feature 1587: move advanced features screen into maintenance screen.

git-svn-id: http://piwigo.org/svn/trunk@5745 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Apr 9, 2010 · 8a4b177 · 8a4b177
1 parent ca04de7
commit 8a4b177
Show file tree

Hide file tree

Showing 28 changed files with 169 additions and 287 deletions.
diff --git a/admin.php b/admin.php
@@ -106,7 +106,6 @@
     'U_SITES'=> $link_start.'remote_site',
     'U_MAINTENANCE'=> $link_start.'maintenance',
     'U_NOTIFICATION_BY_MAIL'=> $link_start.'notification_by_mail',
-    'U_ADVANCED_FEATURE'=> $link_start.'advanced_feature',
     'U_CONFIG_GENERAL'=> $link_start.'configuration',
     'U_CONFIG_DISPLAY'=> $conf_link.'default',
     'U_CONFIG_EXTENTS'=> $link_start.'extend_for_templates',

diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php
diff --git a/admin/include/functions.php b/admin/include/functions.php
@@ -1940,7 +1940,6 @@ function get_active_menu($menu_page)
     case 'stats':
     case 'history':
     case 'maintenance':
-    case 'advanced_feature':
     case 'thumbnail':
       return 4;
 

diff --git a/admin/maintenance.php b/admin/maintenance.php
@@ -144,6 +144,36 @@
     )
   );
 
+// +-----------------------------------------------------------------------+
+// | Define advanced features                                              |
+// +-----------------------------------------------------------------------+
+
+$advanced_features = array();
+
+array_push(
+  $advanced_features,
+  array(
+    'CAPTION' => l10n('Not linked elements'),
+    'URL' => get_root_url().'admin.php?page=element_set&amp;cat=not_linked'
+    )
+  );
+
+array_push(
+  $advanced_features,
+  array(
+    'CAPTION' => l10n('Files with same name in more than one physical category'),
+    'URL' => get_root_url().'admin.php?page=element_set&amp;cat=duplicates'
+    )
+  );
+
+//$advanced_features is array of array composed of CAPTION & URL
+$advanced_features = trigger_event(
+  'get_admin_advanced_features_links',
+  $advanced_features
+  );
+
+$template->assign('advanced_features', $advanced_features);
+
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+

diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
@@ -73,7 +73,6 @@ jQuery().ready(function(){ldelim}
         <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
         <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
-        <li><a href="{$U_ADVANCED_FEATURE}">{'Advanced features'|@translate}</a></li>
       </ul>
     </dd>
   </dl>

diff --git a/admin/themes/default/template/advanced_feature.tpl b/admin/themes/default/template/advanced_feature.tpl
diff --git a/admin/themes/default/template/maintenance.tpl b/admin/themes/default/template/maintenance.tpl
@@ -2,6 +2,12 @@
   <h2>{'Maintenance'|@translate}</h2>
 </div>
 
+<ul>
+  {foreach from=$advanced_features item=feature}
+    <li><a href="{$feature.URL}" {$TAG_INPUT_ENABLED}>{$feature.CAPTION}</a></li>
+  {/foreach}
+</ul>
+
 <ul>
   <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'Update categories informations'|@translate}</a></li>
   <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'Update images informations'|@translate}</a></li>

diff --git a/language/de_DE/help/advanced_feature.html b/language/de_DE/help/advanced_feature.html
diff --git a/language/de_DE/help/maintenance.html b/language/de_DE/help/maintenance.html
@@ -10,6 +10,19 @@ <h2>Wartung</h2>
 <p>Informationen werden mit der Zeit unbrauchbar. Sie von der
 Datenbank gibt den Speicherplatz frei.</p>
 
+<ul>
+
+   <li>
+     <strong>Nicht verlinkte Elemente: </strong>
+     Zeigt die Bilder, die nicht mit einer virtuellen Kategorie verlinkt sind (sind aber in realen Kategorien vorhanden)
+   </li>
+   <li>
+     <strong> Finde Dateien mit dem gleichen Dateiname: </strong>
+     Findet Dateien mit dem gleichen Dateiname die in verschiedenen Ordnern gespeichert sind.
+   </li>
+
+</ul>
+
 <ul>
 
    <li><strong>aktualisieren die Informationen der Kategorien:</strong> Für
@@ -52,4 +65,4 @@ <h2>Wartung</h2>
 
    <li><strong>Löschen der kompilierten Templates</strong></li>
 
-</ul>
+</ul>
diff --git a/language/en_UK/help/advanced_feature.html b/language/en_UK/help/advanced_feature.html
diff --git a/language/en_UK/help/maintenance.html b/language/en_UK/help/maintenance.html
@@ -9,6 +9,19 @@ <h2>Maintenance</h2>
 <p>Some information become useless with time going by. Deleting this useless
 information from database make you save disk space.</p>
 
+<ul>
+
+  <li>
+    <strong>Unlinked elements:</strong>
+    Display images which are not associated to any virtual category.
+  </li>
+  <li>
+    <strong>Files with the same name in more than one physical category:</strong>
+    Display images or files which are found with the same filename in several categories.
+  </li>
+
+</ul>
+
 <ul>
 
   <li><strong>Update categories informations:</strong> For each category,

diff --git a/language/es_ES/help/advanced_feature.html b/language/es_ES/help/advanced_feature.html
diff --git a/language/es_ES/help/maintenance.html b/language/es_ES/help/maintenance.html
@@ -4,6 +4,19 @@ <h2>Mantenimiento</h2>
 
 <p>Informaciones se vuelven inútiles con tiempo. Suprimirlas de la base de datos liberara espacio en el disco.</p>
 
+<ul>
+
+  <li>
+    <strong>Elementos no atados :</strong>
+   Visualiza las imágenes que no son asociadas con una categoría virtual
+  </li>
+  <li>
+    <strong>Ficheros que llevan el mismo nombre en varias categorías físicas :</strong>
+    Visualiza las imágenes o los ficheros que  eventualemente podrían estar encontrados en varias categorías.
+  </li>
+
+</ul>
+
 <ul>
 
   <li><strong>Poner al día las informaciones de las categorías:</strong> Para cada categoría, las informaciones a controllar y\o poner al día son las siguientes: lista de las categorías madres, número de elementos, fecha del último elemento, la posición entre las categorías hermana, posición en el árbol completo de las categorías. Esta acción también verifica la coherencia de los representantes.</li>

diff --git a/language/fr_FR/help/advanced_feature.html b/language/fr_FR/help/advanced_feature.html
diff --git a/language/fr_FR/help/maintenance.html b/language/fr_FR/help/maintenance.html
@@ -9,6 +9,19 @@ <h2>Maintenance</h2>
 <p>Certaines informations deviennent inutiles avec le temps. 
 Les supprimer de la base de données libère de l'espace disque.</p>
 
+<ul>
+
+  <li>
+    <strong>Eléments non liés:</strong>
+    Affiche les images qui ne sont associées à aucune catégorie virtuelle
+  </li>
+  <li>
+    <strong>Fichiers portant le même nom dans plusieurs catégories physiques :</strong>
+    Affiche les images ou les éventuels fichiers qui pourraient être trouvés dans plusieurs catégories.
+  </li>
+
+</ul>
+
 <ul>
 
   <li><strong>Mettre à jour les informations des catégories :</strong> 

diff --git a/language/hr_HR/help/advanced_feature.html b/language/hr_HR/help/advanced_feature.html
diff --git a/language/hr_HR/help/maintenance.html b/language/hr_HR/help/maintenance.html
@@ -9,6 +9,19 @@ <h2>Maintenance</h2>
 <p>Some informations become useless with time. Deleting this useless
 information from database make you save disk space.</p>
 
+<ul>
+
+  <li>
+    <strong>Nepovezane stavke:</strong>
+    Prikaz slika koje nisu povezane ni s jednom nestvarnom skupinom.
+  </li>
+  <li>
+    <strong>Slike istog naziva u više od jednoj stvarnoj skupini:</strong>
+    Prikaz slika istog naziva koje se nalaze u više skupina.
+  </li>
+
+</ul>
+
 <ul>
 
   <li><strong>Update categories informations:</strong> For each category,

diff --git a/language/hu_HU/help/advanced_feature.html → language/hu_HU/help/maintenance.html b/language/hu_HU/help/advanced_feature.html → language/hu_HU/help/maintenance.html
@@ -1,7 +1,3 @@
-<h2>Speciális funkciók</h2>
-
-<p>Speciális szakértői funkciók listázása a PWG rendszergazda számára:</p>
-
 <ul>
 
   <li>