Merge lp:~openerp-dev/openobject-addons/trunk-website_custom_internal_css-pga into lp:openobject-addons

[Harry (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-website_custom_internal_css-pga]

9373. By Parth Gajjar(Open ERP) on 2014-05-14

merged with latest trunk

9374. By Parth Gajjar(Open ERP) on 2014-05-14

[IMP] imporved custom_css according to assets structure, added custom css view from controller

9375. By Parth Gajjar(Open ERP) on 2014-05-14

minor changes

Unmerged revisions

9375. By Parth Gajjar(Open ERP) on 2014-05-14

minor changes

9374. By Parth Gajjar(Open ERP) on 2014-05-14

[IMP] imporved custom_css according to assets structure, added custom css view from controller

9373. By Parth Gajjar(Open ERP) on 2014-05-14

merged with latest trunk

9372. By Parth Gajjar(Open ERP) on 2014-04-23

[ADD] added template for edit custom internal CSS with sample

=== modified file 'website/controllers/main.py'
--- website/controllers/main.py	2014-05-11 15:40:58 +0000
+++ website/controllers/main.py	2014-05-14 08:50:44 +0000
@@ -193,6 +193,8 @@
 
         view = request.registry.get("ir.ui.view")
         views = view._views_get(request.cr, request.uid, xml_id, context=request.context)
+        v_model, custom_css_id = imd.get_object_reference(request.cr, request.uid, 'website', 'custom_css')
+        views.append(view.browse(request.cr, request.uid, custom_css_id, context=request.context))
         done = {}
         result = []
         for v in views:

=== modified file 'website/views/website_templates.xml'
--- website/views/website_templates.xml	2014-05-13 08:18:31 +0000
+++ website/views/website_templates.xml	2014-05-14 08:50:44 +0000
@@ -11,9 +11,63 @@
     <link rel="stylesheet" href='/website/static/src/css/website.css' t-ignore="true"/>
 </template>
 
+<template id="website.custom_css" name="Custom CSS">
+    <style>
+        /* Add Your CSS Here */
+        /* Below given some sample CSS wrapped in comment */
+        
+        /* Remove this line
+        
+        .navbar-default{
+            background-color: #7c7bad;
+            border-width: 0px;
+            color: white;
+        }
+        .navbar-default .navbar-nav &gt; li &gt; a {
+            color: #fff;
+        }
+        .navbar-default .navbar-nav &gt; .active  &gt; a{
+            background-color: #fff;
+            color:#7c7bad;
+        }
+        .navbar-default .navbar-brand {
+            color: #fff;
+        }
+        
+        a,.btn-link{
+            color:#7c7bad;
+        }
+        a:hover,.btn-link:hover{
+            color:#5f5e97;
+        }
+        
+        .btn-primary {
+            color: #fff;
+            background-color: #7c7bad;
+            border-color: #7c7bad;
+        }
+        .btn-primary:hover, .btn-primary:focus,.btn-primary:active {
+            background-color: #5f5e97;
+            border-color: #5f5e97;
+        }
+        
+        .pagination &gt; li &gt; a {
+            color: #7c7bad;
+        }
+        .pagination &gt; .active &gt; a {
+            background-color: #7c7bad;
+            border-color: #7c7bad;
+        }
+        
+        Remove this line  */
+    </style>
+</template>
+
+
 <template id="website.assets_frontend" name="Website assets">
     <t t-call="web.assets_common"/>
     <t t-call="website.theme"/>
+    <t t-call="website.custom_css"/>
 
     <script type="text/javascript" src="/web/static/src/js/watch.js"></script>