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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Oct 31 17:56:32 EST 2006


Author: roy.russo at jboss.com
Date: 2006-10-31 17:56:30 -0500 (Tue, 31 Oct 2006)
New Revision: 5544

Modified:
   trunk/core/src/bin/portal-core-war/images/cms/admin/plus.gif
   trunk/core/src/bin/portal-core-war/images/cms/admin/style.css
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/folderlist.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/upload.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
   trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-1088 - cmsadmin ui changes

Modified: trunk/core/src/bin/portal-core-war/images/cms/admin/plus.gif
===================================================================
(Binary files differ)

Modified: trunk/core/src/bin/portal-core-war/images/cms/admin/style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/images/cms/admin/style.css	2006-10-31 22:53:51 UTC (rev 5543)
+++ trunk/core/src/bin/portal-core-war/images/cms/admin/style.css	2006-10-31 22:56:30 UTC (rev 5544)
@@ -1,4 +1,3 @@
-
 .menu {
    width: 150px;
    font-size: 0.85em;
@@ -45,16 +44,16 @@
 
 /* style the second level background */
 .menu ul ul a.drop, .menu ul ul a.drop:visited {
-   background: #E2E2E2;
+   background: #DFE8ED;
 }
 
 /* style the second level hover */
 .menu ul ul a.drop:hover {
-   background: #E2E2E2;
+   background: #C0D3DC;
 }
 
 .menu ul ul :hover > a.drop {
-   background: #E2E2E2;
+   background: #C0D3DC;
 }
 
 /* hide the sub levels and give them a positon absolute so that they take up no room */
@@ -82,7 +81,7 @@
 
 /* style the second level links */
 .menu ul ul a, .menu ul ul a:visited {
-   background: #EDECEC;
+   background: #DFE8ED;
    height: auto;
    line-height: 20px;
    padding: 5px 10px;
@@ -99,12 +98,12 @@
 }
 
 .menu :hover > a, .menu ul ul :hover > a {
-   background: #E2E2E2;
+   background: #C0D3DC;
 }
 
 /* make the second level visible when hover on first level list OR link */
 .menu ul li:hover ul,
    .menu ul a:hover ul {
    visibility: visible;
-   background: #EDECEC;
+   background: #C0D3DC;
 }
\ No newline at end of file

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp	2006-10-31 22:53:51 UTC (rev 5543)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp	2006-10-31 22:56:30 UTC (rev 5544)
@@ -4,7 +4,7 @@
 <%@ page isELIgnored="false" %>
 
 <%
-   String sCurrPath = (String) request.getAttribute("createpath");
+   String sCurrPath = (String)request.getAttribute("createpath");
    String OP = CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION;
 %>
 <portlet:defineObjects/>
@@ -12,6 +12,9 @@
 <table width="100%">
    <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_CREATECOLLCONFIRM")}</th>
    <tr>
+      <td valign="top" width="250" class="portlet-section-alternate">
+         <%@ include file="folderlist.jsp" %>
+      </td>
       <td class="portlet-section-body" align="left">
          <form name="pickform" action="<portlet:actionURL>
     <portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATE_COLLECTION %>"/>
@@ -28,25 +31,27 @@
                             class="portlet-form-input-field"/></td>
                </tr>
                <tr>
-                  <td valign="bottom">${n:i18n("CMS_NAME")}:</td><td align="left"><input class="portlet-form-input-field" type="text"
-                                                                  name="newcollectionname" size="40" maxlength="50">
-               </td>
-               </tr><tr>
-               <td valign="bottom">${n:i18n("CMS_DESCRIPTION")}:</td><td align="left"><input class="portlet-form-input-field" type="text"
-                                                                      name="newcollectiondescription"
-                                                                      size="40" maxlength="80">
-            </td>
-            </tr>
-               <tr><td></td><td>
-                  <input class="portlet-form-input-field" type="submit" value="${n:i18n("CMS_CREATE")}" name="submit">
-               </td>
+                  <td valign="bottom">${n:i18n("CMS_NAME")}:</td>
+                  <td align="left"><input class="portlet-form-input-field" type="text"
+                                          name="newcollectionname" size="40" maxlength="50">
+                  </td>
                </tr>
+               <tr>
+                  <td valign="bottom">${n:i18n("CMS_DESCRIPTION")}:</td>
+                  <td align="left"><input class="portlet-form-input-field" type="text"
+                                          name="newcollectiondescription"
+                                          size="40" maxlength="80">
+                  </td>
+               </tr>
+               <tr>
+                  <td></td>
+                  <td>
+                     <input class="portlet-form-button" type="submit" value="${n:i18n("CMS_CREATE")}" name="submit">
+                  </td>
+               </tr>
             </table>
          </form>
       </td>
-      <td valign="top" class="portlet-section-alternate">
-         <%@ include file="folderlist.jsp" %>
-      </td>
    </tr>
 </table>
 <br/><br/>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp	2006-10-31 22:53:51 UTC (rev 5543)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp	2006-10-31 22:56:30 UTC (rev 5544)
@@ -8,7 +8,7 @@
 <portlet:defineObjects/>
 
 <%
-   String sCurrPath = (String) request.getAttribute("currpath");
+   String sCurrPath = (String)request.getAttribute("currpath");
 %>
 
 <form action="<portlet:actionURL>
@@ -18,17 +18,18 @@
    <table width="100%">
       <th align="center" class="portlet-section-header">${n:i18n("TITLE_DELETECONFIRM")}</th>
       <tr>
-         <td>
-            <font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %></font>
+         <td align="center">
+            <font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %>
+            </font>
             <br><br>
-            <font class="portlet-font"><b>${n:i18n("CMS_DELETEWARN1")}</b></font>
+            <font class="portlet-font" style="color:red"><b>${n:i18n("CMS_DELETEWARN1")}</b></font>
             <br><br>
             <font class="portlet-font">${n:i18n("CMS_DELETEWARN2")}</font><br>
          </td>
       </tr>
       <tr>
          <td align="center"><input type="submit" value="${n:i18n("CMS_DELETE")}" name="submit"
-                                   class="portlet-form-input-field"></td>
+                                   class="portlet-form-button"></td>
       </tr>
    </table>
 </form>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmmove.jsp	2006-10-31 22:53:51 UTC (rev 5543)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/confirmmove.jsp	2006-10-31 22:56:30 UTC (rev 5544)
@@ -4,15 +4,18 @@
 <%@ page isELIgnored="false" %>
 
 <%
-   String sCurrPath = (String) request.getAttribute("currpath");
+   String sCurrPath = (String)request.getAttribute("currpath");
    String OP = CMSAdminConstants.OP_CONFIRMMOVE;
-   String sType = (String) request.getAttribute("type");
+   String sType = (String)request.getAttribute("type");
 %>
 <portlet:defineObjects/>
 
 <table width="100%">
    <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_MOVECONFIRM")}</th>
    <tr>
+      <td valign="top" width="250" class="portlet-section-alternate">
+         <%@ include file="folderlist.jsp" %>
+      </td>
       <td class="portlet-section-body" align="left">
          <form name="pickform" action="<portlet:actionURL>
     <portlet:param name="op" value="<%= CMSAdminConstants.OP_MOVE %>"/>
@@ -23,7 +26,8 @@
             <table>
                <tr>
                   <td>${n:i18n("CMS_SOURCE")}:</td>
-                  <td><%= sCurrPath %></td>
+                  <td><%= sCurrPath %>
+                  </td>
                </tr>
                <tr>
                   <td valign="bottom">
@@ -34,22 +38,21 @@
                             class="portlet-form-input-field"/>
                   </td>
                </tr>
-               <tr><td></td><td>
-                  <input class="portlet-form-input-field" type="submit" value="${n:i18n("CMS_MOVE")}" name="submit">
-               </td>
+               <tr>
+                  <td></td>
+                  <td>
+                     <input class="portlet-form-button" type="submit" value="${n:i18n("CMS_MOVE")}" name="submit">
+                  </td>
                </tr>
             </table>
          </form>
       </td>
-      <td valign="top" class="portlet-section-alternate">
-         <%@ include file="folderlist.jsp" %>
-      </td>
    </tr>
 </table>
 <br/><br/>
 
 <%
-      String sBackPath = NodeUtil.getParentPath(sCurrPath);
+   String sBackPath = NodeUtil.getParentPath(sCurrPath);
 %>
 <a href="<portlet:renderURL>
                 <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/exportarchive.jsp	2006-10-31 22:53:51 UTC (rev 5543)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/exportarchive.jsp	2006-10-31 22:56:30 UTC (rev 5544)
@@ -7,7 +7,7 @@
 <portlet:defineObjects/>
 
 <%
-   String sCurrPath = (String) request.getAttribute("currpath");
+   String sCurrPath = (String)request.getAttribute("currpath");
    String OP = CMSAdminConstants.OP_EXPORTARCHIVE;
    String[] langs = Locale.getISOLanguages();
 %>
@@ -19,6 +19,9 @@
    <table width="100%">
       <th colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
       <tr>
+         <td valign="top" width="250" class="portlet-section-alternate">
+            <%@ include file="folderlist.jsp" %>
+         </td>
          <td align="left">
             <table>
                <tr>
@@ -31,31 +34,33 @@
                </tr>
                <tr>
                   <td valign="bottom">
-                     ${n:i18n("CMS_LANGUAGE")}:</td><td><select name="language" class="portlet-form-input-field">
-                  <option selected
-                          value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %></option>
-                  <%
-                     for(int i = 0; i < langs.length; i++)
-                     {
-                  %>
-                  <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %></option>
-                  <%
-                     }
-                  %>
-               </select>
-               </td>
+                     ${n:i18n("CMS_LANGUAGE")}:
+                  </td>
+                  <td><select name="language" class="portlet-form-input-field">
+                     <option selected
+                             value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %>
+                     </option>
+                     <%
+                        for (int i = 0; i < langs.length; i++)
+                        {
+                     %>
+                     <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %>
+                     </option>
+                     <%
+                        }
+                     %>
+                  </select>
+                  </td>
                </tr>
-               <tr><td colspan="2">
-                  <br><br>
-                  <input type="submit" name="submit" value="${n:i18n("CMS_EXPORTARCHIVE")}"
-                         class="portlet-form-input-field"/>
-               </td>
+               <tr>
+                  <td colspan="2">
+                     <br><br>
+                     <input type="submit" name="submit" value="${n:i18n("CMS_EXPORTARCHIVE")}"
+                            class="portlet-form-button"/>
+                  </td>
                </tr>
             </table>
          </td>
-         <td valign="top" class="portlet-section-alternate">
-            <%@ include file="folderlist.jsp" %>
-         </td>
       </tr>
    </table>
 </form>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/folderlist.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/folderlist.jsp	2006-10-31 22:53:51 UTC (rev 5543)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/folderlist.jsp	2006-10-31 22:56:30 UTC (rev 5544)
@@ -8,7 +8,7 @@
 
 <%
    // needed for copy/move type: fi(file) or fo(folder).
-   String sCMType = (String) request.getAttribute("type");
+   String sCMType = (String)request.getAttribute("type");
 %>
 
 <script language="JavaScript" type="text/javascript">
@@ -19,6 +19,10 @@
    }
 </script>
 
+<h6>Content Directory</h6>
+Use the directory tree to navigate the portal folder structure.
+<hr/>
+
 <a href="<portlet:renderURL>
    <portlet:param name="op" value="<%= OP %>"/>
    <portlet:param name="path" value="/"/>
@@ -38,18 +42,18 @@
 <a href="javascript:fillform('/')">Root Folder</a><br>
 
 <%
-   String sNavPath = (String) request.getAttribute("navpath");
-   List NAVfolders = (List) request.getAttribute("folders");
-   if(NAVfolders != null && NAVfolders.size() > 0)
+   String sNavPath = (String)request.getAttribute("navpath");
+   List NAVfolders = (List)request.getAttribute("folders");
+   if (NAVfolders != null && NAVfolders.size() > 0)
    {
-      Folder trailFolder = (Folder) NAVfolders.get(0);
+      Folder trailFolder = (Folder)NAVfolders.get(0);
       String sSomePath = trailFolder.getBasePath();
       int firstSlash = sSomePath.indexOf("/");
       int lastSlash = sSomePath.lastIndexOf("/");
       sSomePath = sSomePath.substring(firstSlash, lastSlash);
       StringTokenizer parser = new StringTokenizer(sSomePath, "/");
       String sPathBuilder = "";
-      while(parser.hasMoreTokens())
+      while (parser.hasMoreTokens())
       {
          String sPathChunk = parser.nextToken();
          sPathBuilder += "/" + sPathChunk;
@@ -69,34 +73,33 @@
    %>
    </portlet:renderURL>">
    <img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/plus.gif" border="0"
-        alt="Expand"/></a>
-&nbsp;
-<a href="javascript:fillform('<%= sPathBuilder %>')"><%= sPathBuilder %></a><br>
+        alt="Expand"/></a>&nbsp;<a href="javascript:fillform('<%= sPathBuilder %>')"><%= sPathBuilder %></a><br>
 
 <%
    }
 
-   for(int i = 0; i < NAVfolders.size(); i++)
+   for (int i = 0; i < NAVfolders.size(); i++)
    {
-      Folder folder = (Folder) NAVfolders.get(i);
+      Folder folder = (Folder)NAVfolders.get(i);
 %>
 
-&nbsp;&nbsp;&nbsp;<a href="<portlet:renderURL>
+&nbsp;&nbsp;&nbsp;<a href="
+<portlet:renderURL>
    <portlet:param name="op" value="<%= OP %>"/>
    <portlet:param name="path" value="<%= sCurrPath %>"/>
    <portlet:param name="navpath" value="<%= folder.getBasePath() %>"/>
    <%
-      if(sCMType != null)
+      if (sCMType != null)
       {
    %>
    <portlet:param name="type" value="<%= sCMType %>"/>
    <%
       }
    %>
-</portlet:renderURL>">
-<img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/plus.gif" border="0"
-     alt="Expand"/></a>&nbsp;
-<a href="javascript:fillform('<%= folder.getBasePath() %>')"><%= folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %></a>
+</portlet:renderURL>
+"><img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/plus.gif" border="0"
+alt="Expand"/></a>&nbsp;<a href="javascript:fillform('<%= folder.getBasePath() %>')"><%=
+   folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %></a>
 <br>
 
 <%
@@ -105,7 +108,7 @@
 else
 {
 %>
-&nbsp;<a href="<portlet:renderURL>
+<a href="<portlet:renderURL>
    <portlet:param name="op" value="<%= OP %>"/>
    <portlet:param name="path" value="<%= sCurrPath %>"/>
    <portlet:param name="navpath" value="<%= NodeUtil.getParentPath(sNavPath) %>"/>
@@ -117,9 +120,7 @@
    <%
       }
    %>
-</portlet:renderURL>"><img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/up.gif"
-border="0"
-alt="Up"/></a>
+</portlet:renderURL>">Up</a>
 <%
    }
 %>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/upload.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/upload.jsp	2006-10-31 22:53:51 UTC (rev 5543)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/upload.jsp	2006-10-31 22:56:30 UTC (rev 5544)
@@ -7,7 +7,7 @@
 <portlet:defineObjects/>
 
 <%
-   String sCurrPath = (String) request.getAttribute("currpath");
+   String sCurrPath = (String)request.getAttribute("currpath");
    String OP = CMSAdminConstants.OP_UPLOADCONFIRM;
    String[] langs = Locale.getISOLanguages();
 %>
@@ -19,6 +19,9 @@
    <table width="100%">
       <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_UPLOAD")}</th>
       <tr>
+         <td valign="top" width="250" class="portlet-section-alternate">
+            <%@ include file="folderlist.jsp" %>
+         </td>
          <td align="left">
             <table>
                <tr>
@@ -31,41 +34,47 @@
                </tr>
                <tr>
                   <td valign="bottom">
-                     ${n:i18n("CMS_DESCRIPTION")}:</td><td><input type="text" size="40" maxlength="80" name="description" value=""
-                                                 class="portlet-form-input-field"/></td>
+                     ${n:i18n("CMS_DESCRIPTION")}:
+                  </td>
+                  <td><input type="text" size="40" maxlength="80" name="description" value=""
+                             class="portlet-form-input-field"/></td>
                </tr>
                <tr>
                   <td valign="bottom">
-                     ${n:i18n("CMS_TITLE")}:</td><td><input type="text" size="40" maxlength="80" name="title" value=""
-                                           class="portlet-form-input-field"/></td>
+                     ${n:i18n("CMS_TITLE")}:
+                  </td>
+                  <td><input type="text" size="40" maxlength="80" name="title" value=""
+                             class="portlet-form-input-field"/></td>
                </tr>
                <tr>
                   <td valign="bottom">
-                     ${n:i18n("CMS_LANGUAGE")}:</td><td><select name="language" class="portlet-form-input-field">
-                  <option selected
-                          value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %></option>
-                  <%
-                     for(int i = 0; i < langs.length; i++)
-                     {
-                  %>
-                  <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %></option>
-                  <%
-                     }
-                  %>
-               </select>
-               </td>
+                     ${n:i18n("CMS_LANGUAGE")}:
+                  </td>
+                  <td><select name="language" class="portlet-form-input-field">
+                     <option selected
+                             value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %>
+                     </option>
+                     <%
+                        for (int i = 0; i < langs.length; i++)
+                        {
+                     %>
+                     <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %>
+                     </option>
+                     <%
+                        }
+                     %>
+                  </select>
+                  </td>
                </tr>
-               <tr><td colspan="2" align="left">
-                  <input type="file" size="32" name="content" value="" class="portlet-form-input-field"/>
-                  <br><br>
-                  <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-input-field"/>
-               </td>
+               <tr>
+                  <td colspan="2" align="left">
+                     <input type="file" size="32" name="content" value="" class="portlet-form-input-field"/>
+                     <br><br>
+                     <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
+                  </td>
                </tr>
             </table>
          </td>
-         <td valign="top" class="portlet-section-alternate">
-            <%@ include file="folderlist.jsp" %>
-         </td>
       </tr>
    </table>
 </form>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp	2006-10-31 22:53:51 UTC (rev 5543)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp	2006-10-31 22:56:30 UTC (rev 5544)
@@ -7,7 +7,7 @@
 <portlet:defineObjects/>
 
 <%
-   String sCurrPath = (String) request.getAttribute("currpath");
+   String sCurrPath = (String)request.getAttribute("currpath");
    String OP = CMSAdminConstants.OP_UPLOADARCHIVECONFIRM;
    String[] langs = Locale.getISOLanguages();
 %>
@@ -19,6 +19,9 @@
    <table width="100%">
       <th colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_UPLOADARCHIVE")}</th>
       <tr>
+         <td valign="top" width="250" class="portlet-section-alternate">
+            <%@ include file="folderlist.jsp" %>
+         </td>
          <td align="left">
             <table>
                <tr>
@@ -31,31 +34,33 @@
                </tr>
                <tr>
                   <td valign="bottom">
-                     ${n:i18n("CMS_LANGUAGE")}:</td><td><select name="language" class="portlet-form-input-field">
-                  <option selected
-                          value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %></option>
-                  <%
-                     for(int i = 0; i < langs.length; i++)
-                     {
-                  %>
-                  <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %></option>
-                  <%
-                     }
-                  %>
-               </select>
-               </td>
+                     ${n:i18n("CMS_LANGUAGE")}:
+                  </td>
+                  <td><select name="language" class="portlet-form-input-field">
+                     <option selected
+                             value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %>
+                     </option>
+                     <%
+                        for (int i = 0; i < langs.length; i++)
+                        {
+                     %>
+                     <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %>
+                     </option>
+                     <%
+                        }
+                     %>
+                  </select>
+                  </td>
                </tr>
-               <tr><td colspan="2">
-                  <input type="file" size="32" name="content" value="" class="portlet-form-input-field"/>
-                  <br><br>
-                  <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-input-field"/>
-               </td>
+               <tr>
+                  <td colspan="2">
+                     <input type="file" size="32" name="content" value="" class="portlet-form-input-field"/>
+                     <br><br>
+                     <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
+                  </td>
                </tr>
             </table>
          </td>
-         <td valign="top" class="portlet-section-alternate">
-            <%@ include file="folderlist.jsp" %>
-         </td>
       </tr>
    </table>
 </form>

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 22:53:51 UTC (rev 5543)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/viewfile.jsp	2006-10-31 22:56:30 UTC (rev 5544)
@@ -31,6 +31,8 @@
 
    String createDate = "";
    String modifiedDate = "";
+
+   String rowClass = "portlet-section-body";
 %>
 <br>
 
@@ -95,7 +97,7 @@
             <li><a href="<portlet:renderURL>
    <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
    <portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
-   </portlet:renderURL>">${n:i18n("CMS_EDIT")}></a></li>
+   </portlet:renderURL>">${n:i18n("CMS_EDIT")}</a></li>
             <%
                }
             %>
@@ -176,20 +178,30 @@
    for (int i = 0; i < contentList.size(); i++) // cycle thru list of version nodes
    {
       Content version = (Content)contentList.get(i);
+      if (i % 2 == 0)
+      {
+         rowClass = "portlet-section-body";
+      }
+      else
+      {
+         rowClass = "portlet-section-alternate";
+      }
 %>
-<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';">
-   <%
+<tr onmouseover="this.className='portlet-section-selected';" onmouseout="this.className='<%= rowClass %>';"
+    class="<%= rowClass %>">
+   <td><%
       if (sType.equals("text/html") || sType.equals("text/plain"))
       {
    %>
-   <td>
+
       <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>"><%= version.getMimeType() %></a>
+   </portlet:renderURL>"><%= version.getMimeType() %>
+   </a>
       <%
       }
       else




More information about the jboss-svn-commits mailing list