From 5c1f26521ed42546d23f3968226fcb30e9f0a7db Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 11 Jun 2011 13:12:14 +0000
Subject: Refs #3407 adds a footer for forms

git-svn-id: http://code.elgg.org/elgg/trunk@9167 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/views/default/forms/blog/save.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'mod/blog/views/default/forms')

diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index b2d20579f..cf5a4032e 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -135,13 +135,15 @@ $body_input
 
 $categories_input
 
-<div class="elgg-subtext pvm mbn elgg-divide-top">
+<div class="elgg-form-footer-alt">
+	<div class="elgg-subtext mbm">
 	$save_status <span class="blog-save-status-time">$saved</span>
-</div>
+	</div>
 
-$guid_input
-$container_guid_input
+	$guid_input
+	$container_guid_input
 
-$action_buttons
+	$action_buttons
+</div>
 
 ___HTML;
-- 
cgit v1.2.3


From ece8d3caf00bf117d4a47393275b9e321f2536be Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 18 Jun 2011 15:07:34 -0400
Subject: moving the delete button in blog form to right side

---
 mod/blog/views/default/forms/blog/save.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/blog/views/default/forms')

diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index cf5a4032e..5b3a758ba 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -19,7 +19,7 @@ if ($vars['guid']) {
 	$delete_link = elgg_view('output/confirmlink', array(
 		'href' => $delete_url,
 		'text' => elgg_echo('delete'),
-		'class' => 'elgg-button elgg-button-delete elgg-state-disabled'
+		'class' => 'elgg-button elgg-button-delete elgg-state-disabled float-alt'
 	));
 }
 
-- 
cgit v1.2.3


From 2b68a4d217c35a5587c462620789493cf2804ba2 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 18 Jun 2011 16:24:52 -0400
Subject: Fixes #3580 adding blog preview button that uses save action

---
 mod/blog/actions/blog/save.php             | 10 +++++++++-
 mod/blog/views/default/forms/blog/save.php | 19 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'mod/blog/views/default/forms')

diff --git a/mod/blog/actions/blog/save.php b/mod/blog/actions/blog/save.php
index 0720d6163..8be67ec6c 100644
--- a/mod/blog/actions/blog/save.php
+++ b/mod/blog/actions/blog/save.php
@@ -8,6 +8,9 @@
 // start a new sticky form session in case of failure
 elgg_make_sticky_form('blog');
 
+// save or preview
+$save = (bool)get_input('save');
+
 // store errors to pass along
 $error = FALSE;
 $error_forward_url = REFERER;
@@ -106,6 +109,11 @@ foreach ($values as $name => $default) {
 	}
 }
 
+// if preview, force status to be draft
+if ($save == false) {
+	$values['status'] = 'draft';
+}
+
 // assign values to the entity, stopping on error.
 if (!$error) {
 	foreach ($values as $name => $value) {
@@ -154,7 +162,7 @@ if (!$error) {
 			));
 		}
 
-		if ($blog->status == 'published') {
+		if ($blog->status == 'published' || $save == false) {
 			forward($blog->getURL());
 		} else {
 			forward("blog/edit/$blog->guid");
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index 5b3a758ba..d99f45f01 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -5,6 +5,8 @@
  * @package Blog
  */
 
+$blog = get_entity($vars['guid']);
+
 $draft_warning = $vars['draft_warning'];
 if ($draft_warning) {
 	$draft_warning = '<span class="message warning">' . $draft_warning . '</span>';
@@ -12,6 +14,7 @@ if ($draft_warning) {
 
 $action_buttons = '';
 $delete_link = '';
+$preview_button = '';
 
 if ($vars['guid']) {
 	// add a delete button if editing
@@ -23,8 +26,20 @@ if ($vars['guid']) {
 	));
 }
 
-$save_button = elgg_view('input/submit', array('value' => elgg_echo('save')));
-$action_buttons = $save_button . $delete_link;
+// published blogs do not get the preview button
+if (!$vars['guid'] || ($blog && $blog->status != 'published')) {
+	$preview_button = elgg_view('input/submit', array(
+		'value' => elgg_echo('preview'),
+		'name' => 'preview',
+		'class' => 'mls',
+	));
+}
+
+$save_button = elgg_view('input/submit', array(
+	'value' => elgg_echo('save'),
+	'name' => 'save',
+));
+$action_buttons = $save_button . $preview_button . $delete_link;
 
 $title_label = elgg_echo('title');
 $title_input = elgg_view('input/text', array(
-- 
cgit v1.2.3