You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2009/04/18 08:01:26 UTC
svn commit: r766225 - in /ofbiz/trunk/themes: bluelight/includes/header.ftl
flatgrey/includes/header.ftl
Author: jonesde
Date: Sat Apr 18 06:01:26 2009
New Revision: 766225
URL: http://svn.apache.org/viewvc?rev=766225&view=rev
Log:
Fixed header collapse in bluelight, small cleanup of the same in flatgrey
Modified:
ofbiz/trunk/themes/bluelight/includes/header.ftl
ofbiz/trunk/themes/flatgrey/includes/header.ftl
Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=766225&r1=766224&r2=766225&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Sat Apr 18 06:01:26 2009
@@ -147,9 +147,19 @@
<#if userLogin?exists>
<#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
- <li class="collapsed"><a href="setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&userPrefTypeId=COMPACT_HEADER&userPrefValue=N"> </a></li>
+ <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()"> </a></li>
+ <form name="setUserPreferenceCompactHeaderN" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES">
+ <input type="hidden" name="userPrefTypeId" value="COMPACT_HEADER">
+ <input type="hidden" name="userPrefValue" value="N">
+ </form>
<#else>
- <li class="expanded"><a href="setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&userPrefTypeId=COMPACT_HEADER&userPrefValue=Y"> </a></li>
+ <li class="expanded"><a href="javascript:document.setUserPreferenceCompactHeaderY.submit()"> </a></li>
+ <form name="setUserPreferenceCompactHeaderY" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES">
+ <input type="hidden" name="userPrefTypeId" value="COMPACT_HEADER">
+ <input type="hidden" name="userPrefValue" value="Y">
+ </form>
</#if>
</#if>
</ul>
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=766225&r1=766224&r2=766225&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Sat Apr 18 06:01:26 2009
@@ -118,11 +118,11 @@
<li class="control-area">
<p class="collapsed">
<a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a>
- <a href="javascript:document.commonPreferences.submit()"> </a>
- <form name="commonPreferences" method="post" action="<@o...@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)">
+ <a href="javascript:document.setUserPreferenceCompactHeaderN.submit()"> </a>
+ <form name="setUserPreferenceCompactHeaderN" method="post" action="<@o...@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)">
<input name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES" type="hidden"/>
<input name="userPrefTypeId" value="COMPACT_HEADER" type="hidden"/>
- <input name="userPrefValue" value="N${StringUtil.wrapString(parametersURL?if_exists)}" type="hidden"/>
+ <input name="userPrefValue" value="N" type="hidden"/>
</form
</p>
</li>
@@ -141,11 +141,11 @@
<#if userLogin?exists>
<p class="expanded">
<a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a>
- <a href="javascript:document.commonPreferences.submit()"> </a>
- <form name="commonPreferences" method="post" action="<@o...@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)">
+ <a href="javascript:document.setUserPreferenceCompactHeaderY.submit()"> </a>
+ <form name="setUserPreferenceCompactHeaderY" method="post" action="<@o...@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)">
<input name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES" type="hidden"/>
<input name="userPrefTypeId" value="COMPACT_HEADER" type="hidden"/>
- <input name="userPrefValue" value="Y${StringUtil.wrapString(parametersURL?if_exists)}" type="hidden"/>
+ <input name="userPrefValue" value="Y" type="hidden"/>
</form
</p>
<#if layoutSettings.topLines?has_content>