svn commit: r786358 - in /ofbiz/trunk: applications/commonext/widget/CommonScreens.xml themes/flatgrey/includes/header.ftl themes/flatgrey/webapp/flatgrey/maincss.css

[ha...@apache.org]

Author: hansbak
Date: Fri Jun 19 03:25:31 2009
New Revision: 786358

URL: http://svn.apache.org/viewvc?rev=786358&view=rev
Log:
check for null values to remove some error messages from the log and cut off lengthy system messages in the header

Modified:
    ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
    ofbiz/trunk/themes/flatgrey/includes/header.ftl
    ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css

Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=786358&r1=786357&r2=786358&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Fri Jun 19 03:25:31 2009
@@ -66,11 +66,11 @@
                     <actions>                
                         <service service-name="getLastSystemInfoNote" result-map="resultNote"/>
                         <set field="layoutSettings.middleTopHeader" value="----------Last system notes----------"/>
-                        <set field="layoutSettings.middleTopMessage1" value="${date:dateTimeStr(resultNote.lastSystemInfoNote1.noteDateTime, timeZone, locale)} ${resultNote.lastSystemInfoNote1.noteInfo}"/>
+                        <set field="layoutSettings.middleTopMessage1" value="${groovy:resultNote.lastSystemInfoNote1!=null?resultNote.lastSystemInfoNote1.noteDateTime.toString().substring(0,16) + &quot; &quot; + resultNote.lastSystemInfoNote1.noteInfo:&quot;&quot;}"/>
                         <set field="layoutSettings.middleTopLink1" from-field="resultNote.lastSystemInfoNote1.moreInfoPortletId"/>
-                        <set field="layoutSettings.middleTopMessage2" value="${date:dateTimeStr(resultNote.lastSystemInfoNote2.noteDateTime, timeZone, locale)} ${resultNote.lastSystemInfoNote2.noteInfo}"/>
+                        <set field="layoutSettings.middleTopMessage2" value="${groovy:resultNote.lastSystemInfoNote2!=null?resultNote.lastSystemInfoNote2.noteDateTime.toString().substring(0,16) + &quot; &quot; + resultNote.lastSystemInfoNote2.noteInfo:&quot;&quot;}"/>
                         <set field="layoutSettings.middleTopLink2" from-field="resultNote.lastSystemInfoNote2.moreInfoPortletId"/>
-                        <set field="layoutSettings.middleTopMessage3" value="${date:dateTimeStr(resultNote.lastSystemInfoNote3.noteDateTime, timeZone, locale)} ${resultNote.lastSystemInfoNote3.noteInfo}"/>
+                        <set field="layoutSettings.middleTopMessage3" value="${groovy:resultNote.lastSystemInfoNote3!=null?resultNote.lastSystemInfoNote3.noteDateTime.toString().substring(0,16) + &quot; &quot; + resultNote.lastSystemInfoNote3.noteInfo:&quot;&quot;}"/>
                         <set field="layoutSettings.middleTopLink3" from-field="resultNote.lastSystemInfoNote3.moreInfoPortletId"/>
                     </actions>
                     <widgets/>

Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=786358&r1=786357&r2=786358&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Fri Jun 19 03:25:31 2009
@@ -139,13 +139,12 @@
         <li width=20/>
         <#if layoutSettings.middleTopMessage1?exists && layoutSettings.middleTopMessage1 != " ">
           <li class=h4>
-          <table width="350px">
-          <tr><td>
+          <div class="divHidden">
           <center>${layoutSettings.middleTopHeader?if_exists}</center>
           <a href="/myportal/control/showPortlet?portalPortletId=${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
           <a href="/myportal/control/showPortlet?portalPortletId=${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
           <a href="/myportal/control/showPortlet?portalPortletId=${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
-          </td></tr></table>
+          </div>
           </li>
         </#if>
         <li class="control-area"<#if layoutSettings.headerRightBackgroundUrl?has_content> background="${layoutSettings.headerRightBackgroundUrl}"</#if>>

Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=786358&r1=786357&r2=786358&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Fri Jun 19 03:25:31 2009
@@ -487,7 +487,11 @@
 .salePrice {
 color: #ff0000;
 }
-
+.divHidden {
+    width:400px;
+    overflow:hidden;
+    white-space:nowrap;
+    }
 /* ===== Product Summary Styles ===== */
 .product-prevnext {
 text-align: right;