From cdb5a74c624bac713990850b3cb1cdb51c989ec2 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 29 Oct 2013 11:45:48 +0100
Subject: [PATCH 1/3] [FIX] CMS: blog archives urls

bzr revid: ddm@openerp.com-20131029104548-899tj5oyi3j4qorr
---
 addons/website_blog/static/src/js/website_blog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_blog/static/src/js/website_blog.js b/addons/website_blog/static/src/js/website_blog.js
index df9f2ea3081..ef26187f3c2 100644
--- a/addons/website_blog/static/src/js/website_blog.js
+++ b/addons/website_blog/static/src/js/website_blog.js
@@ -11,7 +11,7 @@ $(document).ready(function () {
             $.post('/blog/nav', {'domain': $(this).data("domain")}, function (result) {
                 var blog_id = +window.location.pathname.split("/").pop();
                 $(JSON.parse(result)).each(function () {
-                    var $a = $('<a href="/blog/' + this.category_id + '/' + this.id + '"/>').text(this.name);
+                    var $a = $('<a href="/blog/' + this.id + '"/>').text(this.name);
                     var $li = $("<li/>").append($a);
                     if (blog_id == this.id)
                         $li.addClass("active");

From 6b1e4d49b20eb8e633df446558da64ca9becad79 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 29 Oct 2013 13:31:43 +0100
Subject: [PATCH 2/3] [FIX] website_hr_recruitment: wording'n shit

following apr review:

* in apply form, the resume shouldn't be required (nbd: shouldn't it
  be configurable by the company, really? In fact, shouldn't the whole
  application form be configurable? What if you're $BIG_CORP and you
  want a contract signed with the blood of the applicant's firstborn?)

* the message at the end of the applying process should be: "Congrats,
  we received your application, we will contact you soon to complete
  the recruitment process " or something like that

bzr revid: xmo@openerp.com-20131029123143-lqpm2vpwfa86cuhu
---
 .../views/website_hr_recruitment.xml          | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 548645f25cd..947f26a57bd 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -38,10 +38,10 @@
                                             </t>
                                             <h4 class="media-heading"><a t-attf-href="/job/detail/#{ job.id }/"><span t-field="job.name"> </span></a></h4>
                                             <div t-if="companies[0].country_id">
-                                                <i class="icon-map-marker"></i> <span t-field="companies[0].city"> </span>  <span t-if="companies[0].state_id" t-field="companies[0].state_id.name"> </span>, <span t-field="companies[0].country_id.name"> </span>
+                                                <i class="icon-map-marker"/> <span t-field="companies[0].city"> </span>  <span t-if="companies[0].state_id" t-field="companies[0].state_id.name"> </span>, <span t-field="companies[0].country_id.name"> </span>
                                             </div>
                                             <div class="text-muted">
-                                                <i class="icon-time"></i> <span><t t-esc="vals[job.id]['date_recruitment']"/></span>
+                                                <i class="icon-time"/> <span><t t-esc="vals[job.id]['date_recruitment']"/></span>
                                             </div>
                                         </div>
                                     </li>
@@ -77,11 +77,11 @@
                     </div>
                 </div>
                 <div class="oe_structure" style="clear:both;">
-                    <h1 class="text-center" t-field="job.name"></h1>
+                    <h1 class="text-center" t-field="job.name"/>
                     <h5 class="text-center">
-                        <i class="icon-map-marker"></i> <span t-field="job.company_id.city"> </span>  <span t-if="job.company_id.state_id" t-field="job.company_id.state_id.name"> </span>, <span t-field="job.company_id.country_id.name"> </span></h5>
+                        <i class="icon-map-marker"/> <span t-field="job.company_id.city"> </span>  <span t-if="job.company_id.state_id" t-field="job.company_id.state_id.name"> </span>, <span t-field="job.company_id.country_id.name"> </span></h5>
                     <h5 class="text-center text-muted">
-                                    <i class="icon-time"></i> <span><t t-esc="vals_date"/></span>
+                                    <i class="icon-time"/> <span><t t-esc="vals_date"/></span>
                     </h5>
                 </div>            
                 <div class="container oe_structure">
@@ -109,7 +109,7 @@
                 <t t-set="additional_title">Apply Job</t>
                 <div id="wrap">
                     <div class="container">
-                        <h1 class="text-center">Apply for <span t-field="job.name"></span></h1>
+                        <h1 class="text-center">Apply for <span t-field="job.name"/></h1>
                         <div class="row">
                             <section id="forms">
                                 <form class="form-horizontal mt32" action="/job/success" method="post" enctype="multipart/form-data">
@@ -137,7 +137,7 @@
                                     <div class="form-group">
                                         <label class="col-md-3 col-sm-4 control-label" for="ufile">Resume</label>
                                         <div class="col-md-7 col-sm-8">
-                                            <input class="input-file" id="fileInput" type="file" name="ufile" required="true"/>
+                                            <input class="input-file" id="fileInput" type="file" name="ufile"/>
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -154,10 +154,14 @@
         </template>
         <template id="thankyou">
             <t t-call="website.layout">
-                <t t-set="additional_title">Thank You!</t>
-        <div id="wrap">
+                <div id="wrap">
                     <div class="container">
-            <h1>You have successfully applied for job.</h1>
+                        <h1>Thank you!</h1>
+                        <p>
+                            We have received your application for the position,
+                            we will contact you soon for the next part of the
+                            recruitment process.
+                        </p>
                     </div>
                 </div>
             </t>

From 4a3f51bb4ee8926d143d59959a1bd8dd2de8e2cf Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 29 Oct 2013 13:57:23 +0100
Subject: [PATCH 3/3] [FIX] add pre-published partners for website_membership
 as asked by apr

bzr revid: xmo@openerp.com-20131029125723-udqca792hwf9mwd5
---
 addons/website_membership/__openerp__.py      |  5 ++---
 addons/website_membership/demo/membership.xml | 10 ++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 addons/website_membership/demo/membership.xml

diff --git a/addons/website_membership/__openerp__.py b/addons/website_membership/__openerp__.py
index afa4aa5e3b7..40b92a8ed13 100644
--- a/addons/website_membership/__openerp__.py
+++ b/addons/website_membership/__openerp__.py
@@ -10,9 +10,8 @@ Website for browsing Associations, Groups and Memberships
 """,
     'author': 'OpenERP SA',
     'depends': ['website_partner', 'website_google_map', 'association'],
-    'data': [
-        'views/website_membership.xml',
-    ],
+    'data': ['views/website_membership.xml',],
+    'demo': ['demo/membership.xml'],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
 }
diff --git a/addons/website_membership/demo/membership.xml b/addons/website_membership/demo/membership.xml
new file mode 100644
index 00000000000..e6c12639526
--- /dev/null
+++ b/addons/website_membership/demo/membership.xml
@@ -0,0 +1,10 @@
+<openerp>
+    <data noupdate="1">
+        <record id="base.res_partner_9" model="res.partner">
+            <field name="website_published" eval="True"/>
+        </record>
+        <record id="base.res_partner_2" model="res.partner">
+            <field name="website_published" eval="True"/>
+        </record>
+    </data>
+</openerp>