Fix positioning for popuplayer button

That means positioning in the source code as well as in the layout.

References #395

templates/2k11/admin/media_pane.tpl

@@ -39,6 +39,9 @@
                     <label for="serendipity[filter][fileCategory][Video]" class="media_selector button_link">{$CONST.VIDEO}</label>
                 </fieldset>
             </li>
+        {if $smarty.get.serendipity.showUpload}
+            <li class="popuplayer_showUpload"><a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a></li>
+        {/if}
         </ul>
 
         <fieldset id="media_pane_filter" class="additional_info filter_pane">
@@ -226,12 +229,6 @@
     </form>
 </div>{* has toolbar end *}
 
-{if $smarty.get.serendipity.showUpload}
-<div class="popuplayer_showUpload">
-    <a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a>
-</div>
-{/if}
-
 <div class="media_library_pane">
 {if $media.nr_files < 1}
 

templates/2k11/admin/style.css

@@ -2520,6 +2520,11 @@ input[name="serendipity[filter][fileCategory]"] {
     margin: 1em 0 0;
 }
 
+.popuplayer_showUpload {
+    float: right;
+    margin: 1em 0 0;
+}
+
 .media_select_strict {
     clear: right;
     float: left;
@@ -2978,6 +2983,10 @@ img.mfp-img {
         display: inline-block;
         width: auto;
     }
+
+    .popuplayer_showUpload {
+        margin: 1em .4rem 0 0;
+    }
 }
 
 @media only screen and (min-width: 480px) {
@@ -3003,6 +3012,14 @@ img.mfp-img {
         position: relative;
     }
 
+    #media_selector_bar {
+        margin: 0;
+    }
+
+    .popuplayer_showUpload {
+        margin: 1em 0 0;
+    }
+
     .tabcontent #pluginlist_event > a,
     .tabcontent #pluginlist_sidebar > a {
         position: absolute;
@@ -3071,13 +3088,12 @@ img.mfp-img {
         margin: 0 0 1em;
     }
 
-    .media_select_strict {
-        margin: -1em 0;
+    .popuplayer_showUpload {
+        margin: 0 .4em 1em 0;
     }
 
-    .popuplayer_showUpload {
-        float: right;
-        margin-top: -2.375em;
+    .media_select_strict {
+        margin: -1em 0;
     }
 
     #mediaPropertyForm .media_file_props label,