Responsive, version beta

package/usr/share/hedera-web/forms/admin/access-log/access-log.js

@@ -1,5 +1,5 @@
 
-Vn.Access = new Class
+Vn.AccessLog = new Class
 ({
 	Extends: Vn.Module
 
@@ -10,7 +10,7 @@ Vn.Access = new Class
 
 	,returnClicked: function (column, value)
 	{
-		this.hash.set ({'module': 'users'});
+		this.hash.set ({'module': 'admin/users'});
 	}
 });
 

package/usr/share/hedera-web/forms/admin/access-log/html.php

@@ -1,5 +1,6 @@
-<div id="access">
+<div id="access-log">
-	<h1><?php i('AccessLog') ?></h1>
+<div class="box">
+	<h1 class="title"><?=s('AccessLog')?></h1>
 	<vn-param id="user">
 		<vn-hash-link key="user"/>
 	</vn-param>
@@ -16,7 +17,7 @@
 		<tbody>
 		<tr>
 			<td class="label">
-				<label><?php i('UserNumber:') ?></label>
+				<label><?=s('UserNumber:')?></label>
 			</td>
 			<td>
 				<htk-label column="Id_Cliente" form="user-form"/>
@@ -24,7 +25,7 @@
 		</tr>
 		<tr>
 			<td class="label">
-				<label><?php i('User:') ?></label>
+				<label><?=s('User:')?></label>
 			</td>
 			<td>
 				<htk-label column="Cliente" form="user-form"/>
@@ -32,7 +33,7 @@
 		</tr>
 		<tr>
 			<td class="label">
-				<label><?php i('Phone:') ?></label>
+				<label><?=s('Phone:')?></label>
 			</td>
 			<td>
 				<htk-label column="Telefono" form="user-form"/>
@@ -40,7 +41,7 @@
 		</tr>
 		<tr>
 			<td class="label">
-				<label><?php i('Mobile:') ?></label>
+				<label><?=s('Mobile:')?></label>
 			</td>
 			<td>
 				<htk-label column="movil" form="user-form"/>
@@ -71,3 +72,4 @@
 		</htk-grid>
 	</div>
 </div>
+</div>

package/usr/share/hedera-web/forms/admin/access-log/style.css

@@ -0,0 +1,26 @@
+#access-log
+{
+	margin: 1em;
+	min-width: 35em;
+}
+#access-log .box
+{
+	max-width: 50em;
+	margin: 0 auto;
+	padding: 2em;
+}
+#access-log grid tbody tr
+{
+	height: 3.4em;
+}
+
+/* Form */
+
+#access-log table.form
+{
+	padding-bottom: 1.6em;
+}
+#access-log td.label
+{
+	width: 46%;
+}

package/usr/share/hedera-web/forms/admin/access/style.css

@@ -1,19 +0,0 @@
-#access h1
-{
-	font-weight: normal;
-	text-align: center;
-	font-size: 20px;
-	margin: 15px;
-}
-#access tbody tr
-{
-	height: 38px;
-}
-#access table.form
-{
-	padding-bottom: 20px;
-}
-#access td.label
-{
-	width: 48%;
-}

package/usr/share/hedera-web/forms/admin/links/style.css

@@ -6,9 +6,14 @@
 #cpanel .box
 {
 	max-width: 60em;
+	min-width: 25em;
 	padding: 2em;
 }
 #cpanel tbody tr
 {
 	height: 3.5em;
 }
+#cpanel tbody td img
+{
+	min-height: 1.6em;
+}

package/usr/share/hedera-web/forms/admin/photos/html.php

@@ -0,0 +1,35 @@
+<div id="photos">
+<div class="box">
+	<h1 class="title">
+		<?=s('Photos')?>
+	</h1>
+	<form action="rest.php?action=image" method="post" enctype="multipart/form-data" target="photos-iframe" id="photos-form">
+		<div class="form-group">
+			<label><?=s('Schema:')?></label>
+			<input type="hidden" name="schema" id="schema-field"/>
+			<htk-combo id="schema">
+				<db-model property="model">
+					SELECT name, `desc` FROM image_schema ORDER BY `desc`
+				</db-model>
+			</htk-combo>
+		</div>
+		<div class="form-group">
+			<label><?=s('ImageName:')?></label>
+			<input type="text" name="name"/>
+		</div>
+		<div class="form-group">
+			<label><?=s('Id:')?></label>
+			<input type="text" name="id" id="photo-id"/>
+		</div>
+		<div class="form-group">
+			<label><?=s('ImageFile:')?></label>
+			<input type="file" name="image"/>
+			<input type="hidden" name="MAX_FILE_SIZE" id="photo-size"/>
+		</div>
+		<button class="vn" id="photo-submit">
+			<?=s('Upload')?>
+		</button>
+	</form>
+	<iframe name="photos-iframe" id="photos-iframe"></iframe>
+</div>
+</div>

package/usr/share/hedera-web/forms/admin/photos/photos.js

@@ -0,0 +1,43 @@
+
+Vn.Photos = new Class
+({
+	Extends: Vn.Module
+
+	,activate: function ()
+	{
+		this.get ('schema').value = 'catalog';
+		$('photo-size').value = 10 /* MB */ * 1048576;
+		$('photos-form').addEventListener ('submit', this.onFormSubmit.bind (this));
+		$('photos-iframe').addEventListener ('load', this.onImageUpload.bind (this));
+		$('photo-id').focus ();
+	}
+
+	,onFormSubmit: function ()
+	{
+		$('schema-field').value = this.get ('schema').value;
+		$('photo-submit').disabled = true;
+		this.gui.loaderPush ();
+	}
+
+	,onImageUpload: function (iframe)
+	{
+		this.gui.loaderPop ();
+		$('photo-submit').disabled = false;
+
+		try {
+			var responseText = $('photos-iframe').contentDocument.body.textContent;
+			var response = eval ('('+ responseText +')');
+
+			if (response.data)
+			{
+				$('photo-id').value = '';
+				$('photo-id').focus ();
+				alert (_('ImageUploaded'));
+			}
+			else
+				alert (response.error.message +' ('+ response.error.code +')');
+		}
+		catch (e) {}
+	}
+});
+

package/usr/share/hedera-web/forms/admin/photos/send-data.php

@@ -0,0 +1,42 @@
+<?php
+
+session_start ();
+
+$params = array
+(
+	 'name'
+	,'surname'
+	,'email'
+	,'message'
+	,'address'
+	,'pc'
+	,'city'
+	,'phone'
+	,'captcha'
+);
+
+$paramsOk = TRUE;
+
+foreach ($params as $param)
+if (!isset ($_POST[$param]) || $_POST[$param] == '')
+{
+	$paramsOk = FALSE;
+	break;
+}
+
+header ('Content-Type: application/json');
+
+if ($paramsOk && isset ($_SESSION['captcha'])
+&& $_POST['captcha'] == $_SESSION['captcha'])
+{
+	mail ('nuria@verdnatura.es', 'Verdnatura', print_r ($_POST, TRUE),
+		'From: Verdnatura <www-data@verdnatura.es>');
+
+	echo json_encode (TRUE);
+}
+else
+	echo json_encode (FALSE);
+
+unset ($_SESSION['captcha']);
+
+?>

package/usr/share/hedera-web/forms/admin/photos/style.css

@@ -0,0 +1,45 @@
+
+#photos
+{	
+	margin: 1em;
+}
+#photos .box
+{
+	max-width: 40em;
+	padding: 2em;
+}
+#photos form
+{
+	margin: 0 auto;
+	max-width: 25em;
+}
+div.form-group
+{
+	padding: 0.4em;
+}
+#photos form label
+{
+	display: block;
+	margin-bottom: 0.5em;
+}
+#photos input,
+#photos select
+{
+	margin: 0;
+	width: 100%;
+}
+#photos-iframe
+{
+	display: none;
+}
+
+/* Footer */
+
+#photos button
+{
+	display: block;
+	margin: 0 auto;
+	padding: 0.6em;
+	margin-top: 1.5em;
+}
+

package/usr/share/hedera-web/forms/admin/users/html.php

@@ -1,10 +1,11 @@
 <div id="users">
-	<h1><?php i('UserManagement') ?></h1>
+<div class="box">
+	<h1 class="title"><?=s('UserManagement')?></h1>
 	<table class="form">
 		<tbody>
 		<tr>
 			<td class="label">
-				<label><?php i('UserName:') ?></label>
+				<label><?=s('UserName:')?></label>
 			</td>
 			<td>
 				<htk-entry>
@@ -15,7 +16,7 @@
 		</tbody>
 	</table>
 	<div>
-		<htk-grid id="users">
+		<htk-grid id="users-grid">
 			<db-model updatable="false">
 				SELECT u.id, u.name, c.Cliente
 					FROM account.user u
@@ -29,10 +30,11 @@
 				</sql-batch>
 			</db-model>
 			<htk-column-button image="image/supplant.png" tip="AccessAsUser" column="id" id="change-user"/>
-			<htk-column-button image="image/access-log.png" tip="AccessLog" column="id" id="access-log"/>
+			<htk-column-button image="image/access-log.svg" tip="AccessLog" column="id" id="access-log"/>
 			<htk-column-spin title="UserNumber" column="id"/>
 			<htk-column-text title="UserName" column="name"/>
 			<htk-column-text title="Alias" column="Cliente"/>
 		</htk-grid>
 	</div>
 </div>
+</div>

package/usr/share/hedera-web/forms/admin/users/style.css

@@ -1,19 +1,26 @@
-#users h1
+#users
 {
-	font-weight: normal;
+	margin: 1em;
-	text-align: center;
+	min-width: 35em;
-	font-size: 20px;
+}
-	margin: 15px;
+#users .box
+{
+	max-width: 50em;
+	margin: 0 auto;
+	padding: 2em;
 }
 #users tbody tr
 {
-	height: 38px;
+	height: 3.4em;
 }
+
+/* Form */
+
 #users table.form
 {
-	padding-bottom: 20px;
+	padding-bottom: 1.6em;
 }
 #users td.label
 {
-	width: 48%;
+	width: 46%;
 }

package/usr/share/hedera-web/forms/admin/users/users.js

@@ -21,14 +21,14 @@ Vn.Users = new Class
 	,accessLogClicked: function (column, value)
 	{
 		this.hash.set ({
-			 'module': 'access'
+			 'form': 'admin/access-log'
 			,'user': value
 		});
 	}
 	
 	,userChanged: function ()
 	{
-		this.hash.set ({'module': 'orders'});
+		this.hash.set ({'form': 'ecomerce/orders'});
 	}
 });
 

package/usr/share/hedera-web/forms/admin/visits/html.php

@@ -1,16 +1,17 @@
 <div id="visits">
-	<div class="actions">
+<div class="box">
-		<button id="refresh"><?php i('Refresh') ?></button>
+	<h1 class="title"><?=s('VisitsManagement')?></h1>
-		<button id="sessions-button"><?php i('ActiveSessions') ?></button>
+	<div class="action-bar">
-		<button id="visits-button"><?php i('VisitsQuery') ?></button>
+		<button id="refresh"><?=s('Refresh')?></button>
+		<button id="sessions-button"><?=s('ActiveSessions')?></button>
+		<button id="visits-button"><?=s('VisitsQuery')?></button>
 	</div>
-	<h1><?php i('VisitsManagement') ?></h1>
 	<div class="step" id="sessions-step">
 		<table class="form">
 			<tbody>
 			<tr>
 				<td class="label">
-					<label><?php i('ActiveSessions:') ?></label>
+					<label><?=s('ActiveSessions:')?></label>
 				</td>
 				<td>
 					<htk-label>
@@ -20,7 +21,7 @@
 			</tr>
 			<tr>
 				<td class="label">
-					<label><?php i('NewVisitsTotal:') ?></label>
+					<label><?=s('NewVisitsTotal:')?></label>
 				</td>
 				<td>
 					<htk-label>
@@ -60,7 +61,7 @@
 			<tbody>
 			<tr>
 				<td class="label">
-					<label><?php i('FromDate:') ?></label>
+					<label><?=s('FromDate:')?></label>
 				</td>
 				<td>
 					<htk-date-chooser>
@@ -70,7 +71,7 @@
 			</tr>
 			<tr>
 				<td class="label">
-					<label><?php i('ToDate:') ?></label>
+					<label><?=s('ToDate:')?></label>
 				</td>
 				<td>
 					<htk-date-chooser>
@@ -80,7 +81,7 @@
 			</tr>
 			<tr>
 				<td class="label">
-					<label><?php i('VisitsTotal:') ?></label>
+					<label><?=s('VisitsTotal:')?></label>
 				</td>
 				<td>
 					<htk-label>
@@ -90,7 +91,7 @@
 			</tr>
 			<tr>
 				<td class="label">
-					<label><?php i('NewVisitsTotal:') ?></label>
+					<label><?=s('NewVisitsTotal:')?></label>
 				</td>
 				<td>
 					<htk-label>
@@ -130,3 +131,4 @@
 		</div>
 	</div>
 </div>
+</div>

package/usr/share/hedera-web/forms/admin/visits/style.css

@@ -1,23 +1,13 @@
-#visits h1
+#visits
 {
-	font-weight: normal;
+	margin: 1em;
-	text-align: center;
+	min-width: 50em;
-	font-size: 20px;
-	margin: 15px;
 }
-
+#visits .box
-/* Actions */
-
-#visits div.actions
 {
-	position: absolute;
+	max-width: 80em;
-	top: 0px;
+	margin: 0 auto;
-	right: 0px;
+	padding: 2em;
-	padding: 15px;
-}
-#visits div.actions button
-{
-	padding: 5px;
 }
 
 /* Steps */

package/usr/share/hedera-web/forms/cms/contact/html.php

@@ -9,14 +9,22 @@
 	<p>
 		<?=s('OrCallUs')?>
 	</p>
-	<form action="modules/contact/send-data.php" method="post" id="contact-form">
+	<form action="forms/cms/contact/send-data.php" method="post" id="contact-form">
 		<div class="form-group">
 			<label><?=s('Name:')?></label>
 			<input type="text" name="name"/>
 		</div>
 		<div class="form-group">
-			<label><?=s('Surname:')?></label>
+			<label><?=s('City:')?></label>
-			<input type="text" name="surname"/>
+			<input type="text" name="city"/>
+		</div>
+		<div class="form-group">
+			<label><?=s('PC:')?></label>
+			<input type="text" name="pc"/>
+		</div>
+		<div class="form-group">
+			<label><?=s('Phone:')?></label>
+			<input type="text" name="phone"/>
 		</div>
 		<div class="form-group">
 			<label><?=s('EMail:')?></label>
@@ -26,22 +34,6 @@
 			<label><?=s('Message:')?></label>
 			<textarea name="message"/>
 		</div>
-		<div class="form-group">
-			<label><?=s('Address:')?></label>
-			<input type="text" name="address"/>
-		</div>
-		<div class="form-group">
-			<label><?=s('PC:')?></label>
-			<input type="text" name="pc"/>
-		</div>
-		<div class="form-group">
-			<label><?=s('City:')?></label>
-			<input type="text" name="city"/>
-		</div>
-		<div class="form-group">
-			<label><?=s('Phone:')?></label>
-			<input type="text" name="phone"/>
-		</div>
 		<div class="form-group" id="captcha">
 			<label><?=s('Anti-Spam:')?></label>
 			<img alt="Captcha" id="captcha-img"/>

package/usr/share/hedera-web/forms/cms/location/location.js

@@ -42,74 +42,6 @@ Vn.Location = new Class
 		if (!this.locations || !gmapsIsLoaded)
 			return;
 
-		var locations = [
-			{
-				 lat: 39.436596
-				,lng: -0.351297
-				,title: 'Mercavalencia'
-				,desc: [
-				 	 'Carretera Font D\'Encorts, 231'
-					,'46013 Valencia'
-					,'Valencia'
-					,'963 677 177'
-				]
-				,lang: null
-			},{
-				 lat: 39.359785
-				,lng: -0.421772
-				,title: 'Valencia'
-				,desc: [
-					 'Avenida Espioca, 100'
-					,'46460 Silla'
-					,'Valencia'
-					,'963 242 100'
-				]
-				,lang: 'es'
-			},{
-				 lat: 40.4523125
-				,lng: -3.4984233
-				,title: 'Madrid'
-				,desc: [
-					 'Polígono Industrial'
-					,'Calle de los Montes de Toledo, 20'
-					,'28830 San Fernando de Henares'
-					,'Madrid'
-					,'916 774 777'
-				]
-			},{
-				 lat: 41.4962045
-				,lng: 2.3765504
-				,title: 'Barcelona'
-				,desc: [
-					 'Camí del crist, 33'
-					,'08340 Vilassar de Mar'
-					,'Barcelona'
-					,'607 562 391'
-				]
-				,lang: 'ca'
-			},{
-				 lat: 52.2612312
-				,lng: 4.7818154
-				,title: 'Holland'
-				,desc: [
-					 'Aalsmeer Flower Auction'
-					,'Legmeerdijk 313'
-					,'1430 BA Aalsmeer'
-					,'Nederland' 
-				]
-				,lang: 'nl'
-			},{
-				 lat: 43.4375416
-				,lng: 5.2261456
-				,title: 'Marseille'
-				,desc: [
-					 'ruben@verdnatura.es'
-					,'0033 781 533 900'
-				]
-				,lang: 'fr'
-			}
-		];
-
 		var options = {
 			 zoom: 5
 			,mapTypeId: google.maps.MapTypeId.ROADMAP

package/usr/share/hedera-web/forms/ecomerce/basket/basket.js

@@ -1,30 +1,17 @@
 
-Vn.Order = new Class
+Vn.Basket = new Class
 ({
 	Extends: Vn.Module
 	
 	,orderId: null
-	,currentStep: null
 
 	,activate: function ()
 	{	
-		// Configuring columns
-	
-		var amount = this.get ('column-amount');
-		amount.on ('changed', this.amountChanged.bind (this));
-		amount.renderer = this.amountRender;
-
-		this.get ('column-subtotal').renderer = this.subtotalRender.bind (this);
-		this.get ('stems').renderer = this.stemsRender.bind (this);
-		this.get ('order-total').func = this.subtotal;
-		
 		// Connecting buttons events
 
 		Vn.get ('delete-order').addEventListener ('click', this.deleteClicked.bind (this));
 		Vn.get ('go-catalog').addEventListener ('click', this.catalogClicked.bind (this));
 		Vn.get ('checkout-button').addEventListener ('click', this.checkoutClicked.bind (this));
-		Vn.get ('go-basket').addEventListener ('click', this.basketClicked.bind (this));
-		Vn.get ('confirm-button').addEventListener ('click', this.confirmClicked.bind (this));
 
 		// Loading order
 
@@ -44,7 +31,57 @@ Vn.Order = new Class
 				this.orderId.value = orderId;
 		}
 
-		this.showStep ('basket-step');
+		// Configuring columns
+	
+		var amount = this.get ('column-amount');
+		amount.on ('changed', this.amountChanged.bind (this));
+		amount.renderer = this.amountRender;
+
+		this.get ('column-subtotal').renderer = this.subtotalRender.bind (this);
+		this.get ('stems').renderer = this.stemsRender.bind (this);
+		this.get ('order-total').func = this.subtotal;
+	}
+
+	,deleteClicked: function ()
+	{
+		if (confirm (_('SureDelOrder')))
+		{
+			var gui = this.gui;
+
+			if (Vn.Cookie.getInt ('order') == this.orderId.value)
+				Vn.Cookie.unset ('order');
+
+			this.get ('order-form').deleteRow ();
+			this.hash.set ({'form': 'ecomerce/orders'});
+		}
+	}
+	
+	,catalogClicked: function ()
+	{
+		Vn.Cookie.set ('order', this.orderId.value);
+		this.hash.set ({'form': 'ecomerce/catalog'});
+	}
+
+	,checkoutClicked: function ()
+	{
+		this.hash.set ({
+			'form': 'ecomerce/checkout',
+			'order': this.orderId.value
+		});
+	}
+	
+	,orderCreated: function (resultSet)
+	{
+		var insertOk = resultSet.fetchResult ();
+		var orderId = resultSet.fetchValue ();
+		
+		if (insertOk && orderId)
+		{
+			this.orderId.value = orderId;
+			Vn.Cookie.set ('order', orderId);
+		}
+		else
+			this.hash.set ({'form': 'ecomerce/orders'});
 	}
 
 	,amountRender: function (renderer, form)
@@ -90,86 +127,5 @@ Vn.Order = new Class
 		else
 			renderer.value = 'invisible';
 	}
-
-	,deleteClicked: function ()
-	{
-		if (confirm (_('SureDelOrder')))
-		{
-			var gui = this.gui;
-
-			if (Vn.Cookie.getInt ('order') == this.orderId.value)
-				Vn.Cookie.unset ('order');
-
-			this.get ('order-form').deleteRow ();
-			this.hash.set ({'module': 'orders'});
-		}
-	}
-	
-	,catalogClicked: function ()
-	{
-		Vn.Cookie.set ('order', this.orderId.value);
-		this.hash.set ({'module': 'catalog'});
-	}
-
-	,showStep: function (stepId)
-	{
-		if (this.currentStep)
-			this.currentStep.style.display = 'none';
-			
-		this.currentStep = Vn.get (stepId);
-		this.currentStep.style.display = 'inline';
-	}
-
-	,checkoutClicked: function ()
-	{
-		this.showStep ('checkout-step');
-	}
-	
-	,basketClicked: function ()
-	{
-		this.showStep ('basket-step');
-	}
-	
-	,confirmClicked: function ()
-	{
-		if (!confirm (_('SureConfirmOrder')))
-			return;
-		
-		var query = 'CALL order_confirm (#order)';
-			
-		var batch = new Sql.Batch ();
-		batch.addParam ('order', this.orderId);
-	
-		this.conn.execQuery (query, this.confirmDone.bind (this), batch);
-	}
-
-	,confirmDone: function (resultSet)
-	{
-		if (resultSet.fetchResult ())
-		{
-			Vn.Cookie.unset ('order');
-			this.hash.set ({'module': 'orders'});
-			alert (_('OrderConfirmed'));
-		}
-		else
-		{	
-			this.showStep ('basket-step');
-			this.get ('order-rows').refresh ();
-		}
-	}
-	
-	,orderCreated: function (resultSet)
-	{
-		var insertOk = resultSet.fetchResult ();
-		var orderId = resultSet.fetchValue ();
-		
-		if (insertOk && orderId)
-		{
-			this.orderId.value = orderId;
-			Vn.Cookie.set ('order', orderId);
-		}
-		else
-			this.hash.set ({'module': 'orders'});
-	}
 });
 

package/usr/share/hedera-web/forms/ecomerce/basket/html.php

@@ -1,4 +1,6 @@
-<div id="order">
+<div id="basket">
+<div class="box">
+	<h1 class="title"><?=s('ShoppingBasket')?></h1>
 	<vn-param id="order-id">
 		<vn-hash-link key="order"/>
 	</vn-param>
@@ -14,21 +16,21 @@
 		<db-param column="wh_id" id="warehouse"/>
 		<db-param column="address_id" id="address"/>
 	</db-form>
-	<div id="basket-step" class="step">
+	<div class="action-bar">
-		<div class="actions">
 		<button id="delete-order">
-				<img src="image/delete.png" alt=""/>
+			<img src="image/delete.svg" alt=""/>
 			<?=s('Delete')?>
 		</button>
 		<button id="go-catalog">
-				<img src="image/catalog.png" alt=""/>
+			<img src="image/catalog.svg" alt=""/>
 			<?=s('GoToCatalog')?>
 		</button>
 		<button id="checkout-button">
-				<img src="image/ok.png" alt=""/>
+			<img src="image/ok.svg" alt=""/>
 			<?=s('Checkout')?>
 		</button>
 	</div>
+	<div>
 		<table class="form">
 		<tbody>
 			<tr>
@@ -106,63 +108,5 @@
 			<htk-column-spin title="Subtotal" unit="€" digits="2" id="column-subtotal"/>
 		</htk-grid>
 	</div>
-	<div id="checkout-step" class="step">
-		<div class="actions">
-			<button id="go-basket">
-				<img src="image/go-previous.png" alt=""/>
-				<?=s('GoBasket')?>
-			</button>
-			<button id="confirm-button">
-				<img src="image/ok.png" alt=""/>
-				<?=s('Confirm')?>
-			</button>
-		</div>
-		<table class="form">
-		<tbody>
-			<tr>
-				<td class="label">
-					<label for="notes"><?=s('Notes:')?></label>
-				</td>
-				<td>
-					<htk-textarea column="note" form="order-form"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="label">
-					<label for="type"><?=s('SendMethod:')?></label>
-				</td>
-				<td>
-					<htk-combo column="type_id" form="order-form">		
-						<db-model property="model">
-							SELECT Id_Agencia, Agencia FROM vn2008.Agencias
-								WHERE web != FALSE ORDER BY Agencia
-						</db-model>
-					</htk-combo>
-				</td>
-			</tr>
-			<tr>
-				<td class="label">
-				</td>
-				<td>
-					<htk-check column="insurance" form="order-form"/>
-					<?=s('Insurance')?>
-				</td>
-			</tr>
-		</tbody>
-		</table>
-		<htk-grid>
-			<db-model updatable="false">
-				SELECT id, consignee, p.name province, zip_code, city, a.name
-					FROM address_view a
-					JOIN vn2008.province p ON a.province_id = p.province_id
-						WHERE active != FALSE
-			</db-model>
-			<htk-column-radio column="id" param="address"/>
-			<htk-column-text title="Consignee" column="consignee"/>
-			<htk-column-text title="Province" column="province"/>
-			<htk-column-text title="PC" column="zip_code"/>
-			<htk-column-text title="City" column="city"/>
-			<htk-column-text title="Address" column="name"/>
-		</htk-grid>
 </div>
 </div>

package/usr/share/hedera-web/forms/ecomerce/basket/style.css

@@ -0,0 +1,30 @@
+#basket
+{
+	margin: 1em;
+	min-width: 50em;
+}
+#basket .box
+{
+	max-width: 70em;
+	margin: 0 auto;
+	padding: 2em;
+}
+
+/* Data */
+
+#basket table.form
+{
+	padding: 1.8em;
+}
+#basket td.label
+{
+	width: 10em;
+}
+
+/* Rows */
+
+#basket td.available-exceeded input
+{
+	background-color: #FCC;
+}
+

package/usr/share/hedera-web/forms/ecomerce/catalog/catalog.js

@@ -5,7 +5,7 @@ Vn.Catalog = new Class
 
 	,activate: function ()
 	{
-		Vn.get ('basket').addEventListener ('click', this.basketClicked.bind (this));
+		$('basket-button').addEventListener ('click', this.basketClicked.bind (this));
 
 		var model = this.get ('items');
 		model.setTableInfo ('m', 'order_row_view');
@@ -44,7 +44,7 @@ Vn.Catalog = new Class
 			orderForm.row = 0;
 			orderId = orderForm.get ('id');
 
-			Vn.Node.setText (Vn.get ('basket'), _('ShoppingBasket'));
+			Vn.Node.setText ($('basket-button'), _('ShoppingBasket'));
 
 			var items = this.get ('items');
 			items.updatable = true;
@@ -86,7 +86,7 @@ Vn.Catalog = new Class
 		});
 		grid.insertColumn (11, priceCol);
 		
-		Vn.get ('basket').disabled = false;
+		$('basket-button').disabled = false;
 	}
 	
 	,orderFormChanged: function (form)
@@ -97,7 +97,7 @@ Vn.Catalog = new Class
 	
 	,basketClicked: function ()
 	{
-		this.hash.set ({'module': 'order'});
+		this.hash.set ({'form': 'ecomerce/basket'});
 	}
 	
 	,typeRenderer: function (column, form)

package/usr/share/hedera-web/forms/ecomerce/catalog/html.php

@@ -1,4 +1,5 @@
 <div id="catalog">
+<div class="box">
 	<vn-param id="type">
 		<vn-hash-link key="type"/>
 	</vn-param>
@@ -65,15 +66,15 @@
 					<item name="filter" object="filter"/>
 				</sql-batch>
 			</db-model>
-			<htk-column-image column="Foto" directory="catalog" subdir="30x30" show-full="true" editable="true"/>
+			<htk-column-image column="Foto" directory="catalog" subdir="200x200" show-full="true" editable="true"/>
 			<htk-column-text title="Pack" column="grouping" format="x%.0d"/>
 			<htk-column-spin title="Aval" column="available"/>
 			<htk-column-text title="Name" column="Article"/>
 			<htk-column-text title="Cat" column="Categoria" id="cat"/>
 			<htk-column-text title="S1" column="Medida"/>
-			<htk-column-text title="Stems" column="Tallos"/>
+<!--		<htk-column-text title="Stems" column="Tallos"/>
 			<htk-column-text title="Color" column="Color"/>
-			<htk-column-text title="Origin" column="Abreviatura"/>
+-->			<htk-column-text title="Origin" column="Abreviatura"/>
 		</htk-grid>
 		<p>
 			<?php i('FixedPrices') ?>
@@ -81,25 +82,10 @@
 	</div>
 	<div id="catalog-right">
 		<center>
-			<button disabled="true" id="basket">
+			<button disabled="true" id="basket-button">
 				<?php i('StartOrder') ?>
 			</button>
 		</center>
-		<htk-realm id="realms">
-			<vn-param id="realm">
-				<vn-hash-link key="realm"/>
-			</vn-param>
-		</htk-realm>
-		<htk-grid id="types-grid" empty-message="SelectFamily">
-			<db-model>
-				SELECT tipo_id, Tipo FROM vn2008.Tipos
-					WHERE reino_id = #realm AND Orden != 0 ORDER BY Orden DESC, Tipo
-				<sql-batch property="batch">
-					<item name="realm" param="realm"/>
-				</sql-batch>
-			</db-model>
-			<htk-column-link title="Subtype" column="Tipo" id="type-column"/>
-		</htk-grid>
 		<table class="form">
 			<tbody>
 				<tr>
@@ -146,5 +132,23 @@
 				</tr>
 			</tbody>
 		</table>
+		<htk-realm id="realms">
+			<vn-param id="realm">
+				<vn-hash-link key="realm"/>
+			</vn-param>
+		</htk-realm>
+		<div id="types-box">
+			<htk-grid id="types-grid" empty-message="SelectFamily">
+				<db-model>
+					SELECT tipo_id, Tipo FROM vn2008.Tipos
+						WHERE reino_id = #realm AND Orden != 0 ORDER BY Orden DESC, Tipo
+					<sql-batch property="batch">
+						<item name="realm" param="realm"/>
+					</sql-batch>
+				</db-model>
+				<htk-column-link title="Subtype" column="Tipo" id="type-column"/>
+			</htk-grid>
+		</div>
+	</div>
 </div>
 </div>

package/usr/share/hedera-web/forms/ecomerce/catalog/style.css

@@ -1,77 +1,104 @@
 #catalog
 {
 	position: relative;
-	height: 100%;
 	width: 100%;
+	height: 100%;
+	min-width: 68em;
+	min-height: 32em;
+}
+#catalog .box
+{
+	position: absolute;
+	top: 1em;
+	bottom: 1em;
+	left: 1em;
+	right: 1em;
+	max-width: 85em;
 }
 #catalog-left
 {
 	position: absolute;
-	top: 0px;
+	top: 0em;
-	right: 240px;
+	bottom: 0em;
-	left: 0px;
+	left: 0em;
-	bottom: 0px;
+	right: 17em;
-	padding-top: 15px;
+	margin: 1em;
-	padding-bottom: 15px;
 	overflow: auto;
 }
 #catalog-right
 {
 	position: absolute;
-	top: 0px;
+	top: 0em;
-	right: 0px;
+	bottom: 0em;
-	bottom: 0px;
+	right: 0em;
-	width: 225px;
+	width: 16em;
-	margin: 8px;
+	margin: 1em;
 }
 
 #catalog-left p
 {
 	text-align: center;
-	font-size: 12px;
 }
 
 /* Right panel */
 
 #search-entry
 {
-	width: 110px;
+	width: 10em;
 }
-#basket
+#basket-button
 {
 	width: 95%;
 	text-align: center;
 }
-#types-grid tbody
-{
-	height: 200px;
-	display: block;
-	overflow: auto;
-}
 
 /* Realms */
 
 .htk-realm
 {
-	height: 50px;
+	height: 3.5em;
 	text-align: center;
-	margin-top: 8px;
+	margin-top: 0.6em;
 	vertical-align: middle;
 }
 .htk-realm img
 {
-	padding: 1px;
+	padding: 0.1em;
-	height: 32px;
+	height: 2.4em;
 	cursor: pointer;
 }
 .htk-realm img.selected,
 .htk-realm img:hover
 {
-	height: 37px;
+	height: 2.7em;
 }
 
 /* Types */
 
+#types-box
+{
+	position: absolute;
+	top: 20em;
+	bottom: 0em;
+	right: 0em;
+	left: 0em;
+	overflow: auto;
+}
+#types-grid
+{
+	width: 100%;
+}/*
+#types-grid tbody
+{
+	height: 200px;
+	display: block;
+	overflow: auto;
+}*/
+#types-grid tbody tr
+{
+	border: none;
+	height: 2.2em;
+}/*
 #types-grid tbody tr
 {
 	display: block;
@@ -83,11 +110,11 @@
 	display: block;
 	width: 100%;
 	padding: 0;
-}
+}*/
 #types-grid tbody a
 {
 	display: block;
-	padding: 4px 7%;
+	padding: 0.3em 7%;
 	width: 86%;
 	height: 100%;
 }
@@ -97,14 +124,23 @@
 }
 #types-grid td.grid-message
 {
-	padding-top: 15px;
+	padding-top: 1em;
 }
 
 /* Catalog */
 
-#catalog-left table.grid tbody tr
+#items-grid
 {
-	height: 45px;
+	width: 100%;
+}
+#items-grid tbody tr
+{
+	height: 6em;
+}
+#items-grid tbody img
+{
+	max-height: 5em;
+	max-width: 5em;
 }
 td.second-category
 {

package/usr/share/hedera-web/forms/ecomerce/checkout/checkout.js

@@ -0,0 +1,49 @@
+
+Vn.Checkout = new Class
+({
+	Extends: Vn.Module
+	
+	,orderId: null
+
+	,activate: function ()
+	{
+		Vn.get ('go-basket').addEventListener ('click', this.goBasket.bind (this));
+		Vn.get ('confirm-button').addEventListener ('click', this.confirmClicked.bind (this));
+
+		this.orderId = this.get ('order-id');
+	}
+
+	,goBasket: function ()
+	{
+		this.hash.set ({
+			'form': 'ecomerce/basket',
+			'order': this.orderId.value
+		});
+	}
+	
+	,confirmClicked: function ()
+	{
+		if (!confirm (_('SureConfirmOrder')))
+			return;
+		
+		var query = 'CALL order_confirm (#order)';
+			
+		var batch = new Sql.Batch ();
+		batch.addParam ('order', this.orderId);
+	
+		this.conn.execQuery (query, this.confirmDone.bind (this), batch);
+	}
+
+	,confirmDone: function (resultSet)
+	{
+		if (resultSet.fetchResult ())
+		{
+			Vn.Cookie.unset ('order');
+			this.hash.set ({'module': 'orders'});
+			alert (_('OrderConfirmed'));
+		}
+		else
+			this.goBasket ();
+	}
+});
+

package/usr/share/hedera-web/forms/ecomerce/checkout/html.php

@@ -0,0 +1,79 @@
+<div id="checkout">
+<div class="box">
+	<h1 class="title"><?=s('Checkout')?></h1>
+	<vn-param id="order-id">
+		<vn-hash-link key="order"/>
+	</vn-param>
+	<db-form id="order-form">
+		<db-model>
+			SELECT type_id, note, insurance, address_id, id
+				FROM order_view WHERE id = #id
+			<sql-batch property="batch">
+				<item name="id" param="order-id"/>
+			</sql-batch>
+		</db-model>
+		<db-param column="date_send" id="date"/>
+		<db-param column="wh_id" id="warehouse"/>
+		<db-param column="address_id" id="address"/>
+	</db-form>
+	<div class="action-bar">
+		<button id="go-basket">
+			<img src="image/go-previous.svg" alt=""/>
+			<?=s('GoBasket')?>
+		</button>
+		<button id="confirm-button">
+			<img src="image/ok.png" alt=""/>
+			<?=s('Confirm')?>
+		</button>
+	</div>
+	<div>
+		<table class="form">
+		<tbody>
+			<tr>
+				<td class="label">
+					<label for="notes"><?=s('Notes:')?></label>
+				</td>
+				<td>
+					<htk-textarea column="note" form="order-form"/>
+				</td>
+			</tr>
+			<tr>
+				<td class="label">
+					<label for="type"><?=s('SendMethod:')?></label>
+				</td>
+				<td>
+					<htk-combo column="type_id" form="order-form">		
+						<db-model property="model">
+							SELECT Id_Agencia, Agencia FROM vn2008.Agencias
+								WHERE web != FALSE ORDER BY Agencia
+						</db-model>
+					</htk-combo>
+				</td>
+			</tr>
+			<tr>
+				<td class="label">
+				</td>
+				<td>
+					<htk-check column="insurance" form="order-form"/>
+					<?=s('Insurance')?>
+				</td>
+			</tr>
+		</tbody>
+		</table>
+		<htk-grid>
+			<db-model updatable="false">
+				SELECT id, consignee, p.name province, zip_code, city, a.name
+					FROM address_view a
+					JOIN vn2008.province p ON a.province_id = p.province_id
+						WHERE active != FALSE
+			</db-model>
+			<htk-column-radio column="id" param="address"/>
+			<htk-column-text title="Consignee" column="consignee"/>
+			<htk-column-text title="Province" column="province"/>
+			<htk-column-text title="PC" column="zip_code"/>
+			<htk-column-text title="City" column="city"/>
+			<htk-column-text title="Address" column="name"/>
+		</htk-grid>
+	</div>
+</div>
+</div>

package/usr/share/hedera-web/forms/ecomerce/checkout/style.css

@@ -0,0 +1,23 @@
+#checkout
+{
+	margin: 1em;
+	min-width: 50em;
+}
+#checkout .box
+{
+	max-width: 70em;
+	margin: 0 auto;
+	padding: 2em;
+}
+
+/* Data */
+
+#checkout table.form
+{
+	padding: 1.8em;
+}
+#checkout td.label
+{
+	width: 10em;
+}
+

package/usr/share/hedera-web/forms/ecomerce/order/style.css

@@ -1,49 +0,0 @@
-/* Actions */
-
-#order div.actions
-{
-	position: absolute;
-	right: 0px;
-	padding: 10px;
-}
-#order div.actions button
-{
-	padding: 5px;
-}
-#order div.actions img
-{
-	vertical-align: middle;
-	margin-right: 5px;
-}
-
-/* Steps */
-
-div.step
-{
-	display: none;
-}
-
-/* Data */
-
-#order table.form
-{
-	padding: 20px;
-}
-#order td.label
-{
-	width: 250px;
-}
-
-#addresses,
-#items
-{
-	margin-bottom: 30px;
-}
-
-/* Rows */
-
-#order td.available-exceeded input
-{
-	background-color: #FCC;
-}
-

package/usr/share/hedera-web/forms/ecomerce/orders/html.php

@@ -1,7 +1,7 @@
 <div id="orders">
 <div class="box">
 	<div class="info">
-		<img src="image/order.png" alt=""/>
+		<img src="image/order.svg" alt=""/>
 		<?=s('StartedOrdersDesc')?>
 		<button id="start-order"><?=s('StartOrder')?></button>
 		<div class="clear"/>
@@ -9,28 +9,27 @@
 	<div>
 		<htk-grid>
 			<db-model>
-				SELECT o.id, date_make, date_send, Agencia
+				SELECT o.id, date_send, Agencia
 					FROM order_view o
 					JOIN vn2008.Agencias a ON o.type_id = a.Id_Agencia
 			</db-model>
-			<htk-column-button column="id" image="image/edit.png" tip="ContinueOrder" id="edit-order"/>
+			<htk-column-button column="id" image="image/edit.svg" tip="ContinueOrder" id="edit-order"/>
 			<htk-column-spin title="OrderNumber" column="id"/>
-			<htk-column-date title="DateMake" column="date_make"/>
 			<htk-column-date title="DateExit" column="date_send"/>
 			<htk-column-text title="SendMethod" column="Agencia"/>
 		</htk-grid>
 	</div>
 	<div class="info">
-		<img src="image/ok.png" alt=""/>
+		<img src="image/ok.svg" alt=""/>
 		<?=s('ConfirmedOrdersDesc')?>
 		<div id="debt">
 			<?=s('PendingBalance:')?>
 			<htk-label format="%.2d€" id="debt-amount">
 				<db-calc-sum model="balance" column-name="amount"/>
 			</htk-label>
-			<img src="image/info.png" title="<?=s('PaymentInfo')?>" alt="Info"/>
+			<img src="image/info.svg" title="<?=s('PaymentInfo')?>" alt="Info"/>
 			<button id="pay-button" title="<?=s('MakePayment')?>">		
-				<img src="image/pay.png" alt="<?=s('MakePayment')?>"/>
+				<img src="image/pay.svg" alt="<?=s('MakePayment')?>"/>
 			</button>
 		</div>
 		<div class="clear"/>
@@ -42,7 +41,7 @@
 			</db-model>
 			<htk-column-text title="Company" column="abbreviation"/>
 			<htk-column-spin title="Pending" column="amount" unit="€" digits="2"/>
-			<htk-column-button title="Pay" image="image/pay.png" tip="Pay" id="company-pay"/>
+			<htk-column-button title="Pay" image="image/pay.svg" tip="Pay" id="company-pay"/>
 		</htk-grid>
 	</div>
 	<div>
@@ -50,14 +49,14 @@
 			<db-model id="tickets">
 				CALL ticket_list ();
 			</db-model>
-			<htk-column-button column="ticket_id" image="image/show.png" tip="SeeOrder" id="edit-ticket"/>
+			<htk-column-button column="ticket_id" image="image/show.svg" tip="SeeOrder" id="edit-ticket"/>
 			<htk-column-spin title="TicketNumber" column="ticket_id"/>
 			<htk-column-date title="DateExit" column="date"/>
 			<htk-column-text title="SendMethod" column="type"/>
 			<htk-column-text title="SentAddress" column="consignee"/>
 			<htk-column-spin title="TotalWithVAT" column="total" unit="€" digits="2"/>
 <!--		<htk-column-spin title="Pending" column="pending" unit="€" digits="2"/>
--->			<htk-column-button image="image/pay.png" tip="PayOrder" id="ticket-pay"/>
+-->			<htk-column-button image="image/pay.svg" tip="PayOrder" id="ticket-pay"/>
 		</htk-grid>
 	</div>
 	<form method="post" id="tpv-form">

package/usr/share/hedera-web/forms/ecomerce/orders/orders.js

@@ -36,13 +36,13 @@ Vn.Orders = new Class
 	,onStartClick: function ()
 	{
 		Vn.Cookie.unset ('order');
-		this.hash.set ({'form': 'ecomerce/order'});
+		this.hash.set ({'form': 'ecomerce/basket'});
 	}
 
 	,onContinueClick: function (column, orderId)
 	{
 		this.hash.set ({
-			'form': 'ecomerce/order',
+			'form': 'ecomerce/basket',
 			'order': orderId
 		});
 	}

package/usr/share/hedera-web/forms/ecomerce/orders/style.css

@@ -1,26 +1,32 @@
 #orders
 {
 	padding: 1em;
+	min-width: 55em;
 }
-
 #orders .box
 {
-	max-width: 80em;
+	max-width: 70em;
 }
+
+/* Info box */
+
 #orders .info
 {
 	margin-bottom: 1em;
-	padding: 5px;
+	padding: 0.4em;
 	background-color: #FFC;
 	border: 1px solid #CC9;
-	border-radius: 2px;
+	border-radius: 0.1em;
 }
 #orders .info > img
 {
 	vertical-align: middle;
-	margin: 8px;
+	margin: 0.7em;
+	height: 1.5em;
 }
 
+/* Buttons */
+
 #orders td.hide
 {
 	display: none;
@@ -39,22 +45,21 @@
 }
 #debt > img
 {
-	padding-left: 4px;
+	padding-left: 0.3em;
 	cursor: pointer;
 }
 #pay-button
 {
-	padding: 7px;
+	margin-left: 1.2em;
-	margin-left: 15px;
 }
 #debt-popup
 {
 	display: none;
 	background-color: white;
 	border: 1px solid #999;
-	border-radius: 2px;
+	border-radius: 0.1em;
-	padding: 15px;
+	padding: 1.4em;
-	width: 300px;
+	width: 28em;
 }
 #debt-grid
 {
@@ -75,13 +80,13 @@
 div.tpv
 {
 	position: absolute;
-	margin-left: -375px;
+	margin-left: -35em;
-	top: 10px;
+	top: 0.8em;
 	left: 50%;
-	height: 570px;
+	height: 50em;
-	width: 750px;
+	width: 70em;
 	border: 1px solid #999;
-	border-radius: 2px;
+	border-radius: 0.1em;
 	background-color: white;
 	text-align: center;
 	z-index: 2;
@@ -90,17 +95,17 @@ div.tpv
 div.tpv button
 {
 	position: absolute;
-	right: 8px;
+	right: 0.6em;
-	bottom: 8px;
+	bottom: 0.6em;
 	z-index: 4;
 }
 
 div.tpv iframe
 {
 	width: 100%;
-	height: 570px;
+	height: 50em;
-	bottom: 0px;
+	bottom: 0;
 	overflow: auto;
-	border-width: 0px;
+	border-width: 0;
 }
 

package/usr/share/hedera-web/forms/ecomerce/ticket/html.php

@@ -1,4 +1,6 @@
 <div id="ticket">
+<div class="box">
+	<h1 class="title"><?=s('OrderDetail')?></h1>
 	<vn-param id="ticket-id">
 		<vn-hash-link key="ticket"/>
 	</vn-param>
@@ -16,10 +18,10 @@
 			</sql-batch>
 		</db-model>
 	</db-form>
-	<div class="actions">
+	<div class="action-bar">
 		<button id="print">
-			<img src="image/print.png" alt=""/>
+			<img src="image/print.svg" alt=""/>
-			<?php i('Print') ?>
+			<?=s('Print')?>
 		</button>
 	</div>
 	<div id="ticket-report">
@@ -27,7 +29,7 @@
 		<tbody>
 			<tr>
 				<td class="label">
-					<label><?php i('TicketNumber:') ?></label>
+					<label><?=s('TicketNumber:')?></label>
 				</td>
 				<td>
 					<htk-label column="id" form="ticket"/>
@@ -35,7 +37,7 @@
 			</tr>
 			<tr>
 				<td class="label">
-					<label><?php i('DateExit:') ?></label>
+					<label><?=s('DateExit:')?></label>
 				</td>
 				<td>
 					<htk-date-chooser column="date" form="ticket" editable="false"/>
@@ -43,7 +45,7 @@
 			</tr>
 			<tr>
 				<td class="label">
-					<label><?php i('SendMethod:') ?></label>
+					<label><?=s('SendMethod:')?></label>
 				</td>
 				<td>
 					<htk-label column="Agencia" form="ticket"/>
@@ -51,7 +53,7 @@
 			</tr>
 			<tr>
 				<td class="label">
-					<label><?php i('Notes:') ?></label>
+					<label><?=s('Notes:')?></label>
 				</td>
 				<td>
 					<htk-label column="note" form="ticket"/>
@@ -59,7 +61,7 @@
 			</tr>
 			<tr>
 				<td class="label">
-					<label for="total"><?php i('Subtotal:') ?></label>
+					<label for="total"><?=s('Subtotal:')?></label>
 				</td>
 				<td>
 					<htk-label format="%.2d€">
@@ -104,3 +106,4 @@
 		</htk-grid>
 	</div>
 </div>
+</div>

package/usr/share/hedera-web/forms/ecomerce/ticket/style.css

@@ -1,34 +1,23 @@
-/* Actions */
+#ticket
-
-#ticket div.actions
 {
-	position: absolute;
+	margin: 1em;
-	right: 0px;
+	min-width: 50em;
-	padding: 10px;
 }
-#ticket div.actions button
+#ticket .box
 {
-	padding: 5px;
+	max-width: 70em;
-}
+	margin: 0 auto;
-#ticket div.actions img
+	padding: 2em;
-{
-	vertical-align: middle;
-	margin-right: 5px;
 }
 
 /* Data */
 
 #ticket table.form
 {
-	padding: 20px;
+	padding: 1.8em;
 }
 #ticket td.label
 {
-	width: 250px;
+	width: 10em;
-}
-
-#items
-{
-	margin-bottom: 30px;
 }
 

package/usr/share/hedera-web/forms/news/new/html.php

@@ -1,5 +1,6 @@
 <div id="new">
-	<h1><?php i('AddNew') ?></h1>
+<div class="box">
+	<h1 class="title"><?=s('AddNew')?></h1>
 	<vn-param id="new-param">
 		<vn-hash-link key="new"/>
 	</vn-param>
@@ -13,28 +14,19 @@
 			</sql-batch>
 		</db-model>
 	</db-form>
-	<table class="form">
+	<div class="form">
-	<tbody>
+		<div class="form-group">
-		<tr>
+			<label><?=s('Title:')?></label>
-			<td class="label">
-				<?php i('Title:') ?>
-			</td>
-			<td>
 			<htk-entry column="title" form="new-form"/>
-			</td>
+		</div>
-		</tr>
+		<div class="form-group">
-		<tr>
+			<label><?=s('NewBody:')?></label>
-			<td class="label">
-				<?php i('NewBody:') ?>
-			</td>
-			<td>
 			<textarea id="html-editor"/>
-			</td>
+		</div>
-		</tr>
+	</div>
-	</tbody>
-	</table>
 	<div class="foot">
-		<button id="new-cancel"><?php i('Cancel') ?></button>
+		<button id="new-cancel" class="vn"><?=s('Cancel')?></button>
-		<button id="new-accept"><?php i('Accept') ?></button>
+		<button id="new-accept" class="vn"><?=s('Accept')?></button>
+	</div>
 </div>
 </div>

package/usr/share/hedera-web/forms/news/new/new.js

@@ -13,9 +13,9 @@ Vn.New = new Class
 		tinymce.init ({
 		    mode : 'exact'
 		    ,elements : 'html-editor'
-		    ,width: 610
+/*		    ,width: 610
 		    ,height: 300
-			,plugins: [
+*/			,plugins: [
 				"advlist autolink lists link image charmap print preview hr anchor pagebreak",
 				"searchreplace wordcount visualblocks visualchars code fullscreen",
 				"insertdatetime media nonbreaking save table contextmenu directionality",
@@ -25,6 +25,13 @@ Vn.New = new Class
 			,toolbar2: "bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent"
 			,toolbar3: "styleselect | fontselect fontsizeselect | forecolor backcolor "
 			,image_advtab: true
+			,setup : function (editor)
+			{
+				editor.on ('init', function () 
+				{
+					this.getDoc().body.style.fontSize = '1em';
+				});
+			}
 		});
 	}
 	

package/usr/share/hedera-web/forms/news/new/style.css

@@ -1,25 +1,40 @@
 
-#new h1
+#new
 {
-	font-weight: normal;
+	margin: 1em;
-	text-align: center;
-	font-size: 20px;
-	margin: 15px;
 }
-#new table.form
+#new .box
 {
-	padding-bottom: 15px;
+	max-width: 50em;
+	margin: 0 auto;
+	padding: 2em;
 }
-#new td.label
+
+/* Form */
+
+#new div.form-group
 {
-	width: 21%;
+	padding: 0.4em;
 }
-#new table.form input,
+#new div.form-group label
-#new-body
 {
-	width: 600px;
+	display: block;
+	margin-bottom: 0.5em;
 }
-#new div.foot
+#new div.form-group input,
+#new div.form-group textarea
+{
+	margin: 0;
+	width: 100%;
+}
+#new textarea
+{
+	min-height: 26em;
+}
+
+#new .foot
 {
 	text-align: center;
+	margin-top: 1em;
 }
+

package/usr/share/hedera-web/forms/news/news/html.php

@@ -1,18 +1,22 @@
 <div id="news">
-	<h1><?php i('NewsManagement') ?></h1>
+<div class="box">
-	<button id="add-new"><?php i('AddNew') ?></button>
+	<h1 class="title"><?=s('NewsManagement')?></h1>
+	<div class="action-bar">
+		<button id="add-new"><?=s('AddNew')?></button>
+	</div>
 	<htk-grid>
 		<db-model id="news-model">
 			SELECT n.id, c.Cliente, priority,
-			CONCAT(LEFT(n.title, 30), '...') title
+			CONCAT(LEFT(n.title, 25), '...') title
 				FROM news n
 				JOIN vn2008.Clientes c ON n.user_id = c.Id_Cliente
 					ORDER BY priority, n.date_time DESC
 		</db-model>
-		<htk-column-button column="id" tip="EditNew" image="image/edit.png" id="edit-new"/>
+		<htk-column-button column="id" tip="EditNew" image="image/edit.svg" id="edit-new"/>
 		<htk-column-image column="id" directory="news" subdir="30x30" show-full="true" editable="true"/>
 		<htk-column-text title="Author" column="Cliente"/>
 		<htk-column-text title="Title" column="title"/>
 		<htk-column-spin title="Priority" column="priority"/>
 	</htk-grid>
 </div>
+</div>

package/usr/share/hedera-web/forms/news/news/style.css

@@ -1,14 +1,15 @@
-#news h1
+#news
 {
-	font-weight: normal;
+	margin: 1em;
-	text-align: center;
+	min-width: 35em;
-	font-size: 20px;
-	margin: 15px;
 }
-#add-new
+#news .box
 {
-	position: absolute;
+	max-width: 60em;
-	right: 0px;
+	margin: 0 auto;
-	top: 0px;
+	padding: 2em;
-	margin: 15px 30px;
+}
+#news .action-bar
+{
+	margin-bottom: 1.5em;
 }

package/usr/share/hedera-web/global/style.css

@@ -99,9 +99,9 @@ textarea,
 button
 {
 	border: 1px solid #CCD;
-	margin: 0.3em;
+	margin: 0.2em;
-	padding: 0.4em;
+	padding: 0.3em;
-	border-radius: 2px;
+	border-radius: 0.1em;
 /*	box-shadow: 0px 2px 2px #AAA; */
 }
 textarea
@@ -130,7 +130,8 @@ button:hover
 	cursor: pointer;
 	background-color: #DDE;
 }
-input[type=checkbox]
+input[type=checkbox],
+input[type=radio]
 {
 	width: 0.8em;
 	height: 0.8em;
@@ -186,7 +187,7 @@ div.box
 table.form
 {
 	border-collapse: separate;
-	border-spacing: 4px;
+	border-spacing: 0.3em;
 }
 table.form td.label
 {
@@ -194,33 +195,55 @@ table.form td.label
 }
 table.form tr
 {
-	height: 35px;
+	height: 2.8em;
+}
+
+/* Action bar */
+
+div.action-bar
+{
+	float: right;
+	padding: 0;
+}
+div.action-bar button
+{
+	float: left;
+	padding: 0.4em;
+}
+div.action-bar img
+{
+	vertical-align: middle;
+	margin-right: 0.4em;
+	height: 1.4em;
 }
 
 /* Grid */
 
 table.grid
 {
-	width: 95%;
+	width: 98%;
 	margin: auto;
 	border-collapse: collapse;
 	text-align: center;
-	margin-bottom: 1.5em;
+	margin-bottom: 1em;
 }
 table.grid thead tr,
 table.grid tfoot tr
 {
-	background-color: #EEF;
+/*	box-shadow: 0px 0.1em 0.1em #DDD;
+	background-color: #AD4;
+*/	background-color: #EEF;
 	border: 1px solid #CCD;
 	color: black;
 	font-weight: bold;
 	vertical-align: middle;
 	text-align: center;
-	height: 3em;
+	height: 2.5em;
 }
 table.grid thead th
 {
 	cursor: pointer;
+	padding: 0 0.4em;
 }
 table.grid thead th:hover
 {
@@ -229,6 +252,7 @@ table.grid thead th:hover
 table.grid tr
 {
 	height: 3.5em;
+	border-top: 1px solid #DDD;
 }
 table.grid tfoot a,
 table.grid thead a
@@ -241,17 +265,18 @@ table.grid tr.pair-row
 }
 td.grid-message
 {
-	height: 7.5em;
+	height: 5em;
 }
 td.grid-message img
 {
 	vertical-align: middle;
-	padding: 1em;
+	padding: 0.8em;
+	height: 1.8em;
 }
 table.grid tbody td
 {
-	padding-right: 0.8em;
+	padding-right: 0.7em;
-	padding-left: 0.8em;
+	padding-left: 0.3em;
 }
 input.cell-spin
 {
@@ -260,7 +285,8 @@ input.cell-spin
 }
 button.cell-button
 {
-	margin: 0.5em;
+	margin: 0;
+	padding: 0;
 	border: none;
 	background-color: transparent;
 }
@@ -327,7 +353,7 @@ button.cell-button img
 .date-chooser button
 {
 	margin: 0;
-	margin-right: 80.8em;
+	margin-right: 0.6em;
 }
 
 /* Full image */
@@ -346,7 +372,7 @@ div.image-loader
 	position: fixed;
 	background-color: #FFF;
 	border: 1px solid #999;
-	border-radius: 2px;
+	border-radius: 0.1em;
 	z-index: 3;
 }
 div.image-loader img

package/usr/share/hedera-web/image/access-log.svg

@@ -36,8 +36,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer9"
-     inkscape:cx="24.108916"
+     inkscape:cx="-0.061047297"
-     inkscape:cy="8.8376873"
+     inkscape:cy="6.5448724"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -58,12 +58,12 @@
      inkscape:snap-nodes="true"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="702"
+     inkscape:window-height="1014"
      inkscape:window-maximized="1"
-     inkscape:window-width="1366"
+     inkscape:window-width="1920"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="8.5267824">
+     inkscape:zoom="31.384543">
     <inkscape:grid
        empspacing="2"
        enabled="true"
@@ -91,7 +91,7 @@
        d="m 51.55489,345.09373 c -0.70541,0.62353 -1.53918,0.90625 -2.55469,0.90625 -1.01551,0 -1.85318,-0.29053 -2.55859,-0.91406 -1.10938,0.36328 -2.43603,1.28775 -2.4375,2.90234 l -0.0039,3.01172 c -7.2e-4,0.554 0.446,1.00002 1,1.00002 l 8,0 c 0.554,0 1,-0.44602 1,-1.00002 l 0,-3 c 0,-1.38672 -1.10231,-2.5558 -2.44531,-2.90625 z"
        id="path3940-5"
        sodipodi:nodetypes="csccsssscc"
-       style="fill:#333333;fill-opacity:1;stroke:none" />
+       style="fill:#666666;fill-opacity:1;stroke:none" />
     <path
        sodipodi:cx="49.5"
        sodipodi:cy="342.5"
@@ -99,7 +99,7 @@
        id="path3942-6"
        sodipodi:rx="2.5"
        sodipodi:ry="2.5"
-       style="color:#bebebe;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#bebebe;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        transform="matrix(1.2,0,0,1.2,-10.3998,-69.00003)"
        sodipodi:type="arc" />
   </g>

package/usr/share/hedera-web/image/blogger.svg

@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="23.998131"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="blogger.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2555">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop2557" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop2559" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2555"
+       id="linearGradient2449"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.5914583,0,0,0.5914584,210.0216,142.2324)"
+       x1="-344.15295"
+       y1="274.711"
+       x2="-395.84943"
+       y2="425.39993" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994948"
+     inkscape:cx="305.25032"
+     inkscape:cy="307.60596"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1920"
+     inkscape:window-height="1041"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.13803,-539.84063)">
+    <g
+       id="g3002"
+       transform="matrix(0.10212425,0,0,0.10212425,344.90822,506.25715)">
+      <rect
+         style="fill:#f57d00;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="rect1942"
+         width="235.00784"
+         height="234.98955"
+         x="-619.14587"
+         y="328.84921"
+         rx="35.487503"
+         ry="35.487503"
+         transform="scale(-1,1)"
+         inkscape:export-filename="C:\Documents and Settings\Molumen\Desktop\path3511111.png"
+         inkscape:export-xdpi="7.7063322"
+         inkscape:export-ydpi="7.7063322" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3778"
+         d="m 474.28848,392.93948 34.10242,-0.52457 c 15.61624,0.43167 24.2952,11.50106 24.13403,24.13019 1.51377,14.92319 -2.6884,31.82138 -26.23264,31.47415 l -33.57777,0 c -14.80482,0.14316 -26.62619,-8.55694 -25.70798,-25.70389 -0.73348,-14.20593 3.95736,-29.58072 27.28194,-29.37588 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:30;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3780"
+         d="m 529.37701,508.34471 -52.46527,0 c -21.86183,0.28049 -32.39245,-9.68626 -30.95451,-32.52329 0.1033,-20.5286 12.01091,-26.39012 29.90521,-26.75303 l 51.9406,0 c 35.31721,-0.94278 31.4599,-1.28462 32.00382,27.27759 -0.22202,20.76496 -11.64206,31.83981 -30.42985,31.99873 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:30;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path3782"
+         d="m 445.95724,480.01797 1.0493,-62.94831"
+         style="fill:none;stroke:#ffffff;stroke-width:30;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path3786"
+         d="m 476.78254,419.90545 29.29082,0.46505"
+         style="fill:none;stroke:#f57d00;stroke-width:25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path3788"
+         d="m 473.45507,477.18678 58.58164,0"
+         style="fill:none;stroke:#f57d00;stroke-width:25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

package/usr/share/hedera-web/image/catalog.svg

@@ -36,8 +36,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer12"
-     inkscape:cx="492.64489"
+     inkscape:cx="4.8431143"
-     inkscape:cy="457.29496"
+     inkscape:cy="8.2436975"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -58,12 +58,12 @@
      inkscape:snap-nodes="true"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="702"
+     inkscape:window-height="1014"
      inkscape:window-maximized="1"
-     inkscape:window-width="1366"
+     inkscape:window-width="1920"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="2.0429687">
+     inkscape:zoom="51">
     <inkscape:grid
        dotted="false"
        empspacing="2"
@@ -133,29 +133,32 @@
      inkscape:label="actions"
      style="display:inline"
      transform="translate(-61.0002,-949.00001)">
+    <g
+       id="g2995">
       <rect
-       height="2.0002136"
+         y="951.49951"
+         x="64.000397"
+         width="10.5"
+         style="color:#bebebe;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:label="a"
          id="rect7356"
-       inkscape:label="a"
+         height="2.1003082" />
-       style="color:#bebebe;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
-       width="9.9996014"
-       x="64.000397"
-       y="951.99982" />
       <rect
-       height="2.0002136"
+         y="955.69958"
+         x="64.000397"
+         width="10.5"
+         style="color:#bebebe;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:label="a"
          id="rect7358"
-       inkscape:label="a"
+         height="2.1003082" />
-       style="color:#bebebe;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
-       width="9.9996014"
-       x="64.000397"
-       y="955.99982" />
       <rect
-       height="2.0002136"
+         y="959.89966"
-       id="rect7360"
-       inkscape:label="a"
-       style="color:#bebebe;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
-       width="9.9996014"
          x="64.000397"
-       y="959.99982" />
+         width="10.5"
+         style="color:#bebebe;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:label="a"
+         id="rect7360"
+         height="2.1003082" />
+    </g>
   </g>
 </svg>

package/usr/share/hedera-web/image/clean.svg

@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="clean"
+   sodipodi:docname="clean.svg"
    inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
@@ -36,7 +36,7 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer12"
-     inkscape:cx="-151.80971"
+     inkscape:cx="-150.83074"
      inkscape:cy="80.67304"
      gridtolerance="10"
      inkscape:guide-bbox="true"
@@ -58,10 +58,10 @@
      inkscape:snap-nodes="true"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="702"
+     inkscape:window-height="1014"
      inkscape:window-maximized="1"
-     inkscape:window-width="1366"
+     inkscape:window-width="1920"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
      inkscape:zoom="2.0429688">
     <inkscape:grid
@@ -138,6 +138,6 @@
        d="m 191.0002,769 6,6 -6,6 -9.0353,0 c -0.53033,-0.0221 -0.9647,-0.49177 -0.9647,-1 l 0,-10 c 0,-0.53079 0.34561,-1 1.0089,-1 l 8.9911,0 z m -1,3 -1,0 c -0.0104,-1.2e-4 -0.0208,-4.6e-4 -0.0313,0 -0.25495,0.0112 -0.50987,0.12858 -0.6875,0.3125 l -1.2812,1.28125 -1.3125,-1.28125 C 185.42208,772.082 185.24103,772.007 185.0002,772 l -1,0 0,1 c 0,0.28647 0.0343,0.55065 0.25,0.75 l 1.28125,1.28125 -1.25,1.25 c -0.18819,0.18817 -0.28124,0.45345 -0.28125,0.71875 l 0,1 1,0 c 0.2653,-10e-6 0.53059,-0.0931 0.71875,-0.28125 l 1.28125,-1.28125 1.28125,1.28125 C 188.46961,777.90694 188.73491,778 189.0002,778 l 1,0 0,-1 c 0,-0.26529 -0.0931,-0.53058 -0.28125,-0.71875 l -1.28125,-1.25 1.28125,-1.28125 c 0.21074,-0.19463 0.30316,-0.46925 0.28125,-0.75 l 0,-1 z"
        id="path43079"
        sodipodi:nodetypes="ccccccccccsccccccccccccccccccccccc"
-       style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
 </svg>

package/usr/share/hedera-web/image/edit.svg

@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="text-editor-symbolic.svg"
+   sodipodi:docname="edit.svg"
    height="16"
    id="svg7384"
    inkscape:version="0.48.5 r10040"
@@ -32,8 +32,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer11"
-     inkscape:cx="124.32121"
+     inkscape:cx="10.177803"
-     inkscape:cy="78.24136"
+     inkscape:cy="3.484103"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -54,12 +54,12 @@
      inkscape:snap-nodes="false"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="702"
+     inkscape:window-height="1014"
      inkscape:window-maximized="1"
-     inkscape:window-width="1366"
+     inkscape:window-width="1920"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="2.0429688">
+     inkscape:zoom="5.7783884">
     <inkscape:grid
        empspacing="2"
        enabled="true"
@@ -95,19 +95,19 @@
        d="m 288.03089,639.02581 6.99819,-7 c 1,0 2,1 2,2 l -7,7 -2,0 z"
        id="path2273-6-2"
        sodipodi:nodetypes="cccccc"
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+       style="fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:none" />
     <path
        inkscape:connector-curvature="0"
        d="m 296.02908,631.02581 c 1,0 2,1 2,2 l 1,-1 c 0,-1 -0.75185,-2 -2,-2 z"
        id="path4113-1-6-3"
        sodipodi:nodetypes="ccccc"
-       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+       style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
     <path
        inkscape:connector-curvature="0"
        d="m 284.12283,629.02581 c -0.56869,5e-5 -1.0937,0.50285 -1.09375,1.0625 l 0,12.84375 0,0.25 0,0.78125 c 5e-5,0.55965 0.52506,1.06245 1.09375,1.0625 l 4.34375,0 1.125,0 5.34375,0 c 0.55754,-5e-5 1.07398,-0.48468 1.09375,-1.03125 3.9e-4,-0.0109 0,-0.0204 0,-0.0312 l 0,-6.93755 -2,2 0,4 -9,0 0,-12 5,0 2,2 1.53125,-1.53125 -2.1875,-2.125 c -0.20046,-0.20837 -0.48969,-0.3416 -0.78125,-0.34375 z"
        id="path6682-6"
        sodipodi:nodetypes="ccccccccccsccccccccccc"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#333333;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
   </g>
   <g
      inkscape:groupmode="layer"

package/usr/share/hedera-web/image/facebook.svg

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24.000189"
+   viewBox="0 0 24 24.00019"
+   enable-background="new 0 0 266.893 266.895"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="facebook.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview5"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.8842429"
+     inkscape:cx="-148.21469"
+     inkscape:cy="128.85949"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     id="Blue_1_"
+     d="m 22.67547,24.00019 c 0.731407,0 1.324523,-0.59312 1.324523,-1.32471 V 1.32462 C 23.999993,0.59293 23.40697,0 22.67547,0 H 1.3246076 C 0.59292132,0 -8.1786701e-6,0.59293 -8.1786701e-6,1.32462 v 21.35086 c 0,0.7315 0.5928363986701,1.32471 1.3246157786701,1.32471 H 22.67547 z"
+     inkscape:connector-curvature="0"
+     style="fill:#3c5a99" /><path
+     id="f"
+     d="m 16.559645,24.00019 v -9.2942 h 3.119608 L 20.14637,11.08388 H 16.559645 V 8.77139 c 0,-1.04868 0.291203,-1.76333 1.794993,-1.76333 l 1.91801,-8.4e-4 V 3.76758 c -0.331712,-0.0441 -1.470263,-0.14276 -2.794879,-0.14276 -2.765359,0 -4.658599,1.68799 -4.658599,4.78785 v 2.67121 H 9.6915528 v 3.62211 H 12.81917 v 9.2942 h 3.740475 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /></svg>

package/usr/share/hedera-web/image/git.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="23.999477"
+   viewBox="0 0 24 23.999477"
+   enable-background="new 0 0 97 97"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="git.svg"><metadata
+     id="metadata11"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs9" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1559"
+     inkscape:window-height="842"
+     id="namedview7"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="2.4329897"
+     inkscape:cx="-54.753903"
+     inkscape:cy="45.94425"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3"
+     transform="matrix(0.26118611,0,0,0.26118611,-0.66726521,-0.66804877)"><path
+       d="M 92.71,44.408 52.591,4.291 c -2.31,-2.311 -6.057,-2.311 -8.369,0 l -8.33,8.332 10.567,10.567 c 2.456,-0.83 5.272,-0.273 7.229,1.685 1.969,1.97 2.521,4.81 1.67,7.275 l 10.186,10.185 c 2.465,-0.85 5.307,-0.3 7.275,1.671 2.75,2.75 2.75,7.206 0,9.958 -2.752,2.751 -7.208,2.751 -9.961,0 -2.068,-2.07 -2.58,-5.11 -1.531,-7.658 l -9.5,-9.499 v 24.997 c 0.67,0.332 1.303,0.774 1.861,1.332 2.75,2.75 2.75,7.206 0,9.959 -2.75,2.749 -7.209,2.749 -9.957,0 -2.75,-2.754 -2.75,-7.21 0,-9.959 0.68,-0.679 1.467,-1.193 2.307,-1.537 v -25.23 c -0.84,-0.344 -1.625,-0.853 -2.307,-1.537 -2.083,-2.082 -2.584,-5.14 -1.516,-7.698 L 31.798,16.715 4.288,44.222 c -2.311,2.313 -2.311,6.06 0,8.371 l 40.121,40.118 c 2.31,2.311 6.056,2.311 8.369,0 L 92.71,52.779 c 2.311,-2.311 2.311,-6.06 0,-8.371 z"
+       id="path5"
+       inkscape:connector-curvature="0"
+       style="fill:#f05133" /></g></svg>

package/usr/share/hedera-web/image/info.svg

@@ -28,9 +28,9 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     inkscape:cy="15.633268"
+     inkscape:cy="2.2028437"
      inkscape:current-layer="layer9"
-     inkscape:window-width="1310"
+     inkscape:window-width="1920"
      pagecolor="#555753"
      showborder="false"
      showguides="true"
@@ -40,19 +40,19 @@
      inkscape:object-nodes="true"
      inkscape:pageshadow="2"
      inkscape:guide-bbox="true"
-     inkscape:window-x="54"
+     inkscape:window-x="1920"
      inkscape:snap-bbox="true"
      bordercolor="#666666"
      id="namedview88"
-     inkscape:window-maximized="0"
+     inkscape:window-maximized="1"
      inkscape:snap-global="true"
-     inkscape:window-y="38"
+     inkscape:window-y="27"
      gridtolerance="10"
-     inkscape:zoom="3.9843904"
+     inkscape:zoom="7.9687808"
-     inkscape:window-height="690"
+     inkscape:window-height="1014"
      borderopacity="1"
      guidetolerance="10"
-     inkscape:cx="-46.807539"
+     inkscape:cx="5.435957"
      inkscape:bbox-paths="false"
      inkscape:snap-grids="true"
      inkscape:pageopacity="1"
@@ -78,9 +78,10 @@
      inkscape:label="status"
      style="display:inline">
     <path
-       d="m 289,257.03125 c -0.40018,0 -0.81534,0.15911 -1.125,0.46875 l -6.375,6.375 c -0.61932,0.61929 -0.61932,1.63071 0,2.25 l 6.375,6.375 c 0.61931,0.61929 1.63068,0.61929 2.25,0 l 6.375,-6.375 c 0.61932,-0.61929 0.61931,-1.63071 0,-2.25 l -6.375,-6.375 c -0.30966,-0.30964 -0.72482,-0.46875 -1.125,-0.46875 z M 288.8125,260 c 1.64243,-0.092 3.0955,1.17008 3.1875,2.8125 -10e-5,1.40136 -0.37771,1.92177 -1.59375,2.84375 -0.19093,0.14364 -0.3256,0.2506 -0.375,0.3125 C 289.98185,266.03085 290,266.002 290,266 c 0.007,0.52831 -0.47163,1 -1,1 -0.52837,0 -1.007,-0.47169 -1,-1 0,-0.50239 0.22424,-0.94342 0.46875,-1.25 0.24451,-0.30663 0.4913,-0.51638 0.71875,-0.6875 0.20405,-0.16056 0.46083,-0.38454 0.6875,-0.65625 0.0935,-0.1121 0.129,-0.30766 0.125,-0.4375 l 0,-0.0313 c -0.0316,-0.56324 -0.49926,-0.9691 -1.0625,-0.9375 -0.56324,0.0316 -0.9691,0.43676 -0.9375,1 l -2,0 c -0.092,-1.64243 1.17007,-2.9079 2.8125,-3 z M 289,268 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+       d="m 287.53551,259.96102 c -0.32661,0 -0.66541,0.12985 -0.91815,0.38255 l -5.20278,5.20277 c -0.50544,0.50543 -0.50544,1.33087 0,1.83629 l 5.20278,5.20279 c 0.50544,0.50541 1.33084,0.50541 1.83629,0 l 5.20277,-5.20279 c 0.50544,-0.50542 0.50544,-1.33086 0,-1.83629 l -5.20277,-5.20277 c -0.25273,-0.2527 -0.59154,-0.38255 -0.91814,-0.38255 z m -0.15302,2.42286 c 1.34042,-0.075 2.52629,0.95493 2.60138,2.29534 -8e-5,1.14368 -0.30825,1.56841 -1.30069,2.32085 -0.15583,0.11723 -0.26573,0.20453 -0.30604,0.25504 -0.0403,0.0507 -0.0254,0.0271 -0.0254,0.0254 0.006,0.43119 -0.38491,0.81613 -0.81612,0.81613 -0.43122,0 -0.82184,-0.38494 -0.81612,-0.81613 0,-0.41 0.183,-0.76994 0.38255,-1.02014 0.19955,-0.25025 0.40096,-0.42144 0.58659,-0.56109 0.16652,-0.13104 0.37609,-0.31383 0.56108,-0.53558 0.0763,-0.0915 0.10528,-0.25108 0.10202,-0.35706 l 0,-0.0255 c -0.0258,-0.45966 -0.40746,-0.7909 -0.86714,-0.76511 -0.45966,0.0258 -0.79089,0.35644 -0.7651,0.81613 l -1.63226,0 c -0.075,-1.34043 0.95494,-2.37322 2.29535,-2.44838 z m 0.15302,6.52899 c 0.45072,0 0.81612,0.36539 0.81612,0.81611 0,0.45073 -0.3654,0.81612 -0.81612,0.81612 -0.45072,0 -0.81612,-0.36539 -0.81612,-0.81612 0,-0.45072 0.3654,-0.81611 0.81612,-0.81611 z"
        id="path19592"
-       style="color:#bebebe;fill:#748cc9;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible" />
+       style="color:#bebebe;fill:#748cc9;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
   </g>
   <g
      transform="translate(-281.0002,-257)"

package/usr/share/hedera-web/image/ok.svg

@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="ok.svg"
-   height="16"
+   height="13.21348"
    id="svg7384"
    inkscape:version="0.48.5 r10040"
    version="1.1"
@@ -32,8 +32,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer15"
-     inkscape:cx="-49.941262"
+     inkscape:cx="8"
-     inkscape:cy="-14.75838"
+     inkscape:cy="6.60674"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -54,12 +54,16 @@
      inkscape:snap-nodes="false"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="702"
+     inkscape:window-height="1014"
      inkscape:window-maximized="1"
-     inkscape:window-width="1366"
+     inkscape:window-width="1920"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="4.1737214">
+     inkscape:zoom="61.755117"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
     <inkscape:grid
        empspacing="2"
        enabled="true"
@@ -68,7 +72,9 @@
        spacingx="1px"
        spacingy="1px"
        type="xygrid"
-       visible="true" />
+       visible="true"
+       originx="-5.8746px"
+       originy="-5.7499995px" />
   </sodipodi:namedview>
   <title
      id="title9167">Gnome Symbolic Icon Theme</title>
@@ -79,36 +85,36 @@
      id="layer9"
      inkscape:label="status"
      style="display:inline"
-     transform="translate(-461.0002,-401)" />
+     transform="translate(-463.9375,-400.91152)" />
   <g
      inkscape:groupmode="layer"
      id="layer10"
      inkscape:label="devices"
-     transform="translate(-461.0002,-401)" />
+     transform="translate(-463.9375,-400.91152)" />
   <g
      inkscape:groupmode="layer"
      id="layer11"
      inkscape:label="apps"
-     transform="translate(-461.0002,-401)" />
+     transform="translate(-463.9375,-400.91152)" />
   <g
      inkscape:groupmode="layer"
      id="layer13"
      inkscape:label="places"
-     transform="translate(-461.0002,-401)" />
+     transform="translate(-463.9375,-400.91152)" />
   <g
      inkscape:groupmode="layer"
      id="layer14"
      inkscape:label="mimetypes"
-     transform="translate(-461.0002,-401)" />
+     transform="translate(-463.9375,-400.91152)" />
   <g
      inkscape:groupmode="layer"
      id="layer15"
      inkscape:label="emblems"
      style="display:inline"
-     transform="translate(-461.0002,-401)">
+     transform="translate(-463.9375,-400.91152)">
     <path
        inkscape:connector-curvature="0"
-       d="M 472.9375,404.9375 468,409.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 1.0625,-1.0625 6,-6 -2.125,-2.125 z"
+       d="m 475.64536,402.5632 -5.32585,5.32584 -2.08987,-2.08989 -2.29214,2.29215 3.23595,3.23594 1.14606,1.14607 1.14607,-1.14607 6.47192,-6.47192 -2.29214,-2.29212 z"
        id="path5037"
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#78d478;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
   </g>
@@ -117,17 +123,17 @@
      id="g71291"
      inkscape:label="emotes"
      style="display:inline"
-     transform="translate(-461.0002,-401)" />
+     transform="translate(-463.9375,-400.91152)" />
   <g
      inkscape:groupmode="layer"
      id="g4953"
      inkscape:label="categories"
      style="display:inline"
-     transform="translate(-461.0002,-401)" />
+     transform="translate(-463.9375,-400.91152)" />
   <g
      inkscape:groupmode="layer"
      id="layer12"
      inkscape:label="actions"
      style="display:inline"
-     transform="translate(-461.0002,-401)" />
+     transform="translate(-463.9375,-400.91152)" />
 </svg>

package/usr/share/hedera-web/image/order.svg

@@ -10,11 +10,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="order.svg"
-   height="16"
+   height="17.90663"
    id="svg7384"
    inkscape:version="0.48.5 r10040"
    version="1.1"
-   width="16">
+   width="12">
   <metadata
      id="metadata90">
     <rdf:RDF>
@@ -33,8 +33,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer12"
-     inkscape:cx="15.101722"
+     inkscape:cx="4.6064521"
-     inkscape:cy="11.321276"
+     inkscape:cy="10.290026"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -55,18 +55,22 @@
      inkscape:snap-nodes="false"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="702"
+     inkscape:window-height="1014"
      inkscape:window-maximized="1"
-     inkscape:window-width="1366"
+     inkscape:window-width="1920"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="32.6875">
+     inkscape:zoom="32.6875"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
     <inkscape:grid
        empspacing="2"
        enabled="true"
        id="grid4866"
-       originx="80.00005px"
+       originx="77px"
-       originy="590px"
+       originy="588.96875px"
        snapvisiblegridlinesonly="true"
        spacingx="1px"
        spacingy="1px"
@@ -82,54 +86,54 @@
      id="layer9"
      inkscape:label="status"
      style="display:inline"
-     transform="translate(-161.00015,-807)" />
+     transform="translate(-164.0002,-804.06212)" />
   <g
      inkscape:groupmode="layer"
      id="layer10"
      inkscape:label="devices"
-     transform="translate(-161.00015,-807)" />
+     transform="translate(-164.0002,-804.06212)" />
   <g
      inkscape:groupmode="layer"
      id="layer11"
      inkscape:label="apps"
-     transform="translate(-161.00015,-807)" />
+     transform="translate(-164.0002,-804.06212)" />
   <g
      inkscape:groupmode="layer"
      id="layer13"
      inkscape:label="places"
-     transform="translate(-161.00015,-807)" />
+     transform="translate(-164.0002,-804.06212)" />
   <g
      inkscape:groupmode="layer"
      id="layer14"
      inkscape:label="mimetypes"
-     transform="translate(-161.00015,-807)" />
+     transform="translate(-164.0002,-804.06212)" />
   <g
      inkscape:groupmode="layer"
      id="layer15"
      inkscape:label="emblems"
      style="display:inline"
-     transform="translate(-161.00015,-807)" />
+     transform="translate(-164.0002,-804.06212)" />
   <g
      inkscape:groupmode="layer"
      id="g71291"
      inkscape:label="emotes"
      style="display:inline"
-     transform="translate(-161.00015,-807)" />
+     transform="translate(-164.0002,-804.06212)" />
   <g
      inkscape:groupmode="layer"
      id="g4953"
      inkscape:label="categories"
      style="display:inline"
-     transform="translate(-161.00015,-807)" />
+     transform="translate(-164.0002,-804.06212)" />
   <g
      inkscape:groupmode="layer"
      id="layer12"
      inkscape:label="actions"
      style="display:inline"
-     transform="translate(-161.00015,-807)">
+     transform="translate(-164.0002,-804.06212)">
     <path
        inkscape:connector-curvature="0"
-       d="m 169.0002,807 c -2.76142,0 -5,2.23858 -5,5 0,0.34518 0.0272,0.67451 0.0937,1 0.37506,2.83961 3.93256,4.92586 4.9375,8.96875 0.98541,-3.98539 4.99777,-6.918 5,-9.96875 l -0.0312,0 c 0,-2.76142 -2.23858,-5 -5,-5 z m 0,2 c 1.65686,0 3,1.34314 3,3 0,1.65686 -1.34314,3 -3,3 -1.65686,0 -3,-1.34314 -3,-3 0,-1.65686 1.34314,-3 3,-3 z"
+       d="m 169.98154,804.06212 c -3.3034,0 -5.98134,2.67794 -5.98134,5.98134 0,0.41292 0.0325,0.80689 0.11209,1.19626 0.44867,3.39694 4.70439,5.89265 5.90657,10.72903 1.17882,-4.76759 5.97867,-8.27578 5.98134,-11.92529 l -0.0373,0 c 0,-3.3034 -2.67794,-5.98134 -5.98134,-5.98134 z m 0,2.39253 c 1.98205,0 3.5888,1.60676 3.5888,3.58881 0,1.98204 -1.60675,3.5888 -3.5888,3.5888 -1.98205,0 -3.5888,-1.60676 -3.5888,-3.5888 0,-1.98205 1.60675,-3.58881 3.5888,-3.58881 z"
        id="path45579"
        sodipodi:nodetypes="ssccccssssss"
        style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />

package/usr/share/hedera-web/image/pay.svg

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="45"
+   height="18"
+   viewBox="0 0 5.4128298 2.1596722"
+   id="svg2"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="pay.svg"><metadata
+     id="metadata13"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview11"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="17.26776"
+     inkscape:cx="19.949497"
+     inkscape:cy="5.5278893"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><defs
+     id="defs4"><style
+       type="text/css"
+       id="style6" /></defs><g
+     id="g5088"
+     transform="matrix(0.05464477,0,0,0.05464477,0.30071444,0.32636112)"><polygon
+       points="38.1441,26.6077 31.0183,26.6077 31.0183,26.6077 35.4754,0.453591 42.6041,0.453591 "
+       style="fill:#004686;stroke:none"
+       id="polygon10" /><path
+       d="M 63.9988,1.09833 C 62.58648,0.567483 60.37334,0 57.60947,0 c -7.04359,-7.10068e-4 -12.0057,3.54707 -12.0477,8.63087 -0.03962,3.75782 3.54224,5.85437 6.24632,7.10536 2.7748,1.28096 3.70755,2.09924 3.69434,3.24416 -0.01747,1.75216 -2.21584,2.55383 -4.26481,2.55383 -2.85319,-2.84e-4 -4.36905,-0.396218 -6.71014,-1.3727 l -0.918544,-0.416384 -1.00049,5.85479 c 1.66525,0.730376 4.74396,1.36305 7.94069,1.39599 7.49349,-4.26e-4 12.358,-3.5066 12.4133,-8.93521 0.02698,-2.97561 -1.87231,-5.23931 -5.98488,-7.10593 -2.49163,-1.21052 -4.01785,-2.01716 -4.00166,-3.24217 1.42e-4,-1.0874 1.29161,-2.24964 4.08232,-2.24964 2.33144,-0.037065 4.01969,0.472053 5.33531,1.00191 l 0.639061,0.301211 0.96626,-5.66776 -4.7e-5,3e-6 z"
+       style="fill:#004686;stroke:none"
+       id="path12"
+       inkscape:connector-curvature="0" /><path
+       d="m 82.279,0.478444 -5.50885,0 c -1.70629,0 -2.98342,0.466799 -3.73297,2.16997 l -10.5868,23.9672 7.48539,0 c 0,0 1.22416,-3.22215 1.50108,-3.92951 0.818282,0 8.0898,0.01122 9.12934,0.01122 0.213588,0.915277 0.867419,3.91886 0.867419,3.91886 l 6.61513,-5.68e-4 -5.76973,-26.13719995 M 73.488229,17.336115 c 0.58964,-1.50705 2.84013,-7.31043 2.84013,-7.31043 -0.04175,0.06916 0.585096,-1.51429 0.945242,-2.49617 l 0.48242,2.25418 c 0,0 1.36447,6.24363 1.64977,7.55285 l -5.91756,-4.26e-4 -2e-6,-4e-6 z"
+       style="fill:#004686;stroke:none"
+       id="path14"
+       inkscape:connector-curvature="0" /><path
+       d="m 25.0395,0.472763 -6.97897,17.8351 -0.743725,-3.62404 c -1.29914,-4.17861 -5.34752,-8.70458 -9.87307,-10.9708 l 6.38166,22.8721 7.54234,-0.0089 11.2228,-26.10339985 -7.551,0 -3.5e-5,-1.315e-5 z"
+       style="fill:#004686;stroke:none"
+       id="path16"
+       inkscape:connector-curvature="0" /><path
+       d="m 11.586,0.457 -11.495,0 -0.0910307,0.54448 c 8.94288,2.16429 14.8602997,7.39649 17.3166997,13.6823 L 14.817089,2.66528 C 14.385652,1.00926 13.133949,0.51519 11.585999,0.45697 l 1e-6,3e-5 z"
+       style="fill:#ef9b11"
+       id="path18"
+       inkscape:connector-curvature="0" /></g></svg>

package/usr/share/hedera-web/image/refresh.svg

@@ -127,7 +127,7 @@
     <path
        id="path4597"
        d="m 253.90645,628.96875 a 1.0001,1.0001 0 0 0 -0.125,0.0312 1.0001,1.0001 0 0 0 -0.78125,1 l 0,1.6875 c -0.38225,-0.57796 -0.84927,-1.08223 -1.40625,-1.5 -1.15563,-0.86677 -2.53199,-1.25227 -3.875,-1.1875 -0.19186,0.009 -0.37223,0.0353 -0.5625,0.0625 -1.52218,0.21741 -2.97815,1.02304 -3.96875,2.34375 -1.98119,2.64144 -1.42267,6.42505 1.21875,8.40625 2.64147,1.98122 6.42504,1.42267 8.40625,-1.21875 A 1.0063276,1.0063276 0 0 0 253.0002,638 a 1.0063276,1.0063276 0 0 0 0,-0.15625 l 0,-0.84375 -0.8125,0 -0.0937,0 a 1.0063276,1.0063276 0 0 0 -0.0937,0 1.0063276,1.0063276 0 0 0 -0.8125,0.40625 c -1.33265,1.77674 -3.81702,2.11387 -5.59375,0.78125 -1.77674,-1.33264 -2.1139,-3.81699 -0.78125,-5.59375 1.33265,-1.77674 3.817,-2.11389 5.59375,-0.78125 0.42946,0.32212 0.76954,0.73295 1.03125,1.1875 l -1.4375,0 a 1.0001,1.0001 0 0 0 -1,1 1.0001,1.0001 0 0 0 0,0.21875 l 0,0.78125 0.84375,0 0.15625,0 4,0 1,0 0,-1 0,-4 a 1.0001,1.0001 0 0 0 0,-0.1875 l 0,-0.8125 -0.8125,0 a 1.0001,1.0001 0 0 0 -0.28125,-0.0312 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#333333;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#666666;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        inkscape:connector-curvature="0" />
   </g>
 </svg>

package/usr/share/hedera-web/image/remove.svg

@@ -24,14 +24,14 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
+     inkscape:window-width="1920"
-     inkscape:window-height="702"
+     inkscape:window-height="1014"
      id="namedview15"
      showgrid="false"
      inkscape:zoom="30.133789"
-     inkscape:cx="1.7611563"
+     inkscape:cx="-2.6856791"
      inkscape:cy="8"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg7384" />
@@ -64,18 +64,18 @@
      id="layer11"
      style="fill:#333333;fill-opacity:1" />
   <g
-     transform="translate(-60,-518)"
+     transform="matrix(1.4994104,0,0,1.4994104,-93.957549,-780.6897)"
      id="layer12"
-     style="fill:#333333;fill-opacity:1">
+     style="fill:#666666;fill-opacity:1">
     <g
        transform="translate(19,-242)"
        id="layer4-4-1"
-       style="display:inline;fill:#333333;fill-opacity:1">
+       style="fill:#666666;fill-opacity:1;display:inline">
       <path
          inkscape:connector-curvature="0"
          d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
          id="path10839-9"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
     </g>
   </g>
   <g

package/usr/share/hedera-web/image/scalable/show.svg

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg7384"
-   sodipodi:docname="show.svg"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   height="16"
-   width="16">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:cy="6.1661"
-     pagecolor="#555753"
-     borderopacity="1"
-     showborder="false"
-     inkscape:bbox-paths="false"
-     guidetolerance="10"
-     inkscape:object-paths="true"
-     inkscape:window-width="1296"
-     showguides="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pageshadow="2"
-     inkscape:guide-bbox="true"
-     inkscape:snap-nodes="false"
-     bordercolor="#666666"
-     objecttolerance="10"
-     id="namedview88"
-     showgrid="true"
-     inkscape:window-maximized="0"
-     inkscape:window-x="68"
-     inkscape:snap-global="true"
-     inkscape:window-y="27"
-     gridtolerance="10"
-     inkscape:window-height="701"
-     inkscape:snap-to-guides="true"
-     inkscape:current-layer="layer12"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:zoom="65.25"
-     inkscape:cx="6.9833509"
-     inkscape:snap-grids="true"
-     inkscape:pageopacity="1">
-    <inkscape:grid
-       spacingx="1px"
-       spacingy="1px"
-       id="grid4866"
-       empspacing="2"
-       enabled="true"
-       type="xygrid"
-       snapvisiblegridlinesonly="true"
-       visible="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     inkscape:label="status"
-     transform="translate(-140.0002,-645.96875)"
-     inkscape:groupmode="layer"
-     id="layer9"
-     style="display:inline" />
-  <g
-     inkscape:label="devices"
-     transform="translate(-140.0002,-645.96875)"
-     inkscape:groupmode="layer"
-     id="layer10" />
-  <g
-     inkscape:label="apps"
-     transform="translate(-140.0002,-645.96875)"
-     inkscape:groupmode="layer"
-     id="layer11" />
-  <g
-     inkscape:label="actions"
-     transform="translate(-140.0002,-645.96875)"
-     inkscape:groupmode="layer"
-     id="layer12">
-    <path
-       inkscape:connector-curvature="0"
-       d="m 146.50761,646.99554 c -3.02886,0 -5.51073,2.47905 -5.51073,5.50447 0,3.02541 2.48187,5.50446 5.51073,5.50446 3.02885,0 5.51072,-2.47905 5.51072,-5.50446 0,-3.02542 -2.48187,-5.50447 -5.51072,-5.50447 z m 0,2.00893 c 1.94735,0 3.49951,1.55039 3.49951,3.49554 0,1.94514 -1.55216,3.49553 -3.49951,3.49553 -1.94736,0 -3.49952,-1.55039 -3.49952,-3.49553 0,-1.94515 1.55216,-3.49554 3.49952,-3.49554 z"
-       id="path27918"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1.55467153000000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 149.8125,655 a 1.0001,1.0001 0 0 0 -0.5,1.71875 l 4,4 a 1.0054782,1.0054782 0 1 0 1.40625,-1.4375 l -4,-4 A 1.0001,1.0001 0 0 0 149.8125,655 z"
-       id="path27941"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#333333;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans" />
-  </g>
-  <g
-     inkscape:label="places"
-     transform="translate(-140.0002,-645.96875)"
-     inkscape:groupmode="layer"
-     id="layer13" />
-  <g
-     inkscape:label="mimetypes"
-     transform="translate(-140.0002,-645.96875)"
-     inkscape:groupmode="layer"
-     id="layer14" />
-  <g
-     inkscape:label="emblems"
-     transform="translate(-140.0002,-645.96875)"
-     inkscape:groupmode="layer"
-     id="layer15"
-     style="display:inline" />
-  <g
-     inkscape:label="categories"
-     transform="translate(-140.0002,-645.96875)"
-     inkscape:groupmode="layer"
-     id="g4953"
-     style="display:inline" />
-</svg>

package/usr/share/hedera-web/image/show.svg

@@ -28,7 +28,7 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     inkscape:cy="6.1661"
+     inkscape:cy="8.9536526"
      pagecolor="#555753"
      borderopacity="1"
      showborder="false"
@@ -47,16 +47,16 @@
      id="namedview88"
      showgrid="true"
      inkscape:window-maximized="0"
-     inkscape:window-x="68"
+     inkscape:window-x="2192"
      inkscape:snap-global="true"
-     inkscape:window-y="27"
+     inkscape:window-y="243"
      gridtolerance="10"
      inkscape:window-height="701"
      inkscape:snap-to-guides="true"
      inkscape:current-layer="layer12"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:zoom="65.25"
+     inkscape:zoom="16.3125"
-     inkscape:cx="6.9833509"
+     inkscape:cx="7.1233965"
      inkscape:snap-grids="true"
      inkscape:pageopacity="1">
     <inkscape:grid
@@ -98,12 +98,12 @@
        inkscape:connector-curvature="0"
        d="m 146.50761,646.99554 c -3.02886,0 -5.51073,2.47905 -5.51073,5.50447 0,3.02541 2.48187,5.50446 5.51073,5.50446 3.02885,0 5.51072,-2.47905 5.51072,-5.50446 0,-3.02542 -2.48187,-5.50447 -5.51072,-5.50447 z m 0,2.00893 c 1.94735,0 3.49951,1.55039 3.49951,3.49554 0,1.94514 -1.55216,3.49553 -3.49951,3.49553 -1.94736,0 -3.49952,-1.55039 -3.49952,-3.49553 0,-1.94515 1.55216,-3.49554 3.49952,-3.49554 z"
        id="path27918"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1.55467153000000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.55467153000000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans" />
     <path
        inkscape:connector-curvature="0"
        d="m 149.8125,655 a 1.0001,1.0001 0 0 0 -0.5,1.71875 l 4,4 a 1.0054782,1.0054782 0 1 0 1.40625,-1.4375 l -4,-4 A 1.0001,1.0001 0 0 0 149.8125,655 z"
        id="path27941"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#333333;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans" />
   </g>
   <g
      inkscape:label="places"

package/usr/share/hedera-web/image/youtube.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="23.999996"
+   id="svg11927"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="youtube.svg">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="64.326307"
+     inkscape:cy="46.777283"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="mm"
+     borderlayer="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-65.660672,-187.08936)">
+    <path
+       style="fill:#c30000;fill-opacity:1;stroke:none;display:inline"
+       d="m 68.556274,210.90728 c -2.293676,-0.68242 -2.880675,-2.99702 -2.89518,-11.41603 -0.01025,-5.94721 0.16327,-7.96905 0.8512,-9.91843 0.533461,-1.51166 1.175311,-1.99041 3.044687,-2.27101 1.814868,-0.27242 11.459518,-0.28621 15.293323,-0.0219 5.345509,0.48245 4.737665,4.05194 4.797521,11.13 0.06208,7.3381 -0.07728,8.93495 -0.942901,10.80584 -0.857753,1.85393 -0.528524,1.79528 -10.467487,1.86487 -5.046388,0.0354 -9.231633,-0.0396 -9.681163,-0.17336 z m 14.0137,-11.9128 c -9.225924,-6.1861 1.31465,0.90117 -8.167349,-5.4762 0.0541,2.97456 0.0086,8.38462 0.04076,11.04998 9.474932,-6.37668 -1.004697,0.69337 8.126587,-5.57378 z"
+       id="path11905"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssscccsccccc" />
+  </g>
+</svg>

package/usr/share/hedera-web/js/htk/column/spin.js

@@ -45,7 +45,7 @@ Htk.ColumnSpin = new Class
 		else if (valueString)
 		{
 			if (this.unit)
-				valueString = valueString +' '+ this.unit;
+				valueString = valueString + this.unit;
 		
 			var text = document.createTextNode (valueString);
 			td.appendChild (text);

package/usr/share/hedera-web/js/htk/field/full-image.js

@@ -15,6 +15,8 @@ Htk.FullImage = new Class
 
 		var div = document.createElement ('div');
 		div.className = 'full-image';
+		div.addEventListener ('mouseover', this.cancelHide.bind (this));
+		div.addEventListener ('mouseout', this.hideNow.bind (this));
 		
 		var loadingBox = document.createElement ('div');
 		loadingBox.className = 'image-loader';
@@ -41,13 +43,7 @@ Htk.FullImage = new Class
 	
 	,show: function (basedir, file)
 	{		
-		if (this.timeout)
+		this.cancelHide ();
-		{
-			clearTimeout (this.timeout);
-			this.timeout = 0;
-		}
-
-		this.hideCalled = false;
 		this.loadingBox.style.left = this.getLeft (40);
 		this.loadingBox.style.top = this.getTop (40);
 
@@ -108,6 +104,9 @@ Htk.FullImage = new Class
 		{
 			document.body.appendChild (this.div);
 			this.visible = true;
+
+			this.onDocumentClickCallback = this.hideNow.bind (this);
+			document.addEventListener ('click', this.onDocumentClickCallback);
 		}
 	}
 
@@ -117,16 +116,34 @@ Htk.FullImage = new Class
 		this.hideLoading ();
 		
 		if (this.visible)
-			this.timeout = setTimeout (this.hideTimeout.bind (this), 450);
+			this.timeout = setTimeout (this.hideNow.bind (this), 450);
 	}
 	
-	,hideTimeout: function ()
+	,hideNow: function ()
+	{
+		if (this.visible)
 		{
 			document.body.removeChild (this.div);
+			this.hideCalled = true;
 			this.visible = false;
 			this.timeout = 0;
 		}
 
+		document.removeEventListener ('click', this.onDocumentClickCallback);
+		this.onDocumentClickCallback = null;
+	}
+
+	,cancelHide: function ()
+	{
+		if (this.timeout)
+		{
+			clearTimeout (this.timeout);
+			this.timeout = 0;
+		}
+
+		this.hideCalled = false;
+	}
+	
 	,hideLoading: function ()
 	{
 		if (this.loading)

package/usr/share/hedera-web/js/htk/grid.js

@@ -139,7 +139,7 @@ Htk.Grid = new Class
 			{
 				this.internalColumn = new Htk.ColumnButton
 				({
-					 image: 'image/remove.png'
+					 image: 'image/remove.svg'
 					,tip: _('Remove')
 				});
 				this.internalColumn.on ('clicked', this.removeClicked, this);
@@ -157,7 +157,7 @@ Htk.Grid = new Class
 	{
 		if (!this._model)
 		{
-			this.showMessage (this.emptyMessage, 'refresh.png');
+			this.showMessage (this.emptyMessage, 'refresh.svg');
 			return;
 		}
 
@@ -179,10 +179,10 @@ Htk.Grid = new Class
 				this.showMessage (_('Loading'), 'loader-black.gif');
 				break;
 			case Db.Model.Status.CLEAN:
-				this.showMessage (_(this.emptyMessage), 'refresh.png');
+				this.showMessage (_(this.emptyMessage), 'refresh.svg');
 				break;
 			case Db.Model.Status.ERROR:
-				this.showMessage (_('ErrorLoadingData'), 'error.png');
+				this.showMessage (_('ErrorLoadingData'), 'error.svg');
 				break;
 		}
 
@@ -192,7 +192,7 @@ Htk.Grid = new Class
 	,showNoRecordsFound: function (count)
 	{
 		if (this._model.numRows == 0)
-			this.showMessage (_('EmptyList'), 'clean.png');
+			this.showMessage (_('EmptyList'), 'clean.svg');
 	}
 
 	,showMessage: function (message, src)

package/usr/share/hedera-web/js/vn/node.js

@@ -1,3 +1,4 @@
+
 Vn.Node =
 {
 	removeChilds: function (node)
@@ -21,3 +22,8 @@ Vn.Node =
 			node.appendChild (document.createTextNode (text));
 	}
 };
+
+function $ (id)
+{
+	return document.getElementById (id);
+}

package/usr/share/hedera-web/locale/ca/forms/admin/photos.json

@@ -0,0 +1,12 @@
+{
+	 "Photos": "Fotos"
+
+	,"Schema:": "Esquema:"
+	,"ImageName:": "Nombre de la imagen:"
+	,"Id:": "Id:"
+	,"ImageFile:": "Archivo de imagen:"
+
+	,"Upload": "Enviar"
+
+	,"ImageUploaded": "Imagen subida correctamente"
+}

package/usr/share/hedera-web/locale/ca/forms/ecomerce/basket.json

@@ -0,0 +1,26 @@
+{
+	 "ShoppingBasket": "Cistella de la compra"
+
+	,"Delete": "Borrar encàrrec"
+	,"GoToCatalog": "Accedir al catàleg"
+	,"Checkout": "Tramitar encàrrec"
+
+	,"OrderNumber:": "N encàrec:"
+	,"DateExit:": "Data d'eixida:"
+	,"Warehouse:": "Magatzem:"
+	,"OrderTotal:": "Total encàrrec:"
+	,"VATNotIncluded": "(IVA i transport no inclosos)"
+
+	,"Amount": "Quant"
+	,"Pack": "Pack"
+	,"Stems": "Tijes"
+	,"Avail": "Disp"
+	,"Item": "Artícle"
+	,"Cat": "Cat"
+	,"S1": "Mes"
+	,"Color": "Color"
+	,"Origin": "Orige"
+	,"Price": "Preu"
+	,"Disc": "Desc"
+	,"Subtotal": "Subtotal"
+}

package/usr/share/hedera-web/locale/ca/forms/ecomerce/catalog.json

@@ -22,7 +22,7 @@
 	,"Cat": "Cat"
 	,"Pack": "Pack"
 	,"Origin": "Origen"
-	,"AstPrice": "* Preu"
+	,"AstPrice": "Preu*"
 
 	,"FixedPrices": "* Els preus resaltats en verd són fixes, la resta són orientatius."
 }

package/usr/share/hedera-web/locale/ca/forms/ecomerce/checkout.json

@@ -1,26 +1,5 @@
 {
-	 "Delete": "Borrar encàrrec"
+	 "Checkout": "Tramitar encarrec"
-	,"GoToCatalog": "Accedir al catàleg"
-	,"Checkout": "Tramitar encàrrec"
-
-	,"OrderNumber:": "N encàrec:"
-	,"DateExit:": "Data d'eixida:"
-	,"Warehouse:": "Magatzem:"
-	,"OrderTotal:": "Total encàrrec:"
-	,"VATNotIncluded": "(IVA i transport no inclosos)"
-
-	,"Amount": "Quant"
-	,"Pack": "Pack"
-	,"Stems": "Tijes"
-	,"Avail": "Disp"
-	,"Item": "Artícle"
-	,"Cat": "Cat"
-	,"S1": "Mes"
-	,"Color": "Color"
-	,"Origin": "Orige"
-	,"Price": "Preu"
-	,"Disc": "Desc"
-	,"Subtotal": "Subtotal"
 
 	,"GoBasket": "Tornar a la cistella"
 	,"Confirm": "Confirmar"

package/usr/share/hedera-web/locale/ca/forms/ecomerce/ticket.json

@@ -1,5 +1,7 @@
 {
-	 "Print": "Imprimir albarà"
+	 "OrderDetail": "Detall de l'encarrec"
+
+	,"Print": "Imprimir albarà"
 
 	,"TicketNumber:": "N ticket:"
 	,"DateExit:": "Data d'enviament:"

package/usr/share/hedera-web/locale/ca/js/vn.js

@@ -66,6 +66,7 @@ Vn.Locale.add
 	,"Administration": "Administració"
 	,"Users": "Usuaris"
 	,"Visits": "Visites"
+	,"Photos": "Fotos"
 	,"Agencies": "Agències"
 	,"News": "Noticies"
 	,"Contact": "Vull ser client"

package/usr/share/hedera-web/locale/es/forms/admin/photos.json

@@ -0,0 +1,12 @@
+{
+	 "Photos": "Fotos"
+
+	,"Schema:": "Esquema:"
+	,"ImageName:": "Nombre de la imagen:"
+	,"Id:": "Id:"
+	,"ImageFile:": "Archivo de imagen:"
+
+	,"Upload": "Enviar"
+
+	,"ImageUploaded": "Imagen subida correctamente"
+}

package/usr/share/hedera-web/locale/es/forms/ecomerce/basket.json

@@ -0,0 +1,26 @@
+{
+	 "ShoppingBasket": "Cesta de la compra"
+
+	,"Delete": "Borrar pedido"
+	,"GoToCatalog": "Acceder al catálogo"
+	,"Checkout": "Tramitar pedido"
+
+	,"OrderNumber:": "Nº pedido:"
+	,"DateExit:": "Fecha de salida:"
+	,"Warehouse:": "Almacén:"
+	,"OrderTotal:": "Total pedido:"
+	,"VATNotIncluded": "(IVA y transporte no incluídos)"
+
+	,"Amount": "Cant"
+	,"Pack": "Pack"
+	,"Stems": "Tallos"
+	,"Avail": "Disp"
+	,"Item": "Artículo"
+	,"Cat": "Cat"
+	,"S1": "Med"
+	,"Color": "Color"
+	,"Origin": "Origen"
+	,"Price": "Precio"
+	,"Disc": "Desc"
+	,"Subtotal": "Subtotal"
+}

package/usr/share/hedera-web/locale/es/forms/ecomerce/catalog.json

@@ -23,7 +23,7 @@
 	,"Cat": "Cat"
 	,"Pack": "Pack"
 	,"Origin": "Origen"
-	,"AstPrice": "* Precio"
+	,"AstPrice": "Precio*"
 
 	,"FixedPrices": "* Los precios resaltados en verde son fijos, el resto son orientativos."
 }

package/usr/share/hedera-web/locale/es/forms/ecomerce/checkout.json

@@ -1,26 +1,5 @@
 {
-	 "Delete": "Borrar pedido"
+	 "Checkout": "Tramitar pedido"
-	,"GoToCatalog": "Acceder al catálogo"
-	,"Checkout": "Tramitar pedido"
-
-	,"OrderNumber:": "Nº pedido:"
-	,"DateExit:": "Fecha de salida:"
-	,"Warehouse:": "Almacén:"
-	,"OrderTotal:": "Total pedido:"
-	,"VATNotIncluded": "(IVA y transporte no incluídos)"
-
-	,"Amount": "Cant"
-	,"Pack": "Pack"
-	,"Stems": "Tallos"
-	,"Avail": "Disp"
-	,"Item": "Artículo"
-	,"Cat": "Cat"
-	,"S1": "Med"
-	,"Color": "Color"
-	,"Origin": "Origen"
-	,"Price": "Precio"
-	,"Disc": "Desc"
-	,"Subtotal": "Subtotal"
 
 	,"GoBasket": "Volver a la cesta"
 	,"Confirm": "Confirmar"

package/usr/share/hedera-web/locale/es/forms/ecomerce/ticket.json

@@ -1,5 +1,7 @@
 {
-	 "Print": "Imprimir albarán"
+	 "OrderDetail": "Detalle del pedido"
+
+	,"Print": "Imprimir albarán"
 
 	,"TicketNumber:": "Nº ticket:"
 	,"DateExit:": "Fecha de envío:"

package/usr/share/hedera-web/locale/es/js/vn.js

@@ -66,6 +66,7 @@ Vn.Locale.add
 	,"Administration": "Administración"
 	,"Users": "Usuarios"
 	,"Visits": "Visitas"
+	,"Photos": "Fotos"
 	,"Agencies": "Agencias"
 	,"News": "Noticias"
 	,"Contact": "Quiero ser cliente"

package/usr/share/hedera-web/locale/fr/forms/admin/photos.json

@@ -0,0 +1,12 @@
+{
+	 "Photos": "Fotos"
+
+	,"Schema:": "Esquema:"
+	,"ImageName:": "Nombre de la imagen:"
+	,"Id:": "Id:"
+	,"ImageFile:": "Archivo de imagen:"
+
+	,"Upload": "Enviar"
+
+	,"ImageUploaded": "Imagen subida correctamente"
+}

package/usr/share/hedera-web/locale/fr/forms/ecomerce/basket.json

@@ -0,0 +1,26 @@
+{
+	 "ShoppingBasket": "Panier"
+
+	,"Delete": "Effacer"
+	,"GoToCatalog": "Accédez au catalogue"
+	,"Checkout": "Caisse"
+
+	,"OrderNumber:": "Numéro de commande:"
+	,"DateExit:": "Date de sortie:"
+	,"Warehouse:": "Magasin:"
+	,"OrderTotal:": "Total commande:"
+	,"VATNotIncluded": "(TVA et frais de port non inclus)"
+
+	,"Amount": "Quant"
+	,"Pack": "Pack"
+	,"Stems": "Tige"
+	,"Avail": "Disp"
+	,"Item": "Nom"
+	,"Cat": "Cat"
+	,"S1": "Mes"
+	,"Color": "Couleur"
+	,"Origin": "Origine"
+	,"Price": "* Prix"
+	,"Disc": "Desc"
+	,"Subtotal": "Sous-total"
+}

package/usr/share/hedera-web/locale/fr/forms/ecomerce/catalog.json

@@ -23,7 +23,7 @@
 	,"Cat": "Cat"
 	,"Pack": "Pack"
 	,"Origin": "Origine"
-	,"AstPrice": "* Prix"
+	,"AstPrice": "Prix*"
 
 	,"FixedPrices": "* Les prix en vert sont fixes, le reste sont orientatives."
 }

package/usr/share/hedera-web/locale/fr/forms/ecomerce/checkout.json

@@ -1,26 +1,5 @@
 {
-	 "Delete": "Effacer"
+	 "Checkout": "Check-Out"
-	,"GoToCatalog": "Accédez au catalogue"
-	,"Checkout": "Caisse"
-
-	,"OrderNumber:": "Numéro de commande:"
-	,"DateExit:": "Date de sortie:"
-	,"Warehouse:": "Magasin:"
-	,"OrderTotal:": "Total commande:"
-	,"VATNotIncluded": "(TVA et frais de port non inclus)"
-
-	,"Amount": "Quant"
-	,"Pack": "Pack"
-	,"Stems": "Tige"
-	,"Avail": "Disp"
-	,"Item": "Nom"
-	,"Cat": "Cat"
-	,"S1": "Mes"
-	,"Color": "Couleur"
-	,"Origin": "Origine"
-	,"Price": "* Prix"
-	,"Disc": "Desc"
-	,"Subtotal": "Sous-total"
 
 	,"GoBasket": "Retour au"
 	,"Confirm": "Confirmer"

package/usr/share/hedera-web/locale/fr/forms/ecomerce/ticket.json

@@ -1,5 +1,7 @@
 {
-	 "Print": "Imprimer bulletin de livraison"
+	 "OrderDetail": "Détails de la commande"
+
+	,"Print": "Imprimer bulletin de livraison"
 
 	,"TicketNumber:": "Num ticket:"
 	,"DateExit:": "Date d'envoi:"

package/usr/share/hedera-web/locale/fr/js/vn.js

@@ -66,6 +66,7 @@ Vn.Locale.add
 	,"Administration": "Administration"
 	,"Users": "Utilisateurs"
 	,"Visits": "Visites"
+	,"Photos": "Photos"
 	,"Agencies": "Agences"
 	,"News": "Nouvelles"
 	,"Contact": "Je veux être client"

package/usr/share/hedera-web/pages/login/html.php

@@ -51,16 +51,16 @@
 			</div>
 			<div id="links">
 				<a target="_blank" href="http://verdnaturacomunicacion.blogspot.com.es/">
-					<img alt="Blogger" src="image/blogger.png" title="Blogger"/>
+					<img alt="Blogger" src="image/blogger.svg" title="Blogger"/>
 				</a>
 				<a target="_blank" href="https://plus.google.com/u/0/107516577801959283883/posts">
-					<img alt="Google+" src="image/google_plus.png" title="Google+"/>
+					<img alt="Google+" src="image/google-plus.svg" title="Google+"/>
 				</a>
 				<a target="_blank" href="http://www.facebook.com/verdnatura">
-					<img alt="Facebook" src="image/facebook.png" title="Facebook"/>
+					<img alt="Facebook" src="image/facebook.svg" title="Facebook"/>
 				</a>
 				<a target="_blank" href="http://www.youtube.com/user/verdnatura">
-					<img alt="YouTube" src="image/youtube.png" title="YouTube"/>
+					<img alt="YouTube" src="image/youtube.svg" title="YouTube"/>
 				</a>
 			</div>
 			</div>

package/usr/share/hedera-web/pages/login/style.css

@@ -154,7 +154,8 @@ input[type=submit]:hover
 }
 #links
 {
-	margin: 2em auto;
+	margin: 0 auto;
+	margin-top: 2em;
 	text-align: center;
 }
 #links img

package/usr/share/hedera-web/pages/web/html.php

@@ -35,16 +35,16 @@
 			<ul id="menu"></ul>
 			<div id="links">
 				<a target="_blank" href="http://verdnaturacomunicacion.blogspot.com.es/">
-					<img alt="Blogger" src="image/blogger.png" title="Blogger"/>
+					<img alt="Blogger" src="image/blogger.svg" title="Blogger"/>
 				</a>
 				<a target="_blank" href="https://plus.google.com/u/0/107516577801959283883/posts">
-					<img alt="Google+" src="image/google_plus.png" title="Google+"/>
+					<img alt="Google+" src="image/google-plus.svg" title="Google+"/>
 				</a>
 				<a target="_blank" href="http://www.facebook.com/verdnatura">
-					<img alt="Facebook" src="image/facebook.png" title="Facebook"/>
+					<img alt="Facebook" src="image/facebook.svg" title="Facebook"/>
 				</a>
 				<a target="_blank" href="http://www.youtube.com/user/verdnatura">
-					<img alt="YouTube" src="image/youtube.png" title="YouTube"/>
+					<img alt="YouTube" src="image/youtube.svg" title="YouTube"/>
 				</a>
 			</div>
 		</div>

package/usr/share/hedera-web/pages/web/web.js

@@ -165,6 +165,9 @@ Vn.Web =
 	
 	,loaderPop: function ()
 	{
+		if (this.loadingCount == 0)
+			return;
+		
 		this.loadingCount--;
 		
 		if (this.loadingCount == 0)
@@ -219,7 +222,11 @@ Vn.Web =
 			
 			if (sectionMap[formId])
 			{
-				var submenu = document.createElement ('ul');
+				var submenu;
+				
+				if (!Vn.isMobile ())
+				{
+					submenu = document.createElement ('ul');
 					submenu.className = 'submenu';
 					li.appendChild (submenu);
 
@@ -227,6 +234,9 @@ Vn.Web =
 						this.onLiMouseHover.bind (this, submenu, a));
 					li.addEventListener ('mouseout',
 						this.onLiMouseOut.bind (this));
+				}
+				else
+					submenu = ul;
 
 				this.createMenu (res, sectionMap, formId, submenu);
 			}
@@ -289,7 +299,7 @@ Vn.Web =
 			var klass = 'Vn.'+ formName.charAt (0).toUpperCase ();
 			klass += formName.substr (1).replace (/\w\-\w/g, function (token)
 			{
-				return token.charAt (0) + token.charAt (1).toUpperCase ();
+				return token.charAt (0) + token.charAt (2).toUpperCase ();
 			});
 
 			formInfo = {