From: <jon...@us...> - 2009-03-03 14:49:35
|
Revision: 17139 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17139&view=rev Author: jonnybradley Date: 2009-03-03 14:49:25 +0000 (Tue, 03 Mar 2009) Log Message: ----------- [MOD] Put back theme drop-down so it doesn't change the theme without you clicking "apply". It does a post back onchange so you can select theme options. Changed message displayed when drop-down showing theme other than the site theme as it was unclear before (suggestions gratefully recieved!). Moved users change theme below theme option. Would be better if you could preview themes before selecting... TODO Modified Paths: -------------- branches/3.0/templates/tiki-admin-include-look.tpl branches/3.0/tiki-admin_include_look.php Modified: branches/3.0/templates/tiki-admin-include-look.tpl =================================================================== --- branches/3.0/templates/tiki-admin-include-look.tpl 2009-03-03 14:16:16 UTC (rev 17138) +++ branches/3.0/templates/tiki-admin-include-look.tpl 2009-03-03 14:49:25 UTC (rev 17139) @@ -36,36 +36,9 @@ <option value="{$styles[ix]|escape}"{if $a_style eq $styles[ix]} selected="selected"{/if}>{$styles[ix]}</option> {/section} </select> - {if $prefs.site_style != $a_style}<span class="highlight">{tr}* Note: Theme displayed differs from "site" theme ({$prefs.site_style}).{/tr}</span>{/if} + {if $prefs.site_style != $a_style} <span class="highlight">{tr}* Note: theme not saved yet - click "Apply"{/tr}</span>{/if} </td> </tr> - -<tr> - <td class="form">{tr}Reg users can change theme{/tr}:</td> - <td> - <table><tr> - <td style="width: 20px"><input type="checkbox" name="change_theme" {if $prefs.change_theme eq 'y'}checked="checked"{/if}/></td> - <td> - <div id="select_available_styles" {if count($prefs.available_styles) > 0 and $prefs.available_styles[0] ne ''}style="display:none;"{else}style="display:block;"{/if}> - <a class="link" href="javascript:show('available_styles');hide('select_available_styles');">{tr}Restrict available themes{/tr}</a> - </div> - <div id="available_styles" {if count($prefs.available_styles) == 0 or $prefs.available_styles[0] eq ''}style="display:none;"{else}style="display:block;"{/if}> - {tr}Available styles:{/tr}<br /> - <select name="available_styles[]" multiple="multiple" size="5"> - <option value=''>{tr}All{/tr}</option> - {section name=ix loop=$styles} - <option value="{$styles[ix]|escape}" - {if in_array($styles[ix], $prefs.available_styles)}selected="selected"{/if}> - {$styles[ix]} - </option> - {/section} - </select> - </div> - </td> - </tr></table> - </td> - </tr> - <tr> <td class="form" > <label for="general-theme">{tr}Theme options{/tr}:</label> @@ -79,6 +52,31 @@ </select> </td> </tr> + <tr> + <td class="form">{tr}Reg users can change theme{/tr}:</td> + <td> + <table><tr> + <td style="width: 20px"><input type="checkbox" name="change_theme" {if $prefs.change_theme eq 'y'}checked="checked"{/if}/></td> + <td> + <div id="select_available_styles" {if count($prefs.available_styles) > 0 and $prefs.available_styles[0] ne ''}style="display:none;"{else}style="display:block;"{/if}> + <a class="link" href="javascript:show('available_styles');hide('select_available_styles');">{tr}Restrict available themes{/tr}</a> + </div> + <div id="available_styles" {if count($prefs.available_styles) == 0 or $prefs.available_styles[0] eq ''}style="display:none;"{else}style="display:block;"{/if}> + {tr}Available styles:{/tr}<br /> + <select name="available_styles[]" multiple="multiple" size="5"> + <option value=''>{tr}All{/tr}</option> + {section name=ix loop=$styles} + <option value="{$styles[ix]|escape}" + {if in_array($styles[ix], $prefs.available_styles)}selected="selected"{/if}> + {$styles[ix]} + </option> + {/section} + </select> + </div> + </td> + </tr></table> + </td> + </tr> <tr> <td class="form"> <label for="general-slideshows">{tr}Slideshows theme{/tr}:</label> Modified: branches/3.0/tiki-admin_include_look.php =================================================================== --- branches/3.0/tiki-admin_include_look.php 2009-03-03 14:16:16 UTC (rev 17138) +++ branches/3.0/tiki-admin_include_look.php 2009-03-03 14:49:25 UTC (rev 17139) @@ -15,7 +15,7 @@ } $a_style = $prefs['site_style']; -if (isset($_REQUEST["looksetup"]) || (!empty($_REQUEST['site_style']) && $_REQUEST['site_style'] != $prefs['site_style']) ) { +if (isset($_REQUEST["looksetup"])) { ask_ticket('admin-inc-look'); if (isset($_REQUEST["site_style"])) { @@ -150,7 +150,7 @@ $smarty->assign_by_ref("slide_styles", $slide_styles); -if (isset($_REQUEST["site_style"]) || isset($_REQUEST["site_style_option"])) { +if (isset($_REQUEST["looksetup"]) && (isset($_REQUEST["site_style"]) || isset($_REQUEST["site_style_option"]))) { // If the theme has changed, reload the page to use the new theme $location= 'location: tiki-admin.php?page=look'; if ($prefs['feature_tabs'] == 'y') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |