mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 15:16:30 +02:00
Code Issues Releases Wiki Activity

Added 'bootstrap' as a e107::css() and e107::js() option. (subject to change)

Browse Source
This commit is contained in:
Cameron
2013-06-17 16:44:46 -07:00
parent a0aec4b210
commit 5a4981c9f1
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_handlers/e107_class.php
View File

@@ -1610,6 +1610,11 @@ class e107
if(null !== $zone) $jshandler->requireCoreLib($data, $zone); if(null !== $zone) $jshandler->requireCoreLib($data, $zone);
else $jshandler->requireCoreLib($data); else $jshandler->requireCoreLib($data);
break; break;
case 'bootstrap': //TODO Eventually add own method and render for bootstrap.
if(null !== $zone) $jshandler->requireCoreLib('bootstrap/js/'.$data, $zone);
else $jshandler->requireCoreLib('bootstrap/js/'.$data);
break;
case 'theme': case 'theme':
// data is e.g. 'jslib/mytheme.js' // data is e.g. 'jslib/mytheme.js'
@@ -1677,6 +1682,11 @@ class e107
// data is path relative to e_FILE/jslib/ // data is path relative to e_FILE/jslib/
$jshandler->coreCSS($data, $media, $preComment, $postComment); $jshandler->coreCSS($data, $media, $preComment, $postComment);
break; break;
case 'bootstrap':
// data is path relative to e_FILE/jslib/
$jshandler->coreCSS('bootstrap/css/'.$data, $media, $preComment, $postComment);
break;
case 'theme': case 'theme':
// data is path relative to current theme // data is path relative to current theme

8
e107_themes/bootstrap/theme.php
View File

@@ -8,7 +8,7 @@ define("VIEWPORT", "width=device-width, initial-scale=1.0");
define("BODYTAG", '<body data-spy="scroll" data-target=".bs-docs-sidebar" >'); define("BODYTAG", '<body data-spy="scroll" data-target=".bs-docs-sidebar" >');
e107::lan('theme'); e107::lan('theme');
e107::js('core','bootstrap/js/bootstrap.min.js'); e107::js('bootstrap','bootstrap.min.js');
if(THEME_STYLE != 'style.css') // allow for drop-in bootstrap replacement. See http://bootswatch.com if(THEME_STYLE != 'style.css') // allow for drop-in bootstrap replacement. See http://bootswatch.com
{ {
@@ -16,11 +16,11 @@ if(THEME_STYLE != 'style.css') // allow for drop-in bootstrap replacement. See h
} }
else else
{ {
e107::css('core','bootstrap/css/bootstrap.min.css'); e107::css('bootstrap','bootstrap.min.css');
} }
e107::css('core','bootstrap/css/bootstrap-responsive.min.css'); e107::css('bootstrap','bootstrap-responsive.min.css');
e107::css('core','bootstrap/css/jquery-ui.custom.css'); e107::css('bootstrap','jquery-ui.custom.css');
e107::css('theme', 'js/google-code-prettify/prettify.css'); e107::css('theme', 'js/google-code-prettify/prettify.css');
e107::js('theme', "js/google-code-prettify/prettify.js"); e107::js('theme', "js/google-code-prettify/prettify.js");