Changeset 1620:542c321dc040 for admin/update.php

Timestamp:

08/30/13 10:37:08 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1619:5d925866b5b3 (diff), 1593:0c884219a872 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.5 into default

Files:

• admin/update.php (modified) (2 diffs)
• admin/update.php (modified) (1 diff)

admin/update.php

@@ -174 +174 @@
           dcPage::jsPageTabs($default_tab).
           dcPage::jsLoad('js/_update.js')
-     : '')
+          : ''),
+     dcPage::breadcrumb(
+          array(
+               __('System') => '',
+               '<span class="page-title">'.__('Dotclear update').'</span>' => ''
+          ))
 );
 
 if (!$core->error->flag()) {
-     echo '<h2>'.__('Dotclear update').'</h2>';
-     
      if (!empty($_GET['nocache'])) {
-          dcPage::message(__('Manual checking of update done successfully.'));
+          dcPage::success(__('Manual checking of update done successfully.'));
      }
 }
@@ -200 +203 @@
           echo
                '<p class="static-msg">'.sprintf(__('Dotclear %s is available.'),$new_v).
-                    ($version_info ? ' ('.sprintf(__('<a href=\"%s\">Information about this version</a>.'),$version_info).')' : '').
+                    ($version_info ? ' <a href="'.$version_info.'">('.__('Information about this version').')</a>' : '').
                     '</p>'.
           

admin/update.php

@@ -249 +249 @@
      '<p class="message">'.
      __("Congratulations, you're one click away from the end of the update.").
-     ' <strong><a href="index.php?logout=1">'.__('Finish the update').'</a>.</strong>'.
+     ' <strong><a href="index.php?logout=1">'.__('Finish the update.').'</a></strong>'.
      '</p>';
 }