Changeset 12029

Timestamp:

Sep 1, 2011, 4:01:52 PM (13 years ago)

Author:

plg

Message:

plugin manager: replace the top left "Display Compact/Complete" select box by a
simpler link "show details" or "hide details" on top right.

Location:

trunk

Files:

• admin/plugins_installed.php (modified) (2 diffs)
• admin/themes/default/template/plugins_installed.tpl (modified) (4 diffs)
• admin/themes/default/theme.css (modified) (2 diffs)
• language/cs_CZ/admin.lang.php (modified) (1 diff)
• language/de_DE/admin.lang.php (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (2 diffs)
• language/es_ES/admin.lang.php (modified) (1 diff)
• language/fr_CA/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (2 diffs)
• language/he_IL/admin.lang.php (modified) (1 diff)
• language/hu_HU/admin.lang.php (modified) (1 diff)
• language/it_IT/admin.lang.php (modified) (1 diff)
• language/ja_JP/admin.lang.php (modified) (1 diff)
• language/lv_LV/admin.lang.php (modified) (1 diff)
• language/nl_NL/admin.lang.php (modified) (1 diff)
• language/pl_PL/admin.lang.php (modified) (1 diff)
• language/ru_RU/admin.lang.php (modified) (1 diff)
• language/sk_SK/admin.lang.php (modified) (1 diff)
• language/sl_SL/admin.lang.php (modified) (1 diff)
• language/sr_RS/admin.lang.php (modified) (1 diff)
• language/sv_SE/admin.lang.php (modified) (1 diff)
• language/tr_TR/admin.lang.php (modified) (1 diff)
• language/uk_UA/admin.lang.php (modified) (1 diff)
• language/vi_VN/admin.lang.php (modified) (1 diff)
• language/zh_CN/admin.lang.php (modified) (1 diff)

trunk/admin/plugins_installed.php

@@ -31 +31 @@
 $template->set_filenames(array('plugins' => 'plugins_installed.tpl'));
 
-// display mode
-$plugin_display = isset($_GET['plugin_display']) ? $_GET['plugin_display'] : (pwg_get_session_var('plugin_display') != null ? pwg_get_session_var('plugin_display') : 'compact');
-pwg_set_session_var('plugin_display', $plugin_display);
+// should we display details on plugins?
+if (isset($_GET['show_details']))
+{
+  if (1 == $_GET['show_details'])
+  {
+    $show_details = true;
+  }
+  else
+  {
+    $show_details = false;
+  }
+
+  pwg_set_session_var('plugins_show_details', $show_details);
+}
+elseif (null != pwg_get_session_var('plugins_show_details'))
+{
+  $show_details = pwg_get_session_var('plugins_show_details');
+}
+else
+{
+  $show_details = false;
+}
 
 $base_url = get_root_url().'admin.php?page='.$page['page'];
@@ -177 +196 @@
 usort($tpl_plugins, 'cmp');
 
-$template->assign(array(
-  'plugin_display' => $plugin_display,
-  'plugins' => $tpl_plugins,
-  'active_plugins' => $active_plugins,
-  'PWG_TOKEN' => $pwg_token,
-));
+$template->assign(
+  array(
+    'plugins' => $tpl_plugins,
+    'active_plugins' => $active_plugins,
+    'PWG_TOKEN' => $pwg_token,
+    'base_url' => $base_url,
+    'show_details' => $show_details,
+    )
+  );
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins');

trunk/admin/themes/default/template/plugins_installed.tpl

@@ -50 +50 @@
         for (i=0;i<data.length;i++) {
           {/literal}
-          {if $plugin_display == 'complete'}
+          {if $show_details}
             jQuery('#'+data[i]+' .pluginBoxNameCell').prepend('<a class="warning" title="'+incompatible_msg+'"></a>')
           {else}
@@ -88 +88 @@
 
 <div class="titrePage">
-  <span class="sort">
-    <form action="" method="get" name="change_display">
-      <input type="hidden" name="page" value="plugins"/>
-      {'Display'|@translate} : 
-      <select name="plugin_display" onchange="this.form.submit();">
-        <option value="compact" {if $plugin_diplay=='compact'}selected="selected"{/if}>{'Compact'|@translate}</option>
-        <option value="complete" {if $plugin_display=='complete'}selected="selected"{/if}>{'Complete'|@translate}</option>
-      </select>
-    </form>
-  </span>
   <h2>{'Plugins'|@translate}</h2>
+</div>
+
+<div class="showDetails">
+  {if $show_details}
+  <a href="{$base_url}&amp;show_details=0">{'hide details'|@translate}</a>
+  {else}
+  <a href="{$base_url}&amp;show_details=1">{'show details'|@translate}</a>
+  {/if}
 </div>
 
@@ -135 +133 @@
   {/if}
    
-  {if $plugin_display == 'complete'}
+  {if $show_details}
     <div id="{$plugin.ID}" class="pluginBox {$plugin.STATE}">
       <table>
@@ -176 +174 @@
     </div> {*<!-- pluginBox -->*}
     
-  {elseif $plugin_display == 'compact'}
+  {else}
     {if not empty($plugin.VISIT_URL)}
       {assign var='version' value="<a class='externalLink' href='"|cat:$plugin.VISIT_URL|cat:"'>"|cat:$plugin.VERSION|cat:"</a>"}

trunk/admin/themes/default/theme.css

@@ -927 +927 @@
 .warning:before {content:url(icon/warning.png);vertical-align:top;}
 .deactivate_all {text-align:right;font-size:0.95em;}
+.showDetails {text-align:right; margin-bottom:-15px; margin-top:-10px; padding-right:1em;}
 
 .languageBoxes {min-height:0;text-align:left;}
@@ -1077 +1078 @@
 #progressbar {border:1px solid #ccc; background-color:#eee;}
 .ui-progressbar-value { background-image: url(images/pbar-ani.gif); height:10px;margin:-1px;border:1px solid #E78F08;}
+

trunk/language/cs_CZ/admin.lang.php

@@ -790 +790 @@
 $lang['Type in a search term'] = 'Zadejte hledaný výraz';
 $lang['Activate icon "new" next to albums and pictures'] = 'Aktivovat ikonu "nové" vedle alb a obrázků';
-$lang['Compact'] = 'Kompaktní';
-$lang['Complete'] = 'Kompletní';
 $lang['Deactivate all'] = 'Deaktivovat vše';
 $lang['Default photos order'] = 'Výchozí pořadí fotografií';

trunk/language/de_DE/admin.lang.php

@@ -797 +797 @@
 $lang['Type in a search term'] = 'Geben Sie bitte einen Suchbegriff ein';
 $lang['Activate icon "new" next to albums and pictures'] = ' Aktivieren Sie das Icon "Neu" neben Alben und Fotos ';
-$lang['Compact'] = 'Kompakt';
-$lang['Complete'] = 'Komplett';
 $lang['Deactivate all'] = 'Deaktiviere alle';
 $lang['Default photos order'] = 'Voreingestellte Fotoanordnung';

trunk/language/en_UK/admin.lang.php

@@ -187 +187 @@
 $lang['Comments for all'] = "Comments for all";
 $lang['Comments'] = "Comments";
-$lang['Compact'] = "Compact";
-$lang['Complete'] = "Complete";
 $lang['Complementary mail content'] = "Complementary mail content";
 $lang['Complementary mail content'] = "Complementary mail content";
@@ -850 +848 @@
 $lang['Manage Permissions'] = 'Manage Permissions';
 $lang['Photo %s of %s'] = 'Photo %s of %s';
+$lang['show details'] = 'show details';
+$lang['hide details'] = 'hide details';
 ?>

trunk/language/es_ES/admin.lang.php

@@ -795 +795 @@
 $lang['Activate icon "new" next to albums and pictures'] = 'Activar el icono "nuevo" al lado de álbumes y fotos';
 $lang['Add a criteria'] = 'Añadir un criterio';
-$lang['Compact'] = 'Compacto';
-$lang['Complete'] = 'Completo';
 $lang['Deactivate all'] = 'desactivar todo';
 $lang['Default photos order'] = 'Orden de las fotos por defecto';

trunk/language/fr_CA/admin.lang.php

@@ -792 +792 @@
 $lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'ERREUR: CE GREFFON EST MANQUANT MAIS TOUJOURS INSTALLÉ! DÉSINSTALLEZ-LE.';
 $lang['display'] = 'Afficher';
-$lang['Compact'] = "Compact";
-$lang['Complete'] = "Complet";
 $lang['Restore'] = "Restaurer";
 $lang['Restore default configuration. You will lose your plugin settings!'] = "Restaurer la configuration par défaut? Vous perdrez vos réglages personnels !";

trunk/language/fr_FR/admin.lang.php

@@ -791 +791 @@
 $lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'ERREUR: CE PLUGIN EST MANQUANT MAIS TOUJOURS INSTALLÉ! DÉSINSTALLEZ-LE.';
 $lang['display'] = 'Afficher';
-$lang['Compact'] = "Compact";
-$lang['Complete'] = "Complet";
 $lang['Restore'] = "Restaurer";
 $lang['Restore default configuration. You will lose your plugin settings!'] = "Restaurer la configuration par défaut? Vous perdrez vos réglages personnels !";
@@ -859 +857 @@
 $lang['Manage Permissions'] = 'Gérer les permissions';
 $lang['Photo %s of %s'] = 'Photo %s sur %s';
+$lang['show details'] = 'montrer les détails';
+$lang['hide details'] = 'cacher les détails';
 ?>

trunk/language/he_IL/admin.lang.php

@@ -800 +800 @@
 $lang['Graphics Library'] = 'ספריית גרפיקה';
 $lang['Activate icon "new" next to albums and pictures'] = 'הפעל כפתו "חדש" ליד אלבומים';
-$lang['Compact'] = 'קומפקטי';
-$lang['Complete'] = 'סיים';
 $lang['Deactivate all'] = 'בטל פעולה להכל';
 $lang['Default photos order'] = 'סדר ברירת מחדל לתמונות';

trunk/language/hu_HU/admin.lang.php

@@ -791 +791 @@
 $lang['Type in a search term'] = 'Írd be a keresett kifejezést';
 // missing translations
-$lang['Compact'] = 'Kompakt';
-$lang['Complete'] = 'Részletes';
 $lang['Deactivate all'] = 'Összes kikapcsolása';
 $lang['Restore'] = 'Visszaállítás';

trunk/language/it_IT/admin.lang.php

@@ -791 +791 @@
 $lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'ERRORE: QUESTO PLUGIN È MANCANTE MA TUTTORA INSTALLATO! CANCELLATELO.';
 $lang['display'] = 'Visualizzare';
-$lang['Compact'] = 'Compatto';
-$lang['Complete'] = 'Completo';
 $lang['Restore'] = 'Restaurare';
 $lang['Restore default configuration. You will lose your plugin settings!'] = 'Reimpostare la configurazione di defaut? Perderete tutte le vostre impostazioni!';

trunk/language/ja_JP/admin.lang.php

@@ -720 +720 @@
 $lang['Batch Manager'] = 'バッチ・マネージャー';
 $lang['Choose an action'] = 'アックションを選択して下さい';
-$lang['Compact'] = 'コンパクト';
-$lang['Complete'] = '完了';
 $lang['Activate icon "new" next to albums and pictures'] = 'アルバムと写真のとなりに、\'起動アイコン　"新" があります';
 $lang['Deactivate all'] = '全て非活性する';

trunk/language/lv_LV/admin.lang.php

@@ -787 +787 @@
 $lang['Searching...'] = 'Meklē...';
 $lang['Type in a search term'] = 'Ierakstiet meklējamo vārdu';
-$lang['Compact'] = 'Kompaktēt';
-$lang['Complete'] = 'Pabeigt';
 $lang['Deactivate all'] = 'Deaktivēt visu';
 $lang['Default photos order'] = 'Foto kārtojums pēc noklusējuma';

trunk/language/nl_NL/admin.lang.php

@@ -797 +797 @@
 $lang['Type in a search term'] = 'Type een zoekterm in';
 $lang['Activate icon "new" next to albums and pictures'] = 'Activeer "nieuw" pictogram naast albums en afbeeldingen';
-$lang['Compact'] = 'Compact';
-$lang['Complete'] = 'Compleet';
 $lang['Deactivate all'] = 'Deactiveer alles';
 $lang['Default photos order'] = 'Standaard foto volgorde';

trunk/language/pl_PL/admin.lang.php

@@ -787 +787 @@
 $lang['Type in a search term'] = 'Wpisz frazę do wyszukania';
 $lang['Activate icon "new" next to albums and pictures'] = 'Aktywuj ikonę "nowe" obok albumów i zdjęć';
-$lang['Compact'] = 'Minimalne';
-$lang['Complete'] = 'Pełne';
 $lang['Deactivate all'] = 'Deaktywuj wszystko';
 $lang['Default photos order'] = 'Domślne sortowanie zdjęć';

trunk/language/ru_RU/admin.lang.php

@@ -786 +786 @@
 $lang['display'] = 'показать';
 $lang['Activate icon "new" next to albums and pictures'] = 'Активировать иконку "new" рядом с альбомами и фотографиями';
-$lang['Compact'] = 'Компактный';
-$lang['Complete'] = 'Полный';
 $lang['Deactivate all'] = 'Деактивировать все';
 $lang['Default photos order'] = 'Порядок фотографий по умолчанию';

trunk/language/sk_SK/admin.lang.php

@@ -797 +797 @@
 $lang['Searching...'] = 'Vyhľadávam...';
 $lang['Type in a search term'] = 'Napíšte vo vyhľadávaní';
-$lang['Compact'] = 'Kompaktné';
-$lang['Complete'] = 'Kompletné';
 $lang['Deactivate all'] = 'Ukončiť všetko';
 $lang['Restore'] = 'Obnoviť';

trunk/language/sl_SL/admin.lang.php

@@ -66 +66 @@
 $lang['Comments for all'] = 'Komentarji za vse';
 $lang['Comments'] = 'Komentarji';
-$lang['Compact'] = 'Stisnjeno';
-$lang['Complete'] = 'Zakljuceno';
 $lang['Complementary mail content'] = 'Komplementarna vsebina pošte';
 $lang['Configuration'] = 'Konfiguracija';

trunk/language/sr_RS/admin.lang.php

@@ -790 +790 @@
 $lang['Average rate'] = 'Просечна оцена';
 $lang['Rate'] = 'Оцена';
-$lang['Compact'] = 'Запаковано';
-$lang['Complete'] = 'Завршено';
 $lang['Deactivate all'] = 'Искључи све';
 $lang['Restore'] = 'Обнови';

trunk/language/sv_SE/admin.lang.php

@@ -794 +794 @@
 $lang['Type in a search term'] = 'Ange nytt sökord';
 $lang['Activate icon "new" next to albums and pictures'] = 'Aktivera ikonen "ny" intill album och bilder';
-$lang['Compact'] = 'Kompakt';
-$lang['Complete'] = 'Komplett';
 $lang['Deactivate all'] = 'Avaktivera allt';
 $lang['Default photos order'] = 'Standardordning för bilder';

trunk/language/tr_TR/admin.lang.php

@@ -773 +773 @@
 $lang['THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'] = 'Bu eklenti şimdi Piwigo\'nun kendi parçasıdır lütfen siliniz.!';
 $lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'Hata: Bu eklenti eksik, ama yüklenmiş. Lütfen siliniz.';
-$lang['Compact'] = 'Kompakt';
-$lang['Complete'] = 'Tamamı';
 $lang['Restore'] = 'Onarım';
 $lang['Restore default configuration. You will lose your plugin settings!'] = 'Varsayılan yapılandırmalarınızı onarın. Eklenti ayarlrınız kaybolacaktır!';

trunk/language/uk_UA/admin.lang.php

@@ -205 +205 @@
 $lang['default values'] = 'значення за замовчуванням';
 $lang['default'] = 'за замовчуванням';
-$lang['Compact'] = 'Компактний';
-$lang['Complete'] = 'Повний';
 $lang['delete album'] = 'видалити альбом';
 $lang['Delete orphan tags'] = 'Видалити пусті теги';

trunk/language/vi_VN/admin.lang.php

@@ -794 +794 @@
 $lang['Type in a search term'] = 'Nhập vào trong mục tìm kiếm';
 $lang['display'] = 'hiển thị';
-$lang['Compact'] = 'Thu gọn';
-$lang['Complete'] = 'Hoàn thành';
 $lang['Deactivate all'] = 'Bỏ kích hoạt tất cả';
 $lang['Restore'] = 'Phục hồi';

trunk/language/zh_CN/admin.lang.php

@@ -787 +787 @@
 $lang['Activate icon "new" next to albums and pictures'] = '激活相册和图片旁边的"新建"图标';
 $lang['Add a criteria'] = '添加一个条件';
-$lang['Compact'] = '简洁';
-$lang['Complete'] = '完整';
 $lang['Deactivate all'] = '解除所有';
 $lang['Default photos order'] = '默认相片排序';