adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-12 03:33:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

- modification : major simplification of admin.php. Titles are managed by

Browse Source 
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
This commit is contained in:
plegall
2005-08-17 14:25:38 +00:00
parent de22732f93
commit 20f0541697
34 changed files with 517 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
template/default/admin.tpl
+92 -90
View File
@@ -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>
<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>
<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>
<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>
<td style="padding:10px;width:99%;" valign="top">
<div class="home">
<div class="titrePage">{PAGE_TITLE}</div>
<!-- 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 -->
<div id="adminMain">
{ADMIN_CONTENT}
</div>
</div>
</td>
</td>
</tr>
</table>
template/default/admin/cat_list.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:title_categories}</h1>
<div class="admin">{CATEGORIES_NAV}</div>
<form id="categoryOrdering" action="" method="post">
template/default/admin/cat_modify.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:title_edit_cat}</h1>
<h2>{CATEGORIES_NAV}</h2>
<ul class="categoryActions">
template/default/admin/cat_options.tpl
+6 -25
View File
@@ -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>
template/default/admin/cat_perm.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{TITLE}</h1>
<form action="{F_ACTION}" method="post" id="categoryPermissions">
<h2>{lang:Groups}</h2>
template/default/admin/configuration.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:title_configuration}</h1>
<form method="post" action="{F_ACTION}">
<table width="100%" align="center">
<!-- BEGIN general -->
template/default/admin/double_select.tpl
+23
View File
@@ -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>
template/default/admin/element_set_global.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:Batch management}</h1>
<div class="admin">{CATEGORY_TITLE}</div>
<p style="text-align:center;">
template/default/admin/group_list.tpl
+2
View File
@@ -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>
template/default/admin/group_perm.tpl
+7
View File
@@ -0,0 +1,7 @@
<h1>{TITLE}</h1>
<form method="post" action="{F_ACTION}">
{DOUBLE_SELECT}
</form>
<p>{lang:Only private categories are listed}</p>
template/default/admin/help.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:title_instructions}</h1>
<table style="width:100%;">
<!-- BEGIN cat -->
<tr class="admin">
template/default/admin/intro.tpl
+14 -7
View File
@@ -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>
template/default/admin/maintenance.tpl
+2
View File
@@ -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>
template/default/admin/picture_modify.tpl
+54 -64
View File
@@ -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;">
<form name="form1" method="post" action="{F_ACTION}">
<fieldset>
<legend>{lang:Association to categories}</legend>
<div style="clear:both;"></div>
<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>
<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" />
<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;">
<form name="form2" method="post" action="{F_ACTION}">
<fieldset>
<legend>{lang:Representation of categories}</legend>
<div style="clear:both;"></div>
<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>
<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" />
<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>
template/default/admin/remote_site.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:remote_sites}</h1>
{REMOTE_SITE_TITLE}
<!-- BEGIN update -->
template/default/admin/stats.tpl
+2
View File
@@ -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>
template/default/admin/thumbnail.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:title_thumbnails}</h1>
<!-- BEGIN results -->
<div class="admin">{L_RESULTS}</div>
<table style="width:100%;">
template/default/admin/update.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:title_update}</h1>
<!-- BEGIN update -->
<div class="admin">{L_RESULT_UPDATE}</div>
<ul style="text-align:left;">
template/default/admin/user_list.tpl
+2 -1
View File
@@ -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>
template/default/admin/user_perm.tpl
+7
View File
@@ -0,0 +1,7 @@
<h1>{TITLE}</h1>
<form method="post" action="{F_ACTION}">
{DOUBLE_SELECT}
</form>
<p>{lang:Only private categories are listed}</p>
template/default/admin/waiting.tpl
+2
View File
@@ -1,3 +1,5 @@
<h1>{lang:title_waiting}</h1>
<form action="{F_ACTION}" method="post">
<table style="width:100%;" >
<tr class="throw">
template/default/default.css
+54
View File
@@ -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;
}
template/default/theme/delete.png
BIN
View File
Binary file not shown.