From d9e682babde7b433896ae6dd161426bdd86eab48 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Mon, 28 Jan 2013 15:32:03 +0100
Subject: [PATCH] Grouped publish/draft status with preview/save buttons.
---
templates/2k11/admin/entries.tpl | 30 ++++++++++++++++--------------
templates/2k11/admin/style.css | 15 ++++++++++++++-
2 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl
index e1c43d98..245e696f 100644
--- a/templates/2k11/admin/entries.tpl
+++ b/templates/2k11/admin/entries.tpl
@@ -34,16 +34,6 @@
{/foreach}
</select>
</div>
-
- <div id="edit_entry_status" class="form_select">
- <label for="entry_status">Entry status</label> {* i18n *}
- <select id="entry_status" name="serendipity[isdraft]">
- {if $entry_vars.serendipityRightPublish}
- <option value="false"{if $entry_vars.draft_mode == 'publish'} selected{/if}>{$CONST.PUBLISH}</option>
- {/if}
- <option value="true"{if $entry_vars.draft_mode == 'draft'} selected{/if}>{$CONST.DRAFT}</option>
- </select>
- </div>
</div>
<div class="form_area">
@@ -86,7 +76,7 @@
<textarea id="serendipity[body]" name="serendipity[body]" rows="20">{$entry_vars.entry.body|@escape}</textarea>
</div>
- <div class="clearfix">
+ <div id="edit_entry_status_comments" class="clearfix">
<div class="form_check">
<input id="checkbox_allow_comments" name="serendipity[allow_comments]" type="checkbox" value="true"{if $entry_vars.allow_comments} checked="checked"{/if}><label for="checkbox_allow_comments">{$CONST.COMMENTS_ENABLE}</label>
</div>
@@ -96,9 +86,21 @@
</div>
</div>
- <div class="form_buttons">
- <input type="submit" accesskey="p" value="{$CONST.PREVIEW}" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';">
- <input type="submit" accesskey="s" value="{$CONST.SAVE}"onclick="return checkSave();">
+ <div id="edit_entry_submit" class="clearfix">
+ <div id="edit_entry_status" class="form_select">
+ <label for="entry_status">Entry status</label> {* i18n *}
+ <select id="entry_status" name="serendipity[isdraft]">
+ {if $entry_vars.serendipityRightPublish}
+ <option value="false"{if $entry_vars.draft_mode == 'publish'} selected{/if}>{$CONST.PUBLISH}</option>
+ {/if}
+ <option value="true"{if $entry_vars.draft_mode == 'draft'} selected{/if}>{$CONST.DRAFT}</option>
+ </select>
+ </div>
+
+ <div class="form_buttons">
+ <input type="submit" accesskey="p" value="{$CONST.PREVIEW}" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';">
+ <input type="submit" accesskey="s" value="{$CONST.SAVE}"onclick="return checkSave();">
+ </div>
</div>
<div class="form_area">
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index dabbceba..b45d1c04 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -403,6 +403,7 @@ form > a,
#login .form_field label,
#edit_entry_title label,
#edit_entry_metadata label,
+#edit_entry_status label,
#filter_comments label,
#serendipity_comment label,
#sort_entries .form_select label,
@@ -894,6 +895,7 @@ summary { cursor: pointer; }
#edit_entry_title label,
#edit_entry_metadata label,
+#edit_entry_status label,
#filter_comments label,
#serendipity_comment label { width: 15%; }
@@ -915,6 +917,7 @@ summary { cursor: pointer; }
#edit_entry_title input,
#edit_entry_metadata input,
#edit_entry_metadata select,
+#edit_entry_status select,
#filter_comments input,
#filter_comments select,
#serendipity_comment .form_field input,
@@ -1000,6 +1003,8 @@ summary { cursor: pointer; }
#media_pane_filter #toggle_filters { right: 1.5em;}
+#edit_entry_category label { vertical-align: top; }
+
.template_info,
.template_info dl,
@@ -1256,6 +1261,7 @@ fieldset p,
}
#edit_entry_metadata label,
+ #edit_entry_status label,
#sort_entries .form_select label,
#filter_entries .form_select label,
#filter_entries .form_field label,
@@ -1281,6 +1287,13 @@ fieldset p,
}
#edit_entry_metadata>div,
+ #edit_entry_submit>div {
+ float: left;
+ width: 50%;
+ }
+
+ #edit_entry_submit .form_buttons { text-align: right; }
+
#sort_entries .form_select,
#filter_comments .clearfix>div,
#serendipity_category>.clearfix>div,
@@ -1313,7 +1326,7 @@ fieldset p,
#content { width: 73%; }
.lt-ie8 #content { width: 72.5%; }
- #edit_entry_metadata select[multiple],
+ #edit_entry_status select[multiple],
#sort_entries .form_select select,
#filter_entries .form_select select,
#filter_entries .form_field input,