diff --git a/webapp/WEB-INF/header.inc.html b/webapp/WEB-INF/header.inc.html index 2eabdc2..9dd02d9 100644 --- a/webapp/WEB-INF/header.inc.html +++ b/webapp/WEB-INF/header.inc.html @@ -7,10 +7,10 @@ KinoSearch :: ${rutext} - + - - + +
diff --git a/webapp/WEB-INF/web.xml b/webapp/WEB-INF/web.xml index ce5522f..b7cbaea 100644 --- a/webapp/WEB-INF/web.xml +++ b/webapp/WEB-INF/web.xml @@ -30,7 +30,8 @@ default - /lib/* + /js/* + /fonts/* /css/* *.png diff --git a/webapp/lib/bootstrap/css/bootstrap.min.css b/webapp/css/bootstrap.min.css similarity index 100% rename from webapp/lib/bootstrap/css/bootstrap.min.css rename to webapp/css/bootstrap.min.css diff --git a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.eot b/webapp/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.eot rename to webapp/fonts/glyphicons-halflings-regular.eot diff --git a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.svg b/webapp/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.svg rename to webapp/fonts/glyphicons-halflings-regular.svg diff --git a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf b/webapp/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to webapp/fonts/glyphicons-halflings-regular.ttf diff --git a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.woff b/webapp/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.woff rename to webapp/fonts/glyphicons-halflings-regular.woff diff --git a/webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/webapp/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from webapp/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to webapp/fonts/glyphicons-halflings-regular.woff2 diff --git a/webapp/lib/bootstrap/js/bootstrap.min.js b/webapp/js/bootstrap.min.js similarity index 100% rename from webapp/lib/bootstrap/js/bootstrap.min.js rename to webapp/js/bootstrap.min.js diff --git a/webapp/lib/jquery-2.1.4.min.js b/webapp/js/jquery-2.1.4.min.js similarity index 100% rename from webapp/lib/jquery-2.1.4.min.js rename to webapp/js/jquery-2.1.4.min.js