Merge branch 'develop'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "5.0.33"
+__version__ = "5.0.34"

frappe/boot.py

@@ -70,6 +70,7 @@ def get_bootinfo():
 
 	bootinfo.error_report_email = frappe.get_hooks("error_report_email")
 	bootinfo.default_background_image = get_url("/assets/frappe/images/ui/into-the-dawn.jpg")
+	bootinfo.calendars = sorted(frappe.get_hooks("calendars"))
 
 	return bootinfo
 

frappe/hooks.py

@@ -4,7 +4,7 @@ app_title = "Frappe Framework"
 app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "octicon octicon-circuit-board"
-app_version = "5.0.33"
+app_version = "5.0.34"
 app_color = "orange"
 
 app_email = "support@frappe.io"
@@ -59,6 +59,8 @@ website_generators = ["Web Page", "Blog Post", "Blog Category", "Web Form"]
 
 email_append_to = ["Event", "ToDo", "Communication"]
 
+calendars = ["Event"]
+
 # login
 
 on_session_creation = [

frappe/public/js/frappe/ui/page.html

@@ -2,37 +2,39 @@
 	<div class="container">
 		<div class="row">
 			<div class="col-sm-7 col-xs-6 page-title">
-                <!-- title -->
-                <h1>
-                    <div class="text-ellipsis title-text"></div>
-                    <span class="indicator hide"></span>
-                </h1>
+				<!-- title -->
+				<h1>
+						<div class="text-ellipsis title-text"></div>
+						<span class="indicator hide"></span>
+				</h1>
 			</div>
 			<div class="text-right col-sm-5 col-xs-6 page-actions">
-                <!-- ID and icon buttons -->
-                <h6 class="text-ellipsis sub-heading rtl hide text-muted"></h6>
-                <span class="page-icon-group hide hidden-xs hidden-sm"></span>
+				<!-- ID and icon buttons -->
+				<h6 class="text-ellipsis sub-heading rtl hide text-muted"></h6>
+				<span class="page-icon-group hide hidden-xs hidden-sm"></span>
 
-                <!-- buttons -->
-                <div class="btn-group menu-btn-group hide">
-                    <button type="button" class="btn btn-default btn-sm dropdown-toggle"
-                        data-toggle="dropdown" aria-expanded="false">
-                    <span class="hidden-xs">{%= __("Menu") %} <span class="caret"></span></span>
-					<span class="visible-xs"><i class="octicon octicon-triangle-down"></i></span>
-                    </button>
-                    <ul class="dropdown-menu" role="menu">
-                    </ul>
-                </div>
-                <button class="btn btn-secondary btn-default btn-sm hide"></button>
-                <div class="btn-group actions-btn-group hide">
-                    <button type="button" class="btn btn-primary btn-sm dropdown-toggle"
-                        data-toggle="dropdown" aria-expanded="false">
-                    {%= __("Actions") %} <span class="caret"></span>
-                    </button>
-                    <ul class="dropdown-menu" role="menu">
-                    </ul>
-                </div>
-                <button class="btn btn-primary btn-sm hide primary-action"></button>
+				<!-- buttons -->
+				<div class="btn-group menu-btn-group hide">
+						<button type="button" class="btn btn-default btn-sm dropdown-toggle"
+								data-toggle="dropdown" aria-expanded="false">
+						<span class="hidden-xs">
+							<span class="menu-btn-group-label">{%= __("Menu") %}</span>
+							<span class="caret"></span></span>
+	<span class="visible-xs"><i class="octicon octicon-triangle-down"></i></span>
+						</button>
+						<ul class="dropdown-menu" role="menu">
+						</ul>
+				</div>
+				<button class="btn btn-secondary btn-default btn-sm hide"></button>
+				<div class="btn-group actions-btn-group hide">
+						<button type="button" class="btn btn-primary btn-sm dropdown-toggle"
+								data-toggle="dropdown" aria-expanded="false">
+						{%= __("Actions") %} <span class="caret"></span>
+						</button>
+						<ul class="dropdown-menu" role="menu">
+						</ul>
+				</div>
+				<button class="btn btn-primary btn-sm hide primary-action"></button>
 			</div>
 		</div>
 	</div>

frappe/public/js/frappe/ui/toolbar/awesome_bar.js

@@ -34,7 +34,7 @@ frappe.search = {
 				frappe.search.autocomplete_open = false;
 			},
 			select: function(event, ui) {
-				if(ui.item._options) {
+				if(ui.item.route_options) {
 					frappe.route_options = ui.item.route_options;
 				}
 

frappe/public/js/frappe/views/calendar.js

@@ -65,7 +65,17 @@ frappe.views.Calendar = frappe.views.CalendarBase.extend({
 			frappe.set_route("Form", me.doctype, doc.name);
 		});
 
-		var me = this;
+		// add links to other calendars
+		$.each(frappe.boot.calendars, function(i, doctype) {
+			if(frappe.model.can_read(doctype)) {
+				me.page.add_menu_item(__(doctype), function() {
+					frappe.set_route("Calendar", doctype);
+				});
+			}
+		});
+
+		this.page.page_actions.find(".menu-btn-group-label").text(__("Type"));
+
 		$(this.parent).on("show", function() {
 			me.$cal.fullCalendar("refetchEvents");
 		})

frappe/utils/formatters.py

@@ -48,4 +48,3 @@ def format_value(value, df, doc=None, currency=None):
 			return value.replace("\n", "<br>")
 
 	return value
-

frappe/website/doctype/top_bar_item/top_bar_item.json

@@ -22,7 +22,7 @@
    "permlevel": 0
   }, 
   {
-   "description": "Link to the page you want to open", 
+   "description": "Link to the page you want to open. Leave blank if you want to make it a group parent.", 
    "fieldname": "url", 
    "fieldtype": "Data", 
    "in_list_view": 1, 
@@ -51,7 +51,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2015-02-19 13:07:34.558311", 
+ "modified": "2015-07-07 07:06:26.632888", 
  "modified_by": "Administrator", 
  "module": "Website", 
  "name": "Top Bar Item", 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.0.33"
+version = "5.0.34"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()