From 35eb6b4af13ac832ae42d628ed665613bb5ca48b Mon Sep 17 00:00:00 2001 From: patdenice Date: Wed, 25 May 2011 11:01:27 +0000 Subject: Rename plugins_list.tpl into plugins_installed.tpl. Update obsolete_extensions.list for 2.3. git-svn-id: http://piwigo.org/svn/trunk@11048 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/plugins_installed.php | 2 +- .../themes/default/template/plugins_installed.tpl | 214 +++++++++++++++++++++ admin/themes/default/template/plugins_list.tpl | 214 --------------------- install/obsolete_extensions.list | 8 +- 4 files changed, 222 insertions(+), 216 deletions(-) create mode 100644 admin/themes/default/template/plugins_installed.tpl delete mode 100644 admin/themes/default/template/plugins_list.tpl diff --git a/admin/plugins_installed.php b/admin/plugins_installed.php index 26ba295e2..a16dbaaef 100644 --- a/admin/plugins_installed.php +++ b/admin/plugins_installed.php @@ -28,7 +28,7 @@ if( !defined("PHPWG_ROOT_PATH") ) include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php'); -$template->set_filenames(array('plugins' => 'plugins_list.tpl')); +$template->set_filenames(array('plugins' => 'plugins_installed.tpl')); // display mode $plugin_display = isset($_GET['plugin_display']) ? $_GET['plugin_display'] : (pwg_get_session_var('plugin_display') != null ? pwg_get_session_var('plugin_display') : 'compact'); diff --git a/admin/themes/default/template/plugins_installed.tpl b/admin/themes/default/template/plugins_installed.tpl new file mode 100644 index 000000000..c7480a9e7 --- /dev/null +++ b/admin/themes/default/template/plugins_installed.tpl @@ -0,0 +1,214 @@ +{combine_script id='jquery.ajaxmanager' load='footer' require='jquery' path='themes/default/js/plugins/jquery.ajaxmanager.js' } + +{footer_script require='jquery.ajaxmanager'} +/* incompatible message */ +var incompatible_msg = '{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'javascript'}'; +var activate_msg = '\n{'Do you want to activate anyway?'|@translate|@escape:'javascript'}'; + +/* group action */ +var pwg_token = '{$PWG_TOKEN}'; +var confirmMsg = '{'Are you sure?'|@translate|@escape:'javascript'}'; +{literal} +var queuedManager = jQuery.manageAjax.create('queued', { + queue: true, + maxRequests: 1, + complete: function() { location.reload(); } +}); + +jQuery(document).ready(function() { + /* group action */ + jQuery('div.deactivate_all a').click(function() { + if (confirm(confirmMsg)) { + jQuery('div.active').each(function() { + performPluginDeactivate(jQuery(this).attr('id')); + }); + } + }); + function performPluginDeactivate(id) { + queuedManager.add({ + type: 'GET', + dataType: 'json', + url: 'ws.php', + data: { method: 'pwg.plugins.performAction', action: 'deactivate', plugin: id, pwg_token: pwg_token, format: 'json' }, + success: function(data) { + if (data['stat'] == 'ok') { + jQuery("#"+id).removeClass('active').addClass('inactive'); + } + } + }); + }; + + /* incompatible plugins */ + jQuery(document).ready(function() { + jQuery.ajax({ + method: 'GET', + url: 'admin.php', + data: { page: 'plugins_installed', incompatible_plugins: true }, + dataType: 'json', + success: function(data) { + for (i=0;i') + {else} + jQuery('#'+data[i]+' .pluginMiniBoxNameCell').prepend('') + {/if} + {literal} + jQuery('#'+data[i]).addClass('incompatible'); + jQuery('#'+data[i]+' .activate').attr('onClick', 'return confirm(incompatible_msg + activate_msg);'); + } + jQuery('.warning').tipTip({ + 'delay' : 0, + 'fadeIn' : 200, + 'fadeOut' : 200, + 'maxWidth':'250px' + }); + } + }); + }); + + /* TipTips */ + jQuery('.plugin-restore').tipTip({ + 'delay' : 0, + 'fadeIn' : 200, + 'fadeOut' : 200 + }); + jQuery('.showInfo').tipTip({ + 'delay' : 0, + 'fadeIn' : 200, + 'fadeOut' : 200, + 'maxWidth':'300px', /* not effective, TipTip bug */ + 'keepAlive':true, + 'activation':'click' + }); +}); +{/literal} +{/footer_script} + +
+ +
+ + {'Display'|@translate} : + +
+
+

{'Plugins'|@translate}

+
+ +{if isset($plugins)} + +{assign var='field_name' value='null'} +{foreach from=$plugins item=plugin name=plugins_loop} + +{if $field_name != $plugin.STATE} + {if $field_name != 'null'} + {if $field_name == 'active'}{/if} + + {/if} + +
+ + {if $plugin.STATE == 'active'} + {'Active Plugins'|@translate} + {elseif $plugin.STATE == 'inactive'} + {'Inactive Plugins'|@translate} + {elseif $plugin.STATE == 'missing'} + {'Missing Plugins'|@translate} + {elseif $plugin.STATE == 'merged'} + {'Obsolete Plugins'|@translate} + {/if} + + {assign var='field_name' value=$plugin.STATE} +{/if} + + {if not empty($plugin.AUTHOR)} + {if not empty($plugin.AUTHOR_URL)} + {assign var='author' value="%s"|@sprintf:$plugin.AUTHOR_URL:$plugin.AUTHOR} + {else} + {assign var='author' value=''|cat:$plugin.AUTHOR|cat:''} + {/if} + {/if} + + {if $plugin_display == 'complete'} +
+ + + + + + + + + +
+ {$plugin.NAME} + {$plugin.DESC}
+ {if $plugin.STATE == 'active'} + {'Deactivate'|@translate} + | {'Restore'|@translate} + + {elseif $plugin.STATE == 'inactive'} + {'Activate'|@translate} + | {'Delete'|@translate} + + {elseif $plugin.STATE == 'missing'} + {'Uninstall'|@translate} + + {elseif $plugin.STATE == 'merged'} + {'Delete'|@translate} + {/if} + + {'Version'|@translate} {$plugin.VERSION} + + {if not empty($author)} + | {'By %s'|@translate|@sprintf:$author} + {/if} + + {if not empty($plugin.VISIT_URL)} + | {'Visit plugin site'|@translate} + {/if} +
+
{**} + + {elseif $plugin_display == 'compact'} + {if not empty($plugin.VISIT_URL)} + {assign var='version' value=""|cat:$plugin.VERSION|cat:""} + {else + {assign var='version' value=$plugin.VERSION} + {/if} + +
+
+ {$plugin.NAME} + i +
+
+
+ {if $plugin.STATE == 'active'} + {'Deactivate'|@translate} + | {'Restore'|@translate} + + {elseif $plugin.STATE == 'inactive'} + {'Activate'|@translate} + | {'Delete'|@translate} + + {elseif $plugin.STATE == 'missing'} + {'Uninstall'|@translate} + + {elseif $plugin.STATE == 'merged'} + {'Delete'|@translate} + {/if} +
+
+
{**} + + {/if} + +{/foreach} +
+ +{/if} diff --git a/admin/themes/default/template/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl deleted file mode 100644 index c7480a9e7..000000000 --- a/admin/themes/default/template/plugins_list.tpl +++ /dev/null @@ -1,214 +0,0 @@ -{combine_script id='jquery.ajaxmanager' load='footer' require='jquery' path='themes/default/js/plugins/jquery.ajaxmanager.js' } - -{footer_script require='jquery.ajaxmanager'} -/* incompatible message */ -var incompatible_msg = '{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'javascript'}'; -var activate_msg = '\n{'Do you want to activate anyway?'|@translate|@escape:'javascript'}'; - -/* group action */ -var pwg_token = '{$PWG_TOKEN}'; -var confirmMsg = '{'Are you sure?'|@translate|@escape:'javascript'}'; -{literal} -var queuedManager = jQuery.manageAjax.create('queued', { - queue: true, - maxRequests: 1, - complete: function() { location.reload(); } -}); - -jQuery(document).ready(function() { - /* group action */ - jQuery('div.deactivate_all a').click(function() { - if (confirm(confirmMsg)) { - jQuery('div.active').each(function() { - performPluginDeactivate(jQuery(this).attr('id')); - }); - } - }); - function performPluginDeactivate(id) { - queuedManager.add({ - type: 'GET', - dataType: 'json', - url: 'ws.php', - data: { method: 'pwg.plugins.performAction', action: 'deactivate', plugin: id, pwg_token: pwg_token, format: 'json' }, - success: function(data) { - if (data['stat'] == 'ok') { - jQuery("#"+id).removeClass('active').addClass('inactive'); - } - } - }); - }; - - /* incompatible plugins */ - jQuery(document).ready(function() { - jQuery.ajax({ - method: 'GET', - url: 'admin.php', - data: { page: 'plugins_installed', incompatible_plugins: true }, - dataType: 'json', - success: function(data) { - for (i=0;i') - {else} - jQuery('#'+data[i]+' .pluginMiniBoxNameCell').prepend('') - {/if} - {literal} - jQuery('#'+data[i]).addClass('incompatible'); - jQuery('#'+data[i]+' .activate').attr('onClick', 'return confirm(incompatible_msg + activate_msg);'); - } - jQuery('.warning').tipTip({ - 'delay' : 0, - 'fadeIn' : 200, - 'fadeOut' : 200, - 'maxWidth':'250px' - }); - } - }); - }); - - /* TipTips */ - jQuery('.plugin-restore').tipTip({ - 'delay' : 0, - 'fadeIn' : 200, - 'fadeOut' : 200 - }); - jQuery('.showInfo').tipTip({ - 'delay' : 0, - 'fadeIn' : 200, - 'fadeOut' : 200, - 'maxWidth':'300px', /* not effective, TipTip bug */ - 'keepAlive':true, - 'activation':'click' - }); -}); -{/literal} -{/footer_script} - -
- -
- - {'Display'|@translate} : - -
-
-

{'Plugins'|@translate}

-
- -{if isset($plugins)} - -{assign var='field_name' value='null'} -{foreach from=$plugins item=plugin name=plugins_loop} - -{if $field_name != $plugin.STATE} - {if $field_name != 'null'} - {if $field_name == 'active'}{/if} - - {/if} - -
- - {if $plugin.STATE == 'active'} - {'Active Plugins'|@translate} - {elseif $plugin.STATE == 'inactive'} - {'Inactive Plugins'|@translate} - {elseif $plugin.STATE == 'missing'} - {'Missing Plugins'|@translate} - {elseif $plugin.STATE == 'merged'} - {'Obsolete Plugins'|@translate} - {/if} - - {assign var='field_name' value=$plugin.STATE} -{/if} - - {if not empty($plugin.AUTHOR)} - {if not empty($plugin.AUTHOR_URL)} - {assign var='author' value="%s"|@sprintf:$plugin.AUTHOR_URL:$plugin.AUTHOR} - {else} - {assign var='author' value=''|cat:$plugin.AUTHOR|cat:''} - {/if} - {/if} - - {if $plugin_display == 'complete'} -
- - - - - - - - - -
- {$plugin.NAME} - {$plugin.DESC}
- {if $plugin.STATE == 'active'} - {'Deactivate'|@translate} - | {'Restore'|@translate} - - {elseif $plugin.STATE == 'inactive'} - {'Activate'|@translate} - | {'Delete'|@translate} - - {elseif $plugin.STATE == 'missing'} - {'Uninstall'|@translate} - - {elseif $plugin.STATE == 'merged'} - {'Delete'|@translate} - {/if} - - {'Version'|@translate} {$plugin.VERSION} - - {if not empty($author)} - | {'By %s'|@translate|@sprintf:$author} - {/if} - - {if not empty($plugin.VISIT_URL)} - | {'Visit plugin site'|@translate} - {/if} -
-
{**} - - {elseif $plugin_display == 'compact'} - {if not empty($plugin.VISIT_URL)} - {assign var='version' value=""|cat:$plugin.VERSION|cat:""} - {else - {assign var='version' value=$plugin.VERSION} - {/if} - -
-
- {$plugin.NAME} - i -
-
-
- {if $plugin.STATE == 'active'} - {'Deactivate'|@translate} - | {'Restore'|@translate} - - {elseif $plugin.STATE == 'inactive'} - {'Activate'|@translate} - | {'Delete'|@translate} - - {elseif $plugin.STATE == 'missing'} - {'Uninstall'|@translate} - - {elseif $plugin.STATE == 'merged'} - {'Delete'|@translate} - {/if} -
-
-
{**} - - {/if} - -{/foreach} -
- -{/if} diff --git a/install/obsolete_extensions.list b/install/obsolete_extensions.list index cc983e4cd..4dc127470 100644 --- a/install/obsolete_extensions.list +++ b/install/obsolete_extensions.list @@ -2,4 +2,10 @@ 396: albums 449: Photos 405: unTagged -440: bulk_manager \ No newline at end of file +440: bulk_manager +302: autoupdate +525: regenerateThumbnails +529: regenerateWebsize +388: square_thumbnails +522: external_ImageMagick +327: Ajax_Thumbnailer \ No newline at end of file -- cgit v1.2.3