[embjopr-commits] EMBJOPR SVN: r458 - in trunk: core and 5 other directories.

embjopr-commits at lists.jboss.org embjopr-commits at lists.jboss.org
Wed May 20 17:10:36 EDT 2009


Author: ips
Date: 2009-05-20 17:10:36 -0400 (Wed, 20 May 2009)
New Revision: 458

Added:
   trunk/core/src/main/webappBinary/images/header.png
Removed:
   trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_hori.gif
Modified:
   trunk/core/pom.xml
   trunk/core/src/main/webapp/css/console-style.css
   trunk/core/src/main/webapp/include/footer.xhtml
   trunk/core/src/main/webapp/include/header.xhtml
   trunk/core/src/main/webapp/login.xhtml
   trunk/jbas5/pom.xml
   trunk/pom.xml
Log:
rebrand header and footer for AS5 admin-console

Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml	2009-05-20 19:06:04 UTC (rev 457)
+++ trunk/core/pom.xml	2009-05-20 21:10:36 UTC (rev 458)
@@ -43,7 +43,7 @@
 
     <properties>
         <war.dir>${basedir}/target/${project.build.finalName}</war.dir>
-        <product.name>${project.name}</product.name>
+        <product.name>Embedded Jopr</product.name>
         <product.version>${project.version}</product.version>
     </properties>
 

Modified: trunk/core/src/main/webapp/css/console-style.css
===================================================================
--- trunk/core/src/main/webapp/css/console-style.css	2009-05-20 19:06:04 UTC (rev 457)
+++ trunk/core/src/main/webapp/css/console-style.css	2009-05-20 21:10:36 UTC (rev 458)
@@ -157,6 +157,11 @@
 
 /* -------------------- this is the content container ----------------------------- */
 
+.headerText {
+    font-size: 24px;
+    font-weight: normal;
+}
+
 .tabmenubox {
     font: 0.9em / 1.3em "Lucida Grand", Verdana, sans-serif;
     text-align: left;

Modified: trunk/core/src/main/webapp/include/footer.xhtml
===================================================================
--- trunk/core/src/main/webapp/include/footer.xhtml	2009-05-20 19:06:04 UTC (rev 457)
+++ trunk/core/src/main/webapp/include/footer.xhtml	2009-05-20 21:10:36 UTC (rev 458)
@@ -35,7 +35,8 @@
     <div id="footer">
         <h:outputText escape="false" value="#{messages['product.name']} #{messages['product.version']}"/>
         <h:outputText escape="false" value=" (r#{messages['product.buildNumber']})"
-                      rendered="#{not empty messages['product.buildNumber']}"/>
+                      rendered="#{not empty messages['product.buildNumber']}"/> 
+        - Powered by <a href="http://jboss.org/embjopr/" title="Embedded Jopr">Embedded Jopr</a>
         <br/>
         <h:outputText escape="false" value="#{messages['product.copyright']}"/>
     </div>

Modified: trunk/core/src/main/webapp/include/header.xhtml
===================================================================
--- trunk/core/src/main/webapp/include/header.xhtml	2009-05-20 19:06:04 UTC (rev 457)
+++ trunk/core/src/main/webapp/include/header.xhtml	2009-05-20 21:10:36 UTC (rev 458)
@@ -34,9 +34,14 @@
 <ui:composition>
     <div id="pageheader">
         <div class="floatleft">
-            <h:outputLink value="http://jboss.org/embjopr/">
-                <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/>
-            </h:outputLink>
+            <h:panelGrid columns="2">
+              <h:outputLink value="http://jboss.org/embjopr/">
+                <h:graphicImage value="images/header.png" alt="Embedded Jopr"/>
+              </h:outputLink>
+              <h:panelGroup styleClass="headerText">
+                #{messages['product.name']}
+              </h:panelGroup>
+            </h:panelGrid>
         </div>
         <div class="login">
             <h:outputText rendered="#{not empty identity.username}">

Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml	2009-05-20 19:06:04 UTC (rev 457)
+++ trunk/core/src/main/webapp/login.xhtml	2009-05-20 21:10:36 UTC (rev 458)
@@ -46,9 +46,14 @@
     <div align="center" class="container">
         <div id="pageheader">
             <div class="floatleft">
-                <h:outputLink value="http://jboss.org/embjopr/">
-                    <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/>
-                </h:outputLink>
+                <h:panelGrid columns="2">
+                  <h:outputLink value="http://jboss.org/embjopr/">
+                    <h:graphicImage value="images/header.png" alt="Embedded Jopr"/>
+                  </h:outputLink>
+                  <h:panelGroup styleClass="headerText">
+                    #{messages['product.name']}
+                  </h:panelGroup>
+                </h:panelGrid>
             </div>
             <div class="login"><a href="#">#{messages['help.link']}</a><br/></div>
         </div>
@@ -56,7 +61,7 @@
             <h:messages layout="table" styleClass="loginerror-msg"/>
             <h:form id="login_form">
                 <div>
-                    <h2>Welcome to the JBoss Administration Console.</h2>
+                    <h2>Welcome to the #{messages['product.name']}.</h2>
 
                     <h2>Please login to proceed.</h2>
 

Deleted: trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_hori.gif
===================================================================
(Binary files differ)

Added: trunk/core/src/main/webappBinary/images/header.png
===================================================================
(Binary files differ)


Property changes on: trunk/core/src/main/webappBinary/images/header.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: trunk/jbas5/pom.xml
===================================================================
--- trunk/jbas5/pom.xml	2009-05-20 19:06:04 UTC (rev 457)
+++ trunk/jbas5/pom.xml	2009-05-20 21:10:36 UTC (rev 458)
@@ -87,27 +87,51 @@
                 </configuration>
             </plugin>
 
-            <!--
             <plugin>
                  <artifactId>maven-antrun-plugin</artifactId>
                  <executions>
                     <execution>
                        <phase>package</phase>
                        <configuration>
-                          <tasks>
+                          <tasks>                             
                              <echo>*** Overlaying messages...</echo>
-                              <replace file="${warDir}/WEB-INF/classes/messages.properties" token="default.windowTitle=JBoss Application Server Console" value="default.windowTitle=JBoss Administration Console for ESB" />
-
-                             <zip destfile="${warFile}" basedir="${warDir}" includes="WEB-INF/classes/messages.properties" update="true" />
+                             <replaceregexp file="${warDir}/WEB-INF/classes/messages.properties"
+                                            match="product.name=(.*)"
+                                            replace="product.name=JBoss AS Administration Console"
+                                            byline="true"/>
+                             <replaceregexp file="${warDir}/WEB-INF/classes/messages.properties"
+                                            match="default.windowTitle=(.*)"
+                                            replace="default.windowTitle=JBoss AS Administration Console"
+                                            byline="true"/>                                            
+                             <zip destfile="${warFile}" basedir="${warDir}" 
+                                  includes="WEB-INF/classes/messages.properties" 
+                                  update="true"/>                             
                           </tasks>
                        </configuration>
                        <goals>
                            <goal>run</goal>
                        </goals>
-                    </execution>
+                    </execution>                    
                  </executions>
+                 <dependencies>
+                    <dependency>
+                      <groupId>org.apache.ant</groupId>
+                      <artifactId>ant-nodeps</artifactId>
+                      <version>1.7.1</version>
+                    </dependency>
+                    <dependency>
+                      <groupId>org.apache.ant</groupId>
+                      <artifactId>ant-apache-regexp</artifactId>
+                      <version>1.7.1</version>
+                    </dependency>
+                    <dependency>
+                      <artifactId>jakarta-regexp</artifactId>
+                      <groupId>jakarta-regexp</groupId>
+                      <version>1.4</version>
+                    </dependency>
+                 </dependencies>                      
              </plugin>
-            -->
+
         </plugins>
     </build>
 

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-05-20 19:06:04 UTC (rev 457)
+++ trunk/pom.xml	2009-05-20 21:10:36 UTC (rev 458)
@@ -96,15 +96,36 @@
                     </archive>
                 </configuration>
             </plugin>
-
+            
+            <plugin>
+                 <artifactId>maven-antrun-plugin</artifactId>
+                 <dependencies>
+                    <dependency>
+                      <groupId>org.apache.ant</groupId>
+                      <artifactId>ant-nodeps</artifactId>
+                      <version>1.7.1</version>
+                    </dependency>
+                    <dependency>
+                      <groupId>org.apache.ant</groupId>
+                      <artifactId>ant-apache-regexp</artifactId>
+                      <version>1.7.1</version>
+                    </dependency>
+                    <dependency>
+                      <artifactId>jakarta-regexp</artifactId>
+                      <groupId>jakarta-regexp</groupId>
+                      <version>1.4</version>
+                    </dependency>
+                 </dependencies>                      
+             </plugin>
+            
         </plugins>
     </build>
 
     <modules>
         <module>core</module>
-        <module>jbas4</module>
+        <!--<module>jbas4</module>-->
         <module>jbas5</module>
-        <module>jsfunit</module>
+        <!--<module>jsfunit</module>-->
     </modules>
 
     <repositories>




More information about the embjopr-commits mailing list