Image selector toggled by showMediaToolbar

And $media.manage in the templates

templates/2k11/admin/media_items.tpl

@@ -1,5 +1,5 @@
 {foreach from=$media.files item="file" name="mediafiles" key="mediakey"}
-    {if $smarty.get.serendipity.showUpload}
+    {if NOT $media.manage}
         {* ML got called for inserting media *}
         <article class="media_wrap_thumb {cycle values="odd,even"}">
             <div class="media_file_thumb{if $media.enclose} equal_heights{/if}">

templates/2k11/admin/media_pane.tpl

@@ -153,7 +153,8 @@
 {else}
     {if $smarty.get.serendipity.showUpload}
         <a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a>
-    {else}
+    {/if}
+    {if $media.manage}
         <form id="formMultiDelete" name="formMultiDelete" action="?" method="post">
             {$media.token}
             <input name="serendipity[action]" type="hidden" value="admin">
@@ -174,13 +175,11 @@
         </nav>
         {/if}
     </div>
-    {if NOT $smarty.get.serendipity.showUpload}
-        {if $media.manage}
+    {if $media.manage}
         <div class="form_buttons">
             <input class="invert_selection" name="toggle" type="button" value="{$CONST.INVERT_SELECTIONS}">
             <input class="state_cancel" name="toggle" type="submit" value="{$CONST.DELETE}">
         </div>
-        {/if}
     </form>
     {/if}
 {/if}

templates/2k11/admin/media_upload.tpl

@@ -70,7 +70,7 @@
         <input id="all_authors" name="serendipity[all_authors]" type="hidden" value="true" checked="checked">
 
         <input class="check_inputs" type="submit" value="{$CONST.GO}">
-        {if NOT $smarty.get.serendipity.showUpload}
+        {if $media.manage}
             <input class="check_inputs" name="go_properties" type="submit" value="{$CONST.GO_ADD_PROPERTIES|@escape}">
         {/if}
     </div>