diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 52dcd1c808..649b95e6ca 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -6015,6 +6015,22 @@ ul#toolnavbox-two li a.btn{ padding-bottom: 10px; padding-top: 10px; margin-bottom: 10px; + overflow: visible; +} +.blog .comments-post .media .media-body{ + overflow: visible; +} +.blog article header{ + padding-top: 0; +} +.blog .form-inline .form-group label{ + padding-right: 10px; +} +.blog .form-inline .form-group .bootstrap-select{ + margin-right: 10px; +} +#smallcalendar .month{ + text-align: center; } /* CSS NEW TOP ******************************************************************************/ /* CSS Responsive */ diff --git a/main/blog/blog.php b/main/blog/blog.php index 7afdb25e53..59150f1ec2 100755 --- a/main/blog/blog.php +++ b/main/blog/blog.php @@ -405,7 +405,6 @@ switch ($action) { $manage = null; if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) { $manage .= Blog::display_form_user_subscribe($blog_id); - echo '

'; $manage .= Blog::display_form_user_unsubscribe($blog_id); } else { api_not_allowed(); diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php index 5bcc1d0ce7..9adca9b6d6 100755 --- a/main/inc/lib/blog.lib.php +++ b/main/inc/lib/blog.lib.php @@ -1297,7 +1297,7 @@ class Blog $html .= '
'; $html .= ''; $html .= '
'; - $html .= ''; + $html .= ''; $html .= '
'; $html .= '
'; $html .= ''; @@ -2258,8 +2258,9 @@ class Blog $currentCourse = $_course['code']; $tbl_users = Database::get_main_table(TABLE_MAIN_USER); $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER); + $html = null; - echo ''.get_lang('SubscribeMembers').''; + $html .= ''.get_lang('SubscribeMembers').''; $properties["width"] = "100%"; @@ -2329,21 +2330,26 @@ class Blog // Display $query_vars['action'] = 'manage_members'; $query_vars['blog_id'] = $blog_id; - echo '
'; - Display::display_sortable_table($column_header, $user_data, null, null, $query_vars); + $html .= ''; + $html.= Display::return_sortable_table($column_header, $user_data, null, null, $query_vars); $link = ''; $link .= isset ($_GET['action']) ? 'action='.Security::remove_XSS($_GET['action']).'&' : ''; $link .= "blog_id=$blog_id&"; - echo ''.get_lang('SelectAll').' - '; - echo ''.get_lang('UnSelectAll').' '; - echo get_lang('WithSelected').' : '; - echo ''; - echo ''; - echo ''; - echo '
'; + $html .= ''.get_lang('SelectAll').' - '; + $html .= ''.get_lang('UnSelectAll').' '; + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= '
'; + $html .= ''; + return $html; } /** @@ -2359,12 +2365,13 @@ class Blog { $_user = api_get_user_info(); $is_western_name_order = api_is_western_name_order(); + $html = null; // Init $tbl_users = Database::get_main_table(TABLE_MAIN_USER); $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER); - echo ''.get_lang('UnsubscribeMembers').''; + $html.= ''.get_lang('UnsubscribeMembers').''; $properties["width"] = "100%"; //table column titles @@ -2440,21 +2447,27 @@ class Blog $query_vars['action'] = 'manage_members'; $query_vars['blog_id'] = $blog_id; - echo '
'; - Display::display_sortable_table($column_header, $user_data, null, null, $query_vars); + $html.= ''; + $html.= Display::return_sortable_table($column_header, $user_data, null, null, $query_vars); $link = ''; $link .= isset ($_GET['action']) ? 'action='.Security::remove_XSS($_GET['action']).'&' : ''; $link .= "blog_id=$blog_id&"; - echo ''.get_lang('SelectAll').' - '; - echo ''.get_lang('UnSelectAll').' '; - echo get_lang('WithSelected').' : '; - echo ''; - echo ''; - echo ''; - echo '
'; + $html.= ''.get_lang('SelectAll').' - '; + $html.= ''.get_lang('UnSelectAll').' '; + $html.= '
'; + $html.= ''; + $html.= ''; + $html.= ''; + $html.= ''; + $html.= '
'; + $html.= ''; + + return $html; } /** @@ -2574,7 +2587,7 @@ class Blog $html .= ' - + '; $html .= ''; diff --git a/main/template/default/blog/layout.tpl b/main/template/default/blog/layout.tpl index 50a7c5b1ce..5a4e20f472 100644 --- a/main/template/default/blog/layout.tpl +++ b/main/template/default/blog/layout.tpl @@ -1,6 +1,6 @@
-
+
{{ content }}
diff --git a/main/template/default/blog/post.tpl b/main/template/default/blog/post.tpl index 33d36ae287..43ba012cb6 100644 --- a/main/template/default/blog/post.tpl +++ b/main/template/default/blog/post.tpl @@ -36,7 +36,7 @@
- +{{ post | var_dump }}
«'.$monthName.' '.$year.''.$monthName.' '.$year.' »