[jboss-svn-commits] JBoss Portal SVN: r5537 - in trunk/core/src: bin/portal-core-war/themes/renaissance resources/portal-core-war/WEB-INF/jsp/cms/admin

[jboss-svn-commits at lists.jboss.org]

Author: roy.russo at jboss.com
Date: 2006-10-31 15:15:58 -0500 (Tue, 31 Oct 2006)
New Revision: 5537

Modified:
   trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-1088 -

Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css	2006-10-31 19:57:49 UTC (rev 5536)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css	2006-10-31 20:15:58 UTC (rev 5537)
@@ -991,7 +991,6 @@
 
 .portlet-section-body {
    color: #656565;
-   padding: 0px 10px 0px 5px;
 }
 
 .portlet-section-alternate {

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/viewfile.jsp	2006-10-31 19:57:49 UTC (rev 5536)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/viewfile.jsp	2006-10-31 20:15:58 UTC (rev 5537)
@@ -120,7 +120,7 @@
 
 <br/><br/>
 
-<table width="100%" border="0" cellspacing="2" cellpadding="2">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
 <%
    if (vContents.size() > 0)
    {
@@ -132,49 +132,45 @@
             Content content = (Content)contentList.get(0);
 %>
 <tr>
-   <td height="10"></td>
+   <td height="15"></td>
 </tr>
 <tr>
-   <td colspan="8">
+   <td colspan="6">
       <%
          if (sType.equals("text/html") || sType.equals("text/plain"))
          {
       %>
-      <a href="<portlet:renderURL>
+      <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
+           alt="${n:i18n("CMS_EDIT")}" border="0">&nbsp;<a href="<portlet:renderURL>
    <portlet:param name="op" value="<%= CMSAdminConstants.OP_EDIT %>"/>
    <portlet:param name="path" value="<%= sCurrPath %>"/>
    <portlet:param name="language" value="<%= content.getLocale().getLanguage() %>" />
-   </portlet:renderURL>">
-         <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
-              alt="${n:i18n("CMS_EDIT")}" border="0">
-      </a>
+   </portlet:renderURL>"><%= content.getLocale().getDisplayLanguage() %>
+   </a>
       <%
       }
       else
       {
       %>
-      <a href="<portlet:renderURL>
+      <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
+           alt="${n:i18n("CMS_EDIT")}" border="0">&nbsp;<a href="<portlet:renderURL>
    <portlet:param name="op" value="<%= CMSAdminConstants.OP_EDIT_BINARY %>"/>
    <portlet:param name="path" value="<%= sCurrPath %>"/>
    <portlet:param name="language" value="<%= content.getLocale().getLanguage() %>"/>
-   </portlet:renderURL>">
-         <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
-              alt="${n:i18n("CMS_EDIT")}" border="0">
-      </a>
+   </portlet:renderURL>"><%= content.getLocale().getDisplayLanguage() %>
+   </a>
       <%
          }
       %>
-
-      <%= content.getLocale().getDisplayLanguage() %>
    </td>
 </tr>
 <tr>
-   <td class="portlet-section-header">${n:i18n("CMS_TYPE")}</td>
-   <td class="portlet-section-header">${n:i18n("CMS_SIZE")}</td>
-   <td class="portlet-section-header">${n:i18n("CMS_VERSION")}</td>
-   <td class="portlet-section-header">${n:i18n("CMS_CREATED")}</td>
-   <td class="portlet-section-header">${n:i18n("CMS_MODIFIED")}</td>
-   <td class="portlet-section-header">${n:i18n("CMS_TITLE")}</td>
+   <td class="portlet-table-text"><b>${n:i18n("CMS_TYPE")}</b></td>
+   <td class="portlet-table-text"><b>${n:i18n("CMS_SIZE")}</b></td>
+   <td class="portlet-table-text"><b>${n:i18n("CMS_VERSION")}</b></td>
+   <td class="portlet-table-text"><b>${n:i18n("CMS_CREATED")}</b></td>
+   <td class="portlet-table-text"><b>${n:i18n("CMS_MODIFIED")}</b></td>
+   <td class="portlet-table-text"><b>${n:i18n("CMS_TITLE")}</b></td>
 </tr>
 <%
    for (int i = 0; i < contentList.size(); i++) // cycle thru list of version nodes
@@ -187,19 +183,22 @@
       {
    %>
    <td>
-      <a href="<portlet:renderURL>
+      <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
+           alt="${n:i18n("CMS_EDIT")}" border="0">&nbsp;<a href="<portlet:renderURL>
    <portlet:param name="op" value="<%= CMSAdminConstants.OP_EDIT %>"/>
    <portlet:param name="path" value="<%= sCurrPath %>"/>
    <portlet:param name="language" value="<%= content.getLocale().getLanguage() %>" />
    <portlet:param name="version" value="<%= version.getVersionNumber() %>"/>
-   </portlet:renderURL>">
-         <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
-              alt="${n:i18n("CMS_EDIT")}" border="0">
-      </a>
+   </portlet:renderURL>"><%= version.getMimeType() %></a>
       <%
-         }
+      }
+      else
+      {
       %>
       <%= version.getMimeType() %>
+      <%
+         }
+      %>
    </td>
    <td><%= version.getBytes().length / 1024 %>kb</td>
    <td>