Fixed issue #10317: glyphicons and/or font-awesome.

LimeSurvey · Feb 9, 2016 · cb465f4 · cb465f4
1 parent 18b900c
commit cb465f4
Show file tree

Hide file tree

Showing 11 changed files with 300 additions and 7 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -36,7 +36,15 @@ public function run()
         $param = $this->_getParameters(func_get_args(), $_POST);
         $surveyid = $param['sid'];
 
-        App()->getClientScript()->registerCssFile( Yii::app()->getBaseUrl(true).'/styles-public/font-awesome-43.min.css' );
+        // Font awesome
+        if(!YII_DEBUG)
+        {
+            App()->getClientScript()->registerCssFile( App()->getAssetManager()->publish( dirname(Yii::app()->request->scriptFile).'/styles-public/font-awesome-43.min.css') );
+        }
+        else
+        {
+            App()->getClientScript()->registerCssFile( Yii::app()->getBaseUrl(true).'/styles-public/font-awesome-43-debugmode.min.css' );
+        }
 
         global $oTemplate;
         $oTemplate = Template::model()->getTemplateConfiguration('',$surveyid);

diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg
diff --git a/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf
diff --git a/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff
diff --git a/fonts/glyphicons-halflings-regular.woff2 b/fonts/glyphicons-halflings-regular.woff2
diff --git a/templates/default/css/flat_and_modern.css b/templates/default/css/flat_and_modern.css
diff --git a/templates/default/views/startpage.pstpl b/templates/default/views/startpage.pstpl
@@ -11,7 +11,6 @@
 {TEMPLATEJS}
 <link rel="shortcut icon" href="{TEMPLATEURL}favicon.ico" />
 {GOOGLE_ANALYTICS_JAVASCRIPT}
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 </head>
 <body class="default lang-{SURVEYLANGUAGE} {SURVEYFORMAT}">
 

diff --git a/templates/news_paper/css/news_paper.css b/templates/news_paper/css/news_paper.css
diff --git a/templates/news_paper/views/startpage.pstpl b/templates/news_paper/views/startpage.pstpl
@@ -11,7 +11,6 @@
 {TEMPLATEJS}
 <link rel="shortcut icon" href="{TEMPLATEURL}favicon.ico" />
 {GOOGLE_ANALYTICS_JAVASCRIPT}
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 </head>
 <body class="default lang-{SURVEYLANGUAGE} {SURVEYFORMAT}">
 

diff --git a/templates/ubuntu_orange/css/ubuntu_orange.css b/templates/ubuntu_orange/css/ubuntu_orange.css
diff --git a/templates/ubuntu_orange/views/startpage.pstpl b/templates/ubuntu_orange/views/startpage.pstpl
@@ -11,7 +11,6 @@
 {TEMPLATEJS}
 <link rel="shortcut icon" href="{TEMPLATEURL}favicon.ico" />
 {GOOGLE_ANALYTICS_JAVASCRIPT}
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 </head>
 <body class="default lang-{SURVEYLANGUAGE} {SURVEYFORMAT}">