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

fixes to website module and fixed rename and double column bugs

Browse source
This commit is contained in:
Rushabh Mehta 2012-04-25 18:24:55 +05:30
parent 65726edd59
commit 598967e4d3
7 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
css/legacy/body.css
View file

@ -203,9 +203,9 @@ div.std-footer-item {
}
.layout_wrapper, .layout-wrapper {
-moz-box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
-webkit-box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
-moz-box-shadow: 0px 0px 9px rgba(0,0,0,0.5);
-webkit-box-shadow: 0px 0px 9px rgba(0,0,0,0.5);
box-shadow: 0px 0px 9px rgba(0,0,0,0.5);
background-color: #fff;
padding: 15px;
-webkit-border-radius: 5px;
@ -225,7 +225,8 @@ div.std-footer-item {
}
.layout-main {
padding: 15px;
padding: 15px;
background-color: #fff;
}
.layout-main-section {

2
js/core.min.js vendored
View file

@ -216,7 +216,7 @@ if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!me.fields_by_name[df.field
/*
* lib/js/wn/views/container.js
*/
wn.provide('wn.pages');wn.provide('wn.views');wn.views.Container=Class.extend({init:function(){this.container=$('#body_div').get(0);this.page=null;this.pagewidth=$('#body_div').width();this.pagemargin=50;},add_page:function(label,onshow,onhide){var page=$('<div class="content"></div>').appendTo(this.container).get(0);if(onshow)
wn.provide('wn.pages');wn.provide('wn.views');wn.views.Container=Class.extend({init:function(){this.container=$('#body_div').get(0);this.page=null;this.pagewidth=$('#body_div').width();this.pagemargin=50;},add_page:function(label,onshow,onhide){var page=$('<div class="content"></div>').attr('id',"page-"+label).appendTo(this.container).get(0);if(onshow)
$(page).bind('show',onshow);if(onshow)
$(page).bind('hide',onhide);page.label=label;wn.pages[label]=page;return page;},change_to:function(label){if(this.page&&this.page.label==label){return;}
var me=this;if(label.tagName){var page=label;}else{var page=wn.pages[label];}

4
js/legacy/widgets/form/form.js
View file

@ -244,7 +244,9 @@ _f.Frm.prototype.rename_notify = function(dt, old, name) {
// from form
if(this.docname == old)
this.docname = name;
this.docname = name;
else
return; // thats it, not for children!
// cleanup
if(this && this.opendocs[old]) {

1
js/wn/views/container.js
View file

@ -11,6 +11,7 @@ wn.views.Container = Class.extend({
},
add_page: function(label, onshow, onhide) {
var page = $('<div class="content"></div>')
.attr('id', "page-" + label)
.appendTo(this.container).get(0);
if(onshow)
$(page).bind('show', onshow);

1
py/core/page/login_page/login_page.js
View file

@ -23,6 +23,7 @@
pscript['onload_Login Page'] = function(wrapper){
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'));
wrapper.appframe.title('Login');
wrapper.appframe.$w.find('.close').toggle(false);
var lw = $i('login_wrapper');
$bs(lw, '1px 1px 3px #888');

9
py/webnotes/model/doctype.py
View file

@ -49,11 +49,12 @@ class _DocType:
doclist += self.get_custom_fields(self.name)
if form:
table_fields = self.get_table_fields(doclist)
for t in table_fields:
table_fields = [t[0] for t in self.get_table_fields(doclist)]
# for each unique table
for t in list(set(table_fields)):
# Get child doc and its fields
table_doclist = webnotes.model.doc.get('DocType', t[0], 1)
table_doclist += self.get_custom_fields(t[0])
table_doclist = webnotes.model.doc.get('DocType', t, 1)
table_doclist += self.get_custom_fields(t)
doclist += table_doclist
self.apply_property_setters(doclist)

1
py/webnotes/widgets/page.py
View file

@ -50,7 +50,6 @@ class Page:
if os.path.exists(fpath):
with open(fpath, 'r') as f:
doc.fields['__script'] = f.read()
doc.script = None
# css
fpath = os.path.join(path, scrub(doc.name) + '.css')