From 308d08ec0784dfe2835104a224829cc1b9e5ec5f Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 4 Oct 2013 16:46:46 +0200 Subject: [FIX] website: footer replace a t-href by href for cke bzr revid: chm@openerp.com-20131004144646-rk1uq7g5nssbiaua --- addons/website/static/src/css/editor.css | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/website/static/src') diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index f3786920722..bc8f566793b 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -326,6 +326,7 @@ table.editorbar-panel td.selected { color: white; height: 48px; margin-bottom: 32px; + padding-top: 12px; } /* ---- SNIPPET MANIPULATOR ---- */ -- cgit v1.2.3 From 3c33f42dddd4a0785918f82ef1190f2010b97e02 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 4 Oct 2013 17:32:07 +0200 Subject: [FIX] building blocks zone tags bzr revid: chm@openerp.com-20131004153207-ofnj0g09ws272lvn --- addons/website/static/src/xml/website.snippets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website/static/src') diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index 38e3b82529d..c75e32893a0 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -35,7 +35,7 @@ drop in this zone -
+

Tip: when your cursor is in a valid zone, OpenERP shows you a preview of the building block in the page. You must release the block when the -- cgit v1.2.3 From d7b75724cb3d0f96941304d3736590e7f0f6d202 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 4 Oct 2013 18:37:54 +0200 Subject: [IMP] Building Block Zone, SEO Style, bootstrap style by default bzr revid: fp@tinyerp.com-20131004163754-rwa3t1gcmfok4v0w --- addons/website/static/src/css/editor.sass | 9 ------ addons/website/static/src/js/website.seo.js | 35 ++++++++++------------ addons/website/static/src/xml/website.seo.xml | 35 +++++++++++++--------- addons/website/static/src/xml/website.snippets.xml | 4 +-- 4 files changed, 39 insertions(+), 44 deletions(-) (limited to 'addons/website/static/src') diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index a620b0d98ea..5e4a095e8c4 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -425,15 +425,6 @@ $highlighted_text_color: #ffffff .oe_seo_keyword padding: .2em .4em .2em .5em +border-radius(.4em) - .keyword-in-title - background-color: $in_title_color+pointer - color: $highlighted_text_color - .keyword-in-description - background-color: $in_description_color - color: $highlighted_text_color - .keyword-in-body - background-color: $in_body_color - color: $highlighted_text_color /* ---- ACE EDITOR ---- */ diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js index 3da7c1ed8f1..635b80bb192 100644 --- a/addons/website/static/src/js/website.seo.js +++ b/addons/website/static/src/js/website.seo.js @@ -17,13 +17,13 @@ function analyzeKeyword(htmlPage, keyword) { return htmlPage.isInTitle(keyword) ? { - title: 'keyword-in-title', + title: 'label label-primary', description: "This keyword is used in the page title", } : htmlPage.isInDescription(keyword) ? { - title: 'keyword-in-description', + title: 'label label-info', description: "This keyword is used in the page description", } : htmlPage.isInBody(keyword) ? { - title: 'keyword-in-body', + title: 'label label-info', description: "This keyword is used in the page content." } : { title: "", description: "" }; } @@ -58,7 +58,7 @@ }); website.seo.SuggestionList = openerp.Widget.extend({ - template: 'website.seo_list', + template: 'website.seo_suggestion_list', init: function (parent, options) { this.root = options.root; this.htmlPage = options.page; @@ -155,7 +155,9 @@ }); } else { var companyName = self.htmlPage.company().toLowerCase(); - self.add(companyName); + if (companyName != 'yourcompany') { + self.add(companyName); + } } }, keywords: function () { @@ -361,24 +363,19 @@ }).appendTo(self.$('.js_seo_tips')); } var htmlPage = this.htmlPage; - if (htmlPage.headers('h1').length === 0) { - tips.push({ - type: 'warning', - message: "This page seems to be missing an <h1> tag.", - }); - } - if (htmlPage.headers('h1').length > 1) { - tips.push({ - type: 'warning', - message: "The page contains more than one <h1> tag.", - }); - } + + // desactivated as too complex for end-users + // if (htmlPage.headers('h1').length === 0) { + // tips.push({ + // type: 'warning', + // message: "This page seems to be missing a title.", + // }); + // } + if (tips.length > 0) { _.each(tips, function (tip) { displayTip(tip.message, tip.type); }); - } else { - displayTip("The markup on this page is appropriate for search engines.", 'success'); } }, confirmKeyword: function (e) { diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index 4630e1f294b..96a38a75d32 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -6,16 +6,18 @@

-

-

Get this page efficiently referenced in Google to attract more visitors.

+
Promote This Page
+
+ Get this page efficiently referenced in Google to attract more visitors. +
-

1. Define keywords describing your page content

+

1. Define Keywords describing your page content

- +
@@ -26,12 +28,12 @@
- Most searched topics related your keywords, ordered by importance: + Most searched topics related to your keywords, ordered by importance:
-

2. Choose a title and description containing keywords relevant to what people are searching on the web

-
+

2. Reference Your Page using above suggestions

+
@@ -52,22 +54,27 @@
-
-
- or Discard -
+
+ +
- -
    + +
    + +
    + +
    +     +
    @@ -75,7 +82,7 @@ -
    +
    x diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index c75e32893a0..e5dde368154 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -35,12 +35,12 @@ drop in this zone
    -

    +

    Tip: when your cursor is in a valid zone, OpenERP shows you a preview of the building block in the page. You must release the block when the preview is visible. -

    +
    -- cgit v1.2.3