From ac7baf046ac9422d0c867827c0dde3dc405cedc3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 3 Oct 2012 12:22:13 +0530 Subject: [PATCH 1/2] commonified ripped paper effect and ctrl+s in todo --- public/js/startup.css | 1 - public/js/startup.js | 2 ++ utilities/page/todo/todo.js | 14 +++++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/public/js/startup.css b/public/js/startup.css index f61e648325..7f5f218e2d 100644 --- a/public/js/startup.css +++ b/public/js/startup.css @@ -1,6 +1,5 @@ h1, h2, h3, h4, h5 { font-family: Arial, Helvetica, sans-serif; - margin-top: 0.2em; } body { diff --git a/public/js/startup.js b/public/js/startup.js index fe9507fcf8..1d43f41f9d 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -182,6 +182,8 @@ erpnext.setup_mousetrap = function() { Mousetrap.bind(["command+s", "ctrl+s"], function() { if(cur_frm) cur_frm.save(); + else if(wn.container.page.save_action) + wn.container.page.save_action(); return false; }); } diff --git a/utilities/page/todo/todo.js b/utilities/page/todo/todo.js index 607ceb4515..2032b31335 100644 --- a/utilities/page/todo/todo.js +++ b/utilities/page/todo/todo.js @@ -56,7 +56,7 @@ erpnext.todo.ToDoItem = Class.extend({ todo.fullname = ''; if(todo.assigned_by) { var assigned_by = wn.boot.user_info[todo.assigned_by] - todo.fullname = repl("[By %(fullname)s]  ", { + todo.fullname = repl("[By %(fullname)s] ".bold(), { fullname: (assigned_by ? assigned_by.fullname : todo.assigned_by), }); } @@ -64,7 +64,7 @@ erpnext.todo.ToDoItem = Class.extend({ var parent_list = "#todo-list"; if(todo.owner !== user) { var owner = wn.boot.user_info[todo.owner]; - todo.fullname = repl("[To %(fullname)s]  ", { + todo.fullname = repl("[To %(fullname)s] ".bold(), { fullname: (owner ? owner.fullname : todo.owner), }); } @@ -136,7 +136,7 @@ erpnext.todo.make_dialog = function(det) { {fieldtype:'Date', fieldname:'date', label:'Event Date', reqd:1}, {fieldtype:'Check', fieldname:'checked', label:'Completed'}, {fieldtype:'Select', fieldname:'priority', label:'Priority', reqd:1, 'options':['Medium','High','Low'].join('\n')}, - {fieldtype:'Button', fieldname:'save', label:'Save'} + {fieldtype:'Button', fieldname:'save', label:'Save (Ctrl+S)'} ] }); @@ -187,7 +187,15 @@ wn.pages.todo.onload = function(wrapper) { erpnext.todo.make_dialog({ date:get_today(), priority:'Medium', checked:0, description:''}); }, 'icon-plus'); + wrapper.appframe.add_ripped_paper_effect(wrapper); // load todos erpnext.todo.refresh(); + + // save on click + wrapper.save_action = function() { + if(erpnext.todo.dialog && erpnext.todo.dialog.display) { + erpnext.todo.dialog.fields_dict.save.input.click(); + } + }; } \ No newline at end of file From 9a56fe48713d8ebe300a7efb94051ed6b9dd4b63 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 3 Oct 2012 12:54:35 +0530 Subject: [PATCH 2/2] bugfix in profile_settings, removed files from conf (always public/files) and changed default avatar to defunct brightkite avatar --- home/page/profile_settings/profile_settings.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/home/page/profile_settings/profile_settings.js b/home/page/profile_settings/profile_settings.js index 96a78e339e..478af83ff6 100644 --- a/home/page/profile_settings/profile_settings.js +++ b/home/page/profile_settings/profile_settings.js @@ -65,13 +65,15 @@ MyProfile = function(wrapper) { // this.make_form = function() { var div = $a($td(this.tab, 0, 1), 'div'); - this.form = new wn.ui.FieldGroup() - this.form.make_fields(div, [ - {fieldname:'first_name', fieldtype:'Data',label:'First Name',reqd:1}, - {fieldname:'last_name', fieldtype:'Data',label:'Last Name'}, - {fieldname:'bio', fieldtype:'Text',label:'Bio'}, - {fieldname:'update', fieldtype:'Button',label:'Update'} - ]); + this.form = new wn.ui.FieldGroup({ + parent: div, + fields: [ + {fieldname:'first_name', fieldtype:'Data',label:'First Name',reqd:1}, + {fieldname:'last_name', fieldtype:'Data',label:'Last Name'}, + {fieldname:'bio', fieldtype:'Text',label:'Bio'}, + {fieldname:'update', fieldtype:'Button',label:'Update'} + ] + }); this.form.fields_dict.update.input.onclick = function() { var v = me.form.get_values(); @@ -99,7 +101,6 @@ MyProfile = function(wrapper) { {fieldname:'change', fieldtype:'Button', label:'Change'} ] }) - d.make(); d.fields_dict.change.input.onclick = function() { var v = d.get_values(); if(v) {