aboutsummaryrefslogtreecommitdiffstats
path: root/template/yoga
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-09-14 21:57:05 +0000
committerplegall <plg@piwigo.org>2005-09-14 21:57:05 +0000
commit3371c757424cef291be02a946e528983dece9543 (patch)
tree2ede9c21e065d766d8a3226309635c46b596d77d /template/yoga
parenteac1724ee5e20967d989916b76fc9076411be758 (diff)
- 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
Diffstat (limited to '')
-rw-r--r--template/yoga/about.tpl2
-rw-r--r--template/yoga/admin/cat_modify.tpl15
-rw-r--r--template/yoga/admin/cat_options.tpl7
-rw-r--r--template/yoga/admin/cat_perm.tpl7
-rw-r--r--template/yoga/admin/help.tpl13
-rw-r--r--template/yoga/admin/thumbnail.tpl89
-rw-r--r--template/yoga/admin/user_list.tpl7
-rw-r--r--template/yoga/content.css14
-rw-r--r--template/yoga/picture.tpl2
-rw-r--r--template/yoga/popuphelp.css12
-rw-r--r--template/yoga/search.tpl9
11 files changed, 88 insertions, 89 deletions
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 @@
<h2>{lang:About}</h2>
</div>
- {lang:about_message}
+ {ABOUT_MESSAGE}
</div>
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 @@
<!-- $Id$ -->
-<h2>{lang:title_edit_cat}</h2>
+<div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+ </ul>
+ <h2>{lang:title_edit_cat}</h2>
+</div>
<h3>{CATEGORIES_NAV}</h3>
@@ -65,21 +70,21 @@
<legend>{lang:Options}</legend>
<table>
<tr>
- <td><strong>{L_EDIT_STATUS}</strong><br /><span class="small">{L_EDIT_STATUS_INFO}</span></td>
+ <td><strong>{L_EDIT_STATUS}</strong>
<td>
<input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
<input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
</td>
</tr>
<tr>
- <td><strong>{L_EDIT_LOCK}</strong><br /><span class="small">{L_EDIT_LOCK_INFO}</span></td>
+ <td><strong>{L_EDIT_LOCK}</strong>
<td>
<input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
<input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
</td>
</tr>
<tr>
- <td><strong>{L_EDIT_COMMENTABLE}</strong><br /><span class="small">{L_EDIT_COMMENTABLE_INFO}</span></td>
+ <td><strong>{L_EDIT_COMMENTABLE}</strong>
<td>
<input type="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}
<input type="radio" name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
@@ -87,7 +92,7 @@
</tr>
<!-- BEGIN upload -->
<tr>
- <td><strong>{L_EDIT_UPLOADABLE}</strong><br /><span class="small">{L_EDIT_UPLOADABLE_INFO}</span></td>
+ <td><strong>{L_EDIT_UPLOADABLE}</strong>
<td>
<input type="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}
<input type="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{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 @@
<!-- $Id$ -->
-<h2>{lang:title_cat_options}</h2>
+<div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+ </ul>
+ <h2>{lang:title_cat_options}</h2>
+</div>
<form method="post" action="{F_ACTION}" id="cat_options">
<fieldset>
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 @@
-<h2>{lang:Manage permissions for a category}</h2>
+<div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+ </ul>
+ <h2>{lang:Manage permissions for a category}</h2>
+</div>
<h3>{CATEGORIES_NAV}</h3>
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 @@
- <!-- BEGIN cat -->
- <h3>{cat.NAME}</h3>
- <!-- BEGIN illustration -->
- <div style="text-align:center;margin:auto;margin-bottom:10px;"><img src="{cat.illustration.SRC_IMG}" style="border:1px solid black;" alt=""/></div>
- {cat.illustration.CAPTION}
- <!-- END illustration -->
- <ul style="text-align:left; margin-right:10px;">
- <!-- BEGIN item -->
- <li style="margin-bottom:5px;">{cat.item.CONTENT}</li>
- <!-- END item -->
- </ul>
- <p>&nbsp;</p>
- <!-- END cat -->
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 @@
<!-- $Id$ -->
-<h2>{lang:title_thumbnails}</h2>
+<div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+ </ul>
+ <h2>{lang:title_thumbnails}</h2>
+</div>
<!-- BEGIN results -->
<div class="admin">{L_RESULTS}</div>
@@ -53,55 +58,39 @@
<!-- END results -->
<!-- BEGIN params -->
-<form method="post" action="{params.F_ACTION}">
- <table style="width:100%;">
- <tr>
- <th class="admin" colspan="3">{L_PARAMS}</th>
- </tr>
- <tr><td colspan="3">&nbsp;</td></tr>
- <tr>
- <td><div class="key">{L_GD}</div></td>
- <td class="choice">
- <input type="radio" name="gd" value="2" {params.GD2_CHECKED} />2.x
- <input type="radio" name="gd" value="1" {params.GD1_CHECKED} />1.x
- </td>
- <td style="width:50%;" class="row2">{L_GD_INFO}</td>
- </tr>
- <tr>
- <td><div class="key">{L_WIDTH}</div></td>
- <td class="choice">
- <input type="text" name="width" value="{params.WIDTH_TN}"/>
- </td>
- <td>{L_WIDTH_INFO}</td>
- </tr>
- <tr>
- <td><div class="key">{L_HEIGHT}</div></td>
- <td class="choice">
- <input type="text" name="height" value="{params.HEIGHT_TN}"/>
- </td>
- <td>{L_HEIGHT_INFO}</td>
- </tr>
- <tr>
- <td><div class="key">{L_CREATE}</div></td>
- <td class="choice">
- <input type="radio" name="n" value="5" {params.n_5_CHECKED} /> 5
- <input type="radio" name="n" value="10" {params.n_10_CHECKED} /> 10
- <input type="radio" name="n" value="20" {params.n_20_CHECKED} /> 20
- <input type="radio" name="n" value="all" {params.n_all_CHECKED} /> {L_ALL}
- </td>
- <td>{L_CREATE_INFO}</td>
- </tr>
- <tr>
- <td><div class="key">{L_FORMAT}</div></td>
- <td class="choice"><span style="font-weight:bold;">jpeg</span></td>
- <td>{L_FORMAT_INFO}</td>
- </tr>
- <tr>
- <td colspan="3" style="text-align:center;">
- <input type="submit" name="submit" value="{L_SUBMIT}"/>
- </td>
- </tr>
- </table>
+<form method="post" action="{params.F_ACTION}" class="properties">
+
+ <fieldset>
+ <legend>{L_PARAMS}</legend>
+
+ <ul>
+ <li>
+ <label><strong>{L_GD}</strong></label>
+ <input type="radio" name="gd" value="2" {params.GD2_CHECKED} />2.x
+ <input type="radio" name="gd" value="1" {params.GD1_CHECKED} />1.x
+ </li>
+
+ <li>
+ <label><strong>{L_WIDTH}</strong></label>
+ <input type="text" name="width" value="{params.WIDTH_TN}"/>
+ </li>
+
+ <li>
+ <label><strong>{L_HEIGHT}</strong></label>
+ <input type="text" name="height" value="{params.HEIGHT_TN}"/>
+ </li>
+
+ <li>
+ <label><strong>{lang:Number of thumbnails to create}</strong></label>
+ <input type="radio" name="n" value="5" {params.n_5_CHECKED} /> 5
+ <input type="radio" name="n" value="10" {params.n_10_CHECKED} /> 10
+ <input type="radio" name="n" value="20" {params.n_20_CHECKED} /> 20
+ <input type="radio" name="n" value="all" {params.n_all_CHECKED} /> {L_ALL}
+ </li>
+ </ul>
+ </fieldset>
+
+ <p><input type="submit" name="submit" value="{L_SUBMIT}"/></p>
</form>
<!-- END params -->
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 @@
-<h2>{lang:title_liste_users}</h2>
+<div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+ </ul>
+ <h2>{lang:title_liste_users}</h2>
+</div>
<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
<fieldset>
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 @@
<!-- BEGIN delete -->
<p class="userCommentDelete">
<a href="{comments.comment.delete.U_COMMENT_DELETE}" title="{L_DELETE_COMMENT}">
- <img src="template/clear/theme/delete.gif" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{L_DELETE}]"/>
+ <img src="template/yoga/theme/delete.png" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{L_DELETE}]"/>
</a>
</p>
<!-- END 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 @@
<div class="titrePage">
<ul class="categoryActions">
+ <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
<li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
</ul>
<h2>{lang:Search}</h2>
@@ -20,7 +21,7 @@
<!-- END errors -->
<table width="100%" align="center" cellpadding="2">
<tr>
- <td width="50%" colspan="2"><b>{L_SEARCH_KEYWORDS} : </b><br /><span class="small">{L_SEARCH_KEYWORDS_HINT}</span></td>
+ <td width="50%" colspan="2"><b>{L_SEARCH_KEYWORDS} : </b>
<td colspan="2" valign="top">
<input type="text" style="width: 300px" name="search_allwords" size="30" />
<br />
@@ -29,13 +30,13 @@
</td>
</tr>
<tr>
- <td colspan="2"><b>{L_SEARCH_AUTHOR} :</b><br /><span class="small">{L_SEARCH_AUTHOR_HINT}</span></td>
+ <td colspan="2"><b>{L_SEARCH_AUTHOR} :</b>
<td colspan="2" valign="middle">
<input type="text" style="width: 300px" name="search_author" size="30" />
</td>
</tr>
<tr>
- <td colspan="2"><b>{L_SEARCH_DATE} :</b><br /><span class="small">{L_SEARCH_DATE_HINT}</span></td>
+ <td colspan="2"><b>{L_SEARCH_DATE} :</b>
<td colspan="2" valign="middle">
<table>
<tr>
@@ -79,7 +80,7 @@
<th colspan="4">{L_SEARCH_OPTIONS}</th>
</tr>
<tr>
- <td width="25%" ><b>{L_SEARCH_CATEGORIES} : </b><br /><span class="small">{L_SEARCH_CATEGORIES_HINT}</span></td>
+ <td width="25%" ><b>{L_SEARCH_CATEGORIES} : </b>
<td width="25%" nowrap="nowrap">
<select style="width:200px" name="cat[]" multiple="multiple" size="8">
<!-- BEGIN category_option -->