svn commit: r1370126 [15/15] - in /ofbiz/branches/jackrabbit20120501: ./ applications/accounting/script/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/webapp/accounting/WEB-INF/ applicati...

[sascharodekamp]

Modified: ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/includes/header.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/themes/droppingcrumbs/includes/header.ftl Tue Aug  7 06:25:59 2012
@@ -172,7 +172,7 @@ under the License.
             <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
             <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
               <#include "component://common/webcommon/includes/helplink.ftl" />
-              <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
+              <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
             </#if>
             <#if userLogin?exists>
               <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">

Modified: ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl Tue Aug  7 06:25:59 2012
@@ -35,7 +35,7 @@ under the License.
         <#assign selected = false>
         <#assign permissions = display.getBasePermission()>
         <#list permissions as perm>
-          <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
+          <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session))>
             <#-- User must have ALL permissions in the base-permission list -->
             <#assign permission = false>
           </#if>
@@ -72,7 +72,7 @@ under the License.
       <#assign selected = false>
       <#assign permissions = display.getBasePermission()>
       <#list permissions as perm>
-        <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
+        <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session))>
           <#-- User must have ALL permissions in the base-permission list -->
           <#assign permission = false>
         </#if>

Modified: ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl Tue Aug  7 06:25:59 2012
@@ -150,7 +150,7 @@ under the License.
           <#---if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
           <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
             <#include "component://common/webcommon/includes/helplink.ftl" />
-            <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
+            <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
           </#if>
           </ul>
       </li>

Modified: ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1370126&r1=1370125&r2=1370126&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/branches/jackrabbit20120501/themes/flatgrey/webapp/flatgrey/maincss.css Tue Aug  7 06:25:59 2012
@@ -881,6 +881,38 @@ background: #FC7455;
 /* button column style - for the small
 collection of buttons used in lists */
 vertical-align: top;
+padding: 0.3em;
+}
+.basic-table tr .button-col a,
+.basic-table tr .button-col button,
+.basic-table tr .button-col input[type="reset"],
+.basic-table tr .button-col input[type="submit"],
+.basic-table tr .button-col input[type="button"] {
+    -webkit-appearance: none;
+    -moz-border-radius: 1em;
+    -webkit-border-radius: 1em;
+    border-radius: 1em;
+    background: #ddd url(images/button.png) repeat-x;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(1, #ddd));
+    background: -moz-linear-gradient(top center, #fff 0%, #ddd 100%);
+    border: 0.1em solid;
+    border-color: #ddd #bbb #999;
+    cursor: pointer;
+    color: #333;
+    display:inline-block;
+    font-size: 0.9em;
+    font-weight: bold;
+    outline: 0;
+    overflow: visible;
+    padding: 0.1em 0.5em 0.2em 0.5em;
+    text-decoration: none;
+    text-shadow: #fff 0 1px 1px; /* Setting must be in px */
+    /*text-transform:uppercase;*/
+    width: auto;
+    
+    /* IE7 */
+    *padding-top: 0.2em;
+    *padding-bottom: 0;
 }
 
 .basic-table .collapsed {
@@ -1426,7 +1458,6 @@ a.buttontextbig,
 .button-style-1 ul a,
 .button-style-2 ul a,
 .button-style-2 a,
-.basic-table tr .button-col a,
 .button,
 button,
 input[type="reset"],

Modified: ofbiz/branches/jackrabbit20120501/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/tomahawk/includes/appbarClose.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/themes/tomahawk/includes/appbarClose.ftl Tue Aug  7 06:25:59 2012
@@ -75,7 +75,7 @@ under the License.
       <#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
       <#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
         <#include "component://common/webcommon/includes/helplink.ftl" />
-        <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
+        <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
       </#if>
       <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
       <li><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>

Modified: ofbiz/branches/jackrabbit20120501/themes/tomahawk/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/tomahawk/includes/appbarOpen.ftl?rev=1370126&r1=1370125&r2=1370126&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/tomahawk/includes/appbarOpen.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/themes/tomahawk/includes/appbarOpen.ftl Tue Aug  7 06:25:59 2012
@@ -49,7 +49,7 @@ under the License.
               <#assign selected = false>
               <#assign permissions = display.getBasePermission()>
               <#list permissions as perm>
-                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
+                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session))>
                   <#-- User must have ALL permissions in the base-permission list -->
                   <#assign permission = false>
                 </#if>
@@ -79,7 +79,7 @@ under the License.
               <#assign selected = false>
               <#assign permissions = display.getBasePermission()>
               <#list permissions as perm>
-                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
+                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session))>
                   <#-- User must have ALL permissions in the base-permission list -->
                   <#assign permission = false>
                 </#if>