Move category list in entry editor.

Also trigger category selector on clicking category list.

References #176
This commit is contained in:
Matthias Mees 2014-06-02 10:49:56 +02:00
parent 35c3541d70
commit a915981b6a
3 changed files with 17 additions and 9 deletions

View File

@ -15,6 +15,12 @@
<input id="entryTitle" name="serendipity[title]" type="text" value="{$entry_vars.entry.title|@escape}"> <input id="entryTitle" name="serendipity[title]" type="text" value="{$entry_vars.entry.title|@escape}">
</div> </div>
<div id="category_list" class="clearfix">
<h3>{$CONST.CATEGORIES}</h3>
<ul class="plainList"></ul>
</div>
<div class="form_area"> <div class="form_area">
<label for="serendipity[body]">{$CONST.ENTRY_BODY}</label> <label for="serendipity[body]">{$CONST.ENTRY_BODY}</label>
{if NOT $entry_vars.wysiwyg} {if NOT $entry_vars.wysiwyg}
@ -34,12 +40,6 @@
<textarea id="serendipity[body]" name="serendipity[body]" rows="15">{$entry_vars.entry.body|@escape}</textarea> <textarea id="serendipity[body]" name="serendipity[body]" rows="15">{$entry_vars.entry.body|@escape}</textarea>
</div> </div>
<div id="category_list" class="clearfix">
<h3>{$CONST.CATEGORIES}</h3>
<ul class="plainList"></ul>
</div>
<div id="edit_entry_submit"> <div id="edit_entry_submit">
<button id="reset_timestamp" class="button_link" type="button" href="#serendipityNewTimestamp" data-currtime="{$entry_vars.reset_timestamp|@formatTime:'o-m-d\TH:i':true:false:true}" title="{$CONST.RESET_DATE_DESC}"><span class="icon-clock"></span><span class="visuallyhidden"> {$CONST.RESET_DATE}</span></button> <button id="reset_timestamp" class="button_link" type="button" href="#serendipityNewTimestamp" data-currtime="{$entry_vars.reset_timestamp|@formatTime:'o-m-d\TH:i':true:false:true}" title="{$CONST.RESET_DATE_DESC}"><span class="icon-clock"></span><span class="visuallyhidden"> {$CONST.RESET_DATE}</span></button>
<a id="select_category" class="button_link icon_link" href="#edit_entry_category" title="{$CONST.CATEGORY}"><span class="icon-list-bullet"></span><span class="visuallyhidden">{$CONST.CATEGORIES}</span></a> <a id="select_category" class="button_link icon_link" href="#edit_entry_category" title="{$CONST.CATEGORY}"><span class="icon-list-bullet"></span><span class="visuallyhidden">{$CONST.CATEGORIES}</span></a>

View File

@ -1073,7 +1073,7 @@ $(function() {
// Show category selector // Show category selector
{if $use_popups} {if $use_popups}
if($('#serendipityEntry').length > 0) { if($('#serendipityEntry').length > 0) {
$('#select_category').click(function(e) { $('#select_category, #category_list').click(function(e) {
$('#edit_entry_category').toggleClass('mfp-hide'); $('#edit_entry_category').toggleClass('mfp-hide');
$('#toggle_metadata').click(); $('#toggle_metadata').click();
}); });
@ -1091,6 +1091,10 @@ $(function() {
} }
} }
}); });
$('#category_list').click(function(e) {
$('#select_category').trigger('click');
});
} }
{/if} {/if}

View File

@ -1660,14 +1660,18 @@ form > .button_link:first-of-type,
padding-bottom: .583335em; padding-bottom: .583335em;
} }
#category_list:hover {
cursor: pointer;
}
#category_list h3 { #category_list h3 {
float: left; float: left;
line-height: 1.5em; line-height: 1.5em;
margin: 0 2em .75em 0; margin: .375em 2em .375em 0;
} }
#category_list ul { #category_list ul {
margin: 0 0 .75em; margin: .375em 0;
line-height: 1.5em; line-height: 1.5em;
} }