Преглед изворни кода

#158 - Don't include internal CSS files using absolute URLs.

AntonLV пре 11 година
родитељ
комит
3e68c37dbd

+ 2 - 1
inc/classes/BxDolTemplate.php

@@ -331,7 +331,7 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
             'media-tablet.css',
             'media-phone.css',
             'media-print.css',
-            'plugins_public/marka/|marka.min.css',
+            BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'marka/|marka.min.css',
         ));
 
         //--- Load default JS ---//
@@ -1645,6 +1645,7 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
             //--- Process Custom CSS/JS file ---//
             else if(strpos($sFile, "|") !== false) {
                 $sFile = implode('', explode("|", $sFile));
+                $sFile = bx_ltrim_str($sFile, BX_DIRECTORY_PATH_ROOT);
 
                 $sUrl = BX_DOL_URL_ROOT . $sFile;
                 $sPath = realpath(BX_DIRECTORY_PATH_ROOT . $sFile);

+ 1 - 1
inc/utils.inc.php

@@ -428,7 +428,7 @@ function genFlag($sLang = '', $oTemplate = null)
 {
     if (!$oTemplate)
         $oTemplate = BxDolTemplate::getInstance();
-    $oTemplate->addCss('plugins_public/flag-icon-css/css/|flag-icon.min.css');
+    $oTemplate->addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flag-icon-css/css/|flag-icon.min.css');
     $sFlag = BxDolLanguages::getInstance()->getLangFlag($sLang);
     return '<span title="' . $sFlag . '" class="flag-icon flag-icon-' . $sFlag . '"></span>';
 }

+ 2 - 2
modules/boonex/albums/classes/BxAlbumsPageMedia.php

@@ -97,8 +97,8 @@ class BxAlbumsPageMedia extends BxTemplPage
         parent::_addJsCss();
 
         $this->_oModule->_oTemplate->addCss(array(
-            'plugins_public/photo-swipe/|photoswipe.css',
-            'plugins_public/photo-swipe/default-skin/|default-skin.css',
+            BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'photo-swipe/|photoswipe.css',
+            BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'photo-swipe/default-skin/|default-skin.css',
         ));
 
         $this->_oModule->_oTemplate->addJs(array(

+ 0 - 7
modules/boonex/ocean/data/template/system/css/splash.css

@@ -1,7 +0,0 @@
-@import url(../../../../../../../template/css/splash.css);
-
-/*--- General ---*/
-.bx-main #bx-content-wrapper {
-	padding-bottom: 100px;
-	padding-bottom: 6.25rem;
-}

+ 1 - 1
modules/boonex/profiler/classes/BxProfiler.php

@@ -60,7 +60,7 @@ class BxProfiler extends BxDol
 
         $aCss = array (
 			'profiler.css',
-            'plugins_public/jush/|jush.css',
+            BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'jush/|jush.css',
         );
         $aJs = array (
             'jquery.tablesorter.min.js',

+ 1 - 1
studio/template/scripts/BxBaseStudioDesigner.php

@@ -376,7 +376,7 @@ class BxBaseStudioDesigner extends BxDolStudioDesigner
             'codemirror/mode/css/css.js',
             'codemirror/mode/htmlmixed/htmlmixed.js',
         ));
-        $oTemplate->addCss('plugins_public/codemirror/lib/|codemirror.css');
+        $oTemplate->addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'codemirror/lib/|codemirror.css');
 
 		return $oTemplate->parseHtmlByName('designer.html', array(
 			'js_object' => $this->getPageJsObject(),

+ 1 - 1
studio/template/scripts/BxBaseStudioFormView.php

@@ -24,7 +24,7 @@ class BxBaseStudioFormView extends BxDolStudioForm
         ));
 
         $this->oTemplate->addCss(array(
-        	'plugins_public/flag-icon-css/css/|flag-icon.min.css'
+        	BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flag-icon-css/css/|flag-icon.min.css'
         ));
     }