[IMP] website: name connected user; carousel selection; imp drop zone
authorChristophe Matthieu <chm@openerp.com>
Mon, 23 Sep 2013 12:56:06 +0000 (14:56 +0200)
committerChristophe Matthieu <chm@openerp.com>
Mon, 23 Sep 2013 12:56:06 +0000 (14:56 +0200)
bzr revid: chm@openerp.com-20130923125606-b6pcr52dai0yh2ia

1  2 
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website/views/views.xml
addons/website/website.py
addons/website_mail/views/website_mail.xml

                          <link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>
                      </head>
                      <body>
 -                        <header>
 -                            <div class="navbar navbar-default navbar-static-top">
 -                                <div class="container">
 -                                    <div class="navbar-header">
 -                                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-top-collapse">
 -                                            <span class="sr-only">Toggle navigation</span>
 -                                            <span class="icon-bar"></span>
 -                                            <span class="icon-bar"></span>
 -                                            <span class="icon-bar"></span>
 -                                        </button>
 -                                        <a class="navbar-brand" href="/page/website.homepage"><em>Your</em><b>Company</b></a>
 -                                    </div>
 -                                    <div class="collapse navbar-collapse navbar-top-collapse">
 -                                        <ul class="nav navbar-nav navbar-right" id="top_menu">
 -                                            <li name="contactus"><a href="/page/website.contactus">Contact us</a></li>
 -                                            <li t-if="user_id.id == website.public_user.id"><a href="/admin">Sign in</a></li>
 -                                            <li t-if="user_id.id != website.public_user.id"><a href="/admin"><t t-field="user_id.name"/></a></li>
 -                                            <li t-if="len(website.language_ids) &gt; 1" class="dropdown">
 -                                                <!-- TODO: use flags for language selection -->
 -                                                <t t-set="lang_selected" t-value="[lg for lg in website.language_ids if lg.code == lang]"/>
 -                                                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
 -                                                    <t t-esc="lang_selected[0]['name']"/> <span class="caret"></span>
 -                                                </a>
 -                                                <ul class="dropdown-menu" role="menu">
 -                                                    <li t-foreach="website.language_ids" t-as="lg">
 -                                                        <a href="#" role="menuitem">
 -                                                            <strong t-att-class="'icon-check' if lg.code == lang
 -                                                                else 'icon-check-empty'"></strong>
 -                                                            <t t-esc="lg.name"/>
 -                                                        </a>
 -                                                    </li>
 -                                                </ul>
 -                                            </li>
 -                                        </ul>
 +                        <div id="wrapwrap">
 +                            <header>
 +                                <div class="navbar navbar-default navbar-static-top">
 +                                    <div class="container">
 +                                        <div class="navbar-header">
 +                                            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-top-collapse">
 +                                                <span class="sr-only">Toggle navigation</span>
 +                                                <span class="icon-bar"></span>
 +                                                <span class="icon-bar"></span>
 +                                                <span class="icon-bar"></span>
 +                                            </button>
 +                                            <a class="navbar-brand" href="/page/website.homepage"><em>Your</em><b>Company</b></a>
 +                                        </div>
 +                                        <div class="collapse navbar-collapse navbar-top-collapse">
 +                                            <ul class="nav navbar-nav navbar-right" id="top_menu">
-                                                 <li><a href="/page/website.contactus">Contact us</a></li>
-                                                 <li><a href="/admin">Sign in</a></li>
++                                                <li name="contactus"><a href="/page/website.contactus">Contact us</a></li>
++                                                <li t-if="user_id.id == website.public_user.id"><a href="/admin">Sign in</a></li>
++                                                <li t-if="user_id.id != website.public_user.id"><a href="/admin"><t t-field="user_id.name"/></a></li>
 +                                                <li t-if="len(website.language_ids) &gt; 1" class="dropdown">
 +                                                    <!-- TODO: use flags for language selection -->
 +                                                    <t t-set="lang_selected" t-value="[lg for lg in website.language_ids if lg.code == lang]"/>
 +                                                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
 +                                                        <t t-esc="lang_selected[0]['name']"/> <span class="caret"></span>
 +                                                    </a>
 +                                                    <ul class="dropdown-menu" role="menu">
 +                                                        <li t-foreach="website.language_ids" t-as="lg">
 +                                                            <a href="#" role="menuitem">
 +                                                                <strong t-att-class="'icon-check' if lg.code == lang
 +                                                                    else 'icon-check-empty'"></strong>
 +                                                                <t t-esc="lg.name"/>
 +                                                            </a>
 +                                                        </li>
 +                                                    </ul>
 +                                                </li>
 +                                            </ul>
 +                                        </div>
                                      </div>
                                  </div>
 -                            </div>
 -                        </header>
 -                        <t t-raw="0"/>
 -                        <footer>
 -                            <div class="container" id="footer_container">
 -                                <div class="row">
 -                                    <div class="col-md-3" name="product">
 -                                        <h4>Our products &amp; Services</h4>
 -                                        <ul class="list-unstyled" name="products">
 -                                            <li><a href="/">Home</a></li>
 -                                        </ul>
 +                            </header>
 +                            <t t-raw="0"/>
 +                            <footer>
 +                                <div class="container" id="footer_container">
 +                                    <div class="row">
 +                                        <div class="col-md-3" name="product">
 +                                            <h4>Our products &amp; Services</h4>
 +                                            <ul class="list-unstyled" name="products">
 +                                                <li><a href="/">Home</a></li>
 +                                            </ul>
 +                                        </div>
 +                                        <div class="col-md-3" name="info">
 +                                            <h4 name="info_title">Connect with us</h4>
 +                                            <ul class="list-unstyled">
 +                                                <li><a href="/page/website.contactus">Contact us</a></li>
 +                                            </ul>
 +                                            <ul class="list-unstyled">
 +                                                <li><i class="icon-phone"></i> <span t-field="res_company.phone"></span></li>
 +                                                <li><i class="icon-envelope"></i>  <span t-field="res_company.email"></span></li>
 +                                            </ul>
 +                                            <h1>
 +                                                <a href="http://twitter.com/openerp"><i class="icon-twitter-sign"></i></a>
 +                                                <a href="http://facebook.com/OpenERP"><i class="icon-facebook-sign"></i></a>
 +                                                <a href="https://plus.google.com/+openerp/posts"><i class="icon-google-plus-sign"></i></a>
 +                                            </h1>
 +                                        </div>
 +                                        <div class="col-md-5 col-lg-offset-1" name="about_us">
 +                                            <h4>
 +                                                <span t-field="res_company.name">Your Company</span>
 +                                                <small> - <a href="/page/website.aboutus">About us</a></small>
 +                                            </h4>
 +                                            <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>
 -                                    <div class="col-md-3" name="info">
 -                                        <h4 name="info_title">Connect with us</h4>
 -                                        <ul class="list-unstyled">
 -                                            <li><a href="/page/website.contactus">Contact us</a></li>
 -                                        </ul>
 -                                        <ul class="list-unstyled">
 -                                            <li><i class="icon-phone"></i> <span t-field="res_company.phone"></span></li>
 -                                            <li><i class="icon-envelope"></i>  <span t-field="res_company.email"></span></li>
 -                                        </ul>
 -                                        <h1>
 -                                            <a href="http://twitter.com/openerp"><i class="icon-twitter-sign"></i></a>
 -                                            <a href="http://facebook.com/OpenERP"><i class="icon-facebook-sign"></i></a>
 -                                            <a href="https://plus.google.com/+openerp/posts"><i class="icon-google-plus-sign"></i></a>
 -                                        </h1>
 +                                </div>
 +                                <div class="container mt16">
 +                                    <div class="pull-right" t-ignore="1">
 +                                        Create a <a href="http://openerp.com/apps/website">free website</a> with
 +                                        <a class="label label-danger" href="https://openerp.com/apps/website">OpenERP</a>
                                      </div>
 -                                    <div class="col-md-5 col-lg-offset-1" name="about_us">
 -                                        <h4>
 -                                            <span t-field="res_company.name">Your Company</span>
 -                                            <small> - <a href="/page/website.aboutus">About us</a></small>
 -                                        </h4>
 -                                        <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 class="pull-left text-muted">
 +                                        Copyright &amp;copy; <span t-field="res_company.name">Company name</span> - <a href="/sitemap">Sitemap</a>
                                      </div>
                                  </div>
 -                            </div>
 -                            <div class="container mt16">
 -                                <div class="pull-right" t-ignore="1">
 -                                    Create a <a href="http://openerp.com/apps/website">free website</a> with
 -                                    <a class="label label-danger" href="https://openerp.com/apps/website">OpenERP</a>
 -                                </div>
 -                                <div class="pull-left text-muted">
 -                                    Copyright &amp;copy; <span t-field="res_company.name">Company name</span> - <a href="/sitemap">Sitemap</a>
 -                                </div>
 -                            </div>
 -                        </footer>
 +                            </footer>
 +                        </div>
                      </body>
                  </html>
          </template>
@@@ -97,13 -98,14 +98,14 @@@ class website(osv.osv)
          if values is None:
              values = {}
  
 -        values.update({
 -            'request': request,
 -            'registry': request.registry,
 -            'json': simplejson,
 -            'website': request.website,
 -            'res_company': request.website.company_id,
 -            'user_id': user.browse(cr, openerp.SUPERUSER_ID, uid),
 -        })
 +        values.update(
 +            request=request,
 +            registry=request.registry,
 +            json=simplejson,
 +            website=request.website,
 +            res_company=request.website.company_id,
++            user_id=user.browse(cr, openerp.SUPERUSER_ID, uid),
 +        )
  
          qweb_context.update(values)
          context = {
      <!-- Layout add nav and footer -->
  
      <template id="header_footer_custom" inherit_id="website.layout">
-         <xpath expr="//header//ul[@id='top_menu']/li[last()]" position="before">
 -        <xpath expr="//body/header//ul[@id='top_menu']/li[@name='contactus']" position="before">
++        <xpath expr="//header//ul[@id='top_menu']/li[@name='contactus']" position="before">
              <li><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
          </xpath>
 -        <xpath expr="//body/footer//div[@name='info']/ul" position="inside">
 +        <xpath expr="//footer//div[@name='info']/ul" position="inside">
              <li><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
          </xpath>
      </template>