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

activity type fix and fixes in page titles

Browse source
This commit is contained in:
Rushabh Mehta 2012-11-16 12:21:27 +05:30
parent 082a93f31e
commit 50952d7a22
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/doctype/doctype/doctype.txt
View file

@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
u'creation': '2012-07-12 22:19:54',
u'creation': '2012-10-15 17:50:35',
u'docstatus': 0,
u'modified': '2012-10-15 17:42:42',
u'modified': '2012-11-16 12:14:02',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
@ -77,11 +77,11 @@
{
u'doctype': u'DocField',
'fieldname': u'module',
'fieldtype': u'Data',
'fieldtype': u'Link',
'label': u'Module',
'oldfieldname': u'module',
'oldfieldtype': u'Link',
'options': u'Suggest',
'options': u'Module Def',
'reqd': 1
},
@ -487,18 +487,12 @@
'role': u'System Manager'
},
# DocPerm
{
u'doctype': u'DocPerm',
'permlevel': 0,
'role': u'System Manager'
},
# DocPerm
{
'cancel': 0,
'create': 1,
u'doctype': u'DocPerm',
'execute': 0,
'permlevel': 0,
'role': u'Administrator',
'submit': 0,

1
public/js/legacy/widgets/form/form.js
View file

@ -120,6 +120,7 @@ _f.Frm.prototype.setup_print_layout = function() {
wn.ui.make_app_page({
parent: this.print_wrapper,
single_column: true,
set_document_title: false,
title: me.doctype + ": Print View",
module: me.meta.module
});

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

@ -1,5 +1,6 @@
wn.ui.AppFrame = Class.extend({
init: function(parent, title, module) {
this.set_document_title = true;
this.buttons = {};
this.$w = $('<div></div>').appendTo(parent);
@ -24,7 +25,8 @@ wn.ui.AppFrame = Class.extend({
this.set_title(txt);
},
set_title: function(txt) {
document.title = txt;
if(this.set_document_title)
document.title = txt;
this.$titlebar.find(".appframe-title").html(txt);
},
set_marker: function(module) {
@ -131,6 +133,8 @@ wn.ui.make_app_page = function(opts) {
</div>');
}
opts.parent.appframe = new wn.ui.AppFrame($(opts.parent).find('.layout-appframe'));
if(opts.set_document_title!==undefined)
opts.parent.appframe.set_document_title = opts.set_document_title;
if(opts.title) opts.parent.appframe.title(opts.title);
if(opts.module) opts.parent.appframe.set_marker(opts.module);
}

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

@ -53,6 +53,7 @@ wn.ui.Dialog = wn.ui.FieldGroup.extend({
make_head: function() {
var me = this;
this.appframe = new wn.ui.AppFrame(this.wrapper);
this.appframe.set_document_title = false;
this.appframe.$titlebar.find('.close').unbind('click').click(function() {
if(me.oncancel)me.oncancel(); me.hide();
});