diff options
author | patdenice <patdenice@piwigo.org> | 2011-04-21 15:12:38 +0000 |
---|---|---|
committer | patdenice <patdenice@piwigo.org> | 2011-04-21 15:12:38 +0000 |
commit | f5ef4fddd7ce277f27ef4face7933fe5a7406200 (patch) | |
tree | 128762355458b207214d41431c3bd9cabbfc6761 /admin/themes | |
parent | e1fd6aa04b301bb52a9ffa6423ba1885a3e21ddc (diff) |
feature:2271
Add pwg.extensions.checkUpdates method to webservices.
Add a warning message on intro page if update is availble for piwigo or extensions.
Add an "Ignore All" button on extensions update page.
git-svn-id: http://piwigo.org/svn/trunk@10538 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes')
-rw-r--r-- | admin/themes/default/template/intro.tpl | 28 | ||||
-rw-r--r-- | admin/themes/default/template/updates_ext.tpl | 20 |
2 files changed, 41 insertions, 7 deletions
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl index aa744ac48..0f4dc7c00 100644 --- a/admin/themes/default/template/intro.tpl +++ b/admin/themes/default/template/intro.tpl @@ -1,13 +1,37 @@ {combine_script id='jquery.cluetip' load='async' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'} {footer_script require='jquery.cluetip'} -jQuery().ready(function(){ldelim} - jQuery('.cluetip').cluetip({ldelim} +var piwigo_need_update_msg = '<a href="admin.php?page=updates">{"A new version of Piwigo is available."|@translate|@escape:"javascript"}</a>'; +var ext_need_update_msg = '<a href="admin.php?page=updates&tab=ext">{"Some upgrades are available for extensions."|@translate|@escape:"javascript"}</a>'; + +{literal} +jQuery().ready(function(){ + jQuery('.cluetip').cluetip({ width: 300, splitTitle: '|', positionBy: 'bottomTop' }); + jQuery.ajax({ + type: 'GET', + url: 'ws.php', + dataType: 'json', + data: { method: 'pwg.extensions.checkUpdates', format: 'json' }, + timeout: 5000, + success: function (data) { + if (data['stat'] != 'ok') + return; + piwigo_update = data['result']['piwigo_need_update']; + ext_update = data['result']['ext_need_update'] + if ((piwigo_update || ext_update) && !jQuery(".warnings").is('div')) + jQuery("#content").prepend('<div class="warnings"><ul></ul></div>'); + if (piwigo_update) + jQuery(".warnings ul").append('<li>'+piwigo_need_update_msg+'</li>'); + if (ext_update) + jQuery(".warnings ul").append('<li>'+ext_need_update_msg+'</li>'); + } + }); }); +{/literal} {/footer_script} <h2>{'Piwigo Administration'|@translate}</h2> diff --git a/admin/themes/default/template/updates_ext.tpl b/admin/themes/default/template/updates_ext.tpl index a2ffccd4d..a4f52f10b 100644 --- a/admin/themes/default/template/updates_ext.tpl +++ b/admin/themes/default/template/updates_ext.tpl @@ -29,6 +29,13 @@ function updateAll() { } }; +function ignoreAll() { + jQuery('.ignoreExtension').each( function() { + if (jQuery(this).parents('div').css('display') == 'block') + jQuery(this).click(); + }); +}; + function resetIgnored() { jQuery.ajax({ type: 'GET', @@ -39,6 +46,7 @@ function resetIgnored() { if (data['stat'] == 'ok') { jQuery(".pluginBox, fieldset").show(); jQuery("#update_all").show(); + jQuery("#ignore_all").show(); jQuery("#up_to_date").hide(); jQuery("#reset_ignore").hide(); jQuery("#ignored").hide(); @@ -67,6 +75,7 @@ function checkFieldsets() { if (total == 0) { jQuery("#update_all").hide(); + jQuery("#ignore_all").hide(); jQuery("#up_to_date").show(); } if (ignored > 0) { @@ -96,7 +105,7 @@ function updateExtension(type, id, revision) { }; function ignoreExtension(type, id) { - jQuery.ajax({ + queuedManager.add({ type: 'GET', url: 'ws.php', dataType: 'json', @@ -137,10 +146,11 @@ checkFieldsets(); <div class="autoupdate_bar"> <br> <input type="submit" id="update_all" value="{'Update All'|@translate}" onClick="updateAll(); return false;"> +<input type="submit" id="ignore_all" value="{'Ignore All'|@translate}" onClick="ignoreAll(); return false;"> <input type="submit" id="reset_ignore" value="{'Reset ignored updates'|@translate}" onClick="resetIgnored(); return false;" {if !$SHOW_RESET}style="display:none;"{/if}> </div> <div class="autoupdate_bar" style="display:none;"> -{'Update in progress... Please wait.'|@translate}<br><img src="admin/themes/default/images/ajax-loader-bar.gif"> +{'Please wait...'|@translate}<br><img src="admin/themes/default/images/ajax-loader-bar.gif"> </div> <p id="up_to_date" style="display:none; text-align:left; margin-left:20px;">{'All extensions are up to date.'|@translate}</p> @@ -159,7 +169,7 @@ checkFieldsets(); <td> <a href="#" onClick="updateExtension('plugins', '{$plugin.EXT_ID}', {$plugin.REVISION_ID});" class="updateExtension">{'Install'|@translate}</a> | <a href="{$plugin.URL_DOWNLOAD}">{'Download'|@translate}</a> - | <a href="#" onClick="ignoreExtension('plugins', '{$plugin.EXT_ID}'); return false;">{'Ignore this update'|@translate}</a> + | <a href="#" onClick="ignoreExtension('plugins', '{$plugin.EXT_ID}'); return false;" class="ignoreExtension">{'Ignore this update'|@translate}</a> </td> </tr> <tr> @@ -201,7 +211,7 @@ checkFieldsets(); <td> <a href="#" onClick="updateExtension('themes', '{$theme.EXT_ID}', {$theme.REVISION_ID});" class="updateExtension">{'Install'|@translate}</a> | <a href="{$theme.URL_DOWNLOAD}">{'Download'|@translate}</a> - | <a href="#" onClick="ignoreExtension('themes', '{$theme.EXT_ID}'); return false;">{'Ignore this update'|@translate}</a> + | <a href="#" onClick="ignoreExtension('themes', '{$theme.EXT_ID}'); return false;" class="ignoreExtension">{'Ignore this update'|@translate}</a> </td> </tr> <tr> @@ -243,7 +253,7 @@ checkFieldsets(); <td> <a href="#" onClick="updateExtension('languages', '{$language.EXT_ID}', {$language.REVISION_ID});" class="updateExtension">{'Install'|@translate}</a> | <a href="{$language.URL_DOWNLOAD}">{'Download'|@translate}</a> - | <a href="#" onClick="ignoreExtension('languages', '{$language.EXT_ID}'); return false;">{'Ignore this update'|@translate}</a> + | <a href="#" onClick="ignoreExtension('languages', '{$language.EXT_ID}'); return false;" class="ignoreExtension">{'Ignore this update'|@translate}</a> </td> </tr> <tr> |