Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[29992] branches/6.x/templates/modules/mod-search.tpl
|
From: Stephane C. <se...@lo...> - 2010-10-13 17:55:54
|
Le Wed, Oct 13, 2010 at 05:20:21PM +0000, jon...@us... écrivait : > Revision: 29992 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=29992&view=rev > Author: jonnybradley > Date: 2010-10-13 17:20:21 +0000 (Wed, 13 Oct 2010) > > Log Message: > ----------- > [FIX] xhtml: Wrap form contents in a div (fieldset has a border etc) Can we use <div class="form"> ? So it would be easier to style them and to know where to look... > Modified Paths: > -------------- > branches/6.x/templates/modules/mod-search.tpl > > Modified: branches/6.x/templates/modules/mod-search.tpl > =================================================================== > --- branches/6.x/templates/modules/mod-search.tpl 2010-10-13 17:07:55 UTC (rev 29991) > +++ branches/6.x/templates/modules/mod-search.tpl 2010-10-13 17:20:21 UTC (rev 29992) > @@ -4,64 +4,66 @@ > {tikimodule error=$module_error title=$tpl_module_title name="search" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle} > {if $module_params.tiki_search neq 'none'} > <form id="search-module-form{$search_mod_usage_counter}" method="get" action="#"{if $module_params.use_autocomplete eq 'y'} onsubmit="return submitSearch{$search_mod_usage_counter}()"{/if}> > - <input id="search_mod_input_{$search_mod_usage_counter}" name="find"{if $module_params.use_autocomplete eq 'y'} class="pagename"{/if}{if !empty($module_params.input_size)} style="width:{$module_params.input_size}em"{/if} type="text" accesskey="s" value="{$module_params.input_value}" /> > - > - {if $module_params.show_object_filter eq 'y'} > - {tr}in:{/tr} > - <select name="where" style="width:{$module_params.select_size}em;"> > - <option value="pages">{tr}Entire Site{/tr}</option> > - {if $prefs.feature_wiki eq 'y'}<option value="wikis"{if $module_params.where eq "wikis"} selected="selected"{/if}>{tr}Wiki Pages{/tr}</option>{/if} > - {if $prefs.feature_directory eq 'y'}<option value="directory"{if $module_params.where eq "directory"} selected="selected"{/if}>{tr}Directory{/tr}</option>{/if} > - {if $prefs.feature_galleries eq 'y'} > - <option value="galleries"{if $module_params.where eq "galleries"} selected="selected"{/if}>{tr}Image Gals{/tr}</option> > - <option value="images"{if $module_params.where eq "images"} selected="selected"{/if}>{tr}Images{/tr}</option> > - {/if} > - {if $prefs.feature_file_galleries eq 'y'}<option value="files"{if $module_params.where eq "files"} selected="selected"{/if}>{tr}Files{/tr}</option>{/if} > - {if $prefs.feature_articles eq 'y'}<option value="articles"{if $module_params.where eq "articles"} selected="selected"{/if}>{tr}Articles{/tr}</option>{/if} > - {if $prefs.feature_forums eq 'y'}<option value="forums"{if $module_params.where eq "forums"} selected="selected"{/if}>{tr}Forums{/tr}</option>{/if} > - {if $prefs.feature_blogs eq 'y'} > - <option value="blogs"{if $module_params.where eq "blogs"} selected="selected"{/if}>{tr}Blogs{/tr}</option> > - <option value="posts"{if $module_params.where eq "posts"} selected="selected"{/if}>{tr}Blog Posts{/tr}</option> > - {/if} > - {if $prefs.feature_faqs eq 'y'}<option value="faqs"{if $module_params.where eq "faqs"} selected="selected"{/if}>{tr}FAQs{/tr}</option>{/if} > - {if $prefs.feature_trackers eq 'y'}<option value="trackers"{if $module_params.where eq "trackers"} selected="selected"{/if}>{tr}Trackers{/tr}</option>{/if} > - </select> > - {elseif !empty($prefs.search_default_where)} > - <input type="hidden" name="where" value="{$prefs.search_default_where|escape}" /> > - {/if} > - > - {if $module_params.tiki_search neq 'y'} > - {if $module_params.advanced_search_option eq 'y'} > - <label for="boolean">{tr}Advanced:{/tr}<input type="checkbox" name="boolean" id="boolean"{if $module_params.advanced_search eq "y"} checked="checked"{/if} /></label> > - {else} > - {if $module_params.advanced_search eq "y"}<input type="hidden" name="boolean" value="on" />{/if} > + <div> > + <input id="search_mod_input_{$search_mod_usage_counter}" name="find"{if $module_params.use_autocomplete eq 'y'} class="pagename"{/if}{if !empty($module_params.input_size)} style="width:{$module_params.input_size}em"{/if} type="text" accesskey="s" value="{$module_params.input_value}" /> > + > + {if $module_params.show_object_filter eq 'y'} > + {tr}in:{/tr} > + <select name="where" style="width:{$module_params.select_size}em;"> > + <option value="pages">{tr}Entire Site{/tr}</option> > + {if $prefs.feature_wiki eq 'y'}<option value="wikis"{if $module_params.where eq "wikis"} selected="selected"{/if}>{tr}Wiki Pages{/tr}</option>{/if} > + {if $prefs.feature_directory eq 'y'}<option value="directory"{if $module_params.where eq "directory"} selected="selected"{/if}>{tr}Directory{/tr}</option>{/if} > + {if $prefs.feature_galleries eq 'y'} > + <option value="galleries"{if $module_params.where eq "galleries"} selected="selected"{/if}>{tr}Image Gals{/tr}</option> > + <option value="images"{if $module_params.where eq "images"} selected="selected"{/if}>{tr}Images{/tr}</option> > + {/if} > + {if $prefs.feature_file_galleries eq 'y'}<option value="files"{if $module_params.where eq "files"} selected="selected"{/if}>{tr}Files{/tr}</option>{/if} > + {if $prefs.feature_articles eq 'y'}<option value="articles"{if $module_params.where eq "articles"} selected="selected"{/if}>{tr}Articles{/tr}</option>{/if} > + {if $prefs.feature_forums eq 'y'}<option value="forums"{if $module_params.where eq "forums"} selected="selected"{/if}>{tr}Forums{/tr}</option>{/if} > + {if $prefs.feature_blogs eq 'y'} > + <option value="blogs"{if $module_params.where eq "blogs"} selected="selected"{/if}>{tr}Blogs{/tr}</option> > + <option value="posts"{if $module_params.where eq "posts"} selected="selected"{/if}>{tr}Blog Posts{/tr}</option> > + {/if} > + {if $prefs.feature_faqs eq 'y'}<option value="faqs"{if $module_params.where eq "faqs"} selected="selected"{/if}>{tr}FAQs{/tr}</option>{/if} > + {if $prefs.feature_trackers eq 'y'}<option value="trackers"{if $module_params.where eq "trackers"} selected="selected"{/if}>{tr}Trackers{/tr}</option>{/if} > + </select> > + {elseif !empty($prefs.search_default_where)} > + <input type="hidden" name="where" value="{$prefs.search_default_where|escape}" /> > + {/if} > + > + {if $module_params.tiki_search neq 'y'} > + {if $module_params.advanced_search_option eq 'y'} > + <label for="boolean">{tr}Advanced:{/tr}<input type="checkbox" name="boolean" id="boolean"{if $module_params.advanced_search eq "y"} checked="checked"{/if} /></label> > + {else} > + {if $module_params.advanced_search eq "y"}<input type="hidden" name="boolean" value="on" />{/if} > + {/if} > + <input type="hidden" name="boolean_last" value="{$module_params.advanced_search}" /> > + {if $module_params.advanced_search_help eq 'y'} > + {capture name=advanced_search_help} > + {include file='advanced_search_help.tpl'} > + {/capture} > + {add_help show='y' title="{tr}Search Help{/tr}" id="advanced_search_help"} > + {$smarty.capture.advanced_search_help} > + {/add_help} > + {/if} > {/if} > - <input type="hidden" name="boolean_last" value="{$module_params.advanced_search}" /> > - {if $module_params.advanced_search_help eq 'y'} > - {capture name=advanced_search_help} > - {include file='advanced_search_help.tpl'} > - {/capture} > - {add_help show='y' title="{tr}Search Help{/tr}" id="advanced_search_help"} > - {$smarty.capture.advanced_search_help} > - {/add_help} > - {/if} > - {/if} > - {if $module_params.show_search_button eq 'y'} > - <input type = "submit" class = "wikiaction{if $module_params.default_button eq 'search'} button_default{/if}" > - name = "search" value = "{tr}{$module_params.search_submit}{/tr}" > - onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$module_params.search_action}');" /> > - {/if} > - {if $module_params.show_go_button eq 'y'} > - <input type = "submit" class = "wikiaction{if $module_params.default_button eq 'go'} button_default{/if}" > - name = "go" value = "{tr}{$module_params.go_submit}{/tr}" > - onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$module_params.go_action}');" /> > - {/if} > - {if $module_params.show_edit_button eq 'y'} > - <input type = "submit" class = "wikiaction{if $module_params.default_button eq 'edit'} button_default{/if}" > - name = "edit" value = "{tr}{$module_params.edit_submit}{/tr}" > - onclick = "$('#search-module-form{$search_mod_usage_counter} input[name!=find]').attr('name', ''); $('#search-module-form{$search_mod_usage_counter} input[name=find]').attr('name', 'page'); $('#search-module-form{$search_mod_usage_counter}').attr('action', '{$module_params.edit_action}');" /> > - {/if} > - > + {if $module_params.show_search_button eq 'y'} > + <input type = "submit" class = "wikiaction{if $module_params.default_button eq 'search'} button_default{/if}" > + name = "search" value = "{tr}{$module_params.search_submit}{/tr}" > + onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$module_params.search_action}');" /> > + {/if} > + {if $module_params.show_go_button eq 'y'} > + <input type="hidden" name="exact_match" /> > + <input type = "submit" class = "wikiaction{if $module_params.default_button eq 'go'} button_default{/if}" > + name = "go" value = "{tr}{$module_params.go_submit}{/tr}" > + onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action', '{$module_params.go_action}');" /> > + {/if} > + {if $module_params.show_edit_button eq 'y'} > + <input type = "submit" class = "wikiaction{if $module_params.default_button eq 'edit'} button_default{/if}" > + name = "edit" value = "{tr}{$module_params.edit_submit}{/tr}" > + onclick = "$('#search-module-form{$search_mod_usage_counter} input[name!=find]').attr('name', ''); $('#search-module-form{$search_mod_usage_counter} input[name=find]').attr('name', 'page'); $('#search-module-form{$search_mod_usage_counter}').attr('action', '{$module_params.edit_action}');" /> > + {/if} > + </div> > </form> > {jq notonready=true} > function submitSearch{{$search_mod_usage_counter}}() { > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > Beautiful is writing same markup. Internet Explorer 9 supports > standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3. > Spend less time writing and rewriting code and more time creating great > experiences on the web. Be a part of the beta today. > http://p.sf.net/sfu/beautyoftheweb > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs -- Cordialement -- Stéphane Casset LOGIDÉE sàrl Se faire plaisir d'apprendre 1a, rue Pasteur Tel : +33 388 23 69 77 ca...@lo... F-67540 OSTWALD Fax : +33 388 23 69 77 http://logidee.com |