@@ -45,7 +45,7 @@
- ![]()
+ 
Awsome. Astonishingly Beautiful.
Professional themes and building blocks
- ![]()
+ 
@@ -86,16 +86,16 @@ references, "our team" page, blogs, newsletters, etc.
Traditional eCommerce and CMS have poor backends as it's not their - core focus. The OpenERP integration allows you to benefit from the + core focus. With the OpenERP integration, you benefit from the best management software to follow-up on your orders, your jobs applicants, your leads, etc.
- You don't need anymore to synchronize your management software and - your ecommerce. + You don't have to synchronize your management software and + your ecommerce. It works out-of-the-box.
- ![]()
+ 
@@ -106,7 +106,7 @@
Responsive content on all pages
- ![]()
+ 
@@ -139,7 +139,7 @@
- ![]()
+ 
The building block approach allows the website to remain clean - after the end-users start creating new contents. + after the end-users start creating new contents. The template + editor allows advanced customization without development.
- ![]()
+ 
+
+Fuild Grid Layouting
+Organize building blocks easily
+
+
+
+ 
+
+
+
+
+ + Design perfect pages by drag and droping building blocks and scale + them to fit the layout you are looking for. +
+ Building blocks are based on a responsive, mobile friendly fluid + grid system that appropriately scales up to 12 columns as the + device or viewport size increases. +
+Fully Integrated With Others Apps
Get hundreds of open source apps for free
diff --git a/addons/website/static/description/website_edit.png b/addons/website/static/description/website_edit.png new file mode 100644 index 00000000000..c199d1f40d8 Binary files /dev/null and b/addons/website/static/description/website_edit.png differ diff --git a/addons/website/static/description/website_editor.png b/addons/website/static/description/website_editor.png new file mode 100644 index 00000000000..87723ede0f1 Binary files /dev/null and b/addons/website/static/description/website_editor.png differ diff --git a/addons/website/static/description/website_events.png b/addons/website/static/description/website_events.png new file mode 100644 index 00000000000..cb9c12245fc Binary files /dev/null and b/addons/website/static/description/website_events.png differ diff --git a/addons/website/static/description/website_grid.png b/addons/website/static/description/website_grid.png new file mode 100644 index 00000000000..ad063c2cb3c Binary files /dev/null and b/addons/website/static/description/website_grid.png differ diff --git a/addons/website/static/description/website_home.png b/addons/website/static/description/website_home.png new file mode 100644 index 00000000000..5d9f8634574 Binary files /dev/null and b/addons/website/static/description/website_home.png differ diff --git a/addons/website/static/description/website_mobile.png b/addons/website/static/description/website_mobile.png new file mode 100644 index 00000000000..60b40ea910f Binary files /dev/null and b/addons/website/static/description/website_mobile.png differ diff --git a/addons/website/static/description/website_seo.png b/addons/website/static/description/website_seo.png new file mode 100644 index 00000000000..7cb74e19878 Binary files /dev/null and b/addons/website/static/description/website_seo.png differ diff --git a/addons/website/static/description/website_theme.png b/addons/website/static/description/website_theme.png new file mode 100644 index 00000000000..a5955b29a60 Binary files /dev/null and b/addons/website/static/description/website_theme.png differ diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 2b5de84c05b..127939f6caf 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -283,32 +283,19 @@ table.editorbar-panel td.selected { /* ---- SNIPPET MANIPULATOR ---- */ .oe_overlay { - display: block; + display: none; position: absolute; background: transparent; border-radius: 3px; - opacity: 0; transition: opacity 100ms linear; box-sizing: border-box; pointer-events: none; } -.oe_overlay.oe_hover { - opacity: 1; - cursor: pointer; -} -.oe_overlay.oe_selected, .oe_overlay.oe_active { - opacity: 1; +.oe_overlay.oe_active { + display: block; border-style: dashed; border-width: 1px; box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset; -} -.oe_overlay.oe_selected { - border-color: rgba(0, 153, 255, 0.5); -} -.oe_overlay .oe_handle { - display: none !important; -} -.oe_overlay.oe_active { border-color: rgba(153, 0, 255, 0.5); } .oe_overlay.oe_active .oe_handle { @@ -356,39 +343,22 @@ table.editorbar-panel td.selected { width: 100%; text-align: center; top: -11px; - display: none; z-index: 1002; } -.oe_overlay .oe_overlay_options > * { - margin: 0 -2px 0 -3px; - display: inline-block; -} -.oe_overlay .oe_overlay_options * { - border-radius: 0; -} .oe_overlay .oe_overlay_options .btn, .oe_overlay .oe_overlay_options a { pointer-events: auto; cursor: pointer; } +.oe_overlay .oe_overlay_options .dropdown { + display: inline-block; +} .oe_overlay .oe_overlay_options .dropdown-menu { text-align: left; min-width: 180px; } -.oe_overlay .oe_overlay_options .oe_label { - position: absolute; - top: 3px; - right: 6px; - background: white; - font-size: 75%; - color: rgba(153, 0, 255, 0.5); - padding: 0 5px; -} .oe_overlay .oe_overlay_options .dropdown-menu select, .oe_overlay .oe_overlay_options .dropdown-menu input { display: block; } -.oe_overlay.oe_active .oe_overlay_options { - display: block; -} .oe_handle { pointer-events: auto; @@ -550,10 +520,16 @@ table.editorbar-panel td.selected { .oe_ace_view_editor .oe_ace_view_editor_title .oe_view_list { width: 50%; height: 32px; + font-size: 14px; + font-family: "Monaco", "Menlo", "Ubuntu Mono", "Consolas", "source-code-pro", monospace; + line-height: normal; } .oe_ace_view_editor .oe_ace_view_editor_title .btn { height: 32px; padding: 0 4px 0 4px; + font-size: 14px; + font-family: "Monaco", "Menlo", "Ubuntu Mono", "Consolas", "source-code-pro", monospace; + line-height: normal; } .oe_ace_view_editor .ace_editor { position: absolute; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 20fa98ec96d..6eb47eab614 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -249,27 +249,18 @@ table.editorbar-panel /* ---- SNIPPET MANIPULATOR ---- */ .oe_overlay - display: block + display: none position: absolute background: transparent border-radius: 3px - opacity: 0 transition: opacity 100ms linear box-sizing: border-box pointer-events: none - &.oe_hover - opacity: 1 - cursor: pointer - &.oe_selected, &.oe_active - opacity: 1 + &.oe_active + display: block border-style: dashed border-width: 1px box-shadow: 0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset - &.oe_selected - border-color: rgba(0, 153, 255, 0.5) - .oe_handle - display: none !important - &.oe_active border-color: rgba(153, 0, 255, 0.5) .oe_handle display: block !important @@ -310,31 +301,17 @@ table.editorbar-panel width: 100% text-align: center top: -11px - display: none z-index: 1002 - > * - margin: 0 -2px 0 -3px - display: inline-block - * - border-radius: 0 .btn, a pointer-events: auto cursor: pointer + .dropdown + display: inline-block .dropdown-menu text-align: left min-width: 180px - .oe_label - position: absolute - top: 3px - right: 6px - background: #fff - font-size: 75% - color: rgba(153, 0, 255, 0.5) - padding: 0 5px .dropdown-menu select,.dropdown-menu input display: block - &.oe_active .oe_overlay_options - display: block .oe_handle pointer-events: auto @@ -460,6 +437,10 @@ $editorbar_height: 40px // TODO Fix => might break with themes $navbar_height: 51px +@mixin editor-font + font-size: 14px + font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace + line-height: normal .oe_ace_view_editor transition: all 0.2s ease-in -webkit-transition: all 0.2s ease-in @@ -481,9 +462,11 @@ $navbar_height: 51px .oe_view_list width: 50% height: $editorbar_height - 8px + @include editor-font .btn height: $editorbar_height - 8px padding: 0 4px 0 4px + @include editor-font .ace_editor position: absolute top: $editorbar_height diff --git a/addons/website/static/src/js/website.mobile.js b/addons/website/static/src/js/website.mobile.js index 6487b2b457b..d4630d0a0c2 100644 --- a/addons/website/static/src/js/website.mobile.js +++ b/addons/website/static/src/js/website.mobile.js @@ -17,7 +17,7 @@ 'hidden.bs.modal': 'destroy' }, start: function () { - document.getElementById("mobile-viewport").src = window.location.href + "?mobile-preview=true"; + document.getElementById("mobile-viewport").src = window.location.origin + window.location.pathname + "#mobile-preview"; this.$el.modal(); }, }); diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js index 8dae960a7b5..1d9234165c4 100644 --- a/addons/website/static/src/js/website.seo.js +++ b/addons/website/static/src/js/website.seo.js @@ -16,7 +16,7 @@ website.seo = {}; function analyzeKeyword(htmlPage, keyword) { - return htmlPage.isInTitle(keyword) ? { + return htmlPage.isInTitle(keyword) ? { title: 'keyword-in-title', description: "This keyword is used in the page title", } : htmlPage.isInDescription(keyword) ? { @@ -350,8 +350,6 @@ }); self.keywordList.appendTo($modal.find('.js_seo_keywords_list')); $modal.modal(); - // Avoid the 'Edit' button in the background boucing needlessly - $modal.on('click', function (e) { e.stopPropagation(); }); }, suggestImprovements: function () { var tips = []; @@ -410,7 +408,7 @@ setTimeout(function () { var title = self.$('input[name=seo_page_title]').val(); self.htmlPage.changeTitle(title); - }, 1); + }, 0); }, descriptionChanged: function () { var self = this; diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js index db2545ada29..3457fbb66e2 100644 --- a/addons/website/static/src/js/website.snippets.js +++ b/addons/website/static/src/js/website.snippets.js @@ -7,7 +7,7 @@ website.EditorBar.include({ start: function () { var self = this; - $("body").on('click', function (event) { + $("[data-oe-model]").on('click', function (event) { var tag = event.srcElement.tagName.toLowerCase(); var $this = $(event.srcElement); if (!(tag === 'a' || tag === "button") && !$this.parents("a, button").length) { @@ -86,19 +86,19 @@ }, dom_filter: function (dom) { if (typeof dom === "string") { - var exclude = ":not(#oe_manipulators):not(#website-top-navbar):not(.oe_snippet)"; + var include = "[data-oe-model]"; var sdom = dom.split(','); dom = ""; _.each(sdom, function (val) { val = val.replace(/^\s+|\s+$/g, ''); - dom += "body > " + exclude + " " + val + ", "; + dom += "body " + include + " " + val + ", "; val = val.split(" "); - dom += "body > "+ val.shift() + exclude + val.join(" ") + ", "; + dom += "body "+ val.shift() + include + val.join(" ") + ", "; }); dom = dom.replace(/,\s*$/g, ''); return $(dom); } else { - return $(dom).parents("#oe_manipulators, #website-top-navbar").length || $(dom).hasClass("oe_snippet") ? $("") : $(dom); + return $(dom).is("[data-oe-model]") || $(dom).parents("[data-oe-model]").length ? $(dom) : $(""); } }, start: function() { @@ -208,7 +208,7 @@ } self.make_active($target); }); - $("body > :not(:has(#website-top-view)):not(#oe_manipulators)").on('click', function (ev) { + $("[data-oe-model]").on('click', function (ev) { if (!snipped_event_flag && self.$active_snipped_id && !self.$active_snipped_id.parents("[data-snippet-id]:first")) { self.make_active(false); } @@ -276,14 +276,14 @@ if($target.length && !self.editor_busy) { if($selected_target != $target){ if($selected_target && $selected_target.data('overlay')){ - $selected_target.data('overlay').removeClass('oe_selected'); + $selected_target.data('overlay').removeClass('oe_hover'); } $selected_target = $target; self.create_overlay($target); - $target.data('overlay').addClass('oe_selected'); + $target.data('overlay').addClass('oe_hover'); } } else if($selected_target && $selected_target.data('overlay')) { - $selected_target.data('overlay').removeClass('oe_selected'); + $selected_target.data('overlay').removeClass('oe_hover'); } }); }, @@ -861,7 +861,6 @@ var cursor = $handle.css("cursor")+'-important'; $("body").addClass(cursor); - self.$overlay.addClass('oe_hover'); var body_mousemove = function (event){ event.preventDefault(); @@ -940,10 +939,16 @@ var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0); var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0); var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0); - + if (offset < 0) { + offset = 0; + } + var colSize = beginCol - (offset - beginOffset); + if (colSize <= 0) { + colSize = 1; + offset = beginOffset + beginCol - 1; + } this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-|col-md-)([0-9-]+)/g, '')); - var colSize = beginCol - (offset - beginOffset); this.$target.addClass('col-md-' + (colSize > 12 ? 12 : colSize)); if (offset > 0) { this.$target.addClass('col-md-offset-' + offset); diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index cc209cf0fe2..4630e1f294b 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -6,8 +6,8 @@
-
Promote
-Get your page efficiently referenced in Google to attract more visitors.
+ +Get this page efficiently referenced in Google to attract more visitors.
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 279a362fec7..752aa66fc34 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -73,14 +73,16 @@
-
+
@@ -244,8 +246,8 @@
-
-
@@ -274,11 +276,11 @@
Enterprise Social Network
+
+
- Enterprise Social Network
Make every employee feel more connected and engaged with twitter-like features for your own company. Follow @@ -258,8 +260,8 @@ and business applications.
- 
+
+
+
-
- 
+
+
+
-
-
Manage Your Shops
+
+
+
@@ -395,7 +407,7 @@
Manage Your Shops
OpenERP's Point of Sale introduces a super clean interface with no installation required that runs @@ -344,10 +346,10 @@
-
- OpenERP Project Management
+
- OpenERP Project Management
- Infinitely flexible. Incredibly easy to use.
-
+ + OpenERP Project Management +
+Infinitely flexible. Incredibly easy to use.
@@ -357,7 +359,7 @@ minute details, from the customer contract to the billing.
- Organize projects around your own processes. Work + Organize projects around your own processes. Work on tasks and issues using the kanban view, schedule tasks using the gantt chart and control deadlines in the calendar view. Every project may have it's @@ -369,6 +371,16 @@
+
+
Title
+
+
+
+
+ Your Website Title
+Great products for great people
+@@ -395,7 +407,7 @@
-
+
@@ -744,8 +755,8 @@
More than 500 happy customers.
-
Work with the hardware you already have...
@@ -730,7 +742,6 @@
-
References
-
++-OpenERP provides essential platform for our project management. Things are better organized and more visible with it. @@ -753,8 +764,8 @@ John Doe, CEO
-++OpenERP provides essential platform for our project management. Things are better organized and more visible with it. diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml index 92c678915e1..afc0b8f0d48 100644 --- a/addons/website/views/themes.xml +++ b/addons/website/views/themes.xml @@ -11,7 +11,7 @@
-+
Theme Changed!
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index 08415623421..42a26b3cb49 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -70,7 +70,7 @@ - OpenERP + YourCompanydiff --git a/addons/website_sale/static/description/website_sale_home.png b/addons/website_sale/static/description/website_sale_home.png new file mode 100644 index 00000000000..3000b43c0b7 Binary files /dev/null and b/addons/website_sale/static/description/website_sale_home.png differ diff --git a/addons/website_sale/static/description/website_sale_product.png b/addons/website_sale/static/description/website_sale_product.png new file mode 100644 index 00000000000..197ddf09b78 Binary files /dev/null and b/addons/website_sale/static/description/website_sale_product.png differ diff --git a/addons/website_sale/static/src/css/Makefile b/addons/website_sale/static/src/css/Makefile new file mode 100644 index 00000000000..6753818a302 --- /dev/null +++ b/addons/website_sale/static/src/css/Makefile @@ -0,0 +1,2 @@ +sass: + sass -t expanded --unix-newlines --watch website_sale.sass:website_sale.css& diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css index 0191b84f42e..8527eded0d8 100644 --- a/addons/website_sale/static/src/css/website_sale.css +++ b/addons/website_sale/static/src/css/website_sale.css @@ -1,34 +1,88 @@ -.css_product { - width: 170px; - margin-left: 16px; -} -.css_product .css_content { - height: 174px; - margin-bottom: 6px; +@charset "utf-8"; +/* ---- Default Styles Description ---- */ +.oe_product_image { + position: absolute; + left: 15px; + right: 15px; + top: 15px; + bottom: 50px; } -.ellipsis { - overflow: hidden; - position: relative; +.oe_product_description { + bottom: 0; + position: absolute; + left: 15px; + right: 15px; + border-top: 1px solid #dddddd; } -.ellipsis .end { - position: absolute; - bottom: 0; - right: 0; - text-align: right; - width: 26px; - background-size: 100% 100%; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAABCAMAAACfZeZEAAAABGdBTUEAALGPC/xhBQAAAwBQTFRF////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAA////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wDWRdwAAAP90Uk5TgsRjMZXhS30YrvDUP3Emow1YibnM9+ggOZxrBtpRRo94gxItwLOoX/vsHdA2yGgL8+TdKUK8VFufmHSGgAQWJNc9tk+rb5KMCA8aM0iwpWV6dwP9+fXuFerm3yMs0jDOysY8wr5FTldeoWKabgEJ8RATG+IeIdsn2NUqLjQ3OgBDumC3SbRMsVKsValZplydZpZpbJOQco2KdYeEe36BDAL8/vgHBfr2CvTyDu8R7esU6RcZ5ecc4+Af3iLcJSjZ1ivT0S/PMs3LNck4x8U7wz7Bv0G9RLtHuEq1TbJQr1OtVqqnWqRdoqBhnmSbZ5mXapRtcJGOc4t2eYiFfH9AS7qYlgAAARlJREFUKM9jqK9fEGS7VNrDI2+F/nyB1Z4Fa5UKN4TbbeLY7FW0Tatkp3jp7mj7vXzl+4yrDsYoVx+JYz7mXXNSp/a0RN25JMcLPP8umzRcTZW77tNyk63tdprzXdmO+2ZdD9MFe56Y9z3LUG96mcX02n/CW71JH6Qmf8px/cw77ZvVzB+BCj8D5vxhn/vXZh6D4uzf1rN+Cc347j79q/zUL25TPrJMfG/5LvuNZP8rixeZz/mf+vU+Vut+5NL5gPOeb/sd1dZbTs03hBuvmV5JuaRyMfk849nEM7qnEk6IHI8/qn049hB35QGHiv0yZXuMdkXtYC3ebrglcqvYxoj1muvC1nDlrzJYGbpcdHHIMo2FwYv+j3QAAOBSfkZYITwUAAAAAElFTkSuQmCC); - background: -webkit-gradient(linear, left top, right top, from(rgba(255, 255, 255, 0)), to(white), color-stop(50%, white)); - background: -moz-linear-gradient(to right, rgba(255, 255, 255, 0), white 50%, white); - background: -o-linear-gradient(to right, rgba(255, 255, 255, 0), white 50%, white); - background: -ms-linear-gradient(to right, rgba(255, 255, 255, 0), white 50%, white); - background: linear-gradient(to right, rgba(255, 255, 255, 0), white 50%, white); +.oe_shop_top .oe_product_description { + top: 0; + bottom: auto; + border-top-style: none; +} +.oe_shop_top .oe_product_image { + top: 15px; + bottom: 50px; +} + +.oe_shop_center .oe_product_description { + text-align: center; + border-top-style: none; +} + +/* Products Options */ +.oe_product.oe_image_full .oe_product_image { + left: 0; + right: 0; + top: 0; + bottom: 0; +} + +/* ---- Default Styles ---- */ +.oe_product { + border: 1px solid rgba(100, 100, 100, 0.2); +} + +.oe_product .oe_product_image img { + max-width: 100%; + max-height: 100%; + z-index: 4; +} + +.oe_product_description { + background: rgba(255, 255, 255, 0.8); + padding: 5px 0 5px 0; + z-index: 5; +} + +.oe_subdescription { + line-height: 1.2; + margin-bottom: 4px; +} + +/* ---- Grid Style ---- */ +.style1 .oe_product .oe_product_image { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; +} + +/* ---- Product Sizes ---- */ +.oe-height-1 { + height: 170px; +} + +.oe-height-2 { + height: 255px; +} + +.oe-height-3 { + height: 340px; +} + +.oe-height-4 { + height: 510px; } -.ellipsis .fill { - background: #fff; - height: 100%; - position: absolute; - width: 100%; -} \ No newline at end of file diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass new file mode 100644 index 00000000000..4efb1a84c54 --- /dev/null +++ b/addons/website_sale/static/src/css/website_sale.sass @@ -0,0 +1,86 @@ +@charset "utf-8" + +/* ---- Default Styles Description ---- */ + +.oe_product_image + position: absolute + left: 15px + right: 15px + top: 15px + bottom: 50px + +.oe_product_description + bottom: 0 + position: absolute + left: 15px + right: 15px + border-top: 1px solid #dddddd + + +.oe_shop_top /* Option 1 */ + .oe_product_description + top: 0 + bottom: auto + border-top-style: none + .oe_product_image + top: 15px + bottom: 50px + +.oe_shop_center /* Option 2 */ + .oe_product_description + text-align: center + border-top-style: none + +/* Products Options */ + +.oe_product.oe_image_full + .oe_product_image + left: 0 + right: 0 + top: 0 + bottom: 0 + +/* ---- Default Styles ---- */ + +.oe_product + border: 1px solid rgba(100,100,100,0.2) + +.oe_product .oe_product_image img + max-width: 100% + max-height: 100% + z-index: 4 + +.oe_product_description + background: rgba(255,255, 255, 0.8) + padding: 5px 0 5px 0 + z-index: 5 + +.oe_subdescription + line-height: 1.2 + margin-bottom: 4px + + +/* ---- Grid Style ---- */ + +.style1 + .oe_product .oe_product_image + position: absolute + left: 0 + right: 0 + top: 0 + bottom: 0 + +/* ---- Product Sizes ---- */ + +.oe-height-1 + height: 170px + +.oe-height-2 + height: 255px + +.oe-height-3 + height: 340px + +.oe-height-4 + height: 510px + diff --git a/addons/website_sale/static/src/img/ipad_experience.png b/addons/website_sale/static/src/img/ipad_experience.png new file mode 100644 index 00000000000..387fc2d2202 Binary files /dev/null and b/addons/website_sale/static/src/img/ipad_experience.png differ diff --git a/addons/website_sale/static/src/img/ipad_why.png b/addons/website_sale/static/src/img/ipad_why.png new file mode 100644 index 00000000000..11015696632 Binary files /dev/null and b/addons/website_sale/static/src/img/ipad_why.png differ diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 450cf2d7749..cc855da8be4 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -64,44 +64,6 @@ - - - - -diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py index 2b400bcaf30..1ca7c322169 100644 --- a/addons/website_sale/__openerp__.py +++ b/addons/website_sale/__openerp__.py @@ -15,6 +15,8 @@ OpenERP E-Commerce 'views/website_sale.xml', 'security/ir.model.access.csv', 'security/website_sale.xml', + ], + 'demo': [ 'website_sale_demo.xml', ], 'qweb': ['static/src/xml/*.xml'], diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index a60f620e642..44d95784071 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -63,8 +63,7 @@ class Ecommerce(http.Controller): product_obj = request.registry.get('product.template') domain = [("sale_ok", "=", True)] - if SUPERUSER_ID != request.uid: - domain += [('website_published', '=', True)] + domain += [('website_published', '=', True)] if post.get("search"): domain += ['|', '|', '|', @@ -109,9 +108,14 @@ class Ecommerce(http.Controller): request.context['pricelist'] = self.get_pricelist() + category = None + if post.get('category_id') and int(post.get('category_id')): + category = category_obj.browse(request.cr, request.uid, int(post.get('category_id')), context=request.context) + product = product_obj.browse(request.cr, request.uid, product_id, context=request.context) values = { 'category_id': post.get('category_id') and int(post.get('category_id')) or None, + 'category': category, 'search': post.get("search"), 'categories': self.get_categories(), 'category_list': category_list, diff --git a/addons/website_sale/static/description/index.html b/addons/website_sale/static/description/index.html index 4a6d40f0a46..179aa5b6455 100644 --- a/addons/website_sale/static/description/index.html +++ b/addons/website_sale/static/description/index.html @@ -7,7 +7,7 @@
@@ -43,7 +43,7 @@-+
- - - -- - -- Shop - -Categories - --------- - -- --- - - @@ -118,91 +80,163 @@ -col-md-9 -+ + -Product -- Create New Product - - - - - -pull-left --- -- - ---
- - - … -
--- -€ - € - - Add to basket -+Our Products ++ +-+ + ++ +- +- + -Product -- - - + + + ++ + ++ + ++++ +++ + +++ + +++++
++Product Name
+ + +- ++ Customers who have bought this product also bought:
@@ -223,9 +257,14 @@ - - + + + + +My cart -+ + + + ++ Your Cart ++- ++ ++ ++ +++ + + +col-md-9 +diff --git a/addons/website_sale/website_sale.py b/addons/website_sale/website_sale.py index 45b42858c94..40957a52c8a 100644 --- a/addons/website_sale/website_sale.py +++ b/addons/website_sale/website_sale.py @@ -36,6 +36,14 @@ class product_template(osv.osv): 'website_description': fields.html('Description for the website'), 'suggested_product_id': fields.many2one('product.template', 'Suggested For Product'), 'suggested_product_ids': fields.one2many('product.template', 'suggested_product_id', 'Suggested Products'), + 'website_sizex': fields.selection(map(lambda x: (str(x+1),str(x+1)), range(12)), 'Size X'), + 'website_sizey': fields.selection(map(lambda x: (str(x+1),str(x+1)), range(6)), 'Size Y'), + 'website_product_class': fields.selection([('','Default'), ('oe_image_full','Image Full')], 'Size Y'), + } + _defaults = { + 'website_sizex': 3, + 'website_sizey': 2, + 'website_product_class': '', } def recommended_products(self, cr, uid, ids, context=None): diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/website_sale_demo.xml index b52ffed43cb..c2e24359d4f 100644 --- a/addons/website_sale/website_sale_demo.xml +++ b/addons/website_sale/website_sale_demo.xml @@ -1,24 +1,69 @@
- + - -- - -- - ++ + oe_image_full +6 +4 ++ + +++++++Why you'll love an iPad.
++ Right from the start, there’s a lot to love about + iPad. It’s simple yet powerful. Thin and light yet + full-featured. It can do just about everything and + be just about anything. +
+ And because it’s so easy to use, it’s easy to love. +
++++
+ ++++++++
++The full iPad experience.
+There is less of it, but no less to it.
++ Everything you love about iPad — the beautiful + screen, fast and fluid performance, FaceTime and + iSight cameras, thousands of amazing apps, 10-hour + battery life* — is everything you’ll love about + iPad mini, too. And you can hold it in one hand. +
++ Learn more » +
++ 6 + oe_image_full
