vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'dev' of github.com:webnotes/wnframework into dev

Browse source
This commit is contained in:
Rushabh Mehta 2012-07-16 14:17:32 +05:30
commit aacdae2903
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
js/legacy/wn/widgets/form/sidebar.js
View file

@ -106,10 +106,7 @@ wn.widgets.form.sidebar = { Sidebar: function(form) {
render: function(wrapper) {
me.form.assign_to = new wn.widgets.form.sidebar.AssignTo(wrapper, me, me.form.doctype, me.form.docname);
},
display: function() {
if(me.form.doc.__local) return false;
else return true;
}
display: function() { return !me.form.doc.__islocal }
},
{

29
js/wn/views/doclistview.js
View file

@ -384,7 +384,7 @@ wn.views.ListView = Class.extend({
// content
if(typeof opts.content=='function') {
opts.content(parent, data);
opts.content(parent, data, me);
}
else if(opts.content=='name') {
$(parent).append(repl('<a href="#!Form/%(doctype)s/%(name)s">%(name)s</a>', data));
@ -409,16 +409,7 @@ wn.views.ListView = Class.extend({
$(parent).append(data.when);
}
else if(opts.type=='bar-graph') {
args = {
percent: data[opts.content],
fully_delivered: (data[opts.content] > 99 ? 'bar-complete' : ''),
label: opts.label
}
$(parent).append(repl('<span class="bar-outer" style="width: 30px; float: right" \
title="%(percent)s% %(label)s">\
<span class="bar-inner %(fully_delivered)s" \
style="width: %(percent)s%;"></span>\
</span>', args));
this.render_bar_graph(parent, data, opts.content, opts.label);
}
else if(opts.type=='link' && opts.doctype) {
$(parent).append(repl('<a href="#!Form/'+opts.doctype+'/'
@ -512,6 +503,22 @@ wn.views.ListView = Class.extend({
if(!this.doclistview.can_delete) {
this.columns = $.map(this.columns, function(v, i) { if(v.content!='check') return v });
}
},
render_bar_graph: function(parent, data, field, label) {
var args = {
percent: data[field],
fully_delivered: (data[field] > 99 ? 'bar-complete' : ''),
label: label
}
$(parent).append(repl('<span class="bar-outer" style="width: 30px; float: right" \
title="%(percent)s% %(label)s">\
<span class="bar-inner %(fully_delivered)s" \
style="width: %(percent)s%;"></span>\
</span>', args));
},
render_icon: function(parent, icon_class, label) {
var icon_html = "<i class='%(icon_class)s' title='%(label)s'></i>";
$(parent).append(repl(icon_html, {icon_class: icon_class, label: label || ''}));
}
});