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

LimeSurvey · Jul 21, 2012 · b2ce636 · b2ce636
2 parents 9a77557 + 22d3f57
commit b2ce636
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 7,424 deletions.
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -989,8 +989,8 @@ function do_5pointchoice($ia)
     $answer .= "</ul>\n<input type=\"hidden\" name=\"java$ia[1]\" id=\"java$ia[1]\" value=\"".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]]."\" />\n";
     $inputnames[]=$ia[1];
     if($aQuestionAttributes['slider_rating']==1){
-        header_includes('/admin/scripts/rating/jquery.rating.css','css');
-        header_includes('/admin/scripts/rating/jquery.rating.js','js');
+        header_includes('jquery.rating.css','css');
+        header_includes('jquery.rating.js','js');
         $answer.="
         <script type=\"text/javascript\">
         document.write('";

diff --git a/scripts/admin/rating/delete.gif b/scripts/admin/rating/delete.gif
diff --git a/scripts/admin/rating/documentation.css b/scripts/admin/rating/documentation.css