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

[minor] [ui] link to calendars

Browse source
This commit is contained in:
Rushabh Mehta 2015-07-08 12:38:28 +05:30
parent 26b219a461
commit f6bee7e78b
5 changed files with 44 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/boot.py
View file

@ -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

2
frappe/hooks.py
View file

@ -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 = [

58
frappe/public/js/frappe/ui/page.html
View file

@ -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>

12
frappe/public/js/frappe/views/calendar.js
View file

@ -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");
})

1
frappe/utils/formatters.py
View file

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