- remove unused css for IE7

- fix admin view plugin (due to a recent change elsewhere)
- remove an echo from admin/stats.php

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

4 files changed, 18 insertions, 29 deletions

diff --git a/admin/stats.php b/admin/stats.php
index 707ed83d8..b06cdba16 100644
--- a/admin/stats.php
+++ b/admin/stats.php
@@ -4,7 +4,6 @@
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -47,7 +46,7 @@ SELECT
     hour,
     nb_pages
   FROM '.HISTORY_SUMMARY_TABLE;
-  
+
   if (isset($day))
   {
     $query.= '
@@ -84,7 +83,7 @@ SELECT
   ORDER BY
     year ASC,
     month ASC
-;';   
+;';
   }
   else
   {
@@ -93,7 +92,7 @@ SELECT
     AND month IS NULL
   ORDER BY
     year ASC
-;';   
+;';
   }
 
   $result = pwg_query($query);
@@ -210,7 +209,7 @@ if (isset($first_time_key))
     sprintf('%4u.%02u.%02u',      $year, $month, $day),
     sprintf('%4u.%02u.%02u.%02u', $year, $month, $day, $hour),
     );
-  
+
   $query = '
 SELECT
     id,
@@ -369,13 +368,13 @@ if (isset($page['day']))
   $url.= '&day='.$page['day'];
 
   $time = mktime(12, 0, 0, $page['month'], $page['day'], $page['year']);
-  
+
   $day_title = sprintf(
     '%u (%s)',
     $page['day'],
     $lang['day'][date('w', $time)]
     );
-  
+
   array_push(
     $title_parts,
     '<a href="'.$url.'">'.$day_title.'</a>'
@@ -455,9 +454,9 @@ if (count($datas) > 0)
     {
       $datas[$i] = 0;
     }
-  
+
     $url = null;
-  
+
     if (isset($page['day']))
     {
       $value = sprintf('%02u', $i);
@@ -471,9 +470,9 @@ if (count($datas) > 0)
         .'&amp;month='.$page['month']
         .'&amp;day='.$i
         ;
-  
+
       $time = mktime(12, 0, 0, $page['month'], $i, $page['year']);
-      
+
       $value = $i.' ('.$lang['day'][date('w', $time)].')';
     }
     else if (isset($page['year']))
@@ -484,7 +483,7 @@ if (count($datas) > 0)
         .'&amp;year='.$page['year']
         .'&amp;month='.$i
         ;
-      
+
       $value = $lang['month'][$i];
     }
     else
@@ -495,15 +494,15 @@ if (count($datas) > 0)
         .'?page=stats'
         .'&amp;year='.$i
         ;
-      
+
       $value = $i;
     }
-  
+
     if ($datas[$i] != 0 and isset($url))
     {
       $value = '<a href="'.$url.'">'.$value.'</a>';
     }
-    
+
     $template->assign_block_vars(
       'statrow',
       array(
@@ -520,5 +519,4 @@ if (count($datas) > 0)
 // +-----------------------------------------------------------------------+
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'stats');
-?>
-
+?>
\ No newline at end of file
diff --git a/plugins/admin_multi_view/is_admin.inc.php b/plugins/admin_multi_view/is_admin.inc.php
index 0f85c5e0d..b0f1172f9 100644
--- a/plugins/admin_multi_view/is_admin.inc.php
+++ b/plugins/admin_multi_view/is_admin.inc.php
@@ -11,6 +11,7 @@ if (! defined('MULTIVIEW_CONTROLLER') )
   if ( !empty($theme) )
   {
     list($user['template'], $user['theme']) = explode('/', $theme);
+    unset( $user['admin_template'], $user['admin_theme']);
   }
   $lang = pwg_get_session_var( 'multiview_lang', '' );
   if ( !empty($lang) )
diff --git a/template/yoga/fix-ie7.css b/template/yoga/fix-ie7.css
index a29b98489..75e51370c 100644
--- a/template/yoga/fix-ie7.css
+++ b/template/yoga/fix-ie7.css
@@ -19,14 +19,4 @@
   top: -50%;   
   margin-top: 2%;
 }
-#content UL.thumbnails SPAN.wrap2 {
-  border-radius: 8px;
-}
-.tabsheet li {
-  border-radius: 12px 12px 0px 0px;	/* round corners with CSS3 compliant browsers */
-}
-ul.tabsheet {
-  padding: 0px 0em 1.98em 6em;
-  border-bottom: 1px solid #fff;
-  border-top: 0px;
-}
+
diff --git a/template/yoga/not-ie.css b/template/yoga/not-ie.css
index a9caaed28..14fcad100 100644
--- a/template/yoga/not-ie.css
+++ b/template/yoga/not-ie.css
@@ -19,6 +19,6 @@ FORM#quickconnect LABEL {
   box-sizing: border-box; /* CSS3 */
 }
 ul.tabsheet li {
-  -moz-border-radius: 6px 6px 0px 0px;	/* round corners with CSS3 compliant browsers */
+  -moz-border-radius: 6px 6px 0px 0px;	/* round corners with Geko */
   -webkit-border-radius: 6px 6px 0px 0px; /* Safari webkit project */
 }