From c1df4145db718b5a439234394f1ad5d8e869694e Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Mon, 11 Feb 2013 12:33:16 +0100
Subject: [PATCH] Some small screen fixes, including media upload form.

---
 templates/2k11/admin/media_upload.tpl | 14 +++++++-------
 templates/2k11/admin/style.css        | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/templates/2k11/admin/media_upload.tpl b/templates/2k11/admin/media_upload.tpl
index ca8a7f98..dcf6ccb2 100644
--- a/templates/2k11/admin/media_upload.tpl
+++ b/templates/2k11/admin/media_upload.tpl
@@ -20,35 +20,35 @@
         <input name="serendipity[adminAction]" type="hidden" value="add">
         {$media.form_hidden}
         <div id="foreign_upload" class="image_add_foreign">
-            <div class="form_field">
+            <div class="form_field clearfix">
                 {* Probably could use input[type=url] here … *}
                 <label for="imageurl">{$CONST.ENTER_MEDIA_URL}</label>
                 <input id="imageurl" name="serendipity[imageurl]" type="text" onchange="checkInputs()" value="">
             </div>
 
-            <div class="form_select">
+            <div class="form_select clearfix">
                 <label for="serendipity_imageimporttype">{$CONST.ENTER_MEDIA_URL_METHOD}</label>
                 <select name="serendipity[imageimporttype]">
                     <option value="image">{$CONST.FETCH_METHOD_IMAGE}</option>
                     <option value="hotlink">{$CONST.FETCH_METHOD_HOTLINK}</option>
                 </select>
             </div>
+
+            <span class="standalone hilite_b">{$CONST.WORD_OR}</span>
         </div>
 
-        <span class="standalone hilite_b">{$CONST.WORD_OR}</span>
-
         <div id="upload_template">
-            <div class="form_field">
+            <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" name="serendipity[userfile][1]" type="file" onchange="checkInputs();">
             </div>
 
-            <div class="form_field">
+            <div class="form_field clearfix">
                 <label for="target_filename_1" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span class="input-desc image-upload">{$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">
+            <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>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 179412f5..4bb3f1fe 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1034,7 +1034,9 @@ summary {
 #template_options .form_select select,
 #template_options .form_field input,
 .configuration_group .form_select select,
-.configuration_group .form_field input { width: 100%; }
+.configuration_group .form_field input,
+#uploadform .form_select select,
+#uploadform .form_field input { width: 100%; }
 
 #serendipity_category .form_multiselect label { width: auto; }
 
@@ -1136,7 +1138,8 @@ fieldset p,
 .media_file .actions,
 #entries_list .actions { margin-bottom: 0; }
 
-#entries_list .actions { margin-top: .75em; }
+#entries_list .actions,
+#formMultiDelete .form_buttons input { margin-top: .75em; }
 
 .media_file .actions { margin-top: 1em; }
 
@@ -1397,7 +1400,11 @@ form > .button_link:first-of-type { margin-top: 0; }
     .configuration_group .form_select select,
     .configuration_group .form_field input,
     .configuration_group fieldset>fieldset legend,
-    .configuration_group fieldset>fieldset .clearfix {
+    .configuration_group fieldset>fieldset .clearfix,
+    #uploadform .form_select label,
+    #uploadform .form_field label,
+    #uploadform .form_select select,
+    #uploadform .form_field input {
         float: left;
         margin-right: 2%;
         width: 48%;
@@ -1406,7 +1413,9 @@ form > .button_link:first-of-type { margin-top: 0; }
     #template_options .form_select select,
     #template_options .form_field input,
     .configuration_group .form_select select,
-    .configuration_group .form_field input { max-width: 48%; }
+    .configuration_group .form_field input,
+    #uploadform .form_select select,
+    #uploadform .form_field input { max-width: 48%; }
 
     .template_info dl { max-width: 12em; }