Fixed issue: Public statistics not using properly the right template.…

…css path for custom templates git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9062 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 16, 2010 · a9fcd36 · a9fcd36
1 parent f7c5769
commit a9fcd36
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/admin/htmleditor-functions.php b/admin/htmleditor-functions.php
@@ -226,7 +226,7 @@ function getPopupEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=nu
 
 function getInlineEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=null,$qID=null,$action=null)
 {
-    global $clang, $imagefiles, $homeurl, $rooturl, $sFCKEditorURL, $fckeditexpandtoolbar;
+    global $clang, $imagefiles, $homeurl, $rooturl, $sFCKEditorURL, $fckeditexpandtoolbar, $uploaddir;
 
     $htmlcode = '';
     $imgopts = '';
@@ -274,7 +274,7 @@ function getInlineEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=n
     . "$oFCKeditorVarName.Config[\"LimeReplacementFieldsQID\"] = \"".$qID."\";\n"
     . "$oFCKeditorVarName.Config[\"LimeReplacementFieldsType\"] = \"".$fieldtype."\";\n"
     . "$oFCKeditorVarName.Config[\"LimeReplacementFieldsAction\"] = \"".$action."\";\n"
-    . "$oFCKeditorVarName.Config[\"SmileyPath\"] = \"".$rooturl."/upload/images/smiley/msn/\";\n"
+    . "$oFCKeditorVarName.Config[\"SmileyPath\"] = \"".$uploaddir."/images/smiley/msn/\";\n"
     . $htmlformatoption
     . $toolbaroption;
 

diff --git a/scripts/jquery/lime-calendar.js b/scripts/jquery/lime-calendar.js
@@ -1,6 +1,4 @@
-// This file will auto convert slider divs to sliders
 $(document).ready(function(){
-	// call the init slider routine for each element of the .multinum-slider class
 	$(".popupdate").each(function(i,e) { 
         var basename = e.id.substr(6);         
         format=$('#dateformat'+basename).val();

diff --git a/statistics_user.php b/statistics_user.php
@@ -78,7 +78,7 @@
         // CHANGE JSW_NZ - let's get the survey title for display
         $thisSurveyTitle = $surveyinfo["name"];
         // CHANGE JSW_NZ - let's get css from individual template.css - so define path
-        $thisSurveyCssPath = $surveyinfo["template"];
+        $thisSurveyCssPath = getTemplateURL($surveyinfo["template"]);
         if ($surveyinfo['publicstatistics']!='Y')
         {
             safe_die('The public statistics for this survey are deactivated.');
@@ -164,7 +164,7 @@
     $header.= ">\n\t<head>\n"
     . "<title>$sitename</title>\n"
     . "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\" />\n"
-    . "<link href=\"templates/".$thisSurveyCssPath."/template.css\" rel=\"stylesheet\" type=\"text/css\" />\n"
+    . "<link href=\"".$thisSurveyCssPath."/template.css\" rel=\"stylesheet\" type=\"text/css\" />\n"
     . "</head>\n<body>\n";
 
     echo $header;