- | {% calendar_modify_link cal %} |
+ {% calendar_view_link cal %} |
{% if with_owner %}{{ cal.owner }} | {% endif %}
{% render_tags cal.tags %} |
- {{ cal.url }} |
{% calendar_actions cal %} |
{% endfor %}
diff --git a/modoboa/extensions/radicale/templatetags/radicale_tags.py b/modoboa/extensions/radicale/templatetags/radicale_tags.py
index 0b18285b8..e655be253 100644
--- a/modoboa/extensions/radicale/templatetags/radicale_tags.py
+++ b/modoboa/extensions/radicale/templatetags/radicale_tags.py
@@ -43,37 +43,46 @@ def radicale_left_menu(user):
@register.simple_tag
-def calendar_modify_link(calendar):
- """
- """
- linkdef = {"label": calendar.name, "modal": True}
+def calendar_view_link(calendar):
+ """Render a link to view calendar detail."""
+ linkdef = {
+ "label": calendar.name, "modal": True,
+ "title": _("View calendar detail")
+ }
if calendar.__class__.__name__ == "UserCalendar":
linkdef["url"] = reverse(
- "radicale:user_calendar", args=[calendar.pk]
+ "radicale:user_calendar_detail", args=[calendar.pk]
)
- linkdef["modalcb"] = "radicale.edit_calendar_cb"
else:
linkdef["url"] = reverse(
- "radicale:shared_calendar", args=[calendar.pk]
+ "radicale:shared_calendar_detail", args=[calendar.pk]
)
- linkdef["modalcb"] = "radicale.shared_calendar_cb"
return render_link(linkdef)
@register.simple_tag
def calendar_actions(calendar):
- """
- """
- actions = [{
- "name": "delcalendar",
- "title": _("Delete %s?" % calendar),
- "img": "fa fa-trash"
- }]
+ """Render per-calendar actions."""
+ actions = [
+ {"name": "editcalendar",
+ "title": _("Edit %s" % calendar),
+ "modal": True,
+ "img": "fa fa-edit"},
+ {"name": "delcalendar",
+ "title": _("Delete %s?" % calendar),
+ "img": "fa fa-trash"}
+ ]
if calendar.__class__.__name__ == 'UserCalendar':
actions[0]["url"] = reverse(
+ "radicale:user_calendar", args=[calendar.pk])
+ actions[0]["modalcb"] = "radicale.edit_calendar_cb"
+ actions[1]["url"] = reverse(
"radicale:user_calendar", args=[calendar.id])
else:
actions[0]["url"] = reverse(
+ "radicale:shared_calendar", args=[calendar.pk])
+ actions[0]["modalcb"] = "radicale.shared_calendar_cb"
+ actions[1]["url"] = reverse(
"radicale:shared_calendar", args=[calendar.id])
return render_actions(actions)
diff --git a/modoboa/extensions/radicale/urls.py b/modoboa/extensions/radicale/urls.py
index 5904c1f76..6ae2542f6 100644
--- a/modoboa/extensions/radicale/urls.py
+++ b/modoboa/extensions/radicale/urls.py
@@ -8,9 +8,13 @@ urlpatterns = patterns(
url(r'^user/$', 'new_user_calendar', name='user_calendar_add'),
url(r'^user/(?P