aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-08-17 14:25:38 +0000
committerplegall <plg@piwigo.org>2005-08-17 14:25:38 +0000
commit20f05416971676e5433da86f3f924d4efe2f92df (patch)
tree406375600205f9e264694da57de66a0f14ea1acd /template
parentde22732f93fad45f94d8c95fdca4cdf6a870327d (diff)
- modification : major simplification of admin.php. Titles are managed by
included page, localized items are managed directly in the template. - new : sub template admin/double_select is included in templates admin/cat_options, admin/user_perm and admin/group_perm. I haven't been able to use it in admin/picture_modify because it seems impossible to have two instance of the same sub-template without interfering. - modification : bug 99, in profile manager, no auto submit when changing language (useless and generate accessibility problem). - improvement : HTML semantically correct for administration menu, simpler syntax, less tags, correct tags (dl/dt/dd instead of div/div). - modification : number of waiting elements and unvalidated comments are displayed in admin/intro instead of administration menu (with a link to the dedicated pages). - deletion : no link to profile from admin/user_list anymore (no need). git-svn-id: http://piwigo.org/svn/trunk@817 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--template/default/admin.tpl180
-rw-r--r--template/default/admin/cat_list.tpl2
-rw-r--r--template/default/admin/cat_modify.tpl2
-rw-r--r--template/default/admin/cat_options.tpl31
-rw-r--r--template/default/admin/cat_perm.tpl2
-rw-r--r--template/default/admin/configuration.tpl2
-rw-r--r--template/default/admin/double_select.tpl23
-rw-r--r--template/default/admin/element_set_global.tpl2
-rw-r--r--template/default/admin/group_list.tpl2
-rw-r--r--template/default/admin/group_perm.tpl7
-rw-r--r--template/default/admin/help.tpl2
-rw-r--r--template/default/admin/intro.tpl21
-rw-r--r--template/default/admin/maintenance.tpl2
-rw-r--r--template/default/admin/picture_modify.tpl130
-rw-r--r--template/default/admin/remote_site.tpl2
-rw-r--r--template/default/admin/stats.tpl2
-rw-r--r--template/default/admin/thumbnail.tpl2
-rw-r--r--template/default/admin/update.tpl2
-rw-r--r--template/default/admin/user_list.tpl3
-rw-r--r--template/default/admin/user_perm.tpl7
-rw-r--r--template/default/admin/waiting.tpl2
-rw-r--r--template/default/default.css54
-rw-r--r--template/default/theme/delete.pngbin0 -> 777 bytes
23 files changed, 290 insertions, 192 deletions
diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index 4c11115b9..be318afa5 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -1,96 +1,98 @@
-<!-- BEGIN install_warning -->
- <p class="install_warning">{L_INSTALL_WARNING}</div>
-<!-- END install_warning -->
<table style="width:100%;">
<tr>
- <td valign="top" style="padding:10px;width:1%;">
- <div class="table1">
+ <td valign="top" style="width:1%;">
+ <div id="theNavbar">
+ <dl>
+ <dt>{lang:links}</dt>
+ <dd>
+ <ul>
+ <li><a href="{U_RETURN}">{lang:home}</a></li>
+ </ul>
+ </dd>
-<div class="titreMenu">{L_LINKS}</div>
-<div class="menu">
-<ul class="menu">
- <li><a class="adminMenu" href="{U_RETURN}">{L_GALLERY_INDEX}</a></li>
- </ul>
-</div>
-<div class="titreMenu">{L_GENERAL}</div>
-<div class="menu">
-<ul class="menu">
- <li><a class="adminMenu" href="{U_FAQ}">{L_FAQ}</a></li>
- <li><a class="adminMenu" href="{U_SITES}">{L_SITES}</a></li>
- <li><a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a></li>
- <li><a class="adminMenu" href="{U_CAT_UPDATE}">{L_UPDATE}</a></li>
- <li><a class="adminMenu" href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
-</ul>
-</div>
-<div class="titreMenu">{L_CONFIGURATION}</div>
-<div class="menu">
-<ul class="menu">
- <li><a class="adminMenu" href="{U_CONFIG_GENERAL}">{L_CONFIG_GENERAL}</a></li>
- <li><a class="adminMenu" href="{U_CONFIG_COMMENTS}">{L_CONFIG_COMMENTS}</a></li>
- <li><a class="adminMenu" href="{U_CONFIG_DISPLAY}">{L_CONFIG_DISPLAY}</a></li>
- <li><a class="adminMenu" href="{U_CONFIG_UPLOAD}">{L_CONFIG_UPLOAD}</a></li>
- <li><a class="adminMenu" href="{U_CONFIG_SESSION}">{L_CONFIG_SESSION}</a></li>
- <li><a class="adminMenu" href="{U_CONFIG_METADATA}">{L_CONFIG_METADATA}</a></li>
-</ul>
-</div>
-<div class="titreMenu">{L_CATEGORIES}</div>
-<div class="menu">
-<ul class="menu">
- <li><a class="adminMenu" href="{U_CATEGORIES}">{L_MANAGE}</a></li>
- <li><a class="adminMenu" href="{U_CAT_UPLOAD}">{L_CAT_UPLOAD}</a></li>
- <li><a class="adminMenu" href="{U_CAT_COMMENTS}">{L_CAT_COMMENTS}</a></li>
- <li><a class="adminMenu" href="{U_CAT_VISIBLE}">{L_CAT_VISIBLE}</a></li>
- <li><a class="adminMenu" href="{U_CAT_STATUS}">{L_CAT_STATUS}</a></li>
- <!-- BEGIN representative -->
- <li><a class="adminMenu" href="{representative.URL}">{lang:Representative}</a></li>
- <!-- END representative -->
-</ul>
-</div>
-<div class="titreMenu">{L_IMAGES}</div>
-<div class="menu">
-<ul class="menu">
- <li><a class="adminMenu" href="{U_WAITING}">{L_WAITING}</a></li>
- <li><a class="adminMenu" href="{U_THUMBNAILS}">{L_THUMBNAILS}</a></li>
- <li><a class="adminMenu" href="{U_COMMENTS}">{L_COMMENTS}</a></li>
- <li><a class="adminMenu" href="{U_CADDIE}">Caddie</a></li>
-</ul>
-</div>
-<div class="titreMenu">{L_IDENTIFY}</div>
-<div class="menu">
-<ul class="menu">
- <li><a class="adminMenu" href="{U_USERS}">{L_USERS}</a></li>
- <li><a class="adminMenu" href="{U_GROUPS}">{L_GROUPS}</a></li>
-</ul>
-</div>
- </div>
- </td>
- <td style="padding:10px;width:99%;" valign="top">
-<div class="home">
- <div class="titrePage">{PAGE_TITLE}</div>
+ <dt>{lang:general}</dt>
+ <dd>
+ <ul>
+ <li><a href="{U_FAQ}">{lang:instructions}</a></li>
+ <li><a href="{U_SITES}">{lang:remote_sites}</a></li>
+ <li><a href="{U_HISTORY}">{lang:history}</a></li>
+ <li><a href="{U_CAT_UPDATE}">{lang:update}</a></li>
+ <li><a href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
+ </ul>
+ </dd>
+
+ <dt>{lang:config}</dt>
+ <dd>
+ <ul>
+ <li><a href="{U_CONFIG_GENERAL}">{lang:general}</a></li>
+ <li><a href="{U_CONFIG_COMMENTS}">{lang:comments}</a></li>
+ <li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
+ <li><a href="{U_CONFIG_UPLOAD}">{lang:upload}</a></li>
+ <li><a href="{U_CONFIG_SESSION}">{lang:conf_cookie}</a></li>
+ <li><a href="{U_CONFIG_METADATA}">{lang:metadata}</a></li>
+ </ul>
+ </dd>
+
+ <dt>{lang:categories}</dt>
+ <dd>
+ <ul>
+ <li><a href="{U_CATEGORIES}">{lang:manage}</a></li>
+ <li><a href="{U_CAT_UPLOAD}">{lang:upload}</a></li>
+ <li><a href="{U_CAT_COMMENTS}">{lang:comments}</a></li>
+ <li><a href="{U_CAT_VISIBLE}">{lang:lock}</a></li>
+ <li><a href="{U_CAT_STATUS}">{lang:cat_security}</a></li>
+ <!-- BEGIN representative -->
+ <li><a href="{representative.URL}">{lang:Representative}</a></li>
+ <!-- END representative -->
+ </ul>
+ </dd>
+
+ <dt>{lang:pictures}</dt>
+ <dd>
+ <ul>
+ <li><a href="{U_WAITING}">{lang:waiting}</a></li>
+ <li><a href="{U_THUMBNAILS}">{lang:thumbnails}</a></li>
+ <li><a href="{U_COMMENTS}">{lang:comments}</a></li>
+ <li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
+ </ul>
+ </dd>
- <!-- BEGIN errors -->
- <div id="errors">
- <ul>
- <!-- BEGIN error -->
- <li>{errors.error.ERROR}</li>
- <!-- END error -->
- </ul>
- </div>
- <!-- END errors -->
+ <dt>{lang:identification}</dt>
+ <dd>
+ <ul>
+ <li><a href="{U_USERS}">{lang:users}</a></li>
+ <li><a href="{U_GROUPS}">{lang:groups}</a></li>
+ </ul>
+ </dd>
+ </dl>
+ </div> <!-- end div#theNavbar -->
+ </td>
- <!-- BEGIN infos -->
- <div id="infos">
- <ul>
- <!-- BEGIN info -->
- <li>{infos.info.INFO}</li>
- <!-- END info -->
- </ul>
- </div>
- <!-- END infos -->
- <div id="adminMain">
- {ADMIN_CONTENT}
- </div>
-</div>
- </td>
+ <td style="width:99%;" valign="top">
+ <div id="adminMain">
+
+ <!-- BEGIN errors -->
+ <div id="errors">
+ <ul>
+ <!-- BEGIN error -->
+ <li>{errors.error.ERROR}</li>
+ <!-- END error -->
+ </ul>
+ </div>
+ <!-- END errors -->
+
+ <!-- BEGIN infos -->
+ <div id="infos">
+ <ul>
+ <!-- BEGIN info -->
+ <li>{infos.info.INFO}</li>
+ <!-- END info -->
+ </ul>
+ </div>
+ <!-- END infos -->
+
+ {ADMIN_CONTENT}
+ </div>
+ </td>
</tr>
</table>
diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl
index c3973b003..b6303b960 100644
--- a/template/default/admin/cat_list.tpl
+++ b/template/default/admin/cat_list.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_categories}</h1>
+
<div class="admin">{CATEGORIES_NAV}</div>
<form id="categoryOrdering" action="" method="post">
diff --git a/template/default/admin/cat_modify.tpl b/template/default/admin/cat_modify.tpl
index c2ddfc7ee..54de1af66 100644
--- a/template/default/admin/cat_modify.tpl
+++ b/template/default/admin/cat_modify.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_edit_cat}</h1>
+
<h2>{CATEGORIES_NAV}</h2>
<ul class="categoryActions">
diff --git a/template/default/admin/cat_options.tpl b/template/default/admin/cat_options.tpl
index a86be6849..a3895f78c 100644
--- a/template/default/admin/cat_options.tpl
+++ b/template/default/admin/cat_options.tpl
@@ -1,30 +1,11 @@
-<div class="admin">{L_CAT_TITLE}</div>
+<h1>{lang:title_cat_options}</h1>
<form method="post" action="{F_ACTION}">
- <table class="doubleSelect">
- <tr>
- <td>
- <h3>{L_CAT_OPTIONS_TRUE}</h3>
- <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
- <!-- BEGIN category_option_true -->
- <option class="{category_option_true.CLASS}" {category_option_true.SELECTED} value="{category_option_true.VALUE}">{category_option_true.OPTION}</option>
- <!-- END category_option_true -->
- </select>
- <p><input type="submit" value="&raquo;" name="falsify" style="font-size:15px;"/></p>
- </td>
-
- <td>
- <h3>{L_CAT_OPTIONS_FALSE}</h3>
- <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
- <!-- BEGIN category_option_false -->
- <option class="{category_option_false.CLASS}" {category_option_false.SELECTED} value="{category_option_false.VALUE}">{category_option_false.OPTION}</option>
- <!-- END category_option_false -->
- </select>
- <p><input type="submit" value="&laquo;" name="trueify" style="font-size:15px;" /></p>
- </td>
- </tr>
- </table>
+ <fieldset>
+ <legend>{L_SECTION}</legend>
+ {DOUBLE_SELECT}
+ </fieldset>
</form>
-<div class="information">{L_CAT_OPTIONS_INFO}</div>
+<p class="information">{L_CAT_OPTIONS_INFO}</div>
diff --git a/template/default/admin/cat_perm.tpl b/template/default/admin/cat_perm.tpl
index 6b7061c65..0cddb2549 100644
--- a/template/default/admin/cat_perm.tpl
+++ b/template/default/admin/cat_perm.tpl
@@ -1,3 +1,5 @@
+<h1>{TITLE}</h1>
+
<form action="{F_ACTION}" method="post" id="categoryPermissions">
<h2>{lang:Groups}</h2>
diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
index 0f8bccf01..c7835f080 100644
--- a/template/default/admin/configuration.tpl
+++ b/template/default/admin/configuration.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_configuration}</h1>
+
<form method="post" action="{F_ACTION}">
<table width="100%" align="center">
<!-- BEGIN general -->
diff --git a/template/default/admin/double_select.tpl b/template/default/admin/double_select.tpl
new file mode 100644
index 000000000..1745c52d3
--- /dev/null
+++ b/template/default/admin/double_select.tpl
@@ -0,0 +1,23 @@
+<table class="doubleSelect">
+ <tr>
+ <td>
+ <h3>{L_CAT_OPTIONS_TRUE}</h3>
+ <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
+ <!-- BEGIN category_option_true -->
+ <option {category_option_true.SELECTED} value="{category_option_true.VALUE}">{category_option_true.OPTION}</option>
+ <!-- END category_option_true -->
+ </select>
+ <p><input type="submit" value="&raquo;" name="falsify" style="font-size:15px;"/></p>
+ </td>
+
+ <td>
+ <h3>{L_CAT_OPTIONS_FALSE}</h3>
+ <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
+ <!-- BEGIN category_option_false -->
+ <option {category_option_false.SELECTED} value="{category_option_false.VALUE}">{category_option_false.OPTION}</option>
+ <!-- END category_option_false -->
+ </select>
+ <p><input type="submit" value="&laquo;" name="trueify" style="font-size:15px;" /></p>
+ </td>
+ </tr>
+</table>
diff --git a/template/default/admin/element_set_global.tpl b/template/default/admin/element_set_global.tpl
index 9b41a5219..6014291f9 100644
--- a/template/default/admin/element_set_global.tpl
+++ b/template/default/admin/element_set_global.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:Batch management}</h1>
+
<div class="admin">{CATEGORY_TITLE}</div>
<p style="text-align:center;">
diff --git a/template/default/admin/group_list.tpl b/template/default/admin/group_list.tpl
index 5fac3e4bb..1bce717ed 100644
--- a/template/default/admin/group_list.tpl
+++ b/template/default/admin/group_list.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_groups}</h1>
+
<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
<fieldset>
<legend>{lang:Add group}</legend>
diff --git a/template/default/admin/group_perm.tpl b/template/default/admin/group_perm.tpl
new file mode 100644
index 000000000..ebb4be2e7
--- /dev/null
+++ b/template/default/admin/group_perm.tpl
@@ -0,0 +1,7 @@
+<h1>{TITLE}</h1>
+
+<form method="post" action="{F_ACTION}">
+ {DOUBLE_SELECT}
+</form>
+
+<p>{lang:Only private categories are listed}</p>
diff --git a/template/default/admin/help.tpl b/template/default/admin/help.tpl
index bcc02ce8b..2a119dcde 100644
--- a/template/default/admin/help.tpl
+++ b/template/default/admin/help.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_instructions}</h1>
+
<table style="width:100%;">
<!-- BEGIN cat -->
<tr class="admin">
diff --git a/template/default/admin/intro.tpl b/template/default/admin/intro.tpl
index cb77bcc11..f42e9caae 100644
--- a/template/default/admin/intro.tpl
+++ b/template/default/admin/intro.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_default}</h1>
+
<dl>
<dt>{lang:PhpWebGallery version}</dt>
<dd>
@@ -19,18 +21,23 @@
<dt>{lang:Database}</dt>
<dd>
<ul>
- <li>{DB_ELEMENTS}</li>
+ <li>
+ {DB_ELEMENTS}
+ <!-- BEGIN waiting -->
+ (<a href="{waiting.URL}">{waiting.INFO}</a>)
+ <!-- END waiting -->
+ </li>
<li>{DB_CATEGORIES}</li>
<li>{DB_USERS}</li>
<li>{DB_GROUPS}</li>
- <li>{DB_COMMENTS}</li>
+ <li>
+ {DB_COMMENTS}
+ <!-- BEGIN unvalidated -->
+ (<a href="{unvalidated.URL}">{unvalidated.INFO}</a>)
+ <!-- END unvalidated -->
+ </li>
<li>{DB_DATE}</li>
</ul>
</dd>
- <dt></dt>
- <dd></dd>
-
- <dt></dt>
- <dd></dd>
</dl>
diff --git a/template/default/admin/maintenance.tpl b/template/default/admin/maintenance.tpl
index cb8f506ff..3a809a9d2 100644
--- a/template/default/admin/maintenance.tpl
+++ b/template/default/admin/maintenance.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:Maintenance}</h1>
+
<ul>
<li><a href="{U_MAINT_CATEGORIES}">{lang:update categories informations}</a></li>
<li><a href="{U_MAINT_IMAGES}">{lang:update images informations}</a></li>
diff --git a/template/default/admin/picture_modify.tpl b/template/default/admin/picture_modify.tpl
index 5cd889e83..f16dce412 100644
--- a/template/default/admin/picture_modify.tpl
+++ b/template/default/admin/picture_modify.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_picmod}</h1>
+
<div class="admin">{TITLE_IMG}</div>
<form action="{F_ACTION}" method="POST">
<table style="width:100%;">
@@ -60,76 +62,64 @@
</table>
</form>
-<form name="form1" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
-
- <div style="clear:both;"></div>
-
- <div style="height:auto;">
-
- <div style="float:left;padding:10px;width:300px;">
- <span class="titreMenu">{L_CAT_ASSOCIATED}</span><br />
- <select style="height:auto;width:280px" name="cat_associated[]" multiple="multiple" size="10">
- <!-- BEGIN associated_option -->
- <option class="{associated_option.CLASS}" {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
- <!-- END associated_option -->
- </select>
- </div>
-
- <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
- <input type="submit" value="&laquo;" name="associate" style="font-size:15px;" class="bouton" /><br/>
- <input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" class="bouton" />
- </div>
-
- <div style="float:right;padding:10px;width:300px;">
- <span class="titreMenu">{L_CAT_DISSOCIATED}</span><br />
- <select style="width:280px" name="cat_dissociated[]" multiple="multiple" size="10">
- <!-- BEGIN dissociated_option -->
- <option class="{dissociated_option.CLASS}" {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
- <!-- END dissociated_option -->
- </select>
- </div>
-
- </div>
-
- <div style="clear:both;"></div>
-
- <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-
+<form name="form1" method="post" action="{F_ACTION}">
+ <fieldset>
+ <legend>{lang:Association to categories}</legend>
+
+ <table class="doubleSelect">
+ <tr>
+ <td>
+ <h3>{L_CAT_ASSOCIATED}</h3>
+ <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
+ <!-- BEGIN associated_option -->
+ <option {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
+ <!-- END associated_option -->
+ </select>
+ <p><input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;"/></p>
+ </td>
+
+ <td>
+ <h3>{L_CAT_DISSOCIATED}</h3>
+ <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
+ <!-- BEGIN dissociated_option -->
+ <option {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
+ <!-- END dissociated_option -->
+ </select>
+ <p><input type="submit" value="&laquo;" name="associate" style="font-size:15px;" /></p>
+ </td>
+ </tr>
+ </table>
+
+ </fieldset>
</form>
-<form name="form2" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
-
- <div style="clear:both;"></div>
-
- <div style="height:auto;">
-
- <div style="float:left;padding:10px;width:300px;">
- <span class="titreMenu">{L_REPRESENTS}</span><br />
- <select style="height:auto;width:280px" name="cat_elected[]" multiple="multiple" size="10">
- <!-- BEGIN elected_option -->
- <option class="{elected_option.CLASS}" {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
- <!-- END elected_option -->
- </select>
- </div>
-
- <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
- <input type="submit" value="&laquo;" name="elect" style="font-size:15px;" class="bouton" /><br/>
- <input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" class="bouton" />
- </div>
-
- <div style="float:right;padding:10px;width:300px;">
- <span class="titreMenu">{L_DOESNT_REPRESENT}</span><br />
- <select style="width:280px" name="cat_dismissed[]" multiple="multiple" size="10">
- <!-- BEGIN dismissed_option -->
- <option class="{dismissed_option.CLASS}" {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
- <!-- END dismissed_option -->
- </select>
- </div>
-
- </div>
-
- <div style="clear:both;"></div>
-
- <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-
+<form name="form2" method="post" action="{F_ACTION}">
+ <fieldset>
+ <legend>{lang:Representation of categories}</legend>
+
+ <table class="doubleSelect">
+ <tr>
+ <td>
+ <h3>{L_REPRESENTS}</h3>
+ <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
+ <!-- BEGIN elected_option -->
+ <option {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
+ <!-- END elected_option -->
+ </select>
+ <p><input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;"/></p>
+ </td>
+
+ <td>
+ <h3>{L_DOESNT_REPRESENT}</h3>
+ <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
+ <!-- BEGIN dismissed_option -->
+ <option {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
+ <!-- END dismissed_option -->
+ </select>
+ <p><input type="submit" value="&laquo;" name="elect" style="font-size:15px;" /></p>
+ </td>
+ </tr>
+ </table>
+
+ </fieldset>
</form>
diff --git a/template/default/admin/remote_site.tpl b/template/default/admin/remote_site.tpl
index 46a466c29..4458bf01c 100644
--- a/template/default/admin/remote_site.tpl
+++ b/template/default/admin/remote_site.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:remote_sites}</h1>
+
{REMOTE_SITE_TITLE}
<!-- BEGIN update -->
diff --git a/template/default/admin/stats.tpl b/template/default/admin/stats.tpl
index b0e8ea924..c858c504e 100644
--- a/template/default/admin/stats.tpl
+++ b/template/default/admin/stats.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_history}</h1>
+
<div class="admin">{L_STAT_TITLE}</div>
<img class="image" src="{IMG_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />
<div class="admin">{L_STAT_MONTH_TITLE}</div>
diff --git a/template/default/admin/thumbnail.tpl b/template/default/admin/thumbnail.tpl
index 8f4738950..c99190050 100644
--- a/template/default/admin/thumbnail.tpl
+++ b/template/default/admin/thumbnail.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_thumbnails}</h1>
+
<!-- BEGIN results -->
<div class="admin">{L_RESULTS}</div>
<table style="width:100%;">
diff --git a/template/default/admin/update.tpl b/template/default/admin/update.tpl
index 3a1ae33d3..ef47d47e0 100644
--- a/template/default/admin/update.tpl
+++ b/template/default/admin/update.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_update}</h1>
+
<!-- BEGIN update -->
<div class="admin">{L_RESULT_UPDATE}</div>
<ul style="text-align:left;">
diff --git a/template/default/admin/user_list.tpl b/template/default/admin/user_list.tpl
index ce9634c65..a66c6f4ba 100644
--- a/template/default/admin/user_list.tpl
+++ b/template/default/admin/user_list.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_liste_users}</h1>
+
<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
<fieldset>
<legend>{lang:Add a user}</legend>
@@ -83,7 +85,6 @@
<td>{user.EMAIL}</td>
<td>{user.GROUPS}</td>
<td style="text-align:center;">
- <a href="{user.U_MOD}"><img src="./template/default/theme/profile.png" style="border:none" alt="profile" title="profile" /></a>
<a href="{user.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
</td>
</tr>
diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl
new file mode 100644
index 000000000..ebb4be2e7
--- /dev/null
+++ b/template/default/admin/user_perm.tpl
@@ -0,0 +1,7 @@
+<h1>{TITLE}</h1>
+
+<form method="post" action="{F_ACTION}">
+ {DOUBLE_SELECT}
+</form>
+
+<p>{lang:Only private categories are listed}</p>
diff --git a/template/default/admin/waiting.tpl b/template/default/admin/waiting.tpl
index 06bd7881f..9daf2c75d 100644
--- a/template/default/admin/waiting.tpl
+++ b/template/default/admin/waiting.tpl
@@ -1,3 +1,5 @@
+<h1>{lang:title_waiting}</h1>
+
<form action="{F_ACTION}" method="post">
<table style="width:100%;" >
<tr class="throw">
diff --git a/template/default/default.css b/template/default/default.css
index bfadbfa81..4ac6caa96 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -366,6 +366,10 @@ input,select,textarea
div#adminMain {
text-align: left;
+ background-color: #5f5f5f;
+ border: 1px solid black;
+ display: block;
+ width: 100%;
}
div#adminMain h2 {
@@ -530,6 +534,22 @@ table.doubleSelect td {
padding: 0 5px;
}
+div#adminMain h1 {
+ margin-top: 0;
+ background-image: url(theme/tableh1_bg.gif);
+ color: #e0e0e0;
+ font-family: 'Trebuchet MS', Verdana, sans-serif;
+ font-weight: 600;
+ font-size: 16px;
+ padding-right: 10px;
+ padding-left: 10px;
+ border-bottom: 1px solid black;
+ border-right: 1px solid black;
+ height: 25px;
+ line-height: 25px;
+ text-align: left;
+}
+
div#adminMain dl {
margin: 10px;
}
@@ -542,4 +562,38 @@ div#adminMain dl>dt {
margin-bottom: 5px;
font-style: italic;
font-size: 110%;
+}
+
+div#theNavbar {
+ background-color: #5f5f5f;
+ border: 1px solid black;
+ text-align: left;
+}
+
+div#theNavbar>dl,
+div#theNavbar>dl>dd
+{
+ margin: 0;
+}
+
+div#theNavbar>dl>dt {
+ background-image: url(theme/tableh1_bg.gif);
+ color: #fff48e;
+ font-size: 12px;
+ font-weight: 600;
+ padding-top: 0;
+ padding-right: 10px;
+ padding-left: 10px;
+ border-bottom: 1px solid black;
+ border-right: 1px solid black;
+ height: 25px;
+ line-height: 25px;
+ text-align: center;
+}
+
+div#theNavbar>dl>dd>ul {
+ white-space: nowrap;
+ list-style-type: square;
+ padding-left: 15px;
+ margin: 5px;
} \ No newline at end of file
diff --git a/template/default/theme/delete.png b/template/default/theme/delete.png
new file mode 100644
index 000000000..9e678c7a2
--- /dev/null
+++ b/template/default/theme/delete.png
Binary files differ