Move #add_upload button inside the uploads tab to simplify interface.

References #26
This commit is contained in:
Matthias Mees 2013-07-21 12:09:19 +02:00
parent 64f64bd139
commit eeba0187bc
2 changed files with 40 additions and 34 deletions

View File

@ -15,48 +15,54 @@
<div class="clearfix tabs">
<h3>Upload</h3> {* i18n *}
<div id="uploads" class="panel">
<div id="upload_form_1" class="upload_form">
<div class="form_field clearfix">
<label for="userfile_1" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label>
<input id="userfile_1" class="uploadform_userfile check_input" name="serendipity[userfile][1]" type="file">
</div>
<div class="panel">
<div id="uploads">
<div id="upload_form_1" class="upload_form">
<div class="form_field clearfix">
<label for="userfile_1" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label>
<input id="userfile_1" class="uploadform_userfile check_input" name="serendipity[userfile][1]" type="file">
</div>
<div class="form_field clearfix">
<label for="target_filename_1" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span>{$CONST.PLAIN_ASCII_NAMES}</span></label>
<input id="target_filename_1" class="uploadform_target_filename" name="serendipity[target_filename][1]" type="text" value="">
</div>
<div class="form_field clearfix">
<label for="target_filename_1" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span>{$CONST.PLAIN_ASCII_NAMES}</span></label>
<input id="target_filename_1" class="uploadform_target_filename" name="serendipity[target_filename][1]" type="text" value="">
</div>
<div class="form_select clearfix">
<label for="target_directory_1" class="uploadform_target_directory_label">{$CONST.STORE_IN_DIRECTORY}</label>
<select id="target_directory_1" class="uploadform_target_directory" name="serendipity[target_directory][1]">
<option value="">{$CONST.BASE_DIRECTORY}</option>
{foreach from=$media.folders item="folder"}
<option{if $media.only_path == $folder.relpath} selected{/if} value="{$folder.relpath}">{'&nbsp;'|@str_repeat:($folder.depth*2)} {$folder.name}</option>
{/foreach}
</select>
</div>
<div class="form_select clearfix">
<label for="target_directory_1" class="uploadform_target_directory_label">{$CONST.STORE_IN_DIRECTORY}</label>
<select id="target_directory_1" class="uploadform_target_directory" name="serendipity[target_directory][1]">
<option value="">{$CONST.BASE_DIRECTORY}</option>
{foreach from=$media.folders item="folder"}
<option{if $media.only_path == $folder.relpath} selected{/if} value="{$folder.relpath}">{'&nbsp;'|@str_repeat:($folder.depth*2)} {$folder.name}</option>
{/foreach}
</select>
</div>
<div id="ccounter"><input id="column_count_1" class="uploadform_column_count" type="hidden" name="serendipity[column_count][1]" value="true"></div>
<div id="ccounter"><input id="column_count_1" class="uploadform_column_count" type="hidden" name="serendipity[column_count][1]" value="true"></div>
</div>
</div>
<a id="add_upload" class="button_link icon_link" href="#" title="{$CONST.IMAGE_MORE_INPUT}"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.IMAGE_MORE_INPUT}</span></a>
</div>
<h3>Download</h3> {* i18n *}
<div id="downloads" class="panel">
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.ADD_MEDIA_BLAHBLAH_NOTE}</span>
<div class="panel">
<div id="downloads">
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.ADD_MEDIA_BLAHBLAH_NOTE}</span>
<div class="clearfix form_field">
<label for="imageurl">{$CONST.ENTER_MEDIA_URL}</label>
<input id="imageurl" class="check_input" name="serendipity[imageurl]" type="text" value="">
</div>
<div class="clearfix form_field">
<label for="imageurl">{$CONST.ENTER_MEDIA_URL}</label>
<input id="imageurl" class="check_input" name="serendipity[imageurl]" type="text" value="">
</div>
<div class="clearfix form_select">
<label for="imageimporttype">{$CONST.ENTER_MEDIA_URL_METHOD}</label>
<select id="imageimporttype" name="serendipity[imageimporttype]">
<option value="image">{$CONST.FETCH_METHOD_IMAGE}</option>
<option value="hotlink">{$CONST.FETCH_METHOD_HOTLINK}</option>
</select>
<div class="clearfix form_select">
<label for="imageimporttype">{$CONST.ENTER_MEDIA_URL_METHOD}</label>
<select id="imageimporttype" name="serendipity[imageimporttype]">
<option value="image">{$CONST.FETCH_METHOD_IMAGE}</option>
<option value="hotlink">{$CONST.FETCH_METHOD_HOTLINK}</option>
</select>
</div>
</div>
</div>
</div>
@ -65,7 +71,6 @@
<div class="form_buttons">
<input id="all_authors" name="serendipity[all_authors]" type="hidden" value="true" checked="checked">
<a id="add_upload" class="button_link" href="#" title="{$CONST.IMAGE_MORE_INPUT}"><span class="icon-plus"></span><span class="visuallyhidden"> {$CONST.IMAGE_MORE_INPUT}</span></a>
<input class="check_inputs" type="submit" value="{$CONST.GO}">
<input class="check_inputs" name="go_properties" type="submit" value="{$CONST.GO_ADD_PROPERTIES|@escape}">
</div>

View File

@ -1345,7 +1345,8 @@ fieldset p,
margin-top: .75em;
}
.media_file .actions {
.media_file .actions,
.js #add_upload {
margin-top: 1em;
}