Reorganize static resources

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>

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]}/">

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>

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>

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>

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>

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;
 }