Code Review / toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 02b1d40)
Adding proactive module, and fixing dns-guard js/css references 26/9126/1
authorLuis Chiang <luis@chiang.ec>
Thu, 17 Jul 2014 21:33:48 +0000 (14:33 -0700)
committerLuis Chiang <luis@chiang.ec>
Thu, 17 Jul 2014 21:33:48 +0000 (14:33 -0700)
Change-Id: I3e599de5aafe4bfe9ba9e50f1e1568da8ac92869
Signed-off-by: Luis Chiang <luis@chiang.ec>
samples/dnsguard/src/main/resources/WEB-INF/jsp/dnsconfig.jsp patch | blob | history
samples/dnsguard/src/main/resources/WEB-INF/jsp/modconfig.jsp patch | blob | history
samples/dnsguard/src/main/resources/WEB-INF/jsp/saved.jsp patch | blob | history
samples/dnsguard/src/main/resources/js/dnsconfig.js patch | blob | history
samples/dnsguard/src/main/resources/js/modconfig.js patch | blob | history
samples/proactive [new submodule] patch | blob

diff --git a/samples/dnsguard/src/main/resources/WEB-INF/jsp/dnsconfig.jsp b/samples/dnsguard/src/main/resources/WEB-INF/jsp/dnsconfig.jsp
index fb7e58adf3a63085e59752219d5dad8d9993845b..25f92aafd6e8ba6bdbbc92ed5767702160b9082c 100644 (file)
--- a/samples/dnsguard/src/main/resources/WEB-INF/jsp/dnsconfig.jsp
+++ b/samples/dnsguard/src/main/resources/WEB-INF/jsp/dnsconfig.jsp
@@ -2,14 +2,14 @@
        <head>
        
        <!-- style -->
-    <link rel="stylesheet" href="/css/ext/pure/pure.css"/>
+    <link rel="stylesheet" href="/css/ext/pure.css"/>
     <link rel="stylesheet" href="/css/phoenix.css"/>
        
     <!-- style app -->
     <link rel="stylesheet" href="/dnsguard/web/css/simple.css"/>
        <link rel="stylesheet" href="http://cdn.datatables.net/1.10.0/css/jquery.dataTables.css"/>
         
-       <script data-main="/dnsguard/web/js/dnsconfig" src="/js/ext/requirejs/require.js"></script> 
+       <script data-main="/dnsguard/web/js/dnsconfig" src="/js/ext/require.js"></script> 
        
        </head>
        <body>
diff --git a/samples/dnsguard/src/main/resources/WEB-INF/jsp/modconfig.jsp b/samples/dnsguard/src/main/resources/WEB-INF/jsp/modconfig.jsp
index 9306345172c8962d84ed5d509b115bc08051297b..5e6552f29e51e7b8a3fd7f7108d1b8dc6a660f08 100644 (file)
--- a/samples/dnsguard/src/main/resources/WEB-INF/jsp/modconfig.jsp
+++ b/samples/dnsguard/src/main/resources/WEB-INF/jsp/modconfig.jsp
@@ -2,14 +2,14 @@
        <head>
        
        <!-- style -->
-    <link rel="stylesheet" href="/css/ext/pure/pure.css"/>
+    <link rel="stylesheet" href="/css/ext/pure.css"/>
     <link rel="stylesheet" href="/css/phoenix.css"/>
        
     <!-- style app -->
     <link rel="stylesheet" href="/dnsguard/web/css/simple.css"/>
        <link rel="stylesheet" href="http://cdn.datatables.net/1.10.0/css/jquery.dataTables.css"/>
         
-       <script data-main="/dnsguard/web/js/modconfig" src="/js/ext/requirejs/require.js"></script> 
+       <script data-main="/dnsguard/web/js/modconfig" src="/js/ext/require.js"></script> 
        
        </head>
        <body>
diff --git a/samples/dnsguard/src/main/resources/WEB-INF/jsp/saved.jsp b/samples/dnsguard/src/main/resources/WEB-INF/jsp/saved.jsp
index b2dffa3a6dbb619c5d247b835691d7e2f0260a43..3aa242b58bba9f66ae2473ff40ef7a03c22038be 100644 (file)
--- a/samples/dnsguard/src/main/resources/WEB-INF/jsp/saved.jsp
+++ b/samples/dnsguard/src/main/resources/WEB-INF/jsp/saved.jsp
@@ -9,14 +9,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
        
        <!-- style -->
-    <link rel="stylesheet" href="/css/ext/pure/pure.css"/>
+    <link rel="stylesheet" href="/css/ext/pure.css"/>
     <link rel="stylesheet" href="/css/phoenix.css"/>
        
     <!-- style app -->
     <link rel="stylesheet" href="/dnsguard/web/css/simple.css"/>
     <link rel="stylesheet" href="http://cdn.datatables.net/1.10.0/css/jquery.dataTables.css"/>
     
-    <script data-main="/dnsguard/web/js/main" src="/js/ext/requirejs/require.js"></script>
+    <script data-main="/dnsguard/web/js/main" src="/js/ext/require.js"></script>
     
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="http://cdn.datatables.net/1.10.0/js/jquery.dataTables.js"></script>
diff --git a/samples/dnsguard/src/main/resources/js/dnsconfig.js b/samples/dnsguard/src/main/resources/js/dnsconfig.js
index 0031ae62d11946c2151b806d8d02e624d887bb0d..d800b034b955944ce205ee93fa0a2717c0eafe27 100644 (file)
--- a/samples/dnsguard/src/main/resources/js/dnsconfig.js
+++ b/samples/dnsguard/src/main/resources/js/dnsconfig.js
@@ -2,9 +2,9 @@
 
 require.config({
   paths: {
-    "jquery": "/js/ext/jquery/dist/jquery.min",
-    "underscore": "/js/ext/underscore/underscore",
-    "backbone": "/js/ext/backbone/backbone",
+    "jquery": "/js/ext/jquery",
+    "underscore": "/js/ext/underscore",
+    "backbone": "/js/ext/backbone",
     "datatables": "/dnsguard/web/js/ext/datatables/media/js/jquery.dataTables",
     "d3": "/dnsguard/web/js/ext/d3/d3.min",
     "d3pie": "/dnsguard/web/js/d3pie/d3pie"
diff --git a/samples/dnsguard/src/main/resources/js/modconfig.js b/samples/dnsguard/src/main/resources/js/modconfig.js
index c89d2d5d74d0b27d1f5101c01feb3d7a38cc804e..4f2ca2fe2bf541200a4f3d713122423fd5d7eef2 100644 (file)
--- a/samples/dnsguard/src/main/resources/js/modconfig.js
+++ b/samples/dnsguard/src/main/resources/js/modconfig.js
@@ -2,9 +2,9 @@
 
 require.config({
   paths: {
-    "jquery": "/js/ext/jquery/dist/jquery.min",
-    "underscore": "/js/ext/underscore/underscore",
-    "backbone": "/js/ext/backbone/backbone",
+    "jquery": "/js/ext/jquery",
+    "underscore": "/js/ext/underscore",
+    "backbone": "/js/ext/backbone",
     "datatables": "/dnsguard/web/js/ext/datatables/media/js/jquery.dataTables",
     "d3": "/dnsguard/web/js/ext/d3/d3.min",
     "d3pie": "/dnsguard/web/js/d3pie/d3pie"
diff --git a/samples/proactive b/samples/proactive
new file mode 160000 (submodule)
index 0000000..513d96e
--- /dev/null
+++ b/samples/proactive
@@ -0,0 +1 @@
+Subproject commit 513d96ee332ab33b7b398b4e90f931b255a7af1e