diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 8b8f82a3678..7b0ae426553 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -265,16 +265,16 @@ class Website(openerp.addons.web.controllers.main.Home): hashed_session = hashlib.md5(request.session_id).hexdigest() retag = hashed_session try: - ids = Model.read(request.cr, request.uid, [('id', '=', id)], request.context) + id = int(id) + ids = Model.search(request.cr, request.uid, [('id', '=', id)], context=request.context) if not ids: - id = Model.read(request.cr, openerp.SUPERUSER_ID, [('id', '=', id), ('website_published', '=', True)], request.context)[0] - + id = Model.search(request.cr, openerp.SUPERUSER_ID, [('id', '=', id), ('website_published', '=', True)], context=request.context)[0] if etag: date = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update], request.context)[0].get(last_update) if hashlib.md5(date).hexdigest() == etag: return werkzeug.wrappers.Response(status=304) - res = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update, field], request.context)[0] + res = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update, field], context=request.context)[0] retag = hashlib.md5(res.get(last_update)).hexdigest() image_base64 = res.get(field) diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index f037f87b34f..80057dbf21d 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -345,18 +345,13 @@ footer { /* Parallax Theme */ .parallax_full { - background: #eeeeee top left repeat; + background: #eeeeee bottom center repeat fixed; min-height: 650px; width: 100%; - overflow: hidden; - position: relative; -} -.parallax_full > img { - position: absolute; - top: 0; - left: 0; } +/* overflow: hidden + * position: relative */ /* -- Hack for removing double scrollbar from mobile preview -- */ div#mobile-preview.modal { overflow: hidden; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index ac85bf67ed3..b1f43b543a3 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -264,15 +264,12 @@ footer /* Parallax Theme */ .parallax_full - background: #eee top left repeat + background: #eee bottom center repeat fixed min-height: 650px width: 100% +/* overflow: hidden - position: relative - > img - position: absolute - top: 0 - left: 0 + position: relative */ /* -- Hack for removing double scrollbar from mobile preview -- */ div#mobile-preview.modal @@ -309,4 +306,4 @@ ul.nav-stacked > li > a /* display: block*/ ::selection - background: rgba(150, 150, 220, 0.3) \ No newline at end of file + background: rgba(150, 150, 220, 0.3) diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index c2ec2ba243b..3854b54b936 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -278,6 +278,7 @@
+

Contact us

@@ -306,6 +307,7 @@
+
@@ -314,28 +316,30 @@ About -
-
-
-
-

About us

-

A passion for great products

-
-
-

- We are a team of passionated people whose goal is to improve everyone's - life through disruptive products. We build great products to solve your - business problems. -

-

- Our products are designed for small to medium companies willing to optimize - their performance. -

-
- Out Team -
-
-
+
+
+
+
+
+

About us

+

A passion for great products

+
+
+

+ We are a team of passionated people whose goal is to improve everyone's + life through disruptive products. We build great products to solve your + business problems. +

+

+ Our products are designed for small to medium companies willing to optimize + their performance. +

+
+ Out Team +
+
+
+
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 86cfdf86050..66c802e0de5 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -30,8 +30,8 @@ import werkzeug class website_mail(http.Controller): - _category_post_per_page = 2 - _post_comment_per_page = 2 + _category_post_per_page = 6 + _post_comment_per_page = 6 @website.route([ '/blog/', @@ -143,7 +143,6 @@ class website_mail(http.Controller): 'blog_posts': blog_posts, 'pager': pager, 'nav_list': nav, - 'uid': request.uid, 'unable_editor': post.get('unable_editor') } diff --git a/addons/website_blog/static/src/css/website_blog.css b/addons/website_blog/static/src/css/website_blog.css index 17260ec19c3..bd680d3b9c2 100644 --- a/addons/website_blog/static/src/css/website_blog.css +++ b/addons/website_blog/static/src/css/website_blog.css @@ -14,8 +14,6 @@ } .blog_content a.oe_mail_expand { font-weight: bold; - display: block; - margin-top: 10px; } p.post-meta { diff --git a/addons/website_blog/static/src/css/website_blog.sass b/addons/website_blog/static/src/css/website_blog.sass index 0011274c63b..43339ad577f 100644 --- a/addons/website_blog/static/src/css/website_blog.sass +++ b/addons/website_blog/static/src/css/website_blog.sass @@ -13,8 +13,6 @@ content: " →" a.oe_mail_expand font-weight: bold - display: block - margin-top: 10px p.post-meta position: relative diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 947150c4daf..81a87cb1639 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -91,7 +91,7 @@

Leave a Comment

- +
diff --git a/addons/website_blog/website_blog.py b/addons/website_blog/website_blog.py index 5dd47c7afd8..4671153fe61 100644 --- a/addons/website_blog/website_blog.py +++ b/addons/website_blog/website_blog.py @@ -77,7 +77,8 @@ class BlogPost(osv.Model): max_length=self._shorten_max_char, expand_options={ 'oe_expand_href': '/blog/%d/%d' % (page.category_id.id, page.id), - } + 'oe_expand_a_class': 'oe_mail_expand btn btn-info' + }, br=True ) except Exception: body_short = False diff --git a/addons/website_blog/website_blog_demo.xml b/addons/website_blog/website_blog_demo.xml index 5de302fe6c9..3ddea7b6fd6 100644 --- a/addons/website_blog/website_blog_demo.xml +++ b/addons/website_blog/website_blog_demo.xml @@ -108,7 +108,7 @@

- No installation required + New Features Launched

OpenERP's Point of Sale introduces a super clean @@ -116,9 +116,6 @@ online and offline on modern hardware. Laptops, tablets, industrial POS, it runs on everything.

-

- Get more information » -

@@ -263,5 +260,90 @@ Think of it as an out-of-the-box solution to boost your business' productivity. + + Announcig a New Partnership + + + +
+
+
+ +
+
+

+ We are proud to announce a new partnership with + the company OpenERP. Their open source application suite + will allow us to reach new market, specifically in + the accounting area. +

+ The full integration with the company inventory + and accounting, will give our customers real time statistics + without the hassle of integrating several applications. +

+
+
+
+ +
+
+
+
+

+ Linked with Project Management +

+

Infinitely flexible. Incredibly easy to use.

+
+
+

+ OpenERP's collaborative and realtime project + management helps your team get work done. Keep + track of everything, from the big picture to the + minute details, from the customer contract to the + billing. +

+ 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 + own stages allowing teams to optimize their job. +

+
+
+
+
+
+
+
+
+

Work with the hardware you already have...

+
+
+ +
+
+

+ No installation required +

+

+ OpenERP's Point of Sale introduces a super clean + interface with no installation required that runs + online and offline on modern hardware. Laptops, + tablets, industrial POS, it runs on everything. +

+

+ Get more information » +

+
+
+
+
+ +]]> + + + + diff --git a/addons/website_hr/website_hr_demo.xml b/addons/website_hr/website_hr_demo.xml index c8cff00c88b..baad4ecf5fe 100644 --- a/addons/website_hr/website_hr_demo.xml +++ b/addons/website_hr/website_hr_demo.xml @@ -7,20 +7,30 @@ Designer, UI Expert - + - Like Coding + Lean Management Expert - + Designer, UI Expert + + + Customer Service Oriented + + Like Coding + + + Driven by Customer Satisfaction + + diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css index 9fad582c61d..f253f5badd9 100644 --- a/addons/website_sale/static/src/css/website_sale.css +++ b/addons/website_sale/static/src/css/website_sale.css @@ -111,6 +111,23 @@ height: 280px; } +@media (max-width: 728px) { + .oe_product { + float: left; + width: 100%; + height: 200px; + display: inline-block; + } + + #products_grid table, #products_grid tbody, #products_grid tr, #products_grid td { + float: left; + width: 100%; + display: inline-block; + } + #products_grid table td.oe-height-2 { + display: none; + } +} @media (min-width: 992px) { .col-md-12 .oe-height-1 { height: 95px; @@ -138,7 +155,6 @@ height: 288px; } } - @media (min-width: 1200px) { .col-md-12 .oe-height-1 { height: 125px; @@ -166,7 +182,6 @@ height: 380px; } } - /* ---- Product list style ---- */ .oe_list_products { border: none; diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass index 2005fba89f3..6edcdae16f3 100644 --- a/addons/website_sale/static/src/css/website_sale.sass +++ b/addons/website_sale/static/src/css/website_sale.sass @@ -103,6 +103,20 @@ .oe-height-4 height: 280px +@media (max-width: 728px) + .oe_product + float: left + width: 100% + height: 200px + display: inline-block + #products_grid + table, tbody,tr, td + float: left + width: 100% + display: inline-block + table td.oe-height-2 + display: none + @media (min-width: 992px) .col-md-12 .oe-height-1 @@ -143,7 +157,6 @@ .oe-height-4 height: 380px - /* ---- Product list style ---- */ .oe_list_products border: none diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index d3f5b09de1e..5c2cb449e29 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -287,8 +287,8 @@
  • Promote