Author: woonsan
Date: Tue Mar 2 15:53:24 2010
New Revision: 918085
URL: http://svn.apache.org/viewvc?rev=918085&view=rev
Log:
JS2-1108: Caching template page nodes, fixing modal window's css problems in
portal site manager.
TODO: Check page/folder access and read page path during displaying menus in
page navigator.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
Tue Mar 2 15:53:24 2010
@@ -71,6 +71,7 @@
public static final String DEFAULT_SPACE_LINKS_MENU = "space-links";
public static final String DEFAULT_TEMPLATE_PAGE =
"/_template/new-user/min.psml";
public static final String FOLDER_SPACE_FLAGS = "folderSpaceFlags";
+ public static final String TEMPLATE_PAGE_NODES = "templatePageNodes";
private static Logger log = LoggerFactory.getLogger(PageNavigator.class);
@@ -217,7 +218,6 @@
}
return
renderResponse.encodeURL(path.append(request.getContextPath()).append(request.getServletPath()).append(relativePath).toString());
-
}
else
{
@@ -393,32 +393,39 @@
private List<NodeBean> getTemplatePageNodes(PortletRequest request)
{
- List<NodeBean> pageNodes = new ArrayList<NodeBean>();
-
- String templatePages =
request.getPreferences().getValue("templatePages", null);
-
- if (!StringUtils.isBlank(templatePages))
+ List<NodeBean> templatePageNodes = (List<NodeBean>)
request.getPortletSession(true).getAttribute(TEMPLATE_PAGE_NODES);
+
+ if (templatePageNodes == null)
{
- String [] templatePagePaths = StringUtils.split(templatePages, ",
\t\r\n");
+ templatePageNodes = new ArrayList<NodeBean>();
- for (String templatePagePath : templatePagePaths)
+ String templatePages =
request.getPreferences().getValue("templatePages", null);
+
+ if (!StringUtils.isBlank(templatePages))
{
- try
- {
- Page templatePage = pageManager.getPage(templatePagePath);
- pageNodes.add(new NodeBean(templatePage));
- }
- catch (SecurityException e)
- {
- // ignore security exception when retrieving template
pages.
- }
- catch (Exception e)
+ String [] templatePagePaths = StringUtils.split(templatePages,
", \t\r\n");
+
+ for (String templatePagePath : templatePagePaths)
{
- log.warn("Invalid template page path: " + templatePagePath
+ ". {}", e.toString());
+ try
+ {
+ Page templatePage =
pageManager.getPage(templatePagePath);
+ templatePageNodes.add(new NodeBean(templatePage));
+ }
+ catch (SecurityException e)
+ {
+ // ignore security exception when retrieving template
pages.
+ }
+ catch (Exception e)
+ {
+ log.warn("Invalid template page path: " +
templatePagePath + ". {}", e.toString());
+ }
}
}
+
+ request.getPortletSession().setAttribute(TEMPLATE_PAGE_NODES,
templatePageNodes);
}
- return pageNodes;
+ return templatePageNodes;
}
}
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddFolderPanel.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
Tue Mar 2 15:53:24 2010
@@ -25,16 +25,16 @@
<form wicket:id="newForm">
<table class="formAnswer" style="width: 100%;">
<tr>
- <td class="portlet-section-header"><span
wicket:id="name"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="name"></span></td>
<td class="portlet-section-body" width="100%"><input
type="text"
wicket:id="nameField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="title"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="title"></span></td>
<td class="portlet-section-body" width="100%"><input
type="text" wicket:id="titleField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="shortTitle"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="shortTitle"></span></td>
<td class="portlet-section-body"><input type="text"
class="medium"
wicket:id="shortTitleField" /></td>
</tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddLinkPanel.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
Tue Mar 2 15:53:24 2010
@@ -30,26 +30,26 @@
wicket:id="nameField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="title"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="title"></span></td>
<td class="portlet-section-body"><input type="text"
wicket:id="titleField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="shortTitle"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="shortTitle"></span></td>
<td class="portlet-section-body"><input type="text"
class="medium"
wicket:id="shortTitleField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="urlLabel"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="urlLabel"></span></td>
<td class="portlet-section-body"><input type="text"
class="medium"
wicket:id="urlField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="targetLabel"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="targetLabel"></span></td>
<td class="portlet-section-body"><select
wicket:id="target">
</select></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="visible"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="visible"></span></td>
<td class="portlet-section-body"><input type="checkbox"
wicket:id="visibleCheck" /></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddPagePanel.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
Tue Mar 2 15:53:24 2010
@@ -25,36 +25,36 @@
<form wicket:id="newForm">
<table class="formAnswer" style="width: 100%;">
<tr>
- <td width="110px" class="portlet-section-header"><span
wicket:id="name"></span></td>
+ <td width="110px"
class="portlet-section-subheader"><span wicket:id="name"></span></td>
<td class="portlet-section-body"><input type="text"
wicket:id="nameField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="title"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="title"></span></td>
<td class="portlet-section-body"><input type="text"
wicket:id="titleField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="shortTitle"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="shortTitle"></span></td>
<td class="portlet-section-body"><input type="text"
class="medium"
wicket:id="shortTitleField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="pageDecorator"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="pageDecorator"></span></td>
<td class="portlet-section-body"><select
wicket:id="decoratorsList">
</select></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="portletDecorator"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="portletDecorator"></span></td>
<td class="portlet-section-body"><select
wicket:id="portletDecoratorsList">
</select></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="theme"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="theme"></span></td>
<td class="portlet-section-body"><select
wicket:id="themeList">
</select></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="visible"></span></td>
+ <td class="portlet-section-subheader"><span
wicket:id="visible"></span></td>
<td class="portlet-section-body"><input type="checkbox"
wicket:id="visibleCheck" /></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24CopyMoveWindow.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$CopyMoveWindow.html
Tue Mar 2 15:53:24 2010
@@ -33,11 +33,11 @@
<form wicket:id="copyForm">
<table>
<tr>
- <td
class="portlet-section-header"><label wicket:id="docType-label">[document
Type]</label></td>
+ <td
class="portlet-section-subheader"><label wicket:id="docType-label">[document
Type]</label></td>
<td class="portlet-section-body"><input type="text"
wicket:id="docType" readonly/></td>
</tr>
<tr>
- <td
class="portlet-section-header"><label wicket:id="docName-label">[Docment
Name]</label></td>
+ <td
class="portlet-section-subheader"><label wicket:id="docName-label">[Docment
Name]</label></td>
<td
class="portlet-section-body"><input type="text" wicket:id="docName"/></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24ExcludesWindow.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$ExcludesWindow.html
Tue Mar 2 15:53:24 2010
@@ -26,7 +26,7 @@
<form wicket:id="menuForm">
<table>
<tr>
- <td class="portlet-section-header"><span
wicket:id="namelabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="namelabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="nameField" /></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24IncludesWindow.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$IncludesWindow.html
Tue Mar 2 15:53:24 2010
@@ -26,11 +26,11 @@
<form wicket:id="menuForm">
<table>
<tr>
- <td class="portlet-section-header"><span
wicket:id="namelabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="namelabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="nameField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="nestlabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="nestlabel"/></td>
<td class="portlet-section-body"><input
type="checkbox "wicket:id="nestField" /></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuWindow.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuWindow.html
Tue Mar 2 15:53:24 2010
@@ -26,39 +26,39 @@
<form wicket:id="menuForm">
<table>
<tr>
- <td class="portlet-section-header"><span
wicket:id="nameLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="nameLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="nameField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="titleLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="titleLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="titleField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="optionLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="optionLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="optionsField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="profileLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="profileLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="profileField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="skinLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="skinLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="skinField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="regExpLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="regExpLabel"/></td>
<td class="portlet-section-body"><input
type="checkbox "wicket:id="regExpField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="pathLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="pathLabel"/></td>
<td class="portlet-section-body"><input
type="checkbox "wicket:id="pathField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="depthLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="depthLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="depthField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="orderLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="orderLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="orderField" /></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataPanel.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
Tue Mar 2 15:53:24 2010
@@ -27,16 +27,16 @@
<table style="width:100%;">
<tr>
- <td width="60px" class="portlet-section-header"><label
wicket:id="name-label" for="name" class="portlet-form-field-label">[name
label]</label>:</td>
+ <td width="60px"
class="portlet-section-subheader"><label wicket:id="name-label" for="name"
class="portlet-form-field-label">[name label]</label>:</td>
<td class="portlet-section-body"><input type="text"
wicket:id="name" id="name" class="portlet-form-field"/></td>
</tr>
<tr>
- <td class="portlet-section-header"><label
wicket:id="language-label" for="language"
class="portlet-form-field-label">[language label]</label>:</td>
+ <td class="portlet-section-subheader"><label
wicket:id="language-label" for="language"
class="portlet-form-field-label">[language label]</label>:</td>
<td class="portlet-section-body"><input type="text"
wicket:id="language" id="language" class="portlet-form-field"/></td>
</tr>
<tr>
- <td class="portlet-section-header"><label
wicket:id="value-label" for="metaValue" class="portlet-form-field-label">[value
label]</label>:</td>
+ <td class="portlet-section-subheader"><label
wicket:id="value-label" for="metaValue" class="portlet-form-field-label">[value
label]</label>:</td>
<td class="portlet-section-body"><input type="text"
wicket:id="metaValue" id="metaValue" class="portlet-form-field"/></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24OptionsWindow.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$OptionsWindow.html
Tue Mar 2 15:53:24 2010
@@ -25,31 +25,31 @@
<form wicket:id="menuForm">
<table>
<tr>
- <td class="portlet-section-header"><span
wicket:id="optionLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="optionLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="optionsField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="profileLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="profileLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="profileField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="skinLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="skinLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="skinField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="regExpLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="regExpLabel"/></td>
<td class="portlet-section-body"><input
type="checkbox "wicket:id="regExpField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="pathLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="pathLabel"/></td>
<td class="portlet-section-body"><input
type="checkbox "wicket:id="pathField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="depthLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="depthLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="depthField" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="orderLabel"/></td>
+ <td class="portlet-section-subheader"><span
wicket:id="orderLabel"/></td>
<td class="portlet-section-body"><input
type="text "wicket:id="orderField" /></td>
</tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24SecurityTabWindowPanel.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTabWindowPanel.html
Tue Mar 2 15:53:24 2010
@@ -25,7 +25,7 @@
<form wicket:id="securityDataForm">
<table>
<tr>
- <td class="portlet-section-header"><label
wicket:id="securityConstraintLabel">[name
+ <td class="portlet-section-subheader"><label
wicket:id="securityConstraintLabel">[name
label]</label></td>
<td class="portlet-section-body"><select
wicket:id="constraints"></select></td>
</tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24SeparatorWindow.html?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
Tue Mar 2 15:53:24 2010
@@ -26,11 +26,11 @@
<form wicket:id="separatorDataForm">
<table>
<tr>
- <td class="portlet-section-header"><span
wicket:id="nameLabel" /></td>
+ <td class="portlet-section-subheader"><span
wicket:id="nameLabel" /></td>
<td class="portlet-section-body"><input
type="text "wicket:id="separatorText" /></td>
</tr>
<tr>
- <td class="portlet-section-header"><span
wicket:id="titleLabel" /></td>
+ <td class="portlet-section-subheader"><span
wicket:id="titleLabel" /></td>
<td class="portlet-section-body"><input
type="text "wicket:id="separatorTitle" /></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=918085&r1=918084&r2=918085&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
Tue Mar 2 15:53:24 2010
@@ -53,25 +53,13 @@
if (MenuElement.MENU_ELEMENT_TYPE.equals(type))
{
Menu folderMenu = (Menu) element;
- String folderName = folderMenu.getName();
- String folderUrl = folderMenu.getUrl();
- String url = pageNavigator.getAbsoluteUrl(folderUrl, renderResponse,
rc);
- //TODO: why the folderMenu's name is null?
- if (folderName == null)
- {
- folderName = folderUrl;
-
- try
- {
- folderName = folderName.substring(space.getPath().length() +
1);
- }
- catch (Exception ignore)
- {
- }
- }
-
- out.write("<li path='" + folderUrl + "' class='expanded'>");
- out.write("<a href='#'>" + folderName + "</a>");
+ String title = folderMenu.getTitle(renderRequest.getLocale());
+ String path = folderMenu.getUrl();
+ String url = folderMenu.getUrl();
+ // FIXME: how can we decide this menu element is editable or not?
+ boolean editable = (renderRequest.getUserPrincipal() != null &&
"admin".equals(renderRequest.getUserPrincipal().getName()));
+ out.write("<li editable='" + editable + "' path='" + path + "'
class='expanded'>");
+ out.write("<a href='#'>" + title + "</a>");
out.write("<a class='dropdown'></a>");
out.write("\n");
@@ -96,9 +84,13 @@
else if (MenuElement.OPTION_ELEMENT_TYPE.equals(type))
{
MenuOption option = (MenuOption)element;
- String url = pageNavigator.getAbsoluteUrl(option.getUrl(),
renderResponse, rc);
- out.write("<li path='" + option.getUrl() +"'>");
- out.write("<a href='" + url + "'>" +
element.getTitle(renderRequest.getLocale()) + "</a>");
+ String url = option.getUrl();
+ String path = option.getUrl();
+ String title = option.getTitle(renderRequest.getLocale());
+ // FIXME: how can we decide this menu element is editable or not?
+ boolean editable = (renderRequest.getUserPrincipal() != null &&
"admin".equals(renderRequest.getUserPrincipal().getName()));
+ out.write("<li editable='" + editable + "' path='" + path +"'>");
+ out.write("<a href='" + pageNavigator.getAbsoluteUrl(url,
renderResponse, rc) + "'>" + title + "</a>");
out.write("<a class='dropdown'></a>");
out.write("</li>");
out.write("\n");
@@ -351,11 +343,13 @@
var onMenuItemMouseEnter = function(e) {
var li = e.target;
- var dropDown = li.one(".dropdown");
- if (dropDown) {
- dropDown.removeClass("dropdown");
- dropDown.addClass("dropdownActive");
- dropDown.on("click", onMenuItemDropDownClick);
+ if ("true" == li.getAttribute("editable")) {
+ var dropDown = li.one(".dropdown");
+ if (dropDown) {
+ dropDown.removeClass("dropdown");
+ dropDown.addClass("dropdownActive");
+ dropDown.on("click", onMenuItemDropDownClick);
+ }
}
e.halt();
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
