From edc2113330d35c0c3a593ce10719cb29affa837c Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Wed, 24 Jul 2013 17:02:23 +0200 Subject: [PATCH] // fix merge --- admin-dev/themes/default/codekit-config.json | 570 +++++++++--------- admin-dev/themes/default/css/admin.scss | 155 +++-- .../template/controllers/products/images.tpl | 61 +- css/admin.scss | 34 +- 4 files changed, 472 insertions(+), 348 deletions(-) diff --git a/admin-dev/themes/default/codekit-config.json b/admin-dev/themes/default/codekit-config.json index bcd8b5ce8..beb8d4729 100644 --- a/admin-dev/themes/default/codekit-config.json +++ b/admin-dev/themes/default/codekit-config.json @@ -24,6 +24,15 @@ "initialSize" : 1704, "fileType" : 8192 }, + "\/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 + }, "\/img\/patterns\/classy_fabric.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -35,16 +44,14 @@ "initialSize" : 8856, "fileType" : 8192 }, - "\/img\/icon-cancel.png" : { + "\/template\/controllers\/preferences\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/img\/icon-cancel.png", - "processed" : 0, - "outputAbbreviatedPath" : "\/img\/icon-cancel.png", - "initialSize" : 4340, - "fileType" : 8192 + "inputAbbreviatedPath" : "\/template\/controllers\/preferences\/helpers\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 }, "\/template\/controllers\/languages\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, @@ -64,23 +71,16 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/preferences\/helpers\/index.php" : { + "\/img\/icon-cancel.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "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 + "inputAbbreviatedPath" : "\/img\/icon-cancel.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/img\/icon-cancel.png", + "initialSize" : 4340, + "fileType" : 8192 }, "\/template\/controllers\/attributes\/helpers\/list\/index.php" : { "ignoreWasSetByUser" : 0, @@ -297,15 +297,6 @@ "initialSize" : 1586, "fileType" : 8192 }, - "\/template\/controllers\/tags\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/tags\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/categories\/helpers\/list\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -315,15 +306,6 @@ "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, @@ -336,16 +318,23 @@ "fileType" : 4, "debugStyle" : 2 }, - "\/img\/header_module.png" : { + "\/template\/controllers\/stats\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/img\/header_module.png", - "processed" : 0, - "outputAbbreviatedPath" : "\/img\/header_module.png", - "initialSize" : 218, - "fileType" : 8192 + "inputAbbreviatedPath" : "\/template\/controllers\/stats\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, + "\/template\/controllers\/tags\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/tags\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 }, "\/img\/bg_loaderSpace.png" : { "ignoreWasSetByUser" : 0, @@ -358,6 +347,17 @@ "initialSize" : 109, "fileType" : 8192 }, + "\/img\/header_module.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/img\/header_module.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/img\/header_module.png", + "initialSize" : 218, + "fileType" : 8192 + }, "\/template\/controllers\/import\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -548,6 +548,24 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/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 + }, + "\/css\/modules.css" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/css\/modules.css", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 16 + }, "\/template\/controllers\/meta\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -566,24 +584,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\/return\/helpers\/form\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -642,15 +642,6 @@ "initialSize" : 3767, "fileType" : 8192 }, - "\/template\/controllers\/addons_catalog\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/addons_catalog\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/slip\/helpers\/form\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -660,12 +651,12 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/helpers\/form\/index.php" : { + "\/template\/controllers\/addons_catalog\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/helpers\/form\/index.php", + "inputAbbreviatedPath" : "\/template\/controllers\/addons_catalog\/index.php", "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, @@ -700,6 +691,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/template\/helpers\/form\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/helpers\/form\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/template\/controllers\/meta\/helpers\/options\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -727,6 +727,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/template\/controllers\/return\/helpers\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/return\/helpers\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/img\/module-logout.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -749,15 +758,6 @@ "initialSize" : 2264, "fileType" : 8192 }, - "\/template\/controllers\/outstanding\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/outstanding\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/countries\/helpers\/list\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -776,6 +776,17 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/img\/process-icon-partial-refund.png" : { + "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 + }, "\/template\/controllers\/tracking\/helpers\/list\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -785,15 +796,6 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/return\/helpers\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/return\/helpers\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/img\/process-icon-new-module-addon.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -825,16 +827,14 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/img\/process-icon-partial-refund.png" : { + "\/template\/controllers\/outstanding\/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\/outstanding\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 }, "\/template\/controllers\/login\/index.php" : { "ignoreWasSetByUser" : 0, @@ -874,15 +874,6 @@ "initialSize" : 1569, "fileType" : 8192 }, - "\/template\/controllers\/stock_mvt\/helpers\/list\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/stock_mvt\/helpers\/list\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/helpers\/list\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -892,6 +883,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/template\/controllers\/stock_mvt\/helpers\/list\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/stock_mvt\/helpers\/list\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/template\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1000,6 +1000,15 @@ "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, @@ -1009,6 +1018,15 @@ "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, @@ -1020,24 +1038,6 @@ "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, @@ -1067,15 +1067,6 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/shop\/helpers\/form\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/shop\/helpers\/form\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/feature_value\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1103,6 +1094,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/template\/controllers\/shop\/helpers\/form\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/shop\/helpers\/form\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/template\/controllers\/localization\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1226,6 +1226,15 @@ "initialSize" : 2616, "fileType" : 8192 }, + "\/template\/controllers\/webservice\/helpers\/form\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/webservice\/helpers\/form\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/img\/process-icon-duplicate.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1237,15 +1246,6 @@ "initialSize" : 1413, "fileType" : 8192 }, - "\/template\/controllers\/webservice\/helpers\/form\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/webservice\/helpers\/form\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/order_preferences\/helpers\/options\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1484,15 +1484,6 @@ "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, @@ -1504,6 +1495,15 @@ "initialSize" : 1176, "fileType" : 8192 }, + "\/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 + }, "\/template\/controllers\/categories\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1535,6 +1535,15 @@ "initialSize" : 930, "fileType" : 8192 }, + "\/template\/controllers\/tax_rules_group\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/tax_rules_group\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/img\/icon-valid-green.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1546,12 +1555,12 @@ "initialSize" : 4447, "fileType" : 8192 }, - "\/template\/controllers\/tax_rules_group\/index.php" : { + "\/template\/controllers\/tags\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/tax_rules_group\/index.php", + "inputAbbreviatedPath" : "\/template\/controllers\/tags\/helpers\/index.php", "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, @@ -1566,15 +1575,6 @@ "initialSize" : 1763, "fileType" : 8192 }, - "\/template\/controllers\/tags\/helpers\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/tags\/helpers\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/payment\/helpers\/view\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1584,12 +1584,12 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/supply_orders_change_state\/index.php" : { + "\/template\/controllers\/customers\/helpers\/view\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/supply_orders_change_state\/index.php", + "inputAbbreviatedPath" : "\/template\/controllers\/customers\/helpers\/view\/index.php", "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, @@ -1602,6 +1602,15 @@ "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, @@ -1613,12 +1622,12 @@ "initialSize" : 1538, "fileType" : 8192 }, - "\/template\/controllers\/logs\/helpers\/list\/index.php" : { + "\/template\/controllers\/shop_url\/helpers\/list\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/logs\/helpers\/list\/index.php", + "inputAbbreviatedPath" : "\/template\/controllers\/shop_url\/helpers\/list\/index.php", "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, @@ -1631,15 +1640,6 @@ "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 - }, "\/img\/play.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -1660,12 +1660,12 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/webservice\/helpers\/index.php" : { + "\/template\/controllers\/logs\/helpers\/list\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/webservice\/helpers\/index.php", + "inputAbbreviatedPath" : "\/template\/controllers\/logs\/helpers\/list\/index.php", "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, @@ -1681,15 +1681,6 @@ "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, @@ -1699,6 +1690,15 @@ "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\/products\/combination\/index.php" : { + "\/template\/controllers\/referrers\/helpers\/view\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/products\/combination\/index.php", + "inputAbbreviatedPath" : "\/template\/controllers\/referrers\/helpers\/view\/index.php", "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, @@ -1743,27 +1743,27 @@ "hidden" : 0, "outputPathIsSetByUser" : 0, "inputAbbreviatedPath" : "\/css\/admin-theme.sass", - "outputStyle" : 3, + "outputStyle" : 0, "shouldRunBless" : 0, "outputAbbreviatedPath" : "\/css\/admin-theme.css", "fileType" : 2, - "debugStyle" : 0 + "debugStyle" : 2 }, - "\/template\/controllers\/attribute_generator\/index.php" : { + "\/template\/controllers\/products\/combination\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/attribute_generator\/index.php", + "inputAbbreviatedPath" : "\/template\/controllers\/products\/combination\/index.php", "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/referrers\/helpers\/view\/index.php" : { + "\/template\/controllers\/webservice\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/referrers\/helpers\/view\/index.php", + "inputAbbreviatedPath" : "\/template\/controllers\/webservice\/helpers\/index.php", "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, @@ -1800,7 +1800,7 @@ "hidden" : 0, "outputPathIsSetByUser" : 0, "inputAbbreviatedPath" : "\/config.rb", - "outputAbbreviatedPath" : "No Output Path", + "outputAbbreviatedPath" : "\/config.rb", "fileType" : 32768 }, "\/img\/button-bg.png" : { @@ -1842,7 +1842,7 @@ "fileType" : 2048 }, "\/css\/admin.css" : { - "ignoreWasSetByUser" : 0, + "ignoreWasSetByUser" : 1, "ignore" : 1, "hidden" : 0, "outputPathIsSetByUser" : 0, @@ -2006,13 +2006,13 @@ "ignoreWasSetByUser" : 0, "ignore" : 0, "hidden" : 0, - "outputPathIsSetByUser" : 1, + "outputPathIsSetByUser" : 0, "inputAbbreviatedPath" : "\/css\/admin.scss", "outputStyle" : 0, "shouldRunBless" : 0, "outputAbbreviatedPath" : "\/css\/admin.css", "fileType" : 4, - "debugStyle" : 0 + "debugStyle" : 2 }, "\/template\/controllers\/supply_orders\/index.php" : { "ignoreWasSetByUser" : 0, @@ -2041,15 +2041,6 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/feature_value\/helpers\/form\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/feature_value\/helpers\/form\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/translations\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2059,6 +2050,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/template\/controllers\/feature_value\/helpers\/form\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/feature_value\/helpers\/form\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/template\/controllers\/cart_rules\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2180,12 +2180,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 }, @@ -2207,12 +2207,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 }, @@ -2274,6 +2274,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 + }, "\/template\/controllers\/maintenance\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2291,18 +2300,9 @@ "inputAbbreviatedPath" : "\/img\/patterns\/bedge_grunge.png", "processed" : 0, "outputAbbreviatedPath" : "\/img\/patterns\/bedge_grunge.png", - "initialSize" : 87957, + "initialSize" : 145677, "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, @@ -2348,15 +2348,6 @@ "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, @@ -2368,6 +2359,15 @@ "initialSize" : 1605, "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 + }, "\/img\/export-csv.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2424,6 +2424,15 @@ "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, @@ -2435,15 +2444,6 @@ "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\/bg-top.png" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/img\/bg-top.png", - "processed" : 0, - "outputAbbreviatedPath" : "\/img\/bg-top.png", - "initialSize" : 9503, - "fileType" : 8192 - }, "\/img\/bullet_orange.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2531,6 +2520,17 @@ "initialSize" : 321, "fileType" : 8192 }, + "\/img\/bg-top.png" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/img\/bg-top.png", + "processed" : 0, + "outputAbbreviatedPath" : "\/img\/bg-top.png", + "initialSize" : 9503, + "fileType" : 8192 + }, "\/template\/controllers\/attributes_groups\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2567,6 +2567,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\/products\/helpers\/list\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2585,15 +2594,6 @@ "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, @@ -2603,15 +2603,6 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/carriers\/helpers\/form\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/carriers\/helpers\/form\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/logs\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2621,6 +2612,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/template\/controllers\/carriers\/helpers\/form\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/carriers\/helpers\/form\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/template\/controllers\/customer_threads\/helpers\/view\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2905,6 +2905,15 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, + "\/template\/controllers\/payment\/helpers\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/payment\/helpers\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/img\/process-icon-back.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2916,15 +2925,6 @@ "initialSize" : 1184, "fileType" : 8192 }, - "\/template\/controllers\/payment\/helpers\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/payment\/helpers\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/template\/controllers\/shop\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2963,15 +2963,6 @@ "outputAbbreviatedPath" : "No Output Path", "fileType" : 2048 }, - "\/template\/controllers\/cms_categories\/helpers\/form\/index.php" : { - "ignoreWasSetByUser" : 0, - "ignore" : 0, - "hidden" : 0, - "outputPathIsSetByUser" : 0, - "inputAbbreviatedPath" : "\/template\/controllers\/cms_categories\/helpers\/form\/index.php", - "outputAbbreviatedPath" : "No Output Path", - "fileType" : 2048 - }, "\/img\/process-icon-new-url.png" : { "ignoreWasSetByUser" : 0, "ignore" : 0, @@ -2983,6 +2974,15 @@ "initialSize" : 1642, "fileType" : 8192 }, + "\/template\/controllers\/cms_categories\/helpers\/form\/index.php" : { + "ignoreWasSetByUser" : 0, + "ignore" : 0, + "hidden" : 0, + "outputPathIsSetByUser" : 0, + "inputAbbreviatedPath" : "\/template\/controllers\/cms_categories\/helpers\/form\/index.php", + "outputAbbreviatedPath" : "No Output Path", + "fileType" : 2048 + }, "\/template\/controllers\/addresses\/helpers\/index.php" : { "ignoreWasSetByUser" : 0, "ignore" : 0, diff --git a/admin-dev/themes/default/css/admin.scss b/admin-dev/themes/default/css/admin.scss index d1ca052ff..e1802650b 100644 --- a/admin-dev/themes/default/css/admin.scss +++ b/admin-dev/themes/default/css/admin.scss @@ -1,10 +1,13 @@ #nobootstrap{ - h1, h2, h3, h4 { margin-bottom:.5em; line-height:1.4em; } + body {font-family: Arial, Helvetica, sans-serif;} + + h1, h2, h3, h4 { font-family: Arial, Helvetica, sans-serif; margin-bottom:.5em; line-height:1.4em; } h2 { font-size:1.7em; } h3 { font-size:1.25em; } h4 { font-size:1.05em; } h6 { font-size:1em; } + /*LIST*/ ul,ol {list-style:none; margin: 0; padding: 0;} ul li {color:#585A69;} @@ -22,39 +25,111 @@ .double_select select{width:300px;height:160px;} .double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px} + .icon {vertical-align:middle} + .icon-top {vertical-align:top} + /*BUTTON*/ - .button, .btn{ + .button{ background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top; background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent; - border-color: #CCCCCC #BBBBBB #A0A0A0; - border-left: 1px solid #BBBBBB; - border-radius: 3px 3px 3px 3px; - border-right: 1px solid #BBBBBB; - border-style: solid; - border-width: 1px; - color: #000000; - margin: 0; - outline: medium none; - padding: 3px 8px; - text-align: center; - vertical-align: middle; - white-space: nowrap; - text-shadow:0 1px 0 #fff;} - .button[disabled=disabled], .btn[disabled=disabled]{color:#8C8C8C} - .button.bt-icon, .btn.bt-icon { display:inline-block; margin-bottom:7px;} - .button.bt-icon span, .btn.bt-icon span {padding-left:5px;} - input.button[disabled=disabled]:hover, input.btn[disabled=disabled]:hover{background-color:#FFF6D3} - .button:hover, .btn:hover{border:1px solid #939393;} - .button:active, .btn:active{border:1px solid #939393;} - .button.export-csv span, .btn.export-csv{ background: transparent url('../img/export-csv.png') no-repeat scroll left top; padding:1px 0 1px 20px} + border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0;outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;} + .button[disabled=disabled]{color:#8C8C8C} + .button.bt-icon { display:inline-block; margin-bottom:7px;} + .button.bt-icon span {padding-left:5px;} + input.button[disabled=disabled]:hover{background-color:#FFF6D3} + .button:hover{border:1px solid #939393;} + .button:active{border:1px solid #939393;} + .button.export-csv span{ background: transparent url('../img/export-csv.png') no-repeat scroll left top; padding:1px 0 1px 20px} + + + #top_container{margin:0;padding:0} + + /*HEADER*/ + #header { background-color: #394049; height:90px; } + /* Portrait orientation targeting */ + @media screen and (orientation: portrait) {#header{min-width:1250px}} + /* Portrait orientation targeting */ + @media screen and (orientation: landscape) {#header{min-width:1250px}} + #header #header_infos{ position:relative; margin: 0; padding:0; height:60px; } + #header #header_shopname {float: left; margin:10px 15px 0 10px;} + #header #employee_box {float: right; display:block;} + #header #employee_infos {display:block; margin:5px 15px 0 10px;} + #header #employee_infos a{color:#BABABA; text-transform:capitalize;margin-right: 5px} + #header #employee_infos a:hover {color:#fff;} + #header #employee_infos .employee_name { float:left; color:#fff;padding: 0 20px 0 0;} + #header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top;height: 19px; width: 16px; margin-right: 5px} + #header ul#employee_links {list-style: none;display: block;text-align: left;} + #header ul#employee_links li {display: inline;line-height: 20px;} + + #header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;} + #header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; padding-left:20px; color:#bababa;} + #header #header_infos a#header_logout:hover {color:#fff;} + #header #header_infos #header_logout a span {color:#bababa} + #header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;} + #header #header_infos #header_foaccess a {color:#bababa !important;} + #header #header_infos a#header_foaccess:hover { color:#fff;} + + + + #header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; position:relative; height:25px; box-shadow: 0 1px 0 #666666; } + #header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 transparent; border:none; box-shadow:none; padding: 5px 0px 5px 4px; width: 160px; } + #header #header_search #bo_search_type_chzn{ font-size:13px; float:left; margin:0 23px 0 0; padding:0 4px; vertical-align:middle;width:80px !important;height:27px; border:none;} + #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single { box-shadow:none; border-radius:0px; border:none; border-left:1px dotted #ccc;} + #header #header_search #bo_search_submit { background: url('../img/icon-search2.png') no-repeat scroll center; border:none; width:27px; height:25px; float:left; font-weight:normal; margin:0; padding:0; cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; border-left:1px solid #3079ED; border-radius:0px; /*hacking ie7font-size: 0!ie7; color: transparent!ie;*/ } + #header #header_quick{float:right; display:block; margin-top:15px;} + #header #header_quick #quick_select_chzn{ font-size:13px; margin:0 10px 0 0; padding:0px 0 4px; } + #header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px} + + + .path_bar {display:none;} + #notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:95px;} + .notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;} + #orders_notif {background: url('../img/notif_order.png') no-repeat center top;} + #customers_notif {background: url('../img/notif_customer.png') no-repeat center top;} + #customer_messages_notif {background: url('../img/notif_message.png') no-repeat center top;} + #orders_notif.open_notifs, + #customers_notif.open_notifs, + #customer_messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; } + + + .number_wrapper {color: white;display: none;font-size: 13px;font-weight: bold;position: absolute; right: -8px;top: -10px;z-index: 101;padding: 2px 5px;} + .number_wrapper span {background-color: #F03D25; font-size:11px; display: block; padding: 1px 3px;border-color: -moz-use-text-color #DD3822 #DD3822;border-radius: 2px 2px 2px 2px;border-right: 1px solid #DD3822;border-style: none solid solid;border-width: 0 0px;} + .notifs_wrapper {background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #000; border-top:none;display: none; cursor:auto; position: absolute; top: 25px; left: -1px; width:300px; padding: 10px;color: black; z-index:9999;} + .notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 1px solid #E5E5E5;} + .notifs_wrapper ul {padding:6px 0;margin:0;} + .notifs_wrapper ul li {text-decoration: none;list-style: none;font-size:12px;padding:5px 0;} + #header_infos .notifs_wrapper a {font-weight: bold; font-size:11px; color: black; float:right;} + .notifs_wrapper p {font-size: 12px;padding-top:8px;margin:0;border-top: 1px solid #E5E5E5;} + .notifs_wrapper p.no_notifs {border: none;} + + + /*MENU*/ + #header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;} + #header #menu li.maintab{float:left;height:29px;list-style:none;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;} + #header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 3px 4px 0;font-weight:normal;font-size:12px;} + #header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0} + #header #menu li{_height:32px;_padding-top:3px} + #header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px} + #header #menu li.active, #header #menu li:hover{background-position:0 -38px;white-space:nowrap;} + #header #menu li.active a{} + #header #menu li:hover, #header #menu li.active {background-color:#49B2FF;} + #header #menu li.maintab:hover, #header #menu li.active {border-left:1px solid #49B2FF;border-right:1px solid #49B2FF;} + #header #menu li.active a.title, #header #menu li:hover a.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;} + #header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px} + #header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 5px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;} + #header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;min-width:150px;} + #header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;} + #header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;} + #header #menu .submenu li.active a { color: #fff;} + #header #menu .submenu li.active a:hover { color:#666666} /*SEPARATION*/ .separation { background-color:#ccc;border-bottom:1px solid #fff; width:100%; height:1px; margin:10px 0;} /*TABLE*/ .table_grid {width:100%;} - .table{ background-color:#fff;border:1px solid #ccc;padding:0;border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;} + .table{ background-color:#fff;border:1px solid #ccc; padding:0; border-radius:3px; -moz-border-radius:3px;-webkit-border-radius:3px;} .filter {background-color:#f1f9ff;} .table .filter {margin:2px;} .table th a{text-decoration:underline} @@ -83,9 +158,9 @@ div#loading{height:128px;width:128px;background:url('../img/ajax-loader.gif');display:block;text-indent:-9999px;margin:100px auto;} td.col-left label { display:block; width:100%; text-align:right;} .alt_row{background-color:#f8f8f8} - .path_bar{background-color:#E2EBEE;border:1px solid #999999;font-size:13px;margin-bottom:20px;padding:5px} + .path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px} .path_bar a{font-weight:700} - .cat_bar{background-color:#F4E8CD;border:1px solid #999999;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px} + .cat_bar{background-color:#F4E8CD;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px} .cat_bar a{font-weight:700} .table tr#total_products, @@ -94,6 +169,7 @@ .table tr#total_shipping { height:35px;} .table tr#total_order { height:50px;} + a.action_module{color: #268CCD;text-decoration: underline;} a.header_module_toggle{font-weight: bold;color: #268CCD;display:block;} a.module_toggle_all{color: #268CCD;} @@ -112,6 +188,7 @@ /*BLOC*/ .Bloc { background: none repeat scroll 0 0 #EBEDF4;} + /*TABLE STATUS COMMANDE*/ .table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;} @@ -127,15 +204,14 @@ /*toolbarBox*/ .toolbar-placeholder {position:relative} - .toolbarBox {position:relative} + .toolbarBox {background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;position:relative} .toolbarBox .pageTitle { margin-left:10px; line-height:48px} .toolbarBox .pageTitle h3 {font-size: 1.6em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;} .toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;} .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;} .toolbarBox a.toolbar_btn { border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;} .toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;-moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;} - .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px} - + .toolbarBox .toolbar_btn span{ display: block; float: none; height: 32px; margin: 0 auto; width: 32px; /*hacking ie7margin:0 !ie; position:relative !ie;*/ } .toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');} .toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');} .toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png');} @@ -237,6 +313,9 @@ border-bottom-color: transparent; } + + + div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;margin:auto} /*button upload files*/ @@ -255,7 +334,6 @@ border-width: 1px; color: #000000; } - #content .qq-upload-button:hover { border:1px solid #939393;} .file_upload_label {margin-top:5px;} @@ -421,7 +499,7 @@ #statsContainer .blocStats form { position:absolute; top:10px; right:5px;} #statsContainer .blocStats form.checkup { position:relative; top:0; left:0;} #statsContainer .totalStats { font-size:16px; font-weight:bold;} - #statsContainer .blocStats .blocConversion { display:block; display:inline-table;} + #statsContainer .blocStats .blocConversion { display:block; display:inline-table; min-height:80px /*!ie;*/ } /*MODULECONTAINER*/ #moduleContainer { margin-left:220px; padding:13px 0 0 20px;} @@ -459,7 +537,7 @@ margin:0; white-space: nowrap; overflow: auto; - height: 335px; + height: 370px; } #modules_list_container_tab #modules_list_container_content li{display:inline-block;} #modules_list_container_tab table tr th { height:40px;} @@ -475,7 +553,7 @@ #modules_list_container_tab .moduleDesc .metadata dl dd { padding-right:10px;} #modules_list_container_tab .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;} #modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; text-align: left;white-space: normal;} - #modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:2px 10px; display: inline-block; border-radius:3px;} + #modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:0 10px; display: inline-block; border-radius:3px;} #modules_list_container_tab .row-actions-module {float: right;} #modules_list_container_tab .setup.non-install { background-color:#ec7000;} #modules_list_container_tab .setup.must-have { background-color: #ec7000;} @@ -489,8 +567,8 @@ #modules_list_container_tab ul.listing-grid-module li select { position:absolute; top:0; right:0px; } .default_modules_list_display_type #modules_list_container_content li table tr td{border: none} - .default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 140px;width: 100%;margin-bottom:15px} - #modules_list_container_tab ul li {height:140px} + .default_modules_list_display_type #modules_list_container_content li table {border:solid 1px #ccc;height:105px;width:100%;margin-bottom:10px} + #modules_list_container_tab ul li {height:105px} /******** ie7 ******/ .ie7 #modules_list_container_tab #modules_list_container_content li{zoom:1;display:inline;} @@ -522,6 +600,13 @@ ul.listForm {} ul.listForm li {padding-bottom:3px;} + + /*FOOTER*/ + #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666} + #footer .footerLeft { float:left; margin-left:10px;} + #footer .footerRight {float:right; margin-right:10px;} + #footer .footer_link, #footer .footer_link:hover { color:#268CCD;} + /*DASHBOARD*/ .pageTitleHome { font-size: 1.6em; font-weight: normal; margin:0; padding:10px 0;} .pageTitleHome h3 { font-weight: normal; margin:0;} diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl index 0a9932df4..d0a1d2b25 100644 --- a/admin-dev/themes/default/template/controllers/products/images.tpl +++ b/admin-dev/themes/default/template/controllers/products/images.tpl @@ -291,28 +291,41 @@ { doAdminAjax( { - line = $("#lineType").html(); - line = line.replace(/image_id/g, id); - line = line.replace(/[a-z]{2}-default/g, path); - line = line.replace(/image_path/g, path); - line = line.replace(/image_position/g, position); - line = line.replace(/blank/g, cover); - line = line.replace(//gi, ""); - line = line.replace(/<\/tbody>/gi, ""); - - if (shops != false) - { - $.each(shops, function(key, value){ - if (value == 1) - line = line.replace('id="' + key + '' + id + '"','id="' + key + '' + id + '" checked=checked'); - }); - } - - $("#imageList").append(line); + "action":"updateImagePosition", + "json":json, + "token" : "{/literal}{$token}{literal}", + "tab" : "AdminProducts", + "ajax" : 1 + }); + } + + function delQueue(id) + { + $("#img" + id).fadeOut("slow"); + $("#img" + id).remove(); + } + + function imageLine(id, path, position, cover, shops) + { + line = $("#lineType").html(); + line = line.replace(/image_id/g, id); + line = line.replace(/[a-z]{2}-default/g, path); + line = line.replace(/image_path/g, path); + line = line.replace(/image_position/g, position); + line = line.replace(/icon-check-empty/g, cover); + line = line.replace(//gi, ""); + line = line.replace(/<\/tbody>/gi, ""); + if (shops != false) + { + $.each(shops, function(key, value){ + if (value == 1) + line = line.replace('id="' + key + '' + id + '"','id="' + key + '' + id + '" checked=checked'); + }); } - - $('.fancybox').fancybox(); - }); - {/literal} - -{/if} + $("#imageList").append(line); + } + $('.fancybox').fancybox(); + }); + {/literal} + +{/if} \ No newline at end of file diff --git a/css/admin.scss b/css/admin.scss index 3bb277e9a..08d0c5759 100644 --- a/css/admin.scss +++ b/css/admin.scss @@ -1,4 +1,16 @@ #nobootstrap{ + /* CSS Admin PrestaShop */ + * {font-family: Arial,Verdana,Helvetica,sans-serif} + + body { + margin: 0; + padding: 0; + font-size: 12px; + color: #000; + /* text-align: center; + behavior: url(csshover.htc); */ + } + .float {float:left} .floatr {float:right} @@ -57,6 +69,14 @@ font-weight: bold; } + legend, th { + font-family : Arial,Helvetica,sans-serif; + } + + h1, h2, h3, h4, h5, h6 { + font-family : Arial,Helvetica,sans-serif; + } + h1 { font-size: 1.6em; margin: 0 0 .67em 0; @@ -75,7 +95,7 @@ h6 { font-size: 0.67em; } - + h3.blue { color: #268CCD; } @@ -255,8 +275,8 @@ input, textarea, option { color: #000; font-size: 12px; - margin: 0 10px 0 0; - padding: 0 8px; + margin: 0; + padding: 0; } input[type="text"], input[type="password"], input[type="file"], textarea { @@ -548,6 +568,12 @@ background: url(../img/admin/warning.gif) no-repeat 0 0; } + #blockNewVersionCheck .warn h3 { + padding: 0 0 0 5px; + margin: 0px; + background: none; + } + #content .error h3 { padding: 0 0 0 20px; background: url(../img/admin/warning.gif) no-repeat 0 0; @@ -2374,5 +2400,5 @@ .id_customization .customization_field { min-width: 205px; width: 205px; - } +} } \ No newline at end of file