Changeset 5128

Timestamp:

Mar 13, 2010, 1:39:25 PM (14 years ago)

Author:

patdenice

Message:

Feature 1502: Fix admin multi view plugin.

Location:

trunk/plugins/admin_multi_view

Files:

• controller.php (modified) (2 diffs)
• is_admin.inc.php (modified) (1 diff)

trunk/plugins/admin_multi_view/controller.php

@@ -129 +129 @@
 // +-----------------------------------------------------------------------+
 // | templates                                                             |
-$my_template = '';
+$my_theme = '';
 $themes_html='<select onchange="document.location = this.options[this.selectedIndex].value;">';
-foreach (get_pwg_themes() as $pwg_template)
-{
-  $selected = $pwg_template == pwg_get_session_var( 'multiview_theme', $view_as_user['template'].'/'.$view_as_user['theme'] ) ? 'selected="selected"' : '';
-  $my_template = $selected == '' ? $my_template : $view_as_user['template'].'/theme/'.$view_as_user['theme'];
+foreach (get_pwg_themes() as $pwg_theme)
+{
+  $selected = $pwg_theme == pwg_get_session_var( 'multiview_theme', $view_as_user['theme'] ) ? 'selected="selected"' : '';
+  $my_theme = $selected == '' ? $my_theme : 'themes/'.$view_as_user['theme'];
   $themes_html .=
     '<option value="'
-    .$my_url.'?theme='.$pwg_template
+    .$my_url.'?theme='.$pwg_theme
     .'" '.$selected.'>'
-    .$pwg_template
+    .$pwg_theme
     .'</option>';
 }
@@ -207 +207 @@
 <?php
 // Controller will be displayed  with  the **real admin template** (without Any if it has been removed)
-if ( $my_template !== '') {
-  $my_template = get_root_url().'template/'.$my_template.'/theme.css';
-  echo '<link rel="stylesheet" type="text/css" href="' . $my_template .'">';
+if ( $my_theme !== '') {
+  $my_theme = get_root_url().$my_theme.'/theme.css';
+  echo '<link rel="stylesheet" type="text/css" href="' . $my_theme .'">';
 }
 ?>

trunk/plugins/admin_multi_view/is_admin.inc.php

@@ -11 +11 @@
   if ( !empty($theme) )
   {
-    list($user['template'], $user['theme']) = explode('/', $theme);
-    unset( $user['admin_template'], $user['admin_theme']);
+    $user['theme'] = $theme;
+    unset($user['admin_theme']);
   }
   $lang = pwg_get_session_var( 'multiview_lang', '' );