Skip to content

Commit

Permalink
Fixed issue #05808: superfish.css should be read in from admintheme
Browse files Browse the repository at this point in the history
  • Loading branch information
@sachdeva-shubham
sachdeva-shubham committed Feb 25, 2012
1 parent 2054c14 commit 7727609
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion application/controllers/admin/assessments.php
View file
Expand Up @@ -77,7 +77,7 @@ protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls =
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'assessments.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/default/superfish.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/".Yii::app()->getConfig('admintheme')."/superfish.css");

parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/emailtemplates.php
View file
Expand Up @@ -32,7 +32,7 @@ function index($iSurveyId)
{
$clang = $this->getController()->lang;
$iSurveyId = sanitize_int($iSurveyId);
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/default/superfish.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/".Yii::app()->getConfig('admintheme')."/superfish.css");

Yii::app()->loadHelper('admin.htmleditor');
Yii::app()->loadHelper('surveytranslator');
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/export.php
View file
Expand Up @@ -1330,7 +1330,7 @@ private function _addHeaders($filename, $content_type, $expires, $pragma = "publ
*/
protected function _renderWrappedTemplate($sAction = 'export', $aViewUrls = array(), $aData = array())
{
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/default/superfish.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/'.Yii::app()->getConfig("admintheme").'/superfish.css');

$aData['display']['menu_bars']['gid_action'] = 'exportstructureGroup';

Expand Down
6 changes: 3 additions & 3 deletions application/controllers/admin/participantsaction.php
View file
Expand Up @@ -1209,8 +1209,8 @@ function viewAttribute()
'attributevalues' => ParticipantAttributeNames::getAttributesValues($iAttributeId)
);

$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/default/participants.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/default/viewAttribute.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/'.Yii::app()->getConfig("admintheme").'/participants.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/'.Yii::app()->getConfig("admintheme").'/viewAttribute.css');

$this->_renderWrappedTemplate('participants', array('participantsPanel', 'viewAttribute'), $aData);
}
Expand Down Expand Up @@ -1693,7 +1693,7 @@ function attributeMap()
{
Yii::app()->loadHelper('common');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "attributeMap.js");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/default/attributeMap.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/".Yii::app()->getConfig('admintheme')."/attributeMap.css");

$iSurveyId = Yii::app()->request->getPost('survey_id');
$redirect = Yii::app()->request->getPost('redirect');
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/question.php
View file
Expand Up @@ -1151,7 +1151,7 @@ protected function _renderWrappedTemplate($sAction = 'survey/Question', $aViewUr
{
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.dd.js');
$this->getController()->_css_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/dd.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/default/superfish.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/".Yii::app()->getConfig('admintheme')."/superfish.css");

parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/questiongroup.php
View file
Expand Up @@ -409,7 +409,7 @@ public function update($gid)
*/
protected function _renderWrappedTemplate($sAction = 'survey/QuestionGroups', $aViewUrls = array(), $aData = array())
{
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/default/superfish.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/".Yii::app()->getConfig('admintheme')."/superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
}
2 changes: 1 addition & 1 deletion application/controllers/admin/quotas.php
View file
Expand Up @@ -561,7 +561,7 @@ protected function _renderWrappedTemplate($sAction = 'quotas', $aViewUrls = arra
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . '/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . '/quotas.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/default/superfish.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/'.Yii::app()->getConfig("admintheme").'/superfish.css');

parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/surveyadmin.php
View file
Expand Up @@ -1620,7 +1620,7 @@ function insert($iSurveyId=null)
*/
protected function _renderWrappedTemplate($sAction = 'survey', $aViewUrls = array(), $aData = array())
{
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/default/superfish.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/".Yii::app()->getConfig('admintheme')."/superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/surveypermission.php
View file
Expand Up @@ -609,7 +609,7 @@ function surveyright($surveyid)
*/
protected function _renderWrappedTemplate($sAction = 'authentication', $aViewUrls = array(), $aData = array())
{
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/default/superfish.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/".Yii::app()->getConfig('admintheme')."/superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/tokens.php
View file
Expand Up @@ -253,7 +253,7 @@ function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstri
$this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/css/jquery.multiselect.filter.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/css/ui.jqgrid.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/css/jquery.ui.datepicker.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/default/displayParticipants.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/".Yii::app()->getConfig('admintheme')."/displayParticipants.css");

Yii::app()->loadHelper('surveytranslator');
Yii::import('application.libraries.Date_Time_Converter', true);
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/usergroups.php
View file
Expand Up @@ -419,7 +419,7 @@ function user($ugid, $action = 'add')
*/
protected function _renderWrappedTemplate($sAction = 'usergroup', $aViewUrls = array(), $aData = array())
{
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/default/superfish.css");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/".Yii::app()->getConfig('admintheme')."/superfish.css");
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . 'scripts/admin/users.js');

$aData['display']['menu_bars']['user_group'] = true;
Expand Down

0 comments on commit 7727609

Please sign in to comment.