Changeset 11010
- Timestamp:
- May 23, 2011, 2:34:08 PM (13 years ago)
- Location:
- trunk/admin
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/plugins_installed.php
r10817 r11010 31 31 $template->set_filenames(array('plugins' => 'plugins_list.tpl')); 32 32 33 // order and display mode 34 $plugin_order = isset($_GET['plugin_order']) ? $_GET['plugin_order'] : (pwg_get_session_var('plugin_order') != null ? pwg_get_session_var('plugin_order') : 'state'); 33 // display mode 35 34 $plugin_display = isset($_GET['plugin_display']) ? $_GET['plugin_display'] : (pwg_get_session_var('plugin_display') != null ? pwg_get_session_var('plugin_display') : 'compact'); 36 pwg_set_session_var('plugin_order', $plugin_order);37 35 pwg_set_session_var('plugin_display', $plugin_display); 38 36 … … 149 147 } 150 148 151 // sort plugins : state or name 152 if ($plugin_order == 'name') 153 { 154 function cmp($a, $b) 155 { 149 // sort plugins by state then by name 150 function cmp($a, $b) 151 { 152 $s = array('merged' => 0, 'missing' => 1, 'active' => 2, 'inactive' => 3); 153 154 if($a['STATE'] == $b['STATE']) 156 155 return strcasecmp($a['NAME'], $b['NAME']); 157 } 156 else 157 return $s[$a['STATE']] >= $s[$b['STATE']]; 158 158 } 159 else 160 { 161 function cmp($a, $b) 162 { 163 $s = array('merged' => 0, 'missing' => 1, 'active' => 2, 'inactive' => 3); 164 165 if($a['STATE'] == $b['STATE']) 166 return strcasecmp($a['NAME'], $b['NAME']); 167 else 168 return $s[$a['STATE']] >= $s[$b['STATE']]; 169 } 170 $plugin_order = 'state'; 171 } 159 usort($tpl_plugins, 'cmp'); 172 160 173 usort($tpl_plugins, 'cmp');174 161 $template->assign(array( 175 'plugin_order' => $plugin_order,176 162 'plugin_display' => $plugin_display, 177 163 'plugins' => $tpl_plugins, -
trunk/admin/themes/clear/theme.css
r11009 r11010 258 258 #footer { background-image: url(images/piwigo_logo_small.png);} 259 259 260 .pluginBox, .pluginMiniBox {background-color:#ddd;color:#353535;border :1px solid#ddd;}260 .pluginBox, .pluginMiniBox {background-color:#ddd;color:#353535;border-color:#ddd;} 261 261 .pluginBoxNameCell, .pluginMiniBoxNameCell {color:#111;} 262 .pluginBox.active, .pluginMiniBox.active {border-color:#666;background-color:#dadada;}263 262 .pluginBox.incompatible, .pluginMiniBox.incompatible {border-color:#a00 !important;} 264 .pluginBox .missing, .pluginBox.merged, .pluginMiniBox.missing, .pluginMiniBox.merged{background-color:#d99;border:1px solid #a00;}265 . plugin-delete {color:#f00;}263 .pluginBoxes .merged, .pluginBoxes .missing {background-color:#d99;border:1px solid #a00;} 264 .deactivate_all {color:#005E89;border-color:#005E89;} 266 265 267 266 .languageBox {background-color:#ddd;} -
trunk/admin/themes/default/template/plugins_list.tpl
r10594 r11010 22 22 if (confirm(confirmMsg)) { 23 23 jQuery('div.active').each(function() { 24 performPlugin Action(jQuery(this).attr('id'), 'deactivate');24 performPluginDeactivate(jQuery(this).attr('id')); 25 25 }); 26 26 } 27 27 }); 28 jQuery('a.activate_all').click(function() { 29 if (confirm(confirmMsg)) { 30 jQuery('div.inactive').each(function() { 31 performPluginAction(jQuery(this).attr('id'), 'activate'); 32 }); 33 } 34 }); 35 function performPluginAction(id, action) { 28 function performPluginDeactivate(id) { 36 29 queuedManager.add({ 37 30 type: 'GET', 38 31 dataType: 'json', 39 32 url: 'ws.php', 40 data: { method: 'pwg.plugins.performAction', action: action, plugin: id, pwg_token: pwg_token, format: 'json' },33 data: { method: 'pwg.plugins.performAction', action: 'deactivate', plugin: id, pwg_token: pwg_token, format: 'json' }, 41 34 success: function(data) { 42 35 if (data['stat'] == 'ok') { 43 if (action == 'deactivate') 44 jQuery("#"+id).removeClass('active').addClass('inactive'); 45 else 46 jQuery("#"+id).removeClass('inactive').addClass('active'); 36 jQuery("#"+id).removeClass('active').addClass('inactive'); 47 37 } 48 38 } … … 81 71 <div class="titrePage"> 82 72 <span class="sort"> 83 <form action="" method="get" name="change_ order">73 <form action="" method="get" name="change_display"> 84 74 <input type="hidden" name="page" value="plugins"/> 85 {'Sort order'|@translate} :86 <select name="plugin_order" onchange="this.form.submit();">87 <option value="status" {if $plugin_order=='state'}selected="selected"{/if}>{'Status'|@translate}</option>88 <option value="name" {if $plugin_order=='name'}selected="selected"{/if}>{'Name'|@translate}</option>89 </select>90 | 91 75 {'Display'|@translate} : 92 76 <select name="plugin_display" onchange="this.form.submit();"> … … 94 78 <option value="complete" {if $plugin_display=='complete'}selected="selected"{/if}>{'Complete'|@translate}</option> 95 79 </select> 96 | 97 <a class="deactivate_all">{'Deactivate'|@translate} {'all'|@translate}</a>98 {* | 99 <a class="activate_all">{'Activate'|@translate} {'all'|@translate}</a> *}100 80 </form> 101 81 </span> … … 108 88 {foreach from=$plugins item=plugin name=plugins_loop} 109 89 110 {if $ plugin_order == 'state' AND $field_name != $plugin.STATE}90 {if $field_name != $plugin.STATE} 111 91 {if $field_name != 'null'}</fieldset>{/if} 112 <fieldset class="pluginBoxes pluginsByState">92 <fieldset class="pluginBoxes"> 113 93 <legend> 114 94 {if $plugin.STATE == 'active'} … … 123 103 </legend> 124 104 {assign var='field_name' value=$plugin.STATE} 125 126 {elseif $field_name == 'null'} 127 <fieldset class="pluginBoxes pluginsByName"> 128 {assign var='field_name' value='not_null'} 129 105 {if $field_name == 'active'}<a class="deactivate_all">{'Deactivate'|@translate} {'all'|@translate}</a>{/if} 130 106 {/if} 131 107 … … 148 124 <td>{$plugin.DESC}</td> 149 125 </tr> 150 <tr >126 <tr class="pluginActions"> 151 127 <td> 152 128 {if $plugin.STATE == 'active'} … … 156 132 {elseif $plugin.STATE == 'inactive'} 157 133 <a href="{$plugin.U_ACTION}&action=activate" {if $plugin.INCOMPATIBLE}class="incompatible"{/if}>{'Activate'|@translate}</a> 158 | <a href="{$plugin.U_ACTION}&action=delete" class="plugin-delete"onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Delete'|@translate}</a>134 | <a href="{$plugin.U_ACTION}&action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Delete'|@translate}</a> 159 135 160 136 {elseif $plugin.STATE == 'missing'} 161 <a href="{$plugin.U_ACTION}&action=uninstall" class="plugin-delete"onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Uninstall'|@translate}</a>137 <a href="{$plugin.U_ACTION}&action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Uninstall'|@translate}</a> 162 138 163 139 {elseif $plugin.STATE == 'merged'} 164 <a href="{$plugin.U_ACTION}&action=delete" class="plugin-delete">{'Delete'|@translate}</a>140 <a href="{$plugin.U_ACTION}&action=delete">{'Delete'|@translate}</a> 165 141 {/if} 166 142 </td> … … 200 176 {elseif $plugin.STATE == 'inactive'} 201 177 <a href="{$plugin.U_ACTION}&action=activate" {if $plugin.INCOMPATIBLE}class="incompatible"{/if}>{'Activate'|@translate}</a> 202 | <a href="{$plugin.U_ACTION}&action=delete" class="plugin-delete"onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Delete'|@translate}</a>178 | <a href="{$plugin.U_ACTION}&action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Delete'|@translate}</a> 203 179 204 180 {elseif $plugin.STATE == 'missing'} 205 <a href="{$plugin.U_ACTION}&action=uninstall" class="plugin-delete"onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Uninstall'|@translate}</a>181 <a href="{$plugin.U_ACTION}&action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Uninstall'|@translate}</a> 206 182 207 183 {elseif $plugin.STATE == 'merged'} 208 <a href="{$plugin.U_ACTION}&action=delete" class="plugin-delete">{'Delete'|@translate}</a>184 <a href="{$plugin.U_ACTION}&action=delete">{'Delete'|@translate}</a> 209 185 {/if} 210 186 </div> -
trunk/admin/themes/default/theme.css
r11008 r11010 885 885 .comment A:hover {border:none;} 886 886 887 .pluginBoxes {text-align:left;} 888 .author-group {text-align:left;background:url('icon/remove_filter.png') left center no-repeat;padding-left:15px;margin-left:-15px;} 889 890 .pluginBox {margin-bottom:10px;-moz-border-radius:5px;} 887 .pluginBoxes { 888 text-align:left; 889 position:relative; 890 } 891 892 .pluginBox { 893 margin-bottom:10px; 894 border-width:1px; 895 border-style:solid; 896 border-radius:5px; 897 -moz-border-radius:5px; 898 } 891 899 .pluginBox table {width:99%;} 892 900 .pluginBox td {text-align:left;} 893 901 .pluginBox td.pluginDesc img {vertical-align:middle;} 894 902 .pluginBoxNameCell {width:180px; vertical-align:top;} 895 .pluginBox.inactive, .pluginBox.uninstalled {margin-left:20px;opacity:0.65;filter:alpha(opacity=65);} 896 .pluginsByState .pluginBox.inactive, .pluginsByState .pluginBox.uninstalled {margin-left:0px;opacity:0.8;filter:alpha(opacity=80);} 897 898 .pluginMiniBox {display:inline-table; text-align:center; width:250px; height:40px; margin:5px; -moz-border-radius:5px; overflow:hidden; } 903 .pluginBoxes .inactive, .pluginBoxes .uninstalled {opacity:0.8;filter:alpha(opacity=80);} 904 905 .pluginMiniBox { 906 display:inline-table; 907 text-align:center; 908 width:250px; 909 height:40px; 910 margin:5px; 911 border-width:1px; 912 border-style:solid; 913 border-radius:5px; 914 -moz-border-radius:5px; 915 overflow:hidden; 916 } 899 917 .pluginMiniBoxNameCell {font-size:1.05em; margin:5px 0;} 900 918 .pluginActions {display: table-row; font-size:12px; } 901 919 .pluginActions DIV {display: table-cell; vertical-align: middle; line-height:18px; } 902 .pluginMiniBox.inactive, .pluginMiniBox.uninstalled {opacity:0.65;filter:alpha(opacity=65);}903 .pluginsByState .pluginMiniBox.inactive, .pluginsByState .pluginMiniBox.uninstalled {opacity:0.8;filter:alpha(opacity=80);}904 920 905 921 .warning:before {content:url(icon/warning.png);vertical-align:top;} 906 fieldset.pluginsByName{border:none;}922 .deactivate_all {position:absolute;bottom:-10px;right:18px;color:#f36;border-bottom:1px dotted #f36;font-size:0.8em;} 907 923 908 924 .languageBoxes {min-height:0;text-align:left;} -
trunk/admin/themes/roma/theme.css
r11008 r11010 235 235 #footer {background-image: url(images/piwigo_logo_small.png);} 236 236 237 .pluginBox, .pluginMiniBox {background-color:#333;color:#999;border :1px solid#333;}237 .pluginBox, .pluginMiniBox {background-color:#333;color:#999;border-color:#333;} 238 238 .pluginBoxNameCell, .pluginMiniBoxNameCell {color:#ddd;} 239 .pluginBox.active, .pluginMiniBox.active {border-color:#666;background-color:#383838;}240 239 .pluginBox.incompatible, .pluginMiniBox.incompatible {border-color:#800 !important;} 241 .pluginBox .missing, .pluginBox.merged, .pluginMiniBox.missing, .pluginMiniBox.merged{background-color:#422;border:1px solid #800;}242 .plugin -delete {color:#f00;}240 .pluginBoxes .merged, .pluginBoxes .missing {background-color:#422;border:1px solid #800;} 241 .pluginActions { color:#666; } 243 242 244 243 .languageBox {background-color:#333;}
Note: See TracChangeset
for help on using the changeset viewer.