[MERGE] trunk-website-demo-partner-bth

bzr revid: chm@openerp.com-20131128173621-ge78agxfpmxcbytu

diff --cc addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
index 0cb05a2,0cb05a2..6e9bed1
--- 1/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
--- 2/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
@@@ -19,6 -19,6 +19,22 @@@
              <field name="marital">single</field>
          </record>
  
++        <record id="res_partner_onss" model="res.partner">
++            <field name="street">54 Rue Jean Baptiste Colette BP </field>
++            <field name="city">Attiches</field>
++            <field name="zip">59551</field>
++            <field name="country_id" ref="base.fr"/>
++            <field name="email">onss@yourcompany.example.com</field>
++        </record>
++        <record id="res_partner_pp" model="res.partner">
++            <field name="street">Shanghai Branch</field>
++            <field name="street2">Anshun Road 83, Room 1603 - </field>
++            <field name="city">Shanghai</field>
++            <field name="zip">200052</field>
++            <field name="country_id" ref="base.cn"/>
++            <field name="email">fiscal@yourcompany.example.com</field>
++        </record>
++    
      </data>
  </openerp>
  

diff --cc addons/membership/__openerp__.py
index 4a0a806,46e5e42..ba61956
--- 1/addons/membership/__openerp__.py
--- 2/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@@ -47,7 -47,9 +47,10 @@@ invoice and send propositions for membe
          'report/report_membership_view.xml',
          'process/membership_process.xml',
      ],
-     'demo': ['membership_demo.xml'],
 -    'demo': ['membership_demo.xml',
++    'demo': [
++        'membership_demo.xml',
+         'membership_demo.yml'
+     ],
      'test': ['test/test_membership.yml'],
      'installable': True,
      'auto_install': False,

diff --cc addons/website/static/src/css/website.css
index b5c176e,ee19ccd..c7fa9ca
--- 1/addons/website/static/src/css/website.css
--- 2/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@@ -431,28 -374,105 +431,65 @@@ ul.nav-stacked > li > a 
    height: 450px;
  }
  
 -/* -- Hack for removing double scrollbar from mobile preview -- */
 -div#mobile-preview.modal {
 -  overflow: hidden;
 -  overflow-y: hidden;
 -}
 -
 -ul.nav-stacked > li > a {
 -  padding: 2px 15px;
 -}
 -
 -#customize-menu .dropdown-header {
 -  text-transform: uppercase;
 -}
 -
 -/* ---- PUBLISH ---- */
 -a[data-publish] {
 -  text-decoration: none !important;
 -}
 -a[data-publish] .css_unpublish, a[data-publish] .css_publish, a[data-publish] .css_unpublished, a[data-publish] .css_published {
 -  display: none;
 -}
 -a[data-publish][data-publish='off'] .css_unpublished, a[data-publish][data-publish='off']:hover .css_publish {
 -  display: inline;
 -}
 -a[data-publish][data-publish='off']:hover .css_unpublished {
 -  display: none;
 -}
 -a[data-publish][data-publish='on'] .css_published, a[data-publish][data-publish='on']:hover .css_unpublish {
 -  display: inline;
 -}
 -a[data-publish][data-publish='on']:hover .css_published {
 -  display: none;
 -}
 -
 -.dropdown .css_unpublish, .dropdown .css_publish {
 -  display: none;
 -}
 -
 -.dropdown.css_publish .css_unpublish, .dropdown.css_unpublish .css_publish {
 -  display: block;
 +/* Background */
 +.oe_dark {
 +  background: #eff8f8;
 +  background: rgba(100, 200, 200, 0.14);
 +  -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
 +  -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
 +  box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset;
  }
  
 -.unpublish {
 -  opacity: 0.5;
 +.oe_black {
 +  background-color: rgba(0, 0, 0, 0.9);
  }
  
 -[data-publish='off']:not(a) > :not(.js_publish) {
 -  opacity: 0.5;
 +.oe_green {
 +  background-color: rgba(0, 128, 0, 0.8);
  }
  
 -[data-publish]:not(a) {
 -  position: relative;
 -  overflow: visible;
 -  /*&:hover .js_publish */
 -  /*     display: block */
 -}
 -[data-publish]:not(a) .js_publish {
 -  position: absolute;
 -  right: -6px;
 -  top: -10px;
 -  display: none;
 +.oe_red {
 +  background-color: rgba(255, 0, 0, 0.8);
  }
  
 -::selection {
 -  background: rgba(150, 150, 220, 0.3);
 +.oe_img_bg {
 +  height: 100%;
 +  background-size: 100%;
  }
+ 
+ .texttop {
+   vertical-align: top;
+ }
++
+ table.well tr th {
+   text-align: right;
+   padding-right: 10px;
+ }
 -
 -table.well tr td span {
++table.well tr td {
+   padding-right: 5px;
++}
+ 
+ .logo-img {
+   width: 220px;
+ }
+ 
+ .oe_demo {
+   position: relative;
+ }
+ .oe_demo img {
+   width: 100%;
+ }
+ .oe_demo div {
+   position: absolute;
+   left: 0;
+   background-color: rgba(0, 0, 0, 0.4);
+   opacity: 0.85;
+   bottom: 0px;
+   width: 100%;
+   padding: 7px;
+   color: white;
+   font-weight: bold;
+ }
+ .oe_demo div a {
+   color: white;
+ }

diff --cc addons/website/static/src/css/website.sass
index fc309da,460d87f..faa17d0
--- 1/addons/website/static/src/css/website.sass
--- 2/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@@ -322,19 -284,84 +322,49 @@@ ul.nav-stacked > li > 
          height: 300px
      &.oe_big
          height: 450px
 -/* -- Hack for removing double scrollbar from mobile preview -- */
 -div#mobile-preview.modal
 -    overflow: hidden
 -    overflow-y: hidden
 -
 -ul.nav-stacked > li > a
 -    padding: 2px 15px
  
 -#customize-menu .dropdown-header
 -    text-transform: uppercase
 -
 -/* ---- PUBLISH ---- */
 -a[data-publish]
 -    text-decoration: none !important
 -    .css_unpublish, .css_publish, .css_unpublished, .css_published
 -        display: none
 -    &[data-publish='off']
 -        .css_unpublished, &:hover .css_publish
 -            display: inline
 -        &:hover .css_unpublished
 -            display: none
 -    &[data-publish='on']
 -        .css_published, &:hover .css_unpublish
 -            display: inline
 -        &:hover .css_published
 -            display: none
 -
 -.dropdown .css_unpublish, .dropdown .css_publish
 -    display: none
 -.dropdown.css_publish .css_unpublish, .dropdown.css_unpublish .css_publish
 -    display: block
 -
 -.unpublish
 -    opacity: 0.5
 -[data-publish='off']:not(a)
 -    >:not(.js_publish)
 -        opacity: 0.5
 -[data-publish]:not(a)
 -    position: relative
 -    overflow: visible
 -    .js_publish
 -        position: absolute
 -        right: -6px
 -        top: -10px
 -        display: none
 -    /*&:hover .js_publish*/
 -    /*     display: block*/
 -
 -::selection
 -    background: rgba(150, 150, 220, 0.3)
 +/* Background */
 + 
 +.oe_dark
 +    background: #eff8f8
 +    background: rgba(100, 200, 200, 0.14)
 +    +box-shadow(0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset)
 +.oe_black
 +    background-color: rgba(0, 0, 0, 0.9)
 +.oe_green
 +    background-color: rgba(0, 128, 0, 0.8)
 +.oe_red
 +    background-color: rgba(255, 0, 0, 0.8)
 +.oe_img_bg
 +    height: 100%
-     background-size: 100%
++    background-size: 100%
+ 
+ .texttop
+     vertical-align: top
+ 
+ table.well tr
+     th
+         text-align: right
+         padding-right: 10px
+     td
+         padding-right: 5px
+ 
+ .logo-img
+     width: 220px
+ 
 -
+ .oe_demo
+     position: relative
+     img
+         width: 100%
+     div
+         position: absolute
+         left: 0
+         background-color: rgba(0,0,0,0.4)
+         opacity: 0.85
+         bottom: 0px
+         width: 100%
+         padding: 7px
+         color: white
+         font-weight: bold
+         a
+             color: white