details: /erp/devel/pi/rev/b974f18346c6
changeset: 7832:b974f18346c6
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jul 09 16:52:17 2010 +0200
summary: related to issue 13891
Do not generate contents for left bar and navigation bar when
using new UI
diffstat:
src/org/openbravo/erpCommon/utility/LeftTabsBar.java | 335 ++++++++--------
src/org/openbravo/erpCommon/utility/NavigationBar.java | 165 ++++----
src/org/openbravo/erpCommon/utility/ToolBar.java | 9 +-
src/org/openbravo/erpCommon/utility/Utility.java | 10 +
4 files changed, 269 insertions(+), 250 deletions(-)
diffs (truncated from 599 to 300 lines):
diff -r 55a53776503a -r b974f18346c6
src/org/openbravo/erpCommon/utility/LeftTabsBar.java
--- a/src/org/openbravo/erpCommon/utility/LeftTabsBar.java Fri Jul 09
15:17:03 2010 +0530
+++ b/src/org/openbravo/erpCommon/utility/LeftTabsBar.java Fri Jul 09
16:52:17 2010 +0200
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2009 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -46,69 +46,73 @@
StringBuffer text = new StringBuffer();
text
.append("<table cellpadding=\"0\" cellspacing=\"0\"
class=\"Main_ContentPane_LeftTabsBar\" id=\"tdLeftTabsBars\">\n");
- text.append(" <tr>\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_body\">\n");
- text.append(" <table cellpadding=\"0\" cellspacing=\"0\"
class=\"Main_LeftTabsBar\">\n");
- text.append(" <tr>\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_top\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td>\n");
- text
- .append(" <a class=\"Main_LeftTabsBar_ButtonLeft\"
href=\"#\" onclick=\"menuShowHide('buttonMenu');return false;\">\n");
- text
- .append(
- " <img class=\"Main_LeftTabsBar_ButtonLeft_Icon
Main_LeftTabsBar_ButtonLeft_Icon_arrow_hide\" src=\"")
- .append(base_direction).append(
- "/images/blank.gif\" border=\"0\" id=\"buttonMenu\"></img>\n");
- text.append(" </a>\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td
class=\"Main_LeftTabsBar_bg_separator_cell\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td>\n");
- text.append(" <div
class=\"Main_LeftTabsBar_ButtonRight_selected\">\n");
- text.append(" <img
class=\"Main_LeftTabsBar_ButtonRight_Icon ").append(
- strClassEdition).append(
- "\" alt=\"" + Utility.messageBD(this.conn, "Form View", this.language)
+ "\" title=\""
- + Utility.messageBD(this.conn, "Form View", this.language) + "\"
src=\"").append(
- base_direction)
- .append("/images/blank.gif\" border=\"0\"
id=\"linkButtonEdition\"></img>\n");
- text.append(" </div>\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td>\n");
- text
- .append(
- " <a class=\"Main_LeftTabsBar_ButtonRight\"
href=\"#\" onClick=\"submitCommandForm('RELATION', isUserChanges, null, '")
- .append(servlet_action).append(
- "', '_self', null, true);return false;\"
id=\"buttonRelation\">\n");
- text
- .append(
- " <img class=\"Main_LeftTabsBar_ButtonRight_Icon
Main_LeftTabsBar_ButtonRight_Icon_relation\" alt=\""
- + Utility.messageBD(this.conn, "Grid View", this.language)
- + "\" title=\""
- + Utility.messageBD(this.conn, "Grid View", this.language) +
"\" src=\"").append(
- base_direction).append("/images/blank.gif\"
border=\"0\"></img>\n");
- text.append(" </a>\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" </table>\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
+
+ if (!Utility.isNewUI()) {
+ // show only for old UI
+ text.append(" <tr>\n");
+ text.append(" <td class=\"Main_LeftTabsBar_bg_body\">\n");
+ text.append(" <table cellpadding=\"0\" cellspacing=\"0\"
class=\"Main_LeftTabsBar\">\n");
+ text.append(" <tr>\n");
+ text.append(" <td class=\"Main_LeftTabsBar_bg_top\">\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td>\n");
+ text
+ .append(" <a class=\"Main_LeftTabsBar_ButtonLeft\"
href=\"#\" onclick=\"menuShowHide('buttonMenu');return false;\">\n");
+ text
+ .append(
+ " <img class=\"Main_LeftTabsBar_ButtonLeft_Icon
Main_LeftTabsBar_ButtonLeft_Icon_arrow_hide\" src=\"")
+ .append(base_direction).append(
+ "/images/blank.gif\" border=\"0\" id=\"buttonMenu\"></img>\n");
+ text.append(" </a>\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td
class=\"Main_LeftTabsBar_bg_separator_cell\">\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td>\n");
+ text.append(" <div
class=\"Main_LeftTabsBar_ButtonRight_selected\">\n");
+ text.append(" <img
class=\"Main_LeftTabsBar_ButtonRight_Icon ").append(
+ strClassEdition).append(
+ "\" alt=\"" + Utility.messageBD(this.conn, "Form View",
this.language) + "\" title=\""
+ + Utility.messageBD(this.conn, "Form View", this.language) + "\"
src=\"").append(
+ base_direction).append(
+ "/images/blank.gif\" border=\"0\"
id=\"linkButtonEdition\"></img>\n");
+ text.append(" </div>\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td>\n");
+ text
+ .append(
+ " <a class=\"Main_LeftTabsBar_ButtonRight\"
href=\"#\" onClick=\"submitCommandForm('RELATION', isUserChanges, null, '")
+ .append(servlet_action).append(
+ "', '_self', null, true);return false;\"
id=\"buttonRelation\">\n");
+ text
+ .append(
+ " <img
class=\"Main_LeftTabsBar_ButtonRight_Icon
Main_LeftTabsBar_ButtonRight_Icon_relation\" alt=\""
+ + Utility.messageBD(this.conn, "Grid View", this.language)
+ + "\" title=\""
+ + Utility.messageBD(this.conn, "Grid View", this.language) +
"\" src=\"").append(
+ base_direction).append("/images/blank.gif\"
border=\"0\"></img>\n");
+ text.append(" </a>\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" </table>\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
+ text.append(" <td class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ }
text.append("</table>\n");
return text.toString();
}
@@ -117,70 +121,74 @@
StringBuffer text = new StringBuffer();
text
.append("<table cellpadding=\"0\" cellspacing=\"0\"
class=\"Main_ContentPane_LeftTabsBar\" id=\"tdLeftTabsBars\">\n");
- text.append(" <tr>\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_body\">\n");
- text.append(" <table cellpadding=\"0\" cellspacing=\"0\"
class=\"Main_LeftTabsBar\">\n");
- text.append(" <tr>\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_top\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td>\n");
- text
- .append(" <a class=\"Main_LeftTabsBar_ButtonLeft\"
href=\"#\" onclick=\"menuShowHide('buttonMenu');return false;\">\n");
- text
- .append(
- " <img class=\"Main_LeftTabsBar_ButtonLeft_Icon
Main_LeftTabsBar_ButtonLeft_Icon_arrow_hide\" src=\"")
- .append(base_direction).append(
- "/images/blank.gif\" border=\"0\" id=\"buttonMenu\"></img>\n");
- text.append(" </a>\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td
class=\"Main_LeftTabsBar_bg_separator_cell\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td>\n");
- text
- .append(
- " <a class=\"Main_LeftTabsBar_ButtonRight\"
href=\"#\" onClick=\"submitCommandForm('EDIT', true, null, '")
- .append(servlet_action).append(
- "', '_self', null, false);return false;\"
id=\"buttonEdition\">\n");
- text
- .append(
- " <img class=\"Main_LeftTabsBar_ButtonRight_Icon
Main_LeftTabsBar_ButtonRight_Icon_edition\" alt=\""
- + Utility.messageBD(this.conn, "Form View", this.language)
- + "\" title=\""
- + Utility.messageBD(this.conn, "Form View", this.language) +
"\" src=\"").append(
- base_direction).append("/images/blank.gif\"
border=\"0\"></img>\n");
- text.append(" </a>\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td>\n");
- text.append(" <div
class=\"Main_LeftTabsBar_ButtonRight_selected\">\n");
- text
- .append(
- " <img class=\"Main_LeftTabsBar_ButtonRight_Icon
Main_LeftTabsBar_ButtonRight_Icon_relation_selected\" alt=\""
- + Utility.messageBD(this.conn, "Grid View", this.language)
- + "\" title=\""
- + Utility.messageBD(this.conn, "Grid View", this.language) +
"\" src=\"").append(
- base_direction).append("/images/blank.gif\"
border=\"0\"></img>\n");
- text.append(" </div>\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" </table>\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
+
+ if (!Utility.isNewUI()) {
+ // show only for old UI
+ text.append(" <tr>\n");
+ text.append(" <td class=\"Main_LeftTabsBar_bg_body\">\n");
+ text.append(" <table cellpadding=\"0\" cellspacing=\"0\"
class=\"Main_LeftTabsBar\">\n");
+ text.append(" <tr>\n");
+ text.append(" <td class=\"Main_LeftTabsBar_bg_top\">\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td>\n");
+ text
+ .append(" <a class=\"Main_LeftTabsBar_ButtonLeft\"
href=\"#\" onclick=\"menuShowHide('buttonMenu');return false;\">\n");
+ text
+ .append(
+ " <img class=\"Main_LeftTabsBar_ButtonLeft_Icon
Main_LeftTabsBar_ButtonLeft_Icon_arrow_hide\" src=\"")
+ .append(base_direction).append(
+ "/images/blank.gif\" border=\"0\" id=\"buttonMenu\"></img>\n");
+ text.append(" </a>\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td
class=\"Main_LeftTabsBar_bg_separator_cell\">\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td>\n");
+ text
+ .append(
+ " <a class=\"Main_LeftTabsBar_ButtonRight\"
href=\"#\" onClick=\"submitCommandForm('EDIT', true, null, '")
+ .append(servlet_action).append(
+ "', '_self', null, false);return false;\"
id=\"buttonEdition\">\n");
+ text
+ .append(
+ " <img
class=\"Main_LeftTabsBar_ButtonRight_Icon
Main_LeftTabsBar_ButtonRight_Icon_edition\" alt=\""
+ + Utility.messageBD(this.conn, "Form View", this.language)
+ + "\" title=\""
+ + Utility.messageBD(this.conn, "Form View", this.language) +
"\" src=\"").append(
+ base_direction).append("/images/blank.gif\"
border=\"0\"></img>\n");
+ text.append(" </a>\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td>\n");
+ text.append(" <div
class=\"Main_LeftTabsBar_ButtonRight_selected\">\n");
+ text
+ .append(
+ " <img
class=\"Main_LeftTabsBar_ButtonRight_Icon
Main_LeftTabsBar_ButtonRight_Icon_relation_selected\" alt=\""
+ + Utility.messageBD(this.conn, "Grid View", this.language)
+ + "\" title=\""
+ + Utility.messageBD(this.conn, "Grid View", this.language) +
"\" src=\"").append(
+ base_direction).append("/images/blank.gif\"
border=\"0\"></img>\n");
+ text.append(" </div>\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr>\n");
+ text.append(" <td class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" </table>\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ text.append(" <tr class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
+ text.append(" <td class=\"Main_LeftTabsBar_bg_empty_cell\">\n");
+ text.append(" </td>\n");
+ text.append(" </tr>\n");
+ }
text.append("</table>\n");
return text.toString();
}
@@ -189,40 +197,43 @@
StringBuffer text = new StringBuffer();
text
.append("<table cellpadding=\"0\" cellspacing=\"0\"
class=\"Main_ContentPane_LeftTabsBar\" id=\"tdLeftTabsBars\">\n");
- text.append(" <tr>\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_body\">\n");
- text.append(" <table cellpadding=\"0\" cellspacing=\"0\"
class=\"Main_LeftTabsBar\">\n");
- text.append(" <tr>\n");
- text.append(" <td class=\"Main_LeftTabsBar_bg_top\">\n");
- text.append(" </td>\n");
- text.append(" </tr>\n");
- text.append(" <tr>\n");
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
