From 3371c757424cef291be02a946e528983dece9543 Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 14 Sep 2005 21:57:05 +0000 Subject: - improvement: long localized messages are in HTML files instead of $lang array. This is the case of admin/help and about pages. - deletion: of unused functions (ts_to_mysqldt, is_image, TN_exists, check_date_format, date_convert, get_category_directories, get_used_metadata_list, array_remove, pwg_write_debug, get_group_restrictions, get_all_group_restrictions, is_group_allowed, style_select, deprecated_getAttribute). - new: many new contextual help pages to replace descriptions previously included in pages. - modification: reorganisation of language files. Deletion of unused language keys, alphabetical sort. No faq.lang.php anymore (replaced by help.html). Only done for en_UK.iso-8859-1. git-svn-id: http://piwigo.org/svn/trunk@862 68402e56-0260-453c-a942-63ccdbb3a9ee --- template/yoga/about.tpl | 2 +- template/yoga/admin/cat_modify.tpl | 15 ++++--- template/yoga/admin/cat_options.tpl | 7 ++- template/yoga/admin/cat_perm.tpl | 7 ++- template/yoga/admin/help.tpl | 13 ------ template/yoga/admin/thumbnail.tpl | 89 ++++++++++++++++--------------------- template/yoga/admin/user_list.tpl | 7 ++- template/yoga/content.css | 14 ++++++ template/yoga/picture.tpl | 2 +- template/yoga/popuphelp.css | 12 ----- template/yoga/search.tpl | 9 ++-- 11 files changed, 88 insertions(+), 89 deletions(-) delete mode 100644 template/yoga/admin/help.tpl (limited to 'template/yoga') diff --git a/template/yoga/about.tpl b/template/yoga/about.tpl index 68d505c01..1344f9c7e 100644 --- a/template/yoga/about.tpl +++ b/template/yoga/about.tpl @@ -7,6 +7,6 @@

{lang:About}

- {lang:about_message} + {ABOUT_MESSAGE} diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl index d64df4960..aef85cb37 100644 --- a/template/yoga/admin/cat_modify.tpl +++ b/template/yoga/admin/cat_modify.tpl @@ -1,5 +1,10 @@ -

{lang:title_edit_cat}

+
+ +

{lang:title_edit_cat}

+

{CATEGORIES_NAV}

@@ -65,21 +70,21 @@ {lang:Options} - + - + - + - +
{L_EDIT_STATUS}
{L_EDIT_STATUS_INFO}		{L_EDIT_STATUS} {L_STATUS_PUBLIC} {L_STATUS_PRIVATE}
{L_EDIT_LOCK}
{L_EDIT_LOCK_INFO}		{L_EDIT_LOCK} {L_YES} {L_NO}
{L_EDIT_COMMENTABLE}
{L_EDIT_COMMENTABLE_INFO}		{L_EDIT_COMMENTABLE} {L_YES} {L_NO} @@ -87,7 +92,7 @@
{L_EDIT_UPLOADABLE}
{L_EDIT_UPLOADABLE_INFO}		{L_EDIT_UPLOADABLE} {L_YES} {L_NO} diff --git a/template/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl index 7ee2a945e..052b2a99c 100644 --- a/template/yoga/admin/cat_options.tpl +++ b/template/yoga/admin/cat_options.tpl @@ -1,5 +1,10 @@ -

{lang:title_cat_options}

+
+
    +
  • (?)
    • +
+

{lang:title_cat_options}

+
diff --git a/template/yoga/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl index 39374d5ed..0bc6efbcb 100644 --- a/template/yoga/admin/cat_perm.tpl +++ b/template/yoga/admin/cat_perm.tpl @@ -1,4 +1,9 @@ -

{lang:Manage permissions for a category}

+
+
    +
  • (?)
    • +
+

{lang:Manage permissions for a category}

+

{CATEGORIES_NAV}

diff --git a/template/yoga/admin/help.tpl b/template/yoga/admin/help.tpl deleted file mode 100644 index d2f59b811..000000000 --- a/template/yoga/admin/help.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -

{cat.NAME}

- -
- {cat.illustration.CAPTION} - -
    - -
  • {cat.item.CONTENT}
    • - -
-

 

- diff --git a/template/yoga/admin/thumbnail.tpl b/template/yoga/admin/thumbnail.tpl index aa8bbcd0f..9e0d70f5e 100644 --- a/template/yoga/admin/thumbnail.tpl +++ b/template/yoga/admin/thumbnail.tpl @@ -1,5 +1,10 @@ -

{lang:title_thumbnails}

+
+
    +
  • (?)
    • +
+

{lang:title_thumbnails}

+
{L_RESULTS}
@@ -53,55 +58,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_PARAMS}
 
{L_GD}
 - 2.x - 1.x - {L_GD_INFO}
{L_WIDTH}
 - - {L_WIDTH_INFO}
{L_HEIGHT}
 - - {L_HEIGHT_INFO}
{L_CREATE}
 - 5 - 10 - 20 - {L_ALL} - {L_CREATE_INFO}
{L_FORMAT}
jpeg{L_FORMAT_INFO}
- -
+ + +
+ {L_PARAMS} + +
    +
  • + + 2.x + 1.x +
    • + +
  • + + +
    • + +
  • + + +
    • + +
  • + + 5 + 10 + 20 + {L_ALL} +
    • +
+
+ +

diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl index 67e8b131b..4c7c5e0b3 100644 --- a/template/yoga/admin/user_list.tpl +++ b/template/yoga/admin/user_list.tpl @@ -1,4 +1,9 @@ -

{lang:title_liste_users}

+
+
    +
  • (?)
    • +
+

{lang:title_liste_users}

+
diff --git a/template/yoga/content.css b/template/yoga/content.css index ec060a3a0..4d3775b21 100644 --- a/template/yoga/content.css +++ b/template/yoga/content.css @@ -173,3 +173,17 @@ ul.categoryActions { padding: 0.5em; } + +/* should be in admin.css ? CSS properties also used in popuphelp */ + +SPAN.pwgScreen { + border-bottom: 1px dotted black; +} + +SPAN.filename:before { + content: "["; +} + +SPAN.filename:after { + content: "]"; +} diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl index 8aecc0262..85007a15e 100644 --- a/template/yoga/picture.tpl +++ b/template/yoga/picture.tpl @@ -161,7 +161,7 @@

- [{L_DELETE}] + [{L_DELETE}]

diff --git a/template/yoga/popuphelp.css b/template/yoga/popuphelp.css index 4c73d212d..b61b7952d 100644 --- a/template/yoga/popuphelp.css +++ b/template/yoga/popuphelp.css @@ -17,18 +17,6 @@ BODY#thePopuphelpPage #content UL LI margin-bottom: 0.5em; } -BODY#thePopuphelpPage #content SPAN.pwgScreen { - border-bottom: 1px dotted black; -} - -BODY#thePopuphelpPage #content SPAN.filename:before { - content: "["; -} - -BODY#thePopuphelpPage #content SPAN.filename:after { - content: "]"; -} - BODY#thePopuphelpPage P#pageBottomActions A { border: none; } diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl index bb2cf08a5..2f5b35dd9 100644 --- a/template/yoga/search.tpl +++ b/template/yoga/search.tpl @@ -2,6 +2,7 @@
    +
  • (?)
  • {lang:home}

{lang:Search}

@@ -20,7 +21,7 @@ - + - + - +
{L_SEARCH_KEYWORDS} :
{L_SEARCH_KEYWORDS_HINT}		{L_SEARCH_KEYWORDS} :
@@ -29,13 +30,13 @@
{L_SEARCH_AUTHOR} :
{L_SEARCH_AUTHOR_HINT}		{L_SEARCH_AUTHOR} :
{L_SEARCH_DATE} :
{L_SEARCH_DATE_HINT}		{L_SEARCH_DATE} : @@ -79,7 +80,7 @@ - +
{L_SEARCH_OPTIONS}
{L_SEARCH_CATEGORIES} :
{L_SEARCH_CATEGORIES_HINT}		{L_SEARCH_CATEGORIES} :