From f01a9f5b7c5d0511391464bf818d87c98f48bd95 Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 25 Aug 2005 22:43:47 +0000 Subject: - new : HTML BODY identifier to let CSS stylesheets manage specific behaviour. - deletion : admin/search useless - improvement : in admin/user_list, special behaviour for true/false fields (expand, show_comments) - new : gallery_title and gallery_description are displayed at the top of each page. - improvement : simplification in HTML for categories menu. - improvement : standardization of presentation in all public pages (identification, registration, search, profile, notification, comments, etc.) (not in ChangeLog, below this line) - add forgotten notification.php (should have been added in a previous commit) - [template cclear] deletion of useless class .bouton - [template cclear] for test purpose, new presentation of register page (using FORM.filter) - [template cclear] adaptation of admin/group_list from template default - [template cclear] deletion of obsolete admin/infos_images - [template cclear] deletion of obsolete admin/search_username - [template cclear] new icon register.png git-svn-id: http://piwigo.org/svn/trunk@850 68402e56-0260-453c-a942-63ccdbb3a9ee --- template/cclear/about.tpl | 20 +++-- template/cclear/admin.tpl | 4 +- template/cclear/admin/cat_list.tpl | 4 +- template/cclear/admin/cat_perm.tpl | 4 +- template/cclear/admin/configuration.tpl | 4 +- template/cclear/admin/element_set_global.tpl | 4 +- template/cclear/admin/group_list.tpl | 75 ++++++---------- template/cclear/admin/group_perm.tpl | 12 +-- template/cclear/admin/infos_images.tpl | 96 --------------------- template/cclear/admin/remote_site.tpl | 2 +- template/cclear/admin/search_username.tpl | 22 ----- template/cclear/admin/thumbnail.tpl | 2 +- template/cclear/admin/update.tpl | 4 +- template/cclear/admin/user_list.tpl | 123 ++++++++++++++------------- template/cclear/admin/user_perm.tpl | 27 ++++-- template/cclear/category.tpl | 4 +- template/cclear/comments.tpl | 5 +- template/cclear/content.css | 13 ++- template/cclear/default-colors.css | 9 +- template/cclear/default-layout.css | 70 +++++++++++---- template/cclear/header.tpl | 7 +- template/cclear/identification.tpl | 22 +++-- template/cclear/notification.tpl | 15 +++- template/cclear/profile.tpl | 7 +- template/cclear/register.tpl | 91 ++++++++------------ template/cclear/search.tpl | 16 ++-- template/cclear/theme/register.png | Bin 0 -> 1444 bytes 27 files changed, 295 insertions(+), 367 deletions(-) delete mode 100644 template/cclear/admin/infos_images.tpl delete mode 100644 template/cclear/admin/search_username.tpl create mode 100644 template/cclear/theme/register.png (limited to 'template') diff --git a/template/cclear/about.tpl b/template/cclear/about.tpl index b56481c4b..c3a94539c 100644 --- a/template/cclear/about.tpl +++ b/template/cclear/about.tpl @@ -1,10 +1,12 @@ -

{PAGE_TITLE}

- -
-[{L_RETURN}] -
-
-php logo +
+ +
+
    +
  • {lang:home}
  • +
+

{lang:About}

+
+ + {lang:about_message} +
diff --git a/template/cclear/admin.tpl b/template/cclear/admin.tpl index ef1f89a80..98f555332 100644 --- a/template/cclear/admin.tpl +++ b/template/cclear/admin.tpl @@ -1,4 +1,5 @@ +
-
    @@ -89,5 +89,3 @@ {ADMIN_CONTENT}
- - diff --git a/template/cclear/admin/cat_list.tpl b/template/cclear/admin/cat_list.tpl index 7331fe2e3..6b59afb03 100644 --- a/template/cclear/admin/cat_list.tpl +++ b/template/cclear/admin/cat_list.tpl @@ -37,12 +37,12 @@ -

+

{L_ADD_VIRTUAL} : - +
diff --git a/template/cclear/admin/cat_perm.tpl b/template/cclear/admin/cat_perm.tpl index a066e5214..39374d5ed 100644 --- a/template/cclear/admin/cat_perm.tpl +++ b/template/cclear/admin/cat_perm.tpl @@ -4,7 +4,7 @@
-

{lang:Groups}

+

{lang:Groups}

{lang:Permission granted} @@ -26,7 +26,7 @@
-

{lang:Users}

+

{lang:Users}

{lang:Permission granted} diff --git a/template/cclear/admin/configuration.tpl b/template/cclear/admin/configuration.tpl index a806b2af9..591a1bbca 100644 --- a/template/cclear/admin/configuration.tpl +++ b/template/cclear/admin/configuration.tpl @@ -190,8 +190,8 @@ - - + + diff --git a/template/cclear/admin/element_set_global.tpl b/template/cclear/admin/element_set_global.tpl index def1d30a0..081bb808a 100644 --- a/template/cclear/admin/element_set_global.tpl +++ b/template/cclear/admin/element_set_global.tpl @@ -27,7 +27,7 @@ -

+

@@ -152,7 +152,7 @@

-

+

diff --git a/template/cclear/admin/group_list.tpl b/template/cclear/admin/group_list.tpl index 3a5688af0..4344c10da 100644 --- a/template/cclear/admin/group_list.tpl +++ b/template/cclear/admin/group_list.tpl @@ -1,52 +1,27 @@ - -
-
    - -
  • {errors.error.ERROR}
  • - -
-
- - -
{L_GROUP_SELECT}
- -{S_GROUP_SELECT}   - -
-{L_GROUP_CONFIRM} -
- - - -
-
- -
{L_GROUP_EDIT} [{edit_group.GROUP_NAME}]
- - - - - - - - - - - +

{lang:title_groups}

+ + +
+ {lang:Add group} + + +
+ + +
{L_USER_NAME}{L_USER_EMAIL}{L_USER_SELECT}
{edit_group.user.NAME}{edit_group.user.EMAIL}
+ + + + - - - - + + + + + + +
{lang:Group name}{lang:Members}{lang:Actions}
- -
{group.NAME}{group.MEMBERS} + permissions + delete +
-
- - - - -
-
- - \ No newline at end of file diff --git a/template/cclear/admin/group_perm.tpl b/template/cclear/admin/group_perm.tpl index 9bf490e5b..91c2f637a 100644 --- a/template/cclear/admin/group_perm.tpl +++ b/template/cclear/admin/group_perm.tpl @@ -1,7 +1,7 @@ - -
-
{L_GROUP_SELECT}
- {S_GROUP_SELECT}   - +

{TITLE}

+ + + {DOUBLE_SELECT}
- \ No newline at end of file + +

{lang:Only private categories are listed}

diff --git a/template/cclear/admin/infos_images.tpl b/template/cclear/admin/infos_images.tpl deleted file mode 100644 index 2e786483b..000000000 --- a/template/cclear/admin/infos_images.tpl +++ /dev/null @@ -1,96 +0,0 @@ - -
-
    - -
  • {errors.error.ERROR}
  • - -
-
- - -
-
{L_INFOS_TITLE} "{CATEGORY}"
- - - - - - - - - - - - - - - - -
{L_AUTHOR}
- - - - {L_INFOS_OVERALL_USE} -
-
{L_INFOS_CREATION_DATE} [DD/MM/YYYY]
-
- - - - {L_INFOS_OVERALL_USE} -
-
{L_KEYWORD} {L_KEYWORD_SEPARATION}
-
- - - - {L_INFOS_ADDTOALL} - - {L_INFOS_REMOVEFROMALL} -
-
-
{L_INFOS_DETAIL}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {L_THUMBNAIL}{L_INFOS_IMG}{L_AUTHOR}{L_INFOS_COMMENT}{L_INFOS_CREATION_DATE}{L_KEYWORD}
-
- -
-
{picture.DEFAULTNAME_IMG}
- ↑ - {L_INFOS_ASSOCIATE} - -
- -
-
diff --git a/template/cclear/admin/remote_site.tpl b/template/cclear/admin/remote_site.tpl index 4b8260279..f4b31d1e4 100644 --- a/template/cclear/admin/remote_site.tpl +++ b/template/cclear/admin/remote_site.tpl @@ -55,7 +55,7 @@
{L_REMOTE_SITE_CREATE} - +
diff --git a/template/cclear/admin/search_username.tpl b/template/cclear/admin/search_username.tpl deleted file mode 100644 index f3e676f8d..000000000 --- a/template/cclear/admin/search_username.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -
{L_SEARCH_USERNAME}
- -   -
- {L_SEARCH_EXPLAIN}
- - {L_UPDATE_USERNAME}
-   -

- -
{L_CLOSE_WINDOW} - diff --git a/template/cclear/admin/thumbnail.tpl b/template/cclear/admin/thumbnail.tpl index e6e140f7d..aa8bbcd0f 100644 --- a/template/cclear/admin/thumbnail.tpl +++ b/template/cclear/admin/thumbnail.tpl @@ -98,7 +98,7 @@
- +
diff --git a/template/cclear/admin/update.tpl b/template/cclear/admin/update.tpl index 182a9a868..8e952c329 100644 --- a/template/cclear/admin/update.tpl +++ b/template/cclear/admin/update.tpl @@ -79,8 +79,8 @@

- - + +

diff --git a/template/cclear/admin/user_list.tpl b/template/cclear/admin/user_list.tpl index a66c6f4ba..ad6b18678 100644 --- a/template/cclear/admin/user_list.tpl +++ b/template/cclear/admin/user_list.tpl @@ -1,11 +1,11 @@ -

{lang:title_liste_users}

+

{lang:title_liste_users}

{lang:Add a user} - +
@@ -60,7 +60,7 @@ - + @@ -68,14 +68,14 @@
- +
- - - - - - + + + + + + @@ -90,13 +90,34 @@
{L_USERNAME}{L_STATUS}{L_EMAIL}{L_GROUPS}{L_ACTIONS} {L_USERNAME}{L_STATUS}{L_EMAIL}{lang:Groups}{L_ACTIONS}
+
{lang:Deletions} - {lang:confirm} - + + +
+ +
+ {lang:Status} + + + + + + +
{L_STATUS} + + + +
+
@@ -139,8 +160,8 @@ {L_NB_IMAGE_LINE} - leave unchanged - set to + + @@ -149,8 +170,8 @@ {L_NB_LINE_PAGE} - leave unchanged - set to + + @@ -159,8 +180,8 @@ {L_TEMPLATE} - leave unchanged - set to + + leave unchanged - set to + + leave unchanged - set to + + @@ -195,33 +216,29 @@ {L_EXPAND} - leave unchanged - set to - {L_YES} - {L_NO} + + / {lang:set to} + + {L_SHOW_NB_COMMENTS} - leave unchanged - set to - {L_YES} - {L_NO} + + / {lang:set to} + + {L_MAXWIDTH} - leave unchanged - unset - set to + + + @@ -231,40 +248,28 @@ {L_MAXHEIGHT} - leave unchanged - unset - set to + + + - - {L_STATUS} - - leave unchanged - set to - - - -

- target - all - selection +

+ {lang:target} +

-

- - +

+ +

diff --git a/template/cclear/admin/user_perm.tpl b/template/cclear/admin/user_perm.tpl index e3944fe42..a24fd9096 100644 --- a/template/cclear/admin/user_perm.tpl +++ b/template/cclear/admin/user_perm.tpl @@ -1,6 +1,21 @@ -
{L_SELECT_USERNAME}
-
- - - -
\ No newline at end of file +

{TITLE}

+ + +
+ {lang:Categories authorized thanks to group associations} + +
    + +
  • {groups.category.NAME}
  • + +
+
+ + +
+ {lang:Other private categories} + +
+ {DOUBLE_SELECT} +
+
diff --git a/template/cclear/category.tpl b/template/cclear/category.tpl index 17ff0d2bb..bb218f9be 100644 --- a/template/cclear/category.tpl +++ b/template/cclear/category.tpl @@ -1,6 +1,4 @@ -

PhpWebGallery demonstration site

- + +
diff --git a/template/cclear/notification.tpl b/template/cclear/notification.tpl index ac50a7d8f..cc4a0ee9f 100644 --- a/template/cclear/notification.tpl +++ b/template/cclear/notification.tpl @@ -1,4 +1,13 @@ -{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.} +
-

{lang:RSS feed}

-

{lang:Return to home page}

+
+
    +
  • {lang:home}
  • +
+

{lang:Notification}

+
+ +

{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}

+ +

{lang:RSS feed}

+
diff --git a/template/cclear/profile.tpl b/template/cclear/profile.tpl index 429999397..76fe2dba6 100644 --- a/template/cclear/profile.tpl +++ b/template/cclear/profile.tpl @@ -76,10 +76,11 @@ -

- - +

+ +

+

[{L_RETURN}]

diff --git a/template/cclear/register.tpl b/template/cclear/register.tpl index 8bae0bc16..c696bfe8b 100644 --- a/template/cclear/register.tpl +++ b/template/cclear/register.tpl @@ -1,59 +1,42 @@ -

{L_TITLE}

+
+ +
+ +
+
    +
  • {lang:home}
  • +
+

{lang:Registration}

+
+ -
- - - - - + +
+
    + +
  • {errors.error.ERROR}
  • + +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
    - -
  • {errors.error.ERROR}
  • - -
-
-
{L_USERNAME} - -
{L_PASSWORD} - -
{L_CONFIRM_PASSWORD} - -
{L_EMAIL} - -
 
- -
- [ {L_GUEST} ] -
+ + +
+ {lang:Enter your personnal informations} + + + + + +
+ +

+ +

+
+ +
+
diff --git a/template/cclear/search.tpl b/template/cclear/search.tpl index 93315a663..75147cffa 100644 --- a/template/cclear/search.tpl +++ b/template/cclear/search.tpl @@ -1,4 +1,12 @@ -

{L_SEARCH_TITLE}

+
+ +
+
    +
  • {lang:home}
  • +
+

{lang:Search}

+
+
@@ -11,9 +19,6 @@
- - -
{L_SEARCH_TITLE}
{L_SEARCH_KEYWORDS} :
{L_SEARCH_KEYWORDS_HINT}
@@ -129,4 +134,5 @@
-[ {L_RETURN} ] + +
diff --git a/template/cclear/theme/register.png b/template/cclear/theme/register.png new file mode 100644 index 000000000..a28069cb7 Binary files /dev/null and b/template/cclear/theme/register.png differ -- cgit v1.2.3