details: /erp/devel/pi/rev/292680c2c3a9
changeset: 9663:292680c2c3a9
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Jan 10 08:28:26 2011 +0100
summary: Updated clear icon, added new asterisk icon
details: /erp/devel/pi/rev/f1b6462c20d5
changeset: 9664:f1b6462c20d5
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Jan 10 08:28:47 2011 +0100
summary: Replaced ReadOnly action handler with WindowSettings action handler
details: /erp/devel/pi/rev/94990ca49351
changeset: 9665:94990ca49351
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Jan 10 08:29:17 2011 +0100
summary: Styling changes for new icon
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/ReadOnlyTabComputationActionHandler.java
| 65 ----------
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/asterisk-new.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/clear-field.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/clear-field_Disabled.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 6 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
| 29 +---
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-statusbar-styles.css
| 3 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-statusbar-styles.js
| 13 +-
8 files changed, 25 insertions(+), 91 deletions(-)
diffs (180 lines):
diff -r 93a390c75887 -r 94990ca49351
modules/org.openbravo.client.application/src/org/openbravo/client/application/ReadOnlyTabComputationActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ReadOnlyTabComputationActionHandler.java
Mon Jan 10 08:27:39 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo Public License
- * Version 1.1 (the "License"), being the Mozilla Public License
- * Version 1.1 with a permitted attribution clause; you may not use this
- * file except in compliance with the License. You may obtain a copy of
- * the License at http://www.openbravo.com/legal/license.html
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ************************************************************************
- */
-package org.openbravo.client.application;
-
-import java.util.Map;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import org.codehaus.jettison.json.JSONObject;
-import org.openbravo.base.exception.OBException;
-import org.openbravo.client.kernel.BaseActionHandler;
-import org.openbravo.client.kernel.StaticResourceComponent;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.ad.ui.Tab;
-import org.openbravo.model.ad.ui.Window;
-import org.openbravo.service.db.DalConnectionProvider;
-
-/**
- * Computes which tabs are readonly and which are not readonly.
- *
- * @author mtaal
- * @see StaticResourceComponent
- */
-...@applicationscoped
-public class ReadOnlyTabComputationActionHandler extends BaseActionHandler {
-
- protected JSONObject execute(Map<String, Object> parameters, String data) {
-
- try {
- OBContext.setAdminMode();
- final String windowId = (String) parameters.get("windowId");
- final Window window = OBDal.getInstance().get(Window.class, windowId);
- final JSONObject json = new JSONObject();
- final String roleId = OBContext.getOBContext().getRole().getId();
- final DalConnectionProvider dalConnectionProvider = new
DalConnectionProvider();
- for (Tab tab : window.getADTabList()) {
- final boolean readOnlyAccess =
org.openbravo.erpCommon.utility.WindowAccessData
- .hasReadOnlyAccess(dalConnectionProvider, roleId, tab.getId());
- json.put(tab.getId(), readOnlyAccess ||
tab.getUIPattern().equals("RO"));
- }
- return json;
- } catch (Exception e) {
- throw new OBException(e);
- } finally {
- OBContext.restorePreviousMode();
- }
- }
-}
diff -r 93a390c75887 -r 94990ca49351
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/asterisk-new.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/asterisk-new.png
has changed
diff -r 93a390c75887 -r 94990ca49351
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/clear-field.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/clear-field.png
has changed
diff -r 93a390c75887 -r 94990ca49351
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/clear-field_Disabled.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/clear-field_Disabled.png
has changed
diff -r 93a390c75887 -r 94990ca49351
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Mon Jan 10 08:27:39 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Mon Jan 10 08:29:17 2011 +0100
@@ -54,6 +54,10 @@
font-weight: bold;
}
+.OBFormFieldLabelDisabled {
+ color: #acacac;
+}
+
.OBFormFieldInput,
.OBFormFieldInputDisabled,
.OBFormFieldInputFocused,
@@ -263,7 +267,9 @@
=======================================================================*/
.OBSectionItemButton_Title_opened,
+.OBSectionItemButton_Title_Disabledopened
.OBSectionItemButton_Title_closed,
+.OBSectionItemButton_Title_Disabledclosed,
.OBSectionItemButton_Title_Overopened,
.OBSectionItemButton_Title_Overclosed {
font-family: 'lucida sans', sans-serif;
diff -r 93a390c75887 -r 94990ca49351
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
Mon Jan 10 08:27:39 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
Mon Jan 10 08:29:17 2011 +0100
@@ -48,32 +48,11 @@
pickerIconWidth: 21,
pickerIconSrc:
'[SKINIMG]../../org.openbravo.client.application/images/form/search_picker.png',
clearIcon: {
+ showHover: true,
height: 15,
- width: 15,
- src:
'[SKINIMG]../../org.openbravo.client.application/images/form/clear-field.png',
-
- // note: TODO: show a helpfull text, need to be present in the messages
table
- //prompt: 'test',
- // TODO: display logic in styling is not nice but it is the best option I
guess
- showIf: function(form, item){
- if (form && form.view && form.view.readOnly) {
- return false;
- }
- if (item.disabled) {
- return false;
- }
- if (item.required) {
- return false;
- }
- if (item.getValue()) {
- return true;
- }
- return false;
- },
-
- click: function() {
- this.formItem.clearValue();
- }
+ width: 15,
+ src:
'[SKINIMG]../../org.openbravo.client.application/images/form/clear-field.png',
+ prompt: OB.I18N.getLabel('OBUIAPP_ClearIconPrompt')
},
newTabIconSrc:
'[SKINIMG]../../org.openbravo.client.application/images/form/ico-to-new-tab.png',
newTabIconSize: 8
diff -r 93a390c75887 -r 94990ca49351
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-statusbar-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-statusbar-styles.css
Mon Jan 10 08:27:39 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-statusbar-styles.css
Mon Jan 10 08:29:17 2011 +0100
@@ -32,6 +32,9 @@
padding-left: 20px;
}
+.OBStatusBarLeftBar {
+}
+
.OBStatusBarIconButtonBar {
margin-right: 20px;
}
\ No newline at end of file
diff -r 93a390c75887 -r 94990ca49351
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-statusbar-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-statusbar-styles.js
Mon Jan 10 08:27:39 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-statusbar-styles.js
Mon Jan 10 08:29:17 2011 +0100
@@ -25,11 +25,22 @@
leaveScrollbarGap: false,
overflow: 'hidden',
+ newIconDefaults: {
+ showHover: true,
+ prompt: OB.I18N.getLabel('OBUIAPP_NewIconPrompt'),
+ height: 14,
+ width: 14,
+ src:
'[SKINIMG]../../org.openbravo.client.application/images/form/asterisk-new.png'
+ },
+
iconButtonGroupSpacerWidth: 5
});
-isc.OBStatusBarTextLabelBar.addProperties({
+isc.OBStatusBarLeftBar.addProperties({
+ baseStyle: 'OBStatusBarLeftBar',
width: '*',
+ layoutLeftMargin: 5,
+ defaultLayoutAlign: 'center',
align: 'left',
overflow: 'visible'
});
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
