Author: vkumar
Date: Mon Apr 27 11:19:47 2009
New Revision: 768925
URL: http://svn.apache.org/viewvc?rev=768925&view=rev
Log:
Adding mising resource bundle and replacing Ajax Link with Ajax button
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/SiteResources.properties
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddFolderPanel.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddFolderPanel.html
Mon Apr 27 11:19:47 2009
@@ -37,8 +37,7 @@
wicket:id="shortTitleField" /></td>
</tr>
<tr>
- <td><input type="button" class="medium"
wicket:id="close" /></td>
- <td><input type="button" class="medium" wicket:id="new"
/></td>
+ <td colspan="2"><input type="button" class="medium"
wicket:id="new" /></td>
</tr>
</table>
</form>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddLinkPanel.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddLinkPanel.html
Mon Apr 27 11:19:47 2009
@@ -51,8 +51,7 @@
<td><input type="checkbox" wicket:id="visibleCheck"
/></td>
</tr>
<tr>
- <td><input type="button" class="medium"
wicket:id="close"/></td>
- <td><input type="button" class="medium" wicket:id="new"
/></td>
+ <td colspan="2"><input type="button" class="medium"
wicket:id="new" /></td>
</tr>
</table>
</form>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24AddPagePanel.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$AddPagePanel.html
Mon Apr 27 11:19:47 2009
@@ -56,8 +56,7 @@
<td><input type="checkbox" wicket:id="visibleCheck"
/></td>
</tr>
<tr>
- <td><input type="button" class="medium"
wicket:id="close" /></td>
- <td><input type="button" class="medium" wicket:id="new"
/></td>
+ <td colspan="2"><input type="button" class="medium"
wicket:id="new" /></td>
</tr>
</table>
</form>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24InformationTab.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
Mon Apr 27 11:19:47 2009
@@ -82,13 +82,13 @@
<table>
<tr>
<td>
- <input type="button" wicket:id="addFolder" />
+ <input type="button" wicket:id="addFolder"/>
</td>
<td>
- <input type="button" wicket:id="addPage" />
+ <input type="button" wicket:id="addPage"/>
</td>
<td>
- <input type="button" wicket:id="addLink" />
+ <input type="button" wicket:id="addLink"/>
</td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuExlcudesPanel.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuExlcudesPanel.html
Mon Apr 27 11:19:47 2009
@@ -24,19 +24,20 @@
<table cellpadding="2">
<thead>
<tr>
- <th
class="portlet-section-header"><span wicked:id="nameLabel"/></th>
+ <th
class="portlet-section-header"><span wicket:id="nameLabel"/></th>
<th> </th>
<th> </th>
</tr>
</thead>
<tr class="even" wicket:id="menuData">
<td><span wicket:id="name" /></td>
- <td><a href="" wicket:id="edit"><span
wicked:id="editLabel"/></a></td>
- <td> <a href="" wicket:id="delete"><span
wicked:id="deleteLabel"/></a></td>
+ <td><a href="" wicket:id="edit"><span
wicket:id="editLabel"/></a></td>
+ <td> <a href="" wicket:id="delete"><span
wicket:id="deleteLabel"/></a></td>
</tr>
</table>
</span>
<input type="button" wicket:id="new" value="New" />
<div wicket:id="modalwindow">[modal window goes here]</div>
+ <form wicket:id="excludeForm"></form>
</wicket:panel>
-</html>
+</html>
\ No newline at end of file
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuSeparatorPanel.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuSeparatorPanel.html
Mon Apr 27 11:19:47 2009
@@ -25,7 +25,7 @@
<thead>
<tr>
<th
class="portlet-section-header"><span wicket:id="textLabel"/></th>
- <th
class="portlet-section-header">Title</th>
+ <th
class="portlet-section-header"><span wicket:id="titleLabel"/></th>
<th> </th>
<th> </th>
</tr>
@@ -33,12 +33,13 @@
<tr class="even" wicket:id="separator">
<td><span wicket:id="text" /></td>
<td><span wicket:id="title" /></td>
- <td><a href="" wicket:id="edit">Edit</a></td>
- <td> <a href=""
wicket:id="delete">Delete</a></td>
+ <td><a href="" wicket:id="edit"><span
wicket:id="editLabel"/></a></td>
+ <td> <a href="" wicket:id="delete"><span
wicket:id="deleteLabel"/></a></td>
</tr>
</table>
</span>
<input type="button" wicket:id="new"/>
- <div wicket:id="modalwindow">[modal window goes here]</div>
+ <div wicket:id="modalwindow">[modal window goes here]</div>
+ <form wicket:id="sepForm"></form>
</wicket:panel>
</html>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MenuTabPanel.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MenuTabPanel.html
Mon Apr 27 11:19:47 2009
@@ -27,10 +27,11 @@
<td><span wicket:id="menuTabs"></span></td>
</tr>
<tr>
- <td colspan="2"><input type="submit
"wicket:id="newsave" /> <input type="submit "wicket:id="remove"/></td>
+ <td colspan="2"><input type="button"
wicket:id="newsave" /> <input type="button" wicket:id="remove"></td>
</tr>
</table>
- <div wicket:id="modalwindow">[modal window goes here]</div>
+ <div wicket:id="modalwindow">[modal window goes here]</div>
+ <form wicket:id="menuForm"></form>
</wicket:panel>
</html>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataTab.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
Mon Apr 27 11:19:47 2009
@@ -41,7 +41,9 @@
</tr>
</table>
</span>
- <input type="button" wicket:id="new" />
- <div wicket:id="modalwindow">[modal window goes here]</div>
+ <input type="button" wicket:id="new">
+ <div wicket:id="modalwindow">[modal window goes here]</div>
+ <form wicket:id="metaForm">
+ </form>
</wicket:panel>
</html>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24SecurityTab.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
Mon Apr 27 11:19:47 2009
@@ -41,6 +41,8 @@
</table>
</span>
<input type="button" wicket:id="new"/>
- <div wicket:id="modalwindow">[modal window goes here]</div>
+ <div wicket:id="modalwindow">[modal window goes here]</div>
+ <form wicket:id="securityFrom">
+ </form>
</wicket:panel>
</html>
\ No newline at end of file
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24SeparatorWindow.html?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SeparatorWindow.html
Mon Apr 27 11:19:47 2009
@@ -24,7 +24,7 @@
<form wicket:id="separatorDataForm">
<table>
<tr>
- <td><span wicket:id="textLabel" /></td>
+ <td><span wicket:id="nameLabel" /></td>
<td><input type="text
"wicket:id="separatorText" /></td>
</tr>
<tr>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
Mon Apr 27 11:19:47 2009
@@ -138,7 +138,7 @@
// session
protected final static String SESSION_FOLDERS =
"jetspeed.site.manager.folders";
-
+
protected final static String SESSION_ROOT = "jetspeed.site.manager.root";
// context
@@ -438,23 +438,22 @@
defaultPageField.setVisibilityAllowed(true);
final ModalWindow metaDataModalWindow;
add(metaDataModalWindow = new ModalWindow("modalwindow"));
- AjaxLink addFolder = new AjaxLink("addFolder",new
ResourceModel("add.subfolder"))
+
+ AjaxButton addFolder = new AjaxButton("addFolder",new
ResourceModel("add.subfolder"),infoForm)
{
-
@Override
- public void onClick(AjaxRequestTarget target)
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- metaDataModalWindow.setContent(new AddFolderPanel(
- metaDataModalWindow.getContentId()));
+ metaDataModalWindow.setContent(new
AddFolderPanel(metaDataModalWindow.getContentId()));
metaDataModalWindow.show(target);
}
};
add(addFolder);
- AjaxLink addPage = new AjaxLink("addPage",new
ResourceModel("add.Page"))
+
+ AjaxButton addPage = new AjaxButton("addPage",new
ResourceModel("add.page"),infoForm)
{
-
@Override
- public void onClick(AjaxRequestTarget target)
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
metaDataModalWindow.setContent(new AddPagePanel(
metaDataModalWindow.getContentId()));
@@ -462,18 +461,18 @@
}
};
add(addPage);
- AjaxLink addLink = new AjaxLink("addLink",new
ResourceModel("add.link"))
+
+ AjaxButton addLink = new AjaxButton("addLink",new
ResourceModel("add.link"),infoForm)
{
-
@Override
- public void onClick(AjaxRequestTarget target)
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
- metaDataModalWindow.setContent(new AddLinkPanel(
- metaDataModalWindow.getContentId()));
+ metaDataModalWindow.setContent(new
AddLinkPanel(metaDataModalWindow.getContentId()));
metaDataModalWindow.show(target);
}
};
add(addLink);
+
addFolder.setVisibilityAllowed(true);
addPage.setVisibilityAllowed(true);
addLink.setVisibilityAllowed(true);
@@ -600,7 +599,7 @@
"basePanel");
ajaxPanel.setOutputMarkupId(true);
ajaxPanel.add(new Label("constraintLabel",new
ResourceModel("security.constraint.title")));
- ajaxPanel.add(new Label("constraintTypeLabel",new
ResourceModel("ecurity.type.title")));
+ ajaxPanel.add(new Label("constraintTypeLabel",new
ResourceModel("security.type.title")));
ajaxPanel.add(new ListView("metaData", new PropertyModel(this,
"document.securityConstraints"))
@@ -645,7 +644,8 @@
listItem.add(deleteLink);
}
});
- add(new AjaxButton("new",new ResourceModel("common.new"))
+ Form securityForm = new Form("securityFrom");
+ add(new AjaxButton("new",new
ResourceModel("common.new"),securityForm)
{
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
@@ -656,6 +656,7 @@
}
});
add(ajaxPanel);
+ add(securityForm);
}
}
@@ -730,18 +731,19 @@
metaDataListView.setOutputMarkupId(true);
ajaxPanel.setOutputMarkupId(true);
ajaxPanel.add(metaDataListView);
- add(new AjaxLink("new", new ResourceModel("common.new"))
+ Form metaForm = new Form("metaForm");
+ add(metaForm);
+ add(new AjaxButton("new",new ResourceModel("common.new"),metaForm)
{
-
@Override
- public void onClick(AjaxRequestTarget target)
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
metaDataModalWindow
- .setContent(new MetaDataPanel(metaDataModalWindow
- .getContentId(),
- new JetspeedDocumentMetaData("", "", ""),
- ajaxPanel));
- metaDataModalWindow.show(target);
+ .setContent(new MetaDataPanel(metaDataModalWindow
+ .getContentId(),
+ new JetspeedDocumentMetaData("", "", ""),
+ ajaxPanel));
+ metaDataModalWindow.show(target);
}
});
add(ajaxPanel);
@@ -855,7 +857,7 @@
menuform.add(new Label("pathLabel",new
ResourceModel("menu.path")));
menuform.add(new CheckBox("regExpField", new PropertyModel(this,
"optionsDefinition.regexp")));
- menuform.add(new Label("regExpLabel",new
ResourceModel("meni.regExp")));
+ menuform.add(new Label("regExpLabel",new
ResourceModel("menu.regExp")));
menuform.add(new TextField("profileField", new PropertyModel(this,
"optionsDefinition.profile")));
menuform.add(new Label("profileLabel",new
ResourceModel("menu.profile")));
@@ -942,7 +944,7 @@
new PropertyModel(this, "menuDef.order"));
menuform.add(new Label("orderLabel",new
ResourceModel("menu.order")));
menuform.add(orderField);
- menuform.add(new AjaxButton("save", menuform)
+ menuform.add(new AjaxButton("save",new
ResourceModel("common.save"), menuform)
{
@Override
@@ -1565,7 +1567,9 @@
menuTree.getTreeState().expandNode(rootNode);
menuTree.setRootLess(true);
add(menuTree);
- add(new AjaxButton("newsave",new ResourceModel("add.menu"))
+ Form menuForm = new Form("menuForm");
+ add(menuForm);
+ add(new AjaxButton("newsave",new
ResourceModel("add.menu"),menuForm)
{
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
@@ -1573,19 +1577,17 @@
MenuDefinition def = null;
if (getNodeType().equals(FOLDER_NODE_TYPE))
{
- def = getServiceLocator().getPageManager()
- .newFolderMenuDefinition();
- } else
+ def =
getServiceLocator().getPageManager().newFolderMenuDefinition();
+ }
+ else
{
- def = getServiceLocator().getPageManager()
- .newPageMenuDefinition();
+ def =
getServiceLocator().getPageManager().newPageMenuDefinition();
}
- metaDataModalWindow.setContent(new MenuWindow(
- metaDataModalWindow.getContentId(), def,
menusTab));
+ metaDataModalWindow.setContent(new
MenuWindow(metaDataModalWindow.getContentId(), def, menusTab));
metaDataModalWindow.show(target);
}
});
- AjaxButton removeLink = new AjaxButton("remove",new
ResourceModel("common.remove"))
+ add(new AjaxButton("remove",new
ResourceModel("common.remove"),menuForm)
{
@Override
@@ -1602,10 +1604,7 @@
target.addComponent(menuTree);
target.addComponent(tabPanel);
}
- };
- removeLink.add(new JavascriptEventConfirmation("onclick",
- "are you sure?"));
- add(removeLink);
+ }.add(new JavascriptEventConfirmation("onclick","are you sure?")));
add(menusTab);
}
@@ -1715,6 +1714,8 @@
final WebMarkupContainer ajaxPanel = new WebMarkupContainer(
"basePanel");
ajaxPanel.setOutputMarkupId(true);
+ ajaxPanel.add(new Label("textLabel",new
ResourceModel("menu.text")));
+ ajaxPanel.add(new Label("titleLabel",new
ResourceModel("menu.title")));
ajaxPanel.add(new ListView("separator", new PropertyModel(this,
"menuOptions"))
{
@@ -1725,7 +1726,7 @@
.getModelObject();
listItem.add(new Label("text", separator.getText()));
listItem.add(new Label("title", separator.getTitle()));
- listItem.add(new AjaxLink("edit")
+ AjaxLink editLink = new AjaxLink("edit")
{
@Override
@@ -1736,8 +1737,10 @@
separator, ajaxPanel));
metaDataModalWindow.show(target);
}
- });
- listItem.add(new AjaxLink("delete")
+ };
+ editLink.add(new Label("editLabel",new
ResourceModel("common.edit")));
+ listItem.add(editLink);
+ AjaxLink deleteLink = new AjaxLink("delete")
{
@Override
@@ -1745,16 +1748,19 @@
{
menuActions(REMOVE_ACTION, def, separator, null);
target.addComponent(ajaxPanel);
- }
- }.add(new JavascriptEventConfirmation("onclick",
- "are you sure?")));
+ }
+ };
+ deleteLink.add(new Label("deleteLabel",new
ResourceModel("common.delete")));
+ deleteLink.add(new
JavascriptEventConfirmation("onclick","are you sure?"));
+ listItem.add(deleteLink);
}
});
- add(new AjaxLink("new")
+ Form separtorForm = new Form("sepForm");
+ add(separtorForm);
+ add(new AjaxButton("new",new
ResourceModel("common.new"),separtorForm)
{
-
@Override
- public void onClick(AjaxRequestTarget target)
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
MenuSeparatorDefinition separatorDefinition = null;
if (getUserSelectedNode().getDocType() == FileType.Folder)
@@ -1832,11 +1838,12 @@
listItem.add(deleteLink);
}
});
- add(new AjaxLink("new")
+ Form excludeForm = new Form("excludeForm");
+ add(excludeForm);
+ add(new AjaxButton("new",new
ResourceModel("common.new"),excludeForm)
{
-
@Override
- public void onClick(AjaxRequestTarget target)
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
MenuExcludeDefinition excludeDefinition = null;
if (getUserSelectedNode().getDocType() == FileType.Folder)
@@ -2255,16 +2262,6 @@
new PropertyModel(this, "document.shortTitle"));
infoForm.add(shortTitleField);
infoForm.add(shortTitleLabel);
- infoForm.add(new AjaxLink("close",new
ResourceModel("common.close"))
- {
-
- @Override
- public void onClick(AjaxRequestTarget target)
- {
- ((ModalWindow) AddFolderPanel.this.getParent())
- .close(target);
- }
- });
infoForm.add(new AjaxButton("new",new
ResourceModel("add.subfolder"),infoForm)
{
@@ -2362,15 +2359,6 @@
new PropertyModel(this, "document.hidden"));
infoForm.add(visibleLabel);
infoForm.add(visibleCheckbox);
- infoForm.add(new AjaxLink("close",new
ResourceModel("common.close"))
- {
-
- @Override
- public void onClick(AjaxRequestTarget target)
- {
- ((ModalWindow)
AddPagePanel.this.getParent()).close(target);
- }
- });
infoForm.add(new AjaxButton("new",new
ResourceModel("add.page"),infoForm)
{
@@ -2462,15 +2450,6 @@
new PropertyModel(this, "document.hidden"));
infoForm.add(visibleLabel);
infoForm.add(visibleCheckbox);
- infoForm.add(new AjaxLink("close",new
ResourceModel("common.close"))
- {
-
- @Override
- public void onClick(AjaxRequestTarget target)
- {
- ((ModalWindow)
AddLinkPanel.this.getParent()).close(target);
- }
- });
infoForm.add(new AjaxButton("new",new
ResourceModel("add.link"),infoForm)
{
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/SiteResources.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/SiteResources.properties?rev=768925&r1=768924&r2=768925&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/SiteResources.properties
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/resources/SiteResources.properties
Mon Apr 27 11:19:47 2009
@@ -73,9 +73,11 @@
menu.nest.label=Nest
menu.order=Order
+menu.title=Title
menu.profile=Profile
menu.skin=Skin
menu.regExp=Reg expression
menu.path=Path
menu.depth=Depth
-menu.option=Options
\ No newline at end of file
+menu.option=Options
+menu.text=Text
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
