Merge lp:~openerp-dev/openobject-client-web/web-dashboard into lp:openobject-client-web/trunk

[Vaibhav Darji]

Improvements in dashboard.

[lp:~openerp-dev/openobject-client-web/web-dashboard]

3423. By Vaibhav Darji on 2010-10-04

[FIX] Fix header actions for dashboard.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

* Don't change link from OpenERP logo, it should direct to "/" not the openerp website.
* Why still have home() and index()?
* Homepage is broken in webkit (size of sidebar is wrong)
* Margins and paddings are not good for buttons:
  - Image on left of button was removed but padding wasn't.
  - Buttons are too big, remove subtext (in gray), make font size bigger (too small), fix paddings so they're same distance from borders of sidebar as from one another
* Remove "Dashboard" title on left side
* Home is on url /openerp/menu, should be on /openerp after fusion of /openerp and /openerp/home
* There are still references to /openerp/home in code why?
* Handling of menu item actions is broken (in homepage and applications menu): when there is no action associated with the application, we get an error message (e.g. in home page or menu, click on "Administration")

review: Needs Fixing

[lp:~openerp-dev/openobject-client-web/web-dashboard]

3424. By Vaibhav Darji on 2010-10-04

[FIX] Fixes as per reviews.

3425. By Vaibhav Darji on 2010-10-04

[FIX] Fixes.

3426. By Vaibhav Darji on 2010-10-05

[FIX] Fix show tools options.

3427. By Vaibhav Darji on 2010-10-05

[FIX] Fixes for show tools options.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Review as of revision 3425:

* Missing images (Warehouse, Point of Sale, Tools)
  - Point of Sale had an icon, doesn't seem to be implemented
  - Remove "Inventory" (doesn't exist), use its icon for Warehouse
  - Remove "Chat" icon from CSS, there is no chat toplevel application.
  - apr sent icon for Tools (applications-other.png)
* Font on buttons is too small, and they don't size correctly
  as per previous review, remove subtext in gray and make font bigger
* Also bigger font for applications names
* Homepage generates the following errors in Webkit console:
  <div> is not allowed inside <tr>. Inserting <div> before the <table> instead.
  <td> is not allowed inside <div>. Moving <td> into the nearest enclosing <tabe>.
  <table> is not allowed inside <tbody>. Closing the current <table> and inserting the new <table> as a sibling.
  <div> is not allowed inside <tbody>. Inserting <div> before the <table> instead.
* in index() when calling menu() use keyword arguments:
    return self.menu(next=next)
  instead of
    return self.menu(None, next)
* I think menu() can be simplified and custom_action has no reason to be in the application URLs, see if this patch seems to work correctly:

=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py 2010-10-04 13:43:28 +0000
+++ addons/openerp/controllers/root.py 2010-10-05 10:07:55 +0000
@@ -104,22 +104,17 @@
         proxy = rpc.RPCProxy("ir.ui.menu")
         ids = proxy.search([('parent_id', '=', False)], 0, 0, 0, ctx)
         parents = proxy.read(ids, ['name', 'action'], ctx)
- show_tools = False
- if not id and ids:
- id = ids[0]
-
+ show_tools = False
+
+ if next:
+ show_tools = True
         for parent in parents:
             if parent['id'] == id:
+ show_tools = True
                 parent['active'] = 'active'
-
- if parent.get('action'):
- parent['url'] = url('/openerp/menu', active=parent['id'], next=url('/openerp/custom_action', action=parent['id']))
- else:
- parent['url'] = url('/openerp/menu', active=parent['id'])
- if parent['id'] == id:
- show_tools = True
- if next:
- show_tools = True
+ if parent.get('action') and not next:
+ next = url('/openerp/custom_action', action=parent['id'])
+
         tools = []
         if show_tools:
             ids = proxy.search([('parent_id', '=', id)], 0, 0, 0, ctx)

=== modified file 'addons/openerp/controllers/templates/index.mako'
--- addons/openerp/controllers/templates/index.mako 2010-10-04 13:43:28 +0000
+++ addons/openerp/controllers/templates/index.mako 2010-10-05 09:59:35 +0000
@@ -36,7 +36,7 @@
                         <ul>
                             %for parent in parents:
                                 <li>
- <a href="${parent['url']}"
+ <a href="${py.url('/openerp/menu', active=parent['id'])}"
                                        target="_top" class="${parent.get('active', '')}">
     ...

review: Needs Fixing

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Patch probably won't apply anymore as you changed conditional in 3426 and 3427 (for the better i think).

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Though you forgot to remove the now-unused ``show_tools`` flag.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Yeah followup on the errors displayed by webkit, template is basically broken, it doesn't make sense. There are divs in tables directly and in trs as well. And table tags which are not closed but an other table is opened (~line 120 in index.mako)

[lp:~openerp-dev/openobject-client-web/web-dashboard]

3428. By Vaibhav Darji on 2010-10-05

[FIX] Fixed template issue, specified proper class name, Fixes per review.

3429. By Vaibhav Darji on 2010-10-05

[FIX] Fixed default first id when there is no active id.

3430. By Vaibhav Darji on 2010-10-05

[FIX] Fixes for activate parent class when selected.

3431. By Vaibhav Darji on 2010-10-05

[ADD] Image for tools .

[Xavier (Open ERP) (xmo-deactivatedaccount)]

review: Approve

=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py	2010-10-03 11:25:14 +0000
+++ addons/openerp/controllers/root.py	2010-10-05 13:06:51 +0000
@@ -50,45 +50,19 @@
     def index(self, next=None):
         """Index page, loads the view defined by `action_id`.
         """
-        if next: arguments = {'next': next}
-        else: arguments = {'next': '/openerp/home'}
-        
-        proxy = rpc.RPCProxy("res.users")
-        act_id = proxy.read([rpc.session.uid], ['action_id', 'name'], rpc.session.context)
-        
-        if act_id[0]['action_id'] :
-            raise redirect("/openerp/menu", **arguments)
-        else:
-            raise redirect('/openerp/dashboard')
-        
-    
-    def user_action(self, id='action_id'):
-        """Perform default user action.
-
-        @param id: `action_id` or `menu_id`
-        """
-        proxy = rpc.RPCProxy("res.users")
-        act_id = proxy.read([rpc.session.uid], [id, 'name'], rpc.session.context)
-
-        if not act_id[0][id]:
-            common.warning(_('You can not log into the system!\nAsk the administrator to verify\nyou have an action defined for your user.'), _('Access Denied!'))
-            rpc.session.logout()
-            raise redirect('/openerp')
-        else:
-            act_id = act_id[0][id][0]
-            from openerp import controllers
-            return controllers.actions.execute_by_id(act_id)
-    
-    @expose(template="/openerp/controllers/templates/dashboard.mako")
-    def dashboard(self):
-        ctx = rpc.session.context.copy()
-        proxy = rpc.RPCProxy("ir.ui.menu")
-        ids = proxy.search([('parent_id', '=', False)], 0, 0, 0, ctx)
-        parents = proxy.read(ids, ['name', 'icon', 'action'], ctx)
-        return dict(parents = parents)
+        
+        if not next:
+            user_action_id = rpc.RPCProxy("res.users").read([rpc.session.uid], ['action_id'], rpc.session.context)[0]['action_id']
+            if user_action_id:
+                next = '/openerp/home'
+        
+        return self.menu(next=next)
+    
     @expose()
     def home(self):
-        return self.user_action('action_id')
+        user_action_id = rpc.RPCProxy("res.users").read([rpc.session.uid], ['action_id'], rpc.session.context)[0]['action_id']
+        from openerp import controllers
+        return controllers.actions.execute_by_id(user_action_id[0])
     
     @expose(content_type='application/octet-stream')
     def report(self, report_name=None, **kw):
@@ -117,9 +91,8 @@
     </html>
     """ % (url("/openerp/static/images/loading.gif"))
 
-    @expose(template="/openerp/controllers/templates/menu.mako")
+    @expose(template="/openerp/controllers/templates/index.mako")
     def menu(self, active=None, next=None):
-        from openerp.utils import icons
         from openerp.widgets import tree_view
         
         try:
@@ -128,37 +101,37 @@
             id = False
             form.Form().reset_notebooks()
         ctx = rpc.session.context.copy()
-        proxy = rpc.RPCProxy("ir.ui.menu")
-        ids = proxy.search([('parent_id', '=', False)], 0, 0, 0, ctx)
-        parents = proxy.read(ids, ['name', 'icon', 'action'], ctx)
-                
-        if not id and ids:
-            id = ids[0]
+        menus = rpc.RPCProxy("ir.ui.menu")
+        ids = menus.search([('parent_id', '=', False)], 0, 0, 0, ctx)
+        parents = menus.read(ids, ['name', 'action'], ctx)
             
         for parent in parents:
             if parent['id'] == id:
                 parent['active'] = 'active'
-                # explicit next takes precedence on menu item action
-                if not next and parent.get('action'):
-                    next = url('/openerp/custom_action', action=id)
-                
-        ids = proxy.search([('parent_id', '=', id)], 0, 0, 0, ctx)
-        tools = proxy.read(ids, ['name', 'icon', 'action'], ctx)
-        view = cache.fields_view_get('ir.ui.menu', 1, 'tree', {})
-        fields = cache.fields_get(view['model'], False, ctx)
+                if parent.get('action') and not next:
+                    next = url('/openerp/custom_action', action=id)  
         
-        for tool in tools:
-            tid = tool['id']
-            tool['icon'] = icons.get_icon(tool['icon'])
-            tool['tree'] = tree = tree_view.ViewTree(view, 'ir.ui.menu', tid,
-                                    domain=[('parent_id', '=', tid)],
-                                    context=ctx, action="/openerp/tree/action", fields=fields)
-            tree._name = "tree_%s" %(tid)
-            tree.tree.onselection = None
-            tree.tree.onheaderclick = None
-            tree.tree.showheaders = 0
-
-        return dict(parents=parents, tools=tools, load_content=(next and next or ''))
+        tools = []
+        if next or active:
+            if not id and ids:
+                id = ids[0] 
+            ids = menus.search([('parent_id', '=', id)], 0, 0, 0, ctx)
+            tools = menus.read(ids, ['name', 'action'], ctx)
+            view = cache.fields_view_get('ir.ui.menu', 1, 'tree', {})
+            fields = cache.fields_get(view['model'], False, ctx)
+            
+            for tool in tools:
+                tid = tool['id']
+                tool['tree'] = tree = tree_view.ViewTree(view, 'ir.ui.menu', tid,
+                                        domain=[('parent_id', '=', tid)],
+                                        context=ctx, action="/openerp/tree/action", fields=fields)
+                tree._name = "tree_%s" %(tid)
+                tree.tree.onselection = None
+                tree.tree.onheaderclick = None
+                tree.tree.showheaders = 0
+        widgets = rpc.RPCProxy('res.widget')
+        return dict(parents=parents, tools=tools, load_content=(next and next or ''),
+                    widgets=widgets.read(widgets.search([], 0, 0, 0, ctx), [], ctx))
 
     @expose(allow_json=True)
     @unsecured

=== modified file 'addons/openerp/controllers/templates/closepopup.mako'
--- addons/openerp/controllers/templates/closepopup.mako	2010-09-15 12:29:56 +0000
+++ addons/openerp/controllers/templates/closepopup.mako	2010-10-05 13:06:51 +0000
@@ -27,7 +27,7 @@
                 window.close();
                 
             } else {
-            	window.location.href='/openerp/menu';
+            	window.location.href='/openerp';
             }
         });
     </script>

=== removed file 'addons/openerp/controllers/templates/dashboard.mako'
--- addons/openerp/controllers/templates/dashboard.mako	2010-10-01 08:16:56 +0000
+++ addons/openerp/controllers/templates/dashboard.mako	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-<%inherit file="/openerp/controllers/templates/base_dispatch.mako"/>
-<%def name="header()">
-    <title>OpenERP Dashboard</title>
-
-    <script type="text/javascript" src="/openerp/static/javascript/accordion.js"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/treegrid.js"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/notebook/notebook.js"></script>
-</%def>
-<%def name="content()">
-    <div id="root">
-        <table id="content" class="three-a" width="100%">
-            <tr>
-                <%include file="header.mako"/>
-            </tr>
-            <tr>
-                <td id="main_nav" colspan="3">
-                    <div id="applications_menu">
-                        <ul>
-                            %for parent in parents:
-                                <li>
-                                    <a href="${py.url('/openerp/menu', active=parent['id'])}"
-                                       target="_top" class="${parent.get('active', '')}">
-                                        <span>${parent['name']}</span>
-                                    </a>
-                                </li>
-                            % endfor
-                        </ul>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td id="primary" width="100%">
-                    <div class="wrap" style="padding: 10px;">
-                        <ul class="sections-a">
-                            %for parent in parents:
-                                <li id="${parent['id']}" class="${'-'.join(parent['name'].split(' ')).lower()}">
-                                    <span class="wrap">
-                                        <a href="${py.url('/openerp/menu', active=parent['id'])}">
-                                            <span>
-                                                <strong>${parent['name']}</strong>
-                                            </span>
-                                        </a>
-                                    </span>
-                                </li>
-                            % endfor
-                        </ul>
-                    </div>
-                </td>
-            </tr>
-        </table>
-    </div>
-</%def>

=== modified file 'addons/openerp/controllers/templates/header.mako'
--- addons/openerp/controllers/templates/header.mako	2010-09-30 10:04:42 +0000
+++ addons/openerp/controllers/templates/header.mako	2010-10-05 13:06:51 +0000
@@ -37,61 +37,60 @@
         <li><a href="#footer" accesskey="f">Skip to footer [f]</a></li>
     </ul>
     % if logged:
-	    <div id="corner">
-	        <ul class="tools">
-	            <li><a href="javascript: void(0)" onclick="header_actions('/openerp/home')" class="home">${_("Home")}</a>
-	                <ul>
-	                    <li class="first last"><a href="javascript: void(0)" onclick="header_actions('/openerp/home')">${_("Home")}</a></li>
-	                </ul>
-	            </li>
-	            <li>
-	                <a href="javascript: void(0)" onclick="header_actions('/openerp/requests')" class="req_messages"><small>${total_request}</small></a>
-	                <ul>
-	                    <li class="first last"><a href="javascript: void(0)" onclick="header_actions('/openerp/requests')">${_("Requests")}</a></li>
-	                </ul>
-	            </li>
-
-	            <li><a href="javascript: void(0)" onclick="header_actions('/openerp/pref/create')" class="preferences">${_("Preferences")}</a>
-	                <ul>
-	                    <li class="first last"><a href="javascript: void(0)" onclick="header_actions('/openerp/pref/create')">${_("Edit Preferences")}</a></li>
-	                </ul>
-	            </li>
-	            <li><a href="javascript: void(0)" onclick="header_actions('/openerp/about')" class="info">${_("About")}</a>
-	                <ul>
-	                    <li class="first last"><a href="javascript: void(0)" onclick="header_actions('/openerp/about')">${_("About")}</a></li>
-	                </ul>
-	            </li>
-
-	            <li><a target="_blank" href="http://doc.openerp.com/" class="help">${_("Help")}</a>
-	                <ul>
-	                    <li class="first last"><a target="_blank" href="http://doc.openerp.com/">${_("Help")}</a></li>
-	                </ul>
-	            </li>
-
-	            % if cp.config('server.environment') == 'production':
-	                <li id="clear_cache"><a href="javascript: void(0)" onclick="header_actions('/openerp/pref/clear_cache')" class="clear_cache">${_("Clear Cache")}</a>
-	                    <ul>
-	                        <li class="first last"><a href="javascript: void(0);">${_("Clear Cache")}</a></li>
-	                    </ul>
-	                </li>
-	            % endif
-	        </ul>
-	        <p class="logout"><a href="${py.url('/openerp/logout')}" target="_top">${_("Logout")}</a></p>
-	    </div>
-	% endif
-	
+        <div id="corner">
+            <ul class="tools">
+                <li><a href="${py.url('/openerp')}" target="_top" class="home">${_("Home")}</a>
+                    <ul>
+                        <li class="first last"><a href="${py.url('/openerp')}" target="_top">${_("Home")}</a></li>
+                    </ul>
+                </li>
+                <li>
+                    <a href="${py.url('/openerp/requests')}" class="req_messages"><small>${total_request}</small></a>
+                    <ul>
+                        <li class="first last"><a href="${py.url('/openerp/requests')}">${_("Requests")}</a></li>
+                    </ul>
+                </li>
+
+                <li><a href="${py.url('/openerp/pref/create')}" class="preferences">${_("Preferences")}</a>
+                    <ul>
+                        <li class="first last"><a href="${py.url('/openerp/pref/create')}">${_("Edit Preferences")}</a></li>
+                    </ul>
+                </li>
+                <li><a href="/openerp/about" class="info">${_("About")}</a>
+                    <ul>
+                        <li class="first last"><a href="/openerp/about">${_("About")}</a></li>
+                    </ul>
+                </li>
+
+                <li><a target="_blank" href="http://doc.openerp.com/" class="help">${_("Help")}</a>
+                    <ul>
+                        <li class="first last"><a target="_blank" href="http://doc.openerp.com/">${_("Help")}</a></li>
+                    </ul>
+                </li>
+
+                % if cp.config('server.environment') == 'production':
+                    <li id="clear_cache"><a href="${py.url('/openerp/pref/clear_cache')}" class="clear_cache">${_("Clear Cache")}</a>
+                        <ul>
+                            <li class="first last"><a href="javascript: void(0);">${_("Clear Cache")}</a></li>
+                        </ul>
+                    </li>
+                % endif
+            </ul>
+            <p class="logout"><a href="${py.url('/openerp/logout')}" target="_top">${_("Logout")}</a></p>
+        </div>
+    % endif
+    
     <div id="shortcuts" class="menubar">
     % if logged:
         <ul>
-	        % for i, sc in enumerate(shortcuts):
-	            <li class="${i == 0 and 'first' or ''}">
-	                <a id="shortcut_${sc['res_id']}"
-	                   href="javascript: void(0)"
-                       onclick='header_actions("/openerp/tree/open","${sc['res_id']}", "ir.ui.menu")'>
-	                   <span>${sc['name']}</span>
-	                </a>
-	            </li>
-	        % endfor
+            % for i, sc in enumerate(shortcuts):
+                <li class="${i == 0 and 'first' or ''}">
+                    <a id="shortcut_${sc['res_id']}"
+                       href="${py.url('/openerp/tree/open', id=sc['res_id'], model='ir.ui.menu')}">
+                       <span>${sc['name']}</span>
+                    </a>
+                </li>
+            % endfor
         </ul>
     % endif
     </div>

=== added file 'addons/openerp/controllers/templates/index.mako'
--- addons/openerp/controllers/templates/index.mako	1970-01-01 00:00:00 +0000
+++ addons/openerp/controllers/templates/index.mako	2010-10-05 13:06:51 +0000
@@ -0,0 +1,159 @@
+<%inherit file="/openerp/controllers/templates/base_dispatch.mako"/>
+
+<%def name="header()">
+    <title>OpenERP</title>
+
+    <script type="text/javascript" src="/openerp/static/javascript/accordion.js"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/treegrid.js"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/notebook/notebook.js"></script>
+    
+    <script type="text/javascript">
+        var DOCUMENT_TO_LOAD = "${load_content}";
+        var CAL_INSTANCE = null;
+
+        jQuery(document).ready(function () {
+            // Don't load doc if there is a hash-url, it takes precedence
+            if(DOCUMENT_TO_LOAD && !hashUrl()) {
+                openLink(DOCUMENT_TO_LOAD);
+            }
+
+            jQuery('.toggle-menu').toggler('#content')
+        });
+        
+    </script>
+</%def>
+
+<%def name="content()">
+
+    <div id="root">
+        <table id="content" class="three-a open" width="100%">
+            <tr>
+                <%include file="header.mako"/>
+            </tr>
+            <tr>
+                <td id="main_nav" colspan="3">
+                    <div id="applications_menu">
+                        <ul>
+                            %for parent in parents:
+                                <li>
+                                    <a href="${py.url('/openerp/menu', active=parent['id'])}"
+                                       target="_top" class="${parent.get('active', '')}">
+                                        <span>${parent['name']}</span>
+                                    </a>
+                                </li>
+                            % endfor
+                        </ul>
+                    </div>
+                </td>
+            </tr>
+            % if tools:
+                <tr>
+                    <td id="secondary" class="sidenav-open">
+                        <div class="wrap">
+                            <ul id="sidenav-a" class="accordion">
+                                % for tool in tools:
+                                    % if tool.get('action'):
+                                      <li class="accordion-title" id="${tool['id']}">
+                                    % else:
+                                      <li class="accordion-title">
+                                    % endif
+                                        <span>${tool['name']}</span>
+                                    </li>
+                                    <li class="accordion-content" id="content_${tool['id']}">
+                                       ${tool['tree'].display()}
+                                    </li>
+                                % endfor
+                            </ul>
+                            <script type="text/javascript">
+                                new Accordion("sidenav-a");
+                            </script>
+                        </div>
+                    </td>
+                    <td class="toggle-menu"></td>
+                    <td id="primary" width="100%">
+                        <div class="wrap">
+                            <div id="appContent"></div>
+                        </div>
+                    </td>
+                </tr>
+            % else:
+                <tr>
+                    <td colspan="3">
+                        <table width="100%">
+                            <tr>
+                                <td id="primary" width="70%">
+                                    <div class="wrap" style="padding: 10px;">
+                                        <ul class="sections-a">
+                                            % for parent in parents:
+                                                <li class="${'-'.join(parent['name'].split(' ')).lower()}">
+                                                    <span class="wrap">
+                                                        <a href="${py.url('/openerp/menu', active=parent['id'])}" target="_top">
+                                                            <span>
+                                                                <strong>${parent['name']}</strong>
+                                                            </span>
+                                                        </a>
+                                                    </span>
+                                                </li>
+                                            % endfor
+                                        </ul>
+                                    </div>
+                                </td>
+                                <td class="tertiary">
+                                    <div class="wrap" style="padding: 10px;">
+                                        <ul class="split-a">
+                                            <li class="one">
+                                                <a class="cta-a" href="http://www.openerp.com/services/subscribe-onsite" target="_blank">
+                                                    <span>
+                                                        <strong>${_('Use On-Site')}</strong>
+                                                        Get the openERP Warranty
+                                                    </span>
+                                                </a>
+                                            </li>
+                                            <li class="two">
+                                                <a class="cta-a" href="http://www.openerp.com/online" target="_blank">
+                                                    <span>
+                                                        <strong>${_('Use Online')}</strong>
+                                                        Subscribe and start
+                                                    </span>
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <div class="box-a">
+                                        <ul class="side">
+                                        </ul>
+                                        % for widget in widgets:
+                                            <div>
+                                                <h3>${widget['title']}</h3>
+                                                ${widget['content']|n}
+                                            </div>
+                                        % endfor
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            % endif
+            <tr>
+                <td id="footer_section" colspan="3">
+                    % if cp.config('server.environment') == 'development':
+                        <div class="footer-a">
+                            <p class="one">
+                                <span>${rpc.session.protocol}://${_("%(user)s", user=rpc.session.loginname)}@${rpc.session.host}:${rpc.session.port}</span>
+                            </p>
+                            <p class="powered">${_("Powered by %(openerp)s ",
+                                                openerp="""<a target="_blank" href="http://www.openerp.com/">openerp.com</a>""")|n}</p>
+                        </div>
+                    % else:
+                        <div class="footer-b">
+                            <p class="powered">${_("Powered by %(openerp)s ",
+                                                openerp="""<a target="_blank" href="http://www.openerp.com/">openerp.com</a>""")|n}</p>
+                        </div>
+                    % endif
+                </td>
+            </tr>
+        </table>
+    </div>
+</%def>
+

=== removed file 'addons/openerp/controllers/templates/menu.mako'
--- addons/openerp/controllers/templates/menu.mako	2010-10-01 08:16:56 +0000
+++ addons/openerp/controllers/templates/menu.mako	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-<%inherit file="/openerp/controllers/templates/base_dispatch.mako"/>
-
-<%def name="header()">
-    <title>OpenERP</title>
-
-    <script type="text/javascript" src="/openerp/static/javascript/accordion.js"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/treegrid.js"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/notebook/notebook.js"></script>
-
-    <script type="text/javascript">
-        var DOCUMENT_TO_LOAD = "${load_content}";
-        var CAL_INSTANCE = null;
-
-        jQuery(document).ready(function () {
-            // Don't load doc if there is a hash-url, it takes precedence
-            if(DOCUMENT_TO_LOAD && !hashUrl()) {
-                openLink(DOCUMENT_TO_LOAD);
-            }
-
-            jQuery('.toggle-menu').toggler('#content')
-        });
-        
-    </script>
-</%def>
-
-<%def name="content()">
-
-    <div id="root">
-        <table id="content" class="three-a open" width="100%">
-            <tr>
-                <%include file="header.mako"/>
-            </tr>
-            <tr>
-                <td id="main_nav" colspan="3">
-                    <div id="applications_menu">
-                        <ul>
-                            %for parent in parents:
-                                <li>
-                                    <a href="${py.url('/openerp/menu', active=parent['id'])}"
-                                       target="_top" class="${parent.get('active', '')}">
-                                        <span>${parent['name']}</span>
-                                    </a>
-                                </li>
-                            % endfor
-                        </ul>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td id="secondary" class="sidenav-open">
-                    <div class="wrap">
-                        <ul id="sidenav-a" class="accordion">
-                            % for tool in tools:
-                                % if tool.get('action'):
-                                  <li class="accordion-title" id="${tool['id']}">
-                                % else:
-                                  <li class="accordion-title">
-                                % endif
-                                    <span>${tool['name']}</span>
-                                </li>
-                                <li class="accordion-content" id="content_${tool['id']}">
-                                   ${tool['tree'].display()}
-                                </li>
-                            % endfor
-                        </ul>
-                        <script type="text/javascript">
-                            new Accordion("sidenav-a");
-                        </script>
-                    </div>
-                </td>
-                <td class="toggle-menu"></td>
-                <td id="primary" width="100%">
-                    <div class="wrap">
-                        <div id="appContent"></div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td id="footer_section" colspan="3">
-                    % if cp.config('server.environment') == 'development':
-                        <div class="footer-a">
-                            <p class="one">
-                                <span>${rpc.session.protocol}://${_("%(user)s", user=rpc.session.loginname)}@${rpc.session.host}:${rpc.session.port}</span>
-                            </p>
-                            <p class="powered">${_("Powered by %(openerp)s ",
-                                                openerp="""<a target="_blank" href="http://www.openerp.com/">openerp.com</a>""")|n}</p>
-                        </div>
-                    % else:
-                        <div class="footer-b">
-                            <p class="powered">${_("Powered by %(openerp)s ",
-                                                openerp="""<a target="_blank" href="http://www.openerp.com/">openerp.com</a>""")|n}</p>
-                        </div>
-                    % endif
-                </td>
-            </tr>
-        </table>
-    </div>
-</%def>
-

=== modified file 'addons/openerp/static/css/screen.css'
--- addons/openerp/static/css/screen.css	2010-10-01 08:16:56 +0000
+++ addons/openerp/static/css/screen.css	2010-10-05 13:06:51 +0000
@@ -1689,7 +1689,7 @@
     background-image: url(../images/sections-a-i-flag.png);
 }
 
-ul.sections-a li.inventory span.wrap a {
+ul.sections-a li.warehouse span.wrap a {
     background-image: url(../images/sections-a-i-box.png);
 }
 
@@ -1705,7 +1705,7 @@
     background-image: url(../images/sections-a-i-wallet.png);
 }
 
-ul.sections-a li.point span.wrap a {
+ul.sections-a li.point-of-sale span.wrap a {
     background-image: url(../images/sections-a-i-tag.png);
 }
 
@@ -1721,14 +1721,14 @@
     background-image: url(../images/sections-a-i-charts.png);
 }
 
-ul.sections-a li.chat span.wrap a {
-    background-image: url(../images/sections-a-i-dialog.png);
-}
-
 ul.sections-a li.administration span.wrap a {
     background-image: url(../images/sections-a-i-briefcase.png);
 }
 
+ul.sections-a li.tools span.wrap a {
+    background-image: url(../images/sections-a-i-tools.png);
+}
+
 ul.sections-a li span.wrap a span {
     position: absolute;
     left: -5px;
@@ -1866,12 +1866,12 @@
 
 ul.split-a .one {
     float: left;
-    width: 150px;
+    width: 55%;
 }
 
 ul.split-a .two {
     float: right;
-    width: 150px;
+    width: 45%;
 }
 
 #view-selector {
@@ -2064,6 +2064,17 @@
 }
 
 /* sidebar */
+td.tertiary {
+    background: url(../images/tertiary-bg-a.gif) repeat-y scroll 0 0 #EAE7E7;
+    min-height: 100%;
+    border-left: 1px solid #D2CFCF;
+    vertical-align: top;
+}
+
+td.tertiary div.wrap {
+    margin-top: 9px;
+}
+
 #tertiary {
     position: relative;
     float: right;
@@ -2318,6 +2329,7 @@
     text-transform: uppercase;
     font-weight: bold;
     text-shadow: #fff 0 1px 0;
+    margin: 2px;
 }
 
 a.cta-a:hover,a.cta-a:focus,a.cta-a:active {
@@ -2326,8 +2338,7 @@
 
 a.cta-a span {
     float: left;
-    width: 95px;
-    padding: 7px 0 5px 32px;
+    padding: 7px 0 5px 5px;
     background-position: 0 50%;
     background-repeat: no-repeat;
     cursor: pointer;

=== added file 'addons/openerp/static/images/sections-a-i-tools.png'
Binary files addons/openerp/static/images/sections-a-i-tools.png	1970-01-01 00:00:00 +0000 and addons/openerp/static/images/sections-a-i-tools.png	2010-10-05 13:06:51 +0000 differ
=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2010-09-27 07:52:12 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2010-10-05 13:06:51 +0000
@@ -120,6 +120,15 @@
             });
             return false;
         });
+    } else {
+        if (jQuery(document).find('div#root').length) {
+            jQuery(document).delegate('a[href]:not([target]):not([href^="#"]):not([href^="javascript"]):not([rel=external])', 'click', function(){
+                window.location.href = openobject.http.getURL('/openerp', {
+                    'next': jQuery(this).attr('href')
+                })
+                return false;
+            });
+        }
     }
 
     // wash for hash changes

=== modified file 'addons/openerp/static/javascript/openerp/openerp.ui.js'
--- addons/openerp/static/javascript/openerp/openerp.ui.js	2010-10-01 08:16:56 +0000
+++ addons/openerp/static/javascript/openerp/openerp.ui.js	2010-10-05 13:06:51 +0000
@@ -158,20 +158,6 @@
     }
 })(jQuery);
 
-function header_actions(url) {
-    // For shortcuts
-    if(arguments[1]) {
-            url = openobject.http.getURL(url, {'id': arguments[1], 'model': arguments[2]});
-    }
-    
-    if(jQuery('#appContent').length) {
-        openLink(url)
-    }
-    else {
-        window.location.href = openobject.http.getURL('/openerp/menu', {'next': url})
-    }
-}
-
 jQuery(document).ready(function () {
     jQuery('#applications_menu').scrollify();
     jQuery('#shortcuts').scrollify();