[embjopr-commits] EMBJOPR SVN: r665 - in trunk/core/src/main/webapp: secure and 1 other directory.

[embjopr-commits at lists.jboss.org]

Author: ips
Date: 2009-08-11 16:02:06 -0400 (Tue, 11 Aug 2009)
New Revision: 665

Modified:
   trunk/core/src/main/webapp/css/console-style.css
   trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml
Log:
fix font size for general props and traits on the Summary tab (https://jira.jboss.org/jira/browse/EMBJOPR-233); update CSS classes for h1, h2, etc.

Modified: trunk/core/src/main/webapp/css/console-style.css
===================================================================
--- trunk/core/src/main/webapp/css/console-style.css	2009-08-11 17:37:33 UTC (rev 664)
+++ trunk/core/src/main/webapp/css/console-style.css	2009-08-11 20:02:06 UTC (rev 665)
@@ -28,9 +28,7 @@
     margin: 0;
     padding: 0;
     font-family: "Lucida Grand", Verdana, Arial, Helvetica, sans-serif;
-    font-size: .8em;
     color: #454545;
-
 }
 
 /* -----------  MAIN LAYOUT COMPONENTS ------------ */
@@ -82,7 +80,7 @@
     overflow: auto;
     background: #eff2f4;
     border-right: 1px solid #dee6ee;
-
+    font-size: 0.75em;
 }
 
 #footer {
@@ -129,30 +127,36 @@
 }
 
 h1 {
-    font-size: 14px;
+    font-size: 1.25em;
     font-weight: bold;
     color: #50667c;
 }
 
 h2 {
-    font-size: 12px;
+    font-size: 1.2em;
     font-weight: bold;
     color: #32444d; /*	border-bottom: 1px solid #e6eaef;  */
 }
 
 h3 {
-    font-size: 11px;
+    font-size: 1.15em;
     font-weight: bold;
     color: #32444d; /*	border-bottom: 1px solid #e6eaef;  */
 }
 
 h4 {
+    font-size: 1.1em;
+    font-weight: bold;
 }
 
 h5 {
+    font-size: 1.05em;
+    font-weight: bold;
 }
 
 h6 {
+    font-size: 1em;
+    font-weight: bold;
 }
 
 /* -------------------- this is the content container ----------------------------- */

Modified: trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml	2009-08-11 17:37:33 UTC (rev 664)
+++ trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml	2009-08-11 20:02:06 UTC (rev 665)
@@ -45,37 +45,41 @@
                 <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/>
 
                 <h2>#{messages['summary.resourceInstance.configuration']}</h2>
-                <table border="0">
-                    <tr>
-                        <td><span
-                                style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.name']}</strong></span>#{resource.resource.name}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><span
-                                style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.version']}</strong></span><h:outputText
-                                rendered="#{not empty resource.resource.version}">#{resource.resource.version}</h:outputText>
-                            <h:outputText rendered="#{empty resource.resource.version}">--</h:outputText></td>
-                    </tr>
-                    <tr>
-                        <td><span
-                                style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.description']}</strong></span><h:outputText
-                                rendered="#{not empty resource.resource.description}">#{resource.resource.description}</h:outputText>
-                            <h:outputText rendered="#{empty resource.resource.description}">--</h:outputText></td>
-                    </tr>
-                </table>
 
+                <h:panelGrid border="0" columns="1" columnClasses="dr-table-cell rich-table-cell standard-traitscolumn">
+                    <h:panelGroup layout="block">
+                        <span style="padding-right:3px;">
+                            <strong>#{messages['summary.resourceInstance.configuration.name']}</strong>
+                        </span>
+                        #{resource.resource.name}
+                    </h:panelGroup>
+                    <h:panelGroup layout="block">
+                        <span style="padding-right:3px;">
+                            <strong>#{messages['summary.resourceInstance.configuration.version']}</strong>
+                        </span>
+                        <h:outputText rendered="#{not empty resource.resource.version}">#{resource.resource.version}</h:outputText>
+                        <h:outputText rendered="#{empty resource.resource.version}">--</h:outputText>
+                    </h:panelGroup>
+                    <h:panelGroup layout="block">
+                        <span style="padding-right:3px;">
+                            <strong>#{messages['summary.resourceInstance.configuration.description']}</strong>
+                        </span>
+                        <h:outputText rendered="#{not empty resource.resource.description}">#{resource.resource.description}</h:outputText>
+                        <h:outputText rendered="#{empty resource.resource.description}">--</h:outputText>
+                    </h:panelGroup>
+                </h:panelGrid>
+
                 <h:panelGroup rendered="#{not empty summaryTraitDisplayList}">
                     <h2>#{messages['summary.resourceInstance.traits']}</h2>
 
-                    <h:dataTable value="#{summaryTraitDisplayList}"
-                                 var="trait"
-                                 columnClasses="standard-traitscolumn">
-                        <h:column>
+                    <rich:dataTable value="#{summaryTraitDisplayList}"
+                                    var="trait"
+                                    columnClasses="standard-traitscolumn">
+                        <rich:column>
                             <strong>#{ summaryMeasurementDefinitionMap[trait.measurementData.name].displayName}:</strong>
                             #{trait.measurementValueAndUnits}
-                        </h:column>
-                    </h:dataTable>
+                        </rich:column>
+                    </rich:dataTable>
                 </h:panelGroup>
 
                 <h:panelGroup rendered="#{not empty summaryMeasurementDisplayList}">