You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2016/02/12 17:28:44 UTC

syncope git commit: [SYNCOPE-156] Updated accordion component with AdminLTE style

Repository: syncope
Updated Branches:
  refs/heads/master 2b8a6481b -> 62c8175af


[SYNCOPE-156] Updated accordion component with AdminLTE style


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/62c8175a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/62c8175a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/62c8175a

Branch: refs/heads/master
Commit: 62c8175af86948f23723480927f2eada6523bbbc
Parents: 2b8a648
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Fri Feb 12 17:28:24 2016 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Fri Feb 12 17:28:24 2016 +0100

----------------------------------------------------------------------
 .../client/console/panels/SchemasPanel.java     |  8 ++--
 .../markup/html/bootstrap/tabs/Accordion.java   | 45 ++++++++++++++++++++
 .../console/wizards/any/DynamicMemberships.java |  6 +--
 .../console/wizards/any/Relationships.java      |  4 +-
 .../client/console/wizards/any/UserDetails.java | 10 ++---
 .../console/wizards/role/RoleWizardBuilder.java |  4 +-
 .../client/console/panels/SchemasPanel.html     |  2 +-
 .../markup/html/bootstrap/tabs/Accordion.html   | 33 ++++++++++++++
 .../client/console/wizards/any/UserDetails.html |  2 +-
 .../fit/console/AbstractTypesITCase.java        | 10 ++---
 .../syncope/fit/console/SchemasITCase.java      | 24 +++++------
 11 files changed, 113 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java
index ca15926..78fb28c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java
@@ -18,9 +18,9 @@
  */
 package org.apache.syncope.client.console.panels;
 
-import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.Collapsible;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs.Accordion;
 import org.apache.syncope.common.lib.types.SchemaType;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
@@ -39,9 +39,9 @@ public class SchemasPanel extends Panel {
 
         this.pageReference = pageRef;
 
-        final Collapsible collapsible = new Collapsible("collapsePanel", buildTabList());
-        collapsible.setOutputMarkupId(true);
-        add(collapsible);
+        final Accordion accordion = new Accordion("accordionPanel", buildTabList());
+        accordion.setOutputMarkupId(true);
+        add(accordion);
     }
 
     private List<ITab> buildTabList() {

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/tabs/Accordion.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/tabs/Accordion.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/tabs/Accordion.java
new file mode 100644
index 0000000..59ff9df
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/tabs/Accordion.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.Collapsible;
+import de.agilecoders.wicket.core.util.Attributes;
+import java.util.List;
+import org.apache.wicket.extensions.markup.html.tabs.ITab;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.model.IModel;
+
+public class Accordion extends Collapsible {
+
+    private static final long serialVersionUID = -4458736091580810334L;
+
+    public Accordion(final String markupId, final List<ITab> tabs) {
+        super(markupId, tabs);
+    }
+
+    public Accordion(final String markupId, final List<ITab> tabs, final IModel<Integer> activeTab) {
+        super(markupId, tabs, activeTab);
+    }
+
+    @Override
+    protected void onComponentTag(final ComponentTag tag) {
+        checkComponentTag(tag, "div");
+        Attributes.addClass(tag, "box-group");
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java
index 7cd23ea..b0b2c59 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java
@@ -18,7 +18,6 @@
  */
 package org.apache.syncope.client.console.wizards.any;
 
-import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.Collapsible;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -30,6 +29,7 @@ import org.apache.syncope.client.console.panels.search.MapOfListModel;
 import org.apache.syncope.client.console.panels.search.SearchClause;
 import org.apache.syncope.client.console.panels.search.UserSearchPanel;
 import org.apache.syncope.client.console.rest.AnyTypeRestClient;
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs.Accordion;
 import org.apache.syncope.common.lib.to.AnyTypeTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
@@ -72,7 +72,7 @@ public class DynamicMemberships extends WizardStep {
         // ------------------------
         // uDynMembershipCond
         // ------------------------
-        add(new Collapsible("uDynMembershipCond", Collections.<ITab>singletonList(
+        add(new Accordion("uDynMembershipCond", Collections.<ITab>singletonList(
                 new AbstractTab(new ResourceModel("uDynMembershipCond", "Dynamic USER Membership Conditions")) {
 
             private static final long serialVersionUID = 1037272333056449378L;
@@ -95,7 +95,7 @@ public class DynamicMemberships extends WizardStep {
             @Override
             protected void populateItem(final ListItem<AnyTypeTO> item) {
                 final String key = item.getModelObject().getKey();
-                item.add(new Collapsible("aDynMembershipCond", Collections.<ITab>singletonList(
+                item.add(new Accordion("aDynMembershipCond", Collections.<ITab>singletonList(
                         new AbstractTab(new StringResourceModel(
                                 "aDynMembershipCond", this, new Model<AnyTypeTO>(item.getModelObject()))) {
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
index 0f435fe..fafdfb0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
@@ -18,7 +18,6 @@
  */
 package org.apache.syncope.client.console.wizards.any;
 
-import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.Collapsible;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -42,6 +41,7 @@ import org.apache.syncope.client.console.panels.search.SearchClausePanel;
 import org.apache.syncope.client.console.panels.search.SearchUtils;
 import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
 import org.apache.syncope.client.console.rest.AnyTypeRestClient;
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs.Accordion;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksPanel;
 import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
@@ -107,7 +107,7 @@ public class Relationships extends WizardStep {
         final Fragment viewFragment = new Fragment("relationships", "viewFragment", this);
         viewFragment.setOutputMarkupId(true);
 
-        viewFragment.add(new Collapsible("relationships",
+        viewFragment.add(new Accordion("relationships",
                 CollectionUtils.collect(relationships.keySet(), new SerializableTransformer<String, ITab>() {
 
                     private static final long serialVersionUID = 3514912643300593122L;

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
index ef1ea05..63de8ae 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
@@ -18,12 +18,12 @@
  */
 package org.apache.syncope.client.console.wizards.any;
 
-import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.Collapsible;
 import java.util.Collections;
 import java.util.List;
 import org.apache.syncope.client.console.commons.JexlHelpUtils;
 import org.apache.syncope.client.console.commons.status.StatusBean;
 import org.apache.syncope.client.console.panels.ListViewPanel;
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs.Accordion;
 import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel;
 import org.apache.syncope.client.console.wicket.markup.html.form.FieldPanel;
 import org.apache.syncope.common.lib.to.UserTO;
@@ -81,7 +81,7 @@ public class UserDetails extends Details<UserTO> {
         // ------------------------
         final Model<Integer> model = Model.of(-1);
 
-        final Collapsible collapsible = new Collapsible("collapsePanel", Collections.<ITab>singletonList(
+        final Accordion accordion = new Accordion("accordionPanel", Collections.<ITab>singletonList(
                 new AbstractTab(new ResourceModel("password.change", "Change password")) {
 
             private static final long serialVersionUID = 1037272333056449378L;
@@ -98,7 +98,7 @@ public class UserDetails extends Details<UserTO> {
             private static final long serialVersionUID = 1L;
 
             @Override
-            protected Component newTitle(final String markupId, final ITab tab, final Collapsible.State state) {
+            protected Component newTitle(final String markupId, final ITab tab, final Accordion.State state) {
                 return new AjaxLink<Integer>(markupId) {
 
                     private static final long serialVersionUID = 1L;
@@ -127,8 +127,8 @@ public class UserDetails extends Details<UserTO> {
             }
         };
 
-        collapsible.setOutputMarkupId(true);
-        add(collapsible);
+        accordion.setOutputMarkupId(true);
+        add(accordion);
         // ------------------------        
     }
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java
index 2ea9ca1..0dc3cde 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java
@@ -15,7 +15,6 @@
  */
 package org.apache.syncope.client.console.wizards.role;
 
-import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.Collapsible;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,6 +26,7 @@ import org.apache.syncope.client.console.panels.search.SearchClause;
 import org.apache.syncope.client.console.panels.search.UserSearchPanel;
 import org.apache.syncope.client.console.rest.RealmRestClient;
 import org.apache.syncope.client.console.rest.RoleRestClient;
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs.Accordion;
 import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPalettePanel;
 import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel;
 import org.apache.syncope.client.console.wizards.AjaxWizardBuilder;
@@ -105,7 +105,7 @@ public class RoleWizardBuilder extends AjaxWizardBuilder<RoleHandler> {
             // ------------------------
             // dynMembershipCond
             // ------------------------
-            add(new Collapsible("dynMembershipCond", Collections.<ITab>singletonList(
+            add(new Accordion("dynMembershipCond", Collections.<ITab>singletonList(
                     new AbstractTab(new ResourceModel("dynMembershipCond", "Dynamic USER Membership Conditions")) {
 
                 private static final long serialVersionUID = 1037272333056449378L;

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel.html
index fe2037e..4e4de2f 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SchemasPanel.html
@@ -22,7 +22,7 @@ under the License.
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://xmlns.jcp.org/jsf/composite">
   <body>
     <wicket:panel>
-      <div wicket:id="collapsePanel"></div>
+      <div wicket:id="accordionPanel"></div>
 <!--      <div class="modal-footer">
         <a wicket:message="title:createSchema" wicket:id="createSchema">
           <i class="glyphicon glyphicon-duplicate"></i>

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/tabs/Accordion.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/tabs/Accordion.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/tabs/Accordion.html
new file mode 100644
index 0000000..a53bd65
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/bootstrap/tabs/Accordion.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+  <wicket:panel>
+    <div class="panel box box-primary" wicket:id="tabs">
+      <div class="box-header with-border">
+        <h4  class="box-title">
+          <a wicket:id="title" class="accordion-toggle" data-toggle="collapse" >Title</a>
+        </h4>
+      </div>
+      <div wicket:id="body" class="panel-collapse collapse">
+        <div class="box-body" wicket:id="content">Content</div>
+      </div>
+    </div>
+  </wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html
index 78247c1..41fbd81 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/UserDetails.html
@@ -35,7 +35,7 @@ under the License.
         </a>
       </div>
 
-      <div wicket:id="collapsePanel"></div>
+      <div wicket:id="accordionPanel"></div>
     </wicket:extend>
   </body>
 </html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
index 048c84d..72f7251 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
@@ -27,7 +27,7 @@ import org.junit.Before;
 public abstract class AbstractTypesITCase extends AbstractConsoleITCase {
 
     protected static final String PLAIN_DATATABLE_PATH = "body:content:tabbedPanel:panel:"
-            + "collapsePanel:tabs:0:body:content:container:content:searchContainer:resultTable";
+            + "accordionPanel:tabs:0:body:content:container:content:searchContainer:resultTable";
 
     protected static final String DATATABLE_PATH =
             "body:content:tabbedPanel:panel:container:content:searchContainer:resultTable";
@@ -76,18 +76,18 @@ public abstract class AbstractTypesITCase extends AbstractConsoleITCase {
     protected void createPlainSchema(final String key) {
         browsingToPlainSchemas();
         wicketTester.clickLink(
-                "body:content:tabbedPanel:panel:collapsePanel:tabs:0:body:content:container:content:add");
+                "body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:container:content:add");
 
         wicketTester.assertComponent(
-                "body:content:tabbedPanel:panel:collapsePanel:tabs:0:body:content:modal", Modal.class);
+                "body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:modal", Modal.class);
 
         final FormTester formTester = wicketTester.newFormTester("body:content:tabbedPanel:panel:"
-                + "collapsePanel:tabs:0:body:content:modal:form");
+                + "accordionPanel:tabs:0:body:content:modal:form");
         formTester.setValue("content:details:form:key:textField", key);
         formTester.setValue("content:details:form:type:dropDownChoiceField", "3");
 
         wicketTester.clickLink("body:content:tabbedPanel:panel:"
-                + "collapsePanel:tabs:0:body:content:modal:dialog:footer:inputs:0:submit");
+                + "accordionPanel:tabs:0:body:content:modal:dialog:footer:inputs:0:submit");
 
         wicketTester.assertInfoMessages("Operation executed successfully");
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/62c8175a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
index 8692d9b..5cd4d01 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
@@ -55,7 +55,7 @@ public class SchemasITCase extends AbstractTypesITCase {
 
         wicketTester.assertComponent(
                 "body:content:tabbedPanel:"
-                + "panel:collapsePanel:tabs:0:body:content:modal:"
+                + "panel:accordionPanel:tabs:0:body:content:modal:"
                 + "form:content:kindForm:kind:dropDownChoiceField", DropDownChoice.class);
     }
 
@@ -63,18 +63,18 @@ public class SchemasITCase extends AbstractTypesITCase {
     public void createPlainSchema() {
         browsingToPlainSchemas();
         wicketTester.clickLink(
-                "body:content:tabbedPanel:panel:collapsePanel:tabs:0:body:content:container:content:add");
+                "body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:container:content:add");
 
         wicketTester.assertComponent(
-                "body:content:tabbedPanel:panel:collapsePanel:tabs:0:body:content:modal", Modal.class);
+                "body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:modal", Modal.class);
 
         final FormTester formTester = wicketTester.newFormTester("body:content:tabbedPanel:panel:"
-                + "collapsePanel:tabs:0:body:content:modal:form");
+                + "accordionPanel:tabs:0:body:content:modal:form");
         formTester.setValue("content:details:form:key:textField", "zBoolean");
         formTester.setValue("content:details:form:type:dropDownChoiceField", "3");
 
         wicketTester.clickLink("body:content:tabbedPanel:panel:"
-                + "collapsePanel:tabs:0:body:content:modal:dialog:footer:inputs:0:submit");
+                + "accordionPanel:tabs:0:body:content:modal:dialog:footer:inputs:0:submit");
 
         wicketTester.assertInfoMessages("Operation executed successfully");
 
@@ -96,15 +96,15 @@ public class SchemasITCase extends AbstractTypesITCase {
 
         wicketTester.assertComponent(
                 "body:content:tabbedPanel:"
-                + "panel:collapsePanel:tabs:0:body:content:modal:"
+                + "panel:accordionPanel:tabs:0:body:content:modal:"
                 + "form:content:kindForm:kind:dropDownChoiceField", DropDownChoice.class);
 
         FormTester formTester = wicketTester.newFormTester(
-                "body:content:tabbedPanel:panel:collapsePanel:tabs:0:body:content:modal:form");
+                "body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:modal:form");
         formTester.setValue("content:details:form:multivalue:checkboxField", "true");
 
         wicketTester.clickLink("body:content:tabbedPanel:panel:"
-                + "collapsePanel:tabs:0:body:content:modal:dialog:footer:inputs:0:submit", true);
+                + "accordionPanel:tabs:0:body:content:modal:dialog:footer:inputs:0:submit", true);
 
         wicketTester.assertInfoMessages("Operation executed successfully");
     }
@@ -114,18 +114,18 @@ public class SchemasITCase extends AbstractTypesITCase {
         browsingToPlainSchemas();
         //create new Plain Schema
         final String schemaName = "zStringDelete";
-        wicketTester.clickLink("body:content:tabbedPanel:panel:collapsePanel:tabs:0:body:content:container:content:add");
+        wicketTester.clickLink("body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:container:content:add");
 
         wicketTester.assertComponent(
-                "body:content:tabbedPanel:panel:collapsePanel:tabs:0:body:content:modal", Modal.class);
+                "body:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:modal", Modal.class);
 
         final FormTester formTester = wicketTester.newFormTester("body:content:tabbedPanel:panel:"
-                + "collapsePanel:tabs:0:body:content:modal:form");
+                + "accordionPanel:tabs:0:body:content:modal:form");
         formTester.setValue("content:details:form:key:textField", schemaName);
         formTester.setValue("content:details:form:type:dropDownChoiceField", "0");
 
         wicketTester.clickLink("body:content:tabbedPanel:panel:"
-                + "collapsePanel:tabs:0:body:content:modal:dialog:footer:inputs:0:submit");
+                + "accordionPanel:tabs:0:body:content:modal:dialog:footer:inputs:0:submit");
 
         wicketTester.assertInfoMessages("Operation executed successfully");;