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/09 14:16:03 UTC
svn commit: r1465987 - in /syncope/trunk: ./
common/src/main/java/org/apache/syncope/common/types/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/console/pages/panels/
console/src/main/resources/org/apa...
Author: ilgrosso
Date: Tue Apr 9 12:16:02 2013
New Revision: 1465987
URL: http://svn.apache.org/r1465987
Log:
[SYNCOPE-351] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.html
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1464883-1465965
Merged /syncope/branches/1_1_X:r1465652-1465985
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java?rev=1465987&r1=1465986&r2=1465987&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/IntMappingType.java Tue Apr 9 12:16:02 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.common.types;
+import java.util.Collection;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
@@ -75,7 +76,7 @@ public enum IntMappingType {
* @return set of attribute types.
*/
public static Set<IntMappingType> getAttributeTypes(
- final AttributableType attributableType, final Set<IntMappingType> toBeFiltered) {
+ final AttributableType attributableType, final Collection<IntMappingType> toBeFiltered) {
final Set<IntMappingType> res = getAttributeTypes(attributableType);
res.removeAll(toBeFiltered);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1465987&r1=1465986&r2=1465987&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Tue Apr 9 12:16:02 2013
@@ -21,9 +21,8 @@ package org.apache.syncope.console.pages
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.List;
-import java.util.Set;
import org.apache.syncope.common.to.NotificationTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.IntMappingType;
@@ -85,14 +84,16 @@ class NotificationModalPage extends Base
subject.addRequiredLabel();
form.add(subject);
- final AjaxDropDownChoicePanel<String> template = new AjaxDropDownChoicePanel<String>("template",
- getString("template"), new PropertyModel(notificationTO, "template"));
+ final AjaxDropDownChoicePanel<String> template = new AjaxDropDownChoicePanel<String>(
+ "template", getString("template"),
+ new PropertyModel<String>(notificationTO, "template"));
template.setChoices(restClient.getMailTemplates());
template.addRequiredLabel();
form.add(template);
- final AjaxDropDownChoicePanel<TraceLevel> traceLevel = new AjaxDropDownChoicePanel<TraceLevel>("traceLevel",
- getString("traceLevel"), new PropertyModel(notificationTO, "traceLevel"));
+ final AjaxDropDownChoicePanel<TraceLevel> traceLevel = new AjaxDropDownChoicePanel<TraceLevel>(
+ "traceLevel", getString("traceLevel"),
+ new PropertyModel<TraceLevel>(notificationTO, "traceLevel"));
traceLevel.setChoices(Arrays.asList(TraceLevel.values()));
traceLevel.addRequiredLabel();
form.add(traceLevel);
@@ -101,26 +102,18 @@ class NotificationModalPage extends Base
form.add(about);
final AjaxDropDownChoicePanel<IntMappingType> recipientAttrType = new AjaxDropDownChoicePanel<IntMappingType>(
- "recipientAttrType",
- new ResourceModel("recipientAttrType", "recipientAttrType").getObject(),
+ "recipientAttrType", new ResourceModel("recipientAttrType", "recipientAttrType").getObject(),
new PropertyModel<IntMappingType>(notificationTO, "recipientAttrType"));
-
- final Set<IntMappingType> toBeFiltered = new HashSet<IntMappingType>();
- toBeFiltered.add(IntMappingType.UserId);
- toBeFiltered.add(IntMappingType.Password);
-
recipientAttrType.setChoices(new ArrayList<IntMappingType>(
- (Set<IntMappingType>) IntMappingType.getAttributeTypes(AttributableType.USER, toBeFiltered)));
-
+ IntMappingType.getAttributeTypes(AttributableType.USER,
+ EnumSet.of(IntMappingType.UserId, IntMappingType.Password))));
recipientAttrType.setRequired(true);
form.add(recipientAttrType);
final AjaxDropDownChoicePanel<String> recipientAttrName = new AjaxDropDownChoicePanel<String>(
- "recipientAttrName",
- new ResourceModel("recipientAttrName", "recipientAttrName").getObject(),
- new PropertyModel(notificationTO, "recipientAttrName"));
-
- recipientAttrName.setChoices(getSchemaNames(notificationTO.getRecipientAttrType()));
+ "recipientAttrName", new ResourceModel("recipientAttrName", "recipientAttrName").getObject(),
+ new PropertyModel<String>(notificationTO, "recipientAttrName"));
+ recipientAttrName.setChoices(getSchemaNames(recipientAttrType.getModelObject()));
recipientAttrName.setRequired(true);
form.add(recipientAttrName);
@@ -130,7 +123,7 @@ class NotificationModalPage extends Base
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- recipientAttrName.setChoices(getSchemaNames(notificationTO.getRecipientAttrType()));
+ recipientAttrName.setChoices(getSchemaNames(recipientAttrType.getModelObject()));
target.add(recipientAttrName);
}
});
@@ -255,25 +248,33 @@ class NotificationModalPage extends Base
}
private List<String> getSchemaNames(final IntMappingType type) {
- if (type == null) {
- return Collections.<String>emptyList();
- }
+ final List<String> result;
- switch (type) {
- case UserSchema:
- return schemaRestClient.getSchemaNames(AttributableType.USER);
-
- case UserDerivedSchema:
- return schemaRestClient.getDerivedSchemaNames(AttributableType.USER);
-
- case UserVirtualSchema:
- return schemaRestClient.getVirtualSchemaNames(AttributableType.USER);
-
- case Username:
- return Collections.singletonList("Username");
+ if (type == null) {
+ result = Collections.<String>emptyList();
+ } else {
+ switch (type) {
+ case UserSchema:
+ result = schemaRestClient.getSchemaNames(AttributableType.USER);
+ break;
+
+ case UserDerivedSchema:
+ result = schemaRestClient.getDerivedSchemaNames(AttributableType.USER);
+ break;
+
+ case UserVirtualSchema:
+ result = schemaRestClient.getVirtualSchemaNames(AttributableType.USER);
+ break;
+
+ case Username:
+ result = Collections.singletonList("Username");
+ break;
- default:
- return Collections.<String>emptyList();
+ default:
+ result = Collections.<String>emptyList();
+ }
}
+
+ return result;
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java?rev=1465987&r1=1465986&r2=1465987&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java Tue Apr 9 12:16:02 2013
@@ -316,11 +316,7 @@ public abstract class AbstractSearchPane
if (searchConditionWrapper == null || searchConditionWrapper.getFilterType() == null) {
return null;
}
-
- LOG.debug("Search conditions: fname {}; ftype {}; fvalue {}; OP {}; type {}; isnot {}", new Object[]{
- searchConditionWrapper.getFilterName(), searchConditionWrapper.getFilterType(),
- searchConditionWrapper.getFilterValue(), searchConditionWrapper.getOperationType(),
- searchConditionWrapper.getType(), searchConditionWrapper.isNotOperator()});
+ LOG.debug("Search condition wrapper: {}", searchConditionWrapper);
NodeCond nodeCond = null;
@@ -351,13 +347,12 @@ public abstract class AbstractSearchPane
case MEMBERSHIP:
final MembershipCond membershipCond = new MembershipCond();
membershipCond.setRoleId(RoleTO.fromDisplayName(searchConditionWrapper.getFilterName()));
- membershipCond.setRoleName(searchConditionWrapper.getFilterName().split(" ")[1]);
+ membershipCond.setRoleName(searchConditionWrapper.getFilterName().
+ substring(searchConditionWrapper.getFilterName().indexOf(' ') + 1));
- if (searchConditionWrapper.isNotOperator()) {
- nodeCond = NodeCond.getNotLeafCond(membershipCond);
- } else {
- nodeCond = NodeCond.getLeafCond(membershipCond);
- }
+ nodeCond = searchConditionWrapper.isNotOperator()
+ ? NodeCond.getNotLeafCond(membershipCond)
+ : NodeCond.getLeafCond(membershipCond);
break;
@@ -365,11 +360,9 @@ public abstract class AbstractSearchPane
final ResourceCond resourceCond = new ResourceCond();
resourceCond.setResourceName(searchConditionWrapper.getFilterName());
- if (searchConditionWrapper.isNotOperator()) {
- nodeCond = NodeCond.getNotLeafCond(resourceCond);
- } else {
- nodeCond = NodeCond.getLeafCond(resourceCond);
- }
+ nodeCond = searchConditionWrapper.isNotOperator()
+ ? NodeCond.getNotLeafCond(resourceCond)
+ : NodeCond.getLeafCond(resourceCond);
break;
@@ -377,12 +370,9 @@ public abstract class AbstractSearchPane
final EntitlementCond entitlementCond = new EntitlementCond();
entitlementCond.setExpression(searchConditionWrapper.getFilterName());
- if (searchConditionWrapper.isNotOperator()) {
- nodeCond = NodeCond.getNotLeafCond(entitlementCond);
- } else {
- nodeCond = NodeCond.getLeafCond(entitlementCond);
- }
-
+ nodeCond = searchConditionWrapper.isNotOperator()
+ ? NodeCond.getNotLeafCond(entitlementCond)
+ : NodeCond.getLeafCond(entitlementCond);
break;
default:
@@ -394,11 +384,9 @@ public abstract class AbstractSearchPane
if (conditions.size() > 1) {
List<SearchCondWrapper> subList = conditions.subList(1, conditions.size());
- if (OperationType.OR.equals(subList.get(0).getOperationType())) {
- nodeCond = NodeCond.getOrCond(nodeCond, buildSearchCond(subList));
- } else {
- nodeCond = NodeCond.getAndCond(nodeCond, buildSearchCond(subList));
- }
+ nodeCond = OperationType.OR.equals(subList.get(0).getOperationType())
+ ? NodeCond.getOrCond(nodeCond, buildSearchCond(subList))
+ : NodeCond.getAndCond(nodeCond, buildSearchCond(subList));
}
return nodeCond;
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html?rev=1465987&r1=1465986&r2=1465987&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage.html Tue Apr 9 12:16:02 2013
@@ -16,115 +16,117 @@ 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"><wicket:message key="title"/></p>
- <form wicket:id="form">
- <div id="tabs">
- <ul>
- <li class="tabs-selected"><a href="#notification"><span><wicket:message key="notification"/></span></a></li>
- <li><a href="#about"><span><wicket:message key="about"/></span></a></li>
- <li><a href="#events"><span><wicket:message key="events"/></span></a></li>
- <li><a href="#recipients"><span><wicket:message key="recipients"/></span></a></li>
- </ul>
-
- <div id="notification">
- <div id="formtable">
- <div class="tablerow alt">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="sender"><wicket:message key="sender"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="sender">[sender]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="subject"><wicket:message key="subject"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="subject">[subject]</span>
- </div>
- </div>
-
- <div class="tablerow alt">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="recipientAttrType"><wicket:message key="recipientAttrType"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="recipientAttrType">[recipientAttrType]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="recipientAttrName"><wicket:message key="recipientAttrName"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="recipientAttrName">[recipientAttrName]</span>
- </div>
- </div>
-
- <div class="tablerow alt">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="template"><wicket:message key="template"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="template">[template]</span>
- </div>
- </div>
-
- <div class="tablerow">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="traceLevel"><wicket:message key="traceLevel"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="traceLevel">[traceLevel]</span>
+<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"><wicket:message key="title"/></p>
+ <form wicket:id="form">
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected"><a href="#notification"><span><wicket:message key="notification"/></span></a></li>
+ <li><a href="#about"><span><wicket:message key="about"/></span></a></li>
+ <li><a href="#events"><span><wicket:message key="events"/></span></a></li>
+ <li><a href="#recipients"><span><wicket:message key="recipients"/></span></a></li>
+ </ul>
+
+ <div id="notification">
+ <div id="formtable">
+ <div class="tablerow alt">
+ <div class="tablecolumn_label medium_fixedsize">
+ <label for="sender"><wicket:message key="sender"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="sender">[sender]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label medium_fixedsize">
+ <label for="subject"><wicket:message key="subject"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="subject">[subject]</span>
+ </div>
+ </div>
+
+ <div class="tablerow alt">
+ <div class="tablecolumn_label medium_fixedsize">
+ <label for="recipientAttrType"><wicket:message key="recipientAttrType"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="recipientAttrType">[recipientAttrType]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label medium_fixedsize">
+ <label for="recipientAttrName"><wicket:message key="recipientAttrName"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="recipientAttrName">[recipientAttrName]</span>
+ </div>
+ </div>
+
+ <div class="tablerow alt">
+ <div class="tablecolumn_label medium_fixedsize">
+ <label for="template"><wicket:message key="template"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="template">[template]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label medium_fixedsize">
+ <label for="traceLevel"><wicket:message key="traceLevel"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="traceLevel">[traceLevel]</span>
+ </div>
</div>
</div>
</div>
- </div>
-
- <div id="about">
- <span wicket:id="about"/>
- </div>
- <div id="events">
- <span wicket:id="events"/>
- </div>
+ <div id="about">
+ <span wicket:id="about"/>
+ </div>
- <div id="recipients">
- <div class="tablerow">
- <div class="tablecolumn_field">
- <span wicket:id="selfAsRecipient">[selfAsRecipient]</span>
- </div>
- <div class="tablecolumn_label">
- <label for="selfAsRecipient"><wicket:message key="selfAsRecipient"/></label>
- </div>
+ <div id="events">
+ <span wicket:id="events"/>
</div>
- <span wicket:id="recipientsContainer">
+
+ <div id="recipients">
<div class="tablerow">
<div class="tablecolumn_field">
- <span wicket:id="checkRecipients">[checkRecipients]</span>
+ <span wicket:id="selfAsRecipient">[selfAsRecipient]</span>
</div>
<div class="tablecolumn_label">
- <label for="checkRecipients"><wicket:message key="checkRecipients"/></label>
+ <label for="selfAsRecipient"><wicket:message key="selfAsRecipient"/></label>
</div>
</div>
- <span wicket:id="recipients"/>
- </span>
+ <span wicket:id="recipientsContainer">
+ <div class="tablerow">
+ <div class="tablecolumn_field">
+ <span wicket:id="checkRecipients">[checkRecipients]</span>
+ </div>
+ <div class="tablecolumn_label">
+ <label for="checkRecipients"><wicket:message key="checkRecipients"/></label>
+ </div>
+ </div>
+ <span wicket:id="recipients"/>
+ </span>
+ </div>
</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/AbstractSearchPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchPanel.html?rev=1465987&r1=1465986&r2=1465987&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchPanel.html Tue Apr 9 12:16:02 2013
@@ -16,61 +16,63 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:panel>
- <div id="searchBox">
- <div wicket:id="searchFeedback"></div>
- <table border="0">
- <thead>
- <tr>
- <th></th>
- <th><wicket:message key="search_not_value"/></th>
- <th><wicket:message key="search_filter_type"/></th>
- <th><wicket:message key="search_filter_name"/></th>
- <th><wicket:message key="search_type_cond"/></th>
- <th><wicket:message key="search_filter_value"/></th>
- <th></th>
- <th></th>
- <th></th>
- </tr>
- </thead>
- <tbody wicket:id="searchFormContainer">
- <tr wicket:id="searchView">
- <td>
- <b><span wicket:id="operationType"/></b>
- </td>
- <td>
- <input type="checkbox" wicket:id="notOperator"/>
- </td>
- <td>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="filterType"/>
- </td>
- <td>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="filterName"/>
- </td>
- <td>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="type"/>
- </td>
- <td>
- <input type="text" class="text ui-widget-content ui-corner-all"
- wicket:id="filterValue"/>
- </td>
- <td>
- <input type="button" class="text ui-widget-content ui-corner-all"
- wicket:id="addAndButton"/>
- </td>
- <td>
- <input type="submit" class="text ui-widget-content ui-corner-all"
- wicket:id="addOrButton"/>
- </td>
- <td>
- <input type="button" class="text ui-widget-content ui-corner-all"
- wicket:id="dropButton"/>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-</wicket:panel>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <div id="searchBox">
+ <div wicket:id="searchFeedback"></div>
+ <table border="0">
+ <thead>
+ <tr>
+ <th></th>
+ <th><wicket:message key="search_not_value"/></th>
+ <th><wicket:message key="search_filter_type"/></th>
+ <th><wicket:message key="search_filter_name"/></th>
+ <th><wicket:message key="search_type_cond"/></th>
+ <th><wicket:message key="search_filter_value"/></th>
+ <th></th>
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody wicket:id="searchFormContainer">
+ <tr wicket:id="searchView">
+ <td>
+ <b><span wicket:id="operationType"/></b>
+ </td>
+ <td>
+ <input type="checkbox" wicket:id="notOperator"/>
+ </td>
+ <td>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="filterType"/>
+ </td>
+ <td>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="filterName"/>
+ </td>
+ <td>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="type"/>
+ </td>
+ <td>
+ <input type="text" class="text ui-widget-content ui-corner-all"
+ wicket:id="filterValue"/>
+ </td>
+ <td>
+ <input type="button" class="text ui-widget-content ui-corner-all"
+ wicket:id="addAndButton"/>
+ </td>
+ <td>
+ <input type="submit" class="text ui-widget-content ui-corner-all"
+ wicket:id="addOrButton"/>
+ </td>
+ <td>
+ <input type="button" class="text ui-widget-content ui-corner-all"
+ wicket:id="dropButton"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </wicket:panel>
+</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.html?rev=1465987&r1=1465986&r2=1465987&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel.html Tue Apr 9 12:16:02 2013
@@ -16,51 +16,51 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<p class="ui-widget ui-corner-all ui-widget-header">
- <wicket:message key="membership_availability"/>
- </p>
+ <wicket:message key="membership_availability"/>
+ </p>
- <div wicket:id="treeTable" style="float: left; width: 100%; margin:auto;" class="role-tree roleTable"/>
+ <div wicket:id="treeTable" style="float: left; width: 100%; margin:auto;" class="role-tree roleTable"/>
- <div style="float: left; width: 100%;">
- <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="membership_text"/></p>
+ <div style="float: left; width: 100%;">
+ <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="membership_text"/></p>
- <table id="users" class="membershipTable"
- style="font-size:1.1em" wicket:id="membershipsContainer"
- cellpadding="5px" cellspacing="2px">
- <thead>
- <tr class="ui-widget-header">
- <th><wicket:message key="id"/></th>
- <th><wicket:message key="name"/></th>
- <th><wicket:message key="edit"/></th>
- <th><wicket:message key="delete"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="memberships">
- <td>
- <span wicket:id="roleId"/>
- </td>
- <td>
- <span wicket:id="roleName"/>
- </td>
- <td>
- <a href="#" wicket:id="editLink">
- <wicket:message key="edit"/>
- </a>
- </td>
- <td>
- <a href="#" wicket:id="deleteLink">
- <wicket:message key="delete"/>
- </a>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
+ <table id="users" class="membershipTable"
+ style="font-size:1.1em" wicket:id="membershipsContainer"
+ cellpadding="5px" cellspacing="2px">
+ <thead>
+ <tr class="ui-widget-header">
+ <th><wicket:message key="id"/></th>
+ <th><wicket:message key="name"/></th>
+ <th><wicket:message key="edit"/></th>
+ <th><wicket:message key="delete"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="memberships">
+ <td>
+ <span wicket:id="roleId"/>
+ </td>
+ <td>
+ <span wicket:id="roleName"/>
+ </td>
+ <td>
+ <a href="#" wicket:id="editLink">
+ <wicket:message key="edit"/>
+ </a>
+ </td>
+ <td>
+ <a href="#" wicket:id="deleteLink">
+ <wicket:message key="delete"/>
+ </a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
- <div wicket:id="membershipWin"/>
-</wicket:panel>
+ <div wicket:id="membershipWin"/>
+ </wicket:panel>
</html>