From 9fe7ad33ab94c64eb55a22eeb5bd011dacdbc406 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 23 Mar 2016 16:12:35 +0300 Subject: [PATCH] =?UTF-8?q?refactory:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=20=D1=81=D1=82=D0=B8=D0=BB=D0=B5=D0=B9=20=D0=B2=20?= =?UTF-8?q?=D0=BA=D0=BE=D1=80=D0=BD=D0=B5=D0=B2=D1=83=D1=8E=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BF=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/WEB-INF/header.inc.html | 6 +++--- webapp/WEB-INF/web.xml | 3 ++- webapp/{lib/bootstrap => }/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin webapp/{lib/bootstrap => }/js/bootstrap.min.js | 0 webapp/{lib => js}/jquery-2.1.4.min.js | 0 10 files changed, 5 insertions(+), 4 deletions(-) rename webapp/{lib/bootstrap => }/css/bootstrap.min.css (100%) rename webapp/{lib/bootstrap => }/fonts/glyphicons-halflings-regular.eot (100%) rename webapp/{lib/bootstrap => }/fonts/glyphicons-halflings-regular.svg (100%) rename webapp/{lib/bootstrap => }/fonts/glyphicons-halflings-regular.ttf (100%) rename webapp/{lib/bootstrap => }/fonts/glyphicons-halflings-regular.woff (100%) rename webapp/{lib/bootstrap => }/fonts/glyphicons-halflings-regular.woff2 (100%) rename webapp/{lib/bootstrap => }/js/bootstrap.min.js (100%) rename webapp/{lib => js}/jquery-2.1.4.min.js (100%) 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