瀏覽代碼

[ui] added list head

version-14
Rushabh Mehta 10 年之前
父節點
當前提交
dc009ae6f9
共有 16 個文件被更改,包括 348 次插入285 次删除
  1. +56
    -55
      frappe/geo/doctype/country/country.json
  2. +67
    -66
      frappe/print/doctype/letter_head/letter_head.json
  3. +129
    -129
      frappe/print/doctype/print_format/print_format.json
  4. +4
    -2
      frappe/public/build.json
  5. +11
    -1
      frappe/public/css/desk.css
  6. +12
    -6
      frappe/public/js/frappe/list/doclistview.js
  7. +2
    -0
      frappe/public/js/frappe/list/list_item_main.html
  8. +10
    -0
      frappe/public/js/frappe/list/list_item_main_head.html
  9. +2
    -1
      frappe/public/js/frappe/list/list_item_row.html
  10. +21
    -0
      frappe/public/js/frappe/list/list_item_row_head.html
  11. +12
    -15
      frappe/public/js/frappe/list/listview.js
  12. +1
    -1
      frappe/public/js/frappe/misc/pretty_date.js
  13. +4
    -6
      frappe/public/js/frappe/ui/listing.html
  14. +1
    -1
      frappe/public/js/frappe/ui/toolbar/navbar.html
  15. +14
    -1
      frappe/public/less/desk.less
  16. +2
    -1
      frappe/workflow/doctype/workflow/workflow.json

+ 56
- 55
frappe/geo/doctype/country/country.json 查看文件

@@ -1,73 +1,74 @@
{
"allow_import": 1,
"autoname": "field:country_name",
"creation": "2013-01-19 10:23:30",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:country_name",
"creation": "2013-01-19 10:23:30",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
"fields": [
{
"fieldname": "country_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Country Name",
"oldfieldname": "country_name",
"oldfieldtype": "Data",
"permlevel": 0,
"fieldname": "country_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Country Name",
"oldfieldname": "country_name",
"oldfieldtype": "Data",
"permlevel": 0,
"reqd": 1
},
},
{
"fieldname": "date_format",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Date Format",
"fieldname": "date_format",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Date Format",
"permlevel": 0
},
},
{
"fieldname": "time_zones",
"fieldtype": "Text",
"in_list_view": 1,
"label": "Time Zones",
"fieldname": "time_zones",
"fieldtype": "Text",
"in_list_view": 1,
"label": "Time Zones",
"permlevel": 0
},
},
{
"fieldname": "code",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Code",
"fieldname": "code",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Code",
"permlevel": 0
}
],
"icon": "icon-globe",
"idx": 1,
"in_create": 0,
"modified": "2014-05-27 03:49:08.984711",
"modified_by": "Administrator",
"module": "Geo",
"name": "Country",
"owner": "Administrator",
],
"icon": "icon-globe",
"idx": 1,
"in_create": 0,
"modified": "2015-01-15 15:24:29.282629",
"modified_by": "Administrator",
"module": "Geo",
"name": "Country",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"submit": 0,
"amend": 0,
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"submit": 0,
"write": 1
},
},
{
"apply_user_permissions": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"apply_user_permissions": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "All"
}
],
],
"read_only": 0
}
}

+ 67
- 66
frappe/print/doctype/letter_head/letter_head.json 查看文件

@@ -1,84 +1,85 @@
{
"autoname": "field:letter_head_name",
"creation": "2012-11-22 17:45:46",
"docstatus": 0,
"doctype": "DocType",
"allow_rename": 1,
"autoname": "field:letter_head_name",
"creation": "2012-11-22 17:45:46",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"fieldname": "letter_head_name",
"fieldtype": "Data",
"in_filter": 0,
"in_list_view": 1,
"label": "Letter Head Name",
"oldfieldname": "letter_head_name",
"oldfieldtype": "Data",
"permlevel": 0,
"fieldname": "letter_head_name",
"fieldtype": "Data",
"in_filter": 0,
"in_list_view": 1,
"label": "Letter Head Name",
"oldfieldname": "letter_head_name",
"oldfieldtype": "Data",
"permlevel": 0,
"reqd": 1
},
},
{
"depends_on": "letter_head_name",
"fieldname": "disabled",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Disabled",
"oldfieldname": "disabled",
"oldfieldtype": "Check",
"depends_on": "letter_head_name",
"fieldname": "disabled",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Disabled",
"oldfieldname": "disabled",
"oldfieldtype": "Check",
"permlevel": 0
},
},
{
"depends_on": "letter_head_name",
"description": "Check this to make this the default letter head in all prints",
"fieldname": "is_default",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Is Default",
"oldfieldname": "is_default",
"oldfieldtype": "Check",
"permlevel": 0,
"depends_on": "letter_head_name",
"description": "Check this to make this the default letter head in all prints",
"fieldname": "is_default",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Is Default",
"oldfieldname": "is_default",
"oldfieldtype": "Check",
"permlevel": 0,
"search_index": 1
},
},
{
"depends_on": "letter_head_name",
"description": "Letter Head in HTML",
"fieldname": "content",
"fieldtype": "Text Editor",
"in_list_view": 1,
"label": "Content",
"oldfieldname": "content",
"oldfieldtype": "Text Editor",
"depends_on": "letter_head_name",
"description": "Letter Head in HTML",
"fieldname": "content",
"fieldtype": "Text Editor",
"in_list_view": 1,
"label": "Content",
"oldfieldname": "content",
"oldfieldtype": "Text Editor",
"permlevel": 0
}
],
"icon": "icon-font",
"idx": 1,
"max_attachments": 3,
"modified": "2014-07-21 05:57:56.052192",
"modified_by": "Administrator",
"module": "Print",
"name": "Letter Head",
"owner": "Administrator",
],
"icon": "icon-font",
"idx": 1,
"max_attachments": 3,
"modified": "2015-01-15 15:25:02.869899",
"modified_by": "Administrator",
"module": "Print",
"name": "Letter Head",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"submit": 0,
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"submit": 0,
"write": 1
},
},
{
"apply_user_permissions": 1,
"delete": 0,
"email": 0,
"permlevel": 0,
"print": 0,
"read": 1,
"report": 0,
"apply_user_permissions": 1,
"delete": 0,
"email": 0,
"permlevel": 0,
"print": 0,
"read": 1,
"report": 0,
"role": "All"
}
]
}
}

+ 129
- 129
frappe/print/doctype/print_format/print_format.json 查看文件

@@ -1,157 +1,157 @@
{
"allow_copy": 0,
"allow_rename": 0,
"autoname": "Prompt",
"creation": "2013-01-23 19:54:43",
"docstatus": 0,
"doctype": "DocType",
"allow_copy": 0,
"allow_rename": 1,
"autoname": "Prompt",
"creation": "2013-01-23 19:54:43",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"description": "Belongs to",
"fieldname": "doc_type",
"fieldtype": "Link",
"in_filter": 1,
"in_list_view": 1,
"label": "DocType",
"options": "DocType",
"permlevel": 0,
"reqd": 1,
"description": "Belongs to",
"fieldname": "doc_type",
"fieldtype": "Link",
"in_filter": 1,
"in_list_view": 1,
"label": "DocType",
"options": "DocType",
"permlevel": 0,
"reqd": 1,
"search_index": 0
},
},
{
"allow_on_submit": 0,
"fieldname": "module",
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Module",
"no_copy": 0,
"oldfieldname": "module",
"oldfieldtype": "Select",
"options": "Module Def",
"permlevel": 0,
"print_hide": 0,
"report_hide": 0,
"reqd": 1,
"allow_on_submit": 0,
"fieldname": "module",
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Module",
"no_copy": 0,
"oldfieldname": "module",
"oldfieldtype": "Select",
"options": "Module Def",
"permlevel": 0,
"print_hide": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1
},
},
{
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"permlevel": 0
},
},
{
"allow_on_submit": 0,
"default": "No",
"fieldname": "standard",
"fieldtype": "Select",
"hidden": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Standard",
"no_copy": 1,
"oldfieldname": "standard",
"oldfieldtype": "Select",
"options": "No\nYes",
"permlevel": 1,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"allow_on_submit": 0,
"default": "No",
"fieldname": "standard",
"fieldtype": "Select",
"hidden": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "Standard",
"no_copy": 1,
"oldfieldname": "standard",
"oldfieldtype": "Select",
"options": "No\nYes",
"permlevel": 1,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1
},
},
{
"default": "Server",
"description": "Client-side formats are now deprecated",
"fieldname": "print_format_type",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Print Format Type",
"options": "Server\nClient",
"permlevel": 0,
"default": "Server",
"description": "Client-side formats are now deprecated",
"fieldname": "print_format_type",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Print Format Type",
"options": "Server\nClient",
"permlevel": 0,
"read_only": 0
},
},
{
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disabled",
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disabled",
"permlevel": 0
},
},
{
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"permlevel": 0
},
},
{
"allow_on_submit": 0,
"depends_on": "",
"fieldname": "html",
"fieldtype": "Code",
"hidden": 0,
"in_filter": 0,
"label": "HTML",
"no_copy": 0,
"oldfieldname": "html",
"oldfieldtype": "Text Editor",
"options": "HTML",
"permlevel": 0,
"print_hide": 0,
"report_hide": 0,
"reqd": 0,
"allow_on_submit": 0,
"depends_on": "",
"fieldname": "html",
"fieldtype": "Code",
"hidden": 0,
"in_filter": 0,
"label": "HTML",
"no_copy": 0,
"oldfieldname": "html",
"oldfieldtype": "Text Editor",
"options": "HTML",
"permlevel": 0,
"print_hide": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0
},
},
{
"fieldname": "print_format_help",
"fieldtype": "HTML",
"label": "Print Format Help",
"options": "<h3>Print Format Help</h3>\n<hr>\n<h4>Introduction</h4>\n<p>Print itemsFormats are rendered on the server side using the Jinja Templating Language. All forms have access to the <code>doc</code> object which contains information about the document that is being formatted. You can also access common utilities via the <code>frappe</code> module.</p>\n<p>For styling, the Boostrap CSS framework is provided and you can enjoy the full range of classes.</p>\n<hr>\n<h4>References</h4>\n<ol>\n\t<li><a href=\"http://jinja.pocoo.org/docs/templates/\" target=\"_blank\">Jinja Tempalting Language: Reference</a></li>\n\t<li><a href=\"http://getbootstrap.com\" target=\"_blank\">Bootstrap CSS Framework</a></li>\n</ol>\n<hr>\n<h4>Example</h4>\n<pre><code>&lt;h3&gt;{{ doc.select_print_heading or \"Invoice\" }}&lt;/h3&gt;\n&lt;div class=\"row\"&gt;\n\t&lt;div class=\"col-md-3 text-right\"&gt;Customer Name&lt;/div&gt;\n\t&lt;div class=\"col-md-9\"&gt;{{ doc.customer_name }}&lt;/div&gt;\n&lt;/div&gt;\n&lt;div class=\"row\"&gt;\n\t&lt;div class=\"col-md-3 text-right\"&gt;Date&lt;/div&gt;\n\t&lt;div class=\"col-md-9\"&gt;{{ doc.get_formatted(\"invoice_date\") }}&lt;/div&gt;\n&lt;/div&gt;\n&lt;table class=\"table table-bordered\"&gt;\n\t&lt;tbody&gt;\n\t\t&lt;tr&gt;\n\t\t\t&lt;th&gt;Sr&lt;/th&gt;\n\t\t\t&lt;th&gt;Item Name&lt;/th&gt;\n\t\t\t&lt;th&gt;Description&lt;/th&gt;\n\t\t\t&lt;th class=\"text-right\"&gt;Qty&lt;/th&gt;\n\t\t\t&lt;th class=\"text-right\"&gt;Rate&lt;/th&gt;\n\t\t\t&lt;th class=\"text-right\"&gt;Amount&lt;/th&gt;\n\t\t&lt;/tr&gt;\n\t\t{%- for row in doc.items -%}\n\t\t&lt;tr&gt;\n\t\t\t&lt;td style=\"width: 3%;\"&gt;{{ row.idx }}&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 20%;\"&gt;\n\t\t\t\t{{ row.item_name }}\n\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t&lt;br&gt;Item Code: {{ row.item_code}}\n\t\t\t\t{%- endif %}\n\t\t\t&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 37%;\"&gt;\n\t\t\t\t&lt;div style=\"border: 0px;\"&gt;{{ row.description }}&lt;/div&gt;&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 10%; text-align: right;\"&gt;{{ row.qty }} {{ row.uom or row.stock_uom }}&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 15%; text-align: right;\"&gt;{{\n\t\t\t\trow.get_formatted(\"rate\", doc) }}&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 15%; text-align: right;\"&gt;{{\n\t\t\t\trow.get_formatted(\"amount\", doc) }}&lt;/td&gt;\n\t\t&lt;/tr&gt;\n\t\t{%- endfor -%}\n\t&lt;/tbody&gt;\n&lt;/table&gt;</code></pre>\n<hr>\n<h4>Common Functions</h4>\n<table class=\"table table-bordered\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<td style=\"width: 30%\"><code>doc.get_formatted(\"[fieldname]\", [parent_doc])</code></td>\n\t\t\t<td>Get document value formatted as Date, Currency etc. Pass parent <code>doc</code> for curreny type fields.</td>\n\t\t</tr>\n\t\t<tr>\n\t\t\t<td style=\"width: 30%\"><code>frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")</code></td>\n\t\t\t<td>Get value from another document.</td>\n\t\t</tr>\n\t</tbody>\n</table>\n",
"fieldname": "print_format_help",
"fieldtype": "HTML",
"label": "Print Format Help",
"options": "<h3>Print Format Help</h3>\n<hr>\n<h4>Introduction</h4>\n<p>Print itemsFormats are rendered on the server side using the Jinja Templating Language. All forms have access to the <code>doc</code> object which contains information about the document that is being formatted. You can also access common utilities via the <code>frappe</code> module.</p>\n<p>For styling, the Boostrap CSS framework is provided and you can enjoy the full range of classes.</p>\n<hr>\n<h4>References</h4>\n<ol>\n\t<li><a href=\"http://jinja.pocoo.org/docs/templates/\" target=\"_blank\">Jinja Tempalting Language: Reference</a></li>\n\t<li><a href=\"http://getbootstrap.com\" target=\"_blank\">Bootstrap CSS Framework</a></li>\n</ol>\n<hr>\n<h4>Example</h4>\n<pre><code>&lt;h3&gt;{{ doc.select_print_heading or \"Invoice\" }}&lt;/h3&gt;\n&lt;div class=\"row\"&gt;\n\t&lt;div class=\"col-md-3 text-right\"&gt;Customer Name&lt;/div&gt;\n\t&lt;div class=\"col-md-9\"&gt;{{ doc.customer_name }}&lt;/div&gt;\n&lt;/div&gt;\n&lt;div class=\"row\"&gt;\n\t&lt;div class=\"col-md-3 text-right\"&gt;Date&lt;/div&gt;\n\t&lt;div class=\"col-md-9\"&gt;{{ doc.get_formatted(\"invoice_date\") }}&lt;/div&gt;\n&lt;/div&gt;\n&lt;table class=\"table table-bordered\"&gt;\n\t&lt;tbody&gt;\n\t\t&lt;tr&gt;\n\t\t\t&lt;th&gt;Sr&lt;/th&gt;\n\t\t\t&lt;th&gt;Item Name&lt;/th&gt;\n\t\t\t&lt;th&gt;Description&lt;/th&gt;\n\t\t\t&lt;th class=\"text-right\"&gt;Qty&lt;/th&gt;\n\t\t\t&lt;th class=\"text-right\"&gt;Rate&lt;/th&gt;\n\t\t\t&lt;th class=\"text-right\"&gt;Amount&lt;/th&gt;\n\t\t&lt;/tr&gt;\n\t\t{%- for row in doc.items -%}\n\t\t&lt;tr&gt;\n\t\t\t&lt;td style=\"width: 3%;\"&gt;{{ row.idx }}&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 20%;\"&gt;\n\t\t\t\t{{ row.item_name }}\n\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t&lt;br&gt;Item Code: {{ row.item_code}}\n\t\t\t\t{%- endif %}\n\t\t\t&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 37%;\"&gt;\n\t\t\t\t&lt;div style=\"border: 0px;\"&gt;{{ row.description }}&lt;/div&gt;&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 10%; text-align: right;\"&gt;{{ row.qty }} {{ row.uom or row.stock_uom }}&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 15%; text-align: right;\"&gt;{{\n\t\t\t\trow.get_formatted(\"rate\", doc) }}&lt;/td&gt;\n\t\t\t&lt;td style=\"width: 15%; text-align: right;\"&gt;{{\n\t\t\t\trow.get_formatted(\"amount\", doc) }}&lt;/td&gt;\n\t\t&lt;/tr&gt;\n\t\t{%- endfor -%}\n\t&lt;/tbody&gt;\n&lt;/table&gt;</code></pre>\n<hr>\n<h4>Common Functions</h4>\n<table class=\"table table-bordered\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<td style=\"width: 30%\"><code>doc.get_formatted(\"[fieldname]\", [parent_doc])</code></td>\n\t\t\t<td>Get document value formatted as Date, Currency etc. Pass parent <code>doc</code> for curreny type fields.</td>\n\t\t</tr>\n\t\t<tr>\n\t\t\t<td style=\"width: 30%\"><code>frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")</code></td>\n\t\t\t<td>Get value from another document.</td>\n\t\t</tr>\n\t</tbody>\n</table>\n",
"permlevel": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "icon-print",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2014-12-25 03:39:35.898712",
"modified_by": "Administrator",
"module": "Print",
"name": "Print Format",
"owner": "Administrator",
],
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "icon-print",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2015-01-15 15:26:36.225573",
"modified_by": "Administrator",
"module": "Print",
"name": "Print Format",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"submit": 0,
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"submit": 0,
"write": 1
},
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"submit": 0
}
],
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
],
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
"sort_order": "DESC"
}
}

+ 4
- 2
frappe/public/build.json 查看文件

@@ -126,9 +126,11 @@
"public/js/frappe/list/doclistview.js",
"public/js/frappe/list/list_sidebar.js",
"public/js/frappe/list/list_sidebar.html",
"public/js/frappe/list/list_item_subject.html",
"public/js/frappe/list/list_item_main.html",
"public/js/frappe/list/list_item_row.html",
"public/js/frappe/list/list_item_standard.html",
"public/js/frappe/list/list_item_main_head.html",
"public/js/frappe/list/list_item_row_head.html",
"public/js/frappe/list/list_item_subject.html",
"public/js/frappe/list/listview.js",

"public/js/frappe/ui/toolbar/selector_dialog.js",


+ 11
- 1
frappe/public/css/desk.css 查看文件

@@ -224,6 +224,10 @@ em.link-option {
transition: 0.2s;
-webkit-transition: 0.2s;
}
.list-row-head {
background-color: #f7fafc;
border-bottom: 1px solid #d1d8dd !important;
}
.list-row:hover,
.grid-row:hover {
background: #f7fafc;
@@ -282,6 +286,10 @@ em.link-option {
.doclist-row .docstatus .octicon {
font-size: 12px;
}
.list-row .h6 {
margin-top: 0px;
margin-bottom: 0px;
}
.doclist-row .progress {
margin-top: 12px;
}
@@ -584,9 +592,11 @@ ul.linked-with-list li {
font-weight: bold;
}
.list-col {
vertical-align: middle;
height: 18px;
}
.list-value {
vertical-align: middle;
}
.grid-static-col {
max-height: 200px;
overflow: hidden;


+ 12
- 6
frappe/public/js/frappe/list/doclistview.js 查看文件

@@ -57,15 +57,14 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
make_page: function() {
var me = this;
this.parent.doclistview = this;
this.page = this.parent.page;

this.$page = $(this.parent).css({"min-height": "400px"});

$('<div class="frappe-list-area">\
<div class="help">'+__('Loading')+'...</div></div>')
.appendTo(this.$page.find(".layout-main-section"));
$('<div class="frappe-list-area"></div>')
.appendTo(this.page.main);

this.$page.find(".layout-main-section")
.addClass("listview-main-section");
this.page = this.parent.page;
this.page.main.addClass("listview-main-section");
var module = locals.DocType[this.doctype].module;

this.page.set_title(__("{0} List", [__(this.doctype)]));
@@ -86,6 +85,13 @@ frappe.views.DocListView = frappe.ui.Listing.extend({
this.init_listview();
this.setup_filterable();
this.init_filters();
this.init_headers();
},

init_headers: function() {
var main = frappe.render_template("list_item_main_head", {columns: this.listview.columns});
$(frappe.render_template("list_item_row_head",
{main:main, list:this})).appendTo(this.page.main.find(".list-headers"));
},

init_listview: function() {


frappe/public/js/frappe/list/list_item_standard.html → frappe/public/js/frappe/list/list_item_main.html 查看文件

@@ -15,6 +15,7 @@
hidden-xs
{% } %}"
{% if(col.title) { %}title="{%= col.title + ": " + value %}"{% } %}>
{% if(col.type!=="Indicator") { %}<span class="list-value">{% } %}
{% if (col.type==="Subject") { %}
{%= subject %}
{% } else if (col.type==="Indicator") { %}
@@ -36,6 +37,7 @@
{% } else { %}
{%= frappe.format(value, col.df, null, data) %}
{% } %}
{% if(col.type!=="Indicator") { %}</span>{% } %}
</div>
{% } %}
{% } %}

+ 10
- 0
frappe/public/js/frappe/list/list_item_main_head.html 查看文件

@@ -0,0 +1,10 @@
<div class="row">
{% var total_cols=0; for (var i=0, l=columns.length; i < l; i++ ) {
var col = columns[i]; total_cols += parseInt(col.colspan); %}
{% if (total_cols <= 12) { %}
<div class="col-sm-{%= col.colspan %} list-col text-ellipsis h6 text-muted">
<span class="list-value">{%= col.title || col.label || "" %}</span>
</div>
{% } %}
{% } %}
</div>

+ 2
- 1
frappe/public/js/frappe/list/list_item_row.html 查看文件

@@ -4,13 +4,14 @@
{% } else { %}
col-sm-10 col-xs-9
{% } %} list-row-left">
<!-- title + columns -->
{%= main %}
</div>

<!-- id -->
{% if (list.meta.title_field) { %}
<div class="list-col col-sm-2 col-xs-3 text-right text-ellipsis rtl list-row-id">
<a class="text-muted" href="#Form/{%= data._doctype_encoded %}/{%= data._name_encoded %}">
<a class="text-muted list-value" href="#Form/{%= data._doctype_encoded %}/{%= data._name_encoded %}">
{%= data.name %}</a>
</div>
{% } %}


+ 21
- 0
frappe/public/js/frappe/list/list_item_row_head.html 查看文件

@@ -0,0 +1,21 @@
<div class="list-row list-row-head hidden-xs">
<div class="row doclist-row">
<div class="{% if (list.meta.title_field) { %}
col-sm-8 col-xs-7
{% } else { %}
col-sm-10 col-xs-9
{% } %} list-row-left">
<!-- title + columns -->
{%= main %}
</div>

<!-- id -->
{% if (list.meta.title_field) { %}
<div class="list-col col-sm-2 col-xs-3 text-right">
</div>
{% } %}

<!-- comment -->
<div class="list-col col-sm-2 col-xs-3 text-right list-row-right"></div>
</div>
</div>

+ 12
- 15
frappe/public/js/frappe/list/listview.js 查看文件

@@ -13,6 +13,9 @@ frappe.views.get_listview = function(doctype, parent) {
frappe.provide("frappe.listview_settings");
frappe.provide("frappe.listview_parent_route");

// Renders customized list
// usually based on `in_list_view` property

frappe.views.ListView = Class.extend({
init: function(doclistview, doctype) {
this.doclistview = doclistview;
@@ -103,6 +106,7 @@ frappe.views.ListView = Class.extend({
this.columns.push({
colspan: this.settings.colwidths && this.settings.colwidths.subject || 6,
type: "Subject",
title: "Title"
});
this.total_colspans = this.columns[0].colspan;

@@ -112,6 +116,7 @@ frappe.views.ListView = Class.extend({
this.columns.push({
colspan: this.settings.colwidths && this.settings.colwidths.indicator || 3,
type: "Indicator",
title: "Status"
});
this.total_colspans += this.columns[1].colspan;
}
@@ -196,21 +201,13 @@ frappe.views.ListView = Class.extend({
}


if(this.template_name) {
var main = frappe.render_template(this.template_name, {
doc: frappe.get_format_helper(data),
list: this
});
} else {
console.log(this);
var main = frappe.render_template("list_item_standard", {
data: data,
columns: this.columns,
subject: this.get_avatar_and_id(data, true),
me: this,
right_column: this.settings.right_column
});
}
var main = frappe.render_template("list_item_main", {
data: data,
columns: this.columns,
subject: this.get_avatar_and_id(data, true),
me: this,
right_column: this.settings.right_column
});

$(frappe.render_template("list_item_row", {data: data, main: main, list: this})).appendTo(row);



+ 1
- 1
frappe/public/js/frappe/misc/pretty_date.js 查看文件

@@ -17,7 +17,7 @@ function prettyDate(time, mini){
ret = "~s";
} else {
var parts = ret.split(" ");
if(parts[0]==="a") {
if(parts[0]==="a" || parts[0]==="an") {
parts[0] = 1;
}
ret = parts[0] + " " + parts[1].substr(0, 1);


+ 4
- 6
frappe/public/js/frappe/ui/listing.html 查看文件

@@ -12,18 +12,16 @@
<div style="margin-bottom:9px" class="list-toolbar-wrapper hide">
<div class="list-toolbar btn-group" style="display:inline-block; margin-right: 10px;">
</div>
<div style="display: none; width: 24px; margin-left: 4px">
<img src="assets/frappe/images/ui/button-load.gif"
class="img-load"/></div>
</div>
<div style="clear:both"></div>
<div class="no-result text-center" style="display: none;">
{%= no_result_message %}
</div>
<div class="list-loading text-center">
{%= __("Loading") %}...
</div>
<div class="result">
<div class="list-headers"></div>
<div class="list-loading text-center">
{%= __("Loading") %}...
</div>
<div class="result-list"></div>
</div>
<div class="list-paging-area" style="display: none;">


+ 1
- 1
frappe/public/js/frappe/ui/toolbar/navbar.html 查看文件

@@ -57,7 +57,7 @@
<div class="form-group form-group-sm">
<input id="navbar-search" type="text" class="form-control"
placeholder="{%= __("Search or type a command") %}"
style="margin-top: 3px; width: 300px;">
style="width: 300px;">
</div>
</form>
</div>


+ 14
- 1
frappe/public/less/desk.less 查看文件

@@ -269,6 +269,11 @@ em.link-option {
-webkit-transition: 0.2s;
}

.list-row-head {
background-color: @panel-bg;
border-bottom: 1px solid @border-color !important;
}

.list-row:hover, .grid-row:hover {
background: @panel-bg;
}
@@ -338,6 +343,11 @@ em.link-option {
font-size: 12px;
}

.list-row .h6 {
margin-top: 0px;
margin-bottom: 0px;
}

.doclist-row .progress {
margin-top: 12px;
}
@@ -712,10 +722,13 @@ ul.linked-with-list li {
}

.list-col {
vertical-align: middle;
height: 18px;
}

.list-value {
vertical-align: middle;
}

.grid-static-col {
max-height: 200px;
overflow: hidden;


+ 2
- 1
frappe/workflow/doctype/workflow/workflow.json 查看文件

@@ -1,4 +1,5 @@
{
"allow_rename": 1,
"autoname": "field:workflow_name",
"creation": "2012-12-28 10:49:55",
"description": "Defines workflow states and rules for a document.",
@@ -76,7 +77,7 @@
],
"icon": "icon-random",
"idx": 1,
"modified": "2015-01-07 14:17:35.546155",
"modified": "2015-01-15 15:22:35.816167",
"modified_by": "Administrator",
"module": "Workflow",
"name": "Workflow",


Loading…
取消
儲存