[portal-commits] JBoss Portal SVN: r11936 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.

[portal-commits at lists.jboss.org]

Author: wesleyhales
Date: 2008-09-18 22:44:57 -0400 (Thu, 18 Sep 2008)
New Revision: 11936

Modified:
   branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
   branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml
   branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml
Log:
https://jira.jboss.org/jira/browse/JBPORTAL-2105 added default icon to object nav

Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css	2008-09-19 01:27:52 UTC (rev 11935)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css	2008-09-19 02:44:57 UTC (rev 11936)
@@ -376,7 +376,7 @@
    padding-top: 2px;
    padding-bottom: 2px;
    line-height: 17px;
-   padding-left: 20px;
+   padding-left: 22px;
    white-space: nowrap;
 }
 

Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml	2008-09-19 01:27:52 UTC (rev 11935)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml	2008-09-19 02:44:57 UTC (rev 11936)
@@ -12,7 +12,7 @@
             #{portalobjectmgr.selectedObject.typeName}</h3>
 
          <h:form id="admin-portal-form">
-            <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
+            <h:panelGrid columns="11" cellpadding="0" cellspacing="0" border="0">
             <h:commandLink rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"
                action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout">
                <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>

Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml	2008-09-19 01:27:52 UTC (rev 11935)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml	2008-09-19 02:44:57 UTC (rev 11936)
@@ -41,11 +41,15 @@
                            </h:panelGroup>
                         </c:when>
                         <c:otherwise>
-                           <h:commandLink action="#{portalobjectmgr.selectObject}">
+                           <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="#{node.typeName == 'portal' ? 'actionSelectPortal' : ''}">
                               <f:param name="id" value="#{node.id}"/>
                               <c:choose>
                                  <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when>
-                                 <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise>
+                                 <c:otherwise>
+                                    <span class="objectName">
+                                       #{node.name} #{node.typeName}
+                                    </span>
+                                 </c:otherwise>
                               </c:choose>
                            </h:commandLink>
                         </c:otherwise>