mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

Renamed bootstrap flag e_BOOTSTRAP to BOOTSTRAP. Set e_BOOTSTRAP as path of bootstrap folder.

Browse Source
This commit is contained in:
Cameron
2013-06-17 16:03:33 -07:00
parent d10dbc443a
commit a0aec4b210
25 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/db_debug_class.php
View File

@@ -517,7 +517,7 @@ class e107_db_debug {
$inc = array(
'HEADERF','FOOTERF','FILE_UPLOADS','FLOODPROTECT','FLOODTIMEOUT','CHARSET',
'BOOTSTRAP','HEADERF','FOOTERF','FILE_UPLOADS','FLOODPROTECT','FLOODTIMEOUT','CHARSET',
'GUESTS_ONLINE','MEMBERS_ONLINE','PAGE_NAME','STANDARDS_MODE','TIMEOFFSET',
'TOTAL_ONLINE','THEME','THEME_ABS','THEME_LAYOUT','THEME_STYLE','META_OG','META_DESCRIPTION','MPREFIX','VIEWPORT','BODYTAG','CSSORDER'
);

8
e107_handlers/e107_class.php
View File

@@ -1663,9 +1663,9 @@ class e107
*/
public static function css($type, $data, $dep = null, $media = 'all', $preComment = '', $postComment = '', $dependence = null)
{
if((strstr($data,'bootstrap.css') || strstr($data,'bootstrap.min.css')) && !defined("e_BOOTSTRAP")) // detect bootstrap is enabled. - used in nextprev.sc and forum currently.
if((strstr($data,'bootstrap.css') || strstr($data,'bootstrap.min.css')) && !defined("BOOTSTRAP")) // detect bootstrap is enabled. - used in nextprev.sc and forum currently.
{
define("e_BOOTSTRAP", true);
define("BOOTSTRAP", true);
}
$jshandler = e107::getJs();
@@ -3007,6 +3007,10 @@ class e107
define('e_AVATAR_UPLOAD_ABS', $this->get_override_http('AVATARS_UPLOAD'));
define('e_AVATAR_DEFAULT_ABS', $this->get_override_http('AVATARS_DEFAULT'));
// Special
define('e_BOOTSTRAP', e_WEB."bootstrap/");
}
return $this;

2
e107_handlers/emailprint_class.php
View File

@@ -58,7 +58,7 @@ class emailprint
if(deftrue('e_BOOTSTRAP'))
if(deftrue('BOOTSTRAP'))
{
$genericMail = "<i class='icon-envelope'></i>";
$genericPrint = "<i class='icon-print'></i>";

4
e107_handlers/form_handler.php
View File

@@ -825,7 +825,7 @@ class e_form
*/
public function progressBar($name,$value,$options=array())
{
if(!deftrue('e_BOOTSTRAP'))
if(!deftrue('BOOTSTRAP'))
{
return;
}
@@ -1537,7 +1537,7 @@ class e_form
*/
public function button($name, $value, $action = 'submit', $label = '', $options = array())
{
if(deftrue('e_BOOTSTRAP') && $action == 'dropdown' && is_array($value))
if(deftrue('BOOTSTRAP') && $action == 'dropdown' && is_array($value))
{
// $options = $this->format_options('admin_button', $name, $options);
$options['class'] = vartrue($options['class']);

4
e107_handlers/user_extended_class.php
View File

@@ -713,7 +713,7 @@ class e107_user_extended
$label = deftrue($label, $label);
if(deftrue('e_BOOTSTRAP'))
if(deftrue('BOOTSTRAP'))
{
$ret .= $frm->radio($fname,$val,($curval == $val),array('label'=>$label));
}
@@ -749,7 +749,7 @@ class e107_user_extended
}
$label = deftrue($label, $label);
if(deftrue('e_BOOTSTRAP'))
if(deftrue('BOOTSTRAP'))
{
$ret .= $frm->checkbox($fname,$val,($curval == $val),array('label'=>$label));
}