JBoss Portal SVN: r8427 - modules/test/tags/1_0_0/test/src/main.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-22 08:52:35 -0400 (Sat, 22 Sep 2007)
New Revision: 8427
Removed:
modules/test/tags/1_0_0/test/src/main/java/
Log:
Delete empty directory
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8426 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-22 08:47:40 -0400 (Sat, 22 Sep 2007)
New Revision: 8426
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
Log:
Oups, ohloh++
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-22 12:23:05 UTC (rev 8425)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-22 12:47:40 UTC (rev 8426)
@@ -428,7 +428,6 @@
Portlet p1 = (Portlet)o1;
Portlet p2 = (Portlet)o2;
String p1Name = p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getString(locale, true);
- System.out.println(locale);
if (p1Name == null)
{
p1Name = p1.getContext().getId();
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8425 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-22 08:23:05 -0400 (Sat, 22 Sep 2007)
New Revision: 8425
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
Log:
- Don't fail if no display name is defined
- Compare based on the localized value
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-22 01:17:46 UTC (rev 8424)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-09-22 12:23:05 UTC (rev 8425)
@@ -49,6 +49,7 @@
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
/**
@@ -419,12 +420,25 @@
/** A comparator for portlets. Order portlets in the alphabetical order of their display name. */
final Comparator comparator = new Comparator()
{
+ FacesContext ctx = FacesContext.getCurrentInstance();
+ Locale locale = ctx.getExternalContext().getRequestLocale();
+
public int compare(Object o1, Object o2)
{
Portlet p1 = (Portlet)o1;
Portlet p2 = (Portlet)o2;
- return p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString()
- .compareToIgnoreCase(p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString());
+ String p1Name = p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getString(locale, true);
+ System.out.println(locale);
+ if (p1Name == null)
+ {
+ p1Name = p1.getContext().getId();
+ }
+ String p2Name = p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME).getString(locale, true);
+ if (p2Name == null)
+ {
+ p2Name = p2.getContext().getId();
+ }
+ return p1Name.compareToIgnoreCase(p2Name);
}
};
}
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8424 - in branches/JBoss_Portal_Branch_2_6: core-cms/src/resources/portal-cms-war/WEB-INF/classes and 2 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-09-21 21:17:46 -0400 (Fri, 21 Sep 2007)
New Revision: 8424
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
branches/JBoss_Portal_Branch_2_6/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java
Log:
JBPORTAL-1709 - CMS Admin, unify the UI with the other admin portlets and fixed NPE on CMS search
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-09-22 01:17:46 UTC (rev 8424)
@@ -1,3 +1,10 @@
+
+div.menu-container {
+ float:left;
+ width: 300px;
+ padding: 5px 0 10px 0;
+}
+
.menu {
width: 150px;
font-size: 0.85em;
@@ -22,7 +29,7 @@
float: left;
width: 150px;
position: relative;
- list-style: none;
+ list-style: none;
}
/* style the links for the top level */
@@ -101,4 +108,22 @@
.menu ul a:hover ul {
visibility: visible;
background: #C0D3DC;
+}
+
+div.search-container {
+ float:right;
+ padding: 5px 15px 10px 0;
+}
+
+div.search-container form{
+ margin:0;
+ padding:0;
+}
+
+h3.sectionTitle{
+
+}
+
+div.file-table-container{
+ width: 100%;
}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2007-09-22 01:17:46 UTC (rev 8424)
@@ -51,6 +51,7 @@
CMS_FOLDER=Folder
CMS_FILE=File
CMS_CREATE=Create
+CMS_CANCEL=Cancel
CMS_EDIT=Edit
CMS_UPLOAD=Upload
CMS_MODIFY=Modify
@@ -85,6 +86,7 @@
CMS_CONTENT_DIR=Content Directory
CMS_CONTENT_DIR_USE=Use the directory tree to navigate the portal folder structure.
CMS_MAIN_USE=Use the CMS Administration portlet to manage the content of your portal.
+CMS_MANAGE=Manage Content
CMS_CREATED_BY=Created By
CMS_APPROVE=Approve
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-09-22 01:17:46 UTC (rev 8424)
@@ -51,6 +51,7 @@
CMS_FOLDER=Cartella
CMS_FILE=File
CMS_CREATE=Crea
+CMS_CANCEL=annullamento
CMS_EDIT=Edita
CMS_UPLOAD=Caricamento
CMS_MODIFY=Modifica
@@ -85,6 +86,7 @@
CMS_CONTENT_DIR=Contenuto della Directory
CMS_CONTENT_DIR_USE=Usa l\'albero delle directory per navigare nella struttura a cartelle del portale.
CMS_MAIN_USE=Usa la portlet di Amministrazione CMS per gestire il contenuto del tuo portale.
+CMS_MANAGE=Controllare il soddisfare
CMS_CREATED_BY=Creato da
CMS_APPROVE=Approva
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2007-09-22 01:17:46 UTC (rev 8424)
@@ -49,6 +49,7 @@
CMS_FOLDER=Pasta
CMS_FILE=Arquivo
CMS_CREATE=Criar
+CMS_CANCEL=Cancel
CMS_RESET=Resetar
CMS_EDIT=Editar
CMS_UPLOAD=Enviar
@@ -80,6 +81,7 @@
CMS_CONTENT_DIR=Content Directory
CMS_CONTENT_DIR_USE=Use the directory tree to navigate the portal folder structure.
CMS_MAIN_USE=Use the CMS Administration portlet to manage the content of your portal.
+CMS_MANAGE=Manage Content
CMS_CREATED_BY=Created By
CMS_APPROVE=Approve
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -7,11 +7,13 @@
String sCurrPath = (String) request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_CONFIRMCOPY;
String sType = (String) request.getAttribute("type");
+ String sBackPath = NodeUtil.getParentPath(sCurrPath);
%>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_COPYCONFIRM")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_COPYCONFIRM")}</h3></th>
<tr>
<td class="portlet-section-body" align="left">
<form name="pickform" action="<portlet:actionURL>
@@ -32,6 +34,7 @@
</tr>
<tr><td></td><td valign="top"><input class="portlet-form-input-field" type="submit" value="${n:i18n("CMS_COPY")}"
name="submit">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -42,15 +45,5 @@
</td>
</tr>
</table>
-<br/><br/>
+</div>
-<%
- String sBackPath = NodeUtil.getParentPath(sCurrPath);
-%>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sBackPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -8,9 +8,10 @@
String OP = CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION;
%>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_CREATECOLLCONFIRM")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -47,6 +48,7 @@
<td></td>
<td>
<input class="portlet-form-button" type="submit" value="${n:i18n("CMS_CREATE")}" name="submit">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -55,16 +57,9 @@
</tr>
</table>
<br/><br/>
+</div>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
-
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -6,9 +6,11 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
+ String sBackPath = NodeUtil.getParentPath(sCurrPath);
%>
<form action="<portlet:actionURL>
@@ -16,7 +18,7 @@
<portlet:param name="path" value="<%= sCurrPath %>"/>
</portlet:actionURL>" method="post">
<table width="100%">
- <th align="center" class="portlet-section-header">${n:i18n("TITLE_DELETECONFIRM")}</th>
+ <th><h3 class="sectionTitle">${n:i18n("TITLE_DELETECONFIRM")}</h3></th>
<tr>
<td align="center">
<font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %>
@@ -29,18 +31,10 @@
</tr>
<tr>
<td align="center"><input type="submit" value="${n:i18n("CMS_DELETE")}" name="submit"
- class="portlet-form-button"></td>
+ class="portlet-form-button">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'">
+ </td>
</tr>
</table>
</form>
-
-<%
- String sBackPath = NodeUtil.getParentPath(sCurrPath);
-%>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sBackPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
\ No newline at end of file
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -7,11 +7,13 @@
String sCurrPath = (String)request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_CONFIRMMOVE;
String sType = (String)request.getAttribute("type");
+ String sBackPath = NodeUtil.getParentPath(sCurrPath);
%>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_MOVECONFIRM")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_MOVECONFIRM")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -42,6 +44,7 @@
<td></td>
<td>
<input class="portlet-form-button" type="submit" value="${n:i18n("CMS_MOVE")}" name="submit">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -51,13 +54,5 @@
</table>
<br/><br/>
-<%
- String sBackPath = NodeUtil.getParentPath(sCurrPath);
-%>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sBackPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -7,7 +7,7 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
String[] langs = Locale.getISOLanguages();
@@ -89,7 +89,7 @@
}
}
</script>
-
+<div class="admin-ui">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SAVENEWTEXT %>"/>
<portlet:param name="path" value=""/>
@@ -97,7 +97,7 @@
<input type="hidden" name="savetopath" value="<%= sCurrPath %>">
<table width="100%">
- <th align="center"><b>${n:i18n("TITLE_CREATE")}</b></th>
+ <th ><h3 class="sectionTitle">${n:i18n("TITLE_CREATE")}</h3></th>
<tr>
<td height="10"></td>
</tr>
@@ -196,15 +196,9 @@
<br>
<input type="button" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button" onclick="javascript:validateAndSubmit();"/>
<input type="reset" name="reset" value="Reset" class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
</form>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -6,7 +6,8 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sContent = (String)request.getAttribute("content");
@@ -63,7 +64,7 @@
</portlet:actionURL>">
<table width="100%">
- <th align="center"><b>${n:i18n("TITLE_EDIT")}</b></th>
+ <th><h3 class="sectionTitle">${n:i18n("TITLE_EDIT")}</h3></th>
<tr>
<td height="10"></td>
</tr>
@@ -162,16 +163,9 @@
<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"/>
-
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
</form>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -5,7 +5,8 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sLanguage = (String)request.getAttribute("language");
@@ -17,7 +18,7 @@
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<input type="hidden" name="language" value="<%= sLanguage %>">
<table width="100%">
- <th colspan="2" align="center"><b>${n:i18n("TITLE_UPLOAD")}</b></th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th>
<tr>
<td align="left">
<table>
@@ -52,6 +53,7 @@
<input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
<br>
<input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -60,10 +62,4 @@
</table>
</form>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -5,19 +5,19 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_EXPORTARCHIVE;
String[] langs = Locale.getISOLanguages();
%>
-
+<div class="admin-ui">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
</portlet:actionURL>">
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -57,6 +57,7 @@
<br><br>
<input type="submit" name="submit" value="${n:i18n("CMS_EXPORTARCHIVE")}"
class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -64,11 +65,4 @@
</tr>
</table>
</form>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -5,13 +5,14 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String) request.getAttribute("currpath");
%>
<table width="100%">
- <th class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
+ <th ><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
<tr>
<td align="left">
<table width="100%">
@@ -27,17 +28,13 @@
src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif"
alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/>
<a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a>
+ <br/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
</td>
</tr>
</table>
+</div>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -5,28 +5,25 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
%>
<table width="100%">
- <th class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
+ <th ><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
<tr>
<td align="left">
<table width="100%">
<tr>
<td align="center"><font color="red">ERROR processing export request!</font></td>
</tr>
+ <tr>
+ <td align="center"><input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"></td>
+ </tr>
</table>
</td>
</tr>
</table>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -12,7 +12,7 @@
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
List folders = (List)request.getAttribute("folders");
@@ -22,31 +22,18 @@
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
%>
-<br>
+<div class="admin-ui">
+<h3 class="sectionTitle">
+${n:i18n("CMS_MANAGE")}
+</h3>
+<!-- Currently browsing -->
+<ul class="objectpath">
+ <li class="pathItem"><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ <portlet:param name="path" value="/"/>
+ </portlet:renderURL>">Home</a></li>
-${n:i18n("CMS_MAIN_USE")}
-<hr/>
-
-<div align="right">
-
-<form method="post" action="<portlet:actionURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_DOSEARCH %>"/>
- </portlet:actionURL>">
- <input type="text"
- size="15"
- maxlength="80"
- name="search"
- class="portlet-form-input-field"/>
- <input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/>
-</form>
-</div>
-
-<!-- Currently browsing -->
-Browsing: <a href="<portlet:renderURL>
-<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
-<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a>
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -57,93 +44,113 @@
if (parser.hasMoreTokens())
{
%>
-> <a href="
+ <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= sPathBuilder %>"/>
</portlet:renderURL>
"><%= sPathChunk %>
</a>
+ </li>
<%
}
else
{
%>
-> <%= sPathChunk %>
+<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="selected"><%= sPathChunk %></li>
<%
}
}
%>
+</ul>
+<br/>
-<br/><br/>
+<!-- folder-level action dropdown -->
+<div class="menu-container">
+ <div class="menu">
+ <ul>
+ <li><a href="#">Select Action <img
+ src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
+ border="0">
+ <!--[if IE 7]><!--></a><!--<![endif]-->
+ <!--[if lte IE 6]><table><tr><td><![endif]-->
+ <ul>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</a></li>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</a></li>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</a></li>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVECONFIRM %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</a></li>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</a></li>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ <portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_SECURE")}</a></li>
+ <%if(manageWorkflowAccessible.booleanValue()){%>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
+ <%}%>
+ <%
+ if (!"/".equals(sCurrPath))
+ {
+ %>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ <portlet:param name="type" value="fo"/>
+ </portlet:renderURL>">${n:i18n("CMS_COPY")}</a></li>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ <portlet:param name="type" value="fo"/>
+ </portlet:renderURL>">${n:i18n("CMS_MOVE")}</a></li>
+ <li><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
+ <% } %>
+ </ul>
+ <!--[if lte IE 6]></td></tr></table></a><![endif]-->
+ </li>
+ </ul>
+ </div>
-<!-- folder-level action dropdown -->
-<div class="menu">
- <ul>
- <li><a href="#">Select Action <img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0">
- <!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
- <ul>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVECONFIRM %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- <portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- </portlet:renderURL>">${n:i18n("CMS_SECURE")}</a></li>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
- <%}%>
- <%
- if (!"/".equals(sCurrPath))
- {
- %>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- <portlet:param name="type" value="fo"/>
- </portlet:renderURL>">${n:i18n("CMS_COPY")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- <portlet:param name="type" value="fo"/>
- </portlet:renderURL>">${n:i18n("CMS_MOVE")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
- <% } %>
- </ul>
- <!--[if lte IE 6]></td></tr></table></a><![endif]-->
- </li>
- </ul>
</div>
-<br/><br/>
+<div class="search-container">
+ <form method="post" action="<portlet:actionURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_DOSEARCH %>"/>
+ </portlet:actionURL>">
+ <input type="text"
+ size="15"
+ maxlength="80"
+ name="search"
+ class="portlet-form-input-field"/>
+ <input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/>
+
+ </form>
+</div>
+<br style="clear:both"/>
+<div class="file-table-container">
<%
if (folders.size() > 0 || files.size() > 0)
@@ -278,6 +285,15 @@
</tr>
<%
}
+ }else{%>
+
+ <tr>
+ <td>
+ <p>This folder is empty.</p>
+ </td>
+ </tr>
+
+<%
}
%>
</table>
@@ -286,3 +302,5 @@
}
%>
+</div>
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -9,7 +9,8 @@
<%@ page import="java.util.StringTokenizer" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
Collection pendingQueue = (Collection)request.getAttribute("pendingQueue");
@@ -18,17 +19,20 @@
String rowClass = "portlet-section-body";
%>
-<br>
+<h3 class="sectionTitle">
${n:i18n("CMS_MAIN_USE")}
+</h3>
-<hr/>
<!-- Currently browsing -->
-Browsing: <a href="<portlet:renderURL>
-<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
-<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a>
+<ul class="objectpath">
+ <li class="pathItem"><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ <portlet:param name="path" value="/"/>
+ </portlet:renderURL>">Home</a></li>
+
+
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -39,30 +43,32 @@
if (parser.hasMoreTokens())
{
%>
-> <a href="
+ <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= sPathBuilder %>"/>
</portlet:renderURL>
"><%= sPathChunk %>
</a>
+ </li>
<%
}
else
{
%>
-> <%= sPathChunk %>
+<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="selected"><%= sPathChunk %></li>
<%
}
}
%>
-
-<br/><br/>
-
+</ul>
+<br/>
<!-- show any errors here -->
<%if(exception!=null && exception.trim().length()>0){%>
<table width="100%">
-<th colspan="2" align="center" class="portlet-section-header">Error:</th>
+<th colspan="2"><h3 class="sectionTitle">Error:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -72,6 +78,7 @@
</tr>
</table>
<br/><br/>
+<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
<!-- the table listing the pending queue items -->
@@ -139,4 +146,5 @@
</td>
</tr>
<%}%>
-</table>
\ No newline at end of file
+</table>
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -1,9 +1,8 @@
+<%@ page import="org.jboss.portal.cms.model.File" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
-<%@ page import="java.util.Locale" %>
-<%@ page import="java.util.List" %>
<%@ page import="java.text.Format" %>
<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="org.jboss.portal.cms.model.File" %>
+<%@ page import="java.util.List" %>
<%@ 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" %>
@@ -11,8 +10,22 @@
<portlet:defineObjects/>
-<div align="right">
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
+<h3 class="sectionTitle">
+${n:i18n("CMS_MANAGE")}
+</h3>
+<!-- Currently browsing -->
+<ul class="objectpath">
+ <li class="pathItem"><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ <portlet:param name="path" value="/"/>
+ </portlet:renderURL>">Home</a></li>
+</ul>
+<br/>
+
+<div class="search-container">
<form method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_DOSEARCH %>"/>
</portlet:actionURL>">
@@ -24,10 +37,11 @@
value="<%= request.getAttribute("textQuery") %>"
/>
<input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/>
-</form>
+</form>
</div>
+
<%
List files = (List)request.getAttribute("files");
String createDate = "";
@@ -104,3 +118,4 @@
<%
}
%>
+<input class="portlet-form-button" type="button" value="Cancel" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -10,7 +10,7 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+ <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
Set roleSet = (Set)request.getAttribute("roles");
@@ -25,14 +25,14 @@
Set manageRoleSet = (Set)request.getAttribute("manageRoleSet");
Set manageUserSet = (Set)request.getAttribute("manageUserSet");
%>
-
+<div class="admin-ui">
<form action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= returnOp %>"/>
</portlet:actionURL>" method="post">
<table width="100%">
-<th colspan="2" align="center" class="portlet-section-header">${n:i18n("TITLE_SECURECONFIRM")}</th>
+<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_SECURECONFIRM")}</h3></th>
<%
if (sConfirm != null && !"".equals(sConfirm))
{
@@ -237,15 +237,11 @@
</tr>
<tr>
<td align="center" colspan="2"><input type="submit" value="${n:i18n("CMS_SECURE")}" name="submit"
- class="portlet-form-button"></td>
+ class="portlet-form-button">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= returnOp %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
+ </td>
</tr>
</table>
</form>
+</div>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= returnOp %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -5,19 +5,19 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_UPLOADCONFIRM;
String[] langs = Locale.getISOLanguages();
%>
-
+<div class="admin-ui">
<form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONTENT %>"/>
</portlet:actionURL>">
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_UPLOAD")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -71,6 +71,7 @@
<input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
<br><br>
<input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -78,11 +79,4 @@
</tr>
</table>
</form>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -5,7 +5,8 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_UPLOADARCHIVECONFIRM;
@@ -17,7 +18,7 @@
</portlet:actionURL>">
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_UPLOADARCHIVE")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -57,6 +58,7 @@
<input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
<br><br>
<input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -64,11 +66,4 @@
</tr>
</table>
</form>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-22 01:17:46 UTC (rev 8424)
@@ -15,7 +15,10 @@
<%@ page import="java.util.Vector" %>
<portlet:defineObjects/>
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
+
<%
String sCurrPath = (String)request.getAttribute("currpath");
Vector vContents = (Vector)request.getAttribute("contents");
@@ -41,17 +44,19 @@
String exception = request.getParameter("exception");
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
%>
-<br>
-${n:i18n("CMS_MAIN_USE")}
+<h3 class="sectionTitle">
+${n:i18n("CMS_MANAGE")}
+</h3>
-<hr/>
-Browsing: <a href="<portlet:renderURL>
-<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
-<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a>
+<ul class="objectpath">
+ <li class="pathItem"><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ <portlet:param name="path" value="/"/>
+ </portlet:renderURL>">Home</a></li>
+
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -62,26 +67,30 @@
if (parser.hasMoreTokens())
{
%>
-> <a href="
+ <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= sPathBuilder %>"/>
</portlet:renderURL>
-"><%= sPathChunk %></a>
+"><%= sPathChunk %>
+</a>
+ </li>
<%
}
else
{
%>
-> <%= sPathChunk %>
+<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="selected"><%= sPathChunk %></li>
<%
}
}
%>
-
-<br/><br/>
-
+</ul>
+<br/>
<!-- file-level action dropdown -->
+<div class="menu-container" style="width:100%">
<div class="menu">
<ul>
<li><a href="#">Select Action <img
@@ -140,9 +149,9 @@
</li>
</ul>
</div>
+</div>
+<br style="clear:both"/>
-<br/><br/>
-
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<%
if (vContents.size() > 0)
@@ -321,7 +330,7 @@
<!-- show any errors here -->
<%if(exception!=null && exception.trim().length()>0){%>
<table width="100%">
-<th colspan="2" align="center" class="portlet-section-header">Error:</th>
+<th colspan="2"><h3 class="sectionTitle">Error:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -331,6 +340,7 @@
</tr>
</table>
<br/><br/>
+<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
@@ -397,3 +407,4 @@
<%}%>
</table>
<%}%>
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java 2007-09-21 20:20:32 UTC (rev 8423)
+++ branches/JBoss_Portal_Branch_2_6/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java 2007-09-22 01:17:46 UTC (rev 8424)
@@ -48,7 +48,11 @@
result.append("//*[");
try
{
- result.append(((JCRQuery)super.convert(query)).getJcrQuery());
+ if (super.convert(query) != null)
+ {
+ result.append(((JCRQuery)super.convert(query)).getJcrQuery());
+ }
+
}
catch (QueryConversionException e)
{
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8423 - in docs/trunk/quickstartuser/en: images and 1 other directories.
by portal-commits＠lists.jboss.org
Author: cdelashmutt
Date: 2007-09-21 16:20:32 -0400 (Fri, 21 Sep 2007)
New Revision: 8423
Modified:
docs/trunk/quickstartuser/en/images/image001.png
docs/trunk/quickstartuser/en/images/image002.png
docs/trunk/quickstartuser/en/images/image006.png
docs/trunk/quickstartuser/en/images/image012.png
docs/trunk/quickstartuser/en/images/image013.png
docs/trunk/quickstartuser/en/images/image014.png
docs/trunk/quickstartuser/en/images/image015.png
docs/trunk/quickstartuser/en/images/image016.png
docs/trunk/quickstartuser/en/images/image019.png
docs/trunk/quickstartuser/en/images/image022.png
docs/trunk/quickstartuser/en/images/image023.png
docs/trunk/quickstartuser/en/images/image024.png
docs/trunk/quickstartuser/en/images/image075.png
docs/trunk/quickstartuser/en/images/image076.png
docs/trunk/quickstartuser/en/images/image077.png
docs/trunk/quickstartuser/en/images/image078.png
docs/trunk/quickstartuser/en/images/image080.png
docs/trunk/quickstartuser/en/images/image081.png
docs/trunk/quickstartuser/en/images/image082.png
docs/trunk/quickstartuser/en/images/image084.png
docs/trunk/quickstartuser/en/images/image085.png
docs/trunk/quickstartuser/en/images/image086.png
docs/trunk/quickstartuser/en/images/image087.png
docs/trunk/quickstartuser/en/images/image088.png
docs/trunk/quickstartuser/en/images/image089.png
docs/trunk/quickstartuser/en/images/image090.png
docs/trunk/quickstartuser/en/images/image091.png
docs/trunk/quickstartuser/en/images/image092.png
docs/trunk/quickstartuser/en/images/image093.png
docs/trunk/quickstartuser/en/images/image094.png
docs/trunk/quickstartuser/en/images/image096.png
docs/trunk/quickstartuser/en/images/image098.png
docs/trunk/quickstartuser/en/images/image100.png
docs/trunk/quickstartuser/en/images/image103.png
docs/trunk/quickstartuser/en/images/image104.png
docs/trunk/quickstartuser/en/images/image105.png
docs/trunk/quickstartuser/en/images/image106.png
docs/trunk/quickstartuser/en/images/image107.png
docs/trunk/quickstartuser/en/images/image108.png
docs/trunk/quickstartuser/en/images/image109.png
docs/trunk/quickstartuser/en/master.xml
docs/trunk/quickstartuser/en/modules/deployportlet.xml
docs/trunk/quickstartuser/en/modules/forward.xml
docs/trunk/quickstartuser/en/modules/installation.xml
docs/trunk/quickstartuser/en/modules/interaction.xml
docs/trunk/quickstartuser/en/modules/portalterminology.xml
Log:
Updated quick start guide for 2.6.2 screens
Modified: docs/trunk/quickstartuser/en/images/image001.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image002.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image006.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image012.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image013.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image014.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image015.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image016.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image019.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image022.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image023.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image024.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image075.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image076.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image077.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image078.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image080.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image081.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image082.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image084.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image085.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image086.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image087.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image088.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image089.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image090.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image091.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image092.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image093.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image094.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image096.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image098.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image100.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image103.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image104.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image105.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image106.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image107.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image108.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/images/image109.png
===================================================================
(Binary files differ)
Modified: docs/trunk/quickstartuser/en/master.xml
===================================================================
--- docs/trunk/quickstartuser/en/master.xml 2007-09-21 16:23:32 UTC (rev 8422)
+++ docs/trunk/quickstartuser/en/master.xml 2007-09-21 20:20:32 UTC (rev 8423)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
"../../docbook-support/support/docbook-dtd/docbookx.dtd" [
-<!ENTITY overview SYSTEM "../../common/en/modules/overview.xml">
+<!ENTITY overview SYSTEM "modules/overview.xml">
<!ENTITY forward SYSTEM "modules/forward.xml">
<!ENTITY installation SYSTEM "modules/installation.xml">
<!ENTITY portalterminology SYSTEM "modules/portalterminology.xml">
@@ -13,7 +13,7 @@
<bookinfo>
<title>JBoss Portal 2.6.2-GA</title>
<subtitle>Quickstart User Guide</subtitle>
- <releaseinfo>Release 2.6.2-GA "Ninja"</releaseinfo>
+ <releaseinfo>Release 2.6.2-GA</releaseinfo>
<author>
<firstname>Kevin</firstname>
Modified: docs/trunk/quickstartuser/en/modules/deployportlet.xml
===================================================================
--- docs/trunk/quickstartuser/en/modules/deployportlet.xml 2007-09-21 16:23:32 UTC (rev 8422)
+++ docs/trunk/quickstartuser/en/modules/deployportlet.xml 2007-09-21 20:20:32 UTC (rev 8423)
@@ -87,9 +87,7 @@
</mediaobject></para>
<para>A list of all portlets will be displayed. Click on the
- local.flashportlet.FlashPortlet link. Once the portal page refreshes, scroll
- to the bottom of the page to see a dialog to create a new instance of the
- Flash Portlet (Figure 45). <mediaobject>
+ "Create Instance" action link for the "Flash Portlet". This will bring up a view similar to Figure 45 that will allow you to name the new portlet instance. <mediaobject>
<imageobject>
<imagedata align="center" fileref="images/image103.png" format="PNG"
valign="middle" />
@@ -97,16 +95,14 @@
<caption><para>Figure 45. Portlets admininstration.</para></caption>
</mediaobject>Type in "Flash Portlet" as the instance name in the textbox
- at the bottom of the page, and click on the "Create Instance" button. The
- "Portlet Instances" tab page will be displayed automatically, with the new
- "Flash Portlet" portlet instance that we created selected. (Figure 46).
+ at the bottom of the page, and click on the "Create Instance" button. The resulting view will show the summary information about the "Flash Portlet" portlet instance that we created. (Figure 46).
<mediaobject>
<imageobject>
<imagedata align="left" fileref="images/image104.png" format="PNG"
valign="middle" />
</imageobject>
- <caption><para>Figure 46. Portlet instances admininstration.
+ <caption><para>Figure 46. Portlet instances summary.
</para></caption>
</mediaobject>Now you can add this portlet instance to the Starter portal
page. Click on the "Portal Objects" tab and navigate to the "Page layout"
@@ -132,4 +128,4 @@
<caption><para>Figure 48. Starter portal page with "flash" portlet.
</para></caption>
</mediaobject></para>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: docs/trunk/quickstartuser/en/modules/forward.xml
===================================================================
--- docs/trunk/quickstartuser/en/modules/forward.xml 2007-09-21 16:23:32 UTC (rev 8422)
+++ docs/trunk/quickstartuser/en/modules/forward.xml 2007-09-21 20:20:32 UTC (rev 8423)
@@ -71,11 +71,11 @@
</listitem>
<listitem>
- This guide was created with JBoss Portal 2.6. This guide is expected to be forward compatible with future versions of Portal (although the screenshots may vary slightly).
+ This guide was created with JBoss Portal 2.6.2. This guide is expected to be forward compatible with future versions of Portal (although the screenshots may vary slightly).
</listitem>
<listitem>
JBoss Portal is platform independent, but this guide was developed using a Linux-based platform. This guide should work equally well for Unix/Linux/Windows installations because JBoss Portal is 100% Pure Java. Obviously, you may need use the run.bat instead of run.sh and use forward slashes instead of backslashes, etc.
</listitem>
</itemizedlist></para>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: docs/trunk/quickstartuser/en/modules/installation.xml
===================================================================
--- docs/trunk/quickstartuser/en/modules/installation.xml 2007-09-21 16:23:32 UTC (rev 8422)
+++ docs/trunk/quickstartuser/en/modules/installation.xml 2007-09-21 20:20:32 UTC (rev 8423)
@@ -40,14 +40,13 @@
Once you have Java installed, you are ready to download the JBoss Portal
bundle. The following link has the list of downloads for JBoss Portal:
<ulink
- url="http://www.jboss.com/products/JBoss Portal/downloads">http://labs.jboss.com/portal/jbossportal/download</ulink>
- . Download the "JBoss Portal +JBoss AS" bundle by clicking the "Download"
+ url="http://labs.jboss.com/jbossportal/download">http://labs.jboss.com/portal/jbossportal/download</ulink>.
+ Download the "JBoss Portal + JBoss AS" bundle by clicking the "Download"
link on the right of the page. From here, you will need to unzip it to
your machine (Note: If you do not have a ZIP utility, please go to this
link to get it: <ulink
- url="http://sourceforge.net/projects/sevenzip/">http://sourceforge.net/projects/sevenzip</ulink>
- ). Once you have unzipped it, you should have a directory structure with
- the following folders under, jboss-portal-2.6-GA: <itemizedlist>
+ url="http://sourceforge.net/projects/sevenzip/">http://sourceforge.net/projects/sevenzip</ulink>). Once you have unzipped it, you should have a directory structure with
+ the following folders under, jboss-portal-2.6.2-GA: <itemizedlist>
<listitem>
@@ -118,4 +117,4 @@
Portal.</para></caption>
</mediaobject></para>
</sect1>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: docs/trunk/quickstartuser/en/modules/interaction.xml
===================================================================
--- docs/trunk/quickstartuser/en/modules/interaction.xml 2007-09-21 16:23:32 UTC (rev 8422)
+++ docs/trunk/quickstartuser/en/modules/interaction.xml 2007-09-21 20:20:32 UTC (rev 8423)
@@ -58,11 +58,13 @@
<sect1>
<title>User Creation</title>
- <para>Let's create a user for the portal. Click on the "You can create an
- account." link in the user portlet. The create user view now shows in the
+ <para>Let's create a user for the portal. Click on the "Register" tab in
+ the user portlet. The basic create user view now shows in the
user portlet. Enter the information as shown in Figure 7 (password is
- starter). Once you have clicked "New user registration" button, the
- default view will show (Figure 8). <mediaobject>
+ starter). Once you have clicked "Submit" button, the
+ user creation confirmation screen will show up (Figure 8). Validate the user
+ information and then click on the "Submit" button to finish the creation of
+ the new user.<mediaobject>
<imageobject>
<imagedata align="center" fileref="images/image077.png" format="png"
valign="middle" />
@@ -76,8 +78,7 @@
valign="middle" />
</imageobject>
- <caption><para>Figure 8. The default view after registering a new
- user.</para></caption>
+ <caption><para>Figure 8. The user creation confirmation view.</para></caption>
</mediaobject>This example models a user enrolling themselves in the
portal security repository, and at this point the user could login and
would have the default security role for the portal. Administrators can
@@ -142,7 +143,7 @@
Please use the quickstart.zip for the batch upload. You may also download it from
<ulink
- url="http://docs.jboss.org/jbportal/v2.6/quickstartuser/en/quickstart.zip">here</ulink>
+ url="http://docs.jboss.org/jbportal/v2.6/quickstartuser/quickstart.zip">here</ulink>
.
</note>You can choose the destination folder for the upload by selecting
@@ -162,7 +163,7 @@
The quickstart.zip file will be uploaded, extracted into the content
repository, and the files and directories will now appear in the content
management structure (see the new "quickstart" directory in Figure
- 14).<mediaobject>
+ 14). This process may take a minute.<mediaobject>
<imageobject>
<imagedata align="left" fileref="images/image012.png" format="PNG"
valign="middle" />
@@ -184,7 +185,7 @@
</imageobject>
<caption><para>Figure 15. HTML files and sub-directories that were
- uploaded intoquickstart directory shows in content management
+ uploaded into quickstart directory shows in content management
repository. </para></caption>
</mediaobject></para>
@@ -207,7 +208,7 @@
<caption><para>Figure 17. Version view for index.html.
</para></caption>
</mediaobject>To edit this HTML file, click on the "text/html" link. The
- WYSIWYG editor view will appear (Figures 18). Note: The WYSIWYG editor is
+ WYSIWYG editor view will appear (Figures 18). Click on the maximize icon in the upper right corner of the WYSIWYG editor if needed to make the editor portlet take up the entire page. Note: The WYSIWYG editor is
dependent on browser. Some browsers show a box to enter HTML. <mediaobject>
<imageobject>
<imagedata align="center" fileref="images/image016.png" format="PNG"
@@ -220,7 +221,7 @@
<para>HTML pages can be edited through this view. Let's change this page
to point to our uploaded pages. Change the section title next to the
PortletSwap table cell from "Project Information" to "Quickstart Guide"
- and change the text following the link below that to "to see the
+ and change the text following the heading to be "Click here to see the
Quickstart guide for JBoss Portal.". The updated text is in Figure 19.
<mediaobject>
<imageobject>
@@ -231,8 +232,8 @@
<caption><para>Figure 19. Updated text in HTML page.</para></caption>
</mediaobject></para>
- <para>Now let's update the link to point to the index.html page in the
- quickstart directory. Click on the "Click here" link under Portal
+ <para>Now let's create the link that will point to the index.html page in the
+ quickstart directory. Select the "Click here" text under Portal
Documentation, then on the edit link button (it looks like a chain). The
insert/edit link window appears. Change the Link URL to
"quickstart/index.html" (Figure 20). <mediaobject>
@@ -243,10 +244,10 @@
<caption><para>Figure 20. Insert/edit link window with updated link
URL </para></caption>
- </mediaobject>Click "Update" button to save the updated link. Then click
+ </mediaobject>Click "Insert" button to create the link. Then click
"Create" button at the bottom of the portlet window to create the new
version of the HTML file. The CMS Administration view shows again with the
- new 1.1 version shown (Figure 21). The star icon next to the version
+ new 1.1 version shown (Figure 21). The check icon next to the version
number shows this is the live version. <mediaobject>
<imageobject>
<imagedata align="left" fileref="images/image022.png" format="PNG"
@@ -293,7 +294,7 @@
<caption><para>Figure 24. Admin portal page.</para></caption>
</mediaobject>Click the "Members" tab to access the member management
- page. Click on the "Search" button to see all of the users currently
+ page. Click on the "Search users" link to see all of the users currently
enrolled in the portal security repository (Figure 25). <mediaobject>
<imageobject>
<imagedata align="left" fileref="images/image084.png" format="PNG"
@@ -312,10 +313,10 @@
<caption><para>Figure 26. User portlet with available roles view.
</para></caption>
- </mediaobject>Add the "Administrators" role to this user by selecting it
- from the "Available roles" list box and clicking the "Add Roles" button.
- Click the "Assign roles" button to apply the new roles list to the user.
- This brings us back to the User portlet menu view (Figure 27).
+ </mediaobject>Add the "Administrators" role to this user by checking the
+ check box next to the "Administrators" label.
+ Click the "Submit" button to apply the new role to the user.
+ This brings us back to the main User Management view (Figure 27).
<mediaobject>
<imageobject>
<imagedata align="left" fileref="images/image086.png" format="PNG"
@@ -324,7 +325,8 @@
<caption><para>Figure 27. User portlet menu view.</para></caption>
</mediaobject>Now let's look at the user profile for the starter user.
- Click on the "Profile" link next to the starter user. The user profile
+ Click on "Search Users" again to get back to the user result list, and then
+ click on the "Edit user" link next to the starter user. The user profile
view appears (Figure 28). <mediaobject>
<imageobject>
<imagedata align="left" fileref="images/image087.png" format="PNG"
@@ -333,15 +335,17 @@
<caption><para>Figure 28. User profile view.</para></caption>
</mediaobject>This shows all of the fields available in the user
- profile. Enter the first name of "starter" and click the "Save changes"
- button. The Member management page is displayed now (Figure 29).
+ profile. Under the "Personal Information" section, enter the first name
+ of "Starter" and click the "Submit"
+ button at the bottom of the page. The user list is redisplayed with the
+ updated first name for the "starter" user (Figure 29).
<mediaobject>
<imageobject>
<imagedata align="left" fileref="images/image089.png" format="PNG"
valign="middle" />
</imageobject>
- <caption><para>Figure 29. Member management portal page default view.
+ <caption><para>Figure 29. User search results with updated user first name.
</para></caption>
</mediaobject>Now, let's explore the management portlet, by clicking on
the "Home" tab. This portlet shows a view of the portals, portal pages and
@@ -354,9 +358,8 @@
<caption><para>Figure 30. Management portlet page view.
</para></caption>
- </mediaobject>Let's create a new portal page. Click on the "root"
- breadcrumb link below the "Portal Objects" tab then choose "default"
- portal. Enter "Starter" in the text field next to the "Create a page:"
+ </mediaobject>Let's create a new portal page. Click on the "default"
+ portal link in the "Portals" list at the bottom of the page. In the resulting view, enter "Starter" in the text field next to the "Create a page named:"
label. Your portal page view should match the following figure (Figure
31).<mediaobject>
<imageobject>
@@ -366,7 +369,7 @@
<caption><para>Figure 31. Management portlet add page view.
</para></caption>
- </mediaobject>Click the "Add" button to create the new page. We now see
+ </mediaobject>Click the "Create Page" button to create the new page. We now see
the "Starter" page in the list of portal pages (Figure 32). <mediaobject>
<imageobject>
<imagedata align="left" fileref="images/image091.png" format="PNG"
@@ -386,13 +389,11 @@
<caption><para>Figure 33. Management portlet for Starter portal page.
</para></caption>
- </mediaobject>First, let's add a weather portlet. We know this is
- portlet, so we can leave the "Content Type" drop-down set to "portlet".
- It's a good idea to give the new portlet window a name instead of relying
+ </mediaobject>First, let's add a weather portlet. It's a good idea to
+ give the new portlet window a name instead of relying
on the portal to generate one for you, so enter "weather" in the "Window
- Name" field. In the list labeled "Select a portlet instance to associate
- to this window", select the "WeatherPortletInstance" portlet instance and
- click the "Select" button. You can verify that you have the proper portlet
+ Name" field. The weather portlet is a JSR-168 portlet, so we can leave the "Content Type" drop-down set to "portlet".
+In the list labeled "Portlet instance associated to this window:", select the "WeatherPortletInstance" portlet instance. You can verify that you have the proper portlet
instance selected by viewing the details that show up below the Portlet
Instance list at the bottom of the portlet (Figure 34).<mediaobject>
<imageobject>
@@ -400,7 +401,7 @@
valign="middle" />
</imageobject>
- <caption><para>Figure 34. Choosing the "WeatherPorletInstance" portlet
+ <caption><para>Figure 34. Choosing the "WeatherPortletInstance" portlet
instance from the list. </para></caption>
</mediaobject>Scroll up to the list box that is labeled "center Region".
Click the "Add" button to the left of that list box. The "weather" portlet
@@ -412,11 +413,9 @@
<caption><para>Figure 35. Weather portlet instance is added.
</para></caption>
- </mediaobject>Lets change the theme for the weather portlet window we
+ </mediaobject>Let's change the theme for the weather portlet window we
just added so that the weather portlet window doesn't display any
- decorations. Click on the "default" link in the breadcrumbs below the
- "Portal Objects" tab, then choose the "Starter" link. Click on the "theme"
- action link next to the "weather" window. Let's set the Window Renderer,
+ decorations. Just below the "Portal Objects" tab near the top of the page is a breadcrumbs list that shows us we are in the "Portals" management section, in the "default" portal, and in the "Starter" page layout. Each of the elements in the breadcrumbs list is a link that will allow you to navigate back to other portal components. Click on the "Starter page" link in the breadcrumbs. In the resulting view under the "Manage windows within Starter page" section, click on the "theme" action link next to the "weather" window. Let's set the Window Renderer,
Decoration Renderer, and Portlet Renderer to "emptyRenderer" (Figure 36).
<mediaobject>
<imageobject>
@@ -428,8 +427,8 @@
instance. </para></caption>
</mediaobject>Click the "Update" button to apply the theme changes.
Finally, let's take a look at security in the Management Portlet. Click on
- the "Starter" page in the breadcrumbs below the "Portal Objects" tab. Next
- click the "Security" link which is just below the breadcrumbs links, and
+ the "Starter page" link in the breadcrumbs below the "Portal Objects" tab. Next
+ click the "Security" link just under the "Manage Starter page" section title, and
the list of available roles and actions is shown for the "Starter" portal
page.(Figure 37). <mediaobject>
<imageobject>
@@ -450,4 +449,4 @@
<caption><para>Figure 38. The Starter portal page.</para></caption>
</mediaobject></para>
</sect1>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: docs/trunk/quickstartuser/en/modules/portalterminology.xml
===================================================================
--- docs/trunk/quickstartuser/en/modules/portalterminology.xml 2007-09-21 16:23:32 UTC (rev 8422)
+++ docs/trunk/quickstartuser/en/modules/portalterminology.xml 2007-09-21 20:20:32 UTC (rev 8423)
@@ -89,11 +89,11 @@
<caption><para>Figure 4. The default portal page with components
highlighted.</para></caption>
</mediaobject>Now we see that the default portal we are looking at has
- four portal pages, and the default portal page has three portlets on it
+ five portal pages, and the default portal page has three portlets on it
(greetings, user, and content view). In addition, we see that each portlet
window is made up of decorations/controls and a portlet fragment (the
content view does not have any decoration/controls). Each portlet can
represent some fragment of information that you want to present to users. By
having multiple portlets on a portal page, we can aggregate information from
the portlets into a single browser window.</para>
-</chapter>
\ No newline at end of file
+</chapter>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8422 - modules/test/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 12:23:32 -0400 (Fri, 21 Sep 2007)
New Revision: 8422
Modified:
modules/test/trunk/build/build-thirdparty.xml
Log:
Use common snapshot
Modified: modules/test/trunk/build/build-thirdparty.xml
===================================================================
--- modules/test/trunk/build/build-thirdparty.xml 2007-09-21 16:20:17 UTC (rev 8421)
+++ modules/test/trunk/build/build-thirdparty.xml 2007-09-21 16:23:32 UTC (rev 8422)
@@ -47,7 +47,7 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.0.0"/>
+ <componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/>
<componentref name="codehaus/cargo" version="0.9"/>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8421 - modules/test/tags/1_0_0/tools/etc/buildfragments.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 12:20:17 -0400 (Fri, 21 Sep 2007)
New Revision: 8421
Modified:
modules/test/tags/1_0_0/tools/etc/buildfragments/defaults.ent
Log:
minor fix
Modified: modules/test/tags/1_0_0/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/test/tags/1_0_0/tools/etc/buildfragments/defaults.ent 2007-09-21 16:08:59 UTC (rev 8420)
+++ modules/test/tags/1_0_0/tools/etc/buildfragments/defaults.ent 2007-09-21 16:20:17 UTC (rev 8421)
@@ -37,17 +37,15 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main/java"/>
+ <property name="source.classes" value="${module.source}/main"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/main/resources"/>
+ <property name="source.resources" value="${module.source}/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
- <property name="source.test.classes" value="${module.source}/test/java"/>
- <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -70,9 +68,7 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.test.classes" value="${module.output}/test/classes"/>
- <property name="build.test.resources" value="${module.output}/test/resources"/>
- <property name="build.test.gen" value="${build.gen}/test/gen"/>
+ <property name="build.gen.test" value="${build.gen}/test"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8420 - in modules/test/tags/1_0_0: test/src/main and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 12:08:59 -0400 (Fri, 21 Sep 2007)
New Revision: 8420
Added:
modules/test/tags/1_0_0/test/src/main/org/
Removed:
modules/test/tags/1_0_0/test/src/main/java/org/
Modified:
modules/test/tags/1_0_0/.classpath
Log:
revert
Modified: modules/test/tags/1_0_0/.classpath
===================================================================
--- modules/test/tags/1_0_0/.classpath 2007-09-21 16:06:17 UTC (rev 8419)
+++ modules/test/tags/1_0_0/.classpath 2007-09-21 16:08:59 UTC (rev 8420)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="test/src/main/java"/>
+ <classpathentry kind="src" path="test/src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
Copied: modules/test/tags/1_0_0/test/src/main/org (from rev 8416, modules/test/tags/1_0_0/test/src/main/java/org)
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8419 - in modules/test/trunk/test: src/main and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 12:06:17 -0400 (Fri, 21 Sep 2007)
New Revision: 8419
Added:
modules/test/trunk/test/src/main/org/
Removed:
modules/test/trunk/test/src/main/java/org/
Modified:
modules/test/trunk/test/.classpath
Log:
Rollback
Modified: modules/test/trunk/test/.classpath
===================================================================
--- modules/test/trunk/test/.classpath 2007-09-21 16:05:00 UTC (rev 8418)
+++ modules/test/trunk/test/.classpath 2007-09-21 16:06:17 UTC (rev 8419)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/apache-ant/lib/ant.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
Copied: modules/test/trunk/test/src/main/org (from rev 8418, modules/test/trunk/test/src/main/java/org)
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8418 - in modules: portlet/trunk/tools/etc/buildfragments and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 12:05:00 -0400 (Fri, 21 Sep 2007)
New Revision: 8418
Modified:
modules/identity/trunk/tools/etc/buildfragments/defaults.ent
modules/portlet/trunk/tools/etc/buildfragments/defaults.ent
modules/test/trunk/tools/etc/buildfragments/defaults.ent
modules/web/trunk/tools/etc/buildfragments/defaults.ent
Log:
oups
Modified: modules/identity/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/identity/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 15:53:21 UTC (rev 8417)
+++ modules/identity/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 16:05:00 UTC (rev 8418)
@@ -37,17 +37,15 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main/java"/>
+ <property name="source.classes" value="${module.source}/main"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/main/resources"/>
+ <property name="source.resources" value="${module.source}/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
- <property name="source.test.classes" value="${module.source}/test/java"/>
- <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -70,9 +68,7 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.test.classes" value="${module.output}/test/classes"/>
- <property name="build.test.resources" value="${module.output}/test/resources"/>
- <property name="build.test.gen" value="${build.gen}/test/gen"/>
+ <property name="build.gen.test" value="${build.gen}/test"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
Modified: modules/portlet/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/portlet/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 15:53:21 UTC (rev 8417)
+++ modules/portlet/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 16:05:00 UTC (rev 8418)
@@ -37,17 +37,15 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main/java"/>
+ <property name="source.classes" value="${module.source}/main"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/main/resources"/>
+ <property name="source.resources" value="${module.source}/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
- <property name="source.test.classes" value="${module.source}/test/java"/>
- <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -70,9 +68,7 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.test.classes" value="${module.output}/test/classes"/>
- <property name="build.test.resources" value="${module.output}/test/resources"/>
- <property name="build.test.gen" value="${build.gen}/test/gen"/>
+ <property name="build.gen.test" value="${build.gen}/test"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
Modified: modules/test/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/test/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 15:53:21 UTC (rev 8417)
+++ modules/test/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 16:05:00 UTC (rev 8418)
@@ -37,17 +37,15 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main/java"/>
+ <property name="source.classes" value="${module.source}/main"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/main/resources"/>
+ <property name="source.resources" value="${module.source}/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
- <property name="source.test.classes" value="${module.source}/test/java"/>
- <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -70,9 +68,7 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.test.classes" value="${module.output}/test/classes"/>
- <property name="build.test.resources" value="${module.output}/test/resources"/>
- <property name="build.test.gen" value="${build.gen}/test/gen"/>
+ <property name="build.gen.test" value="${build.gen}/test"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
Modified: modules/web/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/web/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 15:53:21 UTC (rev 8417)
+++ modules/web/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 16:05:00 UTC (rev 8418)
@@ -37,17 +37,15 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main/java"/>
+ <property name="source.classes" value="${module.source}/main"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/main/resources"/>
+ <property name="source.resources" value="${module.source}/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
- <property name="source.test.classes" value="${module.source}/test/java"/>
- <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -70,9 +68,7 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.test.classes" value="${module.output}/test/classes"/>
- <property name="build.test.resources" value="${module.output}/test/resources"/>
- <property name="build.test.gen" value="${build.gen}/test/gen"/>
+ <property name="build.gen.test" value="${build.gen}/test"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
16 years, 9 months
- 1
- 0