Partial fix #7637: plugin settings rendering problem

LimeSurvey · Mar 5, 2013 · 4a3d7e2 · 4a3d7e2
1 parent 6934dbc
commit 4a3d7e2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
@@ -38,8 +38,6 @@ protected function _init()
         //unset(Yii::app()->session['FileManagerContext']);
 
         $this->user_id = Yii::app()->user->getId();
-        Yii::app()->setConfig('adminimageurl', Yii::app()->getConfig('styleurl').Yii::app()->getConfig('admintheme').'/images/');
-        Yii::app()->setConfig('adminstyleurl', Yii::app()->getConfig('styleurl').Yii::app()->getConfig('admintheme').'/');
         if (!Yii::app()->getConfig("surveyid")) {Yii::app()->setConfig("surveyid", returnGlobal('sid'));}         //SurveyID
         if (!Yii::app()->getConfig("ugid")) {Yii::app()->setConfig("ugid", returnGlobal('ugid'));}                //Usergroup-ID
         if (!Yii::app()->getConfig("gid")) {Yii::app()->setConfig("gid", returnGlobal('gid'));}                   //GroupID

diff --git a/application/core/LSYii_Controller.php b/application/core/LSYii_Controller.php
@@ -140,6 +140,8 @@ protected function _init()
 		{
 			Yii::app()->setConfig("timeadjust",$timeadjust.' hours');
 		}
-
+
+        Yii::app()->setConfig('adminimageurl', Yii::app()->getConfig('styleurl').Yii::app()->getConfig('admintheme').'/images/');
+        Yii::app()->setConfig('adminstyleurl', Yii::app()->getConfig('styleurl').Yii::app()->getConfig('admintheme').'/');
 	}
 }
diff --git a/application/extensions/Menu/views/adminmenu.php b/application/extensions/Menu/views/adminmenu.php
@@ -5,7 +5,7 @@
     App()->getClientScript()->registerScriptFile(App()->getAssetManager()->publish(Yii::getPathOfAlias('ext.Menu.assets'). '/nav.js'));
 
     echo CHtml::tag('div', array(
-        'class' => 'titlebar',
+        'class' => 'maintitle titlebar',
         'id' => 'title-' . $menu['role']
     ), $menu['title']);
 ?>

diff --git a/application/views/layouts/main.php b/application/views/layouts/main.php
@@ -42,13 +42,15 @@
 
     </head>
     <body>
-        <?php $this->widget('ext.FlashMessage.FlashMessage'); ?>
-        <?php $this->widget('ext.Menu.MenuWidget', $this->navData); ?>
-        <div id="content">
-        <?php echo $content; ?>
-        </div>
-        <div id="ajaxprogress" title="Ajax request in progress" style="text-align: center">
-            <img src="<?php echo Yii::app()->getConfig('adminstyleurl');?>/images/ajax-loader.gif"/>
+        <div class="wrapper">
+            <?php $this->widget('ext.FlashMessage.FlashMessage'); ?>
+            <?php $this->widget('ext.Menu.MenuWidget', $this->navData); ?>
+            <div id="content">
+            <?php echo $content; ?>
+            </div>
+            <div id="ajaxprogress" title="Ajax request in progress" style="text-align: center">
+                <img src="<?php echo Yii::app()->getConfig('adminstyleurl');?>/images/ajax-loader.gif"/>
+            </div>
         </div>
     </body>