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

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

Browse source
This commit is contained in:
Nabin Hait 2013-07-10 15:15:57 +05:30
commit bdbfe7167d
12 changed files with 52 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/doctype/customize_form_field/customize_form_field.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:32",
"docstatus": 0,
"modified": "2013-03-07 07:03:19",
"modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -37,6 +37,7 @@
"fieldname": "label",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Label",
"oldfieldname": "label",
"oldfieldtype": "Data",
@ -49,6 +50,7 @@
"fieldname": "fieldtype",
"fieldtype": "Select",
"hidden": 0,
"in_list_view": 1,
"label": "Type",
"oldfieldname": "fieldtype",
"oldfieldtype": "Select",
@ -62,6 +64,7 @@
"fieldname": "fieldname",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Name",
"oldfieldname": "fieldname",
"oldfieldtype": "Data",
@ -76,6 +79,7 @@
"fieldname": "options",
"fieldtype": "Text",
"hidden": 0,
"in_list_view": 1,
"label": "Options",
"oldfieldname": "options",
"oldfieldtype": "Text",
@ -89,6 +93,7 @@
"fieldname": "permlevel",
"fieldtype": "Int",
"hidden": 0,
"in_list_view": 1,
"label": "Perm Level",
"oldfieldname": "permlevel",
"oldfieldtype": "Int",
@ -101,6 +106,7 @@
"fieldname": "width",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Width",
"oldfieldname": "width",
"oldfieldtype": "Data",

3
core/doctype/default_home_page/default_home_page.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:32",
"docstatus": 0,
"modified": "2013-03-07 07:03:20",
"modified": "2013-07-10 14:54:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -15,6 +15,7 @@
{
"doctype": "DocField",
"fieldtype": "Link",
"in_list_view": 1,
"name": "__common__",
"oldfieldtype": "Link",
"parent": "Default Home Page",

3
core/doctype/defaultvalue/defaultvalue.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:32",
"docstatus": 0,
"modified": "2013-03-07 07:03:20",
"modified": "2013-07-10 14:54:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -23,6 +23,7 @@
{
"doctype": "DocField",
"hidden": 0,
"in_list_view": 1,
"name": "__common__",
"parent": "DefaultValue",
"parentfield": "fields",

8
core/doctype/docfield/docfield.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:33",
"docstatus": 0,
"modified": "2013-07-03 10:03:56",
"modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -38,6 +38,7 @@
"fieldname": "label",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Label",
"oldfieldname": "label",
"oldfieldtype": "Data",
@ -51,6 +52,7 @@
"fieldname": "fieldtype",
"fieldtype": "Select",
"hidden": 0,
"in_list_view": 1,
"label": "Type",
"oldfieldname": "fieldtype",
"oldfieldtype": "Select",
@ -63,6 +65,7 @@
"fieldname": "fieldname",
"fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Name",
"oldfieldname": "fieldname",
"oldfieldtype": "Data",
@ -75,6 +78,7 @@
"fieldname": "options",
"fieldtype": "Text",
"hidden": 0,
"in_list_view": 1,
"label": "Options",
"oldfieldname": "options",
"oldfieldtype": "Text",
@ -86,6 +90,7 @@
"fieldname": "reqd",
"fieldtype": "Check",
"hidden": 0,
"in_list_view": 1,
"label": "Mandatory",
"oldfieldname": "reqd",
"oldfieldtype": "Check",
@ -98,6 +103,7 @@
"doctype": "DocField",
"fieldname": "description",
"fieldtype": "Text",
"in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",

8
core/doctype/docperm/docperm.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:33",
"docstatus": 0,
"modified": "2013-03-07 07:03:20",
"modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -38,6 +38,7 @@
"fieldname": "permlevel",
"fieldtype": "Int",
"hidden": 0,
"in_list_view": 1,
"label": "Level",
"oldfieldname": "permlevel",
"oldfieldtype": "Int",
@ -51,6 +52,7 @@
"fieldname": "role",
"fieldtype": "Link",
"hidden": 0,
"in_list_view": 1,
"label": "Role",
"oldfieldname": "role",
"oldfieldtype": "Link",
@ -65,6 +67,7 @@
"fieldname": "read",
"fieldtype": "Check",
"hidden": 0,
"in_list_view": 1,
"label": "Read",
"oldfieldname": "read",
"oldfieldtype": "Check",
@ -78,6 +81,7 @@
"fieldname": "write",
"fieldtype": "Check",
"hidden": 0,
"in_list_view": 1,
"label": "Write",
"oldfieldname": "write",
"oldfieldtype": "Check",
@ -91,6 +95,7 @@
"fieldname": "create",
"fieldtype": "Check",
"hidden": 0,
"in_list_view": 1,
"label": "Create",
"oldfieldname": "create",
"oldfieldtype": "Check",
@ -104,6 +109,7 @@
"fieldname": "submit",
"fieldtype": "Check",
"hidden": 0,
"in_list_view": 1,
"label": "Submit",
"oldfieldname": "submit",
"oldfieldtype": "Check",

3
core/doctype/event_role/event_role.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:33",
"docstatus": 0,
"modified": "2013-03-07 07:03:21",
"modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -17,6 +17,7 @@
"doctype": "DocField",
"fieldname": "role",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Role",
"name": "__common__",
"oldfieldname": "role",

3
core/doctype/event_user/event_user.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:33",
"docstatus": 0,
"modified": "2013-03-07 07:03:21",
"modified": "2013-07-10 14:54:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -17,6 +17,7 @@
"doctype": "DocField",
"fieldname": "person",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Person",
"name": "__common__",
"oldfieldname": "person",

3
core/doctype/page_role/page_role.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:34",
"docstatus": 0,
"modified": "2013-03-07 07:03:26",
"modified": "2013-07-10 14:54:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -25,6 +25,7 @@
"fieldname": "role",
"fieldtype": "Link",
"hidden": 0,
"in_list_view": 1,
"label": "Role",
"name": "__common__",
"oldfieldname": "role",

3
core/doctype/userrole/userrole.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-06 11:30:13",
"docstatus": 0,
"modified": "2013-02-13 07:51:57",
"modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -25,6 +25,7 @@
"fieldname": "role",
"fieldtype": "Link",
"hidden": 0,
"in_list_view": 1,
"label": "Role",
"name": "__common__",
"oldfieldname": "role",

3
core/doctype/workflow_document_state/workflow_document_state.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:36",
"docstatus": 0,
"modified": "2013-03-07 07:03:34",
"modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
"in_list_view": 1,
"name": "__common__",
"parent": "Workflow Document State",
"parentfield": "fields",

3
core/doctype/workflow_transition/workflow_transition.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:36",
"docstatus": 0,
"modified": "2013-03-07 07:03:34",
"modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -16,6 +16,7 @@
{
"doctype": "DocField",
"fieldtype": "Link",
"in_list_view": 1,
"name": "__common__",
"parent": "Workflow Transition",
"parentfield": "fields",

17
public/js/wn/form/grid.js
View file

@ -174,6 +174,12 @@ wn.ui.form.GridRow = Class.extend({
</div>\
</div>\
<div class="form-area"></div>\
<div class="toolbar footer-toolbar" style="height: 36px;">\
<button class="btn btn-success pull-right" \
title="'+wn._("Close")+'"\
style="margin-left: 7px;">\
<i class="icon-chevron-up"></i></button>\
</div>\
</div>\
<div class="divider row"></div>\
</div>')
@ -203,7 +209,12 @@ wn.ui.form.GridRow = Class.extend({
},
set_button_events: function() {
var me = this;
this.wrapper.find(".btn-success").click(function() {
me.toggle_view();
return false;
});
this.wrapper.find(".btn-danger").click(function() {
me.wrapper.fadeOut(function() {
wn.model.clear_doc(me.doc.doctype, me.doc.name);
@ -241,7 +252,7 @@ wn.ui.form.GridRow = Class.extend({
col = $('<div class="col col-lg-1 row-index">' + (me.doc ? me.doc.idx : "#")+ '</div>')
.appendTo(me.row)
$.each(me.docfields, function(ci, df) {
if(!df.hidden && !df.print_hide && me.grid.frm.perm[df.permlevel][READ]
if(!df.hidden && df.in_list_view && me.grid.frm.perm[df.permlevel][READ]
&& !in_list(["Section Break", "Column Break"], df.fieldtype)) {
var colsize = 2,
txt = me.doc ?
@ -370,6 +381,8 @@ wn.ui.form.GridRow = Class.extend({
this.wrapper.find(".btn-danger, .grid-insert-row").toggle(false);
}
this.wrapper.find(".footer-toolbar").toggle(me.fields.length > 6);
this.grid.open_grid_row = this;
},
set_data: function() {