You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/08/04 20:11:22 UTC
svn commit: r1369382 [19/19] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/webapp/accounting/WEB-INF/ appli...
Modified: ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/branches/20120329_portletWidget/themes/bizznesstime/webapp/bizznesstime/css/style.css Sat Aug 4 18:11:00 2012
@@ -2203,147 +2203,3 @@ height: auto;
white-space:normal;
height: auto;
}
-
-/* Begin addon modification portletWidget navigation form*/
-.screenlet-title-bar-pager {
- background-color: #1c334d;
- color: #ffffff;
- height: 1%; /* IE fix */
- min-height: 1.5em;
-}
-
-.screenlet-title-bar-pager .h1,
-.screenlet-title-bar-pager .h2,
-.screenlet-title-bar-pager .h3,
-.screenlet-title-bar-pager h1,
-.screenlet-title-bar-pager h2,
-.screenlet-title-bar-pager h3 {
- background: none;
- color: #ffffff;
- font-weight: bold;
- padding: 0.0em 0.5em 0.2em 3em;
-}
-
-.screenlet-title-bar-pager ul {
- display: inline; /* IE Fix */
-}
-
-.screenlet-title-bar-pager ul li {
- background: none;
- float: right;
- font-size: 1em;
- font-weight: bold;
- padding: 0.0em 0.5em 0.2em 0.5em;
- margin:0;
-}
-
-.screenlet-title-bar-pager ul h1,
-.screenlet-title-bar-pager ul h2,
-.screenlet-title-bar-pager ul h3,
-.screenlet-title-bar-pager ul .h1,
-.screenlet-title-bar-pager ul .h2,
-.screenlet-title-bar-pager ul .h3 {
- border-left: none;
- float: left;
- padding: 0.0em 0.5em 0.2em 0.5em;
-}
-.screenlet-title-bar-pager .h1 { font-size: 1.6em; }
-.screenlet-title-bar-pager .h2 { font-size: 1.3em; }
-.screenlet-title-bar-pager .h3,
-.screenlet-title-bar-pager .head4 {
- font-size: 1.1em;
-}
-
-.screenlet-title-bar-pager .h3 a {
- display: inline;
-}
-
-.screenlet-title-bar-pager ul a {
- color: #A80000;
- display: block;
-}
-
-
-.screenlet-title-bar-pager ul a:hover {
- color: #ffffff;
- text-decoration: underline;
-}
-
-.screenlet-title-bar-pager ul .disabled {
- color: #CCCCCC;
-}
-
-.screenlet-title-bar-pager ul .collapsed,
-.screenlet-title-bar-pager ul .collapsed:hover {
- background: url(/images/expand.gif) no-repeat center center;
- min-height: 1.1em;
- min-width: 1.1em;
-}
-
-.screenlet-title-bar-pager ul .expanded,
-.screenlet-title-bar-pager ul .expanded:hover {
- background: url(/images/collapse.gif) no-repeat center center;
- min-height: 1.1em;
- min-width: 1.1em;
-}
-
-.screenlet-title-bar-pager ul .collapsed a,
-.screenlet-title-bar-pager ul .expanded a {
- cursor: default;
-}
-
-.login-screenlet {
- min-width: 25em;
- width: 25%;
-}
-
-
-.screenlet-title-bar-pager {
- padding:0.08em 0 3em 0;
- clear:both;
- display:block;
- position:relative;
- margin:0px 0 10px 0;
-}
-
-.screenlet-title-bar-pager ul {
- display: inline; /* IE Fix */
-}
-
-.screenlet-title-bar-pager ul li {
- float: left;
- font-weight: bold;
- line-height: 1.8em;
- margin: 0.2em;
-}
-
-.screenlet-title-bar-pager ul li a {
- display: block;
- font-weight: bold;
-}
-
-.screenlet-title-bar-pager ul .nav-first,
-.screenlet-title-bar-pager ul .nav-previous,
-.screenlet-title-bar-pager ul .nav-next,
-.screenlet-title-bar-pager ul .nav-last {
- border:2px solid #ddd;
- color:#fff;
- padding: 0 0.5em 0 0.5em;
-}
-
-.screenlet-title-bar-pager ul .nav-first-disabled,
-.screenlet-title-bar-pager ul .nav-previous-disabled,
-.screenlet-title-bar-pager ul .nav-next-disabled,
-.screenlet-title-bar-pager ul .nav-last-disabled {
- border:2px solid #ddd;
- color:#ccc;
- padding: 0 0.5em 0 0.5em;
-}
-
-.screenlet-title-bar-pager select {
- margin: 0;
-}
-.screenlet-title-bar-pager ul li.nav-displaying {
-float: right;
-}
-/* End addon modification portletWidget navigation form*/
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/themes/bluelight/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/bluelight/includes/appbarOpen.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/bluelight/includes/appbarOpen.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/bluelight/includes/appbarOpen.ftl Sat Aug 4 18:11:00 2012
@@ -45,7 +45,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>
@@ -75,7 +75,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/20120329_portletWidget/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/bluelight/includes/header.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/bluelight/includes/header.ftl Sat Aug 4 18:11:00 2012
@@ -179,7 +179,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}&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}&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/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/branches/20120329_portletWidget/themes/bluelight/webapp/bluelight/style.css Sat Aug 4 18:11:00 2012
@@ -2754,111 +2754,3 @@ height: auto;
white-space:normal;
height: auto;
}
-
-/* begin addon modification portletWidget navigation form*/
-/* additions to manage navigation-form in bluelight theme */
-.screenlet-title-bar-pager {
-background: url("/bluelight/box-head-tl.gif") no-repeat;
-color:#ffffff;
-height: 21px;
-padding:2px 0px;
-}
-
-.screenlet-title-bar-pager select{
-margin-left:10px;
-border-color: #9bc8e8 #5ea4d7 #1e8edc;
-height: 22px;
-margin-top: 0;
-}
-
-.screenlet-title-bar-pager ul {
-display: inline; /* IE Fix */
-}
-
-.screenlet-title-bar-pager ul li {
-float: left;
-line-height: 1.2em;
-margin: 0px 3px;
-font-size:11px;
-}
-
-.screenlet-title-bar-pager ul li.h3 {
-margin-right: 40px;
-}
-
-.screenlet-title-bar-pager ul li.nav-displaying {
-padding-top: 6px;
-float: right;
-}
-
-.screenlet-title-bar-pager ul li a {
-display: block;
-text-indent:-2000px;
-}
-
-.screenlet-title-bar-pager ul li span {
-visibility:hidden;
-display: block;
-}
-
-.screenlet-title-bar-pager ul .nav-first a {
-background: url(/bluelight/images/resultset_first.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-previous a {
-background: url(/bluelight/images/resultset_previous.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-next a {
-background: url(/bluelight/images/resultset_next.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-last a {
-background: url(/bluelight/images/resultset_last.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-first-disabled {
-background: url(/bluelight/images/resultset_first_disabled.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-previous-disabled {
-background: url(/bluelight/images/resultset_previous_disabled.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-next-disabled {
-background: url(/bluelight/images/resultset_next_disabled.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-last-disabled {
-background: url(/bluelight/images/resultset_last_disabled.png) no-repeat;
-}
-
-.screenlet-title-bar-pager ul .nav-first a,
-.screenlet-title-bar-pager ul .nav-previous a,
-.screenlet-title-bar-pager ul .nav-next a,
-.screenlet-title-bar-pager ul .nav-last a,
-.screenlet-title-bar-pager ul .nav-first-disabled,
-.screenlet-title-bar-pager ul .nav-previous-disabled,
-.screenlet-title-bar-pager ul .nav-next-disabled,
-.screenlet-title-bar-pager ul .nav-last-disabled {
-margin-top: 3px;
-width: 23px;
-height:23px;
-}
-
-.screenlet-title-bar-pager-pager ul .nav-pagesize {
-padding: 0 30px 0 30px;
-}
-
-.screenlet-title-bar-pager ul .collapsed,
-.screenlet-title-bar-pager ul .collapsed:hover {
-background: url(/bluelight/images/bullet_arrow_down.png) no-repeat center;
-width:32px;
-border:none;
-}
-
-.screenlet-title-bar-pager ul .expanded,
-.screenlet-title-bar-pager ul .expanded:hover {
-background: url(/bluelight/images/bullet_arrow_up.png) no-repeat center;
-width:32px;
-border:none;
-}
-
-.screenlet-title-bar-pager ul .collapsed a,
-.screenlet-title-bar-pager ul .expanded a {
-cursor: pointer;
-}
-/* End addon modification portletWidget navigation form*/
Modified: ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/includes/appbarOpen.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/includes/appbarOpen.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/includes/appbarOpen.ftl Sat Aug 4 18:11:00 2012
@@ -45,7 +45,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>
@@ -75,7 +75,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/20120329_portletWidget/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/includes/header.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/includes/header.ftl Sat Aug 4 18:11:00 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}&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}&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/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/branches/20120329_portletWidget/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Sat Aug 4 18:11:00 2012
@@ -2753,161 +2753,3 @@ height: auto;
white-space:normal;
height: auto;
}
-
-/* begin addon modification portletWidget navigation form*/
-.screenlet-title-bar-pager {
-background-color:#0099CC;
-height: 1%; /* IE fix */
-min-height: 1.5em;
-padding-top: 1px;
-padding-bottom: 2px;
-}
-
-.screenlet-title-bar-pager .h1,
-.screenlet-title-bar-pager .h2,
-.screenlet-title-bar-pager .h3,
-.screenlet-title-bar-pager h1,
-.screenlet-title-bar-pager h2,
-.screenlet-title-bar-pager h3 {
-color: #ffffff;
-font-weight: bold;
-padding: 0.1em 0.5em 0.2em 0.5em;
-}
-
-.screenlet-title-bar-pager ul {
-display: inline; /* IE Fix */
-}
-
-.screenlet-title-bar-pager ul li {
-background-color: #0099CC;
-border-left: 0.1em solid #5f9fcf;
-color: #ffffff;
-float: right;
-font-size: 1em;
-font-weight: bold;
-padding: 0.1em 0.5em 0.2em 0.5em;
-}
-
-.screenlet-title-bar-pager ul h1,
-.screenlet-title-bar-pager ul h2,
-.screenlet-title-bar-pager ul h3,
-.screenlet-title-bar-pager ul .h1,
-.screenlet-title-bar-pager ul .h2,
-.screenlet-title-bar-pager ul .h3 {
-background-color: #0099CC;
-border-left: none;
-float: left;
-}
-
-.screenlet-title-bar-pager .h1 {
-font-size: 1.6em;
-}
-
-.screenlet-title-bar-pager .h2 {
-font-size: 1.3em;
-}
-
-.screenlet-title-bar-pager .h3,.screenlet-title-bar-pager .head4 {
-font-size: 1.1em;
-}
-
-.screenlet-title-bar-pager .h3 a {
-color: #ffff66;
-display: inline;
-}
-
-.screenlet-title-bar-pager ul a {
-color: #FFA200;
-display: block;
-}
-
-.screenlet-title-bar-pager ul a:hover {
-color: #ffffff;
-text-decoration: none;
-}
-
-.screenlet-title-bar-pager ul .disabled {
-color: #CCCCCC;
-}
-
-.screenlet-title-bar-pager ul .collapsed,
-.screenlet-title-bar-pager ul .collapsed:hover {
-background: url(/droppingcrumbs/images/bullet_arrow_down.png) no-repeat right;
-width:16px;
-border:none;
-}
-
-.screenlet-title-bar-pager ul .expanded,
-.screenlet-title-bar-pager ul .expanded:hover {
-background: url(/droppingcrumbs/images/bullet_arrow_up.png) no-repeat right;
-width:16px;
-border:none;
-}
-
-.screenlet-title-bar-pager ul .collapsed a,
-.screenlet-title-bar-pager ul .expanded a {
-cursor: pointer;
-}
-
-.screenlet-title-bar-pager {
-height: 2em;
-padding-bottom: 0.7em;
-padding-top: 0.4em;
-}
-
-.screenlet-title-bar-pager ul {
-display: inline; /* IE Fix */
-}
-
-.screenlet-title-bar-pager ul li {
-float: left;
-font-weight: bold;
-line-height: 1.8em;
-margin: 0.2em;
-}
-
-.screenlet-title-bar-pager ul li a {
-display: block;
-height: 16px;
-width: 16px;
-text-indent:2000px;
-}
-
-.screenlet-title-bar-pager ul li span {
-visibility:hidden;
-display: block;
-height: 16px;
-width: 16px;
-}
-
-.screenlet-title-bar-pager ul .nav-first a {
-background: url(/droppingcrumbs/images/resultset_first.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-previous a {
-background: url(/droppingcrumbs/images/resultset_previous.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-next a {
-background: url(/droppingcrumbs/images/resultset_next.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-last a {
-background: url(/droppingcrumbs/images/resultset_last.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-first-disabled {
-background: url(/droppingcrumbs/images/resultset_first_disabled.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-previous-disabled {
-background: url(/droppingcrumbs/images/resultset_previous_disabled.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-next-disabled {
-background: url(/droppingcrumbs/images/resultset_next_disabled.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-last-disabled {
-background: url(/droppingcrumbs/images/resultset_last_disabled.png) no-repeat;
-}
-.screenlet-title-bar-pager ul .nav-pagesize {
-padding: 0 30px 0 30px;
-}
-.screenlet-title-bar-pager ul li.nav-displaying {
-float: right;
-}
-/* End addon modification portletWidget navigation form*/
Modified: ofbiz/branches/20120329_portletWidget/themes/flatgrey/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/flatgrey/includes/appbar.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/flatgrey/includes/appbar.ftl Sat Aug 4 18:11:00 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/20120329_portletWidget/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/flatgrey/includes/header.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/flatgrey/includes/header.ftl Sat Aug 4 18:11:00 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}&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}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
</#if>
</ul>
</li>
Modified: ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/branches/20120329_portletWidget/themes/flatgrey/webapp/flatgrey/maincss.css Sat Aug 4 18:11:00 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"],
@@ -2201,126 +2232,3 @@ height: auto;
white-space:normal;
height: auto;
}
-
-/*begin addon modification portletWidget navigation form*/
-.screenlet-title-bar-pager {
-background: url(images/bhead.gif) top left repeat-x;
-color: #ffffff;
-height: 1%; /* IE fix */
-min-height: 1.5em;
-padding:0.8em 0.2em;
-}
-
-.screenlet-title-bar-pager .h1,
-.screenlet-title-bar-pager .h2,
-.screenlet-title-bar-pager .h3,
-.screenlet-title-bar-pager h1,
-.screenlet-title-bar-pager h2,
-.screenlet-title-bar-pager h3 {
-background: none;
-color: #333;
-text-shadow: 1px 1px 0 #fff; /* Setting must be in px */
-}
-
-.screenlet-title-bar-pager ul {
-display: inline; /* IE Fix */
-}
-
-.screenlet-title-bar-pager ul li {
-color: #222;
-float: left;
-font-size: 1em;
-font-weight: bold;
-padding: 0.1em 0.5em 0.2em 0.5em;
-}
-
-.screenlet-title-bar-pager ul .h1,
-.screenlet-title-bar-pager ul .h2,
-.screenlet-title-bar-pager ul .h3 {
-border-left: none;
-float: left;
-}
-
-.screenlet-title-bar-pager h1,
-.screenlet-title-bar-pager .h1 {
-font-size: 1.6em;
-}
-
-.screenlet-title-bar-pager h2,
-.screenlet-title-bar-pager .h2 {
-font-size: 1.3em;
-}
-
-.screenlet-title-bar-pager h3,
-.screenlet-title-bar-pager .h3 {
-font-size: 1.1em;
-}
-
-.screenlet-title-bar-pager .h3 a {
-color: #222;
-display: inline;
-}
-
-.screenlet-title-bar-pager ul a {
-color: #222;
-display: block;
-}
-
-.screenlet-title-bar-pager ul a:visited {
-color: #222;
-}
-
-.screenlet-title-bar-pager ul a:hover {
-color: #ffffff;
-text-decoration: none;
-}
-
-.screenlet-title-bar-pager ul .disabled {
-color: #CCCCCC;
-}
-
-.screenlet-title-bar-pager ul .collapsed,
-.screenlet-title-bar-pager ul .collapsed:hover {
-background: url(/images/expand.gif) no-repeat center center;
-min-height: 1.1em;
-min-width: 1.1em;
-}
-
-.screenlet-title-bar-pager ul .expanded,
-.screenlet-title-bar-pager ul .expanded:hover {
-background: url(/images/collapse.gif) no-repeat center center;
-min-height: 1.1em;
-min-width: 1.1em;
-}
-
-.screenlet-title-bar-pager ul .collapsed a,
-.screenlet-title-bar-pager ul .expanded a {
-/* IE fix */
-cursor: default;
-}
-
-
-.screenlet-title-bar-pager ul a:hover {
-background-color: #999;
-}
-
-.screenlet-title-bar-pager ul .nav-pagesize,
-.screenlet-title-bar-pager ul .nav-page-select,
-.screenlet-title-bar-pager ul .nav-displaying {
-padding: 0 1em 0 1em;
-}
-
-.screenlet-title-bar-pager ul .nav-first-disabled,
-.screenlet-title-bar-pager ul .nav-previous-disabled,
-.screenlet-title-bar-pager ul .nav-next-disabled,
-.screenlet-title-bar-pager ul .nav-last-disabled {
-color: #D4D0C8;
-padding: 0 1em 0 1em;
-}
-
-.screenlet-title-bar-pager ul .nav-displaying {
-border-right: none;
-float :right;
-}
-
-/*end addon modification portletWidget navigation form*/
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/tomahawk/includes/appbarClose.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/tomahawk/includes/appbarClose.ftl Sat Aug 4 18:11:00 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}&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}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
</#if>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
Modified: ofbiz/branches/20120329_portletWidget/themes/tomahawk/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/tomahawk/includes/appbarOpen.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/tomahawk/includes/appbarOpen.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/tomahawk/includes/appbarOpen.ftl Sat Aug 4 18:11:00 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>
Modified: ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css Sat Aug 4 18:11:00 2012
@@ -3141,130 +3141,3 @@ height: auto;
white-space:normal;
height: auto;
}
-/* begin addon modification : portletWidget navigation form*/
-.screenlet-title-bar-pager {
-background:url(../images/bkgd_header.gif) repeat-x;
-height: 23px;
-padding:0px 0px;
-}
-
-.screenlet-title-bar-pager ul h1,
-.screenlet-title-bar-pager ul h2,
-.screenlet-title-bar-pager ul h3,
-.screenlet-title-bar-pager ul .h1,
-.screenlet-title-bar-pager ul .h2,
-.screenlet-title-bar-pager ul .h3 {
-font-weight: normal;
-border-left: none;
-font-size:12px;
-float: left;
-}
-
-.screenlet-title-bar-pager select{
-margin-left:10px;
-border:none;
-height: auto;
-margin-top: 1px;
-}
-
-.screenlet-title-bar-pager ul {
-display: inline; /* IE Fix */
-}
-
-.screenlet-title-bar-pager ul li {
-float: left;
-color : #ffffff;
-line-height: 1.8em;
-margin: 0px 0px 0px 3px;
-font-size:12px;
-}
-
-.screenlet-title-bar-pager ul li.nav-displaying {
-float: right;
-}
-
-.screenlet-title-bar-pager ul li a {
-display: block;
-text-indent:-2000px;
-}
-
-.screenlet-title-bar-pager ul li span {
-visibility:hidden;
-display: block;
-}
-
-.screenlet-title-bar-pager ul .nav-first a:hover {
-background: url(../images/navigation.png) no-repeat 0px -46px;
-}
-.screenlet-title-bar-pager ul .nav-previous a:hover {
-background: url(../images/navigation.png) no-repeat -23px -46px;
-}
-.screenlet-title-bar-pager ul .nav-next a:hover {
-background: url(../images/navigation.png) no-repeat -46px -46px;
-}
-.screenlet-title-bar-pager ul .nav-last a:hover {
-background: url(../images/navigation.png) no-repeat -69px -46px;
-}
-
-.screenlet-title-bar-pager ul .nav-first a {
-background: url(../images/navigation.png) no-repeat 0px -23px;
-}
-.screenlet-title-bar-pager ul .nav-previous a {
-background: url(../images/navigation.png) no-repeat -23px -23px;
-}
-.screenlet-title-bar-pager ul .nav-next a {
-background: url(../images/navigation.png) no-repeat -46px -23px;
-}
-.screenlet-title-bar-pager ul .nav-last a {
-background: url(../images/navigation.png) no-repeat -69px -23px;
-}
-.screenlet-title-bar-pager ul .nav-first-disabled {
-background: url(../images/navigation.png) no-repeat 0px 0px;
-}
-.screenlet-title-bar-pager ul .nav-previous-disabled {
-background: url(../images/navigation.png) no-repeat -23px 0px;
-}
-.screenlet-title-bar-pager ul .nav-next-disabled {
-background: url(../images/navigation.png) no-repeat -46px 0px;
-}
-.screenlet-title-bar-pager ul .nav-last-disabled {
-background: url(../images/navigation.png) no-repeat -69px 0px;
-}
-
-.screenlet-title-bar-pager ul .nav-first a,
-.screenlet-title-bar-pager ul .nav-previous a,
-.screenlet-title-bar-pager ul .nav-next a,
-.screenlet-title-bar-pager ul .nav-last a,
-.screenlet-title-bar-pager ul .nav-first-disabled,
-.screenlet-title-bar-pager ul .nav-previous-disabled,
-.screenlet-title-bar-pager ul .nav-next-disabled,
-.screenlet-title-bar-pager ul .nav-last-disabled {
-width: 23px;
-height:23px;
-}
-
-.screenlet-title-bar-pager-pager ul .nav-pagesize {
-padding: 0 30px 0 30px;
-}
-
-.screenlet-title-bar-pager ul .collapsed,
-.screenlet-title-bar-pager ul .collapsed:hover {
-background: url(../images/bullet_arrow_down.png) no-repeat right;
-width:16px;
-border:none;
-padding-left: 3px;
-}
-
-.screenlet-title-bar-pager ul .expanded,
-.screenlet-title-bar-pager ul .expanded:hover {
-background: url(../images/bullet_arrow_up.png) no-repeat right;
-width:16px;
-border:none;
-padding-left: 3px;
-}
-
-.screenlet-title-bar-pager ul .collapsed a,
-.screenlet-title-bar-pager ul .expanded a {
-cursor: pointer;
-}
-/* End addon modification : portletWidget navigation form*/
\ No newline at end of file
Modified: ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/images/bkgd_header.gif
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/images/bkgd_header.gif?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
Files ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/images/bkgd_header.gif (original) and ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/images/bkgd_header.gif Sat Aug 4 18:11:00 2012 differ
Modified: ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/images/ptrn_button_hover.gif
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/images/ptrn_button_hover.gif?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
Files ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/images/ptrn_button_hover.gif (original) and ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/images/ptrn_button_hover.gif Sat Aug 4 18:11:00 2012 differ
Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat
------------------------------------------------------------------------------
Merged /ofbiz/trunk/tools/mergefromtrunk.bat:r1307080-1307082,1307607-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352
Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
Merged /ofbiz/trunk/tools/mergefromtrunk.sh:r1307080-1307082,1307607-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352