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

templates/2k11/admin/entries.tpl

@@ -111,7 +111,7 @@
                     <div id="category_filter" class="form_field">
                         <label for="categoryfilter" class="visuallyhidden">{$CONST.FILTERS}</label>
                         <input id="categoryfilter" type="text" placeholder="{$CONST.FILTERS}: {$CONST.CATEGORIES}">
-                        <button id="reset_categoryfilter" class="icon_link" type="button" title="Reset filters"><span class="icon-cancel"></span><span class="visuallyhidden">Reset filters</span></button> {* i18n *}
+                        <button id="reset_categoryfilter" class="icon_link" type="button" title="{$CONST.RESET_FILTERS}"><span class="icon-cancel"></span><span class="visuallyhidden">{$CONST.RESET_FILTERS}</span></button>
                     </div>
 
                 {foreach from=$entry_vars.category_options item="entry_cat"}

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

@@ -16,11 +16,11 @@
             <section id="dashboard_update">
                 <h3>{$CONST.UPDATE_NOTIFICATION}</h3>
 
-                <span class="msg_notice"><span class="icon-info-circled"></span> Check for new Serendipity version failed</span> {* i18n *}
+                <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.UPDATE_FAILMSG}</span>
                 <form id="updateCheckDisable" method="POST">
                     <input type="hidden" name="serendipity[adminAction]" value="updateCheckDisable" />
                     {$token}
-                    <button type="submit">Disable update check</button> {* i18n *}
+                    <button type="submit">{$CONST.UPDATE_FAILACTION}</button>
                 </form>
             </section>
         {else if $update}

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

@@ -77,9 +77,21 @@
         {foreach $groupstack as $plug}
             <li class="clearfix">
                 <div class="equal_heights">
-                    <h4>{$plug.name} ({$plug.class_name})</h4>
+                    <h4>{$plug.name}</h4>
 
-                    <p class="plugin_desc">{$plug.description}</p>
+                {if $plug.description}
+                    <details class="plugin_data">
+                        <summary><var class="perm_name">[{$plug.class_name}]</var></summary>
+
+                        <div class="plugin_desc clearfix">
+                        {$plug.description}
+                        </div>
+                    </details>
+                {else}
+                    <div class="plugin_data">
+                        <var class="perm_name">[{$plug.class_name}]</var>
+                    </div>
+                {/if}
 
                     <ul class="plugin_info plainList">
                     {if ! empty($plug.author)}

templates/2k11/admin/style.css

@@ -479,7 +479,8 @@ label > span,
 #mediaPropertyForm header b,
 #mediaPropertyForm footer b,
 #content .upgrade_done,
-.pluginmanager_description .perm_name {
+.pluginmanager_description .perm_name,
+.plugin_data > .perm_name {
     display: block;
 }
 
@@ -502,7 +503,8 @@ details,
 form > a,
 form > button,
 #content .upgrade_done,
-#upgrade_notice {
+#upgrade_notice,
+.plugin_data > .perm_name {
     margin-top: 1.5em;
     margin-bottom: 1.5em;
 }
@@ -517,6 +519,10 @@ form > button,
     margin-bottom: .25em;
 }
 
+.plugin_desc {
+    margin-top: .25em;
+}
+
 #categories,
 #categories ul,
 #serendipity_image_folders,