[MERGE] forward port of branch 8.0 up to 2b192be

[odoo/odoo.git] / addons / web / static / src / xml / base.xml

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index eb02390..f99a96b 100644 (file)
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -228,6 +228,15 @@
                         <td><label for="backup_pwd">Master Password:</label></td>
                         <td><input type="password" name="backup_pwd" class="required" /></td>
                     </tr>
+                    <tr>
+                        <td><label>Format:</label></td>
+                        <td>
+                            <input type="radio" name="format" checked="checked" value="zip" />
+                            <label for="format" title="Archive containing a dump of your database and your whole filestore">Zip</label>
+                            <input type="radio" name="format" value="binary" />
+                            <label for="format" title="Binary dump of your database (PostgreSQL dump)">Binary</label>
+                        </td>
+                    </tr>
                 </table>
             </form>
             <form id="db_restore" name="restore_db_form" style="display: none; ">
@@ -365,13 +374,13 @@
 <t t-name="UserMenu.about">
 
     <div class="oe_about">
-      <a class="oe_activate_debug_mode oe_right label label-primary" href="?debug" >Activate the developer mode</a>
-
-
 
-        <div class="container">
-            <div class="">
-                <div class="col-sm-6 col-md-6 user-details">
+        <div class="container-fluid">
+            <div class="row">
+                <a class="oe_activate_debug_mode oe_right label label-primary" href="?debug" >Activate the developer mode</a>
+            </div>
+            <div class="row">
+                <div class="col-sm-offset-2 col-md-offset-2 col-sm-8 col-md-8 user-details">
                     <div class="user-image">
                         <img src="/web/static/src/img/logo2.png" alt="Odoo (Formerly OpenERP)" title="Odoo (Formerly OpenERP)" class="img-circle"/>
                     </div>
@@ -381,7 +390,7 @@
                             <h3>Version <t t-esc="version_info.server_version"/></h3>
                         </div>
 
-                        <ul class="navigation">
+                        <ul class="list-inline text-center navigation">
                             <li class="active">
                                 <a data-toggle="tab" href="#settings">
                                     <span class="glyphicon glyphicon-cog"></span>
@@ -439,7 +448,6 @@
             </div>
         </div>
     </div>
-
 </t>
 
 <t t-name="WebClient.timezone_notification">
@@ -577,7 +585,7 @@
 </t>
 <t t-name="ViewPager">
     <div class="oe_pager_value">
-        <t t-raw="__content__"/>
+        <t t-raw="0"/>
     </div>
     <ul class="oe_pager_group">
         <!--
@@ -606,6 +614,7 @@
                 <button class="oe_dropdown_toggle oe_dropdown_arrow" t-if="section.name != 'buttons'">
                     <t t-if="section.name == 'files'" t-raw="widget.items[section.name].length || ''"/>
                     <t t-esc="section.label"/>
+                    <i class="fa fa-caret-down"/>
                 </button>
                 <t t-if="section.name == 'buttons'" t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
                     <button t-att-title="item.title or ''" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url"
@@ -1298,10 +1307,10 @@
                     <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
                     <b>Uploading ...</b>
                 </div>
+                <t t-call="HiddenInputFile">
+                    <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+                </t>
             </div>
-          <t t-call="HiddenInputFile">
-            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-          </t>
         </t>
     </span>
 </t>
@@ -1374,7 +1383,7 @@
             method="post" enctype="multipart/form-data" t-att-action="fileupload_action || '/web/binary/upload'">
             <input type="hidden" name="session_id" value="" t-if="widget.session.override_session"/>
             <input type="hidden" name="callback" t-att-value="fileupload_id"/>
-            <t t-raw="__content__"/>
+            <t t-raw="0"/>
             <input type="file" class="oe_form_binary_file" name="ufile" t-if="widget.widget!='image'"/>
             <input type="file" class="oe_form_binary_file" name="ufile" accept="image/*" t-if="widget.widget=='image'"/>
         </form>
@@ -2029,6 +2038,13 @@
     <a href="javascript:void(0)"><t t-esc="text"/></a>
 </t>
 <t t-name="StatInfo">
-    <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t>
+    <strong><t t-esc="value"/></strong><br/><t t-esc="text"/>
+</t>
+<button t-name="toggle_button" type="button"
+    t-att-title="widget.string"
+    style="box-shadow: none; white-space:nowrap;">
+    <img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png"
+    t-att-alt="widget.string"/>
+</button>
 
 </templates>