summaryrefslogtreecommitdiff
path: root/addons/website
diff options
context:
space:
mode:
Diffstat (limited to 'addons/website')
-rw-r--r--addons/website/static/src/css/editor.css1
-rw-r--r--addons/website/static/src/css/editor.sass9
-rw-r--r--addons/website/static/src/js/website.seo.js35
-rw-r--r--addons/website/static/src/xml/website.seo.xml35
-rw-r--r--addons/website/static/src/xml/website.snippets.xml2
-rw-r--r--addons/website/views/snippets.xml116
-rw-r--r--addons/website/views/views.xml22
7 files changed, 105 insertions, 115 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index e08157124c5..5604c62af75 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -330,6 +330,7 @@ table.editorbar-panel td.selected {
color: white;
height: 48px;
margin-bottom: 32px;
+ padding-top: 12px;
}
/* ---- SNIPPET MANIPULATOR ---- */
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c8854b210ec..7b2800bd849 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -429,15 +429,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 @@
<div class="modal-content">
<div class="modal-header">
<button title="Close" type="button" class="close" data-dismiss="modal">×</button>
- <h3 class="modal-title js_seo_page_url"></h3>
- <h4 class="text-muted">Get this page efficiently referenced in Google to attract more visitors.</h4>
+ <div class="h2">Promote This Page</div>
+ <div class="text-muted">
+ Get this page efficiently referenced in Google to attract more visitors.
+ </div>
</div>
<div class="modal-body">
<div class="js_seo_tips" />
<section class="js_seo_keywords_list">
- <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+ <h3 class="page-header mt16">1. Define Keywords <small>describing your page content</small></h3>
<div class="form-horizontal" role="form">
<div class="form-group">
- <label for="seo_page_keywords" class="col-lg-2 control-label">New keyword</label>
+ <label for="seo_page_keywords" class="col-lg-2 control-label">Add keywords:</label>
<div class="col-lg-4">
<div class="input-group">
<input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
@@ -26,12 +28,12 @@
</div>
</div>
</div>
- <span class="text-muted">Most searched topics related your keywords, ordered by importance:</span>
+ <span class="text-muted">Most searched topics related to your keywords, ordered by importance:</span>
<!-- filled in JS -->
</section>
<section>
- <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
- <div class="form-horizontal" role="form">
+ <h3 class="page-header">2. Reference Your Page <small>using above suggestions</small></h3>
+ <div class="form-horizontal mt16" role="form">
<div class="form-group">
<label for="seo_page_title" class="col-lg-2 control-label">Title</label>
<div class="col-lg-8">
@@ -52,22 +54,27 @@
<!-- filled in JS -->
</div>
</section>
- <hr/>
- <section>
- <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
- </section>
+ </div><div class="modal-footer">
+ <button data-action="discard" data-dismiss="modal" href="#" class="btn btn-default">Discard</button>
+ <button type="button" data-action="update" class="btn btn-primary">Apply Changes</button>
</div>
</div>
</div>
</div>
</t>
- <t t-name="website.seo_list">
- <ul class="list-inline">
+ <t t-name="website.seo_suggestion_list">
+ <ul class="list-inline mb0">
<!-- filled in JS -->
</ul>
</t>
+ <t t-name="website.seo_list">
+ <div>
+ <!-- filled in JS -->
+ </div>
+ </t>
+
<t t-name="website.seo_tip">
<div t-attf-class="alert alert-#{ widget.type }">
<t t-raw="widget.message"/>
@@ -75,7 +82,7 @@
</t>
<t t-name="website.seo_keyword">
- <dl class="dl-horizontal">
+ <dl class="dl-horizontal mt8 mb8">
<dt>
<span t-attf-title="#{ widget.tooltip() }" t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_keyword" t-att-data-keyword="widget.keyword">
<a href="#" class="oe_remove" data-action="remove-keyword">x</a> <t t-raw="widget.keyword"/>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 38e3b82529d..e5dde368154 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -40,7 +40,7 @@
OpenERP shows you a preview of the building block
in the page. You must release the block when the
preview is visible.
- </p>
+ </div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 72a862c722e..1a79d52d5cc 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -6,7 +6,7 @@
<ul class="nav navbar-nav nav-tabs">
<li class="active"><a href="#snippet_structure" data-toggle="tab">Structure</a></li>
<li><a href="#snippet_content" data-toggle="tab">Content</a></li>
- <li><a href="#snippet_business" data-toggle="tab">Business</a></li>
+ <li><a href="#snippet_feature" data-toggle="tab">Features</a></li>
<li><a href="#snippet_effect" data-toggle="tab">Effects</a></li>
</ul>
<div class="tab-content">
@@ -40,6 +40,7 @@
<li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
<li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
<li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
+ <li class="divider"></li>
<li class="oe_custom_bg"><a><b>Chose your picture</b></a></li>
</ul>
</li>
@@ -67,8 +68,8 @@
<div class="item image_text active" style="background-image: url('/website/static/src/img/banner/color_splash.jpg')">
<div class="container" contenteditable="true">
<div class="carousel-caption content">
- <h2>Set Your Banner Title</h2>
- <h3>Customize with the top-left menu</h3>
+ <h2>Your Banner Title</h2>
+ <h3>Click to customize this text</h3>
<p>
<a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
</p>
@@ -94,17 +95,14 @@
<div class="container">
<div class="row">
<div class="col-md-6 mt32">
- <h3>Enterprise Social Network</h3>
+ <h3>A Section Subtitle</h3>
<p>
- Make every employee feel more connected and engaged
- with twitter-like features for your own company. Follow
- people, share best practices, 'like' top ideas, etc.
+ Write one or two paragraphs describing your product or
+ services. To be successful your content needs to be
+ useful to your readers.
</p><p>
- Connect with experts, follow what interests you, share
- documents and promote best practices with OpenERP
- Social application. Get work done with effective
- collaboration across departments, geographies
- and business applications.
+ Start with the customer – find out what they want
+ and give it to them.
</p>
</div>
<div class="col-md-6 mt16 mb16">
@@ -128,16 +126,14 @@
<img class="img-responsive shadow" src="/website/static/src/img/image_text.jpg"/>
</div>
<div class="col-md-6 mt32">
- <h3>Manage Your Shops</h3>
+ <h3>A Section Subtitle</h3>
<p>
- OpenERP's Point of Sale introduces a super clean
- interface with no installation required that runs
- online and offline on modern hardwares.
+ Write one or two paragraphs describing your product,
+ services or a specific feature. To be successful
+ your content needs to be useful to your readers.
</p><p>
- It's full integration with the company inventory
- and accounting, gives you real time statistics and
- consolidations amongst all shops without the hassle
- of integrating several applications.
+ Start with the customer – find out what they want
+ and give it to them.
</p>
</div>
</div>
@@ -155,7 +151,7 @@
<div class="container">
<h1>Sell Online. Easily.</h1>
<p>
- Get your online shop ready in a few clicks with OpenERP Commerce.
+ Write one sentence to convince visitor about your message.
</p>
<p>
<a class="btn btn-primary btn-lg" href="/website.contactus">
@@ -177,23 +173,26 @@
<div class="row">
<div class="col-md-12 text-center mt16 mb32">
<h2>
- OpenERP Project Management
+ A Great Headline
</h2>
- <h3 class="text-muted">Infinitely flexible. Incredibly easy to use.</h3>
+ <h3 class="text-muted">A good subtitle. A very good one.</h3>
</div>
<div class="col-md-12 mb16 mt16">
<p>
- OpenERP's <b>collaborative and realtime</b> 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.
+ A great way to catch reader's attention is to tell a story.
+ Everything you consider writing can be told as a story.
</p><p>
- Organize projects around <b>your own processes</b>. 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.
+ <b>Great stories have personality</b>. Personality
+ connected to your person. This shows up in small
+ quirks like word choices or phrases. Write as you
+ write, not as someone else would write.
+ </p><p>
+ <b>Great stories are for everyone when written for
+ just one</b>. If you try to write with a wide general
+ audience in mind, your story will ring false. It
+ will be bland. No one will be interested. Write for
+ one person. If it’s genuine for the one, it’s
+ genuine for the rest.
</p>
</div>
</div>
@@ -212,7 +211,7 @@
<div class="row">
<div class="col-md-12">
<h1 class="text-center">Your Website Title</h1>
- <h3 class="text-muted text-center">Great products for great people</h3>
+ <h3 class="text-muted text-center">Ans a great subtitle too</h3>
</div>
</div>
</div>
@@ -238,23 +237,22 @@
<div class="container">
<div class="row">
<div class="col-md-12 text-center mt32 mb32">
- <h2>Work with the hardware you already have...</h2>
+ <h2>A Punchy Headline</h2>
</div>
<div class="col-md-12">
<img class="img-responsive" src="/website/static/src/img/big_picture.png" style="margin: 0 auto;"/>
</div>
<div class="col-md-6 col-md-offset-3 mb16 mt16">
<p class="text-center">
- <b>No installation required</b>
+ <b>A Small Subtitle</b>
</p>
<p class="text-center">
- 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.
+ Choose a vibrant image and write an inspiring paragraph
+ about it. It does not have to be long, but it should
+ reinforce your image.
</p>
<p class="text-center">
- <a href="/page/website.contactus">Get more information »</a>
+ <a href="/page/website.contactus">Contact us »</a>
</p>
</div>
</div>
@@ -272,8 +270,8 @@
<div class="container">
<div class="row">
<div class="col-md-12 text-center mt16 mb16">
- <h2>OpenERP HR Features</h2>
- <h3 class="text-muted">Manage your company most important asset: People</h3>
+ <h2>A Great Title</h2>
+ <h3 class="text-muted">And a good subtitle</h3>
</div>
<div class="col-md-4">
<img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
@@ -325,9 +323,8 @@
<span class="oe_snippet_thumbnail_title">Well</span>
</div>
<div class="oe_snippet_body well">
- Manage your sales funnel with no effort with OpenERP CRM. Attract
- leads, follow-up on phone calls and meetings. Analyse the quality
- of your leads to make informed decisions.
+ Explain the benefit you offer. Don't write about products or
+ services here, write about solutions.
</div>
</div>
@@ -339,10 +336,10 @@
</div>
<blockquote class="oe_snippet_body">
<p>
- OpenERP provides essential platform for our project management.
- Things are better organized and more visible with it.
+ Write here a quote from one of your customer. Quotes are are
+ great way to give confidence in your products or services.
</p>
- <small>John Doe, CEO</small>
+ <small>Author of this quote</small>
</blockquote>
</div>
@@ -354,13 +351,12 @@
</div>
<div class="oe_snippet_body panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title">OpenERP Features</h3>
+ <h3 class="panel-title">Feature Title</h3>
</div>
<div class="panel-body">
- 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.
+ Panels are great to compare offers or to emphasize on
+ key features. To compare products, use panels inside
+ columns.
</div>
</div>
</div>
@@ -376,7 +372,7 @@
</div>
-<div id="snippet_business" class="tab-pane fade">
+<div id="snippet_feature" class="tab-pane fade">
<div data-snippet-id="portfolio" data-selector-children=".oe_structure, [data-oe-type=html]">
<div class="oe_snippet_thumbnail">
@@ -643,10 +639,10 @@
<div class="col-md-4 col-md-offset-1 mt16 mb32">
<blockquote data-snippet-id="quote">
<p>
- OpenERP provides essential platform for our project management.
- Things are better organized and more visible with it.
+ Write here a quote from one of your customer. Quotes are are
+ great way to give confidence in your products or services.
</p>
- <small>John Doe, CEO</small>
+ <small>Author of this quote</small>
</blockquote>
</div>
<div class="col-md-4 col-md-offset-2 mt16 mb32">
@@ -713,10 +709,10 @@
<div class="row">
<div class="col-md-12 mt128 mb32">
<h1 class="text-center">
- <b>OpenERP Events Management</b>
+ <b>A Great Title</b>
</h1>
<h3 class="text-center">
- Sell tickets online with the Event app
+ And a motivating subtitle
</h3>
</div>
</div>
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index e09d854321c..0e8dbf422d9 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -133,19 +133,17 @@
<div class="col-md-5 col-lg-offset-1" name="about_us">
<h4>
<span t-field="res_company.name">Your Company</span>
- <small> - <a t-href="/page/website.aboutus">About us</a></small>
+ <small> - <a href="/page/website.aboutus">About us</a></small>
</h4>
- <span> <!-- fix me: not ediatable the editable render in chrome is wrong -->
- <p>
- 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.
- </p>
- <p>
- Our products are designed for small to medium companies willing to optimize
- their performance.
- </p>
- </span>
+ <p>
+ 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.
+ </p>
+ <p>
+ Our products are designed for small to medium companies willing to optimize
+ their performance.
+ </p>
</div>
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-24 14:00:28 +0000