Jiten (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-looks-db-management into
lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-looks-db-management/+merge/118698
The DB management interface look like the rest of the app.
Use existing css for menu on the left, input fields, labels and title.
There is not create any new css for that.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-looks-db-management/+merge/118698
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-improve-looks-db-management.
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2012-08-08 06:51:18 +0000
+++ addons/web/static/src/css/base.css 2012-08-08 09:31:09 +0000
@@ -984,6 +984,10 @@
color: black;
text-align: left;
}
+.openerp .db_option_table{
+ position: relative;
+ top: 10px;
+}
.openerp .oe_database_manager .oe_database_manager_menu {
color: black;
}
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-08-07 10:09:02 +0000
+++ addons/web/static/src/js/chrome.js 2012-08-08 09:31:09 +0000
@@ -300,6 +300,7 @@
},
start: function() {
var self = this;
+ $('.oe_secondary_menus_container,.oe_user_menu_placeholder').empty();
var fetch_db = this.rpc("/web/database/get_list", {}).pipe(
function(result) {
self.db_list = result.db_list;
@@ -315,11 +316,20 @@
},
do_render: function() {
var self = this;
- self.$element.html(QWeb.render("DatabaseManager", { widget : self }));
- self.$element.find(".oe_database_manager_menu").tabs({
- show: function(event, ui) {
- $('*[autofocus]:first', ui.panel).focus();
- }
+ $('.oe_topbar,.oe_leftbar').show();
+ self.$element.html(QWeb.render("DatabaseManager",{ widget : self }));
+ $('.oe_secondary_menus_container').append($('.datamanager_menu'));
+ $('.oe_user_menu_placeholder').append($('.oe_user_menu'));
+ $('ul.oe_secondary_submenu > li:first').addClass('oe_active')
+ $('ul.oe_secondary_submenu > li').bind('click', function (event) {
+ $(this).addClass('oe_active').siblings().removeClass('oe_active');
+ var $new = $(this);
+ var submenu = $('ul.oe_secondary_submenu > li > a');
+ submenu.each(function () {
+ $($(this).attr('href')).hide();
+ });
+ $($new.find('a').attr('href')).show();
+ event.preventDefault();
});
self.$element.find("form[name=create_db_form]").validate({ submitHandler: self.do_create });
self.$element.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop });
@@ -336,7 +346,7 @@
},
submitHandler: self.do_change_password
});
- self.$element.find("#back_to_login").click(self.do_exit);
+ $('#back-to-login').click(self.do_exit);
},
destroy: function () {
this.$element.find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login').unbind('click').end().empty();
@@ -407,7 +417,6 @@
};
self.do_action(client_action);
});
-
},
do_drop: function(form) {
var self = this;
@@ -486,11 +495,14 @@
self.display_error(result);
return;
}
+ self.unblockUI();
self.do_notify("Changed Password", "Password has been changed successfully");
});
},
do_exit: function () {
- this.do_action("login");
+ this.$element.remove();
+ $('.oe_topbar,.oe_leftbar').hide();
+ this.do_action('login');
}
});
instance.web.client_actions.add("database_manager", "instance.web.DatabaseManager");
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-08-08 07:38:21 +0000
+++ addons/web/static/src/xml/base.xml 2012-08-08 09:31:09 +0000
@@ -122,151 +122,295 @@
</t>
<t t-name="DatabaseManager">
- <div class="oe_database_manager">
- <div class="oe_database_manager_menu">
- <ul class="oe_notebook">
+ <div>
+ <div class ="oe_user_menu">
+ <span class="oe_right">
+ <a id="back-to-login" href="#"><span class="oe_topbar_item oe_topbar_name">Back to Login</span></a>
+ </span>
+ </div>
+ <div class="datamanager_menu">
+ <div class="oe_secondary_menu_section">Database Management</div>
+ <ul class="oe_secondary_submenu">
<li><a href="#db_create">Create</a></li>
<li><a href="#db_drop">Drop</a></li>
<li><a href="#db_backup">Backup</a></li>
<li><a href="#db_restore">Restore</a></li>
<li><a href="#db_change_password">Password</a></li>
- <li><a id="back_to_login" href="#">Back to Login</a></li>
</ul>
- <form id="db_create" name="create_db_form" method="POST">
- <table align="center" class="db_option_table">
- <tr>
- <th colspan="2" class="option_string"> CREATE DATABASE </th>
- </tr>
- <tr>
- <td><label for="super_admin_pwd">Master password:</label></td>
- <td><input type="password" name="super_admin_pwd" class="required" value="admin"/></td>
- </tr>
- <tr>
- <td><label for="db_name">New database name:</label></td>
- <td><input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_]+$" autofocus="true"/></td>
- </tr>
- <tr>
- <td><label for="demo_data">Load Demonstration data:</label></td>
- <td><input type="checkbox" name="demo_data"/></td>
- </tr>
- <tr>
- <td><label for="db_lang">Default language:</label></td>
- <td>
- <select name="db_lang" t-if="widget.lang_list">
- <t t-foreach="widget.lang_list" t-as="lang">
- <option t-att-value="lang[0]" t-att-selected="lang[0] === 'en_US' ? 'selected' : undefined"><t t-esc="lang[1]"/></option>
- </t>
- </select>
- </td>
- </tr>
- <tr>
- <td><label for="create_admin_pwd">Admin password:</label></td>
- <td><input type="password" name="create_admin_pwd" class="required"/></td>
- </tr>
- <tr>
- <td><label for="create_confirm_pwd">Confirm password:</label></td>
- <td><input type="password" name="create_confirm_pwd" class="required" equalTo="input[name=create_admin_pwd]"/></td>
- </tr>
- <tr>
- <td colspan="2" align="right"><button class="oe_button">Create</button></td>
- </tr>
- </table>
- </form>
- <form id="db_drop" name="drop_db_form" method="POST">
- <table align="center" class="db_option_table">
- <tr>
- <th colspan="2" class="option_string"> DROP DATABASE </th>
- </tr>
- <tr>
- <td><label for="drop_db">Database:</label></td>
- <td>
- <select t-if="widget.db_list" name="drop_db" autofocus="autofocus">
- <t t-foreach="widget.db_list" t-as="db">
- <option t-att-value="db"><t t-esc="db"/></option>
- </t>
- </select>
- <input t-if="!widget.db_list" name="drop_db" class="required" type="text" autofocus="autofocus"/>
- </td>
- </tr>
- <tr>
- <td><label for="drop_password">Master Password:</label></td>
- <td><input type="password" name="drop_pwd" class="required"/></td>
- </tr>
- <tr>
- <td colspan="2" align="right"><button class="oe_button">Drop</button></td>
- </tr>
- </table>
- </form>
- <form id="db_backup" name="backup_db_form" method="POST" target="backup-target" action="/web/database/backup">
- <input type="hidden" name="token"/>
- <table align="center" class="db_option_table">
- <tr>
- <th colspan="2" class="option_string"> BACKUP DATABASE </th>
- </tr>
- <tr>
- <td><label for="backup_db">Database:</label></td>
- <td>
- <select t-if="widget.db_list" name="backup_db" autofocus="autofocus">
- <t t-foreach="widget.db_list" t-as="db">
- <option t-att-value="db"><t t-esc="db"/></option>
- </t>
- </select>
- <input t-if="!widget.db_list" name="backup_db" class="required" type="text" autofocus="autofocus"/>
- </td>
- </tr>
- <tr>
- <td><label for="backup_pwd">Master Password:</label></td>
- <td><input type="password" name="backup_pwd" class="required"/></td>
- </tr>
- <tr>
- <td colspan="2" align="right"><button class="oe_button">Backup</button></td>
- </tr>
- </table>
- </form>
- <form id="db_restore" name="restore_db_form" method="POST">
- <table align="center" class="db_option_table">
- <tr>
- <th colspan="2" class="option_string"> RESTORE DATABASE </th>
- </tr>
- <tr>
- <td><label for="restore_db">File:</label></td>
- <td><input type="file" name="db_file" class="required" autofocus="autofocus"/></td>
- </tr>
- <tr>
- <td><label for="restore_pwd">Master Password:</label></td>
- <td><input type="password" name="restore_pwd" class="required"/></td>
- </tr>
- <tr>
- <td><label for="new_db">New database name:</label></td>
- <td><input type="text" name="new_db" class="required"/></td>
- </tr>
- <tr>
- <td colspan="2" align="right"><button class="oe_button">Restore</button></td>
- </tr>
- </table>
- </form>
- <form id="db_change_password" name="change_pwd_form" method="POST">
- <table align="center" class="db_option_table">
- <tr>
- <th colspan="2" class="option_string"> CHANGE MASTER PASSWORD </th>
- </tr>
- <tr>
- <td><label for="old_pwd">Master password:</label></td>
- <td><input type="password" name="old_pwd" class="required" minlength="1" autofocus="autofocus"/></td>
- </tr>
- <tr>
- <td><label for="new_pwd">New master password:</label></td>
- <td><input type="password" name="new_pwd" class="required" minlength="1"/></td>
- </tr>
- <tr>
- <td><label for="confirm_pwd">Confirm new master password:</label></td>
- <td><input type="password" name="confirm_pwd" class="required" equalTo="input[name=new_pwd]" minlength="1"/></td>
- </tr>
- <tr>
- <td colspan="2" align="right"><button class="oe_button">Change Password</button></td>
- </tr>
- </table>
- </form>
+ </div>
+ <div class="oe_view_manager_view_form">
+ <div class="oe_form">
+ <form id="db_create" name="create_db_form" style="display: block;">
+ <div class="oe_view_manager oe_view_manager_current">
+ <table class=" oe_view_manager_header">
+ <tr class="oe_header_row oe_header_row_top">
+ <td colspan="4">
+ <h2 class="oe_view_title">
+ <span class="oe_view_title_text oe_breadcrumb_title">Create Database</span>
+ </h2>
+ </td>
+ </tr>
+ <tr class="oe_header_row">
+ <td colspan="4">
+ <div class="oe_view_manager_buttons">
+ <button type="submit" class="oe_button oe_highlight db_create" style="float:left">Create</button>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <table align="center" class="db_option_table">
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="super_admin_pwd">Master password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="super_admin_pwd" class="required" value="admin"
+ />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="db_name">New database name:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="text" name="db_name" class="required" matches="^[a-zA-Z][a-zA-Z0-9_]+$"
+ autofocus="true" />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="demo_data">Load Demonstration data:</label>
+ </td>
+ <td class="oe_form_group_cell">
+ <span class="oe_form_field oe_form_field_boolean">
+ <input type="checkbox" name="demo_data" />
+ </span>
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="db_lang">Default language:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_field oe_form_field_selection ">
+ <select name="db_lang" t-if="widget.lang_list">
+ <t t-foreach="widget.lang_list" t-as="lang">
+ <option t-att-value="lang[0]" t-att-selected="lang[0] === 'en_US' ? 'selected' : undefined">
+ <t t-esc="lang[1]" />
+ </option>
+ </t>
+ </select>
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="create_admin_pwd">Admin password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="create_admin_pwd" class="required" />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="create_confirm_pwd">Confirm password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="create_confirm_pwd" class="required" equalTo="input[name=create_admin_pwd]"
+ />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <form id="db_drop" name="drop_db_form" style="display: none; ">
+ <div class="oe_view_manager oe_view_manager_current">
+ <table class=" oe_view_manager_header">
+ <tr class="oe_header_row oe_header_row_top">
+ <td colspan="4">
+ <h2 class="oe_view_title">
+ <span class="oe_view_title_text oe_breadcrumb_title">Drop Database</span>
+ </h2>
+ </td>
+ </tr>
+ <tr class="oe_header_row">
+ <td colspan="4">
+ <div class="oe_view_manager_buttons">
+ <button type="submit" class="oe_button oe_highlight db_drop" style="float:left">Drop</button>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <table align="center" class="db_option_table">
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="drop_db">Database:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_field oe_form_field_selection">
+ <select t-if="widget.db_list" name="drop_db" autofocus="autofocus">
+ <t t-foreach="widget.db_list" t-as="db">
+ <option t-att-value="db">
+ <t t-esc="db" />
+ </option>
+ </t>
+ </select>
+ <input t-if="!widget.db_list" name="drop_db" class="required" type="text"
+ autofocus="autofocus" />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="drop_password">Master Password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="drop_pwd" class="required" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <form id="db_backup" name="backup_db_form" target="backup-target" action="/web/database/backup" style="display: none; ">
+ <div class="oe_view_manager oe_view_manager_current">
+ <table class=" oe_view_manager_header">
+ <tr class="oe_header_row oe_header_row_top">
+ <td colspan="4">
+ <h2 class="oe_view_title">
+ <span class="oe_view_title_text oe_breadcrumb_title">Backup Database</span>
+ </h2>
+ </td>
+ </tr>
+ <tr class="oe_header_row">
+ <td colspan="4">
+ <div class="oe_view_manager_buttons">
+ <button type="submit" class="oe_button oe_highlight db_backup" style="float:left">Backup</button>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <input type="hidden" name="token" />
+ <table align="center" class="db_option_table">
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="backup_db">Database:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_field oe_form_field_selection ">
+ <select t-if="widget.db_list" name="backup_db" autofocus="autofocus">
+ <t t-foreach="widget.db_list" t-as="db">
+ <option t-att-value="db">
+ <t t-esc="db" />
+ </option>
+ </t>
+ </select>
+ <input t-if="!widget.db_list" name="backup_db" class="required" type="text"
+ autofocus="autofocus" />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="backup_pwd">Master Password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="backup_pwd" class="required" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <form id="db_restore" name="restore_db_form" style="display: none; ">
+ <div class="oe_view_manager oe_view_manager_current">
+ <table class=" oe_view_manager_header">
+ <tr class="oe_header_row oe_header_row_top">
+ <td colspan="4">
+ <h2 class="oe_view_title">
+ <span class="oe_view_title_text oe_breadcrumb_title">Restore Database</span>
+ </h2>
+ </td>
+ </tr>
+ <tr class="oe_header_row">
+ <td colspan="4">
+ <div class="oe_view_manager_buttons">
+ <button type="submit" class="oe_button oe_highlight db_restore" style="float:left">Restore</button>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <table align="center" class="db_option_table">
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="restore_db">File:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="file" name="db_file" class="required" autofocus="autofocus"
+ />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="restore_pwd">Master Password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="restore_pwd" class="required" />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="new_db">New database name:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="text" name="new_db" class="required" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <form id="db_change_password" name="change_pwd_form" style="display: none;">
+ <div class="oe_view_manager oe_view_manager_current">
+ <table class=" oe_view_manager_header">
+ <tr class="oe_header_row oe_header_row_top">
+ <td colspan="4">
+ <h2 class="oe_view_title">
+ <span class="oe_view_title_text oe_breadcrumb_title">Change Master Password</span>
+ </h2>
+ </td>
+ </tr>
+ <tr class="oe_header_row">
+ <td colspan="4">
+ <div class="oe_view_manager_buttons">
+ <button type="submit" class="oe_button oe_highlight db-change-password"
+ style="float:left">Change Password</button>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <table align="center" class="db_option_table">
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="old_pwd">Master password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="old_pwd" class="required" minlength="1" autofocus="autofocus"
+ />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="new_pwd">New master password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="new_pwd" class="required" minlength="1" />
+ </td>
+ </tr>
+ <tr class="oe_form_group_row">
+ <td class="oe_form_group_cell oe_form_group_cell_label">
+ <label class= "oe_form_label oe_align_right" for="confirm_pwd">Confirm new master password:</label>
+ </td>
+ <td class="oe_form_group_cell oe_form_required">
+ <input type="password" name="confirm_pwd" class="required" equalTo="input[name=new_pwd]"
+ minlength="1" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
</div>
</div>
</t>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
