Layout and other minor CSS fixes for the upgrader.

Includes adapting the layout to match the installer, using a proper
element for removeFiles msgs, removing unnecessary msg_* wrappers,
fixing the upgrader buttons etc.

include/admin/upgrader.inc.php

@@ -94,7 +94,7 @@ $tasks = array(array('version'   => '0.5.1',
                      'function'  => 'serendipity_removeFiles',
                      'title'     => 'Removal of obsolete files',
                      'arguments' => array($obsolete_files),
-                     'desc'      => '<p>The directory structure has been reworked. The following files will be moved to a folder called "backup". If you made manual changes to those files, be sure to read the file docs/CHANGED_FILES to re-implement your changes.</p><div style="font-size: x-small; margin: 15px">' . implode(', ', $obsolete_files) . '</div>'),
+                     'desc'      => '<p>The directory structure has been reworked. The following files will be moved to a folder called "backup". If you made manual changes to those files, be sure to read the file docs/CHANGED_FILES to re-implement your changes.</p><pre>' . implode(', ', $obsolete_files) . '</pre>'),
 
                array('version'   => '0.8-alpha4',
                      'function'  => 'serendipity_removeFiles',
@@ -202,7 +202,7 @@ $tasks = array(array('version'   => '0.5.1',
                      'function'  => 'serendipity_removeDeadFiles_SPL',
                      'title'     => 'Removal of obsolete and dead Smarty 2.6.x files',
                      'arguments' => array($serendipity['serendipityPath'] . 'bundled-libs/Smarty', $dead_smarty_files, array('internals'), true),
-                     'desc'      => 'Smarty 3.x brought a new file structure. The following dead files will be removed from "bundled-libs/Smarty/libs".<br /><div style="font-size: x-small; margin: 15px">' . implode(', ', $dead_smarty_files) . '</div>'),
+                     'desc'      => 'Smarty 3.x brought a new file structure. The following dead files will be removed from "bundled-libs/Smarty/libs".<br /><pre>' . implode(', ', $dead_smarty_files) . '</pre>'),
 
                array('version'   => '2.0-alpha3',
                      'function'  => 'serendipity_upgrader_rename_plugins',

templates/2k11/admin/style.css

@@ -467,7 +467,8 @@ label > span,
 #dashboard_entries li > a,
 #mediaPropertyForm .media_file_props label,
 #mediaPropertyForm header b,
-#mediaPropertyForm footer b {
+#mediaPropertyForm footer b,
+#content .upgrade_done {
     display: block;
 }
 
@@ -2974,7 +2975,7 @@ img.mfp-img {
 
     .installer #content {
         float: none;
-        margin: 0 auto;
+        margin: 0 auto 2em;
         max-width: 60em;
         width: 100%;
     }

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

@@ -39,7 +39,8 @@
         </div>
     </header>
 {/if}
-    <main class="clearfix">
+    <main class="clearfix serendipityAdminContent installer">
+        <div id="content" class="clearfix">
     {* include of previous plain upgrader here *}
     {if ($get.action == 'ignore')}
         {* TODO: don't know what to put here? *}
@@ -62,9 +63,9 @@
 
     {if (($showAbort && $get.action == 'ignore') || $get.action == 'upgrade')}
         {if $get.action == 'ignore'}
-            <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED}</span>
+            <span class="msg_notice upgrade_done"><span class="icon-info-circled"></span> {$CONST.SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED}</span>
         {elseif $get.action == 'upgrade'}
-            <span class="msg_success"><span class="icon-ok-circled"></span> {$CONST.SERENDIPITY_UPGRADER_NOW_UPGRADED|sprintf:$s9y_version}</span>
+            <span class="msg_success upgrade_done"><span class="icon-ok-circled"></span> {$CONST.SERENDIPITY_UPGRADER_NOW_UPGRADED|sprintf:$s9y_version}</span>
         {/if}
         {if $return_here}
             {$print_UPGRADER_RETURN_HERE}
@@ -80,12 +81,12 @@
         <h3>{$CONST.FIRST_WE_TAKE_A_LOOK}</h3>
 
         <div class="diagnose">
-            <span class="msg_notice"><span class="icon-info-circled"></span> {$result_diagnose}.</span>
+            {$result_diagnose}
 
         {if $checksums}
             <h4>{$CONST.INTEGRITY}</h4>
 
-            <ul>
+            <ul class="plainList">
             {foreach $upgraderResultDiagnose1 AS $urd1}
                 <li>{$urd1}</li>
             {/foreach}
@@ -146,20 +147,23 @@
             {if (($taskCount > 0) || (sizeof($sqlfiles) > 0))}
                 <h3>{$CONST.SERENDIPITY_UPGRADER_PROCEED_QUESTION}</h3>
 
-                <a class="block_level" href="{$upgradeLoc}">{$CONST.SERENDIPITY_UPGRADER_PROCEED_DOIT}</a>{if $showAbort} <a href="{$abortLoc}">{$CONST.SERENDIPITY_UPGRADER_PROCEED_ABORT}</a>{/if}
+                <a class="button_link state_submit" href="{$upgradeLoc}">{$CONST.SERENDIPITY_UPGRADER_PROCEED_DOIT}</a>{if $showAbort} <a class="button_link state_cancel" href="{$abortLoc}">{$CONST.SERENDIPITY_UPGRADER_PROCEED_ABORT}</a>{/if}
             {else}
                 <h3>{$CONST.SERENDIPITY_UPGRADER_NO_UPGRADES}</h3>
 
-                <a class="block_level" href="{$upgradeLoc}">{$CONST.SERENDIPITY_UPGRADER_CONSIDER_DONE}</a>
+                <a class="button_link state_submit" href="{$upgradeLoc}">{$CONST.SERENDIPITY_UPGRADER_CONSIDER_DONE}</a>
             {/if}
         {/if}
     {/if}
     {* end include upgrader *}
+        </div>
     </main>
 {if NOT $admin_vars.no_footer}
+    {if $admin_vars.version_info}
     <footer id="meta">
         <p>{$admin_vars.version_info}</p>
     </footer>
+    {/if}
 {/if}
     <script src="{serendipity_getFile file='admin/serendipity_editor.js'}"></script>
 </body>