Author: woonsan
Date: Fri Mar 26 19:07:21 2010
New Revision: 928020
URL: http://svn.apache.org/viewvc?rev=928020&view=rev
Log:
JS2-1163: Arranging action links and buttons.
Modified:
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/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
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=928020&r1=928019&r2=928020&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
Fri Mar 26 19:07:21 2010
@@ -458,7 +458,7 @@ public class PortalSiteManager extends A
metaDataModalWindow.show(target);
}
};
- add(addFolder);
+ infoForm.add(addFolder);
AjaxButton addPage = new AjaxButton("addPage",new
ResourceModel("add.page"),infoForm)
{
@@ -470,7 +470,7 @@ public class PortalSiteManager extends A
metaDataModalWindow.show(target);
}
};
- add(addPage);
+ infoForm.add(addPage);
AjaxButton addLink = new AjaxButton("addLink",new
ResourceModel("add.link"),infoForm)
{
@@ -481,7 +481,7 @@ public class PortalSiteManager extends A
metaDataModalWindow.show(target);
}
};
- add(addLink);
+ infoForm.add(addLink);
addFolder.setVisibilityAllowed(true);
addPage.setVisibilityAllowed(true);
@@ -561,8 +561,7 @@ public class PortalSiteManager extends A
excuteAction(getDocument(), SAVE_ACTION);
}
});
- add(infoForm);
- add(new AjaxButton("copy",new
ResourceModel("common.copy"),infoForm)
+ infoForm.add(new AjaxButton("copy",new
ResourceModel("common.copy"),infoForm)
{
@Override
@@ -577,7 +576,7 @@ public class PortalSiteManager extends A
metaDataModalWindow.show(target);
}
});
- add(new AjaxButton("move",new
ResourceModel("common.move"),infoForm)
+ infoForm.add(new AjaxButton("move",new
ResourceModel("common.move"),infoForm)
{
@Override
@@ -592,6 +591,7 @@ public class PortalSiteManager extends A
metaDataModalWindow.show(target);
}
});
+ add(infoForm);
}
}
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager%24InformationTab.html?rev=928020&r1=928019&r2=928020&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
Fri Mar 26 19:07:21 2010
@@ -71,20 +71,15 @@
<td class="portlet-section-header"
wicket:id="visible"></td>
<td class="portlet-section-body"><input type="checkbox"
wicket:id="visibleCheck" /></td>
</tr>
- <tr>
- <td class="portlet-section-header"><a wicket:id="view"
></a> </td>
- <td colspan="2" class="portlet-section-body"><input
type="button" wicket:id="remove" /> <input type="button" wicket:id="save"
/></td>
- </tr>
-
</table>
-</form>
<div>
- <br/>
- <input type="button" wicket:id="addFolder"/> <input
type="button" wicket:id="addPage"/> <input type="button"
wicket:id="addLink"/>
<br/>
- <br/>
- <input type="button" wicket:id="copy" /> <input
type="button" wicket:id="move" />
+ <a wicket:id="view" ></a> <input type="button"
wicket:id="save" /> <input type="button" wicket:id="copy" /> <input
type="button" wicket:id="move" /> <input type="button" wicket:id="remove"
/>
+ <br/>
+ <br/>
+ <input type="button" wicket:id="addFolder"/> <input
type="button" wicket:id="addPage"/> <input type="button"
wicket:id="addLink"/>
</div>
+</form>
<div wicket:id="modalwindow"></div>
</wicket:panel>
</html>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
