diff --git a/addons/report/models/report.py b/addons/report/models/report.py index 11937235a77..261050d98a8 100644 --- a/addons/report/models/report.py +++ b/addons/report/models/report.py @@ -375,6 +375,8 @@ class Report(osv.Model): :returns: Content of the pdf as a string """ command_args = [] + if wkhtmltopdf_state == "ok": + command_args.extend(['--viewport-size', '1024x768']) # Passing the cookie to wkhtmltopdf in order to resolve internal links. try: diff --git a/addons/website/static/lib/summernote/src/less/summernote.less b/addons/website/static/lib/summernote/src/less/summernote.less index 4a16ba4b273..c9c538e940d 100644 --- a/addons/website/static/lib/summernote/src/less/summernote.less +++ b/addons/website/static/lib/summernote/src/less/summernote.less @@ -1,4 +1,4 @@ -@import "elements.less"; +/* @_import "elements.less"; */ /* Theme Variables ------------------------------------------*/ diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 4d3f2c6c5ff..4c219f7dda8 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -104,7 +104,7 @@ .oe_snippet { display: inline-block; vertical-align: top; - width: 93px; + width: 92px; margin-left: 3px; margin-right: 3px; margin-top: 1px; diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 75382d5ade1..7a4f511b485 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -287,6 +287,10 @@ td { font-size: 120%; } +.jumbotron.para_large p{ + font-size: 150%; +} + .readable { font-size: 120%; max-width: 700px; @@ -455,7 +459,7 @@ ul.nav-stacked > li > a { /* ---- SNIPPETS --- */ .oe_img_bg { - background-size: 100%; + background-size: cover; } .carousel, .parallax, .blockquote { @@ -740,8 +744,7 @@ div.carousel div.carousel-content { /* Background (kept for 8.0 compatibility) */ .oe_dark { - background: #eff8f8; - background: rgba(200, 200, 200, 0.14); + background-color: rgba(200, 200, 200, 0.14); } .oe_black { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index a7b4bd38f40..52f8d62c9ab 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -191,6 +191,10 @@ td .para_large font-size: 120% +.jumbotron.para_large p{ + font-size: 150%; +} + .readable font-size: 120% max-width: 700px @@ -338,7 +342,7 @@ ul.nav-stacked > li > a /* ---- SNIPPETS --- */ .oe_img_bg - background-size: 100% + background-size: cover .carousel, .parallax, .blockquote overflow: hidden @@ -577,8 +581,7 @@ div.carousel /* Background (kept for 8.0 compatibility) */ .oe_dark - background: #eff8f8 - background: rgba(200, 200, 200, 0.14) + background-color: rgba(200, 200, 200, 0.14) .oe_black background-color: rgba(0, 0, 0, 0.9) diff --git a/addons/website/static/src/js/summernote.js b/addons/website/static/src/js/summernote.js index 282a06623aa..70678e58014 100644 --- a/addons/website/static/src/js/summernote.js +++ b/addons/website/static/src/js/summernote.js @@ -1779,7 +1779,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor) var startPoint = rng.getStartPoint(); var endPoint = rng.getEndPoint(); - if (rng.isCollapsed()) { + if (rng.isCollapsed() && !dom.isFont(rng.sc)) { return { sc: startPoint.node, so: startPoint.offset, @@ -1827,6 +1827,11 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor) }); nodes = list.unique(nodes); + // If ico fa + if (rng.isCollapsed()) { + node.push(startPoint.node); + } + // apply font: foreColor, backColor, size (the color can be use a class text-... or bg-...) var node, font, $font, fonts = [], className; if (color || bgcolor || size) { @@ -1850,7 +1855,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor) if (color) { for (var k=0; k diff --git a/addons/website_quote/data/website_quotation_data.xml b/addons/website_quote/data/website_quotation_data.xml index b4613bd5e6d..40335af3dff 100644 --- a/addons/website_quote/data/website_quotation_data.xml +++ b/addons/website_quote/data/website_quotation_data.xml @@ -101,7 +101,7 @@
-
+

Our offer is based on 3 commitments, which drive our business and our partners:

@@ -110,7 +110,7 @@
-
+

Quality

@@ -122,7 +122,7 @@
-
+

Service

@@ -134,7 +134,7 @@
-
+

Price

diff --git a/addons/website_quote/data/website_quotation_demo.xml b/addons/website_quote/data/website_quotation_demo.xml index 6f3c1354733..8c38162a286 100644 --- a/addons/website_quote/data/website_quotation_demo.xml +++ b/addons/website_quote/data/website_quotation_demo.xml @@ -59,7 +59,7 @@
-
+

Our partnership offer includes all you need to grow your business and deliver quality services @@ -80,7 +80,7 @@

-
+

A Valuable Product

@@ -90,14 +90,15 @@ Deliver strong value added services as you can rely on a leading open source software, with the support of the publisher. -

+

+

Grow with your existing customer base by continuously proposing new modules.

-
+

A Strong Demand

@@ -113,7 +114,7 @@
-
+

High Margins

@@ -147,10 +148,10 @@
-
+

Get access to our experts

-
+

For an extra fee, partners can get access to Odoo's core developers and functional experts. This can help @@ -159,7 +160,7 @@ consultants on demand.

-
+
@@ -167,10 +168,10 @@
-
+

Official certified partner

-
+

Odoo promotes its partners through various ways: publication on our website, official communication, @@ -180,7 +181,7 @@ directory listing.

-
+
@@ -188,10 +189,10 @@
-
+

Access to the Lead

-
+

Every year, we redirect more than 100,000 customer requests to our official partners. These are prospects @@ -201,7 +202,7 @@ (nearest partner) and the grade of the partner.

-
+
@@ -222,10 +223,10 @@

Test developments automatically

-
+
-
+

Save time in your implementation project by having your developments tested automatically by our automated test @@ -259,7 +260,7 @@

-
+

These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live sessions by our senior instructors. At the end of the training, you can pass the Odoo Certification exam in one of the 5000+ Pearson VUE test centers worldwide.

@@ -271,13 +272,13 @@
  • Better comfort to facilitate your learning process
    • -
    +

    Structure of the Training

    -
    +

    There are three components to the training

    • Videos with detailed demos
      • @@ -304,21 +305,20 @@
      -
      +

      Course Summary

      -
      +

      This course is dedicated to developers who need to grasp knowledge of the business applications development process. This course is for new developers or for IT professionals eager to learn more about technical aspects.

      - -
      +

      What you will learn?

      -
      +

      Day 1

      @@ -337,7 +337,7 @@
      -
      +

      Day 2

      @@ -358,7 +358,7 @@
      -
      +

      Day 3

      @@ -384,11 +384,11 @@
      -
      +

      Requirements

      -
      +

      Objectives:

      Having attended this course, participants should be able to:

      @@ -396,20 +396,20 @@
      • Understand the development concepts and architecture;
      • Install and administer your own server;
      • Develop a new module for a particular application.
        • -

       

      +

     

    Our prices include:

    • drinks and lunch;
    • training material.
      • -

     

    +

     

    Requirements:

    • Bring your own laptop.
    • Participants are expected to have some knowledge in programming. A basic knowledge of the Python programming is recommended.
    • Participants preferably have a functional knowledge of our software (see Functional Training).
      • -

     

    +

     

    To get more information, visit the Odoo Official Website.

    @@ -434,10 +434,10 @@
    -
    +

    Objectives

    -
    +

    Upon completion of the training, the participant will be able to:

    • Install and administer Odoo.
      • @@ -454,10 +454,10 @@
    -
    +

    What you will learn?

    -
    +

    Day 1

    @@ -473,7 +473,7 @@
    -
    +

    Day 2

    @@ -489,7 +489,7 @@
    -
    +

    Day 3

    @@ -509,7 +509,7 @@
    -
    +

    Requirements

    • Bring your own laptop.