[jboss-svn-commits] JBoss Portal SVN: r5550 - trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 1 11:20:39 EST 2006
Author: roy.russo at jboss.com
Date: 2006-11-01 11:20:37 -0500 (Wed, 01 Nov 2006)
New Revision: 5550
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/create.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/edit.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/editbinary.jsp
Log:
JBPORTAL-1088 - cmsadmin ui changes
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/create.jsp 2006-11-01 16:14:48 UTC (rev 5549)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/create.jsp 2006-11-01 16:20:37 UTC (rev 5550)
@@ -9,10 +9,10 @@
<portlet:defineObjects/>
<%
- String sCurrPath = (String) request.getAttribute("currpath");
+ String sCurrPath = (String)request.getAttribute("currpath");
String[] langs = Locale.getISOLanguages();
- String sDocBase = (String) request.getAttribute("document_base_url");
- String sCSSURL = (String) request.getAttribute("css_url");
+ String sDocBase = (String)request.getAttribute("document_base_url");
+ String sCSSURL = (String)request.getAttribute("css_url");
%>
<!-- tinyMCE -->
@@ -45,73 +45,91 @@
<table width="100%">
<th align="center"><b>${n:i18n("TITLE_CREATE")}</b></th>
- <tr><td height="10"></td></tr>
- <tr><td>
- <table>
- <tr>
- <td class="portlet-section-header" height="20">
- <font class="portlet-font">${n:i18n("CMS_CREATEFILEINDIR")}: </font>
- </td>
- <td class="portlet-section-alternate"><%= sCurrPath %></td>
- </tr>
- <tr>
- <td class="portlet-section-header" valign="bottom">
- <font class="portlet-font">${n:i18n("CMS_FILENAME")}:</font></td><td class="portlet-section-alternate"><input
- type="text" name="filename"
- class="portlet-form-input-field">
- </td>
- </tr>
- <tr>
- <td class="portlet-section-header" valign="bottom">
- ${n:i18n("CMS_DESCRIPTION")}:</td><td class="portlet-section-alternate"><input type="text" size="40" maxlength="80"
- name="description" value=""
- class="portlet-form-input-field"/></td>
- </tr>
- <tr>
- <td class="portlet-section-header" valign="bottom">
- ${n:i18n("CMS_TITLE")}:</td><td class="portlet-section-alternate"><input type="text" size="40" maxlength="80"
- name="title" value=""
- class="portlet-form-input-field"/></td>
- </tr>
- <tr>
- <td class="portlet-section-header" valign="bottom">
- ${n:i18n("CMS_LANGUAGE")}:</td><td class="portlet-section-alternate"><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>
- </table>
- </td>
+ <tr>
+ <td height="10"></td>
</tr>
- <tr><td height="10"></td></tr>
<tr>
- <td class="portlet-section-alternate">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" border="0"
- alt="Info"> Links to resources within this portal should be absolute. For example: A link to an image
- located in default/images/back.gif
- should be typed in exactly as shown here.
- Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the
- preview button in the editor.
+ <td>
+ <table>
+ <tr>
+ <td>${n:i18n("CMS_CREATEFILEINDIR")}:
+ </td>
+ <td><%= sCurrPath %>
+ </td>
+ </tr>
+ <tr>
+ <td>${n:i18n("CMS_FILENAME")}:</td>
+ <td><input
+ type="text" name="filename"
+ class="portlet-form-input-field">
+ </td>
+ </tr>
+ <tr>
+ <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 height="10"></td></tr>
- <tr><td align="center">
- <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%"></textarea>
- <br>
- <input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-input-field"/>
- <input type="reset" name="reset" value="Reset" class="portlet-form-input-field"/>
- </td></tr>
+ <tr>
+ <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>
+ ${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>
</table>
+</td>
+</tr>
+<tr>
+ <td height="10"></td>
+</tr>
+<tr>
+ <td class="portlet-section-alternate">
+ <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" border="0"
+ alt="Info"> Links to resources within this portal should be absolute. For example: A link to an image
+ located in default/images/back.gif
+ should be typed in exactly as shown here.
+ Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the
+ preview button in the editor.
+ </td>
+</tr>
+<tr>
+ <td height="10"></td>
+</tr>
+<tr>
+ <td align="center">
+ <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%"></textarea>
+ <br>
+ <input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button"/>
+ <input type="reset" name="reset" value="Reset" class="portlet-form-button"/>
+ </td>
+</tr>
+</table>
</form>
<a href="<portlet:renderURL>
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/edit.jsp 2006-11-01 16:14:48 UTC (rev 5549)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/edit.jsp 2006-11-01 16:20:37 UTC (rev 5550)
@@ -8,14 +8,14 @@
<portlet:defineObjects/>
<%
- String sCurrPath = (String) request.getAttribute("currpath");
- String sContent = (String) request.getAttribute("content");
- String sDocBase = (String) request.getAttribute("document_base_url");
- String sCSSURL = (String) request.getAttribute("css_url");
- String sLanguage = (String) request.getAttribute("language");
- String sVersion = (String) request.getAttribute("version");
- String sTitle = (String) request.getAttribute("title");
- String sDescription = (String) request.getAttribute("description");
+ String sCurrPath = (String)request.getAttribute("currpath");
+ String sContent = (String)request.getAttribute("content");
+ String sDocBase = (String)request.getAttribute("document_base_url");
+ String sCSSURL = (String)request.getAttribute("css_url");
+ String sLanguage = (String)request.getAttribute("language");
+ String sVersion = (String)request.getAttribute("version");
+ String sTitle = (String)request.getAttribute("title");
+ String sDescription = (String)request.getAttribute("description");
%>
<!-- tinyMCE -->
@@ -46,82 +46,101 @@
<portlet:param name="language" value="<%= sLanguage %>"/>
</portlet:actionURL>">
- <table width="100%">
- <th align="center"><b>${n:i18n("TITLE_EDIT")}</b></th>
- <tr><td height="10"></td></tr>
- <tr>
- <td>
- <tr><td>
+<table width="100%">
+ <th align="center"><b>${n:i18n("TITLE_EDIT")}</b></th>
+ <tr>
+ <td height="10"></td>
+ </tr>
+ <tr>
+ <td>
+ <tr>
+ <td>
<table>
<tr>
- <td class="portlet-section-header" height="20">
- <font class="portlet-font">${n:i18n("CMS_EDITING")}: </font>
+ <td>${n:i18n("CMS_EDITING")}:
</td>
- <td class="portlet-section-alternate"><%= sCurrPath %></td>
+ <td><%= sCurrPath %>
+ </td>
</tr>
<tr>
- <td class="portlet-section-header" valign="bottom">
- ${n:i18n("CMS_DESCRIPTION")}:</td><td class="portlet-section-alternate"><input type="text"
- size="40"
- maxlength="80"
- name="description"
- value="<%= sDescription %>"
- class="portlet-form-input-field"/>
- </td>
+ <td>
+ ${n:i18n("CMS_DESCRIPTION")}:
+ </td>
+ <td><input type="text"
+ size="40"
+ maxlength="80"
+ name="description"
+ value="<%= sDescription %>"
+ class="portlet-form-input-field"/>
+ </td>
</tr>
<tr>
- <td class="portlet-section-header" valign="bottom">
- ${n:i18n("CMS_TITLE")}:</td><td class="portlet-section-alternate"><input type="text" size="40"
- maxlength="80"
- name="title"
- value="<%= sTitle %>"
- class="portlet-form-input-field"/>
- </td>
+ <td>
+ ${n:i18n("CMS_TITLE")}:
+ </td>
+ <td><input type="text" size="40"
+ maxlength="80"
+ name="title"
+ value="<%= sTitle %>"
+ class="portlet-form-input-field"/>
+ </td>
</tr>
<tr>
- <td class="portlet-section-header" valign="bottom">
- ${n:i18n("CMS_LANGUAGE")}:</td><td
- class="portlet-section-alternate"><%= new Locale(sLanguage).getDisplayLanguage() %>
- </td>
+ <td>
+ ${n:i18n("CMS_LANGUAGE")}:
+ </td>
+ <td><%= new Locale(sLanguage).getDisplayLanguage() %>
+ </td>
</tr>
<tr>
- <td class="portlet-section-header" valign="bottom">
- ${n:i18n("CMS_LIVE")}:</td><td><input type="checkbox" name="makelive" checked
- class="portlet-form-input-field"/>
- </td>
+ <td>
+ ${n:i18n("CMS_LIVE")}:
+ </td>
+ <td><input type="checkbox" name="makelive" checked
+ class="portlet-form-input-field"/>
+ </td>
</tr>
<tr>
- <td class="portlet-section-header">
- ${n:i18n("CMS_VERSION")}:</td><td class="portlet-section-alternate"><%= sVersion %>
- </td>
+ <td>
+ ${n:i18n("CMS_VERSION")}:
+ </td>
+ <td><%= sVersion %>
+ </td>
</tr>
</table>
</td>
- </tr>
- <tr><td height="10"></td></tr>
- <tr>
- <td class="portlet-section-alternate">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif"
- border="0"
- alt="Info"> Links to resources within this portal should be absolute. For example: A link to an
- image
- located in default/images/back.gif
- should be typed in exactly as shown here.
- Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking
- on
- the
- preview button in the editor.
- </td>
- </tr>
- <tr><td height="10"></td></tr>
- <tr><td align="center">
+ </tr>
+ <tr>
+ <td height="10"></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate">
+ <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif"
+ border="0"
+ alt="Info"> Links to resources within this portal should be absolute. For example: A link to an
+ image
+ located in default/images/back.gif
+ should be typed in exactly as shown here.
+ Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking
+ on
+ the
+ preview button in the editor.
+ </td>
+ </tr>
+ <tr>
+ <td height="10"></td>
+ </tr>
+ <tr>
+ <td align="center">
<textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%"
- class="textarea"><%= sContent %></textarea><br>
- <input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-input-field"/>
- <input type="reset" name="reset" value="Reset" class="portlet-form-input-field"/>
+ class="textarea"><%= sContent %>
+ </textarea><br>
+ <input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button"/>
+ <input type="reset" name="reset" value="Reset" class="portlet-form-button"/>
- </td></tr>
- </table>
+ </td>
+ </tr>
+</table>
</form>
<a href="<portlet:renderURL>
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/editbinary.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2006-11-01 16:14:48 UTC (rev 5549)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2006-11-01 16:20:37 UTC (rev 5550)
@@ -1,6 +1,4 @@
-<%@ page import="org.jboss.portal.cms.util.NodeUtil" %>
<%@ page import="org.jboss.portal.core.portlet.cms.admin.CMSAdminConstants" %>
-<%@ page import="java.util.Locale"%>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
@@ -9,8 +7,8 @@
<portlet:defineObjects/>
<%
- String sCurrPath = (String) request.getAttribute("currpath");
- String sLanguage = (String) request.getAttribute("language");
+ String sCurrPath = (String)request.getAttribute("currpath");
+ String sLanguage = (String)request.getAttribute("language");
%>
<form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL>
@@ -24,36 +22,40 @@
<td align="left">
<table>
<tr>
- <td valign="top">
+ <td valign="top" width="150">
${n:i18n("CMS_EDITING")}:
</td>
- <td><%= sCurrPath %></td>
+ <td valign="top"><%= sCurrPath %>
+ </td>
</tr>
<tr>
<td valign="top">
- ${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 valign="top"><input type="text" size="40" maxlength="80" name="description" value=""
+ class="portlet-form-input-field"/></td>
</tr>
<tr>
<td valign="top">
- ${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 valign="top"><input type="text" size="40" maxlength="80" name="title" value=""
+ class="portlet-form-input-field"/></td>
</tr>
<tr>
- <td valign="top">
- ${n:i18n("CMS_LIVE")}:</td><td><input type="checkbox" name="makelive" checked
- class="portlet-form-input-field"/></td>
+ <td valign="top">${n:i18n("CMS_LIVE")}:</td>
+ <td valign="top"><input type="checkbox" name="makelive" checked
+ class="portlet-form-input-field"/></td>
</tr>
- <tr><td colspan="2">
- <input type="file" size="32" name="content" value="" class="portlet-form-input-field"/>
- <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>
+ <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">
- </td>
</tr>
</table>
</form>
More information about the jboss-svn-commits
mailing list