From f7d1743c8a77e0dd6265f4a678d14ef980daca74 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Wed, 24 Jul 2013 11:42:47 +0200
Subject: [PATCH] // fix tags in helper

---
 admin-dev/themes/default/codekit-config.json  | 670 +++++++++---------
 admin-dev/themes/default/css/admin-theme.css  |   6 +-
 admin-dev/themes/default/css/admin-theme.sass |   6 +-
 admin-dev/themes/default/template/header.tpl  |   2 +-
 .../default/template/helpers/form/form.tpl    |  48 +-
 .../admin/AdminAttributesGroupsController.php |  11 +-
 6 files changed, 357 insertions(+), 386 deletions(-)

diff --git a/admin-dev/themes/default/codekit-config.json b/admin-dev/themes/default/codekit-config.json
index 700f906cb..bcd8b5ce8 100644
--- a/admin-dev/themes/default/codekit-config.json
+++ b/admin-dev/themes/default/codekit-config.json
@@ -24,32 +24,16 @@
       "initialSize" : 1704,
       "fileType" : 8192
     },
-    "\/template\/controllers\/geolocation\/helpers\/options\/index.php" : {
+    "\/img\/patterns\/classy_fabric.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/geolocation\/helpers\/options\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
-    "\/template\/controllers\/preferences\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/preferences\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
-    "\/template\/controllers\/languages\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/languages\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
+      "inputAbbreviatedPath" : "\/img\/patterns\/classy_fabric.png",
+      "processed" : 0,
+      "outputAbbreviatedPath" : "\/img\/patterns\/classy_fabric.png",
+      "initialSize" : 8856,
+      "fileType" : 8192
     },
     "\/img\/icon-cancel.png" : {
       "ignoreWasSetByUser" : 0,
@@ -62,6 +46,15 @@
       "initialSize" : 4340,
       "fileType" : 8192
     },
+    "\/template\/controllers\/languages\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/languages\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/order_preferences\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -71,16 +64,23 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/img\/patterns\/classy_fabric.png" : {
+    "\/template\/controllers\/preferences\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/img\/patterns\/classy_fabric.png",
-      "processed" : 0,
-      "outputAbbreviatedPath" : "\/img\/patterns\/classy_fabric.png",
-      "initialSize" : 8856,
-      "fileType" : 8192
+      "inputAbbreviatedPath" : "\/template\/controllers\/preferences\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
+    "\/template\/controllers\/geolocation\/helpers\/options\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/geolocation\/helpers\/options\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
     },
     "\/template\/controllers\/attributes\/helpers\/list\/index.php" : {
       "ignoreWasSetByUser" : 0,
@@ -127,6 +127,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/shipping\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/shipping\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/img\/lock.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -138,15 +147,6 @@
       "initialSize" : 1503,
       "fileType" : 8192
     },
-    "\/template\/controllers\/shipping\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/shipping\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/access\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -257,15 +257,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/supply_orders_receipt_history\/helpers\/list\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders_receipt_history\/helpers\/list\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/modules_list_button.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -277,6 +268,15 @@
       "initialSize" : 2611,
       "fileType" : 8192
     },
+    "\/template\/controllers\/supply_orders_receipt_history\/helpers\/list\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders_receipt_history\/helpers\/list\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/translations\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -315,6 +315,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/stats\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/stats\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/css\/bootstrap\/_variables.scss" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 1,
@@ -327,15 +336,6 @@
       "fileType" : 4,
       "debugStyle" : 2
     },
-    "\/template\/controllers\/stats\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/stats\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/header_module.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -548,24 +548,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/css\/modules.css" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/css\/modules.css",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 16
-    },
-    "\/template\/controllers\/supply_orders\/helpers\/list\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders\/helpers\/list\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/meta\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -584,6 +566,24 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/css\/modules.css" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/css\/modules.css",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 16
+    },
+    "\/template\/controllers\/supply_orders\/helpers\/list\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders\/helpers\/list\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/return\/helpers\/form\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -680,15 +680,6 @@
       "initialSize" : 2002,
       "fileType" : 8192
     },
-    "\/template\/controllers\/orders\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/orders\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/tree-multishop-url.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -700,6 +691,15 @@
       "initialSize" : 649,
       "fileType" : 8192
     },
+    "\/template\/controllers\/orders\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/orders\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/meta\/helpers\/options\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -718,15 +718,37 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/return\/helpers\/index.php" : {
+    "\/template\/controllers\/manufacturers\/helpers\/view\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/return\/helpers\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/manufacturers\/helpers\/view\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/img\/module-logout.png" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/img\/module-logout.png",
+      "processed" : 0,
+      "outputAbbreviatedPath" : "\/img\/module-logout.png",
+      "initialSize" : 1481,
+      "fileType" : 8192
+    },
+    "\/img\/process-icon-preview.png" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/img\/process-icon-preview.png",
+      "processed" : 0,
+      "outputAbbreviatedPath" : "\/img\/process-icon-preview.png",
+      "initialSize" : 2264,
+      "fileType" : 8192
+    },
     "\/template\/controllers\/outstanding\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -745,26 +767,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/tracking\/helpers\/list\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/tracking\/helpers\/list\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
-    "\/img\/process-icon-preview.png" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/img\/process-icon-preview.png",
-      "processed" : 0,
-      "outputAbbreviatedPath" : "\/img\/process-icon-preview.png",
-      "initialSize" : 2264,
-      "fileType" : 8192
-    },
     "\/template\/controllers\/tax_rules\/helpers\/form\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -774,23 +776,21 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/img\/process-icon-partial-refund.png" : {
+    "\/template\/controllers\/tracking\/helpers\/list\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/img\/process-icon-partial-refund.png",
-      "processed" : 0,
-      "outputAbbreviatedPath" : "\/img\/process-icon-partial-refund.png",
-      "initialSize" : 1773,
-      "fileType" : 8192
+      "inputAbbreviatedPath" : "\/template\/controllers\/tracking\/helpers\/list\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
     },
-    "\/template\/controllers\/manufacturers\/helpers\/view\/index.php" : {
+    "\/template\/controllers\/return\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/manufacturers\/helpers\/view\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/return\/helpers\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -825,15 +825,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/img\/module-logout.png" : {
+    "\/img\/process-icon-partial-refund.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/img\/module-logout.png",
+      "inputAbbreviatedPath" : "\/img\/process-icon-partial-refund.png",
       "processed" : 0,
-      "outputAbbreviatedPath" : "\/img\/module-logout.png",
-      "initialSize" : 1481,
+      "outputAbbreviatedPath" : "\/img\/process-icon-partial-refund.png",
+      "initialSize" : 1773,
       "fileType" : 8192
     },
     "\/template\/controllers\/login\/index.php" : {
@@ -1000,15 +1000,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/countries\/helpers\/form\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/countries\/helpers\/form\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/states\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1018,15 +1009,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/supply_orders_change_state\/helpers\/form\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders_change_state\/helpers\/form\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/process-icon-edit.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1038,6 +1020,24 @@
       "initialSize" : 3761,
       "fileType" : 8192
     },
+    "\/template\/controllers\/supply_orders_change_state\/helpers\/form\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders_change_state\/helpers\/form\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
+    "\/template\/controllers\/countries\/helpers\/form\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/countries\/helpers\/form\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/img\/process-icon-delete.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1085,15 +1085,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/request_sql\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/request_sql\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/groups\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1103,6 +1094,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/request_sql\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/request_sql\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/localization\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1273,6 +1273,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/supply_orders\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/img\/process-icon-help-new.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1284,15 +1293,6 @@
       "initialSize" : 3472,
       "fileType" : 8192
     },
-    "\/template\/controllers\/supply_orders\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/products\/multishop\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1484,6 +1484,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/stores\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/stores\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/img\/process-icon-export-csv.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1495,12 +1504,12 @@
       "initialSize" : 1176,
       "fileType" : 8192
     },
-    "\/template\/controllers\/stores\/helpers\/index.php" : {
+    "\/template\/controllers\/categories\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/stores\/helpers\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/categories\/helpers\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -1515,15 +1524,6 @@
       "initialSize" : 1815,
       "fileType" : 8192
     },
-    "\/template\/controllers\/categories\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/categories\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/searchbutton.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1535,6 +1535,17 @@
       "initialSize" : 930,
       "fileType" : 8192
     },
+    "\/img\/icon-valid-green.png" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/img\/icon-valid-green.png",
+      "processed" : 0,
+      "outputAbbreviatedPath" : "\/img\/icon-valid-green.png",
+      "initialSize" : 4447,
+      "fileType" : 8192
+    },
     "\/template\/controllers\/tax_rules_group\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1564,17 +1575,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/img\/icon-valid-green.png" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/img\/icon-valid-green.png",
-      "processed" : 0,
-      "outputAbbreviatedPath" : "\/img\/icon-valid-green.png",
-      "initialSize" : 4447,
-      "fileType" : 8192
-    },
     "\/template\/controllers\/payment\/helpers\/view\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1584,12 +1584,12 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/customers\/helpers\/view\/index.php" : {
+    "\/template\/controllers\/supply_orders_change_state\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/customers\/helpers\/view\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders_change_state\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -1602,15 +1602,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/supply_orders_change_state\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders_change_state\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/module-profile.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1631,12 +1622,21 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/products\/combination\/index.php" : {
+    "\/template\/controllers\/search\/helpers\/view\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/products\/combination\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/search\/helpers\/view\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
+    "\/template\/controllers\/shop_url\/helpers\/list\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/shop_url\/helpers\/list\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -1681,6 +1681,15 @@
       "fileType" : 4,
       "debugStyle" : 2
     },
+    "\/template\/controllers\/customers\/helpers\/view\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/customers\/helpers\/view\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/employees\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1690,15 +1699,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/attribute_generator\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/attribute_generator\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/modules_view_table_select_row.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1719,12 +1719,12 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/search\/helpers\/view\/index.php" : {
+    "\/template\/controllers\/products\/combination\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/search\/helpers\/view\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/products\/combination\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -1749,12 +1749,12 @@
       "fileType" : 2,
       "debugStyle" : 0
     },
-    "\/template\/controllers\/shop_url\/helpers\/list\/index.php" : {
+    "\/template\/controllers\/attribute_generator\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/shop_url\/helpers\/list\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/attribute_generator\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -1776,14 +1776,14 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/config.rb" : {
+    "\/template\/controllers\/cms_categories\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/config.rb",
+      "inputAbbreviatedPath" : "\/template\/controllers\/cms_categories\/helpers\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 32768
+      "fileType" : 2048
     },
     "\/template\/controllers\/products\/combination\/helpers\/list\/index.php" : {
       "ignoreWasSetByUser" : 0,
@@ -1794,14 +1794,14 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/cms_categories\/helpers\/index.php" : {
+    "\/config.rb" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/cms_categories\/helpers\/index.php",
+      "inputAbbreviatedPath" : "\/config.rb",
       "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
+      "fileType" : 32768
     },
     "\/img\/button-bg.png" : {
       "ignoreWasSetByUser" : 0,
@@ -1832,15 +1832,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/css\/admin.css" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 1,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/css\/admin.css",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 16
-    },
     "\/template\/controllers\/categories\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1850,6 +1841,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/css\/admin.css" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 1,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/css\/admin.css",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 16
+    },
     "\/template\/controllers\/referrers\/helpers\/form\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1975,15 +1975,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/products\/combination\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/products\/combination\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/addresses\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -1993,6 +1984,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/products\/combination\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/products\/combination\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/warehouses\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2050,15 +2050,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/cart_rules\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/cart_rules\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/translations\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2068,6 +2059,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/cart_rules\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/cart_rules\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/css\/admin-theme.css" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 1,
@@ -2180,12 +2180,12 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/attributes_groups\/index.php" : {
+    "\/template\/controllers\/customer_threads\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/attributes_groups\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/customer_threads\/helpers\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -2207,12 +2207,12 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/customer_threads\/helpers\/index.php" : {
+    "\/template\/controllers\/attributes_groups\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/customer_threads\/helpers\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/attributes_groups\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -2283,15 +2283,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/attributes_groups\/helpers\/form\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/attributes_groups\/helpers\/form\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/patterns\/bedge_grunge.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2303,6 +2294,15 @@
       "initialSize" : 87957,
       "fileType" : 8192
     },
+    "\/template\/controllers\/attributes_groups\/helpers\/form\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/attributes_groups\/helpers\/form\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/search\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2312,24 +2312,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/emails\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/emails\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
-    "\/template\/controllers\/employees\/helpers\/form\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/employees\/helpers\/form\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/attributes\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2339,12 +2321,21 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/carriers\/index.php" : {
+    "\/template\/controllers\/employees\/helpers\/form\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/carriers\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/employees\/helpers\/form\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
+    "\/template\/controllers\/emails\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/emails\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -2357,6 +2348,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/carriers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/carriers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/img\/notif_message.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2424,15 +2424,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/img\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/img\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/img\/separator_subnav.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2444,6 +2435,15 @@
       "initialSize" : 120,
       "fileType" : 8192
     },
+    "\/img\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/img\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/suppliers\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2509,17 +2509,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/img\/bullet_orange.png" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/img\/bullet_orange.png",
-      "processed" : 0,
-      "outputAbbreviatedPath" : "\/img\/bullet_orange.png",
-      "initialSize" : 321,
-      "fileType" : 8192
-    },
     "\/img\/bg-top.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2531,6 +2520,17 @@
       "initialSize" : 9503,
       "fileType" : 8192
     },
+    "\/img\/bullet_orange.png" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/img\/bullet_orange.png",
+      "processed" : 0,
+      "outputAbbreviatedPath" : "\/img\/bullet_orange.png",
+      "initialSize" : 321,
+      "fileType" : 8192
+    },
     "\/template\/controllers\/attributes_groups\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2540,6 +2540,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/cms\/helpers\/form\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/cms\/helpers\/form\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/invoices\/helpers\/form\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2549,15 +2558,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/products\/helpers\/list\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/products\/helpers\/list\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/images\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2567,12 +2567,12 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/specific_price_rule\/helpers\/index.php" : {
+    "\/template\/controllers\/products\/helpers\/list\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
       "hidden" : 0,
       "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/specific_price_rule\/helpers\/index.php",
+      "inputAbbreviatedPath" : "\/template\/controllers\/products\/helpers\/list\/index.php",
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
@@ -2585,6 +2585,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/specific_price_rule\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/specific_price_rule\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/template\/controllers\/payment\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2594,15 +2603,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/cms\/helpers\/form\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/cms\/helpers\/form\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/carriers\/helpers\/form\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2878,17 +2878,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/img\/process-icon-back.png" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/img\/process-icon-back.png",
-      "processed" : 0,
-      "outputAbbreviatedPath" : "\/img\/process-icon-back.png",
-      "initialSize" : 1184,
-      "fileType" : 8192
-    },
     "\/template\/controllers\/stock_cover\/helpers\/list\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2898,15 +2887,6 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
-    "\/template\/controllers\/stock_cover\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/stock_cover\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/shop_url\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2916,6 +2896,26 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/stock_cover\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/stock_cover\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
+    "\/img\/process-icon-back.png" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/img\/process-icon-back.png",
+      "processed" : 0,
+      "outputAbbreviatedPath" : "\/img\/process-icon-back.png",
+      "initialSize" : 1184,
+      "fileType" : 8192
+    },
     "\/template\/controllers\/payment\/helpers\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2925,6 +2925,15 @@
       "outputAbbreviatedPath" : "No Output Path",
       "fileType" : 2048
     },
+    "\/template\/controllers\/shop\/helpers\/index.php" : {
+      "ignoreWasSetByUser" : 0,
+      "ignore" : 0,
+      "hidden" : 0,
+      "outputPathIsSetByUser" : 0,
+      "inputAbbreviatedPath" : "\/template\/controllers\/shop\/helpers\/index.php",
+      "outputAbbreviatedPath" : "No Output Path",
+      "fileType" : 2048
+    },
     "\/img\/process-icon-standard-refund.png" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
@@ -2936,15 +2945,6 @@
       "initialSize" : 1538,
       "fileType" : 8192
     },
-    "\/template\/controllers\/shop\/helpers\/index.php" : {
-      "ignoreWasSetByUser" : 0,
-      "ignore" : 0,
-      "hidden" : 0,
-      "outputPathIsSetByUser" : 0,
-      "inputAbbreviatedPath" : "\/template\/controllers\/shop\/helpers\/index.php",
-      "outputAbbreviatedPath" : "No Output Path",
-      "fileType" : 2048
-    },
     "\/template\/controllers\/request_sql\/index.php" : {
       "ignoreWasSetByUser" : 0,
       "ignore" : 0,
diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index a0e4884c4..553c66408 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -5075,7 +5075,7 @@ body.fixed-top {
   -webkit-box-shadow: #b4ac9c 0 0 0 4px;
   box-shadow: #b4ac9c 0 0 0 4px; }
   #content fieldset {
-    padding-bottom: 20px;
+    padding: 20px;
     margin-bottom: 10px;
     border: solid 1px #cac4b9;
     background-color: #f6f5f3;
@@ -5088,8 +5088,8 @@ body.fixed-top {
     box-shadow: rgba(0, 0, 0, 0.1) 0 0 7px, white 0 0 0 4px inset; }
   #content form legend {
     float: left;
-    padding: 0 0 0 10px;
-    margin: 20px 0 15px 0;
+    padding: 0 0 0 0;
+    margin: 5px 0 15px 0;
     color: #bfb8b3;
     font-weight: 300; }
   #content form .alert {
diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass
index 49285389a..8e072872b 100755
--- a/admin-dev/themes/default/css/admin-theme.sass
+++ b/admin-dev/themes/default/css/admin-theme.sass
@@ -46,7 +46,7 @@ body.fixed-top
 	background-image: url('../img/patterns/bedge_grunge.png')
 	@include box-shadow(darken($bg-content-color,30%) 0 0 0 4px)
 	fieldset
-		padding-bottom: 20px
+		padding: 20px
 		margin-bottom: 10px
 		border: solid 1px darken($bg-content-color,20%)
 		background-color: $bg-content-color
@@ -54,8 +54,8 @@ body.fixed-top
 		@include box-shadow(rgba(black,0.10) 0 0 7px, white 0 0 0 4px inset)
 	form legend
 		float: left
-		padding: 0 0 0 10px
-		margin: 20px 0 15px 0
+		padding: 0 0 0 0
+		margin: 5px 0 15px 0
 		color: darken(#D6D2CF,10%)
 		font-weight: 300
 	form .alert
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 87d02b257..04c57868c 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -248,7 +248,7 @@
 			<ul id="menu">
 				<li class="maintab">
 					<a href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}" class="title">
-						<i class="icon-AdminDashboard"></i> Dashboard
+						<i class="icon-AdminDashboard"></i> {l s='Dashboard'}
 					</a>
 				</li>
 			{foreach $tabs AS $t}
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 0880cdf04..ad11a452f 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -78,12 +78,22 @@
 										{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
 										<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}" style="{if $language.id_lang != $defaultFormLanguage}display:none{/if}">
 											{if $input.type == 'tags'}
-												tags
+												{literal}
+													<script type="text/javascript">
+														$().ready(function () {
+															var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
+															$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
+															$({/literal}'#{$table}{literal}_form').submit( function() {
+																$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
+															});
+														});
+													</script>
+												{/literal}
 											{/if}
 											<input type="text"
-												id="{$input_name}_{$language.id_lang}"
+												name="{$input_name}_{$language.id_lang}"
 												class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
-												name="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
+												id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
 												value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
 												onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
 												{if isset($input.size)}size="{$input.size}"{/if}
@@ -106,38 +116,6 @@
 										</div>
 									{/foreach}
 									</div>
-
-<!--										<div class="translatable">
-											{foreach $languages as $language}
-												<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}">
- 												{if $input.type == 'tags'}
-														{literal}
-														<script type="text/javascript">
-															$().ready(function () {
-																var input_id = '{/literal}{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}{literal}';
-																$('#'+input_id).tagify({addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
-																$({/literal}'#{$table}{literal}_form').submit( function() {
-																	$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
-																});
-															});
-														</script>
-														{/literal}
-													{/if}
-													{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
-													<input type="text"
-															name="{$input.name}_{$language.id_lang}"
-															id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
-															value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
-															class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
-															{if isset($input.size)}size="{$input.size}"{/if}
-															{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-															{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
-															{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
-															{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
-												</div>
-											{/foreach}
-										</div> -->
-
 									{else}
 										{if $input.type == 'tags'}
 											{literal}
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index 360a812f4..ec003d985 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -100,7 +100,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
 			$this->fields_list = array(
 				'id_attribute' => array(
 					'title' => $this->l('ID'),
-					'width' => 40,
 					'align' => 'center'
 				),
 				'name' => array(
@@ -113,13 +112,11 @@ class AdminAttributesGroupsControllerCore extends AdminController
 			if ($obj->group_type == 'color')
 				$this->fields_list['color'] = array(
 					'title' => $this->l('Color'),
-					'width' => 40,
 					'filter_key' => 'b!color'
 				);
 
 			$this->fields_list['position'] = array(
 				'title' => $this->l('Position'),
-				'width' => 40,
 				'filter_key' => 'a!position',
 				'position' => 'position'
 			);
@@ -187,7 +184,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 		$this->fields_form = array(
 			'legend' => array(
 				'title' => $this->l('Attributes'),
-				'image' => '../img/admin/asterisk.gif'
+				'icon' => 'icon-info-sign'
 			),
 			'input' => array(
 				array(
@@ -195,7 +192,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
 					'label' => $this->l('Name:'),
 					'name' => 'name',
 					'lang' => true,
-					'size' => 33,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
@@ -204,7 +200,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
 					'label' => $this->l('Public name:'),
 					'name' => 'public_name',
 					'lang' => true,
-					'size' => 33,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
 					'desc' => $this->l('Group name displayed to the customer')
@@ -254,7 +249,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 		$this->fields_form = array(
 			'legend' => array(
 				'title' => $this->l('Values'),
-				'image' => '../img/admin/asterisk.gif',
+				'icon' => 'icon-info-sign'
 			),
 			'input' => array(
 				array(
@@ -274,7 +269,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
 					'label' => $this->l('Value:'),
 					'name' => 'name',
 					'lang' => true,
-					'size' => 33,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				)
@@ -306,7 +300,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
 			'type' => 'color',
 			'label' => $this->l('Color:'),
 			'name' => 'color',
-			'size' => 33,
 			'desc' => $this->l('Choose a color with the color picker, or enter an HTML color (e.g. "lightblue", "#CC6600")')
 		);