Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2012-10-03 13:33:33 +05:30
commit 061141b3b8
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
home/page/profile_settings/profile_settings.js
View File

@ -65,13 +65,15 @@ MyProfile = function(wrapper) {
// //
this.make_form = function() { this.make_form = function() {
var div = $a($td(this.tab, 0, 1), 'div'); var div = $a($td(this.tab, 0, 1), 'div');
this.form = new wn.ui.FieldGroup() this.form = new wn.ui.FieldGroup({
this.form.make_fields(div, [ parent: div,
{fieldname:'first_name', fieldtype:'Data',label:'First Name',reqd:1}, fields: [
{fieldname:'last_name', fieldtype:'Data',label:'Last Name'}, {fieldname:'first_name', fieldtype:'Data',label:'First Name',reqd:1},
{fieldname:'bio', fieldtype:'Text',label:'Bio'}, {fieldname:'last_name', fieldtype:'Data',label:'Last Name'},
{fieldname:'update', fieldtype:'Button',label:'Update'} {fieldname:'bio', fieldtype:'Text',label:'Bio'},
]); {fieldname:'update', fieldtype:'Button',label:'Update'}
]
});
this.form.fields_dict.update.input.onclick = function() { this.form.fields_dict.update.input.onclick = function() {
var v = me.form.get_values(); var v = me.form.get_values();
@ -99,7 +101,6 @@ MyProfile = function(wrapper) {
{fieldname:'change', fieldtype:'Button', label:'Change'} {fieldname:'change', fieldtype:'Button', label:'Change'}
] ]
}) })
d.make();
d.fields_dict.change.input.onclick = function() { d.fields_dict.change.input.onclick = function() {
var v = d.get_values(); var v = d.get_values();
if(v) { if(v) {

1
public/js/startup.css
View File

@ -1,6 +1,5 @@
h1, h2, h3, h4, h5 { h1, h2, h3, h4, h5 {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
margin-top: 0.2em;
} }
body { body {

2
public/js/startup.js
View File

@ -182,6 +182,8 @@ erpnext.setup_mousetrap = function() {
Mousetrap.bind(["command+s", "ctrl+s"], function() { Mousetrap.bind(["command+s", "ctrl+s"], function() {
if(cur_frm) if(cur_frm)
cur_frm.save(); cur_frm.save();
else if(wn.container.page.save_action)
wn.container.page.save_action();
return false; return false;
}); });
} }

14
utilities/page/todo/todo.js
View File

@ -56,7 +56,7 @@ erpnext.todo.ToDoItem = Class.extend({
todo.fullname = ''; todo.fullname = '';
if(todo.assigned_by) { if(todo.assigned_by) {
var assigned_by = wn.boot.user_info[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), fullname: (assigned_by ? assigned_by.fullname : todo.assigned_by),
}); });
} }
@ -64,7 +64,7 @@ erpnext.todo.ToDoItem = Class.extend({
var parent_list = "#todo-list"; var parent_list = "#todo-list";
if(todo.owner !== user) { if(todo.owner !== user) {
var owner = wn.boot.user_info[todo.owner]; 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), 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:'Date', fieldname:'date', label:'Event Date', reqd:1},
{fieldtype:'Check', fieldname:'checked', label:'Completed'}, {fieldtype:'Check', fieldname:'checked', label:'Completed'},
{fieldtype:'Select', fieldname:'priority', label:'Priority', reqd:1, 'options':['Medium','High','Low'].join('\n')}, {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({ erpnext.todo.make_dialog({
date:get_today(), priority:'Medium', checked:0, description:''}); date:get_today(), priority:'Medium', checked:0, description:''});
}, 'icon-plus'); }, 'icon-plus');
wrapper.appframe.add_ripped_paper_effect(wrapper);
// load todos // load todos
erpnext.todo.refresh(); 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();
}
};
} }