pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]Merge trunk-website-al.

Browse Source 
bzr revid: bth@tinyerp.com-20131030050933-9p1786l0zgcbelar
This commit is contained in:
bth-openerp
2013-10-30 10:39:33 +05:30
parent 19d139fa60 4a3f51bb4e
commit e11e4c8a30
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_blog/static/src/js/website_blog.js
+1 -1
View File
@@ -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");
addons/website_hr_recruitment/views/website_hr_recruitment.xml
+14 -10
View File
@@ -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>
addons/website_membership/__openerp__.py
+2 -3
View File
@@ -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,
}
addons/website_membership/demo/membership.xml
+10
View File
@@ -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>