summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSagar Ahirrao <sah@odoo.com>2017-02-28 18:50:20 +0530
committerqsm-odoo <qsm@odoo.com>2017-06-01 17:22:45 +0200
commit5d15bd76c67e72a0eb6fd5e1b99037a3ffa7c5c4 (patch)
treeb082b4dc6e602ff6a58f181676a3b82f55c5c737
parentd18346a103acb13987c104ec580ec86d7bc93f9d (diff)
[IMP] website: add "Company Team" snippet
Introduce a new snippet to show the company team. This commit also introduces a new classe "s_no_resize_cols" to put on a .row element to prevent the size and margins options to be used on the .col-* children. This allows to build some complex layout without having a deep hierarchy of snippet options.
-rw-r--r--addons/website/data/website_data.xml29
-rw-r--r--addons/website/static/src/img/blocks/block_company_team.pngbin0 -> 3542 bytes
-rw-r--r--addons/website/static/src/img/snippets_demo/s_team_member_1.pngbin0 -> 27167 bytes
-rw-r--r--addons/website/static/src/img/snippets_demo/s_team_member_2.pngbin0 -> 38588 bytes
-rw-r--r--addons/website/static/src/img/snippets_demo/s_team_member_3.pngbin0 -> 33107 bytes
-rw-r--r--addons/website/static/src/img/snippets_demo/s_team_member_4.pngbin0 -> 36359 bytes
-rw-r--r--addons/website/static/src/less/website.snippets.less10
-rw-r--r--addons/website/views/snippets.xml79
8 files changed, 115 insertions, 3 deletions
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 9344ed70e4a..8c6d57b65d1 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -399,5 +399,34 @@
<field name="url">/website/static/src/img/snippets_demo/s_references_5.png</field>
</record>
+ <record id="website.s_company_team_image_1" model="ir.attachment">
+ <field name="public" eval="True"/>
+ <field name="name">Company Team Snippet - Image 1</field>
+ <field name="datas_fname">s_company_team_image_1.png</field>
+ <field name="type">url</field>
+ <field name="url">/website/static/src/img/snippets_demo/s_team_member_1.png</field>
+ </record>
+ <record id="website.s_company_team_image_2" model="ir.attachment">
+ <field name="public" eval="True"/>
+ <field name="name">Company Team Snippet - Image 2</field>
+ <field name="datas_fname">s_company_team_image_2.png</field>
+ <field name="type">url</field>
+ <field name="url">/website/static/src/img/snippets_demo/s_team_member_2.png</field>
+ </record>
+ <record id="website.s_company_team_image_3" model="ir.attachment">
+ <field name="public" eval="True"/>
+ <field name="name">Company Team Snippet - Image 3</field>
+ <field name="datas_fname">s_company_team_image_3.png</field>
+ <field name="type">url</field>
+ <field name="url">/website/static/src/img/snippets_demo/s_team_member_3.png</field>
+ </record>
+ <record id="website.s_company_team_image_4" model="ir.attachment">
+ <field name="public" eval="True"/>
+ <field name="name">Company Team Snippet - Image 4</field>
+ <field name="datas_fname">s_company_team_image_4.png</field>
+ <field name="type">url</field>
+ <field name="url">/website/static/src/img/snippets_demo/s_team_member_4.png</field>
+ </record>
+
</data>
</odoo>
diff --git a/addons/website/static/src/img/blocks/block_company_team.png b/addons/website/static/src/img/blocks/block_company_team.png
new file mode 100644
index 00000000000..cb21ff00357
--- /dev/null
+++ b/addons/website/static/src/img/blocks/block_company_team.png
Binary files differ
diff --git a/addons/website/static/src/img/snippets_demo/s_team_member_1.png b/addons/website/static/src/img/snippets_demo/s_team_member_1.png
new file mode 100644
index 00000000000..a7a887c5d71
--- /dev/null
+++ b/addons/website/static/src/img/snippets_demo/s_team_member_1.png
Binary files differ
diff --git a/addons/website/static/src/img/snippets_demo/s_team_member_2.png b/addons/website/static/src/img/snippets_demo/s_team_member_2.png
new file mode 100644
index 00000000000..52316d5268e
--- /dev/null
+++ b/addons/website/static/src/img/snippets_demo/s_team_member_2.png
Binary files differ
diff --git a/addons/website/static/src/img/snippets_demo/s_team_member_3.png b/addons/website/static/src/img/snippets_demo/s_team_member_3.png
new file mode 100644
index 00000000000..45bc32e6ab3
--- /dev/null
+++ b/addons/website/static/src/img/snippets_demo/s_team_member_3.png
Binary files differ
diff --git a/addons/website/static/src/img/snippets_demo/s_team_member_4.png b/addons/website/static/src/img/snippets_demo/s_team_member_4.png
new file mode 100644
index 00000000000..7b1dcb484d4
--- /dev/null
+++ b/addons/website/static/src/img/snippets_demo/s_team_member_4.png
Binary files differ
diff --git a/addons/website/static/src/less/website.snippets.less b/addons/website/static/src/less/website.snippets.less
index aa9704f2002..0171b7eb9c4 100644
--- a/addons/website/static/src/less/website.snippets.less
+++ b/addons/website/static/src/less/website.snippets.less
@@ -416,3 +416,13 @@ div.carousel {
.s_parallax {
min-height: 200px;
}
+
+// Company Team
+
+.s_company_team {
+ @media (max-width: @screen-sm-max) {
+ img {
+ max-width: 50%;
+ }
+ }
+}
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 64cc006dbb5..eee4a6f2f3b 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -365,6 +365,78 @@
</section>
</template>
+<template id="s_company_team" name="Company Team">
+ <section class="s_company_team">
+ <div class="container">
+ <h1 class="text-center mb32">
+ Meet the Executive Team
+ </h1>
+ <div class="row">
+ <div class="col-md-6 mb32">
+ <div class="row s_no_resize_cols">
+ <div class="col-md-4">
+ <img src="/web/image/website.s_company_team_image_1" class="img-responsive img-circle center-block shadow"/>
+ </div>
+ <div class="col-md-8">
+ <h4>Tony Fred, CEO</h4>
+ <p class="text-muted">
+ Founder and chief visionary, Tony is the driving force behind Company. He loves
+ to keep his hands full by participating in the development of the software,
+ marketing and the Customer Experience strategies.
+ </p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 mb32">
+ <div class="row s_no_resize_cols">
+ <div class="col-md-4">
+ <img src="/web/image/website.s_company_team_image_2" class="img-responsive img-circle center-block shadow"/>
+ </div>
+ <div class="col-md-8">
+ <h4>Mich Stark, COO</h4>
+ <p class="text-muted">
+ Mich loves taking on challenges. With his multi-year experience as Commercial
+ Director in the software industry, Mich has helped Company to get where it
+ is today. Mich is among the best minds.
+ </p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 mb32">
+ <div class="row s_no_resize_cols">
+ <div class="col-md-4">
+ <img src="/web/image/website.s_company_team_image_3" class="img-responsive img-circle center-block shadow"/>
+ </div>
+ <div class="col-md-8">
+ <h4>Aline Turner, CTO</h4>
+ <p class="text-muted">
+ Aline is one of the iconic person in life who can say she loves what she does.
+ She mentors 100+ in-house developers and looks after the community of over
+ thousands developers.
+ </p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 mb32">
+ <div class="row s_no_resize_cols">
+ <div class="col-md-4">
+ <img src="/web/image/website.s_company_team_image_4" class="img-responsive img-circle center-block shadow"/>
+ </div>
+ <div class="col-md-8">
+ <h4>Iris Joe, CFO</h4>
+ <p class="text-muted">
+ Iris, with her international experience, helps us easily understand the numbers and
+ improves them. She is determined to drive success and delivers her professional
+ acumen to bring Company at the next level.
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </section>
+</template>
+
<template id="s_button" name="Call to Action">
<section class="jumbotron s_button bg-gray-lighter">
<div class="container">
@@ -617,6 +689,7 @@
<div class="o_panel_body">
<t t-snippet="website.s_image_gallery" t-thumbnail="/website/static/src/img/blocks/block_image_gallery.png"/>
<t t-snippet="website.s_comparisons" t-thumbnail="/website/static/src/img/blocks/block_comparison.png"/>
+ <t t-snippet="website.s_company_team" t-thumbnail="/website/static/src/img/blocks/block_company_team.png"/>
<t t-snippet="website.s_button" t-thumbnail="/website/static/src/img/blocks/block_button.png"/>
<t t-snippet="website.s_references" t-thumbnail="/website/static/src/img/blocks/block_references.png"/>
<t t-snippet="website.s_faq_collapse" t-thumbnail="/website/static/src/img/blocks/block_faq.png"/>
@@ -796,7 +869,7 @@
</div>
<div data-js='margin-y'
- data-selector="section, .row > [class*='col-md-'], :not(.o_gallery > .container) > .carousel, .parallax, hr">
+ data-selector="section, .row:not(.s_no_resize_cols) > [class*='col-md-'], :not(.o_gallery > .container) > .carousel, .parallax, hr">
</div>
<div data-js='resize'
@@ -805,8 +878,8 @@
</div>
<div data-js='margin-x'
- data-selector=".row > [class*='col-md-']"
- data-drop-near=".row > [class*='col-md-']">
+ data-selector=".row:not(.s_no_resize_cols) > [class*='col-md-']"
+ data-drop-near=".row:not(.s_no_resize_cols) > [class*='col-md-']">
</div>
<div data-js='content'