diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java index 77cf55238b..224db16019 100644 --- a/org.adempiere.base/src/org/compiere/Adempiere.java +++ b/org.adempiere.base/src/org/compiere/Adempiere.java @@ -79,14 +79,14 @@ public final class Adempiere /** URL of Product */ static public final String URL = "www.idempiere.org"; /** 16*16 Product Image. **/ - static private final String s_File16x16 = "images/AD16.gif"; + static private final String s_File16x16 = "images/iD16.gif"; /** 32*32 Product Image. */ - static private final String s_file32x32 = "images/AD32.gif"; + static private final String s_file32x32 = "images/iD32.gif"; /** 100*30 Product Image. */ - static private final String s_file100x30 = "images/AD10030.png"; + static private final String s_file100x30 = "images/iD10030.png"; /** 48*15 Product Image. */ - static private final String s_file48x15 = "images/Adempiere.png"; - static private final String s_file48x15HR = "images/AdempiereHR.png"; + static private final String s_file48x15 = "images/iDempiere.png"; + static private final String s_file48x15HR = "images/iDempiereHR.png"; /** Support Email */ static private String s_supportEmail = ""; diff --git a/org.adempiere.base/src/org/compiere/util/WebDoc.java b/org.adempiere.base/src/org/compiere/util/WebDoc.java index e033ce3366..f40d050f43 100644 --- a/org.adempiere.base/src/org/compiere/util/WebDoc.java +++ b/org.adempiere.base/src/org/compiere/util/WebDoc.java @@ -186,7 +186,7 @@ public class WebDoc m_topRight = new td().setAlign("right"); if (javaClient) { - m_topRight.addElement(new img("res:org/compiere/images/AD10030.png") + m_topRight.addElement(new img("res:org/compiere/images/iD10030.png") .setAlign(AlignType.RIGHT).setAlt("iDempiere")); } else { m_topRight.addElement(new img("images/header-logo.png") diff --git a/org.adempiere.server/AdemPiere150x50.gif b/org.adempiere.server/AdemPiere150x50.gif deleted file mode 100644 index 6244fce225..0000000000 Binary files a/org.adempiere.server/AdemPiere150x50.gif and /dev/null differ diff --git a/org.adempiere.server/Adempiere120x60.gif b/org.adempiere.server/Adempiere120x60.gif deleted file mode 100644 index 07ca4d0ff0..0000000000 Binary files a/org.adempiere.server/Adempiere120x60.gif and /dev/null differ diff --git a/org.adempiere.server/Background.gif b/org.adempiere.server/Background.gif deleted file mode 100644 index 11988728ed..0000000000 Binary files a/org.adempiere.server/Background.gif and /dev/null differ diff --git a/org.adempiere.server/C32.gif b/org.adempiere.server/C32.gif deleted file mode 100644 index c83d267cbd..0000000000 Binary files a/org.adempiere.server/C32.gif and /dev/null differ diff --git a/org.adempiere.server/Logo.gif b/org.adempiere.server/Logo.gif deleted file mode 100644 index f3e3c93682..0000000000 Binary files a/org.adempiere.server/Logo.gif and /dev/null differ diff --git a/org.adempiere.server/WEB-INF/web.xml b/org.adempiere.server/WEB-INF/web.xml index 1442c4cb53..497dfd0184 100644 --- a/org.adempiere.server/WEB-INF/web.xml +++ b/org.adempiere.server/WEB-INF/web.xml @@ -4,20 +4,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - ADempiere Root + iDempiere Root ServerRoot 1 - ADempiere Monitor Filter - AdempiereMonitorFilter + iDempiere Monitor Filter + idempiereMonitorFilter org.compiere.web.AdempiereMonitorFilter - AdempiereMonitorFilter - /adempiereMonitor/* + idempiereMonitorFilter + /idempiereMonitor/* JNLP Download Servlet @@ -30,15 +30,15 @@ 1 - ADempiere Server Status Info + iDempiere Server Status Info Server Status StatusInfo org.compiere.web.StatusInfo - ADempiere Server Monitor - ADempiere Monitor - AdempiereMonitor + iDempiere Server Monitor + iDempiere Monitor + idempiereMonitor org.compiere.web.AdempiereMonitor 1 @@ -61,8 +61,8 @@ /statusInfo - AdempiereMonitor - /adempiereMonitor/* + idempiereMonitor + /idempiereMonitor/* RestletServlet @@ -86,7 +86,7 @@ admin - /adempiereMonitor/* + /idempiereMonitor/* service @@ -97,6 +97,6 @@ - adempiere.html + idempiere.html diff --git a/org.adempiere.server/adempiere.jnlp b/org.adempiere.server/adempiere.jnlp index 3d00ab2ba2..414310cb0c 100644 --- a/org.adempiere.server/adempiere.jnlp +++ b/org.adempiere.server/adempiere.jnlp @@ -11,7 +11,7 @@ Adempiere ERP+CRM ($$context) Adempiere ERP+CRM Adempiere ERP+CRM ($$context) - + diff --git a/org.adempiere.server/adempiere_logo.gif b/org.adempiere.server/adempiere_logo.gif deleted file mode 100644 index 2f61d547e1..0000000000 Binary files a/org.adempiere.server/adempiere_logo.gif and /dev/null differ diff --git a/org.adempiere.server/adempiere_logo.png b/org.adempiere.server/adempiere_logo.png deleted file mode 100644 index cd78410b72..0000000000 Binary files a/org.adempiere.server/adempiere_logo.png and /dev/null differ diff --git a/org.adempiere.server/adempiere_logo2.gif b/org.adempiere.server/adempiere_logo2.gif deleted file mode 100644 index 2f61d547e1..0000000000 Binary files a/org.adempiere.server/adempiere_logo2.gif and /dev/null differ diff --git a/org.adempiere.server/adempiere_logo3.png b/org.adempiere.server/adempiere_logo3.png deleted file mode 100644 index 679097b795..0000000000 Binary files a/org.adempiere.server/adempiere_logo3.png and /dev/null differ diff --git a/org.adempiere.server/build.properties b/org.adempiere.server/build.properties index 4dc9108aee..2510288944 100644 --- a/org.adempiere.server/build.properties +++ b/org.adempiere.server/build.properties @@ -3,17 +3,12 @@ bin.includes = META-INF/,\ WEB-INF/lib/jnlp-servlet.jar,\ .,\ WEB-INF/web.xml,\ - AdemPiere150x50.gif,\ - Adempiere120x60.gif,\ - Background.gif,\ - C32.gif,\ - Logo.gif,\ - adempiere.html,\ + iDempiere120x60.gif,\ + iD32.gif,\ + idempiere.html,\ adempiere.jnlp,\ - adempiere_logo.gif,\ - adempiere_logo.png,\ - adempiere_logo2.gif,\ - adempiere_logo3.png,\ + idempiere_logo.png,\ + idempiere_logo2.gif,\ applet.html,\ favicon.ico,\ footer_bar.gif,\ @@ -24,7 +19,6 @@ bin.includes = META-INF/,\ robots.txt,\ standard.css,\ webstart.jpg,\ - webstart_s.jpg,\ zip.gif,\ plugin.xml bin.excludes = src/**,\ diff --git a/org.adempiere.server/favicon.ico b/org.adempiere.server/favicon.ico index 14c3ee6ebd..047762dac5 100644 Binary files a/org.adempiere.server/favicon.ico and b/org.adempiere.server/favicon.ico differ diff --git a/org.adempiere.server/header_banner.png b/org.adempiere.server/header_banner.png index 21c11b7b11..abc8907007 100644 Binary files a/org.adempiere.server/header_banner.png and b/org.adempiere.server/header_banner.png differ diff --git a/org.adempiere.server/iD32.gif b/org.adempiere.server/iD32.gif new file mode 100644 index 0000000000..65c7a571a3 Binary files /dev/null and b/org.adempiere.server/iD32.gif differ diff --git a/org.adempiere.server/iDempiere120x60.gif b/org.adempiere.server/iDempiere120x60.gif new file mode 100644 index 0000000000..b91f1011a3 Binary files /dev/null and b/org.adempiere.server/iDempiere120x60.gif differ diff --git a/org.adempiere.server/adempiere.html b/org.adempiere.server/idempiere.html similarity index 94% rename from org.adempiere.server/adempiere.html rename to org.adempiere.server/idempiere.html index c1fd2d86ad..023b1db0f6 100644 --- a/org.adempiere.server/adempiere.html +++ b/org.adempiere.server/idempiere.html @@ -63,7 +63,7 @@ End If //--> - + @@ -78,7 +78,7 @@ End If - + @@ -188,7 +188,7 @@ Start iDempiere via RUN_Adempiere @@ -202,7 +202,7 @@ Start iDempiere via RUN_Adempiere @@ -223,7 +223,7 @@ Start iDempiere via RUN_Adempiere - + diff --git a/org.adempiere.server/idempiere_logo.png b/org.adempiere.server/idempiere_logo.png new file mode 100644 index 0000000000..451e2c2150 Binary files /dev/null and b/org.adempiere.server/idempiere_logo.png differ diff --git a/org.adempiere.server/idempiere_logo2.gif b/org.adempiere.server/idempiere_logo2.gif new file mode 100644 index 0000000000..a7317de91e Binary files /dev/null and b/org.adempiere.server/idempiere_logo2.gif differ diff --git a/org.adempiere.server/index.html b/org.adempiere.server/index.html index a8b1b08a4c..5299d3fa0b 100644 --- a/org.adempiere.server/index.html +++ b/org.adempiere.server/index.html @@ -6,8 +6,8 @@ -

Click here if not forwarded automatically

+

Click here if not forwarded automatically

diff --git a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java index 19147dd331..7bae7bebf0 100644 --- a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java +++ b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java @@ -189,7 +189,7 @@ public class AdempiereMonitor extends HttpServlet return false; } - WebDoc doc = WebDoc.create ("Adempiere Server Monitor Log"); + WebDoc doc = WebDoc.create ("iDempiere Server Monitor Log"); // Body body b = doc.getBody(); // @@ -555,7 +555,7 @@ public class AdempiereMonitor extends HttpServlet private void createSummaryPage (HttpServletRequest request, HttpServletResponse response,boolean refresh) throws ServletException, IOException { - WebDoc doc = WebDoc.create ("Adempiere Server Monitor"); + WebDoc doc = WebDoc.create ("iDempiere Server Monitor"); // log.info("ServletConfig=" + getServletConfig()); AdempiereServerGroup.get().dump(); @@ -1094,7 +1094,7 @@ public class AdempiereMonitor extends HttpServlet */ public String getServletInfo () { - return "Adempiere Server Monitor"; + return "iDempiere Server Monitor"; } // getServletName private static final String s_dirAccessFileName = "dirAccess.txt"; diff --git a/org.adempiere.server/webstart_s.jpg b/org.adempiere.server/webstart_s.jpg deleted file mode 100644 index 7dc44d8c2e..0000000000 Binary files a/org.adempiere.server/webstart_s.jpg and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AGlassPane.java b/org.adempiere.ui.swing/src/org/compiere/apps/AGlassPane.java index 85bc294087..63df3b5356 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/AGlassPane.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/AGlassPane.java @@ -60,7 +60,7 @@ public class AGlassPane extends JPanel implements MouseListener, ActionListener } // AGlassPane /** The Image */ - public static Image s_image = Env.getImage("C10030.gif"); + public static Image s_image = Env.getImage("iD10030.png"); /** The Message Font */ public static Font s_font = new Font("Dialog", 3, 14); /** The Message Color */ diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java b/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java index 6a6809878f..28c390c6b0 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java @@ -145,7 +145,7 @@ public class Waiting extends CDialog infoLabel.setFont(new java.awt.Font("Dialog", 3, 14)); infoLabel.setHorizontalAlignment(SwingConstants.CENTER); infoLabel.setHorizontalTextPosition(SwingConstants.RIGHT); - infoLabel.setIcon(Env.getImageIcon("C10030.gif")); + infoLabel.setIcon(Env.getImageIcon("iD10030.png")); infoLabel.setIconTextGap(10); mainPanel.add(infoLabel, BorderLayout.NORTH); mainPanel.add(progressBar, BorderLayout.CENTER); diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AD10030.bak.gif b/org.adempiere.ui.swing/src/org/compiere/images/AD10030.bak.gif deleted file mode 100755 index 5bc543107b..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AD10030.bak.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AD10030.gif b/org.adempiere.ui.swing/src/org/compiere/images/AD10030.gif deleted file mode 100755 index 318890f722..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AD10030.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AD10030.png b/org.adempiere.ui.swing/src/org/compiere/images/AD10030.png deleted file mode 100755 index 318890f722..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AD10030.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AD10030HR.png b/org.adempiere.ui.swing/src/org/compiere/images/AD10030HR.png deleted file mode 100755 index 80205102be..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AD10030HR.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AD16.gif b/org.adempiere.ui.swing/src/org/compiere/images/AD16.gif deleted file mode 100755 index b1471c38cf..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AD16.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AD32.gif b/org.adempiere.ui.swing/src/org/compiere/images/AD32.gif deleted file mode 100755 index c83d267cbd..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AD32.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/ADempiereHR_.png b/org.adempiere.ui.swing/src/org/compiere/images/ADempiereHR_.png deleted file mode 100644 index 79958a4e6c..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/ADempiereHR_.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/ADempiere_.png b/org.adempiere.ui.swing/src/org/compiere/images/ADempiere_.png deleted file mode 100644 index 79958a4e6c..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/ADempiere_.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiere150x50.gif b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiere150x50.gif deleted file mode 100644 index 6244fce225..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiere150x50.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.gif b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.gif deleted file mode 100644 index 60ee14b61e..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.jpg b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.jpg deleted file mode 100644 index b0c979b7ce..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.jpg and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.png b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.png deleted file mode 100644 index 60ee14b61e..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereCom.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComHR.png b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComHR.png deleted file mode 100644 index d5d3c23e72..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComHR.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComx.png b/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComx.png deleted file mode 100644 index 60ee14b61e..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AdemPiereComx.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.gif b/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.gif deleted file mode 100644 index 61c2440736..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.jpg b/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.jpg deleted file mode 100644 index 4240adf6ef..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.jpg and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.png b/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.png deleted file mode 100644 index 61c2440736..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Adempiere.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Adempiere120x60.gif b/org.adempiere.ui.swing/src/org/compiere/images/Adempiere120x60.gif deleted file mode 100644 index 07ca4d0ff0..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Adempiere120x60.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/AdempiereHR.png b/org.adempiere.ui.swing/src/org/compiere/images/AdempiereHR.png deleted file mode 100644 index 99cb6fea84..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/AdempiereHR.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Adempierex.png b/org.adempiere.ui.swing/src/org/compiere/images/Adempierex.png deleted file mode 100644 index 61c2440736..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Adempierex.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/C10030.gif b/org.adempiere.ui.swing/src/org/compiere/images/C10030.gif deleted file mode 100644 index 318890f722..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/C10030.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/C10030.jpg b/org.adempiere.ui.swing/src/org/compiere/images/C10030.jpg deleted file mode 100644 index 76fb7b5bcd..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/C10030.jpg and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/C10030.png b/org.adempiere.ui.swing/src/org/compiere/images/C10030.png deleted file mode 100644 index 318890f722..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/C10030.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/C10030HR.png b/org.adempiere.ui.swing/src/org/compiere/images/C10030HR.png index 80205102be..e5cd1f7b4f 100644 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/C10030HR.png and b/org.adempiere.ui.swing/src/org/compiere/images/C10030HR.png differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/C10030x.png b/org.adempiere.ui.swing/src/org/compiere/images/C10030x.png deleted file mode 100644 index 318890f722..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/C10030x.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/C10030xHR.png b/org.adempiere.ui.swing/src/org/compiere/images/C10030xHR.png deleted file mode 100755 index 80205102be..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/C10030xHR.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/C16.gif b/org.adempiere.ui.swing/src/org/compiere/images/C16.gif deleted file mode 100644 index 27d903c3e2..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/C16.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/C32.gif b/org.adempiere.ui.swing/src/org/compiere/images/C32.gif deleted file mode 100644 index c83d267cbd..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/C32.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.gif b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.gif deleted file mode 100755 index 60ee14b61e..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.jpg b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.jpg deleted file mode 100755 index b0c979b7ce..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.jpg and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.png b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.png deleted file mode 100755 index 60ee14b61e..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereCom.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereComHR.png b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereComHR.png deleted file mode 100755 index d5d3c23e72..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereComHR.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereComx.png b/org.adempiere.ui.swing/src/org/compiere/images/ComPiereComx.png deleted file mode 100755 index 60ee14b61e..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/ComPiereComx.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Compiere.gif b/org.adempiere.ui.swing/src/org/compiere/images/Compiere.gif deleted file mode 100755 index 61c2440736..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Compiere.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Compiere.jpg b/org.adempiere.ui.swing/src/org/compiere/images/Compiere.jpg deleted file mode 100755 index 4240adf6ef..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Compiere.jpg and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Compiere.png b/org.adempiere.ui.swing/src/org/compiere/images/Compiere.png deleted file mode 100755 index 61c2440736..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Compiere.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/CompiereHR.png b/org.adempiere.ui.swing/src/org/compiere/images/CompiereHR.png deleted file mode 100755 index 99cb6fea84..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/CompiereHR.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Compierex.png b/org.adempiere.ui.swing/src/org/compiere/images/Compierex.png deleted file mode 100755 index 61c2440736..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Compierex.png and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.bak.gif b/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.bak.gif deleted file mode 100755 index 934d093c58..0000000000 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.bak.gif and /dev/null differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.gif b/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.gif index edce8a8dd1..036dd8637b 100644 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.gif and b/org.adempiere.ui.swing/src/org/compiere/images/Java_anim.gif differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/Logo.gif b/org.adempiere.ui.swing/src/org/compiere/images/Logo.gif index 761db55b58..7e98bb0696 100644 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/Logo.gif and b/org.adempiere.ui.swing/src/org/compiere/images/Logo.gif differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/iD10030.png b/org.adempiere.ui.swing/src/org/compiere/images/iD10030.png new file mode 100644 index 0000000000..e5cd1f7b4f Binary files /dev/null and b/org.adempiere.ui.swing/src/org/compiere/images/iD10030.png differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/iD16.gif b/org.adempiere.ui.swing/src/org/compiere/images/iD16.gif new file mode 100644 index 0000000000..e626d5704a Binary files /dev/null and b/org.adempiere.ui.swing/src/org/compiere/images/iD16.gif differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/iD32.gif b/org.adempiere.ui.swing/src/org/compiere/images/iD32.gif new file mode 100644 index 0000000000..65c7a571a3 Binary files /dev/null and b/org.adempiere.ui.swing/src/org/compiere/images/iD32.gif differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/iDempiere.png b/org.adempiere.ui.swing/src/org/compiere/images/iDempiere.png new file mode 100644 index 0000000000..38cb4be63e Binary files /dev/null and b/org.adempiere.ui.swing/src/org/compiere/images/iDempiere.png differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/iDempiereHR.png b/org.adempiere.ui.swing/src/org/compiere/images/iDempiereHR.png new file mode 100644 index 0000000000..76071a46dd Binary files /dev/null and b/org.adempiere.ui.swing/src/org/compiere/images/iDempiereHR.png differ diff --git a/org.adempiere.ui.swing/src/org/compiere/images/logo_ad.png b/org.adempiere.ui.swing/src/org/compiere/images/logo_ad.png index a79ccb61ef..f7574b2071 100644 Binary files a/org.adempiere.ui.swing/src/org/compiere/images/logo_ad.png and b/org.adempiere.ui.swing/src/org/compiere/images/logo_ad.png differ diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereColor.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereColor.java index f778cc515f..2285f07734 100644 --- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereColor.java +++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereColor.java @@ -640,7 +640,7 @@ public class CompiereColor implements Serializable if (!isTexture()) return null; if (m_textureURL == null) - m_textureURL = CompiereColor.class.getResource("Adempiere00x100.gif"); + m_textureURL = CompiereColor.class.getResource("iDempiere00x100.gif"); return m_textureURL; } // getTextureURL diff --git a/org.adempiere.ui.swing/src/org/compiere/util/Splash.java b/org.adempiere.ui.swing/src/org/compiere/util/Splash.java index 9b750adc6a..022a6a0356 100644 --- a/org.adempiere.ui.swing/src/org/compiere/util/Splash.java +++ b/org.adempiere.ui.swing/src/org/compiere/util/Splash.java @@ -93,7 +93,7 @@ public class Splash extends Frame */ public Splash (String text) { - super("Adempiere"); + super("iDempiere"); System.out.println(text); message.setText(text); try diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java index 17713dcbeb..ba2e7e1b16 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java @@ -42,7 +42,7 @@ public class WebUIResourceFinder implements IResourceFinder { @Override public URL getResource(String name) { - if ("images/AdempiereHR.png".equals(name) || "images/Adempiere.png".equals(name)) { + if ("images/iDempiereHR.png".equals(name) || "images/iDempiere.png".equals(name)) { name = ThemeManager.getThemeResource("images/header-logo.png"); } Enumeration e = find(name); diff --git a/org.adempiere.ui.zk/images/AD32.png b/org.adempiere.ui.zk/images/AD32.png deleted file mode 100644 index d51ea2a7fd..0000000000 Binary files a/org.adempiere.ui.zk/images/AD32.png and /dev/null differ diff --git a/org.adempiere.ui.zk/images/iD32.png b/org.adempiere.ui.zk/images/iD32.png new file mode 100644 index 0000000000..65c7a571a3 Binary files /dev/null and b/org.adempiere.ui.zk/images/iD32.png differ diff --git a/org.adempiere.ui.zk/theme/default/images/header-logo.png b/org.adempiere.ui.zk/theme/default/images/header-logo.png index cb8cafadf0..e5cd1f7b4f 100644 Binary files a/org.adempiere.ui.zk/theme/default/images/header-logo.png and b/org.adempiere.ui.zk/theme/default/images/header-logo.png differ diff --git a/org.adempiere.ui.zk/theme/default/images/icon.png b/org.adempiere.ui.zk/theme/default/images/icon.png index e26be9dbee..06749feb37 100644 Binary files a/org.adempiere.ui.zk/theme/default/images/icon.png and b/org.adempiere.ui.zk/theme/default/images/icon.png differ diff --git a/org.adempiere.ui.zk/theme/default/images/login-logo.png b/org.adempiere.ui.zk/theme/default/images/login-logo.png index aa9d7431b3..163c3efa0b 100644 Binary files a/org.adempiere.ui.zk/theme/default/images/login-logo.png and b/org.adempiere.ui.zk/theme/default/images/login-logo.png differ diff --git a/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul b/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul index ba13863fd3..6cc67115c0 100644 --- a/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul +++ b/org.adempiere.ui.zk/theme/default/zul/login/login-links.zul @@ -25,7 +25,7 @@ Copyright (C) 2009 Idalica Corporation image="http://sfx-images.mozilla.org/affiliates/Buttons/firefox3/110x32_get_ffx.png" target="_blank" /> -
iDempiere LogoiDempiere Logo
-

iDempiere Server Management +

iDempiere Server Management

-

Wiki - Manual - IRC Channel
+

Wiki - Resources - IRC Channel
Forums - Support Requests
© Copyright 2012 iDempiere - All rights reserved - iDempiere License is GPLv2© Copyright 2013 iDempiere - All rights reserved - iDempiere License is GPLv2