Dotclear


Ignore:
Timestamp:
09/30/13 21:16:20 (12 years ago)
Author:
Denis Jean-Chirstian <contact@…>
Branch:
dcRepo
Parents:
2174:6ed25e45a14e (diff), 2173:94520262a1b8 (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 from default

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • admin/index.php

    r2166 r2175  
    123123     } 
    124124     $__dashboard_icons['prefs'] = new ArrayObject(array(__('My preferences'),'preferences.php','images/menu/user-pref-b.png')); 
     125} 
     126 
     127# Check plugins and themes update from repository 
     128function dc_check_repository_update($mod, $url, $img, $icon) 
     129{ 
     130     $repo = new dcRepository($mod, $url); 
     131     $repo->check(); 
     132     $upd = $repo->get(true); 
     133     if (!empty($upd)) { 
     134          $icon[0] .= '<br />'.sprintf(__('An update is available', '%s updates are available.', count($upd)),count($upd)); 
     135          $icon[1] .= '#update'; 
     136          $icon[2] = 'images/menu/'.$img.'-b-update.png'; 
     137     } 
     138} 
     139if (isset($__dashboard_icons['plugins'])) { 
     140     dc_check_repository_update($core->plugins, $core->blog->settings->system->repository_plugin_url, 'plugins', $__dashboard_icons['plugins']); 
     141} 
     142if (isset($__dashboard_icons['blog_theme'])) { 
     143     $themes = new dcThemes($core); 
     144     $themes->loadModules($core->blog->themes_path, null); 
     145     dc_check_repository_update($themes, $core->blog->settings->system->repository_theme_url, 'blog-theme', $__dashboard_icons['blog_theme']); 
    125146} 
    126147 
  • admin/index.php

    r2174 r2175  
    226226     dcPage::breadcrumb( 
    227227          array( 
    228           '<span class="page-title">'.__('Dashboard').' : '.html::escapeHTML($core->blog->name).'</span>' => '' 
     228          __('Dashboard').' : '.html::escapeHTML($core->blog->name) => '' 
    229229          ), 
    230           false) 
     230          array('home_link' =>false) 
     231     ) 
    231232); 
    232233 
Note: See TracChangeset for help on using the changeset viewer.

Sites map