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/04/03 12:13:42 UTC
svn commit: r1463905 - in /syncope/trunk/console/src/main:
java/org/apache/syncope/console/pages/
java/org/apache/syncope/console/pages/panels/
resources/org/apache/syncope/console/pages/
resources/org/apache/syncope/console/pages/panels/ resources/org...
Author: ilgrosso
Date: Wed Apr 3 10:13:41 2013
New Revision: 1463905
URL: http://svn.apache.org/r1463905
Log:
[SYNCOPE_347] Turning onBlur into onChange for intAttrNames
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1463905&r1=1463904&r2=1463905&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java Wed Apr 3 10:13:41 2013
@@ -149,7 +149,6 @@ public class ResourceModalPage extends B
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
-
target.add(feedbackPanel);
}
};
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1463905&r1=1463904&r2=1463905&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Wed Apr 3 10:13:41 2013
@@ -128,6 +128,9 @@ public class ResourceMappingPanel extend
*/
private final ResourceTO resourceTO;
+ /**
+ * User / role.
+ */
private final AttributableType attrType;
/**
@@ -162,12 +165,12 @@ public class ResourceMappingPanel extend
/**
* Attribute Mapping Panel.
*
- * @param panelid panel id
+ * @param id panel id
* @param resourceTO external resource
* @param attrType USER / ROLE
*/
- public ResourceMappingPanel(final String panelid, final ResourceTO resourceTO, final AttributableType attrType) {
- super(panelid);
+ public ResourceMappingPanel(final String id, final ResourceTO resourceTO, final AttributableType attrType) {
+ super(id);
setOutputMarkupId(true);
this.resourceTO = resourceTO;
@@ -225,7 +228,7 @@ public class ResourceMappingPanel extend
final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer("jexlHelp");
mappingContainer.add(jexlHelp);
- AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
+ AjaxLink<Void> questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
mappingContainer.add(questionMarkJexlHelp);
add(mappingContainer);
@@ -326,24 +329,34 @@ public class ResourceMappingPanel extend
}
});
- final AjaxDropDownChoicePanel<String> intAttrNames = new AjaxDropDownChoicePanel<String>("intAttrNames",
- getString("intAttrNames"), new PropertyModel<String>(mapItem, "intAttrName"));
+ final AjaxDropDownChoicePanel<String> intAttrNames =
+ new AjaxDropDownChoicePanel<String>("intAttrNames", getString("intAttrNames"),
+ new PropertyModel<String>(mapItem, "intAttrName"), false);
intAttrNames.setChoices(schemaNames);
intAttrNames.setRequired(true);
intAttrNames.setStyleSheet(FIELD_STYLE);
+ intAttrNames.getField().add(new AjaxFormComponentUpdatingBehavior(ON_CHANGE) {
+
+ private static final long serialVersionUID = -1107858522700306810L;
+
+ @Override
+ protected void onUpdate(final AjaxRequestTarget target) {
+ }
+ });
item.add(intAttrNames);
- final AjaxDropDownChoicePanel<IntMappingType> typesPanel =
+ final AjaxDropDownChoicePanel<IntMappingType> intMappingTypes =
new AjaxDropDownChoicePanel<IntMappingType>("intMappingTypes",
new ResourceModel("intMappingTypes", "intMappingTypes").getObject(),
new PropertyModel<IntMappingType>(mapItem, "intMappingType"));
- typesPanel.setRequired(true);
- typesPanel.setChoices(attrTypes);
- typesPanel.setStyleSheet(FIELD_STYLE);
- item.add(typesPanel);
-
- final AjaxDropDownChoicePanel entitiesPanel = new AjaxDropDownChoicePanel("entities",
- new ResourceModel("entities", "entities").getObject(), new Model(entity));
+ intMappingTypes.setRequired(true);
+ intMappingTypes.setChoices(attrTypes);
+ intMappingTypes.setStyleSheet(FIELD_STYLE);
+ item.add(intMappingTypes);
+
+ final AjaxDropDownChoicePanel<AttributableType> entitiesPanel =
+ new AjaxDropDownChoicePanel<AttributableType>("entities",
+ new ResourceModel("entities", "entities").getObject(), new Model<AttributableType>(entity));
entitiesPanel.setChoices(attrType == AttributableType.ROLE
? Collections.<AttributableType>singletonList(AttributableType.ROLE)
: Arrays.asList(AttributableType.values()));
@@ -355,54 +368,54 @@ public class ResourceMappingPanel extend
@Override
protected void onUpdate(final AjaxRequestTarget target) {
attrTypes.clear();
- attrTypes.addAll(getAttributeTypes((AttributableType) entitiesPanel.getModelObject()));
- typesPanel.setChoices(attrTypes);
+ attrTypes.addAll(getAttributeTypes(entitiesPanel.getModelObject()));
+ intMappingTypes.setChoices(attrTypes);
intAttrNames.setChoices(Collections.<String>emptyList());
- target.add(typesPanel.getField());
+ target.add(intMappingTypes.getField());
target.add(intAttrNames.getField());
}
});
item.add(entitiesPanel);
- final FieldPanel extAttrName = new AjaxTextFieldPanel("extAttrName", new ResourceModel("extAttrNames",
- "extAttrNames").getObject(), new PropertyModel<String>(mapItem, "extAttrName"));
- ((AjaxTextFieldPanel) extAttrName).setChoices(schemaNames);
+ final FieldPanel extAttrNames = new AjaxTextFieldPanel("extAttrName",
+ new ResourceModel("extAttrNames", "extAttrNames").getObject(),
+ new PropertyModel<String>(mapItem, "extAttrName"));
+ ((AjaxTextFieldPanel) extAttrNames).setChoices(schemaNames);
boolean required = false;
- if (mapItem != null) {
- boolean accountIdOrPassword = mapItem.isAccountid() || mapItem.isPassword();
- if (!accountIdOrPassword) {
- required = true;
- } else if (accountIdOrPassword && !schemaNames.isEmpty()) {
- ((AjaxTextFieldPanel) extAttrName).setModelObject(null);
- }
+ boolean accountIdOrPassword = mapItem.isAccountid() || mapItem.isPassword();
+ if (accountIdOrPassword) {
+ ((AjaxTextFieldPanel) extAttrNames).setModelObject(null);
+ } else if (!schemaNames.isEmpty()) {
+ required = true;
}
- extAttrName.setRequired(required);
- extAttrName.setEnabled(required);
- extAttrName.setStyleSheet(FIELD_STYLE);
- item.add(extAttrName);
-
- final AjaxTextFieldPanel mandatory = new AjaxTextFieldPanel("mandatoryCondition", new ResourceModel(
- "mandatoryCondition", "mandatoryCondition").getObject(), new PropertyModel(mapItem,
- "mandatoryCondition"));
- mandatory.setChoices(Arrays.asList(new String[]{"true", "false"}));
+ extAttrNames.setRequired(required);
+ extAttrNames.setEnabled(required);
+ extAttrNames.setStyleSheet(FIELD_STYLE);
+ item.add(extAttrNames);
+
+ final AjaxTextFieldPanel mandatory = new AjaxTextFieldPanel("mandatoryCondition",
+ new ResourceModel("mandatoryCondition", "mandatoryCondition").getObject(),
+ new PropertyModel<String>(mapItem, "mandatoryCondition"));
+ mandatory.setChoices(Arrays.asList(new String[] {"true", "false"}));
mandatory.setStyleSheet(SHORT_FIELD_STYLE);
item.add(mandatory);
- final AjaxCheckBoxPanel accountId = new AjaxCheckBoxPanel("accountId", new ResourceModel("accountId",
- "accountId").getObject(), new PropertyModel(mapItem, "accountid"));
+ final AjaxCheckBoxPanel accountId = new AjaxCheckBoxPanel("accountId",
+ new ResourceModel("accountId", "accountId").getObject(),
+ new PropertyModel<Boolean>(mapItem, "accountid"));
accountId.getField().add(new AjaxFormComponentUpdatingBehavior(ON_CHANGE) {
private static final long serialVersionUID = -1107858522700306810L;
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- extAttrName.setEnabled(!accountId.getModelObject() && !mapItem.isPassword());
- extAttrName.setModelObject(null);
- extAttrName.setRequired(!accountId.getModelObject());
- target.add(extAttrName);
+ extAttrNames.setEnabled(!accountId.getModelObject() && !mapItem.isPassword());
+ extAttrNames.setModelObject(null);
+ extAttrNames.setRequired(!accountId.getModelObject());
+ target.add(extAttrNames);
if (accountId.getModelObject()) {
mapItem.setMandatoryCondition("true");
@@ -417,19 +430,20 @@ public class ResourceMappingPanel extend
item.add(accountId);
final AjaxCheckBoxPanel password = new AjaxCheckBoxPanel("password",
- new ResourceModel("password", "password").getObject(), new PropertyModel(mapItem, "password"));
+ new ResourceModel("password", "password").getObject(),
+ new PropertyModel<Boolean>(mapItem, "password"));
password.getField().add(new AjaxFormComponentUpdatingBehavior(ON_CHANGE) {
private static final long serialVersionUID = -1107858522700306810L;
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- extAttrName.setEnabled(!mapItem.isAccountid() && !password.getModelObject());
- extAttrName.setModelObject(null);
- extAttrName.setRequired(!password.getModelObject());
- target.add(extAttrName);
+ extAttrNames.setEnabled(!mapItem.isAccountid() && !password.getModelObject());
+ extAttrNames.setModelObject(null);
+ extAttrNames.setRequired(!password.getModelObject());
+ target.add(extAttrNames);
- setAccountId((IntMappingType) typesPanel.getModelObject(), accountId, password);
+ setAccountId(intMappingTypes.getModelObject(), accountId, password);
target.add(accountId);
}
});
@@ -438,33 +452,35 @@ public class ResourceMappingPanel extend
password.setVisible(false);
}
- final AjaxDropDownChoicePanel purpose = new AjaxDropDownChoicePanel<String>(
- "purpose",
+ final AjaxDropDownChoicePanel<MappingPurpose> purpose =
+ new AjaxDropDownChoicePanel<MappingPurpose>("purpose",
new ResourceModel("purpose", "purpose").getObject(),
- new PropertyModel(mapItem, "purpose"),
+ new PropertyModel<MappingPurpose>(mapItem, "purpose"),
false);
- ((AjaxDropDownChoicePanel) purpose).setChoices(Arrays.asList(MappingPurpose.values()));
+ purpose.setChoices(Arrays.asList(MappingPurpose.values()));
purpose.setStyleSheet(FIELD_STYLE);
purpose.setRequired(true);
purpose.getField().add(new AjaxFormComponentUpdatingBehavior(ON_CHANGE) {
+ private static final long serialVersionUID = -1107858522700306810L;
+
@Override
- protected void onUpdate(AjaxRequestTarget art) {
+ protected void onUpdate(final AjaxRequestTarget target) {
}
});
item.add(purpose);
- typesPanel.getField().add(new AjaxFormComponentUpdatingBehavior(ON_CHANGE) {
+ intMappingTypes.getField().add(new AjaxFormComponentUpdatingBehavior(ON_CHANGE) {
private static final long serialVersionUID = -1107858522700306810L;
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- setAttrNames((IntMappingType) typesPanel.getModelObject(), intAttrNames);
+ setAttrNames(intMappingTypes.getModelObject(), intAttrNames);
target.add(intAttrNames);
- setAccountId((IntMappingType) typesPanel.getModelObject(), accountId, password);
+ setAccountId(intMappingTypes.getModelObject(), accountId, password);
target.add(accountId);
}
});
@@ -535,20 +551,18 @@ public class ResourceMappingPanel extend
}
/**
- * Set attribute names for a drop down chice list.
+ * Set attribute names for a drop down choice list.
*
* @param type attribute type.
* @param toBeUpdated drop down choice to be updated.
*/
- private void setAttrNames(final IntMappingType type, final AjaxDropDownChoicePanel toBeUpdated) {
-
+ private void setAttrNames(final IntMappingType type, final AjaxDropDownChoicePanel<String> toBeUpdated) {
toBeUpdated.setRequired(true);
toBeUpdated.setEnabled(true);
if (type == null || type.getAttributableType() == null) {
- toBeUpdated.setChoices(Collections.emptyList());
+ toBeUpdated.setChoices(Collections.<String>emptyList());
} else {
-
switch (type) {
// user attribute names
case UserSchema:
@@ -577,7 +591,7 @@ public class ResourceMappingPanel extend
default:
toBeUpdated.setRequired(false);
toBeUpdated.setEnabled(false);
- toBeUpdated.setChoices(Collections.emptyList());
+ toBeUpdated.setChoices(Collections.<String>emptyList());
}
}
}
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html?rev=1463905&r1=1463904&r2=1463905&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html Wed Apr 3 10:13:41 2013
@@ -16,46 +16,48 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:extend>
- <div style="margin:10px">
- <p class="ui-widget ui-corner-all ui-widget-header">
- <span wicket:id="new"/> <wicket:message key="title"/> <span wicket:id="name"/>
- </p>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:extend>
+ <div style="margin:10px">
+ <p class="ui-widget ui-corner-all ui-widget-header">
+ <span wicket:id="new"/> <wicket:message key="title"/> <span wicket:id="name"/>
+ </p>
- <form wicket:id="form">
- <div id="tabs">
- <ul>
- <li class="tabs-selected"><a href="#resource"><span><wicket:message key="resource"/></span></a></li>
- <li><a href="#umapping"><span><wicket:message key="umapping"/></span></a></li>
- <li><a href="#rmapping"><span><wicket:message key="rmapping"/></span></a></li>
- <li><a href="#connectorProperties"><span><wicket:message key="connectorProperties"/></span></a></li>
- <li><a href="#security"><span><wicket:message key="security"/></span></a></li>
- </ul>
- <div id="resource">
- <span wicket:id="details">[details]</span>
+ <form wicket:id="form">
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected"><a href="#resource"><span><wicket:message key="resource"/></span></a></li>
+ <li><a href="#umapping"><span><wicket:message key="umapping"/></span></a></li>
+ <li><a href="#rmapping"><span><wicket:message key="rmapping"/></span></a></li>
+ <li><a href="#connectorProperties"><span><wicket:message key="connectorProperties"/></span></a></li>
+ <li><a href="#security"><span><wicket:message key="security"/></span></a></li>
+ </ul>
+ <div id="resource">
+ <span wicket:id="details">[details]</span>
+ </div>
+ <div id="umapping">
+ <span wicket:id="umapping">[umapping]</span>
+ </div>
+ <div id="rmapping">
+ <span wicket:id="rmapping">[rmapping]</span>
+ </div>
+ <div id="connectorProperties">
+ <span wicket:id="connconf">[connconf]</span>
+ </div>
+ <div id="security">
+ <span wicket:id="security">[security]</span>
+ </div>
</div>
- <div id="umapping">
- <span wicket:id="umapping">[umapping]</span>
- </div>
- <div id="rmapping">
- <span wicket:id="rmapping">[rmapping]</span>
- </div>
- <div id="connectorProperties">
- <span wicket:id="connconf">[connconf]</span>
- </div>
- <div id="security">
- <span wicket:id="security">[security]</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="apply"/>
- <input type="button"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="cancel"/>
- </div>
- </form>
- </div>
-</wicket:extend>
+ <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="apply"/>
+ <input type="button"
+ class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="cancel"/>
+ </div>
+ </form>
+ </div>
+ </wicket:extend>
+</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html?rev=1463905&r1=1463904&r2=1463905&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceMappingPanel.html Wed Apr 3 10:13:41 2013
@@ -16,106 +16,108 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:panel>
- <div>
- <table id="mappings"
- class="ui-widget ui-widget-content ui-corner-all"
- style="font-size: 1em;margin-top:2px;"
- width="100%" cellpadding="2px" cellspacing="1px"
- wicket:id="mappingContainer">
- <thead>
- <tr class="ui-widget-header">
- <th><wicket:message key="delete"/></th>
- <th><wicket:message key="entity"/></th>
- <th><wicket:message key="intMappingTypes"/></th>
- <th><wicket:message key="intAttrNames"/></th>
- <th><wicket:message key="extAttrNames"/></th>
- <th><wicket:message key="mandatoryCondition"/>
- <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help">?</a>
- <div wicket:id="jexlHelp" class="help tooltip"
- style="position: fixed; left: 640px; top: 115px; text-align: left; opacity: 0.9; font-size: 10px;">
- <wicket:message key="jexl_info"/>
- <ul>
- <li><wicket:message key="jexl_ex1"/></li>
- <li><wicket:message key="jexl_ex2"/></li>
- </ul>
- <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
- </div>
- </th>
- <th><wicket:message key="accountId"/></th>
- <th><label wicket:id="passwordLabel"/></th>
- <th><wicket:message key="purpose"/></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td colspan="7" style="padding: 5px">
- <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="addMappingBtn" />
- </td>
- </tr>
- </tfoot>
- <tbody>
- <tr wicket:id="mappings" class="tablerow">
- <td align="center" valign="middle">
- <input type="checkbox" class="text ui-widget-content ui-corner-all" wicket:id="toRemove"/>
- </td>
- <td align="center" valign="middle">
- <span wicket:id="entities">[entities]</span>
- </td>
- <td align="center" valign="middle">
- <span wicket:id="intMappingTypes">[intMappingTypes]</span>
- </td>
- <td align="center" valign="middle">
- <span wicket:id="intAttrNames">[intAttrNames]</span>
- </td>
- <td align="center" valign="middle">
- <span wicket:id="extAttrName">[extAttrName]</span>
- </td>
- <td align="center" valign="middle">
- <span wicket:id="mandatoryCondition">[mandatoryCondition]</span>
- </td>
- <td align="center" valign="middle">
- <span wicket:id="accountId">[accountId]</span>
- </td>
- <td align="center" valign="middle">
- <span wicket:id="password">[password]</span>
- </td>
- <td align="center" valign="middle">
- <span wicket:id="purpose">[purpose]</span>
- </td>
- </tr>
- </tbody>
- </table>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <div>
+ <table id="mappings"
+ class="ui-widget ui-widget-content ui-corner-all"
+ style="font-size: 1em;margin-top:2px;"
+ width="100%" cellpadding="2px" cellspacing="1px"
+ wicket:id="mappingContainer">
+ <thead>
+ <tr class="ui-widget-header">
+ <th><wicket:message key="delete"/></th>
+ <th><wicket:message key="entity"/></th>
+ <th><wicket:message key="intMappingTypes"/></th>
+ <th><wicket:message key="intAttrNames"/></th>
+ <th><wicket:message key="extAttrNames"/></th>
+ <th><wicket:message key="mandatoryCondition"/>
+ <a wicket:id="questionMarkJexlHelp" href="#" alt="Click to help" title="Click to help">?</a>
+ <div wicket:id="jexlHelp" class="help tooltip"
+ style="position: fixed; left: 640px; top: 115px; text-align: left; opacity: 0.9; font-size: 10px;">
+ <wicket:message key="jexl_info"/>
+ <ul>
+ <li><wicket:message key="jexl_ex1"/></li>
+ <li><wicket:message key="jexl_ex2"/></li>
+ </ul>
+ <a href="#" wicket:id="jexlLink" target="_blank"><wicket:message key="jexl_syntax_url"/></a>
+ </div>
+ </th>
+ <th><wicket:message key="accountId"/></th>
+ <th><label wicket:id="passwordLabel"/></th>
+ <th><wicket:message key="purpose"/></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td colspan="7" style="padding: 5px">
+ <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="addMappingBtn" />
+ </td>
+ </tr>
+ </tfoot>
+ <tbody>
+ <tr wicket:id="mappings" class="tablerow">
+ <td align="center" valign="middle">
+ <input type="checkbox" class="text ui-widget-content ui-corner-all" wicket:id="toRemove"/>
+ </td>
+ <td align="center" valign="middle">
+ <span wicket:id="entities">[entities]</span>
+ </td>
+ <td align="center" valign="middle">
+ <span wicket:id="intMappingTypes">[intMappingTypes]</span>
+ </td>
+ <td align="center" valign="middle">
+ <span wicket:id="intAttrNames">[intAttrNames]</span>
+ </td>
+ <td align="center" valign="middle">
+ <span wicket:id="extAttrName">[extAttrName]</span>
+ </td>
+ <td align="center" valign="middle">
+ <span wicket:id="mandatoryCondition">[mandatoryCondition]</span>
+ </td>
+ <td align="center" valign="middle">
+ <span wicket:id="accountId">[accountId]</span>
+ </td>
+ <td align="center" valign="middle">
+ <span wicket:id="password">[password]</span>
+ </td>
+ <td align="center" valign="middle">
+ <span wicket:id="purpose">[purpose]</span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
- <script type="text/javascript">
- $(function() {
- $('table#mappings tbody tr.tablerow:even').addClass("alt");
- });
- </script>
+ <script type="text/javascript">
+ $(function() {
+ $('table#mappings tbody tr.tablerow:even').addClass("alt");
+ });
+ </script>
- <table id="accountLinkTable"
- class="ui-widget ui-widget-content ui-corner-all"
- style="font-size: 1em;margin-top:2px;"
- border-width="1px;" border-color="#cccccc;" border-style="solid;"
- width="100%" cellpadding="2px" cellspacing="1px"
- wicket:id="accountLinkContainer">
- <thead>
- <tr class="ui-widget-header">
- <th width="10%" align="left"><wicket:message key="enable"/></th>
- <th align="left"><wicket:message key="accountLink"/></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td width="10%" align="left" valign="middle">
- <span wicket:id="accountLinkCheckbox">[accountLinkCheckbox]</span>
- </td>
- <td align="left" valign="middle">
- <span wicket:id="accountLink">[accountLink]</span>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-</wicket:panel>
+ <table id="accountLinkTable"
+ class="ui-widget ui-widget-content ui-corner-all"
+ style="font-size: 1em;margin-top:2px;"
+ border-width="1px;" border-color="#cccccc;" border-style="solid;"
+ width="100%" cellpadding="2px" cellspacing="1px"
+ wicket:id="accountLinkContainer">
+ <thead>
+ <tr class="ui-widget-header">
+ <th width="10%" align="left"><wicket:message key="enable"/></th>
+ <th align="left"><wicket:message key="accountLink"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td width="10%" align="left" valign="middle">
+ <span wicket:id="accountLinkCheckbox">[accountLinkCheckbox]</span>
+ </td>
+ <td align="left" valign="middle">
+ <span wicket:id="accountLink">[accountLink]</span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </wicket:panel>
+</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html?rev=1463905&r1=1463904&r2=1463905&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html Wed Apr 3 10:13:41 2013
@@ -16,7 +16,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:extend>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:extend>
<select class="ui-widget-content ui-corner-all medium_dynamicsize"
wicket:id="dropDownChoiceField" />
-</wicket:extend>
+ </wicket:extend>
+</html>