[merge] merge proposal soon refused

bzr revid: ahu@openerp.com-20111222141625-vo57xyuhdhznnums

1 files changed, 32 insertions, 79 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 781ec6ad98e..b7266734c05 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -19,6 +19,7 @@
 </t>
 <t t-name="Interface">
     <div id="oe_loading"></div>
+
     <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
     <tr>
         <td colspan="2" valign="top">
@@ -36,15 +37,14 @@
             <div id="oe_database" class="database"></div>
         </td>
         <td valign="top">
-        	<div id="oe_db_options"></div>
+         <div id="oe_db_options"></div>
         </td>
     </tr>
     <tr>
         <td colspan="2" valign="top" height="100%">
             <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
             <tr>
-                <td valign="top" id="oe_secondary_menu" class="secondary_menu">
-                </td>
+                <td valign="top" id="oe_secondary_menu" class="secondary_menu"></td>
                 <td valign="top" class="oe-application-container">
                     <div id="oe_app" class="oe-application">
                     </div>
@@ -262,80 +262,30 @@
 </t>
 
 <t t-name="Login">
-    <div>
-    <form class="oe_forms">
-        <fieldset>
-            <legend style="">
-                <img t-att-src='_s + "/web/static/src/img/stock_person.png"' alt="" />
-            </legend>
-            <div class="oe_box2">
-                <table align="center" cellspacing="2px" cellpadding="0">
-                    <tr>
-                        <td><label for="db">Database:</label></td>
-                        <td>
-                            <input type="text" name="db" t-att-value="widget.selected_db || ''" autofocus="true"/>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><label for="login">User:</label></td>
-                        <td><input type="text" name="login"
-                            t-att-value="widget.selected_login || ''" autofocus="true"/></td>
-                    </tr>
-                    <tr>
-                        <td><label for="password">Password:</label></td>
-                        <td><input type="password" name="password"
-                                t-att-value="widget.selected_password || ''"/></td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td>
-                            <button class="oe_button" type="button" id="oe-db-config">Database</button>
-                            <button class="oe_button" name="submit">Login</button>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </fieldset>
-        <div class="login_error_message">Bad username or password</div>
-    </form>
-    <div class="oe_login_right_pane">
-        <p>We think that daily job activities can be more intuitive, efficient, automated, .. and even fun.</p>
-        <h3>OpenERP's vision to be:</h3>
-
-        <table cellpadding="0" cellspacing="0" width="100%" style="border:none;">
-            <tbody>
-            <tr>
-                <td>
-                    <img t-att-src='_s + "/web/static/src/img/product.png"'/>
-                </td>
-                <td>
-                    <strong>Full featured</strong><br />
-                    Today's enterprise challenges are multiple. We provide one module for each need.
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img t-att-src='_s + "/web/static/src/img/accessories-archiver.png"'/>
-                </td>
-                <td>
-                    <strong>Open Source</strong><br />
-                    To Build a great product, we rely on the knowledge of thousands of contributors.
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <img t-att-src='_s + "/web/static/src/img/partner.png"' />
-                </td>
-                <td>
-                    <strong>User Friendly</strong><br />
-                    In order to be productive, people need clean and easy to use interface.
-                </td>
-            </tr>
-            </tbody>
-        </table>
-
-    </div>
+  <div>
+    <div class="bottom"> </div>
+    <div class="login_error_message">Invalid username or password</div>
+    <div class="pane">
+      <div id="logo"><img src='/web/static/src/img/logo2.png'/></div>
+      <form action="" method="post">
+        <div class="dbpane" >
+          Database:
+          <input name="db"/>
+        </div>
+        <ul>
+          <li>Username</li>
+          <li><input type="text" name="login" autofocus="autofocus"/></li>
+          <li>Password</li>
+          <li><input type="password" name="password" value=""/></li>
+          <li><button name="submit">Log in</button></li>
+        </ul>
+      </form>
+      <div class="footer">
+        <a href="#" id="oe-db-config">Manage Databases</a> |
+        <a href="http://www.openerp.com">Powered by <span class="openerp">OpenERP</span></a>
+      </div>
     </div>
+  </div>
 </t>
 <t t-name="Header">
     <div>
@@ -716,6 +666,11 @@
     </div>
     <t t-raw="frame.render()"/>
 </t>
+<t t-name="One2Many.formview" t-extend="FormView">
+    <t t-jquery=".oe_form_buttons" t-operation="inner">
+        <button type="button" class="oe_button oe_form_button_create">Create</button>
+    </t>
+</t>
 <t t-name="PageView" t-extend="FormView">
     <t t-jquery=".oe_form_buttons" t-operation="inner">
         <button type="button" class="oe_button oe_form_button_edit">Edit</button>
@@ -840,9 +795,7 @@
     <div class="oe_tooltip_string" t-if="widget.string">
         <t t-esc="widget.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>
     </div>
-    <p t-if="widget.help" class="oe_tooltip_help">
-        <t t-esc="widget.help"/>
-    </p>
+    <p t-if="widget.help" class="oe_tooltip_help"><t t-esc="widget.help"/></p>
     <ul t-if="debug" class="oe_tooltip_technical">
         <li data-item="field" t-if="widget.name">
             <span class="oe_tooltip_technical_title">Field:</span>