From 65ac532462eeac41222ac1e863752c205bdad90d Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 17 Aug 2012 17:12:29 +0200
Subject: [PATCH 1/7] darker purple and config view alignment

bzr revid: mit@openerp.com-20120817151229-iuujaaw5aflujgzq
---
 addons/web/static/src/css/base.css  | 40 +++++++++++++++++------------
 addons/web/static/src/css/base.sass | 10 +++++---
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 87a83b4c70e..81e179c8de9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -234,7 +234,7 @@
   font-size: 13px;
 }
 .openerp .ui-widget-content a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .ui-menu .ui-menu-item {
   margin: 0 8px 0 0;
@@ -336,7 +336,7 @@
   border-radius: 0 0 2px 2px;
 }
 .openerp.ui-dialog .oe_about a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp.ui-dialog .oe_about a:hover {
   text-decoration: underline;
@@ -547,7 +547,7 @@
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  color: #8a89ba;
+  color: #7c7bad;
   font-weight: bold;
 }
 .openerp .oe_button.oe_link span:hover {
@@ -578,7 +578,7 @@
   color: #4c4c4c;
 }
 .openerp .oe_tag_dark {
-  background: #8786b7;
+  background: #7c7bad;
   color: #eeeeee;
 }
 .openerp .oe_tags.oe_inline {
@@ -1180,7 +1180,7 @@
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu {
   padding: 2px 0 8px 0;
@@ -1202,7 +1202,7 @@
   top: 1px;
   right: 1px;
   font-size: 10px;
-  background: #8a89ba;
+  background: #7c7bad;
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
@@ -1222,7 +1222,7 @@
   padding: 1px 4px;
 }
 .openerp .oe_secondary_submenu .oe_active {
-  background: #8a89ba;
+  background: #7c7bad;
   border-top: 1px solid lightGray;
   border-bottom: 1px solid lightGray;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1235,7 +1235,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_label {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
   text-shadow: 0 1px 1px white;
   -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1243,7 +1243,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
@@ -1273,7 +1273,7 @@
   width: 100%;
 }
 .openerp .oe_application a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_application a:hover {
   text-decoration: underline;
@@ -1314,7 +1314,7 @@
   float: left;
 }
 .openerp .oe_view_manager table.oe_view_manager_header h2 a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
   display: inline-block;
@@ -1673,7 +1673,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer h3 {
   margin: 8px 4px 4px 12px;
-  color: #8786b7;
+  color: #7c7bad;
   font-size: 13px;
 }
 .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
@@ -1955,7 +1955,7 @@
   padding: 16px 0 48px;
 }
 .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
-  margin: 25px 0 10px 0;
+  margin: 12px 0 8px 0;
 }
 .openerp .oe_form div.oe_form_configuration p {
   color: #aaaaaa;
@@ -1964,6 +1964,12 @@
 .openerp .oe_form div.oe_form_configuration label {
   min-width: 150px;
 }
+.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label {
+  padding: 2px 0;
+}
+.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
+  padding: 1px 0;
+}
 .openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable {
   display: inline-block;
   padding-right: 18px;
@@ -2074,7 +2080,7 @@
   background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
 .openerp ul.oe_form_steps_clickable li .label {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp ul.oe_form_steps_clickable li.oe_active:hover {
   background-color: #4c85c2;
@@ -2155,7 +2161,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 120px;
+  min-width: 160px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
@@ -2187,7 +2193,7 @@
   font-weight: bold;
   font-size: 20px;
   margin: 8px 0px 8px 0px;
-  color: #53637e;
+  color: #7c7bad;
 }
 .openerp .oe_horizontal_separator:empty {
   height: 5px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6472f7aaacd..3463a25ad79 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1522,12 +1522,16 @@ $sheet-max-width: 860px
             padding: 16px 0 48px
         div.oe_form_configuration
             div.oe_horizontal_separator 
-                margin: 25px 0 10px 0
+                margin: 12px 0 8px 0
             p
                 color: #aaa
                 max-width: 650px
             label
                 min-width: 150px
+            .oe_form_group_cell_label
+                padding: 2px 0
+            .oe_form_group_cell div div
+                padding: 1px 0
                 
 
     ul.oe_form_steps, ul.oe_form_steps_clickable
@@ -1650,7 +1654,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 160px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group
@@ -1680,7 +1684,7 @@ $sheet-max-width: 860px
         font-weight: bold
         font-size: 20px
         margin: 8px 0px 8px 0px
-        color: #53637e
+        color: $section-title-color
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator

From fff594348ae8ada571b4e9e7e6a0e16b5c306037 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 17 Aug 2012 17:55:51 +0200
Subject: [PATCH 2/7] fixed the 'more' dropdown menu

bzr revid: mit@openerp.com-20120817155551-4eq9lumqderd09rl
---
 addons/web/static/src/css/base.css  | 16 ++++---------
 addons/web/static/src/css/base.sass | 35 +++++++++++++----------------
 addons/web/static/src/js/chrome.js  |  1 +
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 81e179c8de9..c15a37b26f5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1032,14 +1032,6 @@
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_topbar .oe_topbar_item .oe_active {
-  background: #303030;
-  font-weight: bold;
-  color: white;
-  -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-  -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-  box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-}
 .openerp .oe_topbar .oe_topbar_avatar {
   width: 24px;
   height: 24px;
@@ -1150,10 +1142,10 @@
   padding: 0;
   margin: 0;
 }
-.openerp .oe_menu li {
+.openerp .oe_menu > li {
   float: left;
 }
-.openerp .oe_menu a {
+.openerp .oe_menu > li > a {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
@@ -1162,14 +1154,14 @@
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp .oe_menu a:hover {
+.openerp .oe_menu > li > a:hover {
   background: #303030;
   color: white;
   -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_menu .oe_active {
+.openerp .oe_menu > li > .oe_active {
   background: #303030;
   font-weight: bold;
   color: white;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3463a25ad79..db56bdbacfa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -810,11 +810,6 @@ $sheet-max-width: 860px
                 background: #303030
                 color: white
                 @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-            .oe_active
-                background: #303030
-                font-weight: bold
-                color: white
-                @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
 
         .oe_topbar_avatar
             width: 24px
@@ -902,25 +897,25 @@ $sheet-max-width: 860px
         float: left
         padding: 0
         margin: 0
-        li
+        > li
             float: left
-        a
-            display: block
-            padding: 5px 10px 7px
-            line-height: 20px
-            height: 20px
-            color: #eee
-            vertical-align: top
-            text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            &:hover
+            > a
+                display: block
+                padding: 5px 10px 7px
+                line-height: 20px
+                height: 20px
+                color: #eee
+                vertical-align: top
+                text-shadow: 0 1px 1px rgba(0,0,0,0.2)
+                &:hover
+                    background: #303030
+                    color: white
+                    @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
+            > .oe_active
                 background: #303030
+                font-weight: bold
                 color: white
                 @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-        .oe_active
-            background: #303030
-            font-weight: bold
-            color: white
-            @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
     .oe_secondary_menu_section
         font-weight: bold
         margin-left: 8px
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ff066c9f425..e28aa97bbf5 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -730,6 +730,7 @@ instance.web.Menu =  instance.web.Widget.extend({
             var $more = $(QWeb.render('Menu.more')),
                 $index = this.$element.find('li').eq(maximum_visible_links - 1);
             $index.after($more);
+            //$('.oe_topbar').append($more);
             $more.find('.oe_menu_more').append($index.next().nextAll());
         }
     },

From 2501b06ca0dec18c98f2b9d73b64a7b0aebe13e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 20 Aug 2012 14:22:43 +0200
Subject: [PATCH 3/7] [IMP] removed left and top bar from printing

bzr revid: fva@openerp.com-20120820122243-z9wtrkpb2ub79enf
---
 addons/web/static/src/css/base.css  | 41 ++++++++++++++++-------------
 addons/web/static/src/css/base.sass |  4 +++
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 87a83b4c70e..2276bb2445e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -64,6 +64,11 @@
   }
 }
 
+@media print {
+  .oe_topbar, .oe_leftbar, .oe_loading {
+    display: none !important;
+  }
+}
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -234,7 +239,7 @@
   font-size: 13px;
 }
 .openerp .ui-widget-content a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .ui-menu .ui-menu-item {
   margin: 0 8px 0 0;
@@ -336,7 +341,7 @@
   border-radius: 0 0 2px 2px;
 }
 .openerp.ui-dialog .oe_about a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp.ui-dialog .oe_about a:hover {
   text-decoration: underline;
@@ -547,7 +552,7 @@
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  color: #8a89ba;
+  color: #7c7bad;
   font-weight: bold;
 }
 .openerp .oe_button.oe_link span:hover {
@@ -578,7 +583,7 @@
   color: #4c4c4c;
 }
 .openerp .oe_tag_dark {
-  background: #8786b7;
+  background: #7c7bad;
   color: #eeeeee;
 }
 .openerp .oe_tags.oe_inline {
@@ -1007,7 +1012,7 @@
 .openerp .oe_topbar {
   width: 100%;
   height: 31px;
-  border-top: solid 1px #d3d3d3;
+  border-top: solid 1px lightgrey;
   background-color: #646060;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
   background-image: -webkit-linear-gradient(top, #646060, #262626);
@@ -1180,7 +1185,7 @@
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu {
   padding: 2px 0 8px 0;
@@ -1202,11 +1207,11 @@
   top: 1px;
   right: 1px;
   font-size: 10px;
-  background: #8a89ba;
+  background: #7c7bad;
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1222,9 +1227,9 @@
   padding: 1px 4px;
 }
 .openerp .oe_secondary_submenu .oe_active {
-  background: #8a89ba;
-  border-top: 1px solid lightGray;
-  border-bottom: 1px solid lightGray;
+  background: #7c7bad;
+  border-top: 1px solid lightgrey;
+  border-bottom: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1235,7 +1240,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_label {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
   text-shadow: 0 1px 1px white;
   -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1243,7 +1248,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
@@ -1273,7 +1278,7 @@
   width: 100%;
 }
 .openerp .oe_application a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_application a:hover {
   text-decoration: underline;
@@ -1314,7 +1319,7 @@
   float: left;
 }
 .openerp .oe_view_manager table.oe_view_manager_header h2 a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
   display: inline-block;
@@ -1673,7 +1678,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer h3 {
   margin: 8px 4px 4px 12px;
-  color: #8786b7;
+  color: #7c7bad;
   font-size: 13px;
 }
 .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
@@ -2074,7 +2079,7 @@
   background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
 .openerp ul.oe_form_steps_clickable li .label {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp ul.oe_form_steps_clickable li.oe_active:hover {
   background-color: #4c85c2;
@@ -2174,7 +2179,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6472f7aaacd..653adad7813 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -142,6 +142,10 @@ $sheet-max-width: 860px
         opacity: 1
 // }}}
 
+@media print
+    .oe_topbar, .oe_leftbar, .oe_loading
+        display: none !important
+
 .openerp.openerp_webclient_container
     height: 100%
     position: relative

From 8d1836bd30f8d06b2da6e36c8b34d250b73847b0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Aug 2012 11:30:00 +0200
Subject: [PATCH 4/7] [IMP] improved loading messages

bzr revid: nicolas.vanhoren@openerp.com-20120821093000-4jf6lh7a8o124hsd
---
 addons/web/static/src/js/coresetup.js | 25 +++++++++++++++++++++++++
 addons/web/static/src/xml/base.xml    |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 229a82a1784..a34a7dadd30 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -528,6 +528,14 @@ if ($.blockUI) {
     $.blockUI.defaults.css["background-color"] = '';
 }
 
+var messages_by_seconds = [
+    [0, "Loading..."],
+    [30, "Still Loading..."],
+    [60, "Still Loading...<br />Please be patient."],
+    [120, "Hey, guess what?<br />It's still loading."],
+    [300, "You may not believe it,<br/>but the application is actually loading..."],
+];
+
 instance.web.Throbber = instance.web.Widget.extend({
     template: "Throbber",
     start: function() {
@@ -548,6 +556,23 @@ instance.web.Throbber = instance.web.Widget.extend({
           left: 'auto' // Left position relative to parent in px
         };
         this.spin = new Spinner(opts).spin(this.$element[0]);
+        this.start_time = new Date().getTime();
+        this.act_message();
+    },
+    act_message: function() {
+        var self = this;
+        setTimeout(function() {
+            if (self.isDestroyed())
+                return;
+            var seconds = (new Date().getTime() - self.start_time) / 1000;
+            var mes;
+            _.each(messages_by_seconds, function(el) {
+                if (seconds >= el[0])
+                    mes = el[1];
+            });
+            self.$(".oe_throbber_message").html(mes);
+            self.act_message();
+        }, 1000);
     },
     destroy: function() {
         if (this.spin)
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c91c156a2c4..330a5b3928f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1736,7 +1736,7 @@
         <div class="oe_blockui_spin" style="height: 50px">
         </div>
         <br />
-        <div style="color:white">Loading...</div>
+        <div class="oe_throbber_message" style="color:white"></div>
     </div>
 </t>
 </templates>

From 0fdded4d4e8dd77ec8ee1739bbb97f20f0a8b557 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Aug 2012 12:44:03 +0200
Subject: [PATCH 5/7] [IMP] minor improvement in linkedin module

bzr revid: nicolas.vanhoren@openerp.com-20120821104403-qbmv0tjyngauwfou
---
 addons/web_linkedin/static/src/js/linkedin.js   | 1 +
 addons/web_linkedin/static/src/xml/linkedin.xml | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index c15b995bff9..5bcb03aab33 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -270,6 +270,7 @@ openerp.web_linkedin = function(instance) {
         template: "LinkedIn.KeyWizard", 
         init: function(parent, text) {
             this._super(parent, {title:_t("LinkedIn API Key")});
+            this.api_domain = window.location.origin;
         },
         start: function() {
             this._super();
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 0d062e6fd8c..f114fa53803 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -41,8 +41,7 @@
                 <li>Log into LinkedIn.</li>
                 <li>Add a new application and fill the form:
                     <ul>
-                        <li>JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com)</li>
-                        <li>You can give multiple domain (e.g. yourcompany.my.openerp.com)</li>
+                        <li>JavaScript API Domain: <t t-esc="widget.api_domain"/></li>
                         <li>The programming tool is Javascript</li>
                     </ul>
                 </li>

From 552f5f8ef4b97bdd030f59f96763c821a36f5287 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 12:51:13 +0200
Subject: [PATCH 6/7] [FIX] add a missing dependence

bzr revid: abo@openerp.com-20120821105113-u7bty92d2lfea8q5
---
 addons/portal/__openerp__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 84a3b562133..84091a54347 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -25,6 +25,7 @@
     'depends' : [
         'base',
         'share',
+        'auth_anonymous',
         'auth_signup',
     ],
     'author' : 'OpenERP SA',
@@ -45,8 +46,8 @@ very handy when used in combination with the module 'share'.
     'data': [
         'security/portal_security.xml',
         'security/ir.model.access.csv',
-        'portal_view.xml',
         'portal_data.xml',
+        'portal_view.xml',
         'wizard/portal_wizard_view.xml',
         'wizard/share_wizard_view.xml',
     ],

From c06c6930718807781bc45052d2bea6cd0765abbb Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 13:01:35 +0200
Subject: [PATCH 7/7] [IMP] organization of views and data

bzr revid: abo@openerp.com-20120821110135-12mud78ddjwhmd8c
---
 addons/portal/portal_data.xml | 23 ++---------------------
 addons/portal/portal_view.xml | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 58f2fc3e9d4..ddfb4cc6729 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
@@ -10,7 +10,7 @@
 
         <!-- Mail group for the company's news -->
         <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news feed</field>
+            <field name="name">Company's news</field>
         </record>
 
         <record id="action_news" model="ir.actions.act_window">
@@ -32,24 +32,5 @@
             <field name="view_mode">form</field>
         </record>
 
-        <!-- Top menu item -->
-        <menuitem name="Portal"
-            id="portal_menu"
-            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
-            sequence="20"/>
-
-            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
-                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
-                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
-
-            <!--
-                Create menu items that we'll leave empty for now - they'll be
-                filled up by other portal modules.
-            -->
-            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
-            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
-            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
-            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
-
     </data>
 </openerp>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 831db25e26a..dd720d448ef 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -2,6 +2,25 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
+        <menuitem name="Portal"
+            id="portal_menu"
+            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
+            sequence="20"/>
+
+            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
+                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+
+            <!--
+                Create menu items that we'll leave empty for now - they'll be
+                filled up by other portal modules.
+            -->
+            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
+            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
+            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
+
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
             <field name="name">Portal List</field>