- in admin/configuration, add new step with "sections" (general, comments,

  default, upload, metadata, sessions)

- admin/configuration.php and its template have been higly simplificated by
  making things more generic : for example, for each configuration
  parameter, its name must correspond to the name we find in the config
  table and belongs to a section, in the lang array we find :

  - $lang['conf_<section>_<param>']
  - $lang['conf_<section>_<param>_info']
  - $lang['conf_<section>_<param>_error'] optionnaly

- more described message when connection to database server is impossible

- redefinitions of get_languages and get_templates functions

- deletion of configuration parameters : webmaster, session_keyword

- rename of configuration parameters :

  - default_lang => default_language
  - default_style => default_template


git-svn-id: http://piwigo.org/svn/trunk@512 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 84 insertions, 250 deletions

diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
index d1a528b6d..bcdb4882e 100644
--- a/template/default/admin/configuration.tpl
+++ b/template/default/admin/configuration.tpl
@@ -10,242 +10,49 @@
 <!-- BEGIN confirmation -->
 <div class="info">{L_CONFIRM}</div>
 <!-- END confirmation -->
+
 <form method="post" action="{F_ACTION}">
+
+<p class="confMenu">
+  <!-- BEGIN confmenu_item -->
+  <a class="{confmenu_item.CLASS}" href="{confmenu_item.URL}">{confmenu_item.NAME}</a>
+  <!-- END confmenu_item -->
+</p>
+
 <table width="100%" align="center">
-  <tr class="admin">
-    <th colspan="2">{L_CONF_GENERAL}</th>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="50%" ><strong>{L_ADMIN_NAME} &nbsp;:</strong><br /><span class="small">{L_ADMIN_NAME_INFO}</span></td>
-	<td class="row1"><input type="text" size="25" name="webmaster" value="{ADMIN_NAME}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_ADMIN_MAIL}&nbsp;:</strong><br /><span class="small">{L_ADMIN_MAIL_INFO}</span></td>
-	<td class="row1"><input type="text" size="25" maxlength="100" name="mail_webmaster" value="{ADMIN_MAIL}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_THUMBNAIL_PREFIX}&nbsp;:</strong><br /><span class="small">{L_THUMBNAIL_PREFIX_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="4" name="prefix_thumbnail" value="{THUMBNAIL_PREFIX}" /></td>
-  </tr>
-  <tr>
-  <td><strong>{L_ACCESS}&nbsp;:</strong><br /><span class="small">{L_ACCESS_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="access" value="free" {ACCESS_FREE} />{L_ACCESS_FREE}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="access" value="restricted" {ACCESS_RESTRICTED} />{L_ACCESS_RESTRICTED}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_CONF_HISTORY}&nbsp;:</strong><br /><span class="small">{L_CONF_HISTORY_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="log" value="true" {HISTORY_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="log" value="false" {HISTORY_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_MAIL_NOTIFICATION}&nbsp;:</strong><br /><span class="small">{L_MAIL_NOTIFICATION_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="mail_notification" value="true" {MAIL_NOTIFICATION_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="mail_notification" value="false" {MAIL_NOTIFICATION_NO} />{L_NO}</td>
-  </tr>
-    <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="2">{L_CONF_COMMENTS}</th>
-  </tr>
-    <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td><strong>{L_SHOW_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_SHOW_COMMENTS_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="show_comments" value="true" {SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="show_comments" value="false" {SHOW_COMMENTS_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_COMMENTS_ALL}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_PAGE_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="comments_forall" value="true" {COMMENTS_ALL_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="comments_forall" value="false" {COMMENTS_ALL_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_NB_COMMENTS_PAGE}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_PAGE_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="4" name="nb_comment_page" value="{NB_COMMENTS_PAGE}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_VALIDATE_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_VALIDATE_COMMENTS_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="comments_validation" value="true" {VALIDATE_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="comments_validation" value="false" {VALIDATE_COMMENTS_NO} />{L_NO}</td>
-  </tr>
-    <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="2">{L_ABILITIES_SETTINGS}</th>
-  </tr>
-    <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td><strong>{L_LANG_SELECT}&nbsp;:</strong><br /><span class="small">{L_LANG_SELECT_INFO}</span></td>
-	<td class="row1">{LANG_SELECT}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_NB_IMAGE_LINE}&nbsp;:</strong><br /><span class="small">{L_NB_IMAGE_LINE_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_NB_ROW_PAGE}&nbsp;:</strong><br /><span class="small">{L_NB_ROW_PAGE_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_STYLE_SELECT}&nbsp;:</strong><br /><span class="small">{L_STYLE_SELECT_INFO}</span></td>
-	<td class="row1">{STYLE_SELECT}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_RECENT_PERIOD}&nbsp;:</strong><br /><span class="small">{L_RECENT_PERIOD_INFO}</span></td>
-	<td class="row1"><input type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_EXPAND_TREE}&nbsp;:</strong><br /><span class="small">{L_EXPAND_TREE_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="auto_expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="auto_expand" value="false" {EXPAND_TREE_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_NB_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="2">{L_CONF_UPLOAD}</th>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td><strong>{L_AUTH_UPLOAD}&nbsp;:</strong><br /><span class="small">{L_AUTH_UPLOAD_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="upload_available" value="true" {UPLOAD_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="upload_available" value="false" {UPLOAD_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_UPLOAD_MAXSIZE}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXSIZE_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxfilesize" value="{UPLOAD_MAXSIZE}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_UPLOAD_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXWIDTH_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth" value="{UPLOAD_MAXWIDTH}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_UPLOAD_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXHEIGHT_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight" value="{UPLOAD_MAXHEIGHT}" /></td>
-  </tr>
-    <tr>
-    <td><strong>{L_TN_UPLOAD_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{L_TN_UPLOAD_MAXWIDTH_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth_thumbnail" value="{TN_UPLOAD_MAXWIDTH}" /></td>
-  </tr>
-  <tr>
-    <td><strong>{L_TN_UPLOAD_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{L_TN_UPLOAD_MAXHEIGHT_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight_thumbnail" value="{TN_UPLOAD_MAXHEIGHT}" /></td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="2">{L_CONF_SESSION}</th>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-    <tr>
-    <td><strong>{L_COOKIE}&nbsp;:</strong><br /><span class="small">{L_COOKIE_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="authorize_cookies" value="true" {COOKIE_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="authorize_cookies" value="false" {COOKIE_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{L_SESSION_LENGTH}&nbsp;:</strong><br /><span class="small">{L_SESSION_LENGTH_INFO}</span></td>
-	<td class="row1"><input type="text" size="4" maxlength="6" name="session_time" value="{SESSION_LENGTH}" /></td>
-  </tr>
-    <tr>
-    <td><strong>{L_SESSION_ID_SIZE}&nbsp;:</strong><br /><span class="small">{L_SESSION_ID_SIZE_INFO}</span></td>
-	<td class="row1"><input type="text" size="2" maxlength="3" name="session_id_size" value="{SESSION_ID_SIZE}" /></td>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="2">{L_CONF_METADATA}</th>
-  </tr>
-  <tr>
-    <td colspan="2">&nbsp;</td>
-  </tr>
-  <tr>
-    <td>
-      <strong>{L_USE_EXIF}&nbsp;:</strong>
-      <br /><span class="small">{L_USE_EXIF_INFO}</span>
-    </td>
-    <td class="row1">
-      <input type="radio" class="radio" name="use_exif" value="true" {USE_EXIF_YES} />{L_YES}&nbsp;&nbsp;
-      <input type="radio" class="radio" name="use_exif" value="false" {USE_EXIF_NO} />{L_NO}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>{L_USE_IPTC}&nbsp;:</strong>
-      <br /><span class="small">{L_USE_IPTC_INFO}</span>
-    </td>
-    <td class="row1">
-      <input type="radio" class="radio" name="use_iptc" value="true" {USE_IPTC_YES} />{L_YES}&nbsp;&nbsp;
-      <input type="radio" class="radio" name="use_iptc" value="false" {USE_IPTC_NO} />{L_NO}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>{L_SHOW_EXIF}&nbsp;:</strong>
-      <br /><span class="small">{L_SHOW_EXIF_INFO}</span>
-    </td>
-    <td class="row1">
-      <input type="radio" class="radio" name="show_exif" value="true" {SHOW_EXIF_YES} />{L_YES}&nbsp;&nbsp;
-      <input type="radio" class="radio" name="show_exif" value="false" {SHOW_EXIF_NO} />{L_NO}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>{L_SHOW_IPTC}&nbsp;:</strong>
-      <br /><span class="small">{L_SHOW_IPTC_INFO}</span>
-    </td>
-    <td class="row1">
-      <input type="radio" class="radio" name="show_iptc" value="true" {SHOW_IPTC_YES} />{L_YES}&nbsp;&nbsp;
-      <input type="radio" class="radio" name="show_iptc" value="false" {SHOW_IPTC_NO} />{L_NO}
-    </td>
-  </tr>
-    <!-- BEGIN remote_sites -->
-    <tr>
-      <th colspan="2" align="center">{#remote_site}</th>
-    </tr>
-    <tr>
-      <td colspan=3><div style='margin-bottom:0px'>&nbsp;</div></td>
-    </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td align="center">{#delete}</td>
-      <td>&nbsp;</td>
-    </tr>
-    <!-- BEGIN site -->
-    <tr>
-      <td>{#url}</td>
-      <td align="center"><input type="checkbox" name="delete_site_{#id}" value="1" /></td>
-      <!-- BEGIN rowspan -->
-	  <td class="row2" rowspan="{#nb_sites}">{#conf_remote_site_delete_INFO}</span></td>
-	  <!-- END rowspan -->
-    </tr>
-    <!-- END site -->
-    <tr>
-      <td colspan=3><div style='margin-bottom:0px'>&nbsp;</div></td>
-    </tr>
-    <!-- END remote_sites -->
-    <tr>
-      <td colspan="2" align="center">
-        <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}">
-      </td>
-    </tr>
-  </table>
+  <!-- BEGIN line -->
+  <tr>
+    <td width="50%">
+      <span class="confLineName">{line.NAME} :</span>
+      <br />
+      <span class="confLineInfo">{line.INFO}</span>
+    </td>
+    <td class="confLineField">
+
+      <!-- BEGIN textfield -->
+      <input type="text" size="{line.textfield.SIZE}" name="{line.textfield.NAME}" value="{line.textfield.VALUE}" />
+      <!-- END textfield -->
+
+      <!-- BEGIN radio -->
+      <input type="radio" class="radio" name="{line.radio.NAME}" value="{line.radio.VALUE}" {line.radio.CHECKED} />{line.radio.OPTION}
+      <!-- END radio -->
+
+      <!-- BEGIN select -->
+      <select name="{line.select.NAME}">
+        <!-- BEGIN select_option -->
+        <option value="{line.select.select_option.VALUE}" {line.select.select_option.SELECTED}>{line.select.select_option.OPTION}</option>
+        <!-- END select_option -->
+      </select>
+      <!-- END select -->
+
+    </td>
+  </tr>
+  <!-- END line -->
+  <tr>
+    <td colspan="2" align="center">
+      <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}" />
+    </td>
+  </tr>
+</table>
+
 </form>
diff --git a/template/default/default.css b/template/default/default.css
index 65292944e..81d4bfaca 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -19,8 +19,6 @@ h2 {
 	line-height:	120%; 
 }
 
-.small{ font-size:80%;}
-
 /* ANCHORS */
 
 a { text-decoration:none; color:#FFFFFF;}
@@ -146,16 +144,6 @@ ul.menu {
   border-collapse:collapse;
 }
 
-.row1,.row2 {
-  text-align:left;
-  padding:5px 0px 5px 0px;
-  height:20px;
-} 
-
-.row1 {
-  background-color:#505050;
-}
-
 .throw {
   color:#FFFFCC;
   background-color:#3F3F3F;
@@ -257,7 +245,7 @@ background-color:#444444;
 margin:0px 0px 12px 0px;
 text-align: center;
 padding:0px;
-color : #FFF48E; 
+color : #FFF48E;
 }
 
 .adminMain
@@ -338,4 +326,43 @@ span.update_error_element, span.update_category_error {
 
 .update_summary_del {
   color:#ffe1e1;
+}
+
+.confMenu {
+  background-color:#444444;
+  text-align:center;
+}
+
+.confMenu a {
+  padding:2px;
+  border:1px solid gray;
+  background-color:#505050;
+  color:#fff48e;
+  color:lightgray;
+}
+
+.confMenu a:hover {
+  color:orange;
+  text-decoration:none;
+}
+
+.confMenu a.opened {
+  background-color:gray;
+  color:white;
+  text-decoration:none;
+}
+
+span.confLineName {
+  font-weight:bold;
+}
+
+span.confLineInfo {
+  font-size:80%;
+}
+
+td.confLineField {
+  text-align:left;
+  padding:5px 0px 5px 0px;
+  height:20px;
+  background-color:#505050;
 }
\ No newline at end of file
diff --git a/template/default/footer.tpl b/template/default/footer.tpl
index c0f6aa90a..f1ee02372 100644
--- a/template/default/footer.tpl
+++ b/template/default/footer.tpl
@@ -12,7 +12,7 @@
 
       {L_SEND_MAIL}
       <a href="mailto:{MAIL}?subject={L_TITLE_MAIL}">
-       <span style="font-weight:bold;">{WEBMASTER}</span>
+       <span style="font-weight:bold;">{L_WEBMASTER}</span>
       </a>
 
      </div>