From 1e66f454d6e54bcd9b4db1a6967e18582a2e6248 Mon Sep 17 00:00:00 2001
From: aragonc <aragcar@gmail.com>
Date: Fri, 17 Mar 2017 17:40:16 -0500
Subject: [PATCH] add layout blog - refs BT#12324

---
 main/blog/blog.php                    | 45 +++++++++++++++++----------
 main/inc/lib/blog.lib.php             |  6 ++--
 main/template/default/blog/layout.tpl |  7 +++++
 3 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 main/template/default/blog/layout.tpl

diff --git a/main/blog/blog.php b/main/blog/blog.php
index 6fa27a043c..2573116442 100755
--- a/main/blog/blog.php
+++ b/main/blog/blog.php
@@ -379,7 +379,7 @@ switch ($action) {
 				if ($_POST) {
 					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
 				}
-			Blog :: display_form_new_post($blog_id);
+			$formAdd = Blog :: display_form_new_post($blog_id);
 		} else {
 				if (isset($_GET['filter']) && !empty($_GET['filter'])) {
 					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
@@ -390,6 +390,8 @@ switch ($action) {
 		} else {
 			api_not_allowed();
 		}
+                $tpl->assign('content', $formAdd);
+                $blogLayout = $tpl->get_template('blog/layout.tpl');
 		break;
 	case 'view_post' :
 		$postArticle = Blog :: display_post($blog_id, intval($_GET['post_id']));
@@ -408,7 +410,7 @@ switch ($action) {
 				if ($_POST) {
 					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
 				}
-                Blog :: display_form_edit_post($blog_id, intval($_GET['post_id']));
+                $formEdit = Blog :: display_form_edit_post($blog_id, intval($_GET['post_id']));
 			} else {
 				if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
 					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
@@ -419,42 +421,51 @@ switch ($action) {
 		} else {
 			api_not_allowed();
 		}
-
+                $tpl->assign('content', $formEdit);
+                $blogLayout = $tpl->get_template('blog/layout.tpl');
 		break;
 	case 'manage_members' :
+                $manage = null;
 		if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
-			Blog :: display_form_user_subscribe($blog_id);
+			$manage .= Blog :: display_form_user_subscribe($blog_id);
 			echo '<br /><br />';
-			Blog :: display_form_user_unsubscribe($blog_id);
+			$manage .= Blog :: display_form_user_unsubscribe($blog_id);
 		} else {
 			api_not_allowed();
-        }
-
+                }
+                $tpl->assign('content', $manage);
+                $blogLayout = $tpl->get_template('blog/layout.tpl');
 		break;
 	case 'manage_rights' :
-		Blog :: display_form_user_rights($blog_id);
+		$manage =Blog :: display_form_user_rights($blog_id);
+                $tpl->assign('content', $manage);
+                $blogLayout = $tpl->get_template('blog/layout.tpl');
 		break;
 	case 'manage_tasks' :
 		if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
-			if (isset($_GET['do']) && $_GET['do'] == 'add') {
-				Blog:: display_new_task_form($blog_id);
+                    $taks = null;
+                    if (isset($_GET['do']) && $_GET['do'] == 'add') {
+				$taks .= Blog:: display_new_task_form($blog_id);
 			}
 			if (isset($_GET['do']) && $_GET['do'] == 'assign') {
-				Blog:: display_assign_task_form($blog_id);
+				$taks .= Blog:: display_assign_task_form($blog_id);
 			}
 			if (isset($_GET['do']) && $_GET['do'] == 'edit') {
-				Blog:: display_edit_task_form(
+				$taks .= Blog:: display_edit_task_form(
 					$blog_id,
 					intval($_GET['task_id'])
 				);
 			}
 			if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
-				Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
+				$taks .= Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
 			}
-			Blog :: display_task_list($blog_id);
-			echo '<br /><br />';
-			Blog :: display_assigned_task_list($blog_id);
-			echo '<br /><br />';
+			$taks .= Blog :: display_task_list($blog_id);
+			
+			$taks .= Blog :: display_assigned_task_list($blog_id);
+			
+                        
+                        $tpl->assign('content', $taks);
+                        $blogLayout = $tpl->get_template('blog/layout.tpl');
         } else {
             api_not_allowed();
         }
diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index fa7815ae66..fd6cccbedd 100755
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -1341,7 +1341,7 @@ class Blog
             $form->addHidden('new_post_submit', 'true');
             $form->addButton('save', get_lang('Save'));
 
-            $form->display();
+            return $form->return_form();
         } else {
             api_not_allowed();
         }
@@ -1394,7 +1394,7 @@ class Blog
         $form->addHidden('post_id', intval($_GET['post_id']));
         $form->addButton('save', get_lang('Save'));
         $form->setDefaults($blog_post);
-        $form->display();
+        return $form->return_form();
     }
 
     /**
@@ -1407,7 +1407,7 @@ class Blog
     {
         global $charset;
         $course_id = api_get_course_int_id();
-
+        $html = null;
         if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
             $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
             $counter = 0;
diff --git a/main/template/default/blog/layout.tpl b/main/template/default/blog/layout.tpl
new file mode 100644
index 0000000000..2d36f84149
--- /dev/null
+++ b/main/template/default/blog/layout.tpl
@@ -0,0 +1,7 @@
+<div class="row">    
+    <div class="col-md-12">
+        <div class="blog" id="post-{{ post.id_post }}">
+            {{ content }}
+        </div>
+    </div>
+</div>
\ No newline at end of file