diff --git a/e107_core/templates/contact_template.php b/e107_core/templates/contact_template.php index 654567832..79cff576f 100644 --- a/e107_core/templates/contact_template.php +++ b/e107_core/templates/contact_template.php @@ -58,20 +58,20 @@ $CONTACT_TEMPLATE['info'] = " $CONTACT_TEMPLATE['menu'] = '
-
+
{CONTACT_NAME}
-
+
{CONTACT_EMAIL}
-
+
{CONTACT_BODY=rows=5&cols=30}
-
+
{CONTACT_GDPR_LINK}
diff --git a/e107_plugins/download/download.php b/e107_plugins/download/download.php index 18dfe8734..258d59514 100644 --- a/e107_plugins/download/download.php +++ b/e107_plugins/download/download.php @@ -56,12 +56,12 @@ if(!defined("USER_WIDTH") && !deftrue('BOOTSTRAP')) } /* define images */ -if(deftrue('BOOTSTRAP') && BOOTSTRAP === 3) +if(deftrue('BOOTSTRAP') === 3) { define("IMAGE_DOWNLOAD", (file_exists(THEME . "images/download.png") ? THEME . "images/download.png" : 'icon-download.glyph')); define("IMAGE_NEW", (file_exists(THEME . "images/new.png") ? THEME . "images/new.png" : 'icon-star.glyph')); } -elseif(deftrue('BOOTSTRAP') && BOOTSTRAP === 4) +elseif(deftrue('BOOTSTRAP') > 3) { define("IMAGE_DOWNLOAD", (file_exists(THEME . "images/download.png") ? THEME . "images/download.png" : 'fa-download.glyph')); define("IMAGE_NEW", (file_exists(THEME . "images/new.png") ? THEME . "images/new.png" : 'fa-star.glyph')); diff --git a/e107_plugins/download/templates/download_template.php b/e107_plugins/download/templates/download_template.php index 170423a71..b150cc7fe 100644 --- a/e107_plugins/download/templates/download_template.php +++ b/e107_plugins/download/templates/download_template.php @@ -418,7 +418,7 @@ $DOWNLOAD_TEMPLATE['categories']['end'] = "
{DOWNLOAD_CAT_NEWDOWNLOAD_TEXT}
-
{DOWNLOAD_CAT_SEARCH}
+
{DOWNLOAD_CAT_SEARCH}
"; // ##### ------------------------------------------------------------------------------------------ diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php index 6f14320a8..5489859d8 100644 --- a/e107_plugins/forum/forum_viewforum.php +++ b/e107_plugins/forum/forum_viewforum.php @@ -155,6 +155,7 @@ function init() if(THEME_LEGACY !== true) { $FORUM_VIEWFORUM_TEMPLATE = e107::getTemplate('forum', 'forum_viewforum'); + $GLOBALS['FORUM_VIEWFORUM_TEMPLATE'] = $FORUM_VIEWFORUM_TEMPLATE; } else { diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php index bfaef45a6..0bf6d978d 100644 --- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php @@ -85,7 +85,7 @@ global $forum; $jumpList = $forum->forumGetAllowed('view'); - $text = '
'; + $text = '
'; /* $text .= ($this->var['ntUrl'] ? ''.LAN_FORUM_1018.'' :''). @@ -207,39 +207,7 @@ function sc_iconkey() { - global $FORUM_VIEWFORUM_TEMPLATE; - - /*-- - if(defset('BOOTSTRAP')==3 && !empty($FORUM_VIEWFORUM_TEMPLATE['iconkey'])) // v2.x - { - return e107::getParser()->parseTemplate($FORUM_VIEWFORUM_TEMPLATE['iconkey'],true); - } - // v1.x - - return " - - - - - - - - - - - - - - - - - - - - - -
".IMAGE_new_small."".LAN_FORUM_0039."".IMAGE_nonew_small."".LAN_FORUM_0040."".IMAGE_sticky_small."".LAN_FORUM_1011."".IMAGE_announce_small."".LAN_FORUM_1013."
".IMAGE_new_popular_small."".LAN_FORUM_0039." ".LAN_FORUM_1010."".IMAGE_nonew_popular_small."".LAN_FORUM_0040." ".LAN_FORUM_1010."".IMAGE_stickyclosed_small."".LAN_FORUM_1012."".IMAGE_closed_small."".LAN_FORUM_1014."
"; - --*/ + $FORUM_VIEWFORUM_TEMPLATE = varset($GLOBALS['FORUM_VIEWFORUM_TEMPLATE']); return (defset('BOOTSTRAP') && !empty($FORUM_VIEWFORUM_TEMPLATE['iconkey'])) ? e107::getParser()->parseTemplate($FORUM_VIEWFORUM_TEMPLATE['iconkey'], true) : " @@ -827,14 +795,14 @@ function sc_threaddate() { -// global $gen; + return $this->gen->convert_date($this->var['thread_datestamp'], 'forum'); } function sc_threadtimelapse() { -// global $gen; + return $this->gen->computeLapse($this->var['thread_datestamp'], time(), false, false, 'short'); // convert_date($thread_info['thread_datestamp'], 'forum'); } diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php index 61b79d113..917037e19 100644 --- a/e107_plugins/forum/templates/forum_template.php +++ b/e107_plugins/forum/templates/forum_template.php @@ -103,7 +103,7 @@ $FORUM_TRACK_END = "
TRACK-END"; $FORUM_TEMPLATE['main']['start'] = "{FORUM_BREADCRUMB}
-
+
{SEARCH}
diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php index 4d6ff3bc3..72c66fdf3 100644 --- a/e107_plugins/forum/templates/forum_viewforum_template.php +++ b/e107_plugins/forum/templates/forum_viewforum_template.php @@ -288,8 +288,8 @@ $FORUM_VIEWFORUM_TEMPLATE['caption'] = ""; $FORUM_VIEWFORUM_TEMPLATE['start'] = "
"; $FORUM_VIEWFORUM_TEMPLATE['header'] = "
{BREADCRUMB}
-

{FORUMIMAGE:h=60}{FORUMTITLE}

-
{NEWTHREADBUTTONX}
+

{FORUMIMAGE:h=60}{FORUMTITLE}

+
{NEWTHREADBUTTONX}
@@ -348,18 +348,17 @@ $FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = "
".LAN_FORUM_ $SC_WRAPPER['VIEWABLE_BY'] = "
".LAN_FORUM_8012."
{---}
"; $FORUM_VIEWFORUM_TEMPLATE['footer'] = "
-
+
-
{THREADPAGES}
{NEWTHREADBUTTONX}
+
{THREADPAGES}
{NEWTHREADBUTTONX}
-
+
".LAN_FORUM_8011."
{ICONKEY} -
diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php index 6e1cbe855..2f8c2675a 100644 --- a/e107_plugins/forum/templates/forum_viewtopic_template.php +++ b/e107_plugins/forum/templates/forum_viewtopic_template.php @@ -327,7 +327,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['start'] = "
-

{THREADNAME}

{TRACK} {BUTTONSX}
+

{THREADNAME}

{TRACK} {BUTTONSX}
{MESSAGE}