Changeset 9491


Ignore:
Timestamp:
03/03/11 11:13:17 (9 years ago)
Author:
patdenice
Message:

New plugins update page.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/plugins_update.php

    r8728 r9491  
    120120      $plugin_info = $plugins->server_plugins[$fs_plugin['extension']]; 
    121121 
    122       list($date, ) = explode(' ', $plugin_info['revision_date']); 
    123  
    124       $ext_desc = '<i>'.l10n('Downloads').':</i> '.$plugin_info['extension_nb_downloads']."\r\n" 
    125         ."\r\n" 
    126         .$plugin_info['extension_description']; 
    127  
    128       $rev_desc = '<i>'.l10n('Version').':</i> '.$plugin_info['revision_name']."\r\n" 
    129         .'<i>'.l10n('Released on').':</i> '.$date."\r\n" 
    130         .'<i>'.l10n('Downloads').':</i> '.$plugin_info['revision_nb_downloads']."\r\n" 
    131         ."\r\n" 
    132         .$plugin_info['revision_description']; 
    133  
    134       if ($plugins->plugin_version_compare($fs_plugin['version'], $plugin_info['revision_name'])) 
     122      if (!$plugins->plugin_version_compare($fs_plugin['version'], $plugin_info['revision_name'])) 
    135123      { 
    136         // Plugin is up to date 
    137         $template->append('plugins_uptodate', array( 
    138           'URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'], 
    139           'NAME' => $fs_plugin['name'], 
    140           'EXT_DESC' => $ext_desc, 
    141           'VERSION' => $fs_plugin['version'], 
    142           'VER_DESC' => $rev_desc)); 
    143       } 
    144       else 
    145       { 
    146         // Plugin need upgrade 
    147124        $url_auto_update = $base_url 
    148125          . '&amp;revision=' . $plugin_info['revision_id'] 
     
    151128          ; 
    152129 
    153         $template->append('plugins_not_uptodate', array( 
     130        $template->append('plugins', array( 
     131          'ID' => $plugin_info['extension_id'], 
    154132          'EXT_NAME' => $fs_plugin['name'], 
    155133          'EXT_URL' => PEM_URL.'/extension_view.php?eid='.$plugin_info['extension_id'], 
    156           'EXT_DESC' => $ext_desc, 
    157           'VERSION' => $fs_plugin['version'], 
    158           'NEW_VERSION' => $plugin_info['revision_name'], 
    159           'NEW_VER_DESC' => $rev_desc, 
     134          'EXT_DESC' => trim($plugin_info['extension_description'], " \n\r"), 
     135          'REV_DESC' => trim($plugin_info['revision_description'], " \n\r"), 
     136          'VERSION' => $plugin_info['revision_name'], 
     137          'AUTHOR' => $plugin_info['author_name'], 
     138          'DOWNLOADS' => $plugin_info['extension_nb_downloads'], 
    160139          'URL_UPDATE' => $url_auto_update, 
    161140          'URL_DOWNLOAD' => $plugin_info['download_url'] . '&amp;origin=piwigo_download')); 
    162141      } 
    163     } 
    164     else 
    165     { 
    166       // Can't check plugin 
    167       $template->append('plugins_cant_check', array( 
    168         'NAME' => $fs_plugin['name'], 
    169         'VERSION' => $fs_plugin['version'])); 
    170142    } 
    171143  } 
     
    173145else 
    174146{ 
     147  $template->assign('SERVER_ERROR', true); 
    175148  array_push($page['errors'], l10n('Can\'t connect to server.')); 
    176149} 
  • trunk/admin/themes/default/template/plugins_update.tpl

    r7995 r9491  
     1{combine_script id='jquery.ui' load='async' require='jquery' path='themes/default/js/jquery.ui.min.js' } 
    12{combine_script id='jquery.cluetip' load='async' require='jquery' path='themes/default/js/plugins/jquery.cluetip.packed.js'} 
    23{footer_script require='jquery.cluetip'} 
     
    1314</div> 
    1415 
    15 {if isset($plugins_not_uptodate)} 
    16 <br> 
    17 <b>{'Plugins which need upgrade'|@translate}</b> 
    18 <table class="table2 plugins"> 
    19 <thead> 
    20   <tr class="throw"> 
    21     <td>{'Name'|@translate}</td> 
    22     <td>{'Current<br>version'|@translate}</td> 
    23     <td>{'Available<br>version'|@translate}</td> 
    24     <td>{'Actions'|@translate}</td> 
    25   </tr> 
    26 </thead> 
    27 {foreach from=$plugins_not_uptodate item=plugin name=plugins_loop} 
    28   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> 
    29     <td><a href="{$plugin.EXT_URL}" class="externalLink cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.EXT_NAME}</a></td> 
    30     <td style="text-align:center;">{$plugin.VERSION}</td> 
    31     <td style="text-align:center;"><a href="{$plugin.EXT_URL}" class="externalLink cluetip" title="{$plugin.EXT_NAME}|{$plugin.NEW_VER_DESC|htmlspecialchars|nl2br}">{$plugin.NEW_VERSION}</a></td> 
    32     <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'|@translate|@escape:javascript}');">{'Automatic upgrade'|@translate}</a> 
    33       / <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a></td> 
    34   </tr> 
     16{if not empty($plugins)} 
     17<div id="availablePlugins"> 
     18<fieldset> 
     19<legend>{'Plugins which need upgrade'|@translate}</legend> 
     20{foreach from=$plugins item=plugin name=plugins_loop} 
     21<div class="pluginBox" id="plugin_{$plugin.ID}"> 
     22  <table> 
     23    <tr> 
     24      <td class="pluginBoxNameCell"> 
     25        <a href="{$plugin.EXT_URL}" class="externalLink cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.EXT_NAME}</a> 
     26      </td> 
     27      <td> 
     28        <a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'|@translate|@escape:javascript}');">{'Automatic upgrade'|@translate}</a> 
     29        | <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a> 
     30      </td> 
     31    </tr> 
     32    <tr> 
     33      <td> 
     34        <a href="{$plugin.EXT_URL}" class="externalLink cluetip" title="{'Version'|@translate} {$plugin.VERSION}|{$plugin.REV_DESC|htmlspecialchars|nl2br}"> {'Version'|@translate} {$plugin.VERSION}</a> 
     35      </td> 
     36      <td> 
     37        <em>{'Downloads'|@translate}: {$plugin.DOWNLOADS}</em> 
     38        {'By %s'|@translate|@sprintf:$plugin.AUTHOR} 
     39      </td> 
     40    </tr> 
     41  </table> 
     42</div> 
    3543{/foreach} 
    36 </table> 
     44</fieldset> 
     45</div> 
     46{elseif not isset($SERVER_ERROR)} 
     47<p>{'All plugins are up to date.'|@translate}</p> 
    3748{/if} 
    38  
    39  
    40 {if isset($plugins_uptodate)} 
    41 <br> 
    42 <b>{'Plugins up to date'|@translate}</b> 
    43 <table class="table2 plugins"> 
    44 <thead> 
    45   <tr class="throw"> 
    46     <td>{'Name'|@translate}</td> 
    47     <td>{'Version'|@translate}</td> 
    48   </tr> 
    49 </thead> 
    50 {foreach from=$plugins_uptodate item=plugin name=plugins_loop} 
    51   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> 
    52     <td><a href="{$plugin.URL}" class="externalLink cluetip" title="{$plugin.NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.NAME}</a></td> 
    53     <td style="text-align:center;"><a href="{$plugin.URL}" class="externalLink cluetip" title="{$plugin.NAME}|{$plugin.VER_DESC|htmlspecialchars|nl2br}">{$plugin.VERSION}</a></td> 
    54   </tr> 
    55 {/foreach} 
    56 </table> 
    57 {/if} 
    58  
    59  
    60 {if isset($plugins_cant_check)} 
    61 <br> 
    62 <b>{'Plugin versions can\'t be checked'|@translate}</b> 
    63 <table class="table2 plugins"> 
    64 <thead> 
    65   <tr class="throw"> 
    66     <td>{'Name'|@translate}</td> 
    67     <td>{'Version'|@translate}</td> 
    68   </tr> 
    69 </thead> 
    70 {foreach from=$plugins_cant_check item=plugin name=plugins_loop} 
    71   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}"> 
    72     <td>{$plugin.NAME}</td> 
    73     <td style="text-align:center;">{$plugin.VERSION}</td> 
    74   </tr> 
    75 {/foreach} 
    76 </table> 
    77 {/if} 
  • trunk/language/en_UK/admin.lang.php

    r9472 r9491  
    521521$lang['Plugin has been successfully copied'] = "The plugin has been successfully copied"; 
    522522$lang['Plugin list'] = "Plugins list"; 
    523 $lang['Plugin versions can\'t be checked'] = "Plugin which version cannot be checked"; 
    524 $lang['Plugins up to date'] = "Plugins up-to-date"; 
    525523$lang['Plugins which need upgrade'] = "Plugins to be upgraded"; 
    526524$lang['Plugins'] = "Plugins"; 
     
    777775$lang['[Simulation]'] = "[Simulation]"; 
    778776$lang['Themes which need upgrade'] = 'Themes which need upgrade'; 
    779 $lang['Themes up to date'] = 'Themes up to date'; 
    780 $lang['Theme versions can\'t be checked'] = 'Theme versions can\'t be checked'; 
     777$lang['All themes are up to date.'] = 'All themes are up to date.'; 
     778$lang['All plugins are up to date.'] = 'All plugins are up to date.'; 
    781779?> 
  • trunk/language/fr_FR/admin.lang.php

    r9472 r9491  
    788788$lang['Remove from caddie'] = 'Retirer du panier'; 
    789789$lang['Themes which need upgrade'] = 'Thèmes à mettre à jour'; 
    790 $lang['Themes up to date'] = 'Thèmes à jour'; 
    791 $lang['Theme versions can\'t be checked'] = 'Impossible de vérifier les thèmes suivants'; 
     790$lang['All themes are up to date.'] = 'Tous les thèmes sont à jour.'; 
     791$lang['All plugins are up to date.'] = 'Tous les plugins sont à jour.'; 
    792792?> 
Note: See TracChangeset for help on using the changeset viewer.