- added an image sort order by privacy level (admins only)

- fix an IE6 display issue with quick search on index page

git-svn-id: http://piwigo.org/svn/branches/2.0@2769 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 10 insertions, 9 deletions

diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 26c9478ef..0705b852b 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -273,7 +273,8 @@ function get_category_preferred_image_orders()
       l10n('Rank'),
       'rank ASC',
       ('categories' == @$page['section'] and !isset($page['flat']) and !isset($page['chronology_field']) )
-      )
+      ),
+    array( l10n('permissions'), 'level DESC', is_admin() )
     ));
 }
 
@@ -522,4 +523,4 @@ LIMIT 1';
   }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 9c1556ba8..57c9d627e 100644
--- a/index.php
+++ b/index.php
@@ -197,7 +197,7 @@ if ( $page['section']=='search' and $page['start']==0 and
     $hints = array();
     foreach ( $cats as $cat )
     {
-      $hints[] = get_cat_display_name( array($cat) );
+      $hints[] = get_cat_display_name( array($cat), '', false );
     }
     $template->assign( 'category_search_results', $hints);
   }
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index dc60daff5..2da9d04b5 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -32,19 +32,19 @@
       {/if}
 
       {if isset($U_MODE_FLAT) }
-      <li><a href="{$U_MODE_FLAT}" title="{'mode_flat_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'mode_flat_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_FLAT}" title="{'mode_flat_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'mode_flat_hint'|@translate}" /></a></li>
       {/if}
 
       {if isset($U_MODE_NORMAL) }
-      <li><a href="{$U_MODE_NORMAL}" title="{'mode_normal_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'mode_normal_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_NORMAL}" title="{'mode_normal_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'mode_normal_hint'|@translate}" /></a></li>
       {/if}
 
       {if isset($U_MODE_POSTED) }
-      <li><a href="{$U_MODE_POSTED}" title="{'mode_posted_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'mode_posted_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_POSTED}" title="{'mode_posted_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'mode_posted_hint'|@translate}" /></a></li>
       {/if}
       
       {if isset($U_MODE_CREATED) }
-      <li><a href="{$U_MODE_CREATED}" title="{'mode_created_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'mode_created_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_CREATED}" title="{'mode_created_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'mode_created_hint'|@translate}" /></a></li>
       {/if}
       
       {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if}
@@ -71,7 +71,7 @@
 {if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
 
 {if !empty($category_search_results) }
-<div style="font-size:16px;text-align:left;margin:10px">{'Category results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
+<div style="font-size:16px;margin:10px 16px">{'Category results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
   <em><strong>
   {foreach from=$category_search_results item=res name=res_loop}
   {if !$smarty.foreach.res_loop.first} &mdash; {/if}
@@ -82,7 +82,7 @@
 {/if}
 
 {if !empty($tag_search_results) }
-<div style="font-size:16px;text-align:left;margin:10px">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
+<div style="font-size:16px;margin:10px 16px">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
   <em><strong>
   {foreach from=$tag_search_results item=res name=res_loop}
   {if !$smarty.foreach.res_loop.first} &mdash; {/if}