Resource Wizard update - adding arrows to accordion items in wizard t…

…o indicate, that item is collapsable
Evolveum · Oct 8, 2014 · c9c8ca7 · c9c8ca7
1 parent 00a43aa
commit c9c8ca7
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 15 deletions.
diff --git a/...oint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html b/...oint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
@@ -25,7 +25,10 @@ <h3><wicket:message key="ResourceActivationEditor.label" /></h3>
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne"><wicket:message key="ResourceActivationEditor.label.existence" /></a>
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                        <wicket:message key="ResourceActivationEditor.label.existence" />
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
+                    </a>
                 </h4>
             </div>
 
@@ -63,7 +66,10 @@ <h4 class="panel-title">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"><wicket:message key="ResourceActivationEditor.label.administrativeStatus" /></a>
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
+                        <wicket:message key="ResourceActivationEditor.label.administrativeStatus" />
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
+                    </a>
                 </h4>
             </div>
 
@@ -102,7 +108,10 @@ <h4 class="panel-title">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree"><wicket:message key="ResourceActivationEditor.label.validFrom" /></a>
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+                        <wicket:message key="ResourceActivationEditor.label.validFrom" />
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
+                    </a>
                 </h4>
             </div>
 
@@ -141,7 +150,10 @@ <h4 class="panel-title">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseFour"><wicket:message key="ResourceActivationEditor.label.validTo" /></a>
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
+                        <wicket:message key="ResourceActivationEditor.label.validTo" />
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
+                    </a>
                 </h4>
             </div>
 

diff --git a/...int/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html b/...int/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
@@ -30,6 +30,7 @@ <h3><span wicket:id="label" ></span></h3>
                 <h4 class="panel-title">
                     <a data-toggle="collapse" data-parent="#accordion" href="#main">
                         <wicket:message key="ResourceAssociationEditor.label.association"/>
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
                     </a>
                 </h4>
             </div>
@@ -100,6 +101,7 @@ <h4 class="panel-title">
                 <h4 class="panel-title">
                     <a data-toggle="collapse" data-parent="#accordion" href="#other">
                         <wicket:message key="ResourceAssociationEditor.label.resourceItem"/>
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
                     </a>
                 </h4>
             </div>

diff --git a/...oint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html b/...oint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
@@ -28,9 +28,12 @@ <h3><wicket:message key="ResourceDependencyEditor.label" /></h3>
                 <div class="panel-heading">
                     <h4 class="panel-title">
                         <a wicket:id="dependencyLink" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                            <button wicket:id="deleteDependency" type="button" class="close"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                            <span class="close">&nbsp;</span>
+                            <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
                             <span wicket:id="dependencyLinkName"></span>
                         </a>
-                        <button wicket:id="deleteDependency" type="button" class="close"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+
                     </h4>
                 </div>
 

diff --git a/...oint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java b/...oint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
@@ -121,7 +121,7 @@ public void onClick(AjaxRequestTarget target) {
                         deleteDependencyPerformed(target, item);
                     }
                 };
-                item.add(delete);
+                linkContainer.add(delete);
 
                 WebMarkupContainer dependencyBody = new WebMarkupContainer(ID_DEPENDENCY_BODY);
                 dependencyBody.setOutputMarkupId(true);

diff --git a/...point/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html b/...point/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
@@ -35,7 +35,10 @@ <h3><wicket:message key="ResourceIterationEditor.label" /></h3>
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne"><wicket:message key="ResourceIterationEditor.label.tokenExpression" /></a>
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                        <wicket:message key="ResourceIterationEditor.label.tokenExpression" />
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
+                    </a>
                 </h4>
             </div>
 
@@ -114,7 +117,10 @@ <h4 class="panel-title">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo"><wicket:message key="ResourceIterationEditor.label.preIterationCondition" /></a>
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
+                        <wicket:message key="ResourceIterationEditor.label.preIterationCondition" />
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
+                    </a>
                 </h4>
             </div>
 
@@ -193,7 +199,10 @@ <h4 class="panel-title">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree"><wicket:message key="ResourceIterationEditor.label.postIterationCondition" /></a>
+                    <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+                        <wicket:message key="ResourceIterationEditor.label.postIterationCondition" />
+                        <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
+                    </a>
                 </h4>
             </div>
 

diff --git a/...point/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html b/...point/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
@@ -28,9 +28,11 @@ <h3><wicket:message key="ResourceProtectedEditor.label" /></h3>
                 <div class="panel-heading">
                     <h4 class="panel-title">
                         <a wicket:id="accountLink" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                            <button wicket:id="deleteAccount" type="button" class="close"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                            <span class="close">&nbsp;</span>
+                            <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
                             <span wicket:id="accountLinkName"></span>
                         </a>
-                        <button wicket:id="deleteAccount" type="button" class="close"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
                     </h4>
                 </div>
 

diff --git a/...point/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java b/...point/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
@@ -116,7 +116,7 @@ public void onClick(AjaxRequestTarget target) {
                         deleteDependencyPerformed(target, item);
                     }
                 };
-                item.add(delete);
+                linkCont.add(delete);
 
                 WebMarkupContainer accountBody = new WebMarkupContainer(ID_ACCOUNT_BODY);
                 accountBody.setOutputMarkupId(true);

diff --git a/...web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html b/...web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
@@ -37,11 +37,16 @@
                     <div class="panel-heading">
                         <h4 class="panel-title">
                             <a wicket:id="limitationsLink" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                                <button wicket:id="deleteLimitation" type="button" class="close">
+                                    <span aria-hidden="true">&times;</span>
+                                    <span class="sr-only">
+                                        <wicket:message key="LimitationsEditorDialog.label.close"/>
+                                    </span>
+                                </button>
+                                <span class="close">&nbsp;</span>
+                                <button type="button" class="close"><span aria-hidden="true">&#8628;</span><span class="sr-only">Expand</span></button>
                                 <span wicket:id="limitationsLinkName"></span>
                             </a>
-                            <button wicket:id="deleteLimitation" type="button" class="close"><span aria-hidden="true">&times;</span><span class="sr-only">
-                                <wicket:message key="LimitationsEditorDialog.label.close"/>
-                            </span></button>
                         </h4>
                     </div>
 

diff --git a/...web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java b/...web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
@@ -150,7 +150,7 @@ public void onClick(AjaxRequestTarget target) {
                         deleteLimitationPerformed(target, item);
                     }
                 };
-                item.add(delete);
+                linkContainer.add(delete);
 
                 WebMarkupContainer limitationBody = new WebMarkupContainer(ID_BODY);
                 limitationBody.setOutputMarkupId(true);