[ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9

This commit is contained in:
Rushabh Mehta
2013-05-23 16:03:49 +05:30
parent 4a2f0f8c36
commit b394a25904
7 changed files with 67 additions and 59 deletions

View File

@@ -1,11 +0,0 @@
<div class="appframe col col-lg-12">
<div class="appframe-area"></div>
<div class="layout-main-section">
<div class="tree-area"></div>
</div>
<div class="layout-side-section">
<div class="help">To add child nodes, explore tree and click on the node under which you want to add more nodes.
</div>
</div>
<div class="clear"></div>
</div>

View File

@@ -15,14 +15,22 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
pscript['onload_Sales Browser'] = function(wrapper){
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'));
wrapper.appframe.add_home_breadcrumb()
wn.ui.make_app_page({
parent: wrapper,
})
wrapper.appframe.add_module_icon("Selling")
wrapper.appframe.add_button('Refresh', function() {
wrapper.make_tree();
}, 'icon-refresh');
$(wrapper)
.find(".layout-side-section")
.html('<div class="text-muted">Click on a link to get options to expand \
get options Add / Edit / Delete.</div>')
wrapper.make_tree = function() {
var ctype = wn.get_route()[1] || 'Territory';
wn.call({
@@ -30,7 +38,13 @@ pscript['onload_Sales Browser'] = function(wrapper){
args: {ctype: ctype},
callback: function(r) {
var root = r.message[0]["value"];
erpnext.sales_chart = new erpnext.SalesChart(ctype, root, wrapper);
erpnext.sales_chart = new erpnext.SalesChart(ctype, root,
$(wrapper)
.find(".layout-main-section")
.css({
"min-height": "300px",
"padding-bottom": "25px"
}));
}
});
}
@@ -50,12 +64,12 @@ pscript['onshow_Sales Browser'] = function(wrapper){
};
erpnext.SalesChart = Class.extend({
init: function(ctype, root, wrapper) {
$(wrapper).find('.tree-area').empty();
init: function(ctype, root, parent) {
$(parent).empty();
var me = this;
me.ctype = ctype;
this.tree = new wn.ui.Tree({
parent: $(wrapper).find('.tree-area'),
parent: $(parent),
label: root,
args: {ctype: ctype},
method: 'selling.page.sales_browser.sales_browser.get_children',