Code Review / toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: b3c6709)
Update dnsguard app 91/8091/1
authorAndrew Kim <h.andrew.kim@gmail.com>
Tue, 17 Jun 2014 21:06:47 +0000 (16:06 -0500)
committerAndrew Kim <h.andrew.kim@gmail.com>
Tue, 17 Jun 2014 21:06:47 +0000 (16:06 -0500)
Change-Id: I20b212fab2b98d55cb530a6f4e38c0e2b580776b
Signed-off-by: Andrew Kim <h.andrew.kim@gmail.com>
samples/dnsguard/src/main/resources/WEB-INF/jsp/main.jsp patch | blob | history
samples/dnsguard/src/main/resources/js/main.js patch | blob | history

diff --git a/samples/dnsguard/src/main/resources/WEB-INF/jsp/main.jsp b/samples/dnsguard/src/main/resources/WEB-INF/jsp/main.jsp
index 4fe26e792233545a6ef0b3fa26a3ca6c8fbee5f7..0006cfe416b98796421a6667facf59869284bfa9 100644 (file)
--- a/samples/dnsguard/src/main/resources/WEB-INF/jsp/main.jsp
+++ b/samples/dnsguard/src/main/resources/WEB-INF/jsp/main.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/main" src="/js/ext/requirejs/require.js"></script>
+       <script data-main="/dnsguard/web/js/main" src="/js/ext/require.js"></script>
        
        </head>
        <body>
diff --git a/samples/dnsguard/src/main/resources/js/main.js b/samples/dnsguard/src/main/resources/js/main.js
index f14652053e1c982f85dc08caf70d1ec8de35e805..f01daff19684266183c6f95c65f20cd63db63296 100644 (file)
--- a/samples/dnsguard/src/main/resources/js/main.js
+++ b/samples/dnsguard/src/main/resources/js/main.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"