[MERGE] Merge from trunk

bzr revid: mit@openerp.com-20111221154120-0eufl8mf7whd5avr

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/xml/base.xml
index 556f47e,ef7437c..8ed0f69
--- 1/addons/web/static/src/xml/base.xml
--- 2/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@@ -262,30 -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>
++      <div id="logo"><img src='/web/static/src/img/logo2.png'/></div>
 +      <form action="" method="post">
 +        <div class="dbpane" >
 +          Database: 
 +          <input name="db"></input>
 +        </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>