Skip to content

Commit

Permalink
Merge pull request #28 from jun9/myii
Browse files Browse the repository at this point in the history 
Fixed issue: Invalid javascripts paths
  • Loading branch information
@c-schmitz
c-schmitz committed Aug 8, 2012
2 parents 7a7a50c + de642de commit ba954d7
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 43 deletions.
2 changes: 1 addition & 1 deletion application/controllers/AdminController.php
View file
Expand Up @@ -302,7 +302,7 @@ public function _getAdminHeader($meta = false, $return = false)
$data['baseurl'] = Yii::app()->baseUrl . '/';
$data['datepickerlang']="";
if (Yii::app()->session["adminlang"] != 'en')
$data['datepickerlang'] = "<script type=\"text/javascript\" src=\"".$data['baseurl']."scripts/jquery/locale/jquery.ui.datepicker-".Yii::app()->session["adminlang"].".js\"></script>\n";
$data['datepickerlang'] = "<script type=\"text/javascript\" src=\"".Yii::app()->getConfig('generalscripts')."jquery/locale/jquery.ui.datepicker-".Yii::app()->session["adminlang"].".js\"></script>\n";

$data['sitename'] = Yii::app()->getConfig("sitename");
$data['admintheme'] = Yii::app()->getConfig("admintheme");
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/globalsettings.php
View file
Expand Up @@ -242,8 +242,8 @@ private function _checkSettings()
*/
protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = array())
{
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . "/scripts/jquery/jquery.selectboxes.min.js");
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . "/scripts/admin/globalsettings.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jquery.selectboxes.min.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "globalsettings.js");

parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
Expand Down
6 changes: 3 additions & 3 deletions application/controllers/admin/labels.php
View file
Expand Up @@ -235,8 +235,8 @@ public function view($lid = 0)
$aData = array();

// Includes some javascript files
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/labels.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/updateset.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'labels.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'updateset.js');

// Checks if user have the sufficient rights to manage the labels
if (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 || Yii::app()->session['USER_RIGHT_MANAGE_LABEL'] == 1)
Expand Down Expand Up @@ -361,7 +361,7 @@ public function process()
*/
public function exportmulti()
{
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/labels.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'labels.js');
$this->_renderWrappedTemplate('labels', 'exportmulti_view');
}

Expand Down
14 changes: 7 additions & 7 deletions application/controllers/admin/question.php
View file
Expand Up @@ -256,11 +256,11 @@ public function answeroptions($surveyid, $gid, $qid)
$surveyid = sanitize_int($surveyid);
$qid = sanitize_int($qid);
$gid = sanitize_int($gid);
$this->getController()->_js_admin_includes(Yii::app()->baseUrl .'/scripts/jquery/jquery.dd.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl .'/scripts/admin/answers.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl .'/scripts/jquery/jquery.blockUI.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl .'/scripts/jquery/jquery.selectboxes.min.js');
$this->getController()->_css_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/dd.css');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'answers.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.blockUI.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.selectboxes.min.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/dd.css');

$aData['display']['menu_bars']['surveysummary'] = 'viewgroup';
$aData['display']['menu_bars']['gid_action'] = 'addquestion';
Expand Down Expand Up @@ -1249,8 +1249,8 @@ function checkconditions(value, name, type, evt_type)
*/
protected function _renderWrappedTemplate($sAction = 'survey/Question', $aViewUrls = array(), $aData = array())
{
$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()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.dd.js');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/dd.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/saved.php
View file
Expand Up @@ -35,8 +35,8 @@ public function view($iSurveyId)
die();
}

$this->getController()->_js_admin_includes(Yii::app()->baseUrl . 'scripts/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . 'scripts/admin/saved.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'saved.js');

$aThisSurvey = getSurveyInfo($iSurveyId);
$aData['sSurveyName'] = $aThisSurvey['name'];
Expand Down
9 changes: 5 additions & 4 deletions application/controllers/admin/surveyadmin.php
View file
Expand Up @@ -51,7 +51,7 @@ public function index()
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/i18n/grid.locale-en.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/jquery.jqGrid.min.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jquery.coookie.js");
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . "/scripts/admin/listsurvey.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "listsurvey.js");
$this->getController()->_css_admin_includes(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.filter.css');
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl') . "displayParticipants.css");
Expand Down Expand Up @@ -757,7 +757,7 @@ public function editlocalsettings($iSurveyID)
$aData['surveyid'] = $iSurveyID = sanitize_int($iSurveyID);
$aViewUrls = array();

$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts').'admin/surveysettings.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts').'surveysettings.js');

if (hasSurveyPermission($iSurveyID, 'surveylocale', 'read'))
{
Expand Down Expand Up @@ -1028,7 +1028,7 @@ private function _showReorderForm($iSurveyID)
$aData['surveyid'] = $iSurveyID;

$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.ui.nestedSortable.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'admin/organize.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'organize.js');

$this->_renderWrappedTemplate('survey', 'organizeGroupsAndQuestions_view', $aData);
}
Expand Down Expand Up @@ -1428,10 +1428,11 @@ private function _registerScriptFiles($files = array())
if (empty($files))
{
$generalscripts_path = Yii::app()->getConfig('generalscripts');
$adminscripts_path = Yii::app()->getConfig('adminscripts');
$styleurl = Yii::app()->getConfig('styleurl');

$js_files = array(
$generalscripts_path . 'admin/surveysettings.js',
$adminscripts_path . 'surveysettings.js',
$generalscripts_path . 'jquery/jqGrid/js/i18n/grid.locale-en.js',
$generalscripts_path . 'jquery/jqGrid/js/jquery.jqGrid.min.js',
$generalscripts_path . 'jquery/jquery.json.min.js',
Expand Down
8 changes: 4 additions & 4 deletions application/controllers/admin/surveypermission.php
View file
Expand Up @@ -38,8 +38,8 @@ function index($surveyid)
{
$aBaseSurveyPermissions=Survey_permissions::model()->getBasePermissions();

$this->getController()->_js_admin_includes(Yii::app()->baseUrl.'/scripts/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl.'/scripts/admin/surveysecurity.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'surveysecurity.js');

$result2 = Survey_permissions::model()->getUserDetails($surveyid);

Expand Down Expand Up @@ -374,8 +374,8 @@ function set($surveyid)
{
//$js_admin_includes[]='../scripts/jquery/jquery.tablesorter.min.js';
//$js_admin_includes[]='scripts/surveysecurity.js';
$this->getController()->_js_admin_includes(Yii::app()->baseUrl.'/scripts/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl.'/scripts/admin/surveysecurity.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') .'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'surveysecurity.js');
if ($action == "setsurveysecurity")
{
$query = "select users_name from {{users}} where uid=:uid";
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/templates.php
View file
Expand Up @@ -71,7 +71,7 @@ public function upload()
{
$clang = $this->getController()->lang;

// $this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/templates.js');
// $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'templates.js');

$aViewUrls = $this->_initialise('default', 'welcome', 'startpage.pstpl', FALSE);
$lid = returnGlobal('lid');
Expand Down
6 changes: 3 additions & 3 deletions application/controllers/admin/tokens.php
View file
Expand Up @@ -263,8 +263,8 @@ function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstri
self::_newtokentable($iSurveyId);
}
// Javascript
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "admin/tokens.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "admin/tokentocpdb.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "tokens.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . "tokentocpdb.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jquery.multiselect.min.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/i18n/grid.locale-en.js");
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . "jquery/jqGrid/js/jquery.jqGrid.min.js");
Expand Down Expand Up @@ -1798,7 +1798,7 @@ function import($iSurveyId)
die('access denied');
}

$this->getController()->_js_admin_includes('scripts/tokens.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'tokens.js');

$aEncodings = array(
"armscii8" => $clang->gT("ARMSCII-8 Armenian")
Expand Down
12 changes: 6 additions & 6 deletions application/controllers/admin/useraction.php
View file
Expand Up @@ -37,8 +37,8 @@ function __construct($controller, $id)
*/
public function index()
{
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/users.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts').'users.js');

$userlist = getUserList();
$usrhimself = $userlist[0];
Expand Down Expand Up @@ -393,8 +393,8 @@ function moduser()

function setUserRights()
{
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/users.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'users.js');
$postuser = Yii::app()->request->getPost('user');
$postemail = Yii::app()->request->getPost('email');
$postuserid = Yii::app()->request->getPost('uid');
Expand Down Expand Up @@ -510,8 +510,8 @@ function userrights()

function setusertemplates()
{
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/users.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'users.js');
$aData['postuser'] = Yii::app()->request->getPost("user");
$aData['postemail'] = Yii::app()->request->getPost("email");
$postuserid = Yii::app()->request->getPost("uid");
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/usergroups.php
View file
Expand Up @@ -420,7 +420,7 @@ function user($ugid, $action = 'add')
protected function _renderWrappedTemplate($sAction = 'usergroup', $aViewUrls = array(), $aData = array())
{
$this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . 'scripts/admin/users.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts').'users.js');

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

Expand Down
4 changes: 2 additions & 2 deletions application/helpers/common_helper.php
View file
Expand Up @@ -7325,8 +7325,8 @@ function getPrintableHeader()
global $rooturl,$homeurl;
$headelements = '
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<script type="text/javascript" src="'.$rooturl.'/scripts/jquery/jquery.js"></script>
<script type="text/javascript" src="'.$homeurl.'/scripts/printablesurvey.js"></script>
<script type="text/javascript" src="'.Yii::app()->getConfig('generalscripts').'jquery/jquery.js"></script>
<script type="text/javascript" src="'.Yii::app()->getConfig('adminscripts').'printablesurvey.js"></script>
';
return $headelements;
}
Expand Down
14 changes: 7 additions & 7 deletions application/views/admin/templates/templatesummary_view.php
View file
@@ -1,15 +1,15 @@
<?php if (is_template_editable($templatename)==true)
{ ?>
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/lib/codemirror.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/lib/codemirror.js" ></script>
<?php if ($sEditorFileType=='htmlmixed')
{?>
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/mode/xml/xml.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/mode/javascript/javascript.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/mode/css/css.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/mode/xml/xml.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/mode/javascript/javascript.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/mode/css/css.js" ></script>
<?php }
?>
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/lib/CodeMirror-2.0/mode/<?php echo $sEditorFileType; ?>/<?php echo $sEditorFileType; ?>.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/js/codemirror-ui.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/lib/CodeMirror-2.0/mode/<?php echo $sEditorFileType; ?>/<?php echo $sEditorFileType; ?>.js" ></script>
<script type="text/javascript" src="<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/js/codemirror-ui.js" ></script>
<script type="text/javascript">
var editorfiletype='<?php echo $sEditorFileType; ?>';
</script>
Expand Down Expand Up @@ -44,7 +44,7 @@
} ?>
</textarea>
<script type="text/javascript">
var codemirropath = '<?php echo Yii::app()->baseUrl; ?>/scripts/admin/codemirror_ui/js/';
var codemirropath = '<?php echo Yii::app()->getConfig('adminscripts'); ?>codemirror_ui/js/';
</script>
<p>
<?php if (is_writable($templates[$templatename])) { ?>
Expand Down

0 comments on commit ba954d7

Please sign in to comment.