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

[ui] changes to toolbar and no back button for singles webnotes/erpnext#1052

Browse source
This commit is contained in:
Rushabh Mehta 2013-11-15 13:52:10 +05:30
parent 370289df90
commit 964f850a42
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
public/css/common.css
View file

@ -161,7 +161,6 @@ div#freeze {
/* appframe header */
.appframe {
overflow: hidden;
padding-top: 15px;
}
@ -223,7 +222,7 @@ div#freeze {
}
.appframe-iconbar, .appframe-form {
border-bottom: 2px solid #c7c7c7;
border-bottom: 1px solid #c7c7c7;
}
.appframe-form {
@ -246,12 +245,7 @@ div#freeze {
.iconbar {
display: inline-block;
padding: 9px;
border-right: 1px solid #c7c7c7;
}
.iconbar:last-child {
border-right: 0px;
padding: 9px 0px;
}
.iconbar ul {
@ -266,10 +260,6 @@ div#freeze {
padding-right: 4px;
}
.iconbar li:last-child {
padding-right: 0px;
}
.iconbar i {
margin-top: 4px;
margin-right: 4px;

10
public/js/wn/form/toolbar.js
View file

@ -40,8 +40,14 @@ wn.ui.form.Toolbar = Class.extend({
var me = this;
this.appframe.set_title(title + this.get_lock_status(), wn._(this.frm.docname),
this.frm.doc.modified_by);
this.appframe.set_title_left('<i class="icon-angle-left"></i> ' + wn._(this.frm.doctype),
function() { wn.set_route("List", me.frm.doctype); });
if(this.frm.meta.issingle) {
this.appframe.set_title_left('<i class="icon-angle-left"></i> ' + wn._(this.frm.meta.module),
function() { wn.set_route(wn.modules[me.frm.meta.module].link); });
} else {
this.appframe.set_title_left('<i class="icon-angle-left"></i> ' + wn._(this.frm.doctype),
function() { wn.set_route("List", me.frm.doctype); });
}
},
show_infobar: function() {
/* docs:

1
public/js/wn/ui/appframe.js
View file

@ -26,6 +26,7 @@ wn.ui.AppFrame = Class.extend({
setup_iconbar: function() {
var me = this;
this.iconbar = new wn.ui.IconBar(this.parent.find(".appframe-iconbar .container"), 3);
this.iconbar.$wrapper.find(".iconbar-3").addClass("pull-right");
this.iconbar.$wrapper.on("shown", function() {
me.parent.find(".appframe-iconbar").removeClass("hide")