Merge lp:~unifield-team/unifield-web/UTP-252 into lp:unifield-web

[jftempo]

[lp:~unifield-team/unifield-web/UTP-252]

4722. By jftempo on 2013-11-07

[MERGE] lp:unifield-web + lp:~unifield-team/unifield-web/UTP-252

4723. By jftempo on 2013-11-07

UTP-252 [FIX] 2 buttons to toggle fullscreen removed

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2013-06-20 06:52:02 +0000
+++ addons/openerp/controllers/form.py	2013-11-07 08:48:38 +0000
@@ -192,7 +192,6 @@
 
     @expose(template="/openerp/controllers/templates/form.mako")
     def create(self, params, tg_errors=None):
-
         params.view_type = params.view_type or params.view_mode[0]
 
         if params.view_type == 'tree':
@@ -271,7 +270,7 @@
             tips = tips
         
         is_dashboard = form.screen.is_dashboard or False
-        return dict(form=form, pager=pager, buttons=buttons, path=self.path, can_shortcut=can_shortcut, shortcut_ids=shortcut_ids, display_name=display_name, title=title, tips=tips, obj_process=obj_process, is_dashboard=is_dashboard)
+        return dict(form=form, pager=pager, buttons=buttons, path=self.path, can_shortcut=can_shortcut, shortcut_ids=shortcut_ids, display_name=display_name, title=title, tips=tips, obj_process=obj_process, is_dashboard=is_dashboard, sidebar_closed=params._terp_sidebar_closed)
 
     @expose('json', methods=('POST',))
     def close_or_disable_tips(self):
@@ -280,7 +279,7 @@
     def _read_form(self, context, count, domain, filter_domain, id, ids, kw,
                    limit, model, offset, search_data, search_domain, source,
                    view_ids, view_mode, view_type, notebook_tab, o2m_edit=False,
-                   editable=False):
+                   editable=False, sidebar_closed=False):
         """ Extract parameters for form reading/creation common to both
         self.edit and self.view
         """
@@ -299,7 +298,8 @@
                                        '_terp_search_domain': search_domain,
                                        '_terp_search_data': search_data,
                                        '_terp_filter_domain': filter_domain,
-                                       '_terp_notebook_tab': notebook_tab})
+                                       '_terp_notebook_tab': notebook_tab,
+                                       '_terp_sidebar_closed': sidebar_closed})
         params.o2m_edit = o2m_edit
         params.editable = editable
         params.action_id = kw.get('action_id')
@@ -324,13 +324,13 @@
     def edit(self, model, id=False, ids=None, view_ids=None,
              view_mode=['form', 'tree'], view_type='form', source=None, domain=[], context={},
              offset=0, limit=50, count=0, search_domain=None,
-             search_data=None, filter_domain=None, o2m_edit=False, **kw):
+             search_data=None, filter_domain=None, o2m_edit=False, sidebar_closed=False, **kw):
 
         notebook_tab = kw.get('notebook_tab') or 0
         params = self._read_form(context, count, domain, filter_domain, id,
                                  ids, kw, limit, model, offset, search_data,
                                  search_domain, source, view_ids, view_mode,
-                                 view_type, notebook_tab, o2m_edit=o2m_edit, editable=True)
+                                 view_type, notebook_tab, o2m_edit=o2m_edit, editable=True, sidebar_closed=sidebar_closed)
 
         if not params.ids:
             params.count = 0
@@ -347,13 +347,13 @@
     def view(self, model, id, ids=None, view_ids=None,
              view_mode=['form', 'tree'], view_type='form', source=None, domain=[], context={},
              offset=0, limit=50, count=0, search_domain=None,
-             search_data=None, filter_domain=None, **kw):
+             search_data=None, filter_domain=None, sidebar_closed=False, **kw):
 
         notebook_tab = kw.get('notebook_tab') or 0
         params = self._read_form(context, count, domain, filter_domain, id,
                                  ids, kw, limit, model, offset, search_data,
                                  search_domain, source, view_ids, view_mode,
-                                 view_type, notebook_tab)
+                                 view_type, notebook_tab, sidebar_closed=sidebar_closed)
 
         if not params.ids:
             params.count = 1
@@ -372,7 +372,6 @@
 
         if not params.id and params.ids:
             params.id = params.ids[0]
-
         if params.id and params.editable:
             raise redirect(self.path + "/view", model=params.model,
                                                id=params.id,
@@ -386,7 +385,8 @@
                                                count=params.count,
                                                search_domain=ustr(params.search_domain),
                                                search_data = ustr(params.search_data),
-                                               filter_domain= ustr(params.filter_domain))
+                                               filter_domain= ustr(params.filter_domain),
+                                               sidebar_closed=params._terp_sidebar_closed)
 
         params.view_type = 'tree'
         return self.create(params)
@@ -499,7 +499,8 @@
                 'search_domain': ustr(params.search_domain),
                 'search_data': ustr(params.search_data),
                 'filter_domain': ustr(params.filter_domain),
-                'notebook_tab': params.notebook_tab}
+                'notebook_tab': params.notebook_tab,
+                'sidebar_closed': params.sidebar_closed}
         if params.view_target and params.view_target in ('new', 'same'):
             # within a wizard popup dialog - keep the orignal target mode
             # (here target='new' will hide toolbar buttons (new, save, pager, etc..)
@@ -628,7 +629,8 @@
                 'limit': params.limit,
                 'count': params.count,
                 'search_domain': ustr(params.search_domain),
-                'filter_domain': ustr(params.filter_domain)}
+                'filter_domain': ustr(params.filter_domain),
+                'sidebar_closes': params.sidebar_closed}
 
         if new_id:
             raise redirect(self.path + '/edit', **args)
@@ -671,7 +673,8 @@
                 'limit': params.limit,
                 'count': params.count,
                 'search_domain': ustr(params.search_domain),
-                'filter_domain': ustr(params.filter_domain)}
+                'filter_domain': ustr(params.filter_domain),
+                'sidebar_closed': params.sidebar_closed}
 
         if not params.id:
             raise redirect(self.path + '/edit', **args)

=== modified file 'addons/openerp/controllers/templates/base.mako'
--- addons/openerp/controllers/templates/base.mako	2013-10-03 10:05:30 +0000
+++ addons/openerp/controllers/templates/base.mako	2013-11-07 08:48:38 +0000
@@ -8,7 +8,7 @@
     <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.textarea.js"></script>
 
     <script type="text/javascript" src="/openerp/static/javascript/scripts.js"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/form.js?v=2.3b2"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/form.js?v=2.7b1"></script>
     <script type="text/javascript" src="/openerp/static/javascript/form_state.js?v=2.3b2"></script>
     <script type="text/javascript" src="/openerp/static/javascript/listgrid.js"></script>
 
@@ -20,10 +20,10 @@
     <script type="text/javascript" src="/openerp/static/jscal/calendar-setup.js"></script>
     
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/style.css"/>
-    <link rel="stylesheet" type="text/css" href="/openerp/static/css/menu.css"/>
+    <link rel="stylesheet" type="text/css" href="/openerp/static/css/menu.css?v=2.7b1"/>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/tips.css"/>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/waitbox.css"/>
-    <link rel="stylesheet" type="text/css" href="/openerp/static/css/screen.css"/>
+    <link rel="stylesheet" type="text/css" href="/openerp/static/css/screen.css?v=2.7b1"/>
 
     <link rel="stylesheet" type="text/css" href="/openerp/static/jscal/calendar-blue.css"/>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/dashboard.css"/>

=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako	2013-08-29 12:34:05 +0000
+++ addons/openerp/controllers/templates/form.mako	2013-11-07 08:48:38 +0000
@@ -172,13 +172,15 @@
             </td>
             % if form.sidebar:
                 <%
-                  if form.screen.view_type in ['form', 'calendar', 'gantt']:
+                  if sidebar_closed:
+                      sidebar_class="closed"
+                  elif form.screen.view_type in ['form', 'calendar', 'gantt']:
                       sidebar_class="open"
                   else:
                       sidebar_class="closed"
                 %>
                 <td id="main_sidebar" valign="top">
-                    <a class="toggle-sidebar ${sidebar_class}" href="javascript:void(0)">Toggle</a>
+                    <a class="toggle-sidebar ${sidebar_class}" href="javascript:void(0)" id="a_main_sidebar">Toggle</a>
                     <div id="tertiary" class="${sidebar_class}">
                         <div id="tertiary_wrap">
                             ${form.sidebar.display()}

=== modified file 'addons/openerp/controllers/templates/header.mako'
--- addons/openerp/controllers/templates/header.mako	2012-08-17 08:47:11 +0000
+++ addons/openerp/controllers/templates/header.mako	2013-11-07 08:48:38 +0000
@@ -83,6 +83,10 @@
                 </li>
             % endfor
         </ul>
+        <div style="position: absolute; right: 5px; top: 6px;">
+        <a id="fullscreen-mode" onclick="fullscreen(true);" accesskey="0">${_("Full Screen")}</a>
+        <a id="leave-fullscreen-mode" onclick="fullscreen(false);" accesskey="9">${_("Leave Full Screen")}</a>
+        </div>
     % endif
     </div>
 </td>

=== modified file 'addons/openerp/controllers/templates/index.mako'
--- addons/openerp/controllers/templates/index.mako	2011-12-29 13:01:08 +0000
+++ addons/openerp/controllers/templates/index.mako	2013-11-07 08:48:38 +0000
@@ -76,7 +76,7 @@
                 <%include file="header.mako"/>
             </tr>
             <tr>
-                <td id="main_nav" colspan="3">
+                <td id="main_nav" colspan="4">
                     <div id="applications_menu">
                         <ul>
                             %for parent in parents:
@@ -94,7 +94,8 @@
             % if tools is not None:
                 <tr>
                     <td id="secondary" class="sidenav-open">
-                        <div class="wrap">
+                    <a onclick="$('#nav2').toggle();$('#main-sidebar-toggler').toggleClass('closed');" id="main-sidebar-toggler">Toggle Menu</a>
+                        <div class="wrap" id="nav2">
                             <ul id="sidenav-a" class="accordion">
                                 % for tool in tools:
                                     % if tool.get('action'):
@@ -114,7 +115,7 @@
                             </script>
                         </div>
                     </td>
-                    <td id="primary">
+                    <td></td><td id="primary">
                         <div class="wrap">
                             <div id="appContent"></div>
                         </div>
@@ -122,7 +123,7 @@
                 </tr>
             % else:
                 <tr>
-                    <td colspan="3" height="100%" valign="top">
+                    <td colspan="4" height="100%" valign="top">
                         <table width="100%" height="100%">
                             <tr>
                                 <td id="primary" class="first-page-primary">
@@ -164,7 +165,7 @@
                 </tr>
             % endif
             <tr>
-                <td id="footer_section" colspan="3">
+                <td id="footer_section" colspan="4">
                     % if cp.config('server.environment') == 'development':
                         <div class="footer-a">
                             <p class="one">

=== modified file 'addons/openerp/static/css/menu.css'
--- addons/openerp/static/css/menu.css	2012-08-17 08:47:11 +0000
+++ addons/openerp/static/css/menu.css	2013-11-07 08:48:38 +0000
@@ -64,6 +64,7 @@
     list-style: none;
     white-space: nowrap;
     padding: 0;
+    /*margin: 0 0 -20px 0;*/
     margin: 0;
 }
 

=== modified file 'addons/openerp/static/css/screen.css'
--- addons/openerp/static/css/screen.css	2012-08-17 08:47:11 +0000
+++ addons/openerp/static/css/screen.css	2013-11-07 08:48:38 +0000
@@ -1643,7 +1643,7 @@
 #sidenav-a li > span {
     display: block;
     height: 20px;
-    padding: 0 5px;
+    padding: 0 5px 0 10px;
     font-size: 1.1em;
     background: url(../images/sidenav-link-a.png) 0 100% repeat-x;
     line-height: 20px;
@@ -1950,6 +1950,26 @@
     position: absolute;
     z-index: 10;
 }
+#main-sidebar-toggler {
+    background: url("../images/toggle-a-bg.png") no-repeat scroll -8px -2px transparent;
+    border-color: #D2CFCF;
+    border-style: solid;
+    border-width: 1px;
+    display: block;
+    height: 19px;
+    left: 0;
+    overflow: hidden;
+    padding-left: 0;
+    position: absolute;
+    text-indent: -10001px;
+    width: 6px;
+    z-index: 10;
+    cursor: pointer;
+}
+#main-sidebar-toggler.closed{
+    background-position: -29px -2px;
+}
+
 .toggle-sidebar.open {
     margin-left: 158px;
     width: 21px;
@@ -2340,3 +2360,32 @@
     width: 300px;
     text-align: center;
 }
+
+#fullscreen-mode {
+    background: url("../images/stock/gtk-fullscreen.png") no-repeat scroll 0 0 transparent;
+    height: 17px;
+    text-indent: -100001px;
+    width: 0;
+    padding-left: 17px !important;
+    visibility: hidden;
+}
+
+#leave-fullscreen-mode {
+    background: url("../images/stock/gtk-leave-fullscreen.png") no-repeat scroll 0 0 transparent;
+    height: 17px;
+    text-indent: -100001px;
+    width: 0;
+    padding-left: 17px !important;
+    visibility: hidden;
+}
+#toggle-fullscreen-mode {
+    background: url("../images/stock/gtk-fullscreen.png") no-repeat scroll 0 0 transparent;
+    height: 17px;
+    text-indent: -100001px;
+    width: 0;
+    padding-left: 17px !important;
+    visibility: hidden;
+}
+#toggle-fullscreen-mode.closed {
+    background: url("../images/stock/gtk-leave-fullscreen.png") no-repeat scroll 0 0 transparent;
+}

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2013-09-10 08:03:59 +0000
+++ addons/openerp/static/javascript/form.js	2013-11-07 08:48:38 +0000
@@ -59,7 +59,7 @@
         'notebook_tab': jQuery('#_terp_notebook_tab').val() || 0,
         'action_id': jQuery('#_terp_action_id').val() || null
     };
-
+    get_sidebar_status(args, true);
     var action = readonly ? 'view' : 'edit';
 
     if (target == '_blank') {
@@ -195,6 +195,20 @@
     window.top.jQuery.fancybox(error, {scrolling: 'no'});
 }
 
+function get_sidebar_status(args, noterp) {
+    var sidebar = $('#a_main_sidebar')
+    var view_type=$('#_terp_view_type')
+    if (sidebar && view_type && view_type.val() == 'form') {
+        if (sidebar.hasClass('closed')) {
+            console.log('is_closed');
+            if (noterp) {
+                args['sidebar_closed'] = 1;
+            } else {
+                args['_terp_sidebar_closed'] = 1;
+            }
+        }
+    }
+}
 
 function submit_form(action, src, target){
 
@@ -219,7 +233,7 @@
         action = 'save';
         args['_terp_close'] = 1;
     }
-
+    get_sidebar_status(args);
     action = get_form_action(action, args);
 
     var $form = jQuery('#view_form');
@@ -1352,3 +1366,14 @@
     }
     return true;
 }
+
+function fullscreen(mode) {
+    // switch left panel
+    $('#nav2').toggle(!mode);
+    $('#main-sidebar-toggler').toggleClass('closed', mode);
+
+    // switch right panel
+    var to_remove = mode && 'open' || 'closed';
+    var to_add = mode && 'closed' || 'open';
+    $('#tertiary,#a_main_sidebar').addClass(to_add).removeClass(to_remove);
+}

=== modified file 'addons/openerp/widgets/form/templates/binary.mako'
--- addons/openerp/widgets/form/templates/binary.mako	2011-06-29 05:19:57 +0000
+++ addons/openerp/widgets/form/templates/binary.mako	2013-11-07 08:48:38 +0000
@@ -24,7 +24,9 @@
         %if value:
         	<input type="hidden" name="${name}" value="${value}"></input>
        	% endif
-        % if text:
+        % if text and model == 'ir.attachment':
+        <a class="button-a" href="javascript: void(0)" onclick="save_binary_data('${name}', '${filename}')">${_("Open donation certificate")}</a>
+        % elif text:
         <a class="button-a" href="javascript: void(0)" onclick="save_binary_data('${name}', '${filename}')">${_("Save As")}</a>
         % endif
         % if editable and not readonly:

=== modified file 'openobject/controllers/templates/base.mako'
--- openobject/controllers/templates/base.mako	2012-03-23 06:58:31 +0000
+++ openobject/controllers/templates/base.mako	2013-11-07 08:48:38 +0000
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.base.js"></script>
     <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.gettext.js"></script>
     <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.dom.js"></script>
-    <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.http.js"></script>
+    <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.http.js?v=2.7b1"></script>
     <script type="text/javascript" src="/openobject/static/javascript/openobject/openobject.tools.js"></script>
     
     <script type="text/javascript">

=== modified file 'openobject/static/javascript/openobject/openobject.http.js'
--- openobject/static/javascript/openobject/openobject.http.js	2011-07-08 10:54:52 +0000
+++ openobject/static/javascript/openobject/openobject.http.js	2013-11-07 08:48:38 +0000
@@ -95,7 +95,14 @@
             uri = sp + uri;
         }
     
-        return qs ? uri + "?" +  qs : uri;
+        
+        if (qs) {
+            if (uri.indexOf('?') != -1) {
+                return uri + '&' +qs;
+            }
+            return uri + "?" +  qs;
+        } 
+        return uri
     },
     
     redirect: function(uri, params) {