Versión inestable de la nueva version web

This commit is contained in:
Juan Ferrer Toribio 2015-06-30 14:06:19 +02:00
parent 835492a3cd
commit b5ab9d7112
100 changed files with 2588 additions and 455 deletions

View File

@ -3,6 +3,7 @@ Version: 1.0-47
Architecture: all
Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
Depends: apache2, php5-mysql, php-vn-web
Suggests: php-text-captcha, php5-imap, vn-image, tinymce
Section: misc
Priority: optional
Description: Verdnatura's web page

View File

@ -1,5 +1,6 @@
#!/bin/bash
a2enconf hedera-web
service apache2 reload
service cron restart

View File

@ -1,4 +1,4 @@
Alias /hedera-web /usr/share/hedera-web/
# Alias /hedera-web /usr/share/hedera-web/
<Directory /usr/share/hedera-web/>
@ -19,3 +19,4 @@ Alias /hedera-web /usr/share/hedera-web/
</FilesMatch>
</Directory>

View File

@ -10,7 +10,7 @@ $conf = [
'db' => [
'host' => 'db.verdnatura.es'
,'schema' => 'hedera-web'
,'user' => 'root'
,'user' => 'hedera-web'
,'pass' => 'base64pass'
]

View File

@ -16,6 +16,17 @@ Vn.Address = new Class
if (this.$('address').value == 0)
form.insertRow ();
}
,onIterChange: function (form)
{
// TODO: Implement one way binding in Vn.Param
if (form.get ('country_id') != this.country)
{
this.country = form.get ('country_id');
this.$('country').value = this.country;
}
}
,onOperationsDone: function ()
{

View File

@ -3,11 +3,13 @@
<vn-param id="address">
<vn-hash-link key="address"/>
</vn-param>
<db-form id="iter" on-status-changed="onStatusChange">
<db-form id="iter" on-status-changed="onStatusChange" on-iter-changed="onIterChange">
<db-model id="model" updatable="true" on-operations-done="onOperationsDone">
SELECT id, name, consignee, city, zip_code, province_id
SELECT a.id, a.name, a.consignee, a.city, a.zip_code, a.province_id, c.Id country_id
FROM address_view a
WHERE active != FALSE AND id = #address
LEFT JOIN vn2008.province p ON p.province_id = a.province_id
JOIN vn2008.Paises c ON c.Id = p.Paises_Id
WHERE active != FALSE AND a.id = #address
<sql-batch property="batch">
<item name="address" param="address"/>
</sql-batch>
@ -46,12 +48,26 @@
<label><t>ZipCode</t></label>
<htk-entry column="zip_code" form="iter"/>
</div>
<div class="form-group">
<label><t>Country</t></label>
<htk-combo>
<vn-param id="country"/>
<db-model property="model">
SELECT Id, Pais FROM vn2008.Paises
ORDER BY Pais
</db-model>
</htk-combo>
</div>
<div class="form-group">
<label><t>Province</t></label>
<htk-combo column="province_id" form="iter">
<db-model property="model">
SELECT province_id, name FROM vn2008.province
WHERE Paises_Id = #country
ORDER BY name
<sql-batch property="batch">
<item name="country" param="country"/>
</sql-batch>
</db-model>
</htk-combo>
</div>

View File

@ -9,9 +9,10 @@
</db-model>
</db-form>
<db-model id="addresses" updatable="true">
SELECT id, consignee, p.name province, zip_code, city, a.name, active
SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
FROM address_view a
JOIN vn2008.province p ON a.province_id = p.province_id
LEFT JOIN vn2008.province p ON a.province_id = p.province_id
JOIN vn2008.Paises c ON c.Id = p.Paises_Id
WHERE active != FALSE
</db-model>
</vn-group>
@ -84,11 +85,12 @@
<htk-text form="iter" column="name"/>
</p>
<p>
<htk-text form="iter" column="zip_code"/> -
<htk-text form="iter" column="zip_code"/> -
<htk-text form="iter" column="city"/>
</p>
<p>
<htk-text form="iter" column="province"/>
<htk-text form="iter" column="province"/> -
<htk-text form="iter" column="country"/>
</p>
<div class="actions">
<htk-button

View File

@ -12,15 +12,15 @@
target="photos-iframe"
on-submit="onFormSubmit">
<div class="form-group">
<label><t>Id:</t></label>
<label><t>Id</t></label>
<input type="number" name="id" id="photo-id"/>
</div>
<div class="form-group">
<label><t>ImageName:</t></label>
<label><t>ImageName</t></label>
<input type="text" name="name"/>
</div>
<div class="form-group">
<label><t>Schema:</t></label>
<label><t>Schema</t></label>
<input type="hidden" name="schema" id="schema-field"/>
<htk-combo id="schema">
<db-model property="model">
@ -29,7 +29,7 @@
</htk-combo>
</div>
<div class="form-group">
<label><t>ImageFile:</t></label>
<label><t>ImageFile</t></label>
<input type="file" name="image"/>
<input type="hidden" name="MAX_FILE_SIZE" id="photo-size"/>
</div>

View File

@ -13,31 +13,31 @@
</p>
<form action="forms/cms/contact/send-data.php" method="post" id="contact-form">
<div class="form-group">
<label><t>Name:</t></label>
<label><t>Name</t></label>
<input type="text" name="name"/>
</div>
<div class="form-group">
<label><t>City:</t></label>
<label><t>City</t></label>
<input type="text" name="city"/>
</div>
<div class="form-group">
<label><t>PC:</t></label>
<label><t>PC</t></label>
<input type="text" name="pc"/>
</div>
<div class="form-group">
<label><t>Phone:</t></label>
<label><t>Phone</t></label>
<input type="text" name="phone"/>
</div>
<div class="form-group">
<label><t>EMail:</t></label>
<label><t>EMail</t></label>
<input type="text" name="email"/>
</div>
<div class="form-group">
<label><t>Message:</t></label>
<label><t>Message</t></label>
<textarea name="message"/>
</div>
<div class="form-group captcha">
<label><t>Anti-Spam:</t></label>
<label><t>Anti-Spam</t></label>
<img alt="Captcha" id="captcha-img"/>
<input type="text" name="captcha"/>
</div>

View File

@ -7,24 +7,6 @@ Vn.Basket = new Class
,activate: function ()
{
// Loading order
this.orderId = this.$('order-id');
if (!this.orderId.value)
{
var orderId = Vn.Cookie.getInt ('order');
if (!orderId)
{
var sql = 'INSERT INTO order_view (date_send) VALUES (CURDATE());'
+'SELECT LAST_INSERT_ID();';
this.conn.execQuery (sql, this.orderCreated.bind (this));
}
else
this.orderId.value = orderId;
}
// Configuring columns
this.$('column-amount').renderer = this.amountRender;
@ -35,31 +17,25 @@ Vn.Basket = new Class
,onCatalogClick: function ()
{
Vn.Cookie.set ('order', this.orderId.value);
Vn.Cookie.set ('order', this.$('order').value);
this.hash.set ({'form': 'ecomerce/catalog'});
}
,onConfigureClick: function ()
{
this.hash.set ({
'form': 'ecomerce/checkout',
'order': this.$('order').value
});
}
,onCheckoutClick: function ()
{
this.hash.set ({
'form': 'ecomerce/checkout',
'order': this.orderId.value
'order': this.$('order').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)
{
@ -93,8 +69,7 @@ Vn.Basket = new Class
,subtotal: function (form)
{
return form.get ('amount') * form.get ('price')
* ((100 - form.get ('discount')) / 100);
return form.get ('amount') * form.get ('price');
}
,availableRender: function (renderer, form)

View File

@ -8,6 +8,11 @@
max-width: 70em;
margin: 0 auto;
}
.basket .form
{
padding: 1em;
max-width: 20em;
}
/* Data */

View File

@ -1,14 +1,14 @@
<vn>
<vn-group>
<vn-param id="order-id">
<vn-param id="order">
<vn-hash-link key="order"/>
</vn-param>
<db-form id="order-form">
<db-model updatable="true">
SELECT date_send, type_id, wh_id, note, insurance, address_id, id
SELECT id, date_send, agency_id, wh_id
FROM order_view WHERE id = #id
<sql-batch property="batch">
<item name="id" param="order-id"/>
<item name="id" param="order"/>
</sql-batch>
</db-model>
<db-param column="date_send" id="date"/>
@ -21,6 +21,10 @@
<div class="header">
<h1><t>ShoppingBasket</t></h1>
<div class="action-bar">
<button on-click="onConfigureClick">
<img src="image/dark/preferences.svg" alt=""/>
<t>ConfigureOrder</t>
</button>
<button on-click="onCatalogClick">
<img src="image/dark/menu.svg" alt=""/>
<t>GoToCatalog</t>
@ -33,65 +37,34 @@
</div>
</div>
<div>
<table class="form">
<tbody>
<tr>
<td class="label">
<label><t>OrderNumber:</t></label>
</td>
<td>
<htk-label column="id" form="order-form"/>
</td>
</tr>
<tr>
<td class="label">
<label><t>DateExit:</t></label>
</td>
<td>
<htk-date-chooser column="date_send" form="order-form"/>
</td>
</tr>
<tr>
<td class="label">
<label for="warehouse"><t>Warehouse:</t></label>
</td>
<td>
<htk-combo column="wh_id" form="order-form">
<db-model property="model">
SELECT id, name FROM vn2008.warehouse
WHERE reserve ORDER BY name
</db-model>
</htk-combo>
</td>
</tr>
<tr>
<td class="label">
<label for="total"><t>OrderTotal:</t></label>
</td>
<td>
<htk-label format="%.2d€">
<db-calc-sum id="order-total" model="order-rows"/>
</htk-label>
<t>VATNotIncluded</t>
</td>
</tr>
</tbody>
</table>
<div class="form">
<div class="form-group">
<label><t>OrderNumber</t></label>
<htk-label column="id" form="order-form"/>
</div>
<div class="form-group">
<label for="total"><t>OrderTotal</t></label>
<htk-text format="%.2d€">
<db-calc-sum id="order-total" model="order-rows"/>
</htk-text>
<t>VATNotIncluded</t>
</div>
</div>
<htk-grid>
<db-model result-index="1" id="order-rows" updatable="true">
CALL item (#warehouse, #date);
SELECT m.id, i.grouping, m.amount, available, Article, Categoria, Medida,
Tallos, Color, o.Abreviatura, price, discount, fixed, Foto
SELECT m.id, i.grouping, m.amount, available, Article, Categoria,
Medida, Tallos, Color, o.Abreviatura, price, fixed, Foto
FROM order_row_view m
INNER JOIN vn2008.Articles a ON a.Id_Article = m.item_id
LEFT JOIN vn2008.item_catalog i ON i.item_id = m.item_id
LEFT JOIN vn2008.Origen o ON a.id_origen = o.id
WHERE m.order_id = #order_id;
WHERE m.order_id = #order;
DROP TEMPORARY TABLE vn2008.item_catalog;
<sql-batch property="batch">
<item name="warehouse" param="warehouse"/>
<item name="date" param="date"/>
<item name="order_id" param="order-id"/>
<item name="order" param="order"/>
</sql-batch>
</db-model>
<htk-column-image column="Foto" directory="catalog" subdir="30x30" show-full="true"/>
@ -106,7 +79,6 @@
<htk-column-text title="_Color" column="Color"/>
<htk-column-text title="_Origin" column="Abreviatura"/>
<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
<htk-column-spin title="_Desc" column="discount" unit="%"/>
<htk-column-spin title="_Subtotal" unit="€" digits="2" id="column-subtotal"/>
</htk-grid>
</div>

View File

@ -186,7 +186,13 @@ Vn.Catalog = new Class
,onBasketClick: function ()
{
this.hash.set ({'form': 'ecomerce/basket'});
if (Vn.Cookie.check ('order'))
this.hash.set ({
'form': 'ecomerce/basket',
'order': Vn.Cookie.get ('order')
});
else
this.hash.set ({'form': 'ecomerce/checkout'});
}
,typeRenderer: function (column, form)

View File

@ -30,6 +30,7 @@
{
margin: 0 auto;
max-width: 70em;
min-width: 55em;
}
.catalog .footer-message
@ -101,7 +102,7 @@
button.basket
{
width: 100%;
height: 2.5em;
height: 3em;
font-size: 1.1em;
text-align: center;
background-color: #00BCD4;
@ -111,24 +112,12 @@ button.basket:hover
{
background-color: #0AB;
}
.catalog .form-group
{
margin: 2em;
}
.catalog .form-group select,
.catalog .form-group button
{
display: block;
margin: 0 auto;
width: 12em;
}
/* Realms */
.htk-realm
{
text-align: center;
margin-top: 1em;
vertical-align: middle;
box-shadow: 0 0 0.4em #AAA;
}
@ -149,7 +138,7 @@ button.basket:hover
.types-box
{
position: absolute;
top: 16.8em;
top: 6.8em;
bottom: 0em;
right: 0em;
left: 0em;

View File

@ -4,6 +4,8 @@
<vn-hash-link key="type"/>
</vn-param>
<vn-param id="order"/>
<vn-param id="warehouse"/>
<vn-param id="date"/>
<vn-param id="search"/>
<db-model id="realms-model" on-status-changed="onRealmsReload">
SELECT id, reino, color FROM vn2008.reinos
@ -11,7 +13,7 @@
</db-model>
<db-form id="order-form" on-status-changed="onOrderFormChange">
<db-model updatable="true">
SELECT date_send, wh_id, id FROM order_view WHERE id = #order
SELECT id, date_send, wh_id FROM order_view WHERE id = #order
<sql-batch property="batch" id="order-batch"/>
</db-model>
</db-form>
@ -84,20 +86,6 @@
<button disabled="true" id="basket-button" class="basket" on-click="onBasketClick">
<t>StartOrder</t>
</button>
<div class="form-group">
<htk-date-chooser>
<vn-param id="date"/>
</htk-date-chooser>
</div>
<div class="form-group">
<htk-combo>
<db-model property="model">
SELECT id, name FROM vn2008.warehouse
WHERE reserve ORDER BY name
</db-model>
<vn-param id="warehouse"/>
</htk-combo>
</div>
<htk-realm id="realms" model="realms-model" on-changed="onRealmChange">
<vn-param id="realm">
<vn-hash-link key="realm"/>
@ -117,11 +105,12 @@
</div>
</div>
</div>
<!--
<htk-repeater id="grid-view" form-id="item">
<div class="item-box">
<div class="image">
<div>
<htk-image form="item" column="Foto" directory="catalog/200x200"/>
<htk-image form="item" column="Foto" directory="catalog/200x200"/>
</div>
</div>
<h2>
@ -150,4 +139,5 @@
<div class="clear"/>
</div>
</htk-repeater>
-->
</vn>

View File

@ -3,54 +3,303 @@ Vn.Checkout = new Class
({
Extends: Vn.Module
,goBasket: function ()
,activate: function () {}
,onStatusChange: function (form)
{
this.hash.set ({
'form': 'ecomerce/basket',
'order': this.$('order-id').value
});
// if (this.$('address').value == 0)
// form.insertRow ();
}
,onCancelClick: function ()
{
this.hash.set ({'form': 'ecomerce/orders'});
}
,onConfirmClick: function ()
{
if (!confirm (_('SureConfirmOrder')))
return;
var query = 'CALL order_confirm (#order)';
var batch = new Sql.Batch ();
batch.addParam ('order', this.$('order-id'));
batch.addParam ('date', this.$('date'));
batch.addParam ('agency', this.$('agency'));
batch.addValue ('address', this.$('address'));
batch.addValue ('delivery', 1);
this.conn.execQuery (query, this.confirmDone.bind (this), batch);
var sql = 'CALL order_new_beta (#date, #delivery, #agency, #address);';
this.conn.execQuery (sql, this.onOrderCreate.bind (this), batch);
}
,confirmDone: function (resultSet)
,onOrderCreate: function (resultSet)
{
if (resultSet.fetchResult ())
var orderId = resultSet.fetchValue ();
if (orderId)
{
Vn.Cookie.unset ('order');
this.hash.set ({'form': 'ecomerce/orders'});
(new Htk.Toast ()).showMessage (_('OrderConfirmed'));
Vn.Cookie.set ('order', orderId);
this.hash.set ({'form': 'ecomerce/catalog'});
}
else
this.goBasket ();
(new Htk.Toast ()).showMessage (_('ErrorCreatingOrder'));
}
,onAddAddressClick: function ()
,onFieldChange: function ()
{
this.hash.set ({
'form': 'account/address',
'address': 0
});
setTimeout (this.goNextStep.bind (this), 75);
}
,onEditAddressClick: function (button, form)
,onAddressClick: function (e)
{
this.hash.set ({
'form': 'account/address',
'address': form.get ('id')
});
this.onFieldChange ();
}
,goNextStep: function ()
{
this.$('assistant').moveNext ();
}
,deliverySteps: ['delivery', 'date', 'address', 'agency', 'confirm-delivery']
,pickupSteps: ['delivery', 'date', 'pickup', null, 'confirm-pickup']
,stepFunc: function (stepIndex)
{
var isDelivery = this.$('rg-delivery').value != 'PICKUP';
var steps = isDelivery ? this.deliverySteps : this.pickupSteps;
var stepId = steps[stepIndex];
if (stepId)
{
if (stepId == 'date')
{
Vn.Node.setText (this.$('date-question'), isDelivery ?
_('OrderDateDeliveryQuestion'):
_('OrderDatePickupQuestion'));
this.$('calendar').goToSelectedMonth ();
}
return this.$(stepId +'-step');
}
else
return null;
}
});
Htk.Assitant = new Class
({
Extends: Vn.Object
,Tag: 'htk-assistant'
,Properties:
{
stepCount:
{
type: Number
,set: function (x)
{
this._stepCount = x;
if (x > 0)
this.setStep (0);
else
this.setStep (-1);
}
,get: function ()
{
return this._stepCount;
}
},
step:
{
type: Number
,set: function (x)
{
this.setStep (x);
}
,get: function ()
{
return this._stepIndex;
}
},
stepFunc:
{
type: Function
,set: function (x)
{
this._stepFunc = x;
this.setStep (this._stepIndex);
}
,get: function ()
{
return this._stepFunc;
}
},
node:
{
type: Object
,set: function (x)
{
x.className = 'htk-assistant';
}
},
}
,_stepNode: null
,_stepIndex: -1
,_stepCount: 0
,_stepFunc: null
,setStep: function (stepIndex)
{
if (!(stepIndex >= -1 && stepIndex < this.stepCount))
return;
if (this._stepFunc && stepIndex != -1)
{
var stepNode = this._stepFunc (stepIndex);
if (stepNode)
{
if (this._stepNode)
this._stepNode.style.display = 'none';
this._stepNode = stepNode;
stepNode.style.display = 'block';
this._setStepIndex (stepIndex);
}
else if (this._stepIndex < stepIndex)
this.setStep (stepIndex + 1);
else
this.setStep (stepIndex - 1);
}
else
this._setStepIndex (stepIndex);
}
,_setStepIndex: function (stepIndex)
{
this._stepIndex = stepIndex;
this.signalEmit ('step-change', stepIndex);
}
,movePrevious: function ()
{
this.setStep (this._stepIndex - 1);
}
,moveNext: function ()
{
this.setStep (this._stepIndex + 1);
}
});
Htk.AssitantBar = new Class
({
Extends: Htk.Widget
,Tag: 'htk-assistant-bar'
,Properties:
{
assistant:
{
type: Htk.Assitant
,set: function (x)
{
this.link ({_assistant: x}, {'step-change': this.onStepChange});
var stepCount = x.stepCount;
var steps = this._steps;
Vn.Node.removeChilds (steps);
steps.style.width = (stepCount * 1.3) + 'em';
for (var i = 0; i < stepCount; i++)
{
var img = document.createElement ('img');
img.src = 'image/step.svg';
img.addEventListener ('click', this.setStep.bind (this, i));
steps.appendChild (img);
}
this.onStepChange ();
}
,get: function ()
{
return this._assistant;
}
}
}
,_assistant: null
,_stepIndex: -1
,initialize: function (props)
{
this.parent (props);
var bar = this.createElement ('div');
bar.className = 'htk-assistant-bar';
var previousButton = document.createElement ('img');
previousButton.src = 'image/go-previous.svg';
previousButton.className = 'previous';
previousButton.addEventListener ('click', this.movePrevious.bind (this));
bar.appendChild (previousButton);
var steps = document.createElement ('div');
bar.appendChild (steps);
var nextButton = document.createElement ('img');
nextButton.src = 'image/go-next.svg';
nextButton.className = 'next';
nextButton.addEventListener ('click', this.moveNext.bind (this));
bar.appendChild (nextButton);
this._steps = steps;
this._previousButton = previousButton;
this._nextButton = nextButton;
}
,movePrevious: function ()
{
if (this._assistant)
this._assistant.movePrevious ();
}
,moveNext: function ()
{
if (this._assistant)
this._assistant.moveNext ();
}
,setStep: function (stepIndex)
{
if (this._assistant)
this._assistant.setStep (stepIndex);
}
,onStepChange: function ()
{
if (this._assistant)
{
var stepIndex = this._assistant.step;
var stepCount = this._assistant.stepCount;
}
else
{
var stepIndex = -1;
var stepCount = 0;
}
if (this._stepIndex != -1)
this._steps.childNodes[this._stepIndex].src = 'image/step.svg';
this._stepIndex = stepIndex;
if (stepIndex != -1)
this._steps.childNodes[stepIndex].src = 'image/step-cur.svg';
var visibility = stepIndex <= 0 ? 'hidden' : 'visible';
this._previousButton.style.visibility = visibility;
var visibility = stepIndex >= stepCount - 1 ? 'hidden' : 'visible';
this._nextButton.style.visibility = visibility;
}
});

View File

@ -2,34 +2,170 @@
{
padding: 1em;
}
.checkout .box
.checkout
{
max-width: 70em;
max-width: 50em;
margin: 0 auto;
}
table.form td.label
{
width: 30%;
}
/* Addresses */
/* Checkout */
.addresses > .form
.checkout .form
{
margin: 0 auto;
padding: 2em;
max-width: 25em;
max-width: 40em;
padding: 3em;
}
.address
/* Delivery method */
ul.delivery
{
margin-bottom: 1em;
list-style-type: none;
margin: 0;
padding-top: 0.8em;
padding-left: 1em;
}
.address p
ul.delivery > li
{
margin: 0.2em 0;
}
.address .actions
ul.delivery input
{
text-align: right;
margin-right: 0.4em;
}
/* Step */
.answers button,
.answers span,
.answers select,
.answers p,
.radio > div
{
font-size: 1.3em;
}
.target
{
max-width: 24em;
margin: 0 auto;
}
.address
{
border-radius: 0.1em;
padding: 1em;
}
.address:hover
{
cursor: pointer;
background-color: rgba(1, 1, 1, 0.05);
}
.address > p
{
margin: 0.2em;
}
.radio
{
max-width: 15em;
margin: 0 auto;
}
.radio > div
{
padding: 0.5em;
border-top: 1px solid #AAA;
}
.radio > div:first-child
{
border-top: none;
}
.thin-calendar
{
width: inherit;
max-width: 24em;
margin: 0 auto;
}
.thin-calendar thead > tr,
.thin-calendar tfoot > tr
{
background-color: transparent;
color: inherit;
}
.thin-calendar .button:hover
{
color: white;
}
.thin-calendar td.highlight
{
background-color: #009688;
color: white;
}
.htk-assistant select
{
width: 10em;
float: left;
}
.htk-assistant button
{
float: right;
}
/* Assistant */
.htk-assistant > div
{
display: none;
margin-top: 0;
margin-bottom: 3em;
}
.htk-assistant > div > h2
{
text-align: center;
font-weight: normal;
font-size: 1.6em;
margin: 0.5em;
margin-bottom: 1em;
}
.htk-assistant *
{
color: #555;
}
/* Assistant bar */
.htk-assistant-bar
{
margin: 0.5em auto;
max-width: 30em;
position: relative;
}
.htk-assistant-bar img
{
cursor: pointer;
}
.htk-assistant-bar > img
{
position: absolute;
width: 1.8em;
top: 0;
}
.htk-assistant-bar > img.previous
{
left: 0;
}
.htk-assistant-bar > img.next
{
right: 0;
}
.htk-assistant-bar > div
{
margin: 0 auto;
padding-top: 0.2em;
}
.htk-assistant-bar > div > img
{
width: 1.3em;
}

View File

@ -1,123 +1,172 @@
<vn>
<vn-group>
<vn-param id="date"/>
<vn-param id="address"/>
<vn-param id="agency"/>
<vn-param id="order-id">
<vn-hash-link key="order"/>
</vn-param>
<db-form id="order-form">
<db-form id="order-form" on-status-changed="onStatusChange">
<db-model updatable="true">
SELECT type_id, note, insurance, address_id, id
SELECT id, date_send, wh_id, delivery_method_id, agency_id, address_id, note
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>
<db-model id="addresses" updatable="true">
SELECT id, consignee, p.name province, zip_code, city, a.name, active
<db-form id="defaults">
<db-model>
SELECT address_id, agency_id, delivery_method_id
FROM order_defaults_view
</db-model>
</db-form>
<db-model id="addresses">
SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
FROM address_view a
JOIN vn2008.province p ON a.province_id = p.province_id
LEFT JOIN vn2008.province p ON a.province_id = p.province_id
JOIN vn2008.Paises c ON c.Id = p.Paises_Id
WHERE active != FALSE
</db-model>
</vn-group>
<div id="form" class="checkout">
<div class="box">
<div class="header">
<h1><t>Checkout</t></h1>
<h1><t>ConfigureOrder</t></h1>
<div class="action-bar">
<button on-click="goBasket">
<img src="image/dark/go-previous.svg" alt=""/>
<t>GoBasket</t>
</button>
<button on-click="onConfirmClick">
<img src="image/dark/ok.svg" alt=""/>
<t>Confirm</t>
</button>
</div>
</div>
<div>
<table class="form">
<tbody>
<tr>
<td class="label">
<label for="notes"><t>Notes:</t></label>
</td>
<td>
<htk-textarea column="note" form="order-form"/>
</td>
</tr>
<tr>
<td class="label">
<label for="type"><t>SendMethod:</t></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"/>
<t>Insurance</t>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="box addresses">
<div class="header">
<h1><t>ShippingAddress</t></h1>
<div class="action-bar">
<button on-click="onAddAddressClick">
<img src="image/dark/add.svg" alt=""/>
<t>AddAddress</t>
<button on-click="onCancelClick">
<img src="image/dark/close.svg" alt=""/>
<t>Cancel</t>
</button>
</div>
</div>
<div class="form">
<htk-radio-group
id="default-address"
column="address_id"
form="order-form"/>
<htk-repeater model="addresses" form-id="iter">
<div class="address">
<h2>
<htk-radio
form="iter"
column="id"
radio-group="default-address"
tip="_SelectAddress"/>
<htk-text form="iter" column="consignee"/>
</h2>
<p>
<htk-text form="iter" column="name"/>
</p>
<p>
<htk-text form="iter" column="zip_code"/> -
<htk-text form="iter" column="city"/>
</p>
<p>
<htk-text form="iter" column="province"/>
</p>
<div class="actions">
<htk-button
form="iter"
column="id"
tip="_EditAddress"
image="image/edit.svg"
on-click="onEditAddressClick"/>
<htk-assistant
id="assistant"
step-count="5"
step-func="stepFunc"
node="assistant-node"/>
<div class="htk-assistant" id="assistant-node">
<div id="delivery-step">
<h2><t>DeliveryOrPickupQuestion</t></h2>
<div class="answers radio">
<htk-radio-group
id="rg-delivery"
on-changed="onFieldChange"/>
<div>
<htk-radio radio-group="rg-delivery" value="DELIVERY"/>
<label><t>Receive</t></label>
</div>
<div>
<htk-radio radio-group="rg-delivery" value="PICKUP"/>
<label><t>Pickup</t></label>
</div>
</div>
</div>
</htk-repeater>
<div id="date-step">
<h2 id="date-question"><t>OrderDateDeliveryQuestion</t></h2>
<div class="answers">
<htk-calendar
id="calendar"
class="thin-calendar"
param="date"
on-changed="onFieldChange"/>
</div>
</div>
<div id="address-step">
<h2><t>AddressQuestion</t></h2>
<htk-repeater model="addresses" form-id="iter">
<div class="answers target address" on-click="onAddressClick">
<h2>
<htk-text form="iter" column="consignee"/>
</h2>
<p>
<htk-text form="iter" column="name"/>
</p>
<p>
<htk-text form="iter" column="zip_code"/> -
<htk-text form="iter" column="city"/>
</p>
<p>
<htk-text form="iter" column="province"/> -
<htk-text form="iter" column="country"/>
</p>
</div>
</htk-repeater>
</div>
<div id="agency-step">
<h2><t>AgencyQuestion</t></h2>
<div class="answers target">
<htk-combo param="agency" on-changed="onFieldChange">
<db-model property="model" id="agencies">
SELECT a.Id_Agencia, a.description
FROM vn2008.Agencias a
JOIN vn2008.Vistas v ON a.Vista = v.vista_id
WHERE a.web != FALSE
AND v.code = 'AGENCY'
ORDER BY a.description
</db-model>
</htk-combo>
<button class="thin" on-click="onFieldChange">
<t>NEXT</t>
</button>
<div class="clear"/>
</div>
</div>
<div id="pickup-step">
<h2><t>PickupWarehouseQuestion</t></h2>
<div class="answers target">
<htk-combo param="agency" on-changed="onFieldChange">
<db-model property="model" id="warehouses">
SELECT a.Id_Agencia, SUBSTR(a.description, 5)
FROM vn2008.Agencias a
JOIN vn2008.Vistas v ON a.Vista = v.vista_id
WHERE a.web != FALSE
AND v.code = 'PICKUP'
ORDER BY a.description
</db-model>
</htk-combo>
<button class="thin" on-click="onFieldChange">
<t>NEXT</t>
</button>
<div class="clear"/>
</div>
</div>
<div id="confirm-delivery-step" class="confirm">
<h2><t>ConfirmToAccessCatalog</t></h2>
<div class="answers target">
<p>
<t>ArrivalOf</t> <htk-text format="_%A, %e of %B" param="date"/>
</p>
<p>
<t>Agency</t> <htk-text param="agency"/>
</p>
<p>
<htk-text param="address"/>
</p>
<button class="thin" on-click="onConfirmClick">
<t>CONFIRM</t>
</button>
<div class="clear"/>
</div>
</div>
<div id="confirm-pickup-step" class="confirm">
<h2><t>ConfirmToAccessCatalog</t></h2>
<div class="answers target">
<p>
<t>PickupOf</t> <htk-text format="_%A, %e of %B" param="date"/>
</p>
<p>
<t>Warehouse</t> <htk-text param="agency"/>
</p>
<button class="thin" on-click="onConfirmClick">
<t>CONFIRM</t>
</button>
<div class="clear"/>
</div>
</div>
</div>
<htk-assistant-bar assistant="assistant"/>
</div>
</div>
</div>

View File

@ -0,0 +1,126 @@
Vn.Shipping = new Class
({
Extends: Vn.Module
,activate: function ()
{
// Loading order
this.orderId = this.$('order-id');
if (!this.orderId.value)
{
var orderId = Vn.Cookie.getInt ('order');
if (!orderId)
{
var sql = 'INSERT INTO order_view (date_send) VALUES (CURDATE());'
+'SELECT LAST_INSERT_ID();';
this.conn.execQuery (sql, this.orderCreated.bind (this));
}
else
this.orderId.value = orderId;
}
this.onDeliveryChange ();
}
,onStatusChange: function (form)
{
if (this.$('address').value == 0)
form.insertRow ();
}
,onOperationsDone: function ()
{
this.onReturnClick ();
}
,onAcceptClick: function ()
{
this.$('iter').performOperations ();
}
,onReturnClick: function ()
{
window.history.back();
}
,goBasket: function ()
{
this.hash.set ({
'form': 'ecomerce/basket',
'order': this.$('order-id').value
});
}
,onDeliveryChange: function ()
{
var showAgencies = false;
var showAdresses = false;
var showStores = false;
var deliveryMethod = parseInt (this.$('delivery').value);
switch (deliveryMethod)
{
case 1: // AGENCY
var showAgencies = true;
var showAdresses = true;
break;
case 2: // DELIVERY
var showAdresses = true;
break;
case 3: // PICKUP
var showStores = true;
break;
}
this.$('agencies-div').style.display = showAgencies ? '' : 'none';
this.$('addresses-div').style.display = showAdresses ? '' : 'none';
this.$('stores-div').style.display = showStores ? '' : 'none';
}
,onConfirmClick: function ()
{
if (!confirm (_('SureConfirmOrder')))
return;
var query = 'CALL order_confirm (#order)';
var batch = new Sql.Batch ();
batch.addParam ('order', this.$('order-id'));
this.conn.execQuery (query, this.confirmDone.bind (this), batch);
}
,confirmDone: function (resultSet)
{
if (resultSet.fetchResult ())
{
Vn.Cookie.unset ('order');
this.hash.set ({'form': 'ecomerce/orders'});
(new Htk.Toast ()).showMessage (_('OrderConfirmed'));
}
else
this.goBasket ();
}
,onAddAddressClick: function ()
{
this.hash.set ({
'form': 'account/address',
'address': 0
});
}
,onEditAddressClick: function (button, form)
{
this.hash.set ({
'form': 'account/address',
'address': form.get ('id')
});
}
});

View File

@ -0,0 +1,87 @@
.shipping
{
padding: 1em;
}
.shipping
{
max-width: 70em;
margin: 0 auto;
}
table.form td.label
{
width: 30%;
}
/* Checkout */
.checkout .form
{
margin: 0 auto;
max-width: 25em;
padding: 2em;
}
/* Form */
.form-group
{
padding: 0.4em;
}
.form-group > label
{
display: block;
margin-bottom: 0.5em;
}
.form-group > input[type=text],
.form-group > input[type=password],
.form-group > select,
.form-group > textarea
{
margin: 0;
width: 100%;
}
/* Delivery method */
ul.delivery
{
list-style-type: none;
margin: 0;
padding-top: 0.8em;
padding-left: 1em;
}
ul.delivery > li
{
margin: 0.2em 0;
}
ul.delivery input
{
margin-right: 0.4em;
}
/* Addresses */
div.addresses
{
margin-top: 1em;
}
.addresses > .form
{
margin: 0 auto;
padding: 2em;
max-width: 25em;
}
.address
{
margin-bottom: 1em;
}
.address p
{
margin: 0.2em 0;
}
.address .actions
{
text-align: right;
}

View File

@ -0,0 +1,150 @@
<vn>
<vn-group>
<vn-param id="order-id">
<vn-hash-link key="order"/>
</vn-param>
<db-form id="order-form" on-status-changed="onStatusChange">
<db-model updatable="true">
SELECT id, delivery_method_id, agency_id, address_id, note
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>
<db-model id="addresses" updatable="true">
SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
FROM address_view a
LEFT JOIN vn2008.province p ON a.province_id = p.province_id
JOIN vn2008.Paises c ON c.Id = p.Paises_Id
WHERE active != FALSE
</db-model>
</vn-group>
<div id="form" class="checkout">
<div class="box">
<div class="header">
<h1><t>Checkout</t></h1>
<div class="action-bar">
<button on-click="goBasket">
<img src="image/dark/go-previous.svg" alt=""/>
<t>GoBasket</t>
</button>
<button on-click="onConfirmClick">
<img src="image/dark/ok.svg" alt=""/>
<t>Confirm</t>
</button>
</div>
</div>
<div>
<div class="form">
<div class="form-group">
<t>DeliveryMethod</t>
<htk-radio-group
id="delivery"
form="order-form"
column="delivery_method_id"
on-changed="onDeliveryChange"/>
<ul class="delivery">
<li>
<!-- PICKUP -->
<htk-radio radio-group="delivery" value="3"/>
<label><t>PickupInStore</t></label>
</li>
<li>
<!-- DELIVERY -->
<htk-radio radio-group="delivery" value="2"/>
<label><t>HomeDelivery</t></label>
</li>
<li>
<!-- AGENCY -->
<htk-radio radio-group="delivery" value="1"/>
<label><t>TransportAgency</t></label>
</li>
</ul>
</div>
<div class="form-group" id="agencies-div">
<label><t>ShippingAgency</t></label>
<htk-combo form="order-form" column="agency_id">
<db-model property="model">
SELECT a.Id_Agencia, a.description
FROM vn2008.Agencias a
JOIN vn2008.Vistas v ON a.Vista = v.vista_id
WHERE a.web != FALSE
AND v.code = 'AGENCY'
ORDER BY a.description
</db-model>
</htk-combo>
</div>
<div class="form-group" id="stores-div">
<label><t>PickupStore</t></label>
<htk-combo form="order-form" column="agency_id">
<db-model property="model">
SELECT a.Id_Agencia, a.description
FROM vn2008.Agencias a
JOIN vn2008.Vistas v ON a.Vista = v.vista_id
WHERE a.web != FALSE
AND v.code = 'PICKUP'
ORDER BY a.description
</db-model>
</htk-combo>
</div>
<div class="form-group">
<label for="notes"><t>Notes</t></label>
<htk-textarea form="order-form" column="note"/>
</div>
</div>
</div>
</div>
<div class="addresses box" id="addresses-div">
<div class="header">
<h1><t>ShippingAddress</t></h1>
<div class="action-bar">
<button on-click="onAddAddressClick">
<img src="image/dark/add.svg" alt=""/>
<t>AddAddress</t>
</button>
</div>
</div>
<div class="form">
<htk-radio-group
id="default-address"
column="address_id"
form="order-form"/>
<htk-repeater model="addresses" form-id="iter">
<div class="address">
<h2>
<htk-radio
form="iter"
column="id"
radio-group="default-address"
tip="_SelectAddress"/>
<htk-text form="iter" column="consignee"/>
</h2>
<p>
<htk-text form="iter" column="name"/>
</p>
<p>
<htk-text form="iter" column="zip_code"/> -
<htk-text form="iter" column="city"/>
</p>
<p>
<htk-text form="iter" column="province"/> -
<htk-text form="iter" column="country"/>
</p>
<div class="actions">
<htk-button
form="iter"
column="id"
tip="_EditAddress"
image="image/edit.svg"
on-click="onEditAddressClick"/>
</div>
</div>
</htk-repeater>
</div>
</div>
</div>
</vn>

View File

@ -31,7 +31,7 @@ Vn.Orders = new Class
,onStartClick: function ()
{
Vn.Cookie.unset ('order');
this.hash.set ({'form': 'ecomerce/basket'});
this.hash.set ({'form': 'ecomerce/checkout'});
}
,onContinueClick: function (column, orderId)
@ -140,10 +140,14 @@ Vn.Orders = new Class
if (res && res.next ())
{
var transactionId = res.get ('ds_order');
var form = this.$('tpv-form');
var formMap =
form.action = res.get ('url');
var transactionId = res.get ('ds_order');
form['Ds_Merchant_UrlOK'].value = this.getTpvUrl ('ok', transactionId);
form['Ds_Merchant_UrlKO'].value = this.getTpvUrl ('ko', transactionId);
var fieldsMap =
{
'Ds_Merchant_Amount': 'amount'
,'Ds_Merchant_Order': 'ds_order'
@ -155,15 +159,8 @@ Vn.Orders = new Class
,'Ds_Merchant_MerchantSignature': 'signature'
};
form.action = res.get ('url');
for (var name in formMap)
form[name].value = res.get (formMap[name]);
form['Ds_Merchant_UrlOK'].value = this.getTpvUrl ('ok', transactionId);
form['Ds_Merchant_UrlKO'].value = this.getTpvUrl ('ko', transactionId);
// Showing TPV on the same window
for (var field in fieldsMap)
form[field].value = res.get (fieldsMap[field]);
form.submit ();
}

View File

@ -11,6 +11,10 @@
{
height: 5em;
}
.orders .confirmed
{
margin-top: 1em;
}
/* Info box */

View File

@ -28,7 +28,7 @@
</htk-grid>
</div>
</div>
<div class="box">
<div class="box confirmed">
<div class="header">
<h1><t>ConfirmedOrdersDesc</t></h1>
<div class="action-bar">

View File

@ -0,0 +1,67 @@
Vn.Shipping = new Class
({
Extends: Vn.Module
,onIterChange: function (form)
{
var showAgencies = false;
var showAdresses = false;
var showStores = false;
var deliveryMethod = parseInt (form.get ('delivery_method_id'));
switch (deliveryMethod)
{
case 1: // AGENCY
var showAgencies = true;
var showAdresses = true;
break;
case 2: // DELIVERY
var showAdresses = true;
break;
case 3: // PICKUP
var showStores = true;
break;
}
this.$('conf-div').style.display = showAgencies || showStores ? 'block' : 'none';
this.$('agencies-div').style.display = showAgencies ? 'block' : 'none';
this.$('addresses-div').style.display = showAdresses ? 'block' : 'none';
this.$('stores-div').style.display = showStores ? 'block' : 'none';
}
,onReturnClick: function ()
{
window.history.back();
}
,onBasketClick: function ()
{
this.hash.set ({
'form': 'ecomerce/basket',
'order': this.$('order').value
});
}
,onCatalogClick: function ()
{
this.hash.set ({'form': 'ecomerce/catalog'});
}
,onAddAddressClick: function ()
{
this.hash.set ({
'form': 'account/address',
'address': 0
});
}
,onEditAddressClick: function (button, form)
{
this.hash.set ({
'form': 'account/address',
'address': form.get ('id')
});
}
});

View File

@ -0,0 +1,51 @@
.shipping
{
padding: 1em;
}
.shipping
{
max-width: 70em;
margin: 0 auto;
}
table.form td.label
{
width: 30%;
}
.shipping .form
{
max-width: 25em;
padding: 2em;
}
div.hide
{
display: none;
}
/* Addresses */
div.addresses
{
margin-top: 1em;
}
.addresses > .form
{
margin: 0 auto;
padding: 2em;
max-width: 25em;
}
.address
{
margin-bottom: 1em;
}
.address p
{
margin: 0.2em 0;
}
.address .actions
{
text-align: right;
}

View File

@ -0,0 +1,116 @@
<vn>
<vn-group>
<vn-param id="order">
<vn-hash-link key="order"/>
</vn-param>
<db-form id="order-form" on-iter-changed="onIterChange">
<db-model updatable="true">
SELECT id, delivery_method_id, agency_id, address_id
FROM order_view WHERE id = #id
<sql-batch property="batch">
<item name="id" param="order"/>
</sql-batch>
</db-model>
</db-form>
<db-model id="addresses" updatable="true">
SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
FROM address_view a
LEFT JOIN vn2008.province p ON a.province_id = p.province_id
JOIN vn2008.Paises c ON c.Id = p.Paises_Id
WHERE active != FALSE
</db-model>
</vn-group>
<div id="form" class="shipping">
<div class="box">
<div class="header">
<h1><t>ConfigureShippingPickup</t></h1>
<div class="action-bar">
<button on-click="onReturnClick">
<img src="image/dark/go-previous.svg" alt=""/>
<t>Return</t>
</button>
<button on-click="onBasketClick">
<img src="image/dark/basket.svg" alt=""/>
<t>GoToBasket</t>
</button>
</div>
</div>
<div class="form hide" id="conf-div">
<div class="form-group hide" id="stores-div">
<label><t>PickupStore</t></label>
<htk-combo form="order-form" column="agency_id">
<db-model property="model">
SELECT a.Id_Agencia, a.description
FROM vn2008.Agencias a
JOIN vn2008.Vistas v ON a.Vista = v.vista_id
WHERE a.web != FALSE
AND v.code = 'PICKUP'
ORDER BY a.description
</db-model>
</htk-combo>
</div>
<div class="form-group hide" id="agencies-div">
<label><t>ShippingAgency</t></label>
<htk-combo form="order-form" column="agency_id">
<db-model property="model">
SELECT a.Id_Agencia, a.description
FROM vn2008.Agencias a
JOIN vn2008.Vistas v ON a.Vista = v.vista_id
WHERE a.web != FALSE
AND v.code = 'AGENCY'
ORDER BY a.description
</db-model>
</htk-combo>
</div>
</div>
</div>
<div class="addresses box hide" id="addresses-div">
<div class="header">
<h1><t>ShippingAddress</t></h1>
<div class="action-bar">
<button on-click="onAddAddressClick">
<img src="image/dark/add.svg" alt=""/>
<t>AddAddress</t>
</button>
</div>
</div>
<div class="form">
<htk-radio-group
id="default-address"
column="address_id"
form="order-form"/>
<htk-repeater model="addresses" form-id="iter">
<div class="address">
<h2>
<htk-radio
form="iter"
column="id"
radio-group="default-address"
tip="_SelectAddress"/>
<htk-text form="iter" column="consignee"/>
</h2>
<p>
<htk-text form="iter" column="name"/>
</p>
<p>
<htk-text form="iter" column="zip_code"/> -
<htk-text form="iter" column="city"/>
</p>
<p>
<htk-text form="iter" column="province"/> -
<htk-text form="iter" column="country"/>
</p>
<div class="actions">
<htk-button
form="iter"
column="id"
tip="_EditAddress"
image="image/edit.svg"
on-click="onEditAddressClick"/>
</div>
</div>
</htk-repeater>
</div>
</div>
</div>
</vn>

View File

@ -31,11 +31,11 @@
</div>
<div class="form">
<div class="form-group">
<label><t>Title:</t></label>
<label><t>Title</t></label>
<htk-entry column="title" form="iter"/>
</div>
<div class="form-group">
<label><t>Tag:</t></label>
<label><t>Tag</t></label>
<htk-combo column="tag" form="iter">
<db-model property="model">
SELECT name, description FROM news_tag
@ -44,7 +44,7 @@
</htk-combo>
</div>
<div class="form-group">
<label><t>NewBody:</t></label>
<label><t>NewBody</t></label>
<textarea id="html-editor"/>
</div>
</div>

View File

@ -108,6 +108,10 @@ select
select
{
background-color: white;
cursor: pointer;
padding: 0.4em;
padding-top: 0.2em;
font-size: 1.1em;
}
input[type=text],
input[type=password]
@ -129,6 +133,7 @@ textarea:focus
input[type=checkbox],
input[type=radio]
{
cursor: pointer;
width: 0.8em;
height: 0.8em;
}
@ -151,7 +156,10 @@ input[type=button]:hover
{
background-color: #EEE;
}
button.button,
/* Flat button */
button.flat,
input.button
{
border: none;
@ -160,13 +168,26 @@ input.button
background-color: #AD4;
color: black;
}
button.button:hover,
button.flat:hover,
input.button:hover
{
background-color: #9C3;
cursor: pointer;
}
/* Thin button */
button.thin
{
background-color: transparent;
border: none;
color: #008D77;
}
button.thin:hover
{
background-color: rgba(1,1,1,0.1);
}
/* Image */
img.editable
@ -233,6 +254,31 @@ div.box .body
padding: 2em;
}
/* Form */
div.form
{
margin: 0 auto;
}
div.form-group
{
padding: 0.4em;
}
div.form-group > label
{
display: block;
margin-bottom: 0.5em;
}
div.form-group > input[type=text],
div.form-group > input[type=password],
div.form-group > select,
div.form-group > textarea
{
margin: 0;
width: 100%;
}
/* Action bar */
div.action-bar
@ -299,7 +345,6 @@ table.htk-grid
margin: auto;
border-collapse: collapse;
text-align: center;
margin-bottom: 1em;
}
table.htk-grid thead tr,
table.htk-grid tfoot tr

View File

@ -0,0 +1,60 @@
<?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="16"
height="16"
viewBox="0 0 16 16"
enable-background="new 0 0 512 512"
xml:space="preserve"
inkscape:version="0.48.5 r10040"
sodipodi:docname="basket.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="1920"
inkscape:window-height="1014"
id="namedview7"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="51"
inkscape:cx="6.0064108"
inkscape:cy="8.0000014"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" /><g
id="g2988"
transform="matrix(0.03325942,0,0,0.03325942,-0.51441152,-0.68070862)"
style="fill:#666666;fill-opacity:1"><path
id="path3"
d="m 461.5,222 h -411 c -11.046,0 -20,8.954 -20,20 l 40,207 c 0,11.046 8.954,20 20,20 h 331 c 11.046,0 20,-8.954 20,-20 l 40,-207 c 0,-11.046 -8.954,-20 -20,-20 z M 138,403.5 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.799,0 10.5,4.701 10.5,10.5 v 117 z m 66,0 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.798,0 10.5,4.701 10.5,10.5 v 117 z m 62,0 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.798,0 10.5,4.701 10.5,10.5 v 117 z m 65,0 c 0,5.799 -4.701,10.5 -10.5,10.5 -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 5.799,0 10.5,4.701 10.5,10.5 v 117 z m 65,0 c 0,5.799 -4.701,10.5 -10.5,10.5 -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 5.799,0 10.5,4.701 10.5,10.5 v 117 z"
inkscape:connector-curvature="0"
style="fill:#666666;fill-opacity:1" /><path
id="path5"
d="m 416.595,121.376 c -3.04,-25.57 -25.181,-47.13 -50.66,-50.02 C 358.847,70.835 335.601,70.955 319.9,71.008 318.899,60.897 310.373,53 300,53 h -87 c -10.387,0 -18.92,7.919 -19.901,18.049 -19.155,-0.169 -49.697,-0.793 -60.374,3.647 -19.07,7.12 -34.01,24.74 -37.04,44.99 -4.64,29.089 -9.399,58.169 -13.91,87.291 6.721,0.029 13.44,0.159 20.16,-0.021 4.53,-27.64 8.83,-55.31 13.34,-82.95 1.83,-16.4 15.96,-30.24 32.12,-32.61 C 154.332,90.778 178.309,91 193.67,91.053 195.911,99.648 203.703,106 213,106 h 87 c 9.31,0 17.11,-6.37 19.34,-14.982 14.012,0.012 34.461,0.038 39.715,-0.012 18.1,-0.27 35.21,14.37 37.569,32.34 4.561,27.86 8.82,55.77 13.471,83.61 6.7,0.21 13.42,-0.011 20.13,0.01 -4.42,-28.55 -9.111,-57.05 -13.63,-85.59 z"
inkscape:connector-curvature="0"
style="fill:#666666;fill-opacity:1" /></g></svg>

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,60 @@
<?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="16"
height="16"
viewBox="0 0 16 16"
enable-background="new 0 0 512 512"
xml:space="preserve"
inkscape:version="0.48.5 r10040"
sodipodi:docname="basket.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" /><dc:title></dc:title></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="1920"
inkscape:window-height="1014"
id="namedview7"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="51"
inkscape:cx="4.986803"
inkscape:cy="8.0000014"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" /><g
id="g2988"
transform="matrix(0.03325942,0,0,0.03325942,-0.51441152,-0.68070862)"
style="fill:#ffffff;fill-opacity:1"><path
id="path3"
d="m 461.5,222 h -411 c -11.046,0 -20,8.954 -20,20 l 40,207 c 0,11.046 8.954,20 20,20 h 331 c 11.046,0 20,-8.954 20,-20 l 40,-207 c 0,-11.046 -8.954,-20 -20,-20 z M 138,403.5 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.799,0 10.5,4.701 10.5,10.5 v 117 z m 66,0 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.798,0 10.5,4.701 10.5,10.5 v 117 z m 62,0 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.798,0 10.5,4.701 10.5,10.5 v 117 z m 65,0 c 0,5.799 -4.701,10.5 -10.5,10.5 -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 5.799,0 10.5,4.701 10.5,10.5 v 117 z m 65,0 c 0,5.799 -4.701,10.5 -10.5,10.5 -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 5.799,0 10.5,4.701 10.5,10.5 v 117 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" /><path
id="path5"
d="m 416.595,121.376 c -3.04,-25.57 -25.181,-47.13 -50.66,-50.02 C 358.847,70.835 335.601,70.955 319.9,71.008 318.899,60.897 310.373,53 300,53 h -87 c -10.387,0 -18.92,7.919 -19.901,18.049 -19.155,-0.169 -49.697,-0.793 -60.374,3.647 -19.07,7.12 -34.01,24.74 -37.04,44.99 -4.64,29.089 -9.399,58.169 -13.91,87.291 6.721,0.029 13.44,0.159 20.16,-0.021 4.53,-27.64 8.83,-55.31 13.34,-82.95 1.83,-16.4 15.96,-30.24 32.12,-32.61 C 154.332,90.778 178.309,91 193.67,91.053 195.911,99.648 203.703,106 213,106 h 87 c 9.31,0 17.11,-6.37 19.34,-14.982 14.012,0.012 34.461,0.038 39.715,-0.012 18.1,-0.27 35.21,14.37 37.569,32.34 4.561,27.86 8.82,55.77 13.471,83.61 6.7,0.21 13.42,-0.011 20.13,0.01 -4.42,-28.55 -9.111,-57.05 -13.63,-85.59 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" /></g></svg>

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,93 @@
<?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"
version="1.1"
height="16"
width="16"
inkscape:version="0.91 r13725"
sodipodi:docname="close.svg">
<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="namedview15"
showgrid="false"
inkscape:zoom="30.133789"
inkscape:cx="-2.6193084"
inkscape:cy="8"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg7384" />
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<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>
<defs
id="defs7386" />
<g
transform="translate(-60,-518)"
id="layer9"
style="display:inline;fill:#333333;fill-opacity:1" />
<g
transform="translate(-60,-518)"
id="layer10"
style="fill:#333333;fill-opacity:1" />
<g
transform="translate(-60,-518)"
id="layer11"
style="fill:#333333;fill-opacity:1" />
<g
transform="matrix(1.4994104,0,0,1.4994104,-93.957549,-780.6897)"
id="layer12"
style="fill:#ffffff;fill-opacity:1">
<g
transform="translate(19,-242)"
id="layer4-4-1"
style="fill:#ffffff;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:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono" />
</g>
</g>
<g
transform="translate(-60,-518)"
id="layer13"
style="fill:#333333;fill-opacity:1" />
<g
transform="translate(-60,-518)"
id="layer14"
style="fill:#333333;fill-opacity:1" />
<g
transform="translate(-60,-518)"
id="layer15"
style="fill:#333333;fill-opacity:1" />
</svg>

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,151 @@
<?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"
sodipodi:docname="go-next.svg"
height="16"
id="svg7384"
inkscape:version="0.48.5 r10040"
version="1.1"
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:bbox-nodes="false"
inkscape:bbox-paths="true"
bordercolor="#666666"
borderopacity="1"
inkscape:current-layer="layer12"
inkscape:cx="8"
inkscape:cy="8"
gridtolerance="10"
inkscape:guide-bbox="true"
guidetolerance="10"
id="namedview88"
inkscape:object-nodes="false"
inkscape:object-paths="false"
objecttolerance="10"
pagecolor="#3a3b39"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
showborder="false"
showgrid="false"
showguides="true"
inkscape:snap-bbox="true"
inkscape:snap-bbox-midpoints="false"
inkscape:snap-global="true"
inkscape:snap-grids="true"
inkscape:snap-nodes="true"
inkscape:snap-others="false"
inkscape:snap-to-guides="true"
inkscape:window-height="1014"
inkscape:window-maximized="1"
inkscape:window-width="1920"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:zoom="51">
<inkscape:grid
empspacing="2"
enabled="true"
id="grid4866"
originx="120px"
originy="530px"
snapvisiblegridlinesonly="true"
spacingx="1px"
spacingy="1px"
type="xygrid"
visible="true" />
<inkscape:grid
color="#000000"
empcolor="#000000"
empopacity="0"
empspacing="4"
enabled="true"
id="grid5968"
opacity="0.1254902"
originx="120px"
originy="530px"
snapvisiblegridlinesonly="true"
spacingx="0.5px"
spacingy="0.5px"
type="xygrid"
visible="true" />
</sodipodi:namedview>
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<defs
id="defs7386" />
<g
inkscape:groupmode="layer"
id="layer9"
inkscape:label="status"
style="display:inline"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer10"
inkscape:label="devices"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer11"
inkscape:label="apps"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer13"
inkscape:label="places"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer14"
inkscape:label="mimetypes"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer15"
inkscape:label="emblems"
style="display:inline"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="g71291"
inkscape:label="emotes"
style="display:inline"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="g4953"
inkscape:label="categories"
style="display:inline"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer12"
inkscape:label="actions"
style="display:inline"
transform="translate(-121.0002,-747)">
<path
inkscape:connector-curvature="0"
d="m 126.10829,749.02355 a 0.99672214,0.99672214 0 0 0 -0.49831,1.71294 l 4.26678,4.26679 -4.26678,4.26679 a 1.013034,1.013034 0 1 0 1.43264,1.43265 l 4.98311,-4.98312 0.68518,-0.71632 -0.68518,-0.71632 -4.98311,-4.98311 a 0.99672214,0.99672214 0 0 0 -0.93433,-0.2803 z"
id="path8334"
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:#ffffff;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>
</svg>

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -0,0 +1,138 @@
<?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="preferences.svg"
version="1.1"
inkscape:version="0.48.5 r10040"
height="16.000008"
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="8.0166251"
pagecolor="#555753"
borderopacity="1"
showborder="false"
inkscape:bbox-paths="false"
guidetolerance="10"
inkscape:object-paths="true"
inkscape:window-width="1920"
showguides="true"
inkscape:object-nodes="true"
inkscape:snap-bbox="true"
inkscape:pageshadow="2"
inkscape:guide-bbox="true"
inkscape:snap-nodes="true"
bordercolor="#666666"
objecttolerance="10"
id="namedview88"
showgrid="false"
inkscape:window-maximized="1"
inkscape:window-x="1920"
inkscape:snap-global="true"
inkscape:window-y="27"
gridtolerance="10"
inkscape:window-height="1014"
inkscape:snap-others="false"
inkscape:snap-to-guides="true"
inkscape:current-layer="g4953"
inkscape:snap-bbox-midpoints="false"
inkscape:zoom="51.106157"
inkscape:cx="4.2986535"
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(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer9"
style="display:inline" />
<g
inkscape:label="devices"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer10" />
<g
inkscape:label="apps"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer11" />
<g
inkscape:label="places"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer13" />
<g
inkscape:label="mimetypes"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer14" />
<g
inkscape:label="emblems"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer15"
style="display:inline" />
<g
inkscape:label="emotes"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="g71291"
style="display:inline" />
<g
inkscape:label="categories"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="g4953"
style="display:inline">
<path
inkscape:connector-curvature="0"
d="m 446.65609,464.07124 c -0.30012,0 -0.59101,0.0688 -0.85924,0.16212 l 1.4166,1.41272 c 0.29112,0.29031 0.29112,0.75184 0,1.04217 l -0.53412,0.53266 c -0.29112,0.29031 -0.75392,0.29031 -1.04504,0 l -1.4166,-1.41272 c -0.0935,0.26749 -0.16257,0.55759 -0.16257,0.85689 0,1.43254 1.1645,2.59384 2.60098,2.59384 0.30013,0 0.59102,-0.0688 0.85926,-0.16211 l 0.88247,0.88005 a 1.8580274,1.8529294 0 0 1 0.0464,0 l 1.55594,-1.55167 -0.9057,-0.90321 c 0.0935,-0.2675 0.16256,-0.55759 0.16256,-0.8569 0,-1.43254 -1.16449,-2.59384 -2.60098,-2.59384 z m 4.92329,5.92878 -1.55595,1.55167 a 1.8580274,1.8529294 0 0 1 0.0232,0.0694 l 0.85925,0.8569 c -0.0935,0.26752 -0.16256,0.55762 -0.16256,0.85692 0,1.43254 1.1645,2.59385 2.60098,2.59385 0.32577,0 0.64153,-0.0762 0.92892,-0.18528 l -1.50949,-1.50535 c -0.29112,-0.29032 -0.29112,-0.775 0,-1.06533 l 0.5109,-0.5095 c 0.14555,-0.14517 0.34417,-0.2316 0.53413,-0.2316 0.18996,0 0.38857,0.0864 0.53413,0.2316 l 1.46305,1.45903 c 0.0788,-0.2477 0.13934,-0.5137 0.13934,-0.78742 0,-1.43254 -1.1645,-2.59383 -2.60098,-2.59383 -0.30012,0 -0.59102,0.0688 -0.85925,0.16211 l -0.9057,-0.90322 z"
id="path3908"
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:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
<path
inkscape:connector-curvature="0"
d="m 454.43754,463.99996 -1.15925,1.0804 c -0.33934,0.31625 -0.39773,0.86341 -0.20014,1.28251 l -4.42536,4.50618 a 1.1210834,1.1180053 0 0 0 -0.0234,1.8e-4 1.1210834,1.1180053 0 0 0 -0.63144,-0.11153 1.1210834,1.1180053 0 0 0 -0.65132,0.33113 l -2.96581,3.00425 a 1.1229203,1.1198373 0 1 0 1.6004,1.57127 l 2.96581,-3.00424 a 1.1210834,1.1180053 0 0 0 0.22331,-1.306 l 4.42554,-4.48289 c 0.41923,0.18667 0.95692,0.11046 1.28277,-0.2196 l 1.06512,-1.17281 -1.50627,-1.47885 z"
id="path3910"
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:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
</g>
<g
inkscape:label="actions"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer12"
style="display:inline" />
</svg>

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.0.2, 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="16"
height="16"
viewBox="0 0 16 16"
enable-background="new 0 0 512 372.363"
xml:space="preserve"
inkscape:version="0.48.5 r10040"
sodipodi:docname="shipping.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" /><dc:title></dc:title></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="51"
inkscape:cx="7.9803922"
inkscape:cy="8"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" /><path
d="m 13.454551,5.2727348 h -2.045449 v -2.72727 H 1.8636523 C 1.1102539,2.5454648 0.5,3.1557148 0.5,3.9091148 v 7.5000002 h 1.3636523 c 0,1.12857 0.9170215,2.04542 2.04542,2.04542 1.128457,0 2.0454492,-0.91685 2.0454492,-2.04542 h 4.0909275 c 0,1.12857 0.916846,2.04542 2.045449,2.04542 1.128575,0 2.04542,-0.91685 2.04542,-2.04542 H 15.5 V 8.0000151 L 13.454551,5.2727348 z M 3.9090723,12.431815 c -0.5659278,0 -1.0227246,-0.45677 -1.0227246,-1.0227 0,-0.56596 0.4567968,-1.02272 1.0227246,-1.02272 0.565957,0 1.0227246,0.45676 1.0227246,1.02272 0,0.56593 -0.4567383,1.0227 -1.0227246,1.0227 z M 13.113652,6.2954648 14.453311,8.0000151 H 11.409072 V 6.2954648 h 1.70458 z m -1.022724,6.1363502 c -0.565957,0 -1.022725,-0.45677 -1.022725,-1.0227 0,-0.56596 0.456768,-1.02272 1.022725,-1.02272 0.565927,0 1.022724,0.45676 1.022724,1.02272 0,0.56593 -0.456797,1.0227 -1.022724,1.0227 z"
id="path3"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-opacity:1" /></svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -33,8 +33,8 @@
bordercolor="#666666"
borderopacity="1"
inkscape:current-layer="layer13"
inkscape:cx="39.718376"
inkscape:cy="-0.872946"
inkscape:cx="4.3333343"
inkscape:cy="8"
gridtolerance="10"
inkscape:guide-bbox="true"
guidetolerance="10"
@ -55,12 +55,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-x="0"
inkscape:window-width="1920"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:zoom="32.6875">
inkscape:zoom="51">
<inkscape:grid
empspacing="2"
enabled="true"
@ -102,7 +102,7 @@
inkscape:connector-curvature="0"
d="m 484.0002,180 0,9 9,0 0,-9 2,0 0,9 c 0,2 -2,2 -2,2 l -9,0 c -2,0 -2,-2 -2,-2 l 0,-9 z m 4.00001,1 1.00002,0 0,6 -1.00002,0 z m 2,0 1.00002,0 0,6 -1.00002,0 z m -4,0 0.99999,0 0,6 -0.99999,0 z m -1.00001,-6 c -2,0 -2,2 -2,2 l -2,0 0,2 15,0 0,-2 -2,0 c 0,-2 -2,-2 -2,-2 l -7,0 z m 0,1 7,0 0,1 -7,0 0,-1 z"
id="path3799"
style="fill:#333333;fill-opacity:1;stroke:none" />
style="fill:#666666;fill-opacity:1;stroke:none" />
</g>
<g
inkscape:groupmode="layer"

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 597 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 935 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 784 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 447 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 359 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 805 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 510 B

View File

@ -0,0 +1,151 @@
<?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"
sodipodi:docname="go-next.svg"
height="16"
id="svg7384"
inkscape:version="0.48.5 r10040"
version="1.1"
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:bbox-nodes="false"
inkscape:bbox-paths="true"
bordercolor="#666666"
borderopacity="1"
inkscape:current-layer="layer12"
inkscape:cx="4.372549"
inkscape:cy="8"
gridtolerance="10"
inkscape:guide-bbox="true"
guidetolerance="10"
id="namedview88"
inkscape:object-nodes="false"
inkscape:object-paths="false"
objecttolerance="10"
pagecolor="#3a3b39"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
showborder="false"
showgrid="false"
showguides="true"
inkscape:snap-bbox="true"
inkscape:snap-bbox-midpoints="false"
inkscape:snap-global="true"
inkscape:snap-grids="true"
inkscape:snap-nodes="true"
inkscape:snap-others="false"
inkscape:snap-to-guides="true"
inkscape:window-height="1014"
inkscape:window-maximized="1"
inkscape:window-width="1920"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:zoom="51">
<inkscape:grid
empspacing="2"
enabled="true"
id="grid4866"
originx="120px"
originy="530px"
snapvisiblegridlinesonly="true"
spacingx="1px"
spacingy="1px"
type="xygrid"
visible="true" />
<inkscape:grid
color="#000000"
empcolor="#000000"
empopacity="0"
empspacing="4"
enabled="true"
id="grid5968"
opacity="0.1254902"
originx="120px"
originy="530px"
snapvisiblegridlinesonly="true"
spacingx="0.5px"
spacingy="0.5px"
type="xygrid"
visible="true" />
</sodipodi:namedview>
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<defs
id="defs7386" />
<g
inkscape:groupmode="layer"
id="layer9"
inkscape:label="status"
style="display:inline"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer10"
inkscape:label="devices"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer11"
inkscape:label="apps"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer13"
inkscape:label="places"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer14"
inkscape:label="mimetypes"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer15"
inkscape:label="emblems"
style="display:inline"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="g71291"
inkscape:label="emotes"
style="display:inline"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="g4953"
inkscape:label="categories"
style="display:inline"
transform="translate(-121.0002,-747)" />
<g
inkscape:groupmode="layer"
id="layer12"
inkscape:label="actions"
style="display:inline"
transform="translate(-121.0002,-747)">
<path
inkscape:connector-curvature="0"
d="m 126.10829,749.02355 a 0.99672214,0.99672214 0 0 0 -0.49831,1.71294 l 4.26678,4.26679 -4.26678,4.26679 a 1.013034,1.013034 0 1 0 1.43264,1.43265 l 4.98311,-4.98312 0.68518,-0.71632 -0.68518,-0.71632 -4.98311,-4.98311 a 0.99672214,0.99672214 0 0 0 -0.93433,-0.2803 z"
id="path8334"
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>
</svg>

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -9,10 +9,10 @@
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="go-previous-symbolic.svg"
sodipodi:docname="go-previous.svg"
height="16"
id="svg7384"
inkscape:version="0.48.5 r10040"
inkscape:version="0.91 r13725"
version="1.1"
width="16">
<metadata
@ -33,8 +33,8 @@
bordercolor="#666666"
borderopacity="1"
inkscape:current-layer="layer12"
inkscape:cx="-10.422846"
inkscape:cy="-25.208568"
inkscape:cx="4.5742092"
inkscape:cy="7.9610706"
gridtolerance="10"
inkscape:guide-bbox="true"
guidetolerance="10"
@ -55,12 +55,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-x="0"
inkscape:window-width="1920"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:zoom="2.0429688">
inkscape:zoom="51.375">
<inkscape:grid
empspacing="2"
enabled="true"
@ -146,24 +146,6 @@
inkscape:connector-curvature="0"
d="m 110.875,749 a 1.0001,1.0001 0 0 0 -0.59375,0.28125 l -5,5 -0.6875,0.71875 0.6875,0.71875 5,5 a 1.016466,1.016466 0 1 0 1.4375,-1.4375 L 107.4375,755 l 4.28125,-4.28125 A 1.0001,1.0001 0 0 0 110.875,749 z"
id="path6040"
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" />
<rect
height="1"
id="rect6046"
rx="0"
ry="1"
style="fill:#333333;fill-opacity:1;stroke:none"
width="1"
x="111.0002"
y="749" />
<rect
height="1"
id="rect6050"
rx="0"
ry="1"
style="fill:#333333;fill-opacity:1;stroke:none"
width="1"
x="111.0002"
y="760" />
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>
</svg>

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

View File

@ -0,0 +1,138 @@
<?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="preferences.svg"
version="1.1"
inkscape:version="0.48.5 r10040"
height="16.000008"
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="8.0166251"
pagecolor="#555753"
borderopacity="1"
showborder="false"
inkscape:bbox-paths="false"
guidetolerance="10"
inkscape:object-paths="true"
inkscape:window-width="1920"
showguides="true"
inkscape:object-nodes="true"
inkscape:snap-bbox="true"
inkscape:pageshadow="2"
inkscape:guide-bbox="true"
inkscape:snap-nodes="true"
bordercolor="#666666"
objecttolerance="10"
id="namedview88"
showgrid="false"
inkscape:window-maximized="1"
inkscape:window-x="1920"
inkscape:snap-global="true"
inkscape:window-y="27"
gridtolerance="10"
inkscape:window-height="1014"
inkscape:snap-others="false"
inkscape:snap-to-guides="true"
inkscape:current-layer="g4953"
inkscape:snap-bbox-midpoints="false"
inkscape:zoom="51.106157"
inkscape:cx="4.2986535"
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(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer9"
style="display:inline" />
<g
inkscape:label="devices"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer10" />
<g
inkscape:label="apps"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer11" />
<g
inkscape:label="places"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer13" />
<g
inkscape:label="mimetypes"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer14" />
<g
inkscape:label="emblems"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer15"
style="display:inline" />
<g
inkscape:label="emotes"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="g71291"
style="display:inline" />
<g
inkscape:label="categories"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="g4953"
style="display:inline">
<path
inkscape:connector-curvature="0"
d="m 446.65609,464.07124 c -0.30012,0 -0.59101,0.0688 -0.85924,0.16212 l 1.4166,1.41272 c 0.29112,0.29031 0.29112,0.75184 0,1.04217 l -0.53412,0.53266 c -0.29112,0.29031 -0.75392,0.29031 -1.04504,0 l -1.4166,-1.41272 c -0.0935,0.26749 -0.16257,0.55759 -0.16257,0.85689 0,1.43254 1.1645,2.59384 2.60098,2.59384 0.30013,0 0.59102,-0.0688 0.85926,-0.16211 l 0.88247,0.88005 a 1.8580274,1.8529294 0 0 1 0.0464,0 l 1.55594,-1.55167 -0.9057,-0.90321 c 0.0935,-0.2675 0.16256,-0.55759 0.16256,-0.8569 0,-1.43254 -1.16449,-2.59384 -2.60098,-2.59384 z m 4.92329,5.92878 -1.55595,1.55167 a 1.8580274,1.8529294 0 0 1 0.0232,0.0694 l 0.85925,0.8569 c -0.0935,0.26752 -0.16256,0.55762 -0.16256,0.85692 0,1.43254 1.1645,2.59385 2.60098,2.59385 0.32577,0 0.64153,-0.0762 0.92892,-0.18528 l -1.50949,-1.50535 c -0.29112,-0.29032 -0.29112,-0.775 0,-1.06533 l 0.5109,-0.5095 c 0.14555,-0.14517 0.34417,-0.2316 0.53413,-0.2316 0.18996,0 0.38857,0.0864 0.53413,0.2316 l 1.46305,1.45903 c 0.0788,-0.2477 0.13934,-0.5137 0.13934,-0.78742 0,-1.43254 -1.1645,-2.59383 -2.60098,-2.59383 -0.30012,0 -0.59102,0.0688 -0.85925,0.16211 l -0.9057,-0.90322 z"
id="path3908"
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:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
<path
inkscape:connector-curvature="0"
d="m 454.43754,463.99996 -1.15925,1.0804 c -0.33934,0.31625 -0.39773,0.86341 -0.20014,1.28251 l -4.42536,4.50618 a 1.1210834,1.1180053 0 0 0 -0.0234,1.8e-4 1.1210834,1.1180053 0 0 0 -0.63144,-0.11153 1.1210834,1.1180053 0 0 0 -0.65132,0.33113 l -2.96581,3.00425 a 1.1229203,1.1198373 0 1 0 1.6004,1.57127 l 2.96581,-3.00424 a 1.1210834,1.1180053 0 0 0 0.22331,-1.306 l 4.42554,-4.48289 c 0.41923,0.18667 0.95692,0.11046 1.28277,-0.2196 l 1.06512,-1.17281 -1.50627,-1.47885 z"
id="path3910"
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:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
</g>
<g
inkscape:label="actions"
transform="translate(-442.0002,-462)"
inkscape:groupmode="layer"
id="layer12"
style="display:inline" />
</svg>

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.0.2, 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="16"
height="16"
viewBox="0 0 16 16"
enable-background="new 0 0 512 372.363"
xml:space="preserve"
inkscape:version="0.48.5 r10040"
sodipodi:docname="shipping.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="51"
inkscape:cx="7.9803922"
inkscape:cy="8"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" /><path
d="m 13.454551,5.2727348 h -2.045449 v -2.72727 H 1.8636523 C 1.1102539,2.5454648 0.5,3.1557148 0.5,3.9091148 v 7.5000002 h 1.3636523 c 0,1.12857 0.9170215,2.04542 2.04542,2.04542 1.128457,0 2.0454492,-0.91685 2.0454492,-2.04542 h 4.0909275 c 0,1.12857 0.916846,2.04542 2.045449,2.04542 1.128575,0 2.04542,-0.91685 2.04542,-2.04542 H 15.5 V 8.0000151 L 13.454551,5.2727348 z M 3.9090723,12.431815 c -0.5659278,0 -1.0227246,-0.45677 -1.0227246,-1.0227 0,-0.56596 0.4567968,-1.02272 1.0227246,-1.02272 0.565957,0 1.0227246,0.45676 1.0227246,1.02272 0,0.56593 -0.4567383,1.0227 -1.0227246,1.0227 z M 13.113652,6.2954648 14.453311,8.0000151 H 11.409072 V 6.2954648 h 1.70458 z m -1.022724,6.1363502 c -0.565957,0 -1.022725,-0.45677 -1.022725,-1.0227 0,-0.56596 0.456768,-1.02272 1.022725,-1.02272 0.565927,0 1.022724,0.45676 1.022724,1.02272 0,0.56593 -0.456797,1.0227 -1.022724,1.0227 z"
id="path3"
inkscape:connector-curvature="0"
style="fill:#666666;fill-opacity:1" /></svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -0,0 +1,64 @@
<?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="20"
height="20"
viewBox="0 0 20 20"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="step-cur.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="41.1"
inkscape:cx="9.9756691"
inkscape:cy="10"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1014"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<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:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1032.3622)">
<circle
style="fill:#666666;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4138"
cx="10"
cy="1042.3622"
r="7.5" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,64 @@
<?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="20"
height="20"
viewBox="0 0 20 20"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="step.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="41.1"
inkscape:cx="10"
inkscape:cy="10"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1014"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<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:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1032.3622)">
<circle
style="fill:#aaaaaa;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4138"
cx="10"
cy="1042.3622"
r="4" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -82,13 +82,17 @@ Htk.Field = new Class
,_value: undefined
,_param: null
,_editable: true
,ignoreParamChange: false
,_blockParamChange: false
,_blockValueChange: false
,onParamChange: function ()
{
this.ignoreParamChange = true;
this.value = this._param.value;
this.ignoreParamChange = false;
if (!this._blockValueChange)
{
this._blockParamChange = true;
this.value = this._param.value;
this._blockParamChange = false;
}
}
,bindToForm: function ()
@ -126,11 +130,11 @@ Htk.Field = new Class
if (this.conditionalFunc)
this.conditionalFunc (this, value);
if (this._param && !this.ignoreParamChange)
if (this._param && !this._blockParamChange)
{
this._param.blockSignal ('changed', this.onParamChange, true);
this._blockValueChange = true;
this._param.value = value;
this._param.blockSignal ('changed', this.onParamChange, false);
this._blockValueChange = false;
}
this.signalEmit ('changed');

View File

@ -199,7 +199,7 @@ Htk.Calendar = new Class
,selectTd: function (td)
{
if (this.selectedTd)
this.selectedTd.className = undefined;
this.selectedTd.className = '';
if (td)
td.className = 'highlight';

View File

@ -49,7 +49,7 @@ Htk.Radio = new Class
,onRadioGroupChange: function ()
{
if (this._radioGroup.value == this.value)
if (this._radioGroup.value && this._radioGroup.value == this.value)
this.node.checked = true;
else
this.node.checked = false;

View File

@ -0,0 +1,36 @@
include ([
'js/db/db.js',
'js/htk/js/htk/main',
'js/htk/widget',
'js/htk/popup',
'js/htk/toast',
'js/htk/repeater',
'js/htk/grid',
'js/htk/full-image',
'js/htk/image-editor',
'js/htk/field',
'js/htk/field/text',
'js/htk/field/html',
'js/htk/field/entry',
'js/htk/field/radio-group',
'js/htk/field/radio',
'js/htk/field/label',
'js/htk/field/text-area',
'js/htk/field/spin',
'js/htk/field/check',
'js/htk/field/select',
'js/htk/field/calendar',
'js/htk/field/date-chooser',
'js/htk/field/image',
'js/htk/field/button',
'js/htk/field/table',
'js/htk/column',
'js/htk/column/button',
'js/htk/column/link',
'js/htk/column/date',
'js/htk/column/image',
'js/htk/column/radio',
'js/htk/column/spin',
'js/htk/column/text',
'js/htk/column/check'
]);

View File

@ -241,10 +241,15 @@ Vn.Builder = new Class
value = 0 + new Number (value);
break;
case String:
case Object:
value = this.translateValue (value);
break;
case Function:
{
var method = this.getMethod (value);
value = method ? method.bind (this.signalData) : null;
break;
}
default:
if (prop.type instanceof Function)
{

View File

@ -5,6 +5,7 @@
,"Address": "Direcció"
,"City": "Ciutat"
,"ZipCode": "Codi postal"
,"Country": "País"
,"Province": "Província"
,"Return": "Tornar"

View File

@ -1,10 +1,10 @@
{
"Photos": "Fotos"
,"Schema:": "Esquema:"
,"ImageName:": "Nombre de la imagen:"
,"Id:": "Id:"
,"ImageFile:": "Archivo de imagen:"
,"Schema": "Esquema"
,"ImageName": "Nombre de la imagen"
,"Id": "Id"
,"ImageFile": "Archivo de imagen"
,"Upload": "Enviar"

View File

@ -5,14 +5,14 @@
,"OrCallUs": "O si ho prefereix truqui al 963 242 100."
,"AllFieldsMandatory": "* Tots els camps són obligatoris."
,"Name:": "Nom:"
,"Surname:": "Cognoms:"
,"EMail:": "Correu electrònic:"
,"Message:": "Missatge:"
,"Address:": "Adreça:"
,"PC:": "Codi postal:"
,"City:": "Ciutat:"
,"Phone:": "Telèfon:"
,"Name": "Nom"
,"Surname": "Cognoms"
,"EMail": "Correu electrònic"
,"Message": "Missatge"
,"Address": "Adreça"
,"PC": "Codi postal"
,"City": "Ciutat"
,"Phone": "Telèfon"
,"Send": "Enviar dades"
,"DataSentSuccess": "Les seves dades han estat enviades correctament. En breu ens posarem en contacte amb vostè."

View File

@ -5,9 +5,9 @@
,"Confirm": "Confirmar"
,"PayCash": "Contrareemborsament/Contat"
,"PayMethod:": "Forma de pagament:"
,"Notes:": "Notes:"
,"SendMethod:": "Forma d'enviament:"
,"PayMethod": "Forma de pagament"
,"Notes": "Notes"
,"SendMethod": "Forma d'enviament"
,"Insurance": "Assegurar mercaderia: 5% de l'import de l'encàrrec (Sols per a enviament per agència)"
,"Consignee": "Consignatari"

View File

@ -1,8 +1,9 @@
{
"AddEditNew": "Afegir / Editar notícia"
,"Title:": "Títol:"
,"NewBody:": "Cos:"
,"Title": "Títol"
,"NewBody": "Cos"
,"Tag": "Etiqueta"
,"Return": "Tornar"
,"Accept": "Acceptar"

View File

@ -52,7 +52,7 @@ Vn.Locale.add
,"Menu": "Menú"
,"ErrorLoadingForm": "Error al carregar formulari"
,"YoureVisitor": "Solament esteu de visita?"
,"NewVersionAvailable": "Existeix una nova versió del lloc web, ¿Desitgeu actualitzar?"
,"NewVersionAvailable": "Hi ha una nova actualització, la pàgina recargargará automàticament per descarregar-la"
,"ChangeLog": "Canvis recentes"
,"CookiesNotification": "En utilitzar aquest lloc web acceptes l'ús de cookies per a la personalització de continguts i anàlisi."

View File

@ -5,6 +5,7 @@
,"Address": "Dirección"
,"City": "Ciudad"
,"ZipCode": "Código postal"
,"Country": "País"
,"Province": "Provincia"
,"Return": "Volver"

View File

@ -1,10 +1,10 @@
{
"Photos": "Fotos"
,"Schema:": "Esquema:"
,"ImageName:": "Nombre de la imagen:"
,"Id:": "Id:"
,"ImageFile:": "Archivo de imagen:"
,"Schema": "Esquema"
,"ImageName": "Nombre de la imagen"
,"Id": "Id"
,"ImageFile": "Archivo de imagen"
,"Upload": "Enviar"

View File

@ -5,14 +5,14 @@
,"OrCallUs": "O si lo prefiere llámenos al 963 242 100."
,"AllFieldsMandatory": "* Todos los campos son obligatorios."
,"Name:": "Nombre:"
,"Surname:": "Apellidos:"
,"EMail:": "Correo electrónico:"
,"Message:": "Mensaje:"
,"Address:": "Dirección:"
,"PC:": "Código postal:"
,"City:": "Ciudad:"
,"Phone:": "Teléfono:"
,"Name": "Nombre"
,"Surname": "Apellidos"
,"EMail": "Correo electrónico"
,"Message": "Mensaje"
,"Address": "Dirección"
,"PC": "Código postal"
,"City": "Ciudad"
,"Phone": "Teléfono"
,"Send": "Enviar datos"
,"DataSentSuccess": "Sus datos han sido enviados correctamente. En breve nos pondremos en contacto con usted."

View File

@ -3,12 +3,13 @@
,"Delete": "Borrar pedido"
,"GoToCatalog": "Ir al catálogo"
,"ConfigureOrder": "Configurar pedido"
,"Checkout": "Tramitar pedido"
,"OrderNumber:": "Nº pedido:"
,"DateExit:": "Fecha de salida:"
,"Warehouse:": "Almacén:"
,"OrderTotal:": "Total pedido:"
,"OrderNumber": "Nº pedido"
,"DateExit": "Fecha de salida"
,"Warehouse": "Almacén"
,"OrderTotal": "Total pedido"
,"VATNotIncluded": "(IVA y transporte no incluídos)"
,"Amount": "Cant"

View File

@ -1,47 +1,26 @@
{
"Checkout": "Tramitar pedido"
"ConfigureOrder": "Configurar pedido"
,"GoBasket": "Volver a la cesta"
,"Confirm": "Confirmar"
,"Cancel": "Cancelar"
,"NEXT": "SIGUIENTE"
,"PayCash": "Contrareembolso/Contado"
,"PayMethod:": "Forma de pago:"
,"Notes:": "Notas:"
,"SendMethod:": "Forma de envío:"
,"Insurance": "Asegurar mercancía: 5% del importe del pedido (Solo para envíos por agencia)"
,"Consignee": "Consignatario"
,"Province": "Provincia"
,"PC": "Código postal"
,"City": "Ciudad"
,"Address": "Domicilio"
,"SureDelOrder": "¿Está seguro de eliminar el pedido?"
,"SureConfirmOrder": "¿Desea confirmar su pedido?"
,"OrderConfirmed": "Su pedido ha sido procesado y confirmado correctamente"
,"ClientAcceptCash": "El cliente accepta pagar Contrareembolso/Contado"
,"InetOrder": "Pedido realizado por Internet"
,"NoOrderFound": "No se ha encontrado ningún pedido"
,"NoArticleAdded": "No ha agregado ningún artículo a su pedido"
,"OrderExceeded": "Ha excedido el numero maximo de pedidos por confirmar, por favor elimine o confirme los pedidos iniciados"
,"HighQuantity": "Algunos artículos ya no están disponibles o hay mas cantidad de la disponible, revise los recuadros en rojo"
,"NoArticleAdded": "No ha seleccionado ningun artículo"
,"IsertOrderType": "Introduzca el tipo de pedido que desea"
,"QuantityIntroduced": "La cantidad introducida de"
,"IsHigherThan": "es mayor que la cantidad disponible, por lo tanto se agregará el máximo disponible"
,"RoundedTo": "ha sido redondeada debido a que este artículo se vende por cajas"
,"NoOrderAfterHour": "No es posible realizar pedidos para hoy despues de las"
,"NoOrderOnHolidays": "No es posible realizar pedidos para Domingos o festivos"
,"DateLow": "La fecha de envío debe de ser igual o superior al día de hoy"
,"DateHigh": "La fecha introducida es demasiado grande"
,"DateUpdatedTo": "El día de envío ha sido actualizado a el"
,"CreditExceeded": "Ha excedido su crédito máximo permitido, si desea confimar el pedido de todas formas marque la casilla Pago Contrareembolso/Contado o reduzca el importe de su pedido en "
,"InsuranceQuestion": "Las agencias de transporte disponen de un menor número de trabajadores en verano, por las vacaciones, lo que puede ocasionar retrasos en la entrega. Esto, unido al calor, ha causado, en algunas ocasiones, que la mercancía no llegara en óptimas condiciones. Ya que nuestros portes habituales no incluyen ningún tipo de seguro, le ofrecemos la posibilidad de asegurar este envio. El coste sería de el 5% del valor de la mercancía. ¿Desea contratarlo?"
,"DeliveryOrPickupQuestion": "¿Desea recibir o recoger el pedido?"
,"Receive": "Recibir"
,"Pickup": "Recoger"
,"ShippingAddress": "Dirección de envío"
,"OrderDateDeliveryQuestion": "¿Qué día desea recibir el pedido?"
,"OrderDatePickupQuestion": "¿Qué día desea recoger el pedido?"
,"AddressQuestion": "¿Dónde desea recibir el pedido?"
,"AgencyQuestion": "¿Por qué agencia desea recibir el pedido?"
,"PickupWarehouseQuestion": "¿En qué almacén desea recoger su pedido?"
,"ConfirmToAccessCatalog": "Confirme los datos para acceder al catálogo"
,"ArrivalOf": "Llegada el"
,"PickupOf": "Recogida el"
,"%A, %e of %B": "%A, %e de %B"
,"Agency": "Agencia"
,"Warehouse": "Almacén"
,"CONFIRM": "CONFIRMAR"
,"AddAddress": "Añadir dirección"
,"SelectAddress": "Seleccionar dirección"
,"EditAddress": "Modificar dirección"
,"ErrorCreatingOrder": "Error al crear el pedido"
}

View File

@ -0,0 +1,26 @@
{
"ConfigureOrder": "Configurar pedido"
,"Return": "Volver"
,"Accept": "Aceptar"
,"ShippingDate": "Fecha de envío"
,"Warehouse": "Almacén"
,"DeliveryMethod": "Forma de envío"
,"ShippingAgency": "Agencia de envío"
,"Notes": "Notas"
,"PickupInStore": "Recogida en almacén"
,"HomeDelivery": "Reparto a domicilio"
,"TransportAgency": "Agencia de transporte"
,"PickupStore": "Almacén de recogida"
,"ShippingAddress": "Dirección de envío"
,"AddAddress": "Añadir dirección"
,"SelectAddress": "Seleccionar dirección"
,"EditAddress": "Modificar dirección"
,"SureConfirmOrder": "¿Desea confirmar su pedido?"
,"OrderConfirmed": "Su pedido ha sido procesado y confirmado correctamente"
}

View File

@ -0,0 +1,16 @@
{
"ConfigureShippingPickup": "Configurar envío / recogida"
,"Return": "Volver"
,"GoToCatalog": "Ir al catálogo"
,"GoToBasket": "Cesta de la compra"
,"ShippingAgency": "Agencia de envío"
,"PickupStore": "Almacén de recogida"
,"ShippingAddress": "Dirección de envío"
,"AddAddress": "Añadir dirección"
,"SelectAddress": "Seleccionar dirección"
,"EditAddress": "Modificar dirección"
}

View File

@ -1,8 +1,9 @@
{
"AddEditNew": "Añadir / Editar noticia"
,"Title:": "Título:"
,"NewBody:": "Cuerpo:"
,"Title": "Título"
,"NewBody": "Cuerpo"
,"Tag": "Etiqueta"
,"Return": "Volver"
,"Accept": "Aceptar"

View File

@ -52,7 +52,7 @@ Vn.Locale.add
,"Menu": "Menú"
,"ErrorLoadingForm": "Error al cargar formulario"
,"YoureVisitor": "¿Solo estás de visita?"
,"NewVersionAvailable": "Existe una nueva versión de la página web, ¿Desea actualizar?"
,"NewVersionAvailable": "Hay una nueva actualización, la página se recargargará automaticamente para descargarla"
,"ChangeLog": "Cambios recientes"
,"CookiesNotification": "Al utilizar este sitio web aceptas el uso de cookies para la personalización de contenidos y análisis."

View File

@ -5,6 +5,7 @@
,"Address": "Adresse De La Rue"
,"City": "Ville"
,"ZipCode": "Code postal"
,"Country": "Pays"
,"Province": "Province"
,"Return": "Reviens"

View File

@ -1,10 +1,10 @@
{
"Photos": "Fotos"
,"Schema:": "Esquema:"
,"ImageName:": "Nombre de la imagen:"
,"Id:": "Id:"
,"ImageFile:": "Archivo de imagen:"
,"Schema": "Esquema"
,"ImageName": "Nombre de la imagen"
,"Id": "Id"
,"ImageFile": "Archivo de imagen"
,"Upload": "Enviar"

View File

@ -5,14 +5,14 @@
,"OrCallUs": "Ou si vous préférez nous appeler au 0033 781 533 900."
,"AllFieldsMandatory": "* Todos los campos son obligatorios."
,"Name:": "Nom:"
,"Surname:": "Nom:"
,"EMail:": "Email:"
,"Message:": "Message:"
,"Address:": "Adresse:"
,"PC:": "Code postal:"
,"City:": "Ville:"
,"Phone:": "Téléphone:"
,"Name": "Nom"
,"Surname": "Nom"
,"EMail": "Email"
,"Message": "Message"
,"Address": "Adresse"
,"PC": "Code postal"
,"City": "Ville"
,"Phone": "Téléphone"
,"Send": "Envoyer des données"
,"DataSentSuccess": "Vos détails ont été envoyés avec succès. Peu de temps nous vous contacterons."

View File

@ -5,9 +5,9 @@
,"Confirm": "Confirmer"
,"PayCash": "COD / Trésorerie"
,"PayMethod:": "Mode de paiement:"
,"Notes:": "Remarques:"
,"SendMethod:": "Mode de livraison:"
,"PayMethod": "Mode de paiement"
,"Notes": "Remarques"
,"SendMethod": "Mode de livraison"
,"Insurance": "S'assurer que la marchandise: 5% du montant de la commande (uniquement pour les envois par agence)"
,"Consignee": "Destinataire"

View File

@ -1,8 +1,9 @@
{
"AddEditNew": "Ajouter / Editer nouvelles"
,"Title:": "Titre:"
,"NewBody:": "Corps:"
,"Title": "Titre"
,"NewBody": "Corps"
,"Tag": "Tag"
,"Return": "Reviens"
,"Accept": "Accepter"

View File

@ -52,7 +52,7 @@ Vn.Locale.add
,"Menu": "Menu"
,"ErrorLoadingForm": "Forme erreur de chargement"
,"YoureVisitor": "¿Solo estás de visita?"
,"NewVersionAvailable": "Une nouvelle version du site, Vous voulez mettre à niveau?"
,"NewVersionAvailable": "Il ya une nouvelle mise à jour, la page sera automatiquement recargargará pour télécharger"
,"ChangeLog": "Modifications récentes"
,"CookiesNotification": "En utilisant ce site, vous acceptez l'utilisation de cookies pour personnaliser le contenu et l'analyse."

View File

@ -5,6 +5,7 @@
,"Address": "Dirección"
,"City": "Ciudad"
,"ZipCode": "Código postal"
,"Country": "País"
,"Province": "Provincia"
,"Return": "Volver"

View File

@ -1,10 +1,10 @@
{
"Photos": "Fotos"
,"Schema:": "Esquema:"
,"ImageName:": "Nombre de la imagen:"
,"Id:": "Id:"
,"ImageFile:": "Archivo de imagen:"
,"Schema": "Esquema"
,"ImageName": "Nombre de la imagen"
,"Id": "Id"
,"ImageFile": "Archivo de imagen"
,"Upload": "Enviar"

View File

@ -5,14 +5,14 @@
,"OrCallUs": "O si lo prefiere llámenos al 963 242 100."
,"AllFieldsMandatory": "* Todos los campos son obligatorios."
,"Name:": "Nombre:"
,"Surname:": "Apellidos:"
,"EMail:": "Correo electrónico:"
,"Message:": "Mensaje:"
,"Address:": "Dirección:"
,"PC:": "Código postal:"
,"City:": "Ciudad:"
,"Phone:": "Teléfono:"
,"Name": "Nombre"
,"Surname": "Apellidos"
,"EMail": "Correo electrónico"
,"Message": "Mensaje"
,"Address": "Dirección"
,"PC": "Código postal"
,"City": "Ciudad"
,"Phone": "Teléfono"
,"Send": "Enviar datos"
,"DataSentSuccess": "Sus datos han sido enviados correctamente. En breve nos pondremos en contacto con usted."

View File

@ -5,9 +5,9 @@
,"Confirm": "Confirmar"
,"PayCash": "Contrareembolso/Contado"
,"PayMethod:": "Forma de pago:"
,"Notes:": "Notas:"
,"SendMethod:": "Forma de envío:"
,"PayMethod": "Forma de pago"
,"Notes": "Notas"
,"SendMethod": "Forma de envío"
,"Insurance": "Asegurar mercancía: 5% del importe del pedido (Solo para envíos por agencia)"
,"Consignee": "Consignatario"

View File

@ -1,8 +1,9 @@
{
"AddEditNew": "Añadir / Editar noticia"
,"Title:": "Título:"
,"NewBody:": "Cuerpo:"
,"Title": "Título"
,"NewBody": "Cuerpo"
,"Tag": "Etiqueta"
,"Return": "Volver"
,"Accept": "Aceptar"

View File

@ -52,7 +52,7 @@ Vn.Locale.add
,"Menu": "Menú"
,"ErrorLoadingForm": "Error al cargar formulario"
,"YoureVisitor": "¿Solo estás de visita?"
,"NewVersionAvailable": "Existe una nueva versión de la página web, ¿Desea actualizar?"
,"NewVersionAvailable": "Hay una nueva actualización, la página se recargargará automaticamente para descargarla"
,"ChangeLog": "Cambios recientes"
,"CookiesNotification": "Al utilizar este sitio web aceptas el uso de cookies para la personalización de contenidos y análisis."

View File

@ -139,9 +139,8 @@ class Web
,Auth::getPassword ()
,$conf['db']['schema']
);
self::$conn->query ('CALL user_session_start (#)',
[session_id()]);
[session_id ()]);
Auth::login ($useCookies);
}

View File

@ -186,9 +186,14 @@ class Tpv
&& isset ($params['Ds_Response'])
&& isset ($params['Ds_Signature']))
{
if (isset ($params['Ds_ErrorCode']))
$error = $params['Ds_ErrorCode'];
else
$error = NULL;
try {
return self::$conn->query (
'CALL transaction_confirm_with_check (#, #, #, #, #, #)',
'CALL transaction_confirm_with_check (#, #, #, #, #, #, #)',
[
$params['Ds_Amount']
,$params['Ds_Order']
@ -196,6 +201,7 @@ class Tpv
,$params['Ds_Currency']
,$params['Ds_Response']
,$params['Ds_Signature']
,$error
]
);
}