Changeset 1792:3ad2e47ed52d for admin/update.php

Timestamp:

09/11/13 10:08:47 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1793:a25f8d0fd400, 1829:db77f6bb5df9, 1899:840b0d73f60c

Parents:

1790:13dd14dd5254 (diff), 1791:39acc93c9d30 (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

File:

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

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>'.