[imp] before merge

bzr revid: ahu@openerp.com-20111226163735-o53sk7407fuh3w67

diff --git a/addons/web_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css
index 8e40377..db37c97 100644 (file)
--- a/addons/web_dashboard/static/src/css/dashboard.css
+++ b/addons/web_dashboard/static/src/css/dashboard.css
@@ -369,10 +369,10 @@
   box-shadow: 0 1px 2px #bbb;
 }
 
-.openerp .welcome_message {
+.openerp .oe_welcome_message {
     display:none;
 }
-.openerp .initial_welcome_message {
+.openerp .oe_initial_welcome_message {
     width:30%;
     text-align:center;
     margin:10px 35% 0 35%;
@@ -392,7 +392,7 @@
     text-shadow: #fff 0 1px 0;
 }
 
-.openerp .initial_welcome_message ul{
+.openerp .oe_initial_welcome_message ul{
     padding:10px 0 0 0;
     margin:0;
     list-style-type: none;
@@ -401,7 +401,7 @@
     background-repeat: no-repeat;
     cursor: pointer;
 }
-.openerp .initial_welcome_message ul a, .openerp .initial_welcome_message ul a:hover, .openerp .initial_welcome_message ul a:active, .openerp .initial_welcome_message ul a:focus {
+.openerp .oe_initial_welcome_message ul a, .openerp .initial_welcome_message ul a:hover, .openerp .initial_welcome_message ul a:active, .openerp .initial_welcome_message ul a:focus {
     color:#222;
     text-decoration:none;
 }

diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml
index c623c94..84b14f9 100644 (file)
--- a/addons/web_dashboard/static/src/xml/web_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@ -106,22 +106,28 @@
 
 <t t-name="web_dashboard.ApplicationTiles">
     <div>
-        <h1 class="welcome_message">Welcome to OpenERP</h1>
        <div class="oe_applications_tiles">
-       <h1>Welcome to OpenERP</h1>
+       <h1 class="oe_welcome_message">Welcome to OpenERP</h1>
                </div>
     </div>
 </t>
 
 <div t-name="web_dashboard.ApplicationInstaller">
-    <div class="initial_welcome_message">
+    <div class="oe_initial_welcome_message">
         <ul>
-            <li>Remember to bookmark <a href="javascript:if(document.all) window.external.AddFavorite(location.href,document.title); else if(window.sidebar) window.sidebar.addPanel (document.title,location.href,'');">this page.</a></li>
-            <li>Remember your login: <t t-esc="widget.session.username"/></li>
+            <li>Remember to bookmark 
+                <a class="oe_welcome_url" href="#">
+                This url 
+                </a>
+            </li>
+            <li>Your login: <t t-esc="widget.session.username"/></li>
         </ul>
-        <h3>Please choose the first application to install.</h3>
     </div>
     <div class="oe_installer" />
 </div>
-
+<t t-extend="web_dashboard.ApplicationInstaller">
+    <t t-jquery=".oe_welcome_url">
+        this.attr('href', window.location.host);
+    </t>
+</t>
 </template>

diff --git a/addons/web_diagram/static/src/css/base_diagram.css b/addons/web_diagram/static/src/css/base_diagram.css
index 0dd8483..6be8d48 100644 (file)
--- a/addons/web_diagram/static/src/css/base_diagram.css
+++ b/addons/web_diagram/static/src/css/base_diagram.css
@@ -6,3 +6,30 @@
 .openerp .oe_diagram_buttons {
     float: left;
 }
+
+/*.openerp .dhx_canvas_text {
+    padding:30px 0 0 10px;
+    -webkit-transform: rotate(60deg);
+    -moz-transform: rotate(60deg);
+    -o-transform: rotate(60deg);
+    -ms-transform: rotate(60deg);
+    transform: rotate(60deg);
+}
+
+.openerp .dhx_canvas_text.dhx_axis_item_y, .openerp .dhx_canvas_text.dhx_axis_title_x {
+    padding: 0px;
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    transform: rotate(0deg);
+}
+
+.openerp .dhx_canvas_text.dhx_axis_title_y {
+    padding: 0;
+    -webkit-transform: rotate(270deg);
+    -moz-transform: rotate(270deg);
+    -o-transform: rotate(270deg);
+    -ms-transform: rotate(270deg);
+    transform: rotate(270deg);
+} */