svn commit: r740299 - in /ofbiz/trunk: framework/common/webcommon/inc
Locked
svn commit: r740299 - in /ofbiz/trunk: framework/common/webcommon/inc
 
|
Author: jleroux
Date: Tue Feb 3 13:21:30 2009 New Revision: 740299 URL: http://svn.apache.org/viewvc?rev=740299&view=rev Log: A patch from Bruno Busco " Moving Timestamp to footer" '(https://issues.apache.org/jira/browse/OFBIZ-2164) - OFBIZ-2164 Modified: ofbiz/trunk/framework/common/webcommon/includes/footer.ftl ofbiz/trunk/framework/common/webcommon/includes/header.ftl ofbiz/trunk/framework/images/webapp/images/maincss.css ofbiz/trunk/themes/bluelight/includes/header.ftl ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Modified: ofbiz/trunk/framework/common/webcommon/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/footer.ftl?rev=740299&r1=740298&r2=740299&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/footer.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/footer.ftl Tue Feb 3 13:21:30 2009 @@ -28,42 +28,45 @@ <#if userLogin?has_content> <center> <div id="secondary-navigation"> - <#list displayApps as display> - <#assign thisApp = display.getContextRoot()> - <#assign permission = true> - <#assign selected = false> - <#assign permissions = display.getBasePermission()> - <#list permissions as perm> - <#if perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session)> - <#-- User must have ALL permissions in the base-permission list --> - <#assign permission = false> - </#if> - </#list> - <#if permission == true> - <#if thisApp == contextPath || contextPath + "/" == thisApp> - <#assign selected = true> - </#if> - <#assign thisURL = thisApp> - <#if thisApp != "/"> - <#assign thisURL = thisURL + "/control/main"> - </#if> - <a<#if selected> class="selected"</#if> href="${response.encodeURL(thisURL + externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a> + <#list displayApps as display> + <#assign thisApp = display.getContextRoot()> + <#assign permission = true> + <#assign selected = false> + <#assign permissions = display.getBasePermission()> + <#list permissions as perm> + <#if perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session)> + <#-- User must have ALL permissions in the base-permission list --> + <#assign permission = false> </#if> </#list> + <#if permission == true> + <#if thisApp == contextPath || contextPath + "/" == thisApp> + <#assign selected = true> + </#if> + <#assign thisURL = thisApp> + <#if thisApp != "/"> + <#assign thisURL = thisURL + "/control/main"> + </#if> + <a<#if selected> class="selected"</#if> href="${response.encodeURL(thisURL + externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a> + </#if> + </#list> </div> </center> </#if> <div id="footer"> - <p><a href="http://jigsaw.w3.org/css-validator/"><img src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/></a> - <a href="http://validator.w3.org/check?uri=referer"><img src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p> - <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br /> - Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p> + <p>${nowTimestamp?datetime?string.short} - + <a href="<@ofbizUrl>LookupTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a> + </p> + <p><a href="http://jigsaw.w3.org/css-validator/"><img src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/></a> + <a href="http://validator.w3.org/check?uri=referer"><img src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p> + <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br /> + Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p> </div> <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content> - <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript> - <script src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script> - </#list> + <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript> + <script src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script> + </#list> </#if> </div> Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=740299&r1=740298&r2=740299&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Tue Feb 3 13:21:30 2009 @@ -114,7 +114,6 @@ ${uiLabelMap.CommonWelcome}! </#if> </li> - <li>${nowTimestamp?datetime?string.short}</li> <li class="control-area"> <p class="collapsed"> <a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a> @@ -152,13 +151,11 @@ ${uiLabelMap.CommonWelcome}! <a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a> </p> </#if> - <p>${nowTimestamp?datetime?string.short}</p> <ul id="preferences-menu"> <!-- <li class="first"><a href="<@ofbizUrl>Preferences</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> --> <li class="first"><a href="<@ofbizUrl>LookupLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li> - <li><a href="<@ofbizUrl>LookupTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></li> <#if userLogin?exists> <li><a href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li> </#if> Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=740299&r1=740298&r2=740299&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/maincss.css (original) +++ ofbiz/trunk/framework/images/webapp/images/maincss.css Tue Feb 3 13:21:30 2009 @@ -911,6 +911,10 @@ min-width: 10px; } +ul#preferences-menu { +float: right; +} + /* ========================================= */ /* ===== Footer Styles ===================== */ /* ========================================= */ Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=740299&r1=740298&r2=740299&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/includes/header.ftl (original) +++ ofbiz/trunk/themes/bluelight/includes/header.ftl Tue Feb 3 13:21:30 2009 @@ -116,7 +116,6 @@ </li> <li class="control-area"> <p class="collapsed"> - ${nowTimestamp?datetime?string.short} <a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a> <a href="setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&userPrefTypeId=COMPACT_HEADER&userPrefValue=N"> </a> </p> @@ -135,7 +134,6 @@ <li class="control-area"> <#if userLogin?exists> <p class="expanded"> - <span class="clock">${nowTimestamp?datetime?string.short}</span> <a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a> <a href="setUserPreference?userPrefGroupTypeId=GLOBAL_PREFERENCES&userPrefTypeId=COMPACT_HEADER&userPrefValue=Y"> </a> </p> @@ -156,7 +154,6 @@ <li class="first"><a href="<@ofbizUrl>Preferences</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> --> <li class="first"><a href="<@ofbizUrl>LookupLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li> - <li><a href="<@ofbizUrl>LookupTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></li> <#if userLogin?exists> <li><a href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li> </#if> Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=740299&r1=740298&r2=740299&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Tue Feb 3 13:21:30 2009 @@ -954,15 +954,6 @@ text-align: right; } - -#masthead ul .clock { -font-size: 1.5em; -font-weight: normal; -background-color: #5CA3D7; -color: #FFFFFF; -padding: .1em; -} - #masthead ul .control-area .expanded { background: url(/images/collapse.gif) no-repeat right; min-height: 10px; @@ -980,6 +971,7 @@ ul#preferences-menu { font-size: 1.1em; +float: right; } ul#preferences-menu li { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |