refactory: перенос стилей в корневую папку

2016-03-23 16:12:35 +03:00
parent a143dd3a27
commit 9fe7ad33ab
10 changed files with 5 additions and 4 deletions
--- a/webapp/WEB-INF/header.inc.html
+++ b/webapp/WEB-INF/header.inc.html
@@ -7,10 +7,10 @@
    <meta name="version" content="${version}">
    <title>KinoSearch :: ${rutext}</title>
    <link rel="icon" type="image/png" href="${basedir}/favicon.png" >
-    <link rel="stylesheet" type="text/css" href="${basedir}/lib/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="${basedir}/css/bootstrap.min.css">
    <link rel="stylesheet" type="text/css" href="${basedir}/css/style.css">
-    <script type="text/javascript" src="${basedir}/lib/jquery-2.1.4.min.js"></script>
-    <script type="text/javascript" src="${basedir}/lib/bootstrap/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="${basedir}/js/jquery-2.1.4.min.js"></script>
+    <script type="text/javascript" src="${basedir}/js/bootstrap.min.js"></script>
 </head>
 <body>
    <div class="container">
--- a/webapp/WEB-INF/web.xml
+++ b/webapp/WEB-INF/web.xml
@@ -30,7 +30,8 @@

    <servlet-mapping>
        <servlet-name>default</servlet-name>
-        <url-pattern>/lib/*</url-pattern>
+        <url-pattern>/js/*</url-pattern>
+        <url-pattern>/fonts/*</url-pattern>
        <url-pattern>/css/*</url-pattern>
        <url-pattern>*.png</url-pattern>
    </servlet-mapping>
--- a/webapp/lib/bootstrap/css/bootstrap.min.css
+++ b/webapp/lib/bootstrap/css/bootstrap.min.css
--- a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
+++ b/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
--- a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ b/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
--- a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
+++ b/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
--- a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
+++ b/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
--- a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
+++ b/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
--- a/webapp/lib/bootstrap/js/bootstrap.min.js
+++ b/webapp/lib/bootstrap/js/bootstrap.min.js
--- a/webapp/lib/jquery-2.1.4.min.js
+++ b/webapp/lib/jquery-2.1.4.min.js