From 835e4771474dfa3de20eb7204f2c490ec893da6d Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 26 Jan 2021 15:08:58 -0800 Subject: [PATCH] Bootstrap 5 styling. (data-bs-toggle) Signup shortcodes now automatically load the required template. --- e107_admin/cpage.php | 2 +- e107_admin/emoticon.php | 4 +-- e107_admin/eurl.php | 2 +- e107_admin/frontpage.php | 4 +-- e107_admin/image.php | 10 ++++---- e107_admin/includes/tabbed.php | 4 +-- e107_admin/menus.php | 2 +- e107_admin/newspost.php | 8 +++--- e107_admin/plugin.php | 12 ++++----- e107_admin/prefs.php | 8 +++--- e107_admin/theme.php | 2 +- e107_admin/users.php | 4 +-- .../shortcodes/batch/admin_shortcodes.php | 14 +++++------ .../shortcodes/batch/bbcode_shortcodes.php | 6 ++--- .../shortcodes/batch/signup_shortcodes.php | 11 ++++++-- e107_core/templates/admin_template.php | 18 ++++++------- .../bootstrap4/navigation_template.php | 10 ++++---- e107_core/templates/navigation_template.php | 4 +-- e107_handlers/e_marketplace.php | 4 +-- e107_handlers/form_handler.php | 18 ++++++------- e107_handlers/media_class.php | 4 +-- e107_handlers/sitelinks_class.php | 2 +- e107_handlers/theme_handler.php | 14 +++++------ e107_handlers/user_handler.php | 8 +++--- e107_plugins/download/includes/admin.php | 16 ++++++------ .../featurebox_category_template.php | 2 +- e107_plugins/forum/forum_post.php | 2 +- e107_plugins/forum/forum_viewforum.php | 2 +- .../shortcodes/batch/post_shortcodes.php | 6 ++--- .../shortcodes/batch/view_shortcodes.php | 14 +++++------ .../shortcodes/batch/viewforum_shortcodes.php | 25 ++++++++----------- .../forum/templates/forum_poll_template.php | 2 +- .../templates/forum_viewforum_template.php | 6 ++--- .../templates/forum_viewtopic_template.php | 8 +++--- e107_plugins/pm/e_shortcode.php | 2 +- e107_plugins/tinymce4/plugins/e107/dialog.php | 6 ++--- e107_tests/tests/unit/e_formTest.php | 2 +- e107_themes/bootstrap3/admin_template.php | 4 +-- search.php | 2 +- 39 files changed, 139 insertions(+), 135 deletions(-) diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 56c439906..bf4e24e2e 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -143,7 +143,7 @@ class page_admin_form_ui extends e_admin_form_ui $query['id'] = $id; $query = http_build_query($query,null, '&'); - $text = " + $text = " ".ADMIN_EDIT_ICON.""; if($this->getController()->getMode() === 'overview') diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index 07e9f8b4a..38877299b 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -128,8 +128,8 @@ class emotec $text = "
diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index 736bc1496..9b5ee4de7 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -756,7 +756,7 @@ class eurl_admin_form_ui extends e_admin_form_ui $id = 'eurl_'.$this->name2id($title); - $text = ""; + $text = ""; $text .= $title; $text .= ''; diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php index 96f1884aa..211ec8149 100644 --- a/e107_admin/frontpage.php +++ b/e107_admin/frontpage.php @@ -495,8 +495,8 @@ class frontpage "; $text .= ' '; diff --git a/e107_admin/image.php b/e107_admin/image.php index 6e25532ca..3ed4afed7 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -1473,7 +1473,7 @@ class media_admin_ui extends e_admin_ui if($bbcodeQuery !== 'video' && $bbcodeQuery !== 'glyph') { - $text .= "
  • ".ADLAN_105."
    • \n"; + $text .= "
  • ".ADLAN_105."
    • \n"; } else { @@ -1493,23 +1493,23 @@ class media_admin_ui extends e_admin_ui if(varset($options['bbcode']) === 'img') { - $text .= "
  • ".IMALAN_152."
    • \n"; + $text .= "
  • ".IMALAN_152."
    • \n"; } if($this->getQuery('video') == 1 || $this->getQuery('bbcode') === 'video') { - $text .= "
  • "."Youtube
    • \n"; + $text .= "
  • "."Youtube
    • \n"; } if($this->getQuery('glyph') == 1 || $this->getQuery('bbcode') === 'glyph') { - $text .= "
  • "."Glyphs
    • \n"; + $text .= "
  • "."Glyphs
    • \n"; } if(getperms('A|A1') && ($this->getQuery('bbcode') !== 'video' && $this->getQuery('bbcode') !== 'glyph')) { - $text .= "
  • ".IMALAN_150. '
    • '; + $text .= "
  • ".IMALAN_150. '
    • '; } diff --git a/e107_admin/includes/tabbed.php b/e107_admin/includes/tabbed.php index ff9b22941..46b062b00 100644 --- a/e107_admin/includes/tabbed.php +++ b/e107_admin/includes/tabbed.php @@ -47,7 +47,7 @@ class tabbed foreach ($admin_cat['id'] as $cat_key => $cat_id) { $cls = ($cat_key == 1) ? "class='active'" : ""; - $text .= "
  • ".$admin_cat['title'][$cat_key]."
    • "; + $text .= "
  • ".$admin_cat['title'][$cat_key]."
    • "; } $text .= ""; @@ -109,7 +109,7 @@ class tabbed foreach ($admin_cat['id'] as $cat_key => $cat_id) { // $text .= "
  • ".$admin_cat['title'][$cat_key]."
    • "; - $text .= "
  • ".$admin_cat['title'][$cat_key]."
    • "; + $text .= "
  • ".$admin_cat['title'][$cat_key]."
    • "; } $text .= ""; diff --git a/e107_admin/menus.php b/e107_admin/menus.php index f3f6043e4..d7d62c8bc 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -1590,7 +1590,7 @@ class e_layout foreach($layouts as $title) { - $text .= '
  • '.$title.'
    • '; + $text .= '
  • '.$title.'
    • '; $active = ''; } diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 2087e0a02..8c714ad4e 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -315,7 +315,7 @@ class news_sub_form_ui extends e_admin_form_ui // $text .= ""; - $text = ""; + $text = ""; $text .= $tp->toHTML($submitnews_title,FALSE,'emotes_off, no_make_clickable'); $text .= ''; @@ -387,7 +387,7 @@ class news_sub_form_ui extends e_admin_form_ui // $text .= ""; - $text = "".ADMIN_VIEW_ICON.""; + $text = "".ADMIN_VIEW_ICON.""; @@ -1496,8 +1496,8 @@ class news_form_ui extends e_admin_form_ui $text = '
    '; diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 5e5516376..c3efb3484 100755 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -1363,7 +1363,7 @@ class plugin_online_ui extends e_admin_ui // Temporary Pop-up version. // $dicon = ''; - // $dicon = " "; + // $dicon = " "; return "
    {$dicon} @@ -1855,7 +1855,7 @@ class plugin_form_online_ui extends e_admin_form_ui $dicon = ''.$button.''; - // $dicon = " "; + // $dicon = " "; return $dicon; @@ -2694,7 +2694,7 @@ class pluginBuilder $text = $frm->open('newplugin-step3','post', e_SELF.'?mode=create&action=build&newplugin='.$newplug.'&createFiles='.$this->createFiles.'&step=3'); $text .= ""; diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 7b7cf6f82..f42a9c575 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -2137,7 +2137,7 @@ function prefs_adminmenu() function libraryGetName($machineName, $details) { $text = e107::getParser()->lanVars(LAN_LIBRARY_MANAGER_27, array($machineName)); - return '' . $details['name'] . ''; + return '' . $details['name'] . ''; } /** @@ -2216,7 +2216,7 @@ function libraryGetProvider($details) $provider = LAN_THEME; } - return '' . $provider . ''; + return '' . $provider . ''; } /** @@ -2230,12 +2230,12 @@ function libraryGetStatus($details) { $icon = $tp->toGlyph('fa-check'); $text = LAN_OK; - return '' . $icon . ''; + return '' . $icon . ''; } $icon = $tp->toGlyph('fa-remove'); $text = $details['error']; - return '' . $icon . ''; + return '' . $icon . ''; } /** diff --git a/e107_admin/theme.php b/e107_admin/theme.php index 01b5b29b1..8537dfc3e 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -1022,7 +1022,7 @@ class theme_admin_form_ui extends e_admin_form_ui $infoUrl = e_SELF.'?mode=main&iframe=1&action=info&src='.$base64; // $viewUrl = $theme['url']; $main_icon = "".$tp->toGlyph('fa-download',array('size'=>'2x')).""; - $info_icon = "".$tp->toGlyph('fa-info-circle',array('size'=>'2x')).""; + $info_icon = "".$tp->toGlyph('fa-info-circle',array('size'=>'2x')).""; if(!empty($theme['preview'][0])) { diff --git a/e107_admin/users.php b/e107_admin/users.php index 9d6bc2c7d..d106cbaf1 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -2766,7 +2766,7 @@ class users_admin_form_ui extends e_admin_form_ui $btn = '
    - @@ -2957,7 +2957,7 @@ class users_admin_form_ui extends e_admin_form_ui $query['id'] = $id; $query = http_build_query($query, null, '&'); - $text = " + $text = " ".ADMIN_EDIT_ICON.""; $special = $this->getController()->getListModel()->get('gen_datestamp'); diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 8a6d510ee..5bd1b3c2f 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -46,7 +46,7 @@ class admin_shortcodes extends e_shortcode return '
    • - + '.E_16_E107.'