[IMP]Remove pager, Date is in grey after place, & description in div.

bzr revid: bth@tinyerp.com-20130930100247-5mq3cijv0enjk6e2

diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py
index 339b0c8..745a9bd 100644 (file)
--- a/addons/website_hr_recruitment/controllers/main.py
+++ b/addons/website_hr_recruitment/controllers/main.py
@@ -40,7 +40,7 @@ class website_hr_recruitment(http.Controller):
         active = id
         step = 5
         pager = request.website.pager(url="/jobs/", total=len(jobpost_ids), page=page, step=step, scope=5)
-        jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, limit=step, offset=pager['offset'])
+        #jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, limit=step, offset=pager['offset'])
         
         values = {
             'active': active,
@@ -49,7 +49,7 @@ class website_hr_recruitment(http.Controller):
             'departments': hr_department_obj.browse(request.cr, request.uid, department_ids),
             'vals': vals,
             'no_of_jobs': len(hr_job_obj.browse(request.cr, request.uid, jobpost_ids)),
-            'pager': pager
+           # 'pager': pager
         }
         return request.website.render("website_hr_recruitment.index", values)
 

diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 146b1a7..8955ae8 100644 (file)
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -25,14 +25,14 @@
                <div id="wrap">
                    <div class="oe_structure"/>
                     <div class="container oe_website_jobs">
-                       <div class="row">
+                       <!--<div class="row">
                            <div class="col-sm-4">
                                <t t-call="website.pager">
                                    <t t-set="classname">pull-left</t>
                                </t>
                            </div>
-                       </div>
-                       <div class='row style_default'>
+                       </div>-->
+                       <div class='row style_default mt16'>
                            <div class="col-md-12" id="jobs_grid">
                                <ul class="media-list">
                                    <li t-foreach="res_job" t-as="job" class="media" data-publish="">
@@ -42,12 +42,12 @@
                                                <span class="label label-default pull-right label-info"><t t-esc="vals[job.id]['count']"/> Vacancies.</span>
                                            </t>
                                            <h4 class="media-heading"><a t-attf-href="/job/detail/#{ job.id }/"><span t-field="job.name"> </span></a></h4>
-                                           <div>
-                                               <i class="icon-time"></i> <span t-esc="vals[job.id]['date_recruitment']"> </span>
-                                           </div>
                                            <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>
                                            </div>
+                                           <div class="text-muted">
+                                               <i class="icon-time"></i> <span><t t-esc="vals[job.id]['date_recruitment']"/></span>
+                                           </div>
                                        </div>
                                    </li>
                                </ul>
@@ -86,7 +86,7 @@
                    <div class="oe_structure" style="clear:both;">
                        <h1 class="text-center" t-field="job.name"></h1>
                        <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"></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>
                        <h5 class="text-center text-muted">
                             <i class="icon-time"></i> <span><t t-esc="vals_date"/></span>
                        </h5>
@@ -96,7 +96,7 @@
                        <hr/>
                        <div class="row">
                            <div t-if="job.website_description">
-                                <t t-field="job.website_description"/>
+                                <div t-field="job.website_description"></div>
                                <section snippet-id="cta" class="mt16 mb16">
                                    <div class="container">
                                        <div class="row">