Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13831: merge master
  • Loading branch information
MichaelDaum committed Jan 16, 2017
1 parent fb960a7 commit 4cbe297
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
4 changes: 2 additions & 2 deletions PatternSkin/data/System/WebTopBarExample.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1447730097" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1484554777" format="1.1" version="1"}%
%META:TOPICPARENT{name="PatternSkin"}%
<table border="0" cellpadding="0" cellspacing="0" style="width:100%" summary="">
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="%WEBLOGOURL%"><img src="%WEBLOGOIMG%" border="0" alt="%WEBLOGOALT%" style="border:none;" /></a></span></td>
Expand All @@ -8,6 +8,6 @@
</form>
* <form name="quickSearchForm" action="%SCRIPTURLPATH{view}%/%BASEWEB%/WebSearch"><input type="text" class="foswikiInputField foswikiDefaultText" title="%MAKETEXT{"Search"}%" id="quickSearchBox" name="search" value="%URLPARAM{search}%" size="18" /><input type="hidden" name="scope" value="all" /><input type="hidden" name="web" value="%BASEWEB%" /><noscript>&nbsp;<input type="submit" size="5" class="foswikiButton" name="submit" value="%MAKETEXT{"Search"}%" />&nbsp;</noscript>
</form>
%IF{"context i18n_enabled" then=' * %INCLUDE{%SYSTEMWEB%.LanguageSelector}%'}%
%IF{"context i18n_enabled" then=' * $percntINCLUDE{%SYSTEMWEB%.LanguageSelector}$percnt'}%
</noautolink></td></tr></table>
%META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="*"}%
21 changes: 10 additions & 11 deletions core/data/System/LanguageSelector.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1447730097" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1484554777" format="1.1" version="1"}%
%META:TOPICPARENT{name="TimeSpecifications"}%
---+!! Language selection dropdown

Expand All @@ -18,23 +18,22 @@ Result:
then="$percentINCLUDE{\"%TOPIC%\" section=\"selector\"}$percent"
}%%STOPINCLUDE%

<!-- %JQREQUIRE{"chili"}% <verbatim class="tml">
%STARTSECTION{"selector"}%<form name="changeLanguage"\
action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%" method="get">
<verbatim class="foswikiHidden">
%STARTSECTION{"selector"}%<form action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%" method="get">
<input type="hidden" name="redirectto" value="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?%QUERYPARAMS{encoding="url" separator=";"}%" />
<select name="language" class="foswikiSelect"\
onchange="document.changeLanguage.submit()">
<select name="language" class="foswikiSelect" onchange="this.form.submit()">
<option value='default'>%MAKETEXT{"Default"}%</option>
%LANGUAGES{
format="<option $marker value=\"$langtag\">$langname</option>"
format="<option $marker value='$langtag'>$langname</option>"
selection="%LANGUAGE%"
separator=" "
marker="selected=\"selected\""
marker="selected='selected'"
}%</select>
<input type="hidden" name="template" value="oopslanguagechanged" />
<noscript>
<input class="foswikiButton" type="submit"\
value="%MAKETEXT{"Change language"}%" />
<input class="foswikiButton" type="submit" value="%MAKETEXT{"Change language"}%" />
</noscript>
</form>%ENDSECTION{"selector"}%
</verbatim> -->
</verbatim>

%META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="*"}%

0 comments on commit 4cbe297

Please sign in to comment.