[IMP] Website HR WIP

bzr revid: fp@openerp.com-20130929182813-l6v41ud970gifqd6

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 845c94c..3d9c209 100644 (file)
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -315,15 +315,25 @@
               <t t-set="title">About <t t-raw="res_company.name"></t>
               </t>
               <div id="wrap" class="oe_structure">
-                <div class="container">
-                    <h2>About us</h2>
+                <div class="container mb32">
                     <div class="row">
-                        <div class="col-md-4">
-                            <h3>Our vision</h3>
-                            <p>Contact us about anything related to our company or services.</p>
-                            <p>We'll do our best to get back to you as soon as possible.</p>
+                        <div class="col-sm-12 text-center">
+                            <h1>About us</h1>
+                            <h3 class="text-muted">A passion for great products</h3>
+                        </div>
+                        <div class="col-sm-8 mt16">
+                            <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 class="col-sm-3 col-sm-offset-1">
+                            <img src="/website/static/src/img/library/business_conference.jpg" class="img img-responsive shadow" alt="Out Team"/>
                         </div>
-                        <div class="col-md-8"></div>
                     </div>
                 </div>
               </div>

diff --git a/addons/website_hr/hr.py b/addons/website_hr/hr.py
index 105a60c..169d430 100644 (file)
--- a/addons/website_hr/hr.py
+++ b/addons/website_hr/hr.py
@@ -7,6 +7,7 @@ class hr(osv.osv):
     _inherit = 'hr.employee'
     _columns = {
         'website_published': fields.boolean('Available in the website'),
+        'public_info': fields.text('Public Info'),
     }
 
     def img(self, cr, uid, ids, field='image_small', context=None):

diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index 3445694..3e3368d 100644 (file)
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -12,7 +12,7 @@
 
     <!-- Layout add nav and footer -->
 
-    <template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
+    <template id="footer_custom" inherit_id="website.layout" name="Jobs">
         <xpath expr="//footer//div[@name='info']/ul" position="inside">
             <li><a t-href="/blog/%(website_hr.website_mail_job)d/">Jobs</a></li>
         </xpath>
@@ -22,27 +22,27 @@
 
  
     <template id="aboutus" inherit_id="website.aboutus">
-        <xpath expr="//div[@class='col-md-8']" position="inside">
+        <xpath expr="//div[@class='row']" position="inside">
             <t t-set="head">
                 <t t-raw="head or ''"/>
             </t>
-            <h3>Our team</h3>
-            <div class="thumbnails">
-                <div t-foreach="employee_ids" t-as="employee" class="col-md-4 mt16">
-                    <div class="media img-thumbnail" data-publish="">
-                        <t t-call="website.publish_management"><t t-set="object" t-value="employee"/></t>
-                        <a class="pull-left" href="#">
-                            <img class="media-object" t-att-src="employee.img('image_small')"/>
-                        </a>
-                        <div class="media-body" style="min-height: 64px; min-width: 130px;">
-                            <h5 class="media-heading" t-field="employee.name"/>
-                            <div t-field="employee.department_id"/>
-                            <div t-field="employee.job_id"/>
-                            <div t-field="employee.work_location"/>
-                            <div t-field="employee.work_phone"/>
-                            <div t-field="employee.work_email"/>
-                            <div t-field="employee.public_info"/>
-                        </div>
+            <div class="col-sm-12 text-center">
+                <h2>Our team</h2>
+            </div>
+            <div t-foreach="employee_ids" t-as="employee" class="col-md-4 mt16">
+                <div class="img-rounded" data-publish="">
+                    <t t-call="website.publish_management"><t t-set="object" t-value="employee"/></t>
+                    <a class="pull-left" href="#">
+                        <img t-att-src="employee.img('image_small')"/>
+                    </a>
+                    <div style="min-height: 64px; min-width: 130px;">
+                        <h5 t-field="employee.name"/>
+                        <div t-field="employee.department_id"/>
+                        <div t-field="employee.job_id"/>
+                        <div t-field="employee.work_location"/>
+                        <div t-field="employee.work_phone"/>
+                        <div t-field="employee.work_email"/>
+                        <div t-field="employee.public_info"> </field>
                     </div>
                 </div>
             </div>