syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1632219 - in /syncope/branches/1_2_X/console/src/main: java/org/apache/syncope/console/pages/SchemaModalPage.java resources/org/apache/syncope/console/pages/SchemaModalPage.html
Date Thu, 16 Oct 2014 07:19:25 GMT
Author: ilgrosso
Date: Thu Oct 16 07:19:25 2014
New Revision: 1632219

URL: http://svn.apache.org/r1632219
Log:
[SYNCOPE-566] Patch applied

Modified:
    syncope/branches/1_2_X/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
    syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html

Modified: syncope/branches/1_2_X/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1632219&r1=1632218&r2=1632219&view=diff
==============================================================================
--- syncope/branches/1_2_X/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
(original)
+++ syncope/branches/1_2_X/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
Thu Oct 16 07:19:25 2014
@@ -102,6 +102,8 @@ public class SchemaModalPage extends Abs
         conversionParams.add(conversionPattern);
         schemaForm.add(conversionParams);
 
+        final WebMarkupContainer typeParams = new WebMarkupContainer("typeParams");
+        typeParams.setOutputMarkupPlaceholderTag(true);
         // -- enum
         final AjaxTextFieldPanel enumerationValuesPanel =
                 new AjaxTextFieldPanel("panel", "enumerationValues", new Model<String>(null));
@@ -121,7 +123,7 @@ public class SchemaModalPage extends Abs
         enumParams.setOutputMarkupPlaceholderTag(true);
         enumParams.add(enumerationValues);
         enumParams.add(enumerationKeys);
-        schemaForm.add(enumParams);
+        typeParams.add(enumParams);
 
         // -- encrypted
         final AjaxTextFieldPanel secretKey = new AjaxTextFieldPanel("secretKey",
@@ -136,7 +138,7 @@ public class SchemaModalPage extends Abs
         encryptedParams.setOutputMarkupPlaceholderTag(true);
         encryptedParams.add(secretKey);
         encryptedParams.add(cipherAlgorithm);
-        schemaForm.add(encryptedParams);
+        typeParams.add(encryptedParams);
 
         // -- binary
         final AjaxTextFieldPanel mimeType = new AjaxTextFieldPanel("mimeType",
@@ -146,8 +148,10 @@ public class SchemaModalPage extends Abs
         final WebMarkupContainer binaryParams = new WebMarkupContainer("binaryParams");
         binaryParams.setOutputMarkupPlaceholderTag(true);
         binaryParams.add(mimeType);
-        schemaForm.add(binaryParams);
+        typeParams.add(binaryParams);
 
+        schemaForm.add(typeParams);
+        
         // -- show or hide
         showHide(schema, type,
                 conversionParams, conversionPattern,
@@ -165,7 +169,7 @@ public class SchemaModalPage extends Abs
                         enumParams, enumerationValuesPanel, enumerationValues, enumerationKeys,
                         encryptedParams, secretKey, cipherAlgorithm,
                         binaryParams, mimeType);
-                target.add(schemaForm);
+                target.add(typeParams);
             }
         });
 

Modified: syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html?rev=1632219&r1=1632218&r2=1632219&view=diff
==============================================================================
--- syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html
(original)
+++ syncope/branches/1_2_X/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.html
Thu Oct 16 07:19:25 2014
@@ -51,51 +51,51 @@ under the License.
             </div>
           </div>
 
-          <div wicket:id="enumParams">
-            <div class="tablerow">
-              <div class="tablecolumn_label short_dynamicsize">
-                <label for="enumerationValues"><wicket:message key="enumerationValues"/></label>
-              </div>
-              <div class="tablecolumn_field medium_dynamicsize">
-                <span wicket:id="enumerationValues">[enumerationValues]</span>
-              </div>
-            </div>
-            <div class="tablerow alt">
-              <div class="tablecolumn_label short_dynamicsize">
-                <label for="enumerationKeys"><wicket:message key="enumerationKeys"/></label>
-              </div>
-              <div class="tablecolumn_field medium_dynamicsize">
-                <span wicket:id="enumerationKeys">[enumerationKeys]</span>
-              </div>
-            </div>
-          </div>
-
-          <div wicket:id="encryptedParams">
-            <div class="tablerow">
-              <div class="tablecolumn_label short_dynamicsize">
-                <label for="secretKey"><wicket:message key="secretKey"/></label>
-              </div>
-              <div class="tablecolumn_field medium_dynamicsize">
-                <span wicket:id="secretKey">[secretKey]</span>
-              </div>
-            </div>
-            <div class="tablerow alt">
-              <div class="tablecolumn_label short_dynamicsize">
-                <label for="cipherAlgorithm"><wicket:message key="cipherAlgorithm"/></label>
-              </div>
-              <div class="tablecolumn_field medium_dynamicsize">
-                <span wicket:id="cipherAlgorithm">[cipherAlgorithm]</span>
-              </div>
-            </div>
-          </div>
-
-          <div wicket:id="binaryParams">
-            <div class="tablerow alt">
-              <div class="tablecolumn_label short_dynamicsize">
-                <label for="mimeType"><wicket:message key="mimeType"/></label>
-              </div>
-              <div class="tablecolumn_field medium_dynamicsize">
-                <span wicket:id="mimeType">[mimeType]</span>
+          <div wicket:id="typeParams">
+            <div wicket:id="enumParams">
+              <div class="tablerow">
+                <div class="tablecolumn_label short_dynamicsize">
+                  <label for="enumerationValues"><wicket:message key="enumerationValues"/></label>
+                </div>
+                <div class="tablecolumn_field medium_dynamicsize">
+                  <span wicket:id="enumerationValues">[enumerationValues]</span>
+                </div>
+              </div>
+              <div class="tablerow alt">
+                <div class="tablecolumn_label short_dynamicsize">
+                  <label for="enumerationKeys"><wicket:message key="enumerationKeys"/></label>
+                </div>
+                <div class="tablecolumn_field medium_dynamicsize">
+                  <span wicket:id="enumerationKeys">[enumerationKeys]</span>
+                </div>
+              </div>
+            </div>
+            <div wicket:id="encryptedParams">
+              <div class="tablerow">
+                <div class="tablecolumn_label short_dynamicsize">
+                  <label for="secretKey"><wicket:message key="secretKey"/></label>
+                </div>
+                <div class="tablecolumn_field medium_dynamicsize">
+                  <span wicket:id="secretKey">[secretKey]</span>
+                </div>
+              </div>
+              <div class="tablerow alt">
+                <div class="tablecolumn_label short_dynamicsize">
+                  <label for="cipherAlgorithm"><wicket:message key="cipherAlgorithm"/></label>
+                </div>
+                <div class="tablecolumn_field medium_dynamicsize">
+                  <span wicket:id="cipherAlgorithm">[cipherAlgorithm]</span>
+                </div>
+              </div>
+            </div>
+            <div wicket:id="binaryParams">
+              <div class="tablerow alt">
+                <div class="tablecolumn_label short_dynamicsize">
+                  <label for="mimeType"><wicket:message key="mimeType"/></label>
+                </div>
+                <div class="tablecolumn_field medium_dynamicsize">
+                  <span wicket:id="mimeType">[mimeType]</span>
+                </div>
               </div>
             </div>
           </div>



Mime
View raw message