Dotclear

Changeset 1729:19daad6a1d74


Ignore:
Timestamp:
09/05/13 10:45:41 (11 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Message:

Update information message displayed twice : fixed
Harmonization of error message for plugins installed twice (or more)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • admin/index.php

    r1728 r1729  
    302302     echo '</ul></div>'; 
    303303} 
    304  
    305 # Dashboard columns (processed first, as we need to know the result before displaying the icons.) 
    306 $dashboardItems = ''; 
    307  
    308 # Dotclear updates notifications 
    309 if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS)) 
    310 { 
    311      $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions'); 
    312      $new_v = $updater->check(DC_VERSION); 
    313      $version_info = $new_v ? $updater->getInfoURL() : ''; 
    314       
    315      if ($updater->getNotify() && $new_v) { 
    316           $dashboardItems .= 
    317           '<div id="upg-notify" class="static-msg"><p>'.sprintf(__('Dotclear %s is available!'),$new_v).'</p> '. 
    318           '<ul><li><strong><a href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a></strong>'. 
    319           '</li><li><a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'. 
    320           ($version_info ? ' </li><li>'.sprintf(__('<a href=\"%s\">Information about this version</a>.'),$version_info) : ''). 
    321           '</li></ul></div>'; 
    322      } 
    323 } 
    324  
    325304# Errors modules notifications 
    326305if ($core->auth->isSuperAdmin()) 
     
    332311      
    333312     if (count($list) > 0) { 
    334           $dashboardItems .= 
    335           '<div id="module-errors" class="error"><p>'.__('Some plugins are installed twice:').'</p> '. 
     313          echo  
     314          '<div class="error" id="module-errors" class="error"><p>'.__('Some plugins are installed twice:').'</p> '. 
    336315          '<ul>'.implode("\n",$list).'</ul></div>'; 
    337316     } 
    338       
    339 } 
     317} 
     318 
     319# Dashboard columns (processed first, as we need to know the result before displaying the icons.) 
     320$dashboardItems = ''; 
    340321 
    341322foreach ($__dashboard_items as $i) 
Note: See TracChangeset for help on using the changeset viewer.

Sites map