You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/02/22 18:10:14 UTC
svn commit: r1449136 - in /syncope/trunk: ./
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/console/pages/panels/
console/src/main/resources/org/apache/syncope/console/pages/
console/src/main/resources/...
Author: ilgrosso
Date: Fri Feb 22 17:10:14 2013
New Revision: 1449136
URL: http://svn.apache.org/r1449136
Log:
Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.html
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1447609-1449127
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java Fri Feb 22 17:10:14 2013
@@ -95,13 +95,13 @@ public class MembershipModalPage extends
//--------------------------------
// Derived attributes container
//--------------------------------
- form.add(new DerivedAttributesPanel("derivedAttributes", membershipTO, pageRef));
+ form.add(new DerivedAttributesPanel("derivedAttributes", membershipTO));
//--------------------------------
//--------------------------------
// Virtual attributes container
//--------------------------------
- form.add(new VirtualAttributesPanel("virtualAttributes", membershipTO, templateMode, pageRef));
+ form.add(new VirtualAttributesPanel("virtualAttributes", membershipTO, templateMode));
//--------------------------------
add(form);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java Fri Feb 22 17:10:14 2013
@@ -92,7 +92,7 @@ public class RoleModalPage extends BaseM
form.setModel(new CompoundPropertyModel(roleTO));
- this.rolePanel = new RolePanel("rolePanel", form, roleTO, mode, pageRef);
+ this.rolePanel = new RolePanel("rolePanel", form, roleTO, mode);
form.add(rolePanel);
final AjaxButton submit = new ClearIndicatingAjaxButton("submit", new ResourceModel("submit"), pageRef) {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Fri Feb 22 17:10:14 2013
@@ -122,13 +122,13 @@ public abstract class UserModalPage exte
//--------------------------------
// Derived attributes panel
//--------------------------------
- form.add(new DerivedAttributesPanel("derivedAttributes", userTO, pageRef));
+ form.add(new DerivedAttributesPanel("derivedAttributes", userTO));
//--------------------------------
//--------------------------------
// Virtual attributes panel
//--------------------------------
- form.add(new VirtualAttributesPanel("virtualAttributes", userTO, mode == Mode.TEMPLATE, pageRef));
+ form.add(new VirtualAttributesPanel("virtualAttributes", userTO, mode == Mode.TEMPLATE));
//--------------------------------
//--------------------------------
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java Fri Feb 22 17:10:14 2013
@@ -27,7 +27,6 @@ import org.apache.syncope.common.types.A
import org.apache.syncope.console.rest.SchemaRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox;
import org.apache.wicket.Component;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -63,9 +62,7 @@ public class DerivedAttributesPanel exte
@SpringBean
private SchemaRestClient schemaRestClient;
- public <T extends AbstractAttributableTO> DerivedAttributesPanel(final String id, final T entityTO,
- final PageReference pageRef) {
-
+ public <T extends AbstractAttributableTO> DerivedAttributesPanel(final String id, final T entityTO) {
super(id);
setOutputMarkupId(true);
@@ -90,8 +87,7 @@ public class DerivedAttributesPanel exte
attributesContainer.setOutputMarkupId(true);
add(attributesContainer);
- AjaxButton addAttributeBtn = new IndicatingAjaxButton("addAttributeBtn",
- new ResourceModel("addAttributeBtn")) {
+ AjaxButton addAttributeBtn = new IndicatingAjaxButton("addAttributeBtn", new ResourceModel("addAttributeBtn")) {
private static final long serialVersionUID = -4804368561204623354L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java Fri Feb 22 17:10:14 2013
@@ -23,7 +23,6 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.pages.RoleModalPage;
import org.apache.syncope.console.rest.AuthRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
-import org.apache.wicket.PageReference;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
@@ -40,9 +39,7 @@ public class RolePanel extends Panel {
private final Palette<String> entitlementsPalette;
- public RolePanel(final String id, final Form form, final RoleTO roleTO, final RoleModalPage.Mode mode,
- final PageReference pageRef) {
-
+ public RolePanel(final String id, final Form form, final RoleTO roleTO, final RoleModalPage.Mode mode) {
super(id);
this.add(new RoleDetailsPanel("details", roleTO, form, mode == RoleModalPage.Mode.TEMPLATE));
@@ -60,7 +57,7 @@ public class RolePanel extends Panel {
//--------------------------------
// Derived attributes container
//--------------------------------
- this.add(new DerivedAttributesPanel("derivedAttributes", roleTO, pageRef));
+ this.add(new DerivedAttributesPanel("derivedAttributes", roleTO));
final AjaxCheckBoxPanel inhDerivedAttributes = new AjaxCheckBoxPanel("inheritDerivedAttributes",
"inheritDerivedAttributes", new PropertyModel<Boolean>(roleTO, "inheritDerivedAttributes"));
@@ -72,7 +69,7 @@ public class RolePanel extends Panel {
//--------------------------------
// Virtual attributes container
//--------------------------------
- this.add(new VirtualAttributesPanel("virtualAttributes", roleTO, mode == RoleModalPage.Mode.TEMPLATE, pageRef));
+ this.add(new VirtualAttributesPanel("virtualAttributes", roleTO, mode == RoleModalPage.Mode.TEMPLATE));
final AjaxCheckBoxPanel inhVirtualAttributes = new AjaxCheckBoxPanel("inheritVirtualAttributes",
"inheritVirtualAttributes", new PropertyModel<Boolean>(roleTO, "inheritVirtualAttributes"));
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java Fri Feb 22 17:10:14 2013
@@ -59,7 +59,7 @@ public class RoleTabPanel extends Panel
form.setModel(new CompoundPropertyModel(roleTO));
form.setOutputMarkupId(true);
- final RolePanel rolePanel = new RolePanel("rolePanel", form, roleTO, RoleModalPage.Mode.ADMIN, pageRef);
+ final RolePanel rolePanel = new RolePanel("rolePanel", form, roleTO, RoleModalPage.Mode.ADMIN);
rolePanel.setEnabled(false);
form.add(rolePanel);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java Fri Feb 22 17:10:14 2013
@@ -33,7 +33,6 @@ import org.apache.syncope.console.wicket
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
import org.apache.wicket.Component;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -62,7 +61,7 @@ public class VirtualAttributesPanel exte
private SchemaRestClient schemaRestClient;
public <T extends AbstractAttributableTO> VirtualAttributesPanel(final String id, final T entityTO,
- final boolean templateMode, final PageReference pageRef) {
+ final boolean templateMode) {
super(id);
@@ -71,28 +70,28 @@ public class VirtualAttributesPanel exte
final IModel<Map<String, VirtualSchemaTO>> schemas =
new LoadableDetachableModel<Map<String, VirtualSchemaTO>>() {
- private static final long serialVersionUID = -5489981430516587774L;
+ private static final long serialVersionUID = -5489981430516587774L;
- @Override
- protected Map<String, VirtualSchemaTO> load() {
- final List<VirtualSchemaTO> schemaTOs;
- if (entityTO instanceof RoleTO) {
- schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.ROLE);
- } else if (entityTO instanceof UserTO) {
- schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.USER);
- } else {
- schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.MEMBERSHIP);
- }
+ @Override
+ protected Map<String, VirtualSchemaTO> load() {
+ final List<VirtualSchemaTO> schemaTOs;
+ if (entityTO instanceof RoleTO) {
+ schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.ROLE);
+ } else if (entityTO instanceof UserTO) {
+ schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.USER);
+ } else {
+ schemaTOs = schemaRestClient.getVirtualSchemas(AttributableType.MEMBERSHIP);
+ }
- final Map<String, VirtualSchemaTO> schemas = new HashMap<String, VirtualSchemaTO>();
+ final Map<String, VirtualSchemaTO> schemas = new HashMap<String, VirtualSchemaTO>();
- for (VirtualSchemaTO schemaTO : schemaTOs) {
- schemas.put(schemaTO.getName(), schemaTO);
- }
+ for (VirtualSchemaTO schemaTO : schemaTOs) {
+ schemas.put(schemaTO.getName(), schemaTO);
+ }
- return schemas;
- }
- };
+ return schemas;
+ }
+ };
final List<String> virtualSchemaNames = new ArrayList<String>(schemas.getObject().keySet());
@@ -101,8 +100,7 @@ public class VirtualAttributesPanel exte
attributesContainer.setOutputMarkupId(true);
add(attributesContainer);
- AjaxButton addAttributeBtn = new IndicatingAjaxButton("addAttributeBtn",
- new ResourceModel("addAttributeBtn")) {
+ AjaxButton addAttributeBtn = new IndicatingAjaxButton("addAttributeBtn", new ResourceModel("addAttributeBtn")) {
private static final long serialVersionUID = -4804368561204623354L;
@@ -184,17 +182,17 @@ public class VirtualAttributesPanel exte
new PropertyModel<String>(attributeTO, "schema"), virtualSchemaNames,
new ChoiceRenderer<String>() {
- private static final long serialVersionUID = 3109256773218160485L;
+ private static final long serialVersionUID = 3109256773218160485L;
- @Override
- public Object getDisplayValue(final String object) {
- final StringBuilder text = new StringBuilder(object);
- if (templateMode) {
- text.append(" (JEXL)");
- }
- return text.toString();
- }
- });
+ @Override
+ public Object getDisplayValue(final String object) {
+ final StringBuilder text = new StringBuilder(object);
+ if (templateMode) {
+ text.append(" (JEXL)");
+ }
+ return text.toString();
+ }
+ });
schemaChoice.add(new AjaxFormComponentUpdatingBehavior("onblur") {
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.html?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.html Fri Feb 22 17:10:14 2013
@@ -17,36 +17,36 @@ specific language governing permissions
under the License.
-->
<wicket:extend>
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
+ <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
<form wicket:id="MembershipForm">
- <div id="tabs">
- <ul>
- <li><a href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li>
- <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
- <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
- </ul>
- <div id="tabs-1">
- <div id="formtable">
- <span wicket:id="attributes">[membership attributes]</span>
- </div>
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li>
+ <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
+ <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
+ </ul>
+ <div id="tabs-1">
+ <div id="formtable">
+ <span wicket:id="attributes">[membership attributes]</span>
+ </div>
- <script type="text/javascript">
- $(function() {
- $('#formtable div.tablerow:even').addClass("alt");
- });
- </script>
- </div>
- <div id="tabs-2">
- <span wicket:id="derivedAttributes">[membership derived attributes]</span>
- </div>
-
- <div id="tabs-3">
- <span wicket:id="virtualAttributes">[membership virtual attributes]</span>
- </div>
+ <script type="text/javascript">
+ $(function() {
+ $('#formtable div.tablerow:even').addClass("alt");
+ });
+ </script>
+ </div>
+ <div id="tabs-2">
+ <span wicket:id="derivedAttributes">[membership derived attributes]</span>
</div>
- <div style="margin: 20px 10px 0">
- <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="submit"/>
- <input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="cancel"/>
+
+ <div id="tabs-3">
+ <span wicket:id="virtualAttributes">[membership virtual attributes]</span>
</div>
+ </div>
+ <div style="margin: 20px 10px 0">
+ <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="submit"/>
+ <input type="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="cancel"/>
+ </div>
</form>
</wicket:extend>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html Fri Feb 22 17:10:14 2013
@@ -16,45 +16,43 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html>
- <wicket:panel>
- <table class="ui-widget ui-widget-content ui-corner-all"
- style="font-size: 1em;margin-top:2px;"
- width="100%" cellpadding="2px" cellspacing="1px">
- <thead>
- <tr class="ui-widget-header">
- <th><wicket:message key="derivedAttributeToBeRemoved"/></th>
- <th><wicket:message key="derivedAttributeName"/></th>
- <th><wicket:message key="derivedAttributeValue"/></th>
- </tr>
- </thead>
+<wicket:panel>
+ <table class="ui-widget ui-widget-content ui-corner-all"
+ style="font-size: 1em;margin-top:2px;"
+ width="100%" cellpadding="2px" cellspacing="1px">
+ <thead>
+ <tr class="ui-widget-header">
+ <th><wicket:message key="derivedAttributeToBeRemoved"/></th>
+ <th><wicket:message key="derivedAttributeName"/></th>
+ <th><wicket:message key="derivedAttributeValue"/></th>
+ </tr>
+ </thead>
- <tfoot>
- <tr>
- <td>
- <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="addAttributeBtn" />
- </td>
- </tr>
- </tfoot>
+ <tfoot>
+ <tr>
+ <td>
+ <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="addAttributeBtn" />
+ </td>
+ </tr>
+ </tfoot>
- <tbody wicket:id="derAttrContainer">
- <tr wicket:id="attributes">
- <td align="center" valign="middle">
- <input type="checkbox" class="text ui-widget-content ui-corner-all" wicket:id="toRemove"/>
- </td>
+ <tbody wicket:id="derAttrContainer">
+ <tr wicket:id="attributes">
+ <td align="center" valign="middle">
+ <input type="checkbox" class="text ui-widget-content ui-corner-all" wicket:id="toRemove"/>
+ </td>
- <td>
- <select class="text ui-widget-content ui-corner-all"
- style="width:100%" wicket:id="schema"/>
- </td>
+ <td>
+ <select class="text ui-widget-content ui-corner-all"
+ style="width:100%" wicket:id="schema"/>
+ </td>
- <td align="center" valign="middle">
- <input type="text"
- style="width:100%" wicket:id="value"/>
- </td>
- </tr>
- </tbody>
- </table>
- </wicket:panel>
-</html>
+ <td align="center" valign="middle">
+ <input type="text"
+ style="width:100%" wicket:id="value"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.html?rev=1449136&r1=1449135&r2=1449136&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.html Fri Feb 22 17:10:14 2013
@@ -16,45 +16,43 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html>
- <wicket:panel>
- <table class="ui-widget ui-widget-content ui-corner-all"
- style="font-size: 1em;margin-top:2px;"
- width="100%" cellpadding="2px" cellspacing="1px">
- <thead>
- <tr class="ui-widget-header">
- <th><wicket:message key="virtualAttributeToBeRemoved"/></th>
- <th><wicket:message key="virtualAttributeName"/></th>
- <th><wicket:message key="virtualAttributeValue"/></th>
- </tr>
- </thead>
+<wicket:panel>
+ <table class="ui-widget ui-widget-content ui-corner-all"
+ style="font-size: 1em;margin-top:2px;"
+ width="100%" cellpadding="2px" cellspacing="1px">
+ <thead>
+ <tr class="ui-widget-header">
+ <th><wicket:message key="virtualAttributeToBeRemoved"/></th>
+ <th><wicket:message key="virtualAttributeName"/></th>
+ <th><wicket:message key="virtualAttributeValue"/></th>
+ </tr>
+ </thead>
- <tfoot>
- <tr>
- <td>
- <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="addAttributeBtn" />
- </td>
- </tr>
- </tfoot>
+ <tfoot>
+ <tr>
+ <td>
+ <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="addAttributeBtn" />
+ </td>
+ </tr>
+ </tfoot>
- <tbody wicket:id="virAttrContainer">
- <tr wicket:id="attributes">
- <td align="center" valign="top">
- <input type="checkbox" class="text ui-widget-content ui-corner-all" wicket:id="toRemove"/>
- </td>
+ <tbody wicket:id="virAttrContainer">
+ <tr wicket:id="attributes">
+ <td align="center" valign="top">
+ <input type="checkbox" class="text ui-widget-content ui-corner-all" wicket:id="toRemove"/>
+ </td>
- <td align="center" valign="top">
- <select class="text ui-widget-content ui-corner-all"
- style="width:100%" wicket:id="schema"/>
- </td>
+ <td align="center" valign="top">
+ <select class="text ui-widget-content ui-corner-all"
+ style="width:100%" wicket:id="schema"/>
+ </td>
- <td align="center " valign="top">
- <span wicket:id="values" style="text-align:left;display:block;width:95%">[values]</span>
- </td>
+ <td align="center " valign="top">
+ <span wicket:id="values" style="text-align:left;display:block;width:95%">[values]</span>
+ </td>
- </tr>
- </tbody>
- </table>
- </wicket:panel>
-</html>
+ </tr>
+ </tbody>
+ </table>
+</wicket:panel>