Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

templates/2k11/admin/plugins.inc.tpl

@@ -120,6 +120,7 @@
     {/foreach}
     <script src="{serendipity_getFile file='admin/js/jquery.syncheight.js'}"></script>
 {else}
+    <h2>{$CONST.CONFIGURE_PLUGINS}</h2>
     {if $save}
     <span class="msg_success"><span class="icon-ok-circled"></span> {$CONST.DONE}:{$CONST.SETTINGS_SAVED_AT|sprintf:"$timestamp"}</span>
     {/if}

templates/2k11/admin/style.css

@@ -489,7 +489,8 @@ details,
 .form_buttons,
 #maintenance > section > .button_link,
 form > a,
-form > button {
+form > button,
+#content .upgrade_done {
     margin-top: 1.5em;
     margin-bottom: 1.5em;
 }
@@ -1454,7 +1455,8 @@ fieldset p,
 .comment_data,
 .configuration_group h3,
 form > .button_link:first-of-type,
-.upload_form > .form_field:first-child {
+.upload_form > .form_field:first-child,
+#uploadform .tabs ul {
     margin-top: 0;
 }
 
@@ -1792,8 +1794,12 @@ form > .button_link:first-of-type,
     text-decoration: none;
 }
 
-.perm_name {
+.perm_name,
+.installer pre {
     color: #888;
+}
+
+.perm_name {
     font-family: monospace, serif;
     font-size: .875em;
     font-style: normal;