diff --git a/admin-dev/themes/flashyturtle/admin.css b/admin-dev/themes/flashyturtle/admin.css deleted file mode 100644 index 40a806415..000000000 --- a/admin-dev/themes/flashyturtle/admin.css +++ /dev/null @@ -1,93 +0,0 @@ -body{background:#EFEFEF url(../../../img/admin/bg.png)} -#top_container{background:url(bg-top.png) repeat-x 0 -60px;margin:0;padding:0} -div#header_infos span{color:#FFF} -#header_infos{float:left;font-size:10px;margin:10px 20px 4px 0;width:360px;height:43px} -div#header_infos a#header_shopname span{display:block;font-size:24px;overflow:hidden;margin-bottom:-8px;height:28px} -div#header_infos a#header_logout span{text-decoration:underline} -div#header_infos a#header_foaccess span{text-decoration:none} -div#header_infos a {color:#FFF;} -#header_search{background:url(searchbar.png) no-repeat;float:right;height:39px;width:356px} -#header_search #bo_query{background:transparent;border:none;color:#FFF;float:left;height:16px;line-height:16px;margin:10px 0 0 30px;outline:0;vertical-align:middle;width:140px} -#header_search #bo_search_type{background:#ECECEC;border:#000;float:left;height:21px;line-height:21px;margin-top:9px;vertical-align:middle;width:90px} -#header_search #bo_search_submit{background:url(searchbutton.png) no-repeat;border:none;color:#FFF;cursor:pointer;float:left;font-size:10px;font-weight:700;height:24px;line-height:24px;margin:7px 0 0 2px;outline:0;padding-bottom:2px;width:79px} -#header_search #bo_search_submit:hover{background-position:0 -25px} -#header_search #bo_search_submit:active{background-position:0 -50px} -#header_quick{background:url(bg-quick.png) no-repeat;float:right;height:39px;margin-right:1px;width:175px} -#header_quick #quick_select{background:#ECECEC;border:#000;height:21px;line-height:21px;margin:8px 0 0 30px;vertical-align:middle;width:140px} -#header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:39px;margin-right:1px;width:39px} -.button{background:#83CA38 url(center_btn_filter.png) repeat-x 0px -1px;border:1px solid #364A14;border-left:1px solid #475B25;border-top:1px solid #475B25;color:#FFF;cursor:pointer;padding:0 5px;height:24px} -.button[disabled=disabled]{background:#E2EBEE;color:#000000} -input.button[disabled=disabled]:hover{background-color:#FFF6D3} -.button:hover{background-position:0 -27px} -a.button{padding:3px 15px;color:white;} -.table{border:1px solid #416110;padding:0} -.table th a{text-decoration:underline} -.table a:hover{text-decoration:none} -.table tr th{background:#7AB51D url(thead.png) repeat-x top left;border-bottom:1px solid #416110;color:#FFF;padding:4px 6px} -.table tr td{border-bottom:1px solid #F0EADA;color:#963;font-size:.9em;height:23px;padding:0 4px 0 6px} -.table tr.action_details td{background:#FAFAFA;} -.table tr.alt_row.action_details td{background:#E8E8E8;} -.table tr td.empty{border-bottom:none;background:white!important} -.table tr td.first{border-left:1px solid #DEDEDE} -.table tr td.last{border-right:1px solid #DEDEDE} -.table tr.small td{height:15px} -.table tr.last td{border-bottom:none} -.alt_row{background-color:#EFEFEF} -.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-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px} -.cat_bar a{font-weight:700} -fieldset{background:#FFF;border:1px solid #8E8E8E;font-size:1.1em;margin:0;padding:1em} -legend{background:#7AB51D url(thead.png) repeat-x top left;border:1px solid #364A14;font-weight:700;margin:0;padding:.2em .5em;text-align:left;color:#FFFFFF} -#menu{float:left;height:35px;line-height:normal;margin:10px 0 0;*margin:7px 0 0;padding:0;width:100%} -#menu li{background:url(bg-tab.png) repeat-x;float:left;height:35px;list-style:none;margin:0 1px 0 0} -#menu li a{color:#FFF;display:block;height:35px;padding:6px 8px 4px 0;} -#menu img{display:inline;padding:0 3px 0 6px;vertical-align:top;width:16px;height:16px} -#menu li.active{background-position:0 -70px} -#menu li.active a{color:#000} -#submenu{clear:both;color:#666;margin:0;padding:0;border-bottom: #A2A8B2 1px solid} -.withLeftBorder{background:url(bg-submenu.png) repeat-x #DADADA;background-position:0 -1px} -#submenu li{display:inline;list-style:none;margin:0;background:transparent url(separator_subnav.png) no-repeat right 0;padding-left:8px;padding-right:8px;margin-top:8px;float:left;height:29px} -#submenu li a{text-decoration:underline} -#menu li{_height:32px;_padding-top:3px} -#menu li a{_display:inline;_padding:6px 6px 4px} -.tab-page {border:1px solid #383838;background:#F6F6F6} -.tab-row .tab.selected {border:1px solid #383838;background:#812143} -.tab-row .tab.selected a{color:black} -.tab-row .tab {border:1px solid #FDFDFD;background:#EFEFEF;height:24px;line-height:24px;vertical-align:middle} -hr {height: 1px;color:#DEDEDE;background-color:#DEDEDE} -#footer {height:40px;background:#DDDDDD url("footer-bg.png") repeat-x scroll left bottom;border:1px solid #383838;font-size:12px;clear:both;font-size:0.9em;color:#666666} -#content {background-color:#FFF;border-left:1px solid #383838;border-right:1px solid #383838} -input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #416110} -select {border: 1px solid #416110} -select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA} -.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;} -a.action_module{color: #488C40;text-decoration: underline;} -a.header_module_toggle{font-weight: bold;color: #812143;display:block;} -a.module_toggle_all{color:#FFF;text-decoration:none;display:inherit;} -.nbr_module{float:right;margin-right:10px;font-style:italic;font-size:12px;color: #812143;} - -.autoupgradeSteps div { line-height: 30px; } -.upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;} -#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;} -#upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;} -.button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;} -.processing {overflow: auto;} - -#header_infos {width: 445px;} -#header_shopname {float: left;width: 300px;} -#employee_links {float: left;clear: both;margin-top: 10px;} -#notifs_icon_wrapper {float: left;position: relative;margin-top: 8px;} -.notifs {float: left;position: relative; cursor: pointer;margin: 0px 5px;width: 18px;height: 15px;color:black;} -#orders_notif {background: url("notif_order.png") no-repeat left top;} -#customers_notif {background: url("notif_customer.png") no-repeat left top;} -#messages_notif {background: url("notif_message.png") no-repeat left top;} -.number_wrapper {color: black;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;display: block;padding: 0 2px;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 {display: none;cursor:auto; position: absolute;top: 20px;left: 0;width:300px;background-color: white;border:2px solid #E0E0E0;padding: 10px;} -.notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 2px solid #E0E0E0;} -.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;color: black;} -.notifs_wrapper p {font-size: 12px;padding-top:8px;margin:0;border-top: 2px solid #E0E0E0;} -.notifs_wrapper p.no_notifs {border: none;} \ No newline at end of file diff --git a/admin-dev/themes/flashyturtle/bg-lang.png b/admin-dev/themes/flashyturtle/bg-lang.png deleted file mode 100644 index e099979d2..000000000 Binary files a/admin-dev/themes/flashyturtle/bg-lang.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/bg-quick.png b/admin-dev/themes/flashyturtle/bg-quick.png deleted file mode 100644 index 96503c8f8..000000000 Binary files a/admin-dev/themes/flashyturtle/bg-quick.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/bg-submenu.png b/admin-dev/themes/flashyturtle/bg-submenu.png deleted file mode 100644 index 59e2b8af6..000000000 Binary files a/admin-dev/themes/flashyturtle/bg-submenu.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/bg-subtab.png b/admin-dev/themes/flashyturtle/bg-subtab.png deleted file mode 100644 index 2ae767a20..000000000 Binary files a/admin-dev/themes/flashyturtle/bg-subtab.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/bg-tab.png b/admin-dev/themes/flashyturtle/bg-tab.png deleted file mode 100644 index 6214b2094..000000000 Binary files a/admin-dev/themes/flashyturtle/bg-tab.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/bg-top.png b/admin-dev/themes/flashyturtle/bg-top.png deleted file mode 100644 index 75fe354e0..000000000 Binary files a/admin-dev/themes/flashyturtle/bg-top.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/button-bg.png b/admin-dev/themes/flashyturtle/button-bg.png deleted file mode 100644 index 3708ba053..000000000 Binary files a/admin-dev/themes/flashyturtle/button-bg.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/center_btn_filter.png b/admin-dev/themes/flashyturtle/center_btn_filter.png deleted file mode 100644 index f7009ad52..000000000 Binary files a/admin-dev/themes/flashyturtle/center_btn_filter.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/footer-bg.png b/admin-dev/themes/flashyturtle/footer-bg.png deleted file mode 100644 index 227aa8a5e..000000000 Binary files a/admin-dev/themes/flashyturtle/footer-bg.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/header_module.png b/admin-dev/themes/flashyturtle/header_module.png deleted file mode 100644 index 98a824487..000000000 Binary files a/admin-dev/themes/flashyturtle/header_module.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/index.php b/admin-dev/themes/flashyturtle/index.php deleted file mode 100644 index 4e2611d37..000000000 --- a/admin-dev/themes/flashyturtle/index.php +++ /dev/null @@ -1,36 +0,0 @@ - -* @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/admin-dev/themes/flashyturtle/notif_customer.png b/admin-dev/themes/flashyturtle/notif_customer.png deleted file mode 100644 index 8a48039e7..000000000 Binary files a/admin-dev/themes/flashyturtle/notif_customer.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/notif_message.png b/admin-dev/themes/flashyturtle/notif_message.png deleted file mode 100644 index 517a5a474..000000000 Binary files a/admin-dev/themes/flashyturtle/notif_message.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/notif_order.png b/admin-dev/themes/flashyturtle/notif_order.png deleted file mode 100644 index e72645c99..000000000 Binary files a/admin-dev/themes/flashyturtle/notif_order.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/searchbar.png b/admin-dev/themes/flashyturtle/searchbar.png deleted file mode 100644 index dc69699d1..000000000 Binary files a/admin-dev/themes/flashyturtle/searchbar.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/searchbutton.png b/admin-dev/themes/flashyturtle/searchbutton.png deleted file mode 100644 index 30cc017e2..000000000 Binary files a/admin-dev/themes/flashyturtle/searchbutton.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/separator_subnav.png b/admin-dev/themes/flashyturtle/separator_subnav.png deleted file mode 100644 index f14a7ca0c..000000000 Binary files a/admin-dev/themes/flashyturtle/separator_subnav.png and /dev/null differ diff --git a/admin-dev/themes/flashyturtle/thead.png b/admin-dev/themes/flashyturtle/thead.png deleted file mode 100644 index 8820a89e9..000000000 Binary files a/admin-dev/themes/flashyturtle/thead.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/admin.css b/admin-dev/themes/oldschool/admin.css deleted file mode 100644 index 8522778d2..000000000 --- a/admin-dev/themes/oldschool/admin.css +++ /dev/null @@ -1,89 +0,0 @@ -body{background:#EFEFEF} -#top_container{margin:0;padding:0} -#header_infos{float:left;font-size:10px;margin:10px 20px 4px 0;width:380px;height:40px} -#header_infos #header_shopname span{display:block;font-size:24px;height:28px;overflow:hidden;margin-bottom:-8px} -#header_infos #header_logout{text-decoration:underline} -#header_infos #header_foaccess{text-decoration:none} -#header_search{float:right;height:39px;width:356px} -#header_search #bo_query{float:left;height:16px;line-height:16px;margin:8px 2px 0 30px;vertical-align:middle;width:140px} -#header_search #bo_search_type{float:left;height:21px;line-height:21px;margin:8px 2px 0 0;vertical-align:middle;width:90px} -#header_search #bo_search_submit{cursor:pointer;float:left;font-weight:700;margin:7px 0 0 2px;width:79px} -#header_quick{float:right;height:39px;margin-right:1px;width:175px} -#header_quick #quick_select{margin:8px 0 0 20px;vertical-align:middle;width:140px} -#header_shoplist{float: right;} -#header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px} -.button{background-color:#FFF6D3;border:1px solid #DFD5AF;border-left:1px solid #FFF6D3;border-top:1px solid #FFF6D3;color:#268CCD;padding:3px} -.button[disabled=disabled]{color:#8C8C8C} -input.button[disabled=disabled]:hover{background-color:#FFF6D3} -.button:hover{background-color:#F0EBD6} -.table{border:1px solid #DFD5C3;padding:0} -.table th a{text-decoration:underline} -.table a:hover{text-decoration:none} -.table tr th{background:#F4E6C9 url(news-bg.gif) repeat-x top left;padding:4px 6px} -.table tr td{border-bottom:1px solid #DEDEDE;color:#963;font-size:.9em;height:23px;padding:0 4px 0 6px} -.table tr.action_details td{background:#FAFAFA;} -.table tr.alt_row.action_details td{background:#E8E8E8;} -.table tr td.empty{border-bottom:none;background:white!important} -.table tr td.first{border-left:1px solid #DEDEDE} -.table tr td.last{border-right:1px solid #DEDEDE} -.table tr.small td{height:15px} -.table tr.last td{border-bottom:none} -.alt_row{background-color:#EFEFEF} -.not_alt_row{background-color:#FFF} -.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-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px} -.cat_bar a{font-weight:700} -fieldset{background:#FFFFF0;border:1px solid #DFD5C3;font-size:1.1em;margin:0;padding:1em} -legend{background:#FFF6D3;border:1px solid #DFD5C3;font-weight:700;margin:0;padding:.2em .5em;text-align:left} -#menu{float:left;height:30px;line-height:normal;margin:10px 0 0;*margin:7px 0 0;padding:0;width:100%;padding:0 1px} -#menu li{background:url(bg-tab.png) repeat-x 0 -2px;float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block;border:1px solid #999999;-moz-border-radius-topright:6px;-moz-border-radius-topleft:6px;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px} -#menu li a{color:#000;display:block;height:20px;padding:8px 6px 4px 0;font-weight:bold;font-size:0.95em;} -#menu img{display:inline;padding:0 3px 0 6px;vertical-align:top;width:16px;height:16px} -#menu li.active,#menu li:hover{background-position:0 -38px;white-space:nowrap;} -#menu li.active a{color:#000} -#submenu{background:#ECEADE;clear:both;color:#666;margin:0;padding:0;border:1px solid #999999} -.withLeftBorder{background:transparent url(separator_subnav.png) no-repeat 0 5px} -#submenu li{display:inline;list-style:none;margin:0;background:transparent url(separator_subnav.png) no-repeat right 0;padding-left:7px;padding-right:7px;margin-top:8px;float:left;height:29px} -#submenu li a{text-decoration:underline} -#menu li{_height:32px;_padding-top:3px} -#menu li a{_display:inline;_padding:6px 5px 4px 0} -.tab-page {border:1px solid #ccc;background:#FFFFF0} -.tab-row .tab.selected {border:1px solid #ccc;background:#FFF6D3;margin:1px -3px -3px 0px;top:-2px} -.tab-row .tab {background:#EFEFEF} -hr {height: 1px;color:#E0D0B1;background-color:#E0D0B1} -#footer {height:40px;background:#ECEADE url(footer-bg.png) repeat-x scroll left bottom;border:1px solid #999999;font-size:12px;clear:both;font-size:0.9em;color:#666666} -#content {background-color:#FFF;border-left:1px solid #999999;border-right:1px solid #999999} -input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #E0D0B1} -select {border: 1px solid #E0D0B1} -select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA} -.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;} -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;} -.nbr_module{float:right;margin-right:10px;font-style:italic;font-size:12px;color: #268CCD;} - -.autoupgradeSteps div { line-height: 30px; } -.upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;} -#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;} -#upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;} -.button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;} -.processing {overflow: auto;} - -#header_infos {width: 445px;} -#header_shopname {float: left;width: 300px;} -#employee_links {float: left;clear: both;margin-top: 10px;} -#notifs_icon_wrapper {float: left;position: relative;margin-top: 8px;} -.notifs {float: left;position: relative; cursor: pointer;margin: 0px 5px;width: 18px;height: 15px;} -#orders_notif {background: url("notif_order.png") no-repeat left top;} -#customers_notif {background: url("notif_customer.png") no-repeat left top;} -#messages_notif {background: url("notif_message.png") no-repeat left top;} -.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;display: block;padding: 0 2px;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 {display: none;cursor:auto; position: absolute;top: 20px;left: 0;width:300px;background-color: white;border:2px solid #E0E0E0;padding: 10px;color: black;} -.notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 2px solid #E0E0E0;} -.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;color: black;} -.notifs_wrapper p {font-size: 12px;padding-top:8px;margin:0;border-top: 2px solid #E0E0E0;} -.notifs_wrapper p.no_notifs {border: none;} \ No newline at end of file diff --git a/admin-dev/themes/oldschool/bg-lang.png b/admin-dev/themes/oldschool/bg-lang.png deleted file mode 100644 index 5db32699e..000000000 Binary files a/admin-dev/themes/oldschool/bg-lang.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/bg-quick.png b/admin-dev/themes/oldschool/bg-quick.png deleted file mode 100644 index 4acbb75b4..000000000 Binary files a/admin-dev/themes/oldschool/bg-quick.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/bg-subtab.png b/admin-dev/themes/oldschool/bg-subtab.png deleted file mode 100644 index fdc1b1180..000000000 Binary files a/admin-dev/themes/oldschool/bg-subtab.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/bg-tab.png b/admin-dev/themes/oldschool/bg-tab.png deleted file mode 100644 index 69f70da30..000000000 Binary files a/admin-dev/themes/oldschool/bg-tab.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/button-bg.png b/admin-dev/themes/oldschool/button-bg.png deleted file mode 100644 index bbde5ed57..000000000 Binary files a/admin-dev/themes/oldschool/button-bg.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/footer-bg.png b/admin-dev/themes/oldschool/footer-bg.png deleted file mode 100644 index a72c8ba8d..000000000 Binary files a/admin-dev/themes/oldschool/footer-bg.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/header_module.png b/admin-dev/themes/oldschool/header_module.png deleted file mode 100644 index afaaae61d..000000000 Binary files a/admin-dev/themes/oldschool/header_module.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/index.php b/admin-dev/themes/oldschool/index.php deleted file mode 100644 index 4e2611d37..000000000 --- a/admin-dev/themes/oldschool/index.php +++ /dev/null @@ -1,36 +0,0 @@ - -* @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/admin-dev/themes/oldschool/news-bg.gif b/admin-dev/themes/oldschool/news-bg.gif deleted file mode 100644 index 9adbd05e5..000000000 Binary files a/admin-dev/themes/oldschool/news-bg.gif and /dev/null differ diff --git a/admin-dev/themes/oldschool/notif_customer.png b/admin-dev/themes/oldschool/notif_customer.png deleted file mode 100644 index 8a48039e7..000000000 Binary files a/admin-dev/themes/oldschool/notif_customer.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/notif_message.png b/admin-dev/themes/oldschool/notif_message.png deleted file mode 100644 index 517a5a474..000000000 Binary files a/admin-dev/themes/oldschool/notif_message.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/notif_order.png b/admin-dev/themes/oldschool/notif_order.png deleted file mode 100644 index e72645c99..000000000 Binary files a/admin-dev/themes/oldschool/notif_order.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/searchbar.png b/admin-dev/themes/oldschool/searchbar.png deleted file mode 100644 index 26b93aeef..000000000 Binary files a/admin-dev/themes/oldschool/searchbar.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/searchbutton.gif b/admin-dev/themes/oldschool/searchbutton.gif deleted file mode 100644 index a2f27ddf9..000000000 Binary files a/admin-dev/themes/oldschool/searchbutton.gif and /dev/null differ diff --git a/admin-dev/themes/oldschool/separator_subnav.png b/admin-dev/themes/oldschool/separator_subnav.png deleted file mode 100644 index 0d2a18ad0..000000000 Binary files a/admin-dev/themes/oldschool/separator_subnav.png and /dev/null differ diff --git a/admin-dev/themes/oldschool/submenu-bg.gif b/admin-dev/themes/oldschool/submenu-bg.gif deleted file mode 100644 index c3de2cfc5..000000000 Binary files a/admin-dev/themes/oldschool/submenu-bg.gif and /dev/null differ diff --git a/admin-dev/themes/oldschool/tab_right.gif b/admin-dev/themes/oldschool/tab_right.gif deleted file mode 100644 index 82740efa4..000000000 Binary files a/admin-dev/themes/oldschool/tab_right.gif and /dev/null differ diff --git a/admin-dev/themes/oldschool/thead.png b/admin-dev/themes/oldschool/thead.png deleted file mode 100644 index afaaae61d..000000000 Binary files a/admin-dev/themes/oldschool/thead.png and /dev/null differ diff --git a/admin-dev/themes/origins/admin.css b/admin-dev/themes/origins/admin.css deleted file mode 100644 index 2271f637f..000000000 --- a/admin-dev/themes/origins/admin.css +++ /dev/null @@ -1,90 +0,0 @@ -body{background:#EFEFEF url(../../../img/admin/bg.png)} -#top_container{background:url(bg-top.png) repeat-x 0 -60px;margin:0;padding:0} -div#header_infos span{color:#FFF} -#header_infos{float:left;font-size:10px;margin:10px 20px 4px 0;width:360px;height:43px} -div#header_infos a#header_shopname span{display:block;font-size:24px;overflow:hidden;margin-bottom:-8px;height:28px} -div#header_infos a#header_logout span{text-decoration:underline} -div#header_infos a#header_foaccess span{text-decoration:none} -div#header_infos a {color:#FFF;} -#header_search{background:url(searchbar.png) no-repeat;float:right;height:39px;width:356px} -#header_search #bo_query{background:transparent;border:none;color:#FFF;float:left;height:16px;line-height:16px;margin:10px 0 0 30px;outline:0;vertical-align:middle;width:140px} -#header_search #bo_search_type{background:#ECECEC;border:#000;float:left;height:21px;line-height:21px;margin-top:9px;vertical-align:middle;width:90px} -#header_search #bo_search_submit{background:url(searchbutton.png) no-repeat;border:none;color:#000;cursor:pointer;float:left;font-size:10px;font-weight:700;height:24px;line-height:24px;margin:7px 0 0 2px;outline:0;padding-bottom:2px;width:79px} -#header_search #bo_search_submit:hover{background-position:0 -24px} -#header_quick{background:url(bg-quick.png) no-repeat;float:right;height:39px;margin-right:1px;width:175px} -#header_quick #quick_select{background:#ECECEC;border:#000;height:21px;line-height:21px;margin:8px 0 0 30px;vertical-align:middle;width:140px} -#header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:39px;margin-right:1px;width:39px} -.button{background-color:#FFF6D3;border:1px solid #DFD5AF;border-left:1px solid #FFF6D3;border-top:1px solid #FFF6D3;color:#268CCD;padding:3px} -.button[disabled=disabled]{color:#8C8C8C} -input.button[disabled=disabled]:hover{background-color:#FFF6D3} -.button:hover{background-color:#F0EBD6} -.table{border:1px solid #DFD5C3;padding:0} -.table th a{text-decoration:underline} -.table a:hover{text-decoration:none} -.table tr th{background:#F4E6C9 url(news-bg.gif) repeat-x top left;padding:4px 6px} -.table tr td{border-bottom:1px solid #DEDEDE;color:#963;font-size:.9em;height:23px;padding:0 4px 0 6px} -.table tr.action_details td{background:#FAFAFA;} -.table tr.alt_row.action_details td{background:#E8E8E8;} -.table tr td.empty{border-bottom:none;background:white!important} -.table tr td.first{border-left:1px solid #DEDEDE} -.table tr td.last{border-right:1px solid #DEDEDE} -.table tr.small td{height:15px} -.table tr.last td{border-bottom:none} -.alt_row{background-color:#EFEFEF} -.path_bar{background-color:#E2EBEE;border:1px solid #999;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 #999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px} -.cat_bar a{font-weight:700} -fieldset{background:#FFFFF0;border:1px solid #DFD5C3;font-size:1.1em;margin:0;padding:1em} -legend{background:#FFF6D3;border:1px solid #DFD5C3;font-weight:700;margin:0;padding:.2em .5em;text-align:left} -#menu{float:left;height:35px;line-height:normal;margin:10px 0 0;*margin:7px 0 0;padding:0;width:100%;} -#menu li{background:url(bg-tab.png) repeat-x 0 -2px;float:left;height:35px;list-style:none;margin:0 1px 0 0;list-style:none;display:block;-moz-border-radius-topright:6px;-moz-border-radius-topleft:6px;-webkit-border-top-right-radius:6px;-webkit-border-top-left-radius:6px} -#menu li a{color:#000;display:block;height:20px;padding:6px 8px 4px 0;} -#menu img{display:inline;padding:0 3px 0 6px;vertical-align:top;width:16px;height:16px} -#menu li.active{background-position:0 -38px;white-space:nowrap;} -#menu li.active a{color:#000} -#submenu{clear:both;color:#666;margin:0;padding:0;border-bottom: #A2A8B2 1px solid} -.withLeftBorder{background:url(bg-submenu.png) repeat-x #DADADA;background-position:0 -1px} -#submenu li{display:inline;list-style:none;margin:0;background:transparent url(separator_subnav.png) no-repeat right 0;padding-left:8px;padding-right:8px;margin-top:8px;float:left;height:29px} -#submenu li a{text-decoration:underline} -#menu li{_height:32px;_padding-top:3px} -#menu li a{_display:inline;_padding:6px 5px 4px 0} -.tab-page {border:1px solid #ccc;background:#FFFFF0} -.tab-row .tab.selected {border:1px solid #ccc;background:#FFF6D3;margin:1px -3px -3px 0px;top:-2px} -.tab-row .tab {background:#EFEFEF} -hr {height: 1px;color:#E0D0B1;background-color:#E0D0B1} -#footer {height:40px;background:#ECEADE url(footer-bg.png) repeat-x scroll left bottom;border:1px solid #999999;font-size:12px;clear:both;font-size:0.9em;color:#666666} -#content {background-color:#FFF;border-left:1px solid #999999;border-right:1px solid #999999} -input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #E0D0B1} -select {border: 1px solid #E0D0B1} -select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA} -.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;} -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;} -.nbr_module{float:right;margin-right:10px;font-style:italic;font-size:12px;color: #268CCD;} - -.autoupgradeSteps div { line-height: 30px; } -.upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;} -#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;} -#upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;} -.button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;} -.processing {overflow: auto;} - -#header_infos {width: 445px;} -#header_shopname {float: left;width: 300px;} -#employee_links {float: left;clear: both;margin-top: 10px;} -#notifs_icon_wrapper {float: left;position: relative;margin-top: 8px;} -.notifs {float: left;position: relative; cursor: pointer;margin: 0px 5px;width: 18px;height: 15px;} -#orders_notif {background: url("notif_order.png") no-repeat left top;} -#customers_notif {background: url("notif_customer.png") no-repeat left top;} -#messages_notif {background: url("notif_message.png") no-repeat left top;} -.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;display: block;padding: 0 2px;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 {display: none;cursor:auto; position: absolute;top: 20px;left: 0;width:300px;background-color: white;border:2px solid #E0E0E0;padding: 10px;color: black;} -.notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 2px solid #E0E0E0;} -.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;color: black;} -.notifs_wrapper p {font-size: 12px;padding-top:8px;margin:0;border-top: 2px solid #E0E0E0;} -.notifs_wrapper p.no_notifs {border: none;} \ No newline at end of file diff --git a/admin-dev/themes/origins/bg-lang.png b/admin-dev/themes/origins/bg-lang.png deleted file mode 100644 index a1f547194..000000000 Binary files a/admin-dev/themes/origins/bg-lang.png and /dev/null differ diff --git a/admin-dev/themes/origins/bg-quick.png b/admin-dev/themes/origins/bg-quick.png deleted file mode 100644 index 4acbb75b4..000000000 Binary files a/admin-dev/themes/origins/bg-quick.png and /dev/null differ diff --git a/admin-dev/themes/origins/bg-submenu.png b/admin-dev/themes/origins/bg-submenu.png deleted file mode 100644 index ba30c6b36..000000000 Binary files a/admin-dev/themes/origins/bg-submenu.png and /dev/null differ diff --git a/admin-dev/themes/origins/bg-subtab.png b/admin-dev/themes/origins/bg-subtab.png deleted file mode 100644 index fdc1b1180..000000000 Binary files a/admin-dev/themes/origins/bg-subtab.png and /dev/null differ diff --git a/admin-dev/themes/origins/bg-tab.png b/admin-dev/themes/origins/bg-tab.png deleted file mode 100644 index f2dcf116f..000000000 Binary files a/admin-dev/themes/origins/bg-tab.png and /dev/null differ diff --git a/admin-dev/themes/origins/bg-top.png b/admin-dev/themes/origins/bg-top.png deleted file mode 100644 index a07fbec98..000000000 Binary files a/admin-dev/themes/origins/bg-top.png and /dev/null differ diff --git a/admin-dev/themes/origins/button-bg.png b/admin-dev/themes/origins/button-bg.png deleted file mode 100644 index bbde5ed57..000000000 Binary files a/admin-dev/themes/origins/button-bg.png and /dev/null differ diff --git a/admin-dev/themes/origins/footer-bg.png b/admin-dev/themes/origins/footer-bg.png deleted file mode 100644 index a72c8ba8d..000000000 Binary files a/admin-dev/themes/origins/footer-bg.png and /dev/null differ diff --git a/admin-dev/themes/origins/header_module.png b/admin-dev/themes/origins/header_module.png deleted file mode 100644 index afaaae61d..000000000 Binary files a/admin-dev/themes/origins/header_module.png and /dev/null differ diff --git a/admin-dev/themes/origins/img/index.php b/admin-dev/themes/origins/img/index.php deleted file mode 100644 index dce6b30f5..000000000 --- a/admin-dev/themes/origins/img/index.php +++ /dev/null @@ -1,36 +0,0 @@ - -* @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/admin-dev/themes/origins/img/t/AdminAddonsCatalog.gif b/admin-dev/themes/origins/img/t/AdminAddonsCatalog.gif deleted file mode 100644 index 2104e0bed..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminAddonsCatalog.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminAddonsMyAccount.gif b/admin-dev/themes/origins/img/t/AdminAddonsMyAccount.gif deleted file mode 100644 index 2104e0bed..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminAddonsMyAccount.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminCatalog.gif b/admin-dev/themes/origins/img/t/AdminCatalog.gif deleted file mode 100644 index 34e1aa5f4..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminCatalog.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminCustomers.gif b/admin-dev/themes/origins/img/t/AdminCustomers.gif deleted file mode 100644 index 99650c04b..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminCustomers.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminEmployees.gif b/admin-dev/themes/origins/img/t/AdminEmployees.gif deleted file mode 100644 index 1950e2ea4..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminEmployees.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminModules.gif b/admin-dev/themes/origins/img/t/AdminModules.gif deleted file mode 100644 index 2104e0bed..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminModules.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminModulesPositions.gif b/admin-dev/themes/origins/img/t/AdminModulesPositions.gif deleted file mode 100644 index 8b043ca74..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminModulesPositions.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminOrders.gif b/admin-dev/themes/origins/img/t/AdminOrders.gif deleted file mode 100644 index 92067bd9e..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminOrders.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminPayment.gif b/admin-dev/themes/origins/img/t/AdminPayment.gif deleted file mode 100644 index 89de86e3c..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminPayment.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminPreferences.gif b/admin-dev/themes/origins/img/t/AdminPreferences.gif deleted file mode 100644 index e3274c83d..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminPreferences.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminShipping.gif b/admin-dev/themes/origins/img/t/AdminShipping.gif deleted file mode 100644 index 2a85c456c..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminShipping.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminStats.gif b/admin-dev/themes/origins/img/t/AdminStats.gif deleted file mode 100644 index 16408519c..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminStats.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminStockMvt.gif b/admin-dev/themes/origins/img/t/AdminStockMvt.gif deleted file mode 100755 index 2a85c456c..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminStockMvt.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminStores.gif b/admin-dev/themes/origins/img/t/AdminStores.gif deleted file mode 100644 index 92067bd9e..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminStores.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/AdminTools.gif b/admin-dev/themes/origins/img/t/AdminTools.gif deleted file mode 100644 index d875d9167..000000000 Binary files a/admin-dev/themes/origins/img/t/AdminTools.gif and /dev/null differ diff --git a/admin-dev/themes/origins/img/t/index.php b/admin-dev/themes/origins/img/t/index.php deleted file mode 100644 index 4e2611d37..000000000 --- a/admin-dev/themes/origins/img/t/index.php +++ /dev/null @@ -1,36 +0,0 @@ - -* @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/admin-dev/themes/origins/index.php b/admin-dev/themes/origins/index.php deleted file mode 100644 index 4e2611d37..000000000 --- a/admin-dev/themes/origins/index.php +++ /dev/null @@ -1,36 +0,0 @@ - -* @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/admin-dev/themes/origins/news-bg.gif b/admin-dev/themes/origins/news-bg.gif deleted file mode 100644 index 9adbd05e5..000000000 Binary files a/admin-dev/themes/origins/news-bg.gif and /dev/null differ diff --git a/admin-dev/themes/origins/notif_customer.png b/admin-dev/themes/origins/notif_customer.png deleted file mode 100644 index 8a48039e7..000000000 Binary files a/admin-dev/themes/origins/notif_customer.png and /dev/null differ diff --git a/admin-dev/themes/origins/notif_message.png b/admin-dev/themes/origins/notif_message.png deleted file mode 100644 index 517a5a474..000000000 Binary files a/admin-dev/themes/origins/notif_message.png and /dev/null differ diff --git a/admin-dev/themes/origins/notif_order.png b/admin-dev/themes/origins/notif_order.png deleted file mode 100644 index e72645c99..000000000 Binary files a/admin-dev/themes/origins/notif_order.png and /dev/null differ diff --git a/admin-dev/themes/origins/searchbar.png b/admin-dev/themes/origins/searchbar.png deleted file mode 100644 index 26b93aeef..000000000 Binary files a/admin-dev/themes/origins/searchbar.png and /dev/null differ diff --git a/admin-dev/themes/origins/searchbutton.png b/admin-dev/themes/origins/searchbutton.png deleted file mode 100644 index 31327bf89..000000000 Binary files a/admin-dev/themes/origins/searchbutton.png and /dev/null differ diff --git a/admin-dev/themes/origins/separator_subnav.png b/admin-dev/themes/origins/separator_subnav.png deleted file mode 100644 index 0d2a18ad0..000000000 Binary files a/admin-dev/themes/origins/separator_subnav.png and /dev/null differ diff --git a/admin-dev/themes/origins/tab_right.gif b/admin-dev/themes/origins/tab_right.gif deleted file mode 100644 index 82740efa4..000000000 Binary files a/admin-dev/themes/origins/tab_right.gif and /dev/null differ diff --git a/admin-dev/themes/origins/thead.png b/admin-dev/themes/origins/thead.png deleted file mode 100644 index afaaae61d..000000000 Binary files a/admin-dev/themes/origins/thead.png and /dev/null differ diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php index b680f1a90..3877a61af 100644 --- a/classes/Dispatcher.php +++ b/classes/Dispatcher.php @@ -281,7 +281,7 @@ class DispatcherCore $controllers = self::getControllers($this->controller_directories); if (!isset($controllers[$this->controller])) $this->controller = strtolower($this->controller_not_found); - $this->controller_class = $controllers[$this->controller]; + $controller_class = $controllers[$this->controller]; } // BO dispatch else @@ -292,18 +292,18 @@ class DispatcherCore { // We need controller_not_found to be the camelcase controller name $this->controller = strtolower($this->controller_not_found); - $this->controller_class = $this->controller_not_found; + $controller_class = $this->controller_not_found; } else - $this->controller_class = $controller_row['class_name']; + $controller_class = $controller_row['class_name']; // If Tab/Controller is in module, include it if (!empty($controller_row['module'])) - $controller_type = self::includeModuleClass($controller_row['module'], $this->controller_class); + $controller_type = self::includeModuleClass($controller_row['module'], $controller_class); // If it is an AdminTab, include it - elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$this->controller_class.'.php')) + elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$controller_class.'.php')) { - include(_PS_ADMIN_DIR_.'/tabs/'.$this->controller_class.'.php'); + include(_PS_ADMIN_DIR_.'/tabs/'.$controller_class.'.php'); $controller_type = 'tab'; } // For retrocompatibility with admin/tabs/ old system @@ -311,17 +311,17 @@ class DispatcherCore { require_once(_PS_ADMIN_DIR_.'/functions.php'); $ajaxMode = !empty($_REQUEST['ajaxMode']); - runAdminTab($this->controller_class, $ajaxMode); + runAdminTab($controller_class, $ajaxMode); return; } - $this->controller_class = $this->controller_class.'Controller'; + $controller_class = $controller_class.'Controller'; } // Instantiate controller try { - Controller::getController($this->controller_class)->run(); + Controller::getController($controller_class)->run(); } catch (PrestashopException $e) { diff --git a/classes/Employee.php b/classes/Employee.php index 0f34f1a0f..13eef0f5f 100644 --- a/classes/Employee.php +++ b/classes/Employee.php @@ -59,9 +59,6 @@ class EmployeeCore extends ObjectModel /** @var string employee's chosen theme */ public $bo_theme; - /** @var string / enum hover or click mode */ - public $bo_uimode; - /** @var bool, true */ public $bo_show_screencast; @@ -74,7 +71,7 @@ class EmployeeCore extends ObjectModel protected $fieldsSize = array('lastname' => 32, 'firstname' => 32, 'email' => 128, 'passwd' => 32, 'bo_color' => 32, 'bo_theme' => 32); protected $fieldsValidate = array('lastname' => 'isName', 'firstname' => 'isName', 'email' => 'isEmail', 'id_lang' => 'isUnsignedInt', 'passwd' => 'isPasswdAdmin', 'active' => 'isBool', 'id_profile' => 'isInt', 'bo_color' => 'isColor', 'bo_theme' => 'isGenericName', - 'bo_uimode' => 'isGenericName', 'bo_show_screencast' => 'isBool'); + 'bo_show_screencast' => 'isBool'); protected $table = 'employee'; protected $identifier = 'id_employee'; @@ -112,7 +109,6 @@ class EmployeeCore extends ObjectModel $fields['bo_color'] = pSQL($this->bo_color); $fields['bo_theme'] = pSQL($this->bo_theme); - $fields['bo_uimode'] = pSQL($this->bo_uimode); $fields['bo_show_screencast'] = (int)$this->bo_show_screencast; $fields['active'] = (int)$this->active; diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 50579f0c9..c77541c80 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -183,26 +183,6 @@ class AdminEmployeesControllerCore extends AdminController if ((int)$this->tabAccess['edit']) { - $this->fields_form['input'][] = array( - 'type' => 'radio', - 'label' => $this->l('UI mode:'), - 'name' => 'bo_uimode', - 'required' => false, - 'class' => 't', - 'values' => array( - array( - 'id' => 'uimode_on', - 'value' => 'hover', - 'label' => $this->l('Hover on tabs') - ), - array( - 'id' => 'uimode_off', - 'value' => 'click', - 'label' => $this->l('Click on tabs') - ) - ) - ); - $this->fields_form['input'][] = array( 'type' => 'radio', 'label' => $this->l('Show screencast:'), diff --git a/install-dev/sql/db.sql b/install-dev/sql/db.sql index a8cf76b4f..abc30738a 100644 --- a/install-dev/sql/db.sql +++ b/install-dev/sql/db.sql @@ -653,7 +653,6 @@ CREATE TABLE `PREFIX_employee` ( `stats_date_to` date default NULL, `bo_color` varchar(32) default NULL, `bo_theme` varchar(32) default NULL, - `bo_uimode` ENUM('hover','click') default 'click', `bo_show_screencast` tinyint(1) NOT NULL default '1', `active` tinyint(1) unsigned NOT NULL default '0', `id_last_order` tinyint(1) unsigned NOT NULL default '0', diff --git a/install-dev/sql/upgrade/1.4.5.0.sql b/install-dev/sql/upgrade/1.4.5.0.sql index f5d05001a..43c3d5e1d 100644 --- a/install-dev/sql/upgrade/1.4.5.0.sql +++ b/install-dev/sql/upgrade/1.4.5.0.sql @@ -36,7 +36,7 @@ INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edi ('afterDeleteAttribute', 'On deleting attribute feature value', 'On deleting attribute feature value', 0, 0), ('afterSaveAttribute', 'On saving attribute feature value', 'On saving attribute feature value', 0, 0); -ALTER TABLE `PREFIX_employee` ADD `bo_show_screencast` TINYINT(1) NOT NULL DEFAULT '1' AFTER `bo_uimode`; +ALTER TABLE `PREFIX_employee` ADD `bo_show_screencast` TINYINT(1) NOT NULL DEFAULT '1' AFTER `bo_theme`; UPDATE `PREFIX_country` SET id_zone = (SELECT id_zone FROM `PREFIX_zone` WHERE name = 'Oceania' LIMIT 1) WHERE iso_code = 'KI' LIMIT 1; diff --git a/install-dev/sql/upgrade/1.5.0.1.sql b/install-dev/sql/upgrade/1.5.0.1.sql index 12e6173b3..c62ced319 100644 --- a/install-dev/sql/upgrade/1.5.0.1.sql +++ b/install-dev/sql/upgrade/1.5.0.1.sql @@ -544,3 +544,5 @@ INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) ('P /* PHP:add_new_groups('Non identifié', 'Unidentified'); */; /* PHP:add_new_groups('Invité', 'Guest'); */; + +UPDATE `PREFIX_employee` SET `bo_theme` = 'default'; diff --git a/install-dev/xml/checkShopInfos.php b/install-dev/xml/checkShopInfos.php index a15094976..63401d989 100644 --- a/install-dev/xml/checkShopInfos.php +++ b/install-dev/xml/checkShopInfos.php @@ -235,7 +235,7 @@ if (isFormValid()) $sqlParams[] = "INSERT INTO "._DB_PREFIX_."configuration (name, value, date_add, date_upd) VALUES ('PS_MAIL_SMTP_ENCRYPTION', '".pSQL($_GET['smtpEnc'])."', NOW(), NOW())"; $sqlParams[] = "INSERT INTO "._DB_PREFIX_."configuration (name, value, date_add, date_upd) VALUES ('PS_MAIL_SMTP_PORT', '".pSQL($_GET['smtpPort'])."', NOW(), NOW())"; } - $sqlParams[] = 'INSERT INTO '._DB_PREFIX_.'employee (id_employee, lastname, firstname, email, passwd, last_passwd_gen, bo_theme, active, id_profile, id_lang, bo_show_screencast) VALUES (NULL, \''.pSQL(ToolsInstall::ucfirst($_GET['infosName'])).'\', \''.pSQL(ToolsInstall::ucfirst($_GET['infosFirstname'])).'\', \''.pSQL($_GET['infosEmail']).'\', \''.md5(pSQL(_COOKIE_KEY_.$_GET['infosPassword'])).'\', \''.date('Y-m-d h:i:s', strtotime('-360 minutes')).'\', \'oldschool\', 1, 1, (SELECT `value` FROM `'._DB_PREFIX_.'configuration` WHERE `name` = \'PS_LANG_DEFAULT\' LIMIT 1), 1)'; + $sqlParams[] = 'INSERT INTO '._DB_PREFIX_.'employee (id_employee, lastname, firstname, email, passwd, last_passwd_gen, bo_theme, active, id_profile, id_lang, bo_show_screencast) VALUES (NULL, \''.pSQL(ToolsInstall::ucfirst($_GET['infosName'])).'\', \''.pSQL(ToolsInstall::ucfirst($_GET['infosFirstname'])).'\', \''.pSQL($_GET['infosEmail']).'\', \''.md5(pSQL(_COOKIE_KEY_.$_GET['infosPassword'])).'\', \''.date('Y-m-d h:i:s', strtotime('-360 minutes')).'\', \'default\', 1, 1, (SELECT `value` FROM `'._DB_PREFIX_.'configuration` WHERE `name` = \'PS_LANG_DEFAULT\' LIMIT 1), 1)'; $sqlParams[] = 'INSERT INTO '._DB_PREFIX_.'employee_shop (id_employee, id_shop) VALUES (1 ,1)'; $sqlParams[] = 'INSERT INTO '._DB_PREFIX_.'contact (id_contact, email, customer_service) VALUES (NULL, \''.pSQL($_GET['infosEmail']).'\', 1), (NULL, \''.pSQL($_GET['infosEmail']).'\', 1)'; diff --git a/install-new/data/db_structure.sql b/install-new/data/db_structure.sql index 595339222..d0bff52f3 100644 --- a/install-new/data/db_structure.sql +++ b/install-new/data/db_structure.sql @@ -653,7 +653,6 @@ CREATE TABLE `PREFIX_employee` ( `stats_date_to` date default NULL, `bo_color` varchar(32) default NULL, `bo_theme` varchar(32) default NULL, - `bo_uimode` ENUM('hover','click') default 'click', `bo_show_screencast` tinyint(1) NOT NULL default '1', `active` tinyint(1) unsigned NOT NULL default '0', `id_last_order` tinyint(1) unsigned NOT NULL default '0', diff --git a/install-new/upgrade/sql/1.4.5.0.sql b/install-new/upgrade/sql/1.4.5.0.sql index f5d05001a..43c3d5e1d 100644 --- a/install-new/upgrade/sql/1.4.5.0.sql +++ b/install-new/upgrade/sql/1.4.5.0.sql @@ -36,7 +36,7 @@ INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edi ('afterDeleteAttribute', 'On deleting attribute feature value', 'On deleting attribute feature value', 0, 0), ('afterSaveAttribute', 'On saving attribute feature value', 'On saving attribute feature value', 0, 0); -ALTER TABLE `PREFIX_employee` ADD `bo_show_screencast` TINYINT(1) NOT NULL DEFAULT '1' AFTER `bo_uimode`; +ALTER TABLE `PREFIX_employee` ADD `bo_show_screencast` TINYINT(1) NOT NULL DEFAULT '1' AFTER `bo_theme`; UPDATE `PREFIX_country` SET id_zone = (SELECT id_zone FROM `PREFIX_zone` WHERE name = 'Oceania' LIMIT 1) WHERE iso_code = 'KI' LIMIT 1;