[IMP]Improved website_mail module and removed dependency from website_contract.

bzr revid: bth@tinyerp.com-20130827132439-77uo7dgacx3xhyv0

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 57acf28..d9c67b2 100644 (file)
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -202,4 +202,14 @@ header .collapse ul {
 }
 .navbar-nav>li>a {
   padding:10px 15px 10px;
+}
+/* -- Hack for nav header -- */
+.nav > li.nav-header {
+    display: block;
+    font-size: 11px;
+    font-weight: bold;
+    line-height: 20px;
+    color: #999999;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+    text-transform: uppercase;
 }
\ No newline at end of file

diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index ef6dc5d..4a87ab5 100644 (file)
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -144,4 +144,13 @@ header
 
 .navbar-nav >li >a
   padding:10px 15px 10px
-      
\ No newline at end of file
+
++/* -- Hack for nav header -- */
+.nav > li.nav-header
+    display: block
+    font-size: 11px
+    font-weight: bold
+    line-height: 20px
+    color: #999999
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
+    text-transform: uppercase

diff --git a/addons/website_contract/__openerp__.py b/addons/website_contract/__openerp__.py
index 978552d..3be3877 100644 (file)
--- a/addons/website_contract/__openerp__.py
+++ b/addons/website_contract/__openerp__.py
@@ -9,7 +9,7 @@ OpenERP Blog
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'sale', 'website_crm_partner_assign'],
+    'depends': ['website', 'sale'],
     'data': [
         'views/website_contract.xml',
     ],

diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 79f4f86..1c5f767 100644 (file)
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -108,15 +108,15 @@
     <template id="blog_history" inherit_id="website_mail.index" inherit_option_id="website_mail.index" name="History">
         <xpath expr="//div[@id='left_column']" position="inside">
             <ul class="nav nav-pills nav-stacked">
-                <li><a t-attf-href="/blog/#{ mail_group_id }/">BLOG ARCHIVE</a></li>
+                <li class="nav-header"><a t-attf-href="/blog/#{ mail_group_id }/">BLOG ARCHIVE</a></li>
                 <!-- TODO: check qweb iteration -->
                 <li t-foreach="nav_list" t-as="year" class="js_nav_year">
                     <t t-set="year" t-value="nav_list[year]"/>
                     <a href="#"><t t-esc="year['name']"/> <small>(<t t-esc="year['date_count']"/>)</small></a>
-                    <ul class="nav nav-list css_nav_month">
+                    <ul class="nav list-group css_nav_month" style="padding-left: 16px;">
                         <t t-foreach="year['months']">
                             <li class="js_nav_month"><a href="#" t-att-data-domain="__domain"><t t-esc="date"/> <small>(<t t-esc="date_count"/>)</small></a>
-                                <ul class="nav nav-list"/>
+                                <ul class="nav list-group"/>
                             </li>
                         </t>
                     </ul>