openerp-dev-web team mailing list archive

["Jiten \(OpenERP\)" <jra@xxxxxxxxxxx>]

Jiten (OpenERP) has proposed merging lp:~openerp-dev/openobject-client-web/trunk-proto61-mobile-login-page into lp:~openerp-dev/openobject-client-web/trunk-proto61-mobile.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-proto61-mobile-login-page/+merge/61357

Login page for web mobile interface.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-proto61-mobile-login-page/+merge/61357
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-client-web/trunk-proto61-mobile-login-page into lp:~openerp-dev/openobject-client-web/trunk-proto61-mobile.

=== modified file 'addons/web_mobile/static/src/web_mobile.html'
=== modified file 'addons/web_mobile/static/src/xml/mobile.xml'
--- addons/web_mobile/static/src/xml/mobile.xml	2011-05-17 11:54:38 +0000
+++ addons/web_mobile/static/src/xml/mobile.xml	2011-05-18 08:41:20 +0000
@@ -3,6 +3,7 @@
 -->
 
 <templates id="template" xml:space="preserve">
+<<<<<<< TREE
 <t t-name="WebClient">
 	<div id="oe_login">
     </div>
@@ -144,4 +145,96 @@
 
 
 
+=======
+
+<t t-name="MobileInterface">
+	<div id="oe_loading" class="loading"></div>
+	<div id="oe_login" class="login"></div>
+	<table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
+        t-att-class="'main_table' + (typeof kitten == 'undefined' ? '' : ' kitten-mode-activated')">
+    <tr>
+        <td colspan="2">
+            <div id="oe_header" class="header"></div>
+            <div id="oe_menu" class="menu"></div>
+        </td>
+    </tr>
+    </table>
+</t>
+	
+<t t-name="Loading">
+    Loading...
+</t>
+
+<t t-name="Login">
+<form>
+	<div style="top: 279.5px;" class="ui-loader ui-body-a ui-corner-all"><span class="ui-icon ui-icon-loading spin"></span><h1>loading</h1></div><div class="ui-page ui-body-c ui-page-active" data-url="docs/lists/lists-divider.html" data-role="page">
+	
+		<div role="banner" class="ui-bar-d ui-header" data-role="header" data-theme="b">
+			<h1 aria-level="1" role="heading" tabindex="0" class="ui-title">OpenERP</h1>
+		</div><!-- /header -->
+	
+		<div role="main" class="ui-content" data-role="content">
+			<fieldset>
+				<div class="ui-field-contain ui-body ui-br" data-role="fieldcontain">
+					<label class="select ui-select">Database:</label>
+						<input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" name="db" value="trunk" type="text" />
+				
+					<label class="ui-input-text" for="name">Login:</label>
+						<input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" name="login" value="admin" type="text" />
+					
+					<label class="ui-input-text" for="name">Password:</label>
+						<input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" name="password" value="" type="password" />
+		
+					<input class="ui-input-text ui-body-null ui-corner-all ui-shadow-inset ui-body-c" name="submit" id="submit" value="Login" type="submit" />
+				</div>
+			</fieldset>
+		</div>
+	
+	</div>
+</form>
+</t>
+<t t-name="Header">
+    <a href="/" class="company_logo_link">
+        <img t-att-src="typeof kitten == 'undefined' ? '/base/static/src/img/logo.png' :
+            'http://placekitten.com/g/179/46'" border="0" class="company_logo"/>
+    </a>
+    <h1 class="header_title" t-if="session.session_is_valid()">
+        <span class="company">$company</span> - (<span class="database">$database</span>)<br/>
+        <small class="username">$username session_id: <t t-esc="session.session_id"/></small>
+    </h1>
+    <div class="header_corner">
+        <ul class="block" t-if="session.session_is_valid()">
+            <li>
+                <a href="#home" title="Home" class="home"><img src="/base/static/src/img/header-home.png" width="16" height="16" border="0"/></a>
+            </li>
+            <li>
+                <a href="#requests" title="Requests" class="requests"><img src="/base/static/src/img/header-requests.png" width="16" height="16" border="0"/><small>1</small></a>
+            </li>
+            <li class="preferences">
+                <a href="#preferences" title="Preferences" class="preferences"><img src="/base/static/src/img/header-preferences.png" width="16" height="16" border="0"/></a>
+            </li>
+            <li>
+                <a href="#about" title="About" class="about"><img src="/base/static/src/img/header-about.png" width="16" height="16" border="0"/></a>
+            </li>
+            <li>
+                <a href="http://doc.openerp.com/v6.0/book?version=$version"; title="Help" target="_blank" class="help"><img src="/base/static/src/img/header-help.png" width="16" height="16" border="0"/></a>
+            </li>
+        </ul>
+        <div class="block">
+            <a href="#logout" class="logout">LOGOUT</a>
+        </div>
+
+    </div>
+</t>
+<t t-name="Menu">
+    <ul>
+        <li t-foreach="data.children" t-as="menu">
+            <a href="#" t-att-data-menu="menu.id">
+                <span><t t-esc="menu.name"/></span>
+            </a>
+        </li>
+    </ul>
+</t>
+
+>>>>>>> MERGE-SOURCE
 </templates>

=== modified file 'openerpweb/openerpweb.py'
--- openerpweb/openerpweb.py	2011-05-02 13:19:04 +0000
+++ openerpweb/openerpweb.py	2011-05-18 08:41:20 +0000
@@ -496,7 +496,8 @@
                         return m(**kw)
             raise cherrypy.NotFound('/' + '/'.join(l))
         else:
-            raise cherrypy.HTTPRedirect('/base/static/src/base.html', 301)
+            raise cherrypy.HTTPRedirect('/web_mobile/static/src/web_mobile.html', 301)
+
     default.exposed = True
 
 def main(argv):