Merge pull request #33 from jun9/myii

Fixed issue: Invalid images and script file paths
LimeSurvey · Aug 15, 2012 · 7e49096 · 7e49096
2 parents 27aff61 + 38a222b
commit 7e49096
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/application/views/admin/participants/attributeMapToken_view.php b/application/views/admin/participants/attributeMapToken_view.php
@@ -2,7 +2,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->getConfig('adminstyleurl') . "attributeMapToken.css" ?>" />
 <script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery.js" ?>" type="text/javascript"></script>
 <script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery-ui.js" ?>" type="text/javascript"></script>
-<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery.ui.sortable.js" ?>" type="text/javascript"></script>
+<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery.ui.nestedSortable.js" ?>" type="text/javascript"></script>
 <script src="<?php echo Yii::app()->getConfig('adminscripts') . "attributeMapToken.js" ?>" type="text/javascript"></script>
 <script type="text/javascript">
     var redUrl = "<?php echo Yii::app()->baseUrl . "/index.php/admin/participants/displayParticipants"; ?>";
@@ -89,7 +89,7 @@
     </p>
     <?php
     $ajaxloader = array(
-        'src' => Yii::app()->baseUrl . '/images/ajax-loader.gif',
+        'src' => Yii::app()->getConfig('adminimageurl') . '/ajax-loader.gif',
         'alt' => 'Ajax Loader',
         'title' => 'Ajax Loader'
     );

diff --git a/application/views/admin/participants/attributeMap_view.php b/application/views/admin/participants/attributeMap_view.php
@@ -107,7 +107,7 @@
    	</p>
     <?php
     $ajaxloader = array(
-        'src' => Yii::app()->baseUrl . '/images/ajax-loader.gif',
+        'src' => Yii::app()->getConfig('adminimageurl') . '/ajax-loader.gif',
         'alt' => 'Ajax loader',
         'title' => 'Ajax loader'
     );
@@ -117,4 +117,4 @@
     </div>
 
 </body>
-</html>
+</html>
diff --git a/application/views/admin/participants/displayParticipants_view.php b/application/views/admin/participants/displayParticipants_view.php
@@ -153,7 +153,7 @@
     var shareUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/shareParticipants"); ?>";
     var surveyUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/addToToken"); ?>";
     var postUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/setSession"); ?>";
-    var ajaxUrl = "<?php echo Yii::app()->getController()->createUrl("images/ajax-loader.gif"); ?>";
+    var ajaxUrl = "<?php echo Yii::app()->getConfig('adminimageurl') . "/ajax-loader.gif" ?>";
     var redUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/displayParticipants"); ?>";
     var colNames = '["participant_id","can_edit","<?php $clang->eT("First name") ?>","<?php $clang->eT("Last name") ?>","<?php $clang->eT("Email") ?>","<?php $clang->eT("Blacklisted") ?>","<?php $clang->eT("Surveys") ?>","<?php $clang->eT("Language") ?>","<?php $clang->eT("Owner name") ?>"<?php echo $columnNames; ?>]';
     var colModels = '[{ "name":"participant_id", "index":"participant_id", "width":100, "align":"center", "sorttype":"int", "sortable": true, "editable":false, "hidden":true},';

diff --git a/application/views/admin/translate/translatetabs_view.php b/application/views/admin/translate/translatetabs_view.php
@@ -6,5 +6,5 @@
 
 <div class='translate'>
 <input type='button' class='auto-trans' value='<?php $clang->eT("Auto Translate");?>' id='auto-trans-tab-<?php echo $type;?>' />
-<img src='<?php echo Yii::app()->getConfig("imageurl");?>/ajax-loader.gif' style='display: none' class='ajax-loader' alt='<?php $clang->eT("Loading...");?>' />
+<img src='<?php echo Yii::app()->getConfig("adminimageurl");?>/ajax-loader.gif' style='display: none' class='ajax-loader' alt='<?php $clang->eT("Loading...");?>' />
 <?php echo $translateTabs; ?>