Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Yii

LimeSurvey · Aug 8, 2012 · 1618e15 · 1618e15
2 parents 68aced0 + 65c3328
commit 1618e15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/views/admin/participants/attributeMapCSV_view.php b/application/views/admin/participants/attributeMapCSV_view.php
@@ -76,7 +76,7 @@
         <input type="button" name="attmap" id="attmap" value="<?php $clang->eT("Continue"); ?>" />
     </p>
     <div id="processing" title="<?php $clang->eT("Processing...") ?>" style="display:none">
-        <img src="<?php echo Yii::app()->getConfig('imageurl') . '/ajax-loader.gif'; ?>" alt="<?php $clang->eT('Loading...'); ?>" title="<?php $clang->eT('Loading...'); ?>" />
+        <img src="<?php echo Yii::app()->getConfig('adminimageurl') . '/ajax-loader.gif'; ?>" alt="<?php $clang->eT('Loading...'); ?>" title="<?php $clang->eT('Loading...'); ?>" />
     </div>
 </body>
-</html>
+</html>
diff --git a/application/views/admin/usergroup/viewUserGroup_view.php b/application/views/admin/usergroup/viewUserGroup_view.php
@@ -45,7 +45,7 @@
                 if($currentuser["displayactions"])
                 { ?>
                     <form method='post' action='<?php echo $this->createUrl("admin/usergroups/user/ugid/{$usergroupid}/action/remove"); ?>'>
-                    <input type='image' src='<?php echo Yii::app()->getConfig('imageurl')?>/token_delete.png' alt='<?php $clang->eT("Delete this user from group");?>' onclick='return confirm("<?php $clang->eT("Are you sure you want to delete this entry?","js");?>")' />
+                    <input type='image' src='<?php echo Yii::app()->getConfig('adminimageurl')?>/token_delete.png' alt='<?php $clang->eT("Delete this user from group");?>' onclick='return confirm("<?php $clang->eT("Are you sure you want to delete this entry?","js");?>")' />
                     <input name='uid' type='hidden' value='<?php echo $currentuser["userid"]; ?>' />
                     </form>
                     <?php