From 1df3d1a2b0823c954cb061d7d8333be18fd9bb81 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 Apr 2015 01:39:37 -0700 Subject: [PATCH] HTML5 validation fixes. --- e107_handlers/admin_ui.php | 5 +++++ e107_handlers/e_parse_class.php | 2 +- e107_themes/bootstrap3/theme.php | 20 +++++++++++++++----- e107_themes/bootstrap3/theme_shortcodes.php | 2 +- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 53aff5886..9eec9430e 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -5183,6 +5183,11 @@ class e_admin_ui extends e_admin_controller_ui { } + + public function renderHelp() + { + } + /** * Create - send JS to page Header * @return none diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 9a39a0558..7fe1f8e89 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -3156,7 +3156,7 @@ class e_parser return e107::getMedia()->getThumb($id); } - $video = ''; + $video = ''; return '
'.$video.'
'; } diff --git a/e107_themes/bootstrap3/theme.php b/e107_themes/bootstrap3/theme.php index 64c24de6d..eb3cb8e4c 100644 --- a/e107_themes/bootstrap3/theme.php +++ b/e107_themes/bootstrap3/theme.php @@ -65,9 +65,13 @@ function tablestyle($caption, $text, $id='', $info=array()) if($style == 'jumbotron') { echo '
-
-

'.$caption.'

-

'.$text.'

+
'; + if(!empty($caption)) + { + echo '

'.$caption.'

'; + } + echo ' + '.$text.'
'; return; @@ -75,8 +79,14 @@ function tablestyle($caption, $text, $id='', $info=array()) if($style == 'col-md-4' || $style == 'col-md-6' || $style == 'col-md-8') { - echo '
-

'.$caption.'

+ echo '
'; + + if(!empty($caption)) + { + echo '

'.$caption.'

'; + } + + echo ' '.$text.'
'; return; diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php index 7107edae0..666c9f70c 100644 --- a/e107_themes/bootstrap3/theme_shortcodes.php +++ b/e107_themes/bootstrap3/theme_shortcodes.php @@ -87,7 +87,7 @@ class theme_shortcodes extends e_shortcode if(!USERID) // Logged Out. { $text = ' -