Fix for 0000629: Adding display differences between physical and virtual categories

(Icon is displayed for people who have deficient vision).

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

9 files changed, 23 insertions, 2 deletions

diff --git a/admin/cat_list.php b/admin/cat_list.php
index 5b2bd5f28..82a272639 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -295,6 +295,12 @@ foreach ($categories as $category)
         'URL'=>$self_url.'&delete='.$category['id']
         )
       );
+    $template->assign_block_vars(
+      'categories.category.virtual',
+      array(
+        'CLASS' => 'virtual_cat',
+        )
+      );
   }
 
   if ($category['nb_images'] > 0)
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index cca9bc958..eadbbe0e0 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -479,6 +479,7 @@ $lang['user_status_normal'] = 'User';
 $lang['user_status_webmaster'] = 'Webmaster';
 $lang['username'] = 'username';
 $lang['users'] = 'Users';
+$lang['virtual_category'] = 'Virtual category';
 $lang['visitors'] = 'Visitors';
 $lang['w_day'] = 'Day';
 $lang['waiting'] = 'Waiting';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 53d835147..bbeec9c44 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -479,6 +479,7 @@ $lang['user_status_normal'] = 'Visiteur';
 $lang['user_status_webmaster'] = 'Webmestre';
 $lang['username'] = 'nom utilisateur';
 $lang['users'] = 'Utilisateurs';
+$lang['virtual_category'] = 'Catégorie virtuelle';
 $lang['visitors'] = 'Visiteurs';
 $lang['w_day'] = 'Jour';
 $lang['waiting'] = 'En attente';
diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index 8f063a6d6..b5317fdb3 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -18,7 +18,11 @@
   <ul class="categoryUl">
 
     <!-- BEGIN category -->
-    <li class="categoryLi"> <!-- category {category.ID} -->
+    <li class="categoryLi
+          <!-- BEGIN virtual -->
+          {categories.category.virtual.CLASS}
+          <!-- END virtual -->
+    "> <!-- category {category.ID} -->
 
       <ul class="categoryActions">
         <li><a href="{categories.category.U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to category}" /></a></li>
@@ -35,7 +39,12 @@
         <!-- END delete -->
       </ul>
 
-      <p><strong><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}">{categories.category.NAME}</a></strong></p>
+      <p>
+      <strong><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}">{categories.category.NAME}</a></strong>
+      <!-- BEGIN virtual -->
+      <img src="{themeconf:icon_dir}/virt_category.png" class="button" alt="{lang:virtual_category}" /></a></li>
+      <!-- END virtual -->
+      </p>
 
       <p>
         <label>
diff --git a/template/yoga/icon/virt_category.png b/template/yoga/icon/virt_category.png
new file mode 100644
index 000000000..15f4f2267
--- /dev/null
+++ b/template/yoga/icon/virt_category.png
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index 0a85ed60c..ab9bc5597 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -94,3 +94,4 @@ TD.calDayCellEmpty { color: silver; }
 
 .calBackDate { color: #000; }
 .calForeDate { color: #fff; }
+.virtual_cat { background: #fff !important; }
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 04632b6a4..be8393911 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -133,3 +133,4 @@ TD.calDayCellEmpty { color: silver; }
 
 .calBackDate { color: #000; }
 .calForeDate { color: #fff; }
+.virtual_cat { background: #3f3f3f !important; }
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index 42d0e8b47..f50b666af 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -255,3 +255,4 @@ TD.calDayCellEmpty { color: silver; }
 

 .calBackDate { color: #000; }

 .calForeDate { color: #fff; }

+.virtual_cat { background: #fff !important; }

diff --git a/template/yoga/theme/wipi/theme.css b/template/yoga/theme/wipi/theme.css
index cb91f1d14..6460ee03d 100644
--- a/template/yoga/theme/wipi/theme.css
+++ b/template/yoga/theme/wipi/theme.css
@@ -245,3 +245,4 @@ TD.calDayCellEmpty { color: silver; }
 

 .calBackDate { color: #000; }

 .calForeDate { color: #fff; }

+.virtual_cat { background: #222 !important; }