- errors and informations boxes : management centralized in admin.php,

  $errors and $infos arrays replaced by $page['errors'] and $page['infos'],
  special management for admin/update.php (more complex management)


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

13 files changed, 64 insertions, 88 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index 5c86bfdd7..db93f7ca9 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -71,6 +71,27 @@
 	<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 align="center">{ADMIN_CONTENT}{ADMIN_CONTENT_2}</div>
 </div>
 	</td>
diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl
index 39fbc3b20..f6e30b042 100644
--- a/template/default/admin/cat_list.tpl
+++ b/template/default/admin/cat_list.tpl
@@ -1,19 +1,3 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
-<!-- BEGIN infos -->
-<div class="info">
-  <!-- BEGIN info -->
-  <li>{infos.info.INFO}</li>
-  <!-- END info -->
-</div>
-<!-- END infos -->
 <div class="admin">{CATEGORIES_NAV}</div>
 <table style="width:100%;">
 <!-- BEGIN category -->
diff --git a/template/default/admin/cat_modify.tpl b/template/default/admin/cat_modify.tpl
index bd25ac1b6..e83f587d4 100644
--- a/template/default/admin/cat_modify.tpl
+++ b/template/default/admin/cat_modify.tpl
@@ -1,7 +1,3 @@
-<!-- BEGIN confirmation -->
-<div style="color:red;text-align:center;">
-  {L_EDIT_CONFIRM} <a href="{U_PERMISSIONS}">{L_HERE}</a></div>
-<!-- END confirmation -->
 <div class="admin">{CATEGORIES_NAV}</div>
 <form action="{F_ACTION}" method="POST">
 <table style="width:100%;">
diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
index 9349c63b7..0f8bccf01 100644
--- a/template/default/admin/configuration.tpl
+++ b/template/default/admin/configuration.tpl
@@ -1,15 +1,3 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
-<!-- BEGIN confirmation -->
-<div class="info">{L_CONFIRM}</div>
-<!-- END confirmation -->
 <form method="post" action="{F_ACTION}">
 <table width="100%" align="center">
 <!-- BEGIN general -->
diff --git a/template/default/admin/group_list.tpl b/template/default/admin/group_list.tpl
index 3a5688af0..89cdf1bb2 100644
--- a/template/default/admin/group_list.tpl
+++ b/template/default/admin/group_list.tpl
@@ -1,12 +1,3 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
 <form method="post" name="post" action="{S_GROUP_ACTION}">
 <div class="admin">{L_GROUP_SELECT}</div>
 <!-- BEGIN select_box -->
@@ -49,4 +40,4 @@
 </div>
 <br />
 <!-- END edit_group -->
-</form>
\ No newline at end of file
+</form>
diff --git a/template/default/admin/images/errors.png b/template/default/admin/images/errors.png
new file mode 100644
index 000000000..887ec3d67
--- /dev/null
+++ b/template/default/admin/images/errors.png
diff --git a/template/default/admin/images/infos.png b/template/default/admin/images/infos.png
new file mode 100644
index 000000000..bf20a2e4c
--- /dev/null
+++ b/template/default/admin/images/infos.png
diff --git a/template/default/admin/picture_modify.tpl b/template/default/admin/picture_modify.tpl
index 2816c9c69..5cd889e83 100644
--- a/template/default/admin/picture_modify.tpl
+++ b/template/default/admin/picture_modify.tpl
@@ -1,12 +1,3 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
 <div class="admin">{TITLE_IMG}</div>
 <form action="{F_ACTION}" method="POST">
   <table style="width:100%;">
diff --git a/template/default/admin/remote_site.tpl b/template/default/admin/remote_site.tpl
index 4b8260279..46a466c29 100644
--- a/template/default/admin/remote_site.tpl
+++ b/template/default/admin/remote_site.tpl
@@ -1,19 +1,5 @@
 {REMOTE_SITE_TITLE}
 
-<!-- BEGIN errors -->
-<div class="errors">
-  <ul>
-    <!-- BEGIN error -->
-    <li>{errors.error.ERROR}</li>
-    <!-- END error -->
-  </ul>
-</div>
-<!-- END errors -->
-
-<!-- BEGIN confirmation -->
-<div class="info">{confirmation.CONTENT}</div>
-<!-- END confirmation -->
-
 <!-- BEGIN update -->
 <div class="admin">{L_RESULT_UPDATE}</div>
 <ul style="text-align:left;">
diff --git a/template/default/admin/thumbnail.tpl b/template/default/admin/thumbnail.tpl
index d362b017d..8f4738950 100644
--- a/template/default/admin/thumbnail.tpl
+++ b/template/default/admin/thumbnail.tpl
@@ -1,13 +1,3 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
-
 <!-- 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 d1f3adf5a..3a1ae33d3 100644
--- a/template/default/admin/update.tpl
+++ b/template/default/admin/update.tpl
@@ -7,27 +7,27 @@
   <li class="update_summary_del">{update.NB_DEL_ELEMENTS} {L_NB_DEL_ELEMENTS}</li>
   <li class="update_summary_err">{update.NB_ERRORS} {L_UPDATE_NB_ERRORS}</li>
 </ul>
-<!-- BEGIN errors -->
+<!-- BEGIN update_errors -->
 <div class="admin">{L_UPDATE_ERROR_LIST_TITLE}</div>
 <ul style="text-align:left;">
-  <!-- BEGIN error -->
-  <li>[{update.errors.error.ELEMENT}] {update.errors.error.LABEL}</li>
-  <!-- END error -->
+  <!-- BEGIN update_error -->
+  <li>[{update.update_errors.update_error.ELEMENT}] {update.update_errors.update_error.LABEL}</li>
+  <!-- END update_error -->
 </ul>
 <div class="admin">{L_UPDATE_ERRORS_CAPTION}</div>
 <ul style="text-align:left;">
   <li><strong>PWG-UPDATE-1</strong> : {L_UPDATE_WRONG_DIRNAME_INFO}</li>
   <li><strong>PWG-UPDATE-2</strong> : {L_UPDATE_MISSING_TN_INFO} {{PICTURE_EXT_LIST}}</li>
 </ul>
-<!-- END errors -->
-<!-- BEGIN infos -->
+<!-- END update_errors -->
+<!-- BEGIN update_infos -->
 <div class="admin">{L_UPDATE_INFOS_TITLE}</div>
 <ul style="text-align:left;">
-  <!-- BEGIN info -->
-  <li>[{update.infos.info.ELEMENT}] {update.infos.info.LABEL}</li>
-  <!-- END info -->
+  <!-- BEGIN update_info -->
+  <li>[{update.update_infos.update_info.ELEMENT}] {update.update_infos.update_info.LABEL}</li>
+  <!-- END update_info -->
 </ul>
-<!-- END infos -->
+<!-- END update_infos -->
 <!-- END update -->
 
 <!-- BEGIN metadata_result -->
diff --git a/template/default/admin/waiting.tpl b/template/default/admin/waiting.tpl
index 6c2cbd104..06bd7881f 100644
--- a/template/default/admin/waiting.tpl
+++ b/template/default/admin/waiting.tpl
@@ -1,7 +1,4 @@
 <form action="{F_ACTION}" method="post">
-  <!-- BEGIN confirmation -->
-  <div class="info">{L_WAITING_CONFIRMATION}</div>
-  <!-- END confirmation -->
   <table style="width:100%;" >
     <tr class="throw">
       <th style="width:20%;">{L_CATEGORY}</th>
diff --git a/template/default/default.css b/template/default/default.css
index 35f54769c..2b5ed28fc 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -381,3 +381,35 @@ pre { text-align:left; }
 label:hover {
   cursor: pointer;
 }
+
+/**
+ * Errors box in administration
+ */
+#errors {
+  text-align: left;
+  background-color: red;
+  background-image: url(admin/images/errors.png);
+  background-repeat: no-repeat;
+  background-position: top right;
+  color: white;
+  font-weight: bold;
+  margin: 5px;
+  border:1px solid black;
+  padding: 10px 50px 10px 10px;
+}
+
+/**
+ * Informations box in administration
+ */
+#infos {
+  text-align: left;
+  background-color: #eee;
+  background-image: url(admin/images/infos.png);
+  background-repeat: no-repeat;
+  background-position: top right;
+  color: black;
+  font-weight: bold;
+  margin: 5px;
+  border:1px solid gray;
+  padding: 10px 50px 10px 10px;
+}
\ No newline at end of file