From c1c6b8f1edb9039709354a3889b05a4e25460750 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Sun, 16 Dec 2012 16:35:00 +0100
Subject: [PATCH] Reorganize static resources

---
 .../templates/default/admin/node/lookup.tpl   |   8 ++---
 .../templates/default/admin/user/lookup.tpl   |   8 ++---
 frontend/templates/default/admin/vps/list.tpl |   8 ++---
 .../templates/default/client/vps/list.tpl     |  14 ++++-----
 .../templates/default/client/vps/lookup.tpl   |   6 ++--
 frontend/templates/default/shared/main.tpl    |  14 ++++-----
 .../default/static}/css/chosen.css            |   0
 .../default/static}/css/cvm.css               |  28 +++++++++---------
 .../css/fonts/base/icomoon-webfont.eot        | Bin
 .../css/fonts/base/icomoon-webfont.svg        |   0
 .../css/fonts/base/icomoon-webfont.ttf        | Bin
 .../css/fonts/base/icomoon-webfont.woff       | Bin
 .../fonts/social/icomoonsocial-webfont.eot    | Bin
 .../fonts/social/icomoonsocial-webfont.svg    |   0
 .../fonts/social/icomoonsocial-webfont.ttf    | Bin
 .../fonts/social/icomoonsocial-webfont.woff   | Bin
 .../static}/css/img/breadcrumbs-bg.gif        | Bin
 .../default/static}/css/img/chosen-sprite.png | Bin
 .../static}/css/img/fancybox/blank.gif        | Bin
 .../static}/css/img/fancybox/fancy_close.png  | Bin
 .../css/img/fancybox/fancy_loading.png        | Bin
 .../css/img/fancybox/fancy_nav_left.png       | Bin
 .../css/img/fancybox/fancy_nav_right.png      | Bin
 .../css/img/fancybox/fancy_shadow_e.png       | Bin
 .../css/img/fancybox/fancy_shadow_n.png       | Bin
 .../css/img/fancybox/fancy_shadow_ne.png      | Bin
 .../css/img/fancybox/fancy_shadow_nw.png      | Bin
 .../css/img/fancybox/fancy_shadow_s.png       | Bin
 .../css/img/fancybox/fancy_shadow_se.png      | Bin
 .../css/img/fancybox/fancy_shadow_sw.png      | Bin
 .../css/img/fancybox/fancy_shadow_w.png       | Bin
 .../css/img/fancybox/fancy_title_left.png     | Bin
 .../css/img/fancybox/fancy_title_main.png     | Bin
 .../css/img/fancybox/fancy_title_over.png     | Bin
 .../css/img/fancybox/fancy_title_right.png    | Bin
 .../static}/css/img/fancybox/fancybox-x.png   | Bin
 .../static}/css/img/fancybox/fancybox-y.png   | Bin
 .../static}/css/img/fancybox/fancybox.png     | Bin
 .../img/fancybox/jquery.easing-1.3.pack.js    |   0
 .../css/img/fancybox/jquery.fancybox-1.3.4.js |   0
 .../fancybox/jquery.fancybox-1.3.4.pack.js    |   0
 .../fancybox/jquery.mousewheel-3.0.4.pack.js  |   0
 .../default/static}/css/img/grid.png          | Bin
 .../static}/css/img/icon-arrow-right.png      | Bin
 .../default/static}/css/img/icon-check.png    | Bin
 .../default/static}/css/img/rte/link.png      | Bin
 .../static}/css/img/rte/link_break.png        | Bin
 .../static}/css/img/rte/picture_empty.png     | Bin
 .../static}/css/img/rte/text_align_center.png | Bin
 .../static}/css/img/rte/text_align_left.png   | Bin
 .../static}/css/img/rte/text_align_right.png  | Bin
 .../default/static}/css/img/rte/text_bold.png | Bin
 .../static}/css/img/rte/text_italic.png       | Bin
 .../static}/css/img/rte/text_list_bullets.png | Bin
 .../static}/css/img/rte/text_list_numbers.png | Bin
 .../css/img/rte/text_strikethrough.png        | Bin
 .../static}/css/img/rte/text_subscript.png    | Bin
 .../static}/css/img/rte/text_superscript.png  | Bin
 .../static}/css/jquery.fancybox-1.3.4.css     |   0
 .../default/static}/css/kickstart-buttons.css |   0
 .../default/static}/css/kickstart-forms.css   |   0
 .../default/static}/css/kickstart-grid.css    |   0
 .../default/static}/css/kickstart-icons.css   |   0
 .../default/static}/css/kickstart-menus.css   |   0
 .../default/static}/css/kickstart.css         |   0
 .../default/static}/css/prettify.css          |   0
 .../default/static}/css/tiptip.css            |   0
 .../default/static/images/button/restart.png} | Bin
 .../default/static/images/button/start.png}   | Bin
 .../default/static/images/button/stop.png}    | Bin
 .../default/static/images/error/error.png}    | Bin
 .../default/static/images/error/info.png}     | Bin
 .../default/static/images/error/success.png}  | Bin
 .../default/static/images/error/warning.png}  | Bin
 .../default/static/images/menu/alerts.png}    | Bin
 .../default/static/images/menu/api.png}       | Bin
 .../default/static/images/menu/backup.png}    | Bin
 .../default/static/images/menu/console.png}   | Bin
 .../default/static/images/menu/ip.png}        | Bin
 .../default/static/images/menu/overview.png}  | Bin
 .../default/static/images/menu/password.png}  | Bin
 .../default/static/images/menu/reinstall.png} | Bin
 .../static/images/menu/statistics.png}        | Bin
 .../default/static/images/misc}/loading.gif   | Bin
 .../default/static/images/misc}/logo.png      | Bin
 .../default/static/images/misc/wrench.png}    | Bin
 .../default/static/images/status/offline.png} | Bin
 .../default/static/images/status/online.png}  | Bin
 .../static/images/status/suspended.png}       | Bin
 .../default/static/images/status/unknown.png} | Bin
 .../{ => templates/default/static}/js/cvm.js  |   0
 .../default/static}/js/kickstart.js           |   0
 .../default/static}/js/prettify.js            |   0
 93 files changed, 43 insertions(+), 43 deletions(-)
 rename frontend/{ => templates/default/static}/css/chosen.css (100%)
 rename frontend/{ => templates/default/static}/css/cvm.css (91%)
 rename frontend/{ => templates/default/static}/css/fonts/base/icomoon-webfont.eot (100%)
 rename frontend/{ => templates/default/static}/css/fonts/base/icomoon-webfont.svg (100%)
 rename frontend/{ => templates/default/static}/css/fonts/base/icomoon-webfont.ttf (100%)
 rename frontend/{ => templates/default/static}/css/fonts/base/icomoon-webfont.woff (100%)
 rename frontend/{ => templates/default/static}/css/fonts/social/icomoonsocial-webfont.eot (100%)
 rename frontend/{ => templates/default/static}/css/fonts/social/icomoonsocial-webfont.svg (100%)
 rename frontend/{ => templates/default/static}/css/fonts/social/icomoonsocial-webfont.ttf (100%)
 rename frontend/{ => templates/default/static}/css/fonts/social/icomoonsocial-webfont.woff (100%)
 rename frontend/{ => templates/default/static}/css/img/breadcrumbs-bg.gif (100%)
 rename frontend/{ => templates/default/static}/css/img/chosen-sprite.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/blank.gif (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_close.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_loading.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_nav_left.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_nav_right.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_shadow_e.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_shadow_n.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_shadow_ne.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_shadow_nw.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_shadow_s.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_shadow_se.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_shadow_sw.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_shadow_w.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_title_left.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_title_main.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_title_over.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancy_title_right.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancybox-x.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancybox-y.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/fancybox.png (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/jquery.easing-1.3.pack.js (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/jquery.fancybox-1.3.4.js (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/jquery.fancybox-1.3.4.pack.js (100%)
 rename frontend/{ => templates/default/static}/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js (100%)
 rename frontend/{ => templates/default/static}/css/img/grid.png (100%)
 rename frontend/{ => templates/default/static}/css/img/icon-arrow-right.png (100%)
 rename frontend/{ => templates/default/static}/css/img/icon-check.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/link.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/link_break.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/picture_empty.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_align_center.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_align_left.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_align_right.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_bold.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_italic.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_list_bullets.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_list_numbers.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_strikethrough.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_subscript.png (100%)
 rename frontend/{ => templates/default/static}/css/img/rte/text_superscript.png (100%)
 rename frontend/{ => templates/default/static}/css/jquery.fancybox-1.3.4.css (100%)
 rename frontend/{ => templates/default/static}/css/kickstart-buttons.css (100%)
 rename frontend/{ => templates/default/static}/css/kickstart-forms.css (100%)
 rename frontend/{ => templates/default/static}/css/kickstart-grid.css (100%)
 rename frontend/{ => templates/default/static}/css/kickstart-icons.css (100%)
 rename frontend/{ => templates/default/static}/css/kickstart-menus.css (100%)
 rename frontend/{ => templates/default/static}/css/kickstart.css (100%)
 rename frontend/{ => templates/default/static}/css/prettify.css (100%)
 rename frontend/{ => templates/default/static}/css/tiptip.css (100%)
 rename frontend/{images/button_restart.png => templates/default/static/images/button/restart.png} (100%)
 rename frontend/{images/button_start.png => templates/default/static/images/button/start.png} (100%)
 rename frontend/{images/button_stop.png => templates/default/static/images/button/stop.png} (100%)
 rename frontend/{images/errorhandler_error.png => templates/default/static/images/error/error.png} (100%)
 rename frontend/{images/errorhandler_info.png => templates/default/static/images/error/info.png} (100%)
 rename frontend/{images/errorhandler_success.png => templates/default/static/images/error/success.png} (100%)
 rename frontend/{images/errorhandler_warning.png => templates/default/static/images/error/warning.png} (100%)
 rename frontend/{images/icon_alerts.png => templates/default/static/images/menu/alerts.png} (100%)
 rename frontend/{images/icon_api.png => templates/default/static/images/menu/api.png} (100%)
 rename frontend/{images/icon_backup.png => templates/default/static/images/menu/backup.png} (100%)
 rename frontend/{images/icon_webshell.png => templates/default/static/images/menu/console.png} (100%)
 rename frontend/{images/icon_ip.png => templates/default/static/images/menu/ip.png} (100%)
 rename frontend/{images/icon_overview.png => templates/default/static/images/menu/overview.png} (100%)
 rename frontend/{images/icon_password.png => templates/default/static/images/menu/password.png} (100%)
 rename frontend/{images/icon_reinstall.png => templates/default/static/images/menu/reinstall.png} (100%)
 rename frontend/{images/icon_statistics.png => templates/default/static/images/menu/statistics.png} (100%)
 rename frontend/{images => templates/default/static/images/misc}/loading.gif (100%)
 rename frontend/{images => templates/default/static/images/misc}/logo.png (100%)
 rename frontend/{images/icon_wrench.png => templates/default/static/images/misc/wrench.png} (100%)
 rename frontend/{images/icon_offline.png => templates/default/static/images/status/offline.png} (100%)
 rename frontend/{images/icon_online.png => templates/default/static/images/status/online.png} (100%)
 rename frontend/{images/icon_suspended.png => templates/default/static/images/status/suspended.png} (100%)
 rename frontend/{images/icon_unknown.png => templates/default/static/images/status/unknown.png} (100%)
 rename frontend/{ => templates/default/static}/js/cvm.js (100%)
 rename frontend/{ => templates/default/static}/js/kickstart.js (100%)
 rename frontend/{ => templates/default/static}/js/prettify.js (100%)

diff --git a/frontend/templates/default/admin/node/lookup.tpl b/frontend/templates/default/admin/node/lookup.tpl
index fbc1a3a..cd46301 100644
--- a/frontend/templates/default/admin/node/lookup.tpl
+++ b/frontend/templates/default/admin/node/lookup.tpl
@@ -36,13 +36,13 @@
 			<tr class="clickable" data-url="/{%?container[id]}/">
 				<td class="container-status">
 					{%if container[status] == running}
-						<img src="/images/icon_online.png" alt="{%!list-status-running}">
+						<img src="/templates/default/static/images/status/online.png" alt="{%!list-status-running}">
 					{%elseif container[status] == stopped}
-						<img src="/images/icon_offline.png" alt="{%!list-status-stopped}">
+						<img src="/templates/default/static/images/status/offline.png" alt="{%!list-status-stopped}">
 					{%elseif container[status] == suspended}
-						<img src="/images/icon_suspended.png" alt="{%!list-status-suspended}">
+						<img src="/templates/default/static/images/status/suspended.png" alt="{%!list-status-suspended}">
 					{%else}
-						<img src="/images/icon_unknown.png" alt="{%!list-status-unknown}">
+						<img src="/templates/default/static/images/status/unknown.png" alt="{%!list-status-unknown}">
 					{%/if}
 				</td>
 				<td>
diff --git a/frontend/templates/default/admin/user/lookup.tpl b/frontend/templates/default/admin/user/lookup.tpl
index e1498b5..347425f 100644
--- a/frontend/templates/default/admin/user/lookup.tpl
+++ b/frontend/templates/default/admin/user/lookup.tpl
@@ -53,13 +53,13 @@
 		<tr class="clickable" data-url="/{%?container[id]}/">
 			<td class="container-status">
 				{%if container[status] == running}
-					<img src="/images/icon_online.png" alt="{%!list-status-running}">
+					<img src="/templates/default/static/images/status/online.png" alt="{%!list-status-running}">
 				{%elseif container[status] == stopped}
-					<img src="/images/icon_offline.png" alt="{%!list-status-stopped}">
+					<img src="/templates/default/static/images/status/offline.png" alt="{%!list-status-stopped}">
 				{%elseif container[status] == suspended}
-					<img src="/images/icon_suspended.png" alt="{%!list-status-suspended}">
+					<img src="/templates/default/static/images/status/suspended.png" alt="{%!list-status-suspended}">
 				{%else}
-					<img src="/images/icon_unknown.png" alt="{%!list-status-unknown}">
+					<img src="/templates/default/static/images/status/unknown.png" alt="{%!list-status-unknown}">
 				{%/if}
 			<td>
 				<a href="/{%?container[id]}/">
diff --git a/frontend/templates/default/admin/vps/list.tpl b/frontend/templates/default/admin/vps/list.tpl
index e10d6f9..df4889e 100644
--- a/frontend/templates/default/admin/vps/list.tpl
+++ b/frontend/templates/default/admin/vps/list.tpl
@@ -13,13 +13,13 @@
 		<tr class="clickable" data-url="/{%?vps[id]}/">
 			<td class="container-status">
 				{%if vps[status] == running}
-					<img src="/images/icon_online.png" alt="{%!list-status-running}">
+					<img src="/templates/default/static/images/status/online.png" alt="{%!list-status-running}">
 				{%elseif vps[status] == stopped}
-					<img src="/images/icon_offline.png" alt="{%!list-status-stopped}">
+					<img src="/templates/default/static/images/status/offline.png" alt="{%!list-status-stopped}">
 				{%elseif vps[status] == suspended}
-					<img src="/images/icon_suspended.png" alt="{%!list-status-suspended}">
+					<img src="/templates/default/static/images/status/suspended.png" alt="{%!list-status-suspended}">
 				{%else}
-					<img src="/images/icon_unknown.png" alt="{%!list-status-unknown}">
+					<img src="/templates/default/static/images/status/unknown.png" alt="{%!list-status-unknown}">
 				{%/if}
 			</td>
 			<td>
diff --git a/frontend/templates/default/client/vps/list.tpl b/frontend/templates/default/client/vps/list.tpl
index 0eb1210..3f48054 100644
--- a/frontend/templates/default/client/vps/list.tpl
+++ b/frontend/templates/default/client/vps/list.tpl
@@ -11,14 +11,14 @@
 	{%foreach container in containers}
 		<tr class="clickable" data-url="/{%?container[id]}/">
 			<td class="container-status">
-				{%if vps[status] == running}
-					<img src="/images/icon_online.png" alt="{%!list-status-running}">
-				{%elseif vps[status] == stopped}
-					<img src="/images/icon_offline.png" alt="{%!list-status-stopped}">
-				{%elseif vps[status] == suspended}
-					<img src="/images/icon_suspended.png" alt="{%!list-status-suspended}">
+				{%if container[status] == running}
+					<img src="/templates/default/static/images/status/online.png" alt="{%!list-status-running}">
+				{%elseif container[status] == stopped}
+					<img src="/templates/default/static/images/status/offline.png" alt="{%!list-status-stopped}">
+				{%elseif container[status] == suspended}
+					<img src="/templates/default/static/images/status/suspended.png" alt="{%!list-status-suspended}">
 				{%else}
-					<img src="/images/icon_unknown.png" alt="{%!list-status-unknown}">
+					<img src="/templates/default/static/images/status/unknown.png" alt="{%!list-status-unknown}">
 				{%/if}
 			</td>
 			<td>
diff --git a/frontend/templates/default/client/vps/lookup.tpl b/frontend/templates/default/client/vps/lookup.tpl
index c40bd23..218e71b 100644
--- a/frontend/templates/default/client/vps/lookup.tpl
+++ b/frontend/templates/default/client/vps/lookup.tpl
@@ -27,15 +27,15 @@
 
 <div class="controlbox">
 	<a class="controlbutton button-loader" href="/{%?id}/start/">
-		<img src="/images/button_start.png" class="button-icon">
+		<img src="/templates/default/static/images/button/start.png" class="button-icon">
 		{%!overview-button-start}
 	</a>
 	<a class="controlbutton button-loader" href="/{%?id}/restart/">
-		<img src="/images/button_restart.png" class="button-icon">
+		<img src="/templates/default/static/images/button/restart.png" class="button-icon">
 		{%!overview-button-restart}
 	</a>
 	<a class="controlbutton button-loader last" href="/{%?id}/stop/">
-		<img src="/images/button_stop.png" class="button-icon">
+		<img src="/templates/default/static/images/button/stop.png" class="button-icon">
 		{%!overview-button-stop}
 	</a>
 	<div class="clear"></div>
diff --git a/frontend/templates/default/shared/main.tpl b/frontend/templates/default/shared/main.tpl
index 1d17008..2429c27 100644
--- a/frontend/templates/default/shared/main.tpl
+++ b/frontend/templates/default/shared/main.tpl
@@ -3,17 +3,17 @@
 	<head>
 		<title>CVM</title>
 		<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700">
-		<link rel="stylesheet" href="/css/cvm.css?1">
-		<link rel="stylesheet" href="/css/kickstart-grid.css" media="all">
+		<link rel="stylesheet" href="/templates/default/static/css/cvm.css?1">
+		<link rel="stylesheet" href="/templates/default/static/css/kickstart-grid.css" media="all">
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-		<script src="/js/prettify.js"></script>
-		<script src="/js/kickstart.js"></script>
-		<script src="/js/cvm.js?3"></script>
+		<script src="/templates/default/static/js/prettify.js"></script>
+		<script src="/templates/default/static/js/kickstart.js"></script>
+		<script src="/templates/default/static/js/cvm.js?3"></script>
 	</head>
 	<body>
 		<div class="wrapper">
 			<div class="header">
-				<img src="/images/logo.png">
+				<img src="/templates/default/static/images/misc/logo.png">
 				{%if logged-in == true}
 					<div class="userbox">
 						<div>{%!userbox-loggedin}</div>
@@ -33,7 +33,7 @@
 				{%!footer}
 			</div>
 		</div>
-		<img class="preload" src="/images/loading.gif">
+		<img class="preload" src="/templates/default/static/images/misc/loading.gif">
 		{%?generation}
 	</body>
 </html>
diff --git a/frontend/css/chosen.css b/frontend/templates/default/static/css/chosen.css
similarity index 100%
rename from frontend/css/chosen.css
rename to frontend/templates/default/static/css/chosen.css
diff --git a/frontend/css/cvm.css b/frontend/templates/default/static/css/cvm.css
similarity index 91%
rename from frontend/css/cvm.css
rename to frontend/templates/default/static/css/cvm.css
index e54eeba..aa100e3 100644
--- a/frontend/css/cvm.css
+++ b/frontend/templates/default/static/css/cvm.css
@@ -229,47 +229,47 @@ tr.clickable:hover
 
 #button_overview
 {
-	background-image: url(../images/icon_overview.png);
+	background-image: url(../images/menu/overview.png);
 }
 
 #button_statistics
 {
-	background-image: url(../images/icon_statistics.png);
+	background-image: url(../images/menu/statistics.png);
 }
 
 #button_webshell
 {
-	background-image: url(../images/icon_webshell.png);
+	background-image: url(../images/menu/console.png);
 }
 
 #button_ip
 {
-	background-image: url(../images/icon_ip.png);
+	background-image: url(../images/menu/ip.png);
 }
 
 #button_reinstall
 {
-	background-image: url(../images/icon_reinstall.png);
+	background-image: url(../images/menu/reinstall.png);
 }
 
 #button_backup
 {
-	background-image: url(../images/icon_backup.png);
+	background-image: url(../images/menu/backup.png);
 }
 
 #button_api
 {
-	background-image: url(../images/icon_api.png);
+	background-image: url(../images/menu/api.png);
 }
 
 #button_alerts
 {
-	background-image: url(../images/icon_alerts.png);
+	background-image: url(../images/menu/alerts.png);
 }
 
 #button_password
 {
-	background-image: url(../images/icon_password.png);
+	background-image: url(../images/menu/password.png);
 }
 
 .quota-item
@@ -449,28 +449,28 @@ tr.clickable:hover
 {
 	background-color: #FCCBC9;
 	border: 1px solid red;
-	background-image: url(../images/errorhandler_error.png);
+	background-image: url(../images/error/error.png);
 }
 
 .errorhandler.error-info
 {
 	background-color: #C9F6FC;
 	border: 1px solid blue;
-	background-image: url(../images/errorhandler_info.png);
+	background-image: url(../images/error/info.png);
 }
 
 .errorhandler.error-warning
 {
 	background-color: #FBFCC9;
 	border: 1px solid #C5BA00;
-	background-image: url(../images/errorhandler_warning.png);
+	background-image: url(../images/error/warning.png);
 }
 
 .errorhandler.error-success
 {
 	background-color: #DEFCC9;
 	border: 1px solid #4CC500;
-	background-image: url(../images/errorhandler_success.png);
+	background-image: url(../images/error/success.png);
 }
 
 .errorhandler ul
@@ -545,7 +545,7 @@ button.column
 	margin-top: 7px;
 	border: 2px solid #817F9D;
 	padding-left: 38px;
-	background-image: url(/images/icon_wrench.png);
+	background-image: url(/images/misc/wrench.png);
 	background-repeat: no-repeat;
 	background-position: 4px center;
 }
diff --git a/frontend/css/fonts/base/icomoon-webfont.eot b/frontend/templates/default/static/css/fonts/base/icomoon-webfont.eot
similarity index 100%
rename from frontend/css/fonts/base/icomoon-webfont.eot
rename to frontend/templates/default/static/css/fonts/base/icomoon-webfont.eot
diff --git a/frontend/css/fonts/base/icomoon-webfont.svg b/frontend/templates/default/static/css/fonts/base/icomoon-webfont.svg
similarity index 100%
rename from frontend/css/fonts/base/icomoon-webfont.svg
rename to frontend/templates/default/static/css/fonts/base/icomoon-webfont.svg
diff --git a/frontend/css/fonts/base/icomoon-webfont.ttf b/frontend/templates/default/static/css/fonts/base/icomoon-webfont.ttf
similarity index 100%
rename from frontend/css/fonts/base/icomoon-webfont.ttf
rename to frontend/templates/default/static/css/fonts/base/icomoon-webfont.ttf
diff --git a/frontend/css/fonts/base/icomoon-webfont.woff b/frontend/templates/default/static/css/fonts/base/icomoon-webfont.woff
similarity index 100%
rename from frontend/css/fonts/base/icomoon-webfont.woff
rename to frontend/templates/default/static/css/fonts/base/icomoon-webfont.woff
diff --git a/frontend/css/fonts/social/icomoonsocial-webfont.eot b/frontend/templates/default/static/css/fonts/social/icomoonsocial-webfont.eot
similarity index 100%
rename from frontend/css/fonts/social/icomoonsocial-webfont.eot
rename to frontend/templates/default/static/css/fonts/social/icomoonsocial-webfont.eot
diff --git a/frontend/css/fonts/social/icomoonsocial-webfont.svg b/frontend/templates/default/static/css/fonts/social/icomoonsocial-webfont.svg
similarity index 100%
rename from frontend/css/fonts/social/icomoonsocial-webfont.svg
rename to frontend/templates/default/static/css/fonts/social/icomoonsocial-webfont.svg
diff --git a/frontend/css/fonts/social/icomoonsocial-webfont.ttf b/frontend/templates/default/static/css/fonts/social/icomoonsocial-webfont.ttf
similarity index 100%
rename from frontend/css/fonts/social/icomoonsocial-webfont.ttf
rename to frontend/templates/default/static/css/fonts/social/icomoonsocial-webfont.ttf
diff --git a/frontend/css/fonts/social/icomoonsocial-webfont.woff b/frontend/templates/default/static/css/fonts/social/icomoonsocial-webfont.woff
similarity index 100%
rename from frontend/css/fonts/social/icomoonsocial-webfont.woff
rename to frontend/templates/default/static/css/fonts/social/icomoonsocial-webfont.woff
diff --git a/frontend/css/img/breadcrumbs-bg.gif b/frontend/templates/default/static/css/img/breadcrumbs-bg.gif
similarity index 100%
rename from frontend/css/img/breadcrumbs-bg.gif
rename to frontend/templates/default/static/css/img/breadcrumbs-bg.gif
diff --git a/frontend/css/img/chosen-sprite.png b/frontend/templates/default/static/css/img/chosen-sprite.png
similarity index 100%
rename from frontend/css/img/chosen-sprite.png
rename to frontend/templates/default/static/css/img/chosen-sprite.png
diff --git a/frontend/css/img/fancybox/blank.gif b/frontend/templates/default/static/css/img/fancybox/blank.gif
similarity index 100%
rename from frontend/css/img/fancybox/blank.gif
rename to frontend/templates/default/static/css/img/fancybox/blank.gif
diff --git a/frontend/css/img/fancybox/fancy_close.png b/frontend/templates/default/static/css/img/fancybox/fancy_close.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_close.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_close.png
diff --git a/frontend/css/img/fancybox/fancy_loading.png b/frontend/templates/default/static/css/img/fancybox/fancy_loading.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_loading.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_loading.png
diff --git a/frontend/css/img/fancybox/fancy_nav_left.png b/frontend/templates/default/static/css/img/fancybox/fancy_nav_left.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_nav_left.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_nav_left.png
diff --git a/frontend/css/img/fancybox/fancy_nav_right.png b/frontend/templates/default/static/css/img/fancybox/fancy_nav_right.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_nav_right.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_nav_right.png
diff --git a/frontend/css/img/fancybox/fancy_shadow_e.png b/frontend/templates/default/static/css/img/fancybox/fancy_shadow_e.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_shadow_e.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_shadow_e.png
diff --git a/frontend/css/img/fancybox/fancy_shadow_n.png b/frontend/templates/default/static/css/img/fancybox/fancy_shadow_n.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_shadow_n.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_shadow_n.png
diff --git a/frontend/css/img/fancybox/fancy_shadow_ne.png b/frontend/templates/default/static/css/img/fancybox/fancy_shadow_ne.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_shadow_ne.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_shadow_ne.png
diff --git a/frontend/css/img/fancybox/fancy_shadow_nw.png b/frontend/templates/default/static/css/img/fancybox/fancy_shadow_nw.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_shadow_nw.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_shadow_nw.png
diff --git a/frontend/css/img/fancybox/fancy_shadow_s.png b/frontend/templates/default/static/css/img/fancybox/fancy_shadow_s.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_shadow_s.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_shadow_s.png
diff --git a/frontend/css/img/fancybox/fancy_shadow_se.png b/frontend/templates/default/static/css/img/fancybox/fancy_shadow_se.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_shadow_se.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_shadow_se.png
diff --git a/frontend/css/img/fancybox/fancy_shadow_sw.png b/frontend/templates/default/static/css/img/fancybox/fancy_shadow_sw.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_shadow_sw.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_shadow_sw.png
diff --git a/frontend/css/img/fancybox/fancy_shadow_w.png b/frontend/templates/default/static/css/img/fancybox/fancy_shadow_w.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_shadow_w.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_shadow_w.png
diff --git a/frontend/css/img/fancybox/fancy_title_left.png b/frontend/templates/default/static/css/img/fancybox/fancy_title_left.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_title_left.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_title_left.png
diff --git a/frontend/css/img/fancybox/fancy_title_main.png b/frontend/templates/default/static/css/img/fancybox/fancy_title_main.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_title_main.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_title_main.png
diff --git a/frontend/css/img/fancybox/fancy_title_over.png b/frontend/templates/default/static/css/img/fancybox/fancy_title_over.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_title_over.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_title_over.png
diff --git a/frontend/css/img/fancybox/fancy_title_right.png b/frontend/templates/default/static/css/img/fancybox/fancy_title_right.png
similarity index 100%
rename from frontend/css/img/fancybox/fancy_title_right.png
rename to frontend/templates/default/static/css/img/fancybox/fancy_title_right.png
diff --git a/frontend/css/img/fancybox/fancybox-x.png b/frontend/templates/default/static/css/img/fancybox/fancybox-x.png
similarity index 100%
rename from frontend/css/img/fancybox/fancybox-x.png
rename to frontend/templates/default/static/css/img/fancybox/fancybox-x.png
diff --git a/frontend/css/img/fancybox/fancybox-y.png b/frontend/templates/default/static/css/img/fancybox/fancybox-y.png
similarity index 100%
rename from frontend/css/img/fancybox/fancybox-y.png
rename to frontend/templates/default/static/css/img/fancybox/fancybox-y.png
diff --git a/frontend/css/img/fancybox/fancybox.png b/frontend/templates/default/static/css/img/fancybox/fancybox.png
similarity index 100%
rename from frontend/css/img/fancybox/fancybox.png
rename to frontend/templates/default/static/css/img/fancybox/fancybox.png
diff --git a/frontend/css/img/fancybox/jquery.easing-1.3.pack.js b/frontend/templates/default/static/css/img/fancybox/jquery.easing-1.3.pack.js
similarity index 100%
rename from frontend/css/img/fancybox/jquery.easing-1.3.pack.js
rename to frontend/templates/default/static/css/img/fancybox/jquery.easing-1.3.pack.js
diff --git a/frontend/css/img/fancybox/jquery.fancybox-1.3.4.js b/frontend/templates/default/static/css/img/fancybox/jquery.fancybox-1.3.4.js
similarity index 100%
rename from frontend/css/img/fancybox/jquery.fancybox-1.3.4.js
rename to frontend/templates/default/static/css/img/fancybox/jquery.fancybox-1.3.4.js
diff --git a/frontend/css/img/fancybox/jquery.fancybox-1.3.4.pack.js b/frontend/templates/default/static/css/img/fancybox/jquery.fancybox-1.3.4.pack.js
similarity index 100%
rename from frontend/css/img/fancybox/jquery.fancybox-1.3.4.pack.js
rename to frontend/templates/default/static/css/img/fancybox/jquery.fancybox-1.3.4.pack.js
diff --git a/frontend/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js b/frontend/templates/default/static/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js
similarity index 100%
rename from frontend/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js
rename to frontend/templates/default/static/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js
diff --git a/frontend/css/img/grid.png b/frontend/templates/default/static/css/img/grid.png
similarity index 100%
rename from frontend/css/img/grid.png
rename to frontend/templates/default/static/css/img/grid.png
diff --git a/frontend/css/img/icon-arrow-right.png b/frontend/templates/default/static/css/img/icon-arrow-right.png
similarity index 100%
rename from frontend/css/img/icon-arrow-right.png
rename to frontend/templates/default/static/css/img/icon-arrow-right.png
diff --git a/frontend/css/img/icon-check.png b/frontend/templates/default/static/css/img/icon-check.png
similarity index 100%
rename from frontend/css/img/icon-check.png
rename to frontend/templates/default/static/css/img/icon-check.png
diff --git a/frontend/css/img/rte/link.png b/frontend/templates/default/static/css/img/rte/link.png
similarity index 100%
rename from frontend/css/img/rte/link.png
rename to frontend/templates/default/static/css/img/rte/link.png
diff --git a/frontend/css/img/rte/link_break.png b/frontend/templates/default/static/css/img/rte/link_break.png
similarity index 100%
rename from frontend/css/img/rte/link_break.png
rename to frontend/templates/default/static/css/img/rte/link_break.png
diff --git a/frontend/css/img/rte/picture_empty.png b/frontend/templates/default/static/css/img/rte/picture_empty.png
similarity index 100%
rename from frontend/css/img/rte/picture_empty.png
rename to frontend/templates/default/static/css/img/rte/picture_empty.png
diff --git a/frontend/css/img/rte/text_align_center.png b/frontend/templates/default/static/css/img/rte/text_align_center.png
similarity index 100%
rename from frontend/css/img/rte/text_align_center.png
rename to frontend/templates/default/static/css/img/rte/text_align_center.png
diff --git a/frontend/css/img/rte/text_align_left.png b/frontend/templates/default/static/css/img/rte/text_align_left.png
similarity index 100%
rename from frontend/css/img/rte/text_align_left.png
rename to frontend/templates/default/static/css/img/rte/text_align_left.png
diff --git a/frontend/css/img/rte/text_align_right.png b/frontend/templates/default/static/css/img/rte/text_align_right.png
similarity index 100%
rename from frontend/css/img/rte/text_align_right.png
rename to frontend/templates/default/static/css/img/rte/text_align_right.png
diff --git a/frontend/css/img/rte/text_bold.png b/frontend/templates/default/static/css/img/rte/text_bold.png
similarity index 100%
rename from frontend/css/img/rte/text_bold.png
rename to frontend/templates/default/static/css/img/rte/text_bold.png
diff --git a/frontend/css/img/rte/text_italic.png b/frontend/templates/default/static/css/img/rte/text_italic.png
similarity index 100%
rename from frontend/css/img/rte/text_italic.png
rename to frontend/templates/default/static/css/img/rte/text_italic.png
diff --git a/frontend/css/img/rte/text_list_bullets.png b/frontend/templates/default/static/css/img/rte/text_list_bullets.png
similarity index 100%
rename from frontend/css/img/rte/text_list_bullets.png
rename to frontend/templates/default/static/css/img/rte/text_list_bullets.png
diff --git a/frontend/css/img/rte/text_list_numbers.png b/frontend/templates/default/static/css/img/rte/text_list_numbers.png
similarity index 100%
rename from frontend/css/img/rte/text_list_numbers.png
rename to frontend/templates/default/static/css/img/rte/text_list_numbers.png
diff --git a/frontend/css/img/rte/text_strikethrough.png b/frontend/templates/default/static/css/img/rte/text_strikethrough.png
similarity index 100%
rename from frontend/css/img/rte/text_strikethrough.png
rename to frontend/templates/default/static/css/img/rte/text_strikethrough.png
diff --git a/frontend/css/img/rte/text_subscript.png b/frontend/templates/default/static/css/img/rte/text_subscript.png
similarity index 100%
rename from frontend/css/img/rte/text_subscript.png
rename to frontend/templates/default/static/css/img/rte/text_subscript.png
diff --git a/frontend/css/img/rte/text_superscript.png b/frontend/templates/default/static/css/img/rte/text_superscript.png
similarity index 100%
rename from frontend/css/img/rte/text_superscript.png
rename to frontend/templates/default/static/css/img/rte/text_superscript.png
diff --git a/frontend/css/jquery.fancybox-1.3.4.css b/frontend/templates/default/static/css/jquery.fancybox-1.3.4.css
similarity index 100%
rename from frontend/css/jquery.fancybox-1.3.4.css
rename to frontend/templates/default/static/css/jquery.fancybox-1.3.4.css
diff --git a/frontend/css/kickstart-buttons.css b/frontend/templates/default/static/css/kickstart-buttons.css
similarity index 100%
rename from frontend/css/kickstart-buttons.css
rename to frontend/templates/default/static/css/kickstart-buttons.css
diff --git a/frontend/css/kickstart-forms.css b/frontend/templates/default/static/css/kickstart-forms.css
similarity index 100%
rename from frontend/css/kickstart-forms.css
rename to frontend/templates/default/static/css/kickstart-forms.css
diff --git a/frontend/css/kickstart-grid.css b/frontend/templates/default/static/css/kickstart-grid.css
similarity index 100%
rename from frontend/css/kickstart-grid.css
rename to frontend/templates/default/static/css/kickstart-grid.css
diff --git a/frontend/css/kickstart-icons.css b/frontend/templates/default/static/css/kickstart-icons.css
similarity index 100%
rename from frontend/css/kickstart-icons.css
rename to frontend/templates/default/static/css/kickstart-icons.css
diff --git a/frontend/css/kickstart-menus.css b/frontend/templates/default/static/css/kickstart-menus.css
similarity index 100%
rename from frontend/css/kickstart-menus.css
rename to frontend/templates/default/static/css/kickstart-menus.css
diff --git a/frontend/css/kickstart.css b/frontend/templates/default/static/css/kickstart.css
similarity index 100%
rename from frontend/css/kickstart.css
rename to frontend/templates/default/static/css/kickstart.css
diff --git a/frontend/css/prettify.css b/frontend/templates/default/static/css/prettify.css
similarity index 100%
rename from frontend/css/prettify.css
rename to frontend/templates/default/static/css/prettify.css
diff --git a/frontend/css/tiptip.css b/frontend/templates/default/static/css/tiptip.css
similarity index 100%
rename from frontend/css/tiptip.css
rename to frontend/templates/default/static/css/tiptip.css
diff --git a/frontend/images/button_restart.png b/frontend/templates/default/static/images/button/restart.png
similarity index 100%
rename from frontend/images/button_restart.png
rename to frontend/templates/default/static/images/button/restart.png
diff --git a/frontend/images/button_start.png b/frontend/templates/default/static/images/button/start.png
similarity index 100%
rename from frontend/images/button_start.png
rename to frontend/templates/default/static/images/button/start.png
diff --git a/frontend/images/button_stop.png b/frontend/templates/default/static/images/button/stop.png
similarity index 100%
rename from frontend/images/button_stop.png
rename to frontend/templates/default/static/images/button/stop.png
diff --git a/frontend/images/errorhandler_error.png b/frontend/templates/default/static/images/error/error.png
similarity index 100%
rename from frontend/images/errorhandler_error.png
rename to frontend/templates/default/static/images/error/error.png
diff --git a/frontend/images/errorhandler_info.png b/frontend/templates/default/static/images/error/info.png
similarity index 100%
rename from frontend/images/errorhandler_info.png
rename to frontend/templates/default/static/images/error/info.png
diff --git a/frontend/images/errorhandler_success.png b/frontend/templates/default/static/images/error/success.png
similarity index 100%
rename from frontend/images/errorhandler_success.png
rename to frontend/templates/default/static/images/error/success.png
diff --git a/frontend/images/errorhandler_warning.png b/frontend/templates/default/static/images/error/warning.png
similarity index 100%
rename from frontend/images/errorhandler_warning.png
rename to frontend/templates/default/static/images/error/warning.png
diff --git a/frontend/images/icon_alerts.png b/frontend/templates/default/static/images/menu/alerts.png
similarity index 100%
rename from frontend/images/icon_alerts.png
rename to frontend/templates/default/static/images/menu/alerts.png
diff --git a/frontend/images/icon_api.png b/frontend/templates/default/static/images/menu/api.png
similarity index 100%
rename from frontend/images/icon_api.png
rename to frontend/templates/default/static/images/menu/api.png
diff --git a/frontend/images/icon_backup.png b/frontend/templates/default/static/images/menu/backup.png
similarity index 100%
rename from frontend/images/icon_backup.png
rename to frontend/templates/default/static/images/menu/backup.png
diff --git a/frontend/images/icon_webshell.png b/frontend/templates/default/static/images/menu/console.png
similarity index 100%
rename from frontend/images/icon_webshell.png
rename to frontend/templates/default/static/images/menu/console.png
diff --git a/frontend/images/icon_ip.png b/frontend/templates/default/static/images/menu/ip.png
similarity index 100%
rename from frontend/images/icon_ip.png
rename to frontend/templates/default/static/images/menu/ip.png
diff --git a/frontend/images/icon_overview.png b/frontend/templates/default/static/images/menu/overview.png
similarity index 100%
rename from frontend/images/icon_overview.png
rename to frontend/templates/default/static/images/menu/overview.png
diff --git a/frontend/images/icon_password.png b/frontend/templates/default/static/images/menu/password.png
similarity index 100%
rename from frontend/images/icon_password.png
rename to frontend/templates/default/static/images/menu/password.png
diff --git a/frontend/images/icon_reinstall.png b/frontend/templates/default/static/images/menu/reinstall.png
similarity index 100%
rename from frontend/images/icon_reinstall.png
rename to frontend/templates/default/static/images/menu/reinstall.png
diff --git a/frontend/images/icon_statistics.png b/frontend/templates/default/static/images/menu/statistics.png
similarity index 100%
rename from frontend/images/icon_statistics.png
rename to frontend/templates/default/static/images/menu/statistics.png
diff --git a/frontend/images/loading.gif b/frontend/templates/default/static/images/misc/loading.gif
similarity index 100%
rename from frontend/images/loading.gif
rename to frontend/templates/default/static/images/misc/loading.gif
diff --git a/frontend/images/logo.png b/frontend/templates/default/static/images/misc/logo.png
similarity index 100%
rename from frontend/images/logo.png
rename to frontend/templates/default/static/images/misc/logo.png
diff --git a/frontend/images/icon_wrench.png b/frontend/templates/default/static/images/misc/wrench.png
similarity index 100%
rename from frontend/images/icon_wrench.png
rename to frontend/templates/default/static/images/misc/wrench.png
diff --git a/frontend/images/icon_offline.png b/frontend/templates/default/static/images/status/offline.png
similarity index 100%
rename from frontend/images/icon_offline.png
rename to frontend/templates/default/static/images/status/offline.png
diff --git a/frontend/images/icon_online.png b/frontend/templates/default/static/images/status/online.png
similarity index 100%
rename from frontend/images/icon_online.png
rename to frontend/templates/default/static/images/status/online.png
diff --git a/frontend/images/icon_suspended.png b/frontend/templates/default/static/images/status/suspended.png
similarity index 100%
rename from frontend/images/icon_suspended.png
rename to frontend/templates/default/static/images/status/suspended.png
diff --git a/frontend/images/icon_unknown.png b/frontend/templates/default/static/images/status/unknown.png
similarity index 100%
rename from frontend/images/icon_unknown.png
rename to frontend/templates/default/static/images/status/unknown.png
diff --git a/frontend/js/cvm.js b/frontend/templates/default/static/js/cvm.js
similarity index 100%
rename from frontend/js/cvm.js
rename to frontend/templates/default/static/js/cvm.js
diff --git a/frontend/js/kickstart.js b/frontend/templates/default/static/js/kickstart.js
similarity index 100%
rename from frontend/js/kickstart.js
rename to frontend/templates/default/static/js/kickstart.js
diff --git a/frontend/js/prettify.js b/frontend/templates/default/static/js/prettify.js
similarity index 100%
rename from frontend/js/prettify.js
rename to frontend/templates/default/static/js/prettify.js