Merge branch 'develop'

frappe/__version__.py

@@ -1 +1 @@
-__version__ = "4.4.0"
+__version__ = "4.4.1"

frappe/hooks.py

@@ -3,7 +3,7 @@ app_title = "Frappe Framework"
 app_publisher = "Web Notes Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "assets/frappe/images/frappe.svg"
-app_version = "4.4.0"
+app_version = "4.4.1"
 app_color = "#3498db"
 app_email = "support@frappe.io"
 

frappe/public/css/desk.css

@@ -75,7 +75,7 @@ div#freeze {
 	overflow: hidden;
 }
 
-.page-container .container {
+.limit-container-width .container {
 	max-width: 970px;
 }
 

frappe/public/js/frappe/ui/appframe.js

@@ -312,7 +312,7 @@ frappe.ui.make_app_page = function(opts) {
 			"title: [optional] set this title"
 		]
 	*/
-	$wrapper = $(opts.parent)
+	var $wrapper = $(opts.parent)
 	$('<div class="app-page container"><div class="appframe-titlebar">\
 			<div class="container">\
 				<div class="row">\
@@ -360,5 +360,6 @@ frappe.ui.make_app_page = function(opts) {
 		opts.parent.appframe.set_document_title = opts.set_document_title;
 	if(opts.title) opts.parent.appframe.set_title(opts.title);
 	if(opts.icon) opts.parent.appframe.get_main_icon(opts.icon);
+	if(opts.full_width) $wrapper.find(".app-page").addClass("full-width");
 
 }

frappe/public/js/frappe/views/container.js

@@ -13,6 +13,8 @@ frappe.views.Container = Class.extend({
 		this.page = null; // current page
 		this.pagewidth = $('#body_div').width();
 		this.pagemargin = 50;
+
+		$(document).on("page-change", this.set_full_width);
 	},
 	add_page: function(label, onshow, onhide) {
 		var page = $('<div class="content page-container"></div>')
@@ -71,5 +73,11 @@ frappe.views.Container = Class.extend({
 		$(this.page).trigger('show');
 		scroll(0,0);
 		return this.page;
+	},
+	set_full_width: function() {
+		// limit max-width to 970px for most pages
+		$("body").toggleClass("limit-container-width", !$(frappe.container.page).find(".app-page.full-width").length);
 	}
 });
+
+

frappe/public/js/frappe/views/grid_report.js

@@ -103,6 +103,7 @@ frappe.views.GridReport = Class.extend({
 		var me = this;
 		$.extend(this, opts);
 
+		$(this.page).find(".app-page").addClass("full-width");
 		this.wrapper = $('<div>').appendTo(this.parent);
 		this.appframe.parent.find(".appframe").css({"padding-top": "0px"});
 
@@ -125,6 +126,7 @@ frappe.views.GridReport = Class.extend({
 			// reapply filters on show
 			frappe.cur_grid_report = me;
 			me.get_data_and_refresh();
+			frappe.container.set_full_width();
 		});
 
 	},

frappe/public/js/frappe/views/query_report.js

@@ -12,7 +12,8 @@ frappe.standard_pages["query-report"] = function() {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Query Report'),
-		single_column: true
+		single_column: true,
+		full_width: true
 	});
 
 	frappe.query_report = new frappe.views.QueryReport({

frappe/public/js/frappe/views/reportview.js

@@ -41,7 +41,7 @@ frappe.views.ReportViewPage = Class.extend({
 		var me = this;
 		this.page = frappe.container.add_page(this.page_name);
 		frappe.ui.make_app_page({parent:this.page,
-			single_column:true});
+			single_column:true, full_width: true});
 		frappe.container.change_to(this.page_name);
 
 		$(this.page).on('show', function(){

frappe/templates/print_formats/standard_macros.html

@@ -105,7 +105,7 @@
 		<h3>{{ doc.select_print_heading or (doc.print_heading if doc.print_heading != None
 			else _(doc.doctype)) }}</h3>
 		<h4 class="text-muted">{{ doc.sub_heading if doc.sub_heading != None
-				else "#{}".format(doc[doc.meta.title_field or "name"]) }}</h4>
+				else ("#" + doc[doc.meta.title_field or "name"]) }}</h4>
 	</div>
 	{%- if doc.meta.is_submittable and doc.docstatus==0-%}
 	<div class="alert alert-info text-center">

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.4.0"
+version = "4.4.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()