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 2017/07/13 08:53:40 UTC
[3/4] syncope git commit: Connector and Resource configuration
versioning in Admin Console for SYNCOPE-1145 - This closes #50
http://git-wip-us.apache.org/repos/asf/syncope/blob/8f7a7be7/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonDiffPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonDiffPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonDiffPanel.html
new file mode 100644
index 0000000..fb08214
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonDiffPanel.html
@@ -0,0 +1,72 @@
+<!--
+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:head>
+ <link rel="stylesheet" type="text/css" href="webjars/codemirror/${codemirror.version}/lib/codemirror.css"/>
+ <link rel="stylesheet" type="text/css" href="webjars/codemirror/${codemirror.version}/addon/merge/merge.css"/>
+
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/lib/codemirror.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/mode/javascript/javascript.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/addon/display/autorefresh.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/addon/search/search.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/addon/search/searchcursor.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/addon/edit/matchbrackets.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/addon/edit/closebrackets.js"></script>
+ <script type="text/javascript" src="webjars/google-diff-match-patch/${googlediffmatchpath.version}/diff_match_patch.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/addon/merge/merge.js"></script>
+
+ <style>
+ .w_content_3 {
+ padding: 0;
+ color: #333333;
+ font-family: Verdana,Tahoma,sans-serif;
+ font-size: 100%;
+ border: 1px solid #BBBBBB;
+ padding: 1%;
+ }
+
+ /* enlarge modal container for better viewing */
+ .wrapper div#outer.modal-lg {
+ max-width: 1400px;
+ }
+ .wrapper .modal-content .modal-body {
+ max-height: 80vh;
+ }
+ #jsonDiffEditorInfoDefForm {
+ height: 550px;
+ }
+ #jsonDiffEditorInfoDefForm .CodeMirror-merge,
+ #jsonDiffEditorInfoDefForm .CodeMirror-merge-pane,
+ #jsonDiffEditorInfoDefForm .CodeMirror {
+ height: 100%;
+ }
+ </style>
+ </wicket:head>
+ <wicket:panel>
+ <div style="padding: 1%;">
+ <textarea wicket:id="jsonEditorInfo1" id="consoleLayoutInfo" name="jsonEditorInfo1" style="display: none;">
+ </textarea>
+ <textarea wicket:id="jsonEditorInfo2" id="consoleLayoutInfo" name="jsonEditorInfo2" style="display: none;">
+ </textarea>
+ <div class="w_content_3" id="jsonDiffEditorInfoDefForm">
+
+ </div>
+ </div>
+ </wicket:panel>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/8f7a7be7/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonEditorPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonEditorPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonEditorPanel.html
index e7b558f..82d232e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonEditorPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/JsonEditorPanel.html
@@ -41,12 +41,26 @@ under the License.
border: 1px solid #BBBBBB;
padding: 1%;
}
+
+ /* enlarge modal container for better viewing */
+ .wrapper div#outer.modal-lg {
+ max-width: 1400px;
+ }
+ .wrapper .modal-content .modal-body {
+ max-height: 80vh;
+ }
+ #jsonEditorInfoDefForm .CodeMirror {
+ height: 100%;
+ }
+ #jsonEditorInfoDefForm {
+ height: 550px;
+ }
</style>
</wicket:head>
<wicket:panel>
<div style="padding: 1%;">
<div class="w_content_3" id="jsonEditorInfoDefForm">
- <textarea wicket:id="jsonEditorInfo" id="consoleLayoutInfo" name="jsonEditorInfo" style="width: 100%; height: 350px;">
+ <textarea wicket:id="jsonEditorInfo" id="consoleLayoutInfo" name="jsonEditorInfo" style="width: 100%; height: 550px;">
</textarea>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8f7a7be7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fe0cd3f..ae48981 100644
--- a/pom.xml
+++ b/pom.xml
@@ -422,6 +422,7 @@ under the License.
<ionicons.version>2.0.1</ionicons.version>
<highlightjs.version>9.8.0</highlightjs.version>
<codemirror.version>5.24.2</codemirror.version>
+ <googlediffmatchpath.version>20121119-1</googlediffmatchpath.version>
<jsplumb.version>2.0.7</jsplumb.version>
<wicket.version>7.7.0</wicket.version>
@@ -1332,6 +1333,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.webjars</groupId>
+ <artifactId>google-diff-match-patch</artifactId>
+ <version>${googlediffmatchpath.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
<artifactId>jsplumb</artifactId>
<version>${jsplumb.version}</version>
</dependency>