From 2dfc7625d19cb8b4fea366ded4df09b0a753b5d2 Mon Sep 17 00:00:00 2001 From: Alex Marginean Date: Nov 12 2018 15:16:09 +0000 Subject: Major changes (Almost done) --- diff --git a/fedocal/templates/default/add_meeting.html b/fedocal/templates/default/add_meeting.html index c38b1e7..aa06bdf 100644 --- a/fedocal/templates/default/add_meeting.html +++ b/fedocal/templates/default/add_meeting.html @@ -12,58 +12,64 @@ {% block content %} {% from "_formhelpers.html" import render_field_in_row %} -
-
+
+

{{ _('New meeting') }}

{{ _('Please enter your meeting details in the above form.') }}

-
- -
- - {{ render_field_in_row(form.meeting_name) }} - {{ render_field_in_row(form.meeting_date) }} - {{ render_field_in_row(form.meeting_date_end) }} - {{ render_field_in_row(form.meeting_time_start)}} - {{ render_field_in_row(form.meeting_time_stop)}} - {{ render_field_in_row(form.full_day) }} - {{ render_field_in_row(form.meeting_timezone) }} - {% macro get_after_markdown() %} - {{_('Supports the') }} {{ _('Markdown syntax') }} - - {% endmacro %} - {{ render_field_in_row( - form.information, - after=get_after_markdown(), - escape_after=True) }} - {{ render_field_in_row(form.wiki_link) }} - {{ render_field_in_row(form.meeting_location) }} -
- -

{{ _('Recurring event') }}

-

{{ _('If this is a regular meeting this is where you want to set it as so.') }}

- - {{ render_field_in_row(form.frequency) }} - {{ render_field_in_row(form.end_repeats, after=_('Leave empty if there is no end date for the repeat.')) }} -
- -

{{ _('Reminder') }}

-

{{ _('You may want fedocal to send an email to a mailing list of your choices.') }}

-

{{ _('Note that fedocal will send the reminder in your name.') }}

- - {{ render_field_in_row(form.remind_when) }} - {{ render_field_in_row(form.reminder_from) }} - {{ render_field_in_row(form.remind_who) }} -
- -

- - - {{ form.csrf_token }} -

-
-
+ + + +
+ + {{ render_field_in_row(form.meeting_name) }} + {{ render_field_in_row(form.meeting_date) }} + {{ render_field_in_row(form.meeting_date_end) }} + {{ render_field_in_row(form.meeting_time_start)}} + {{ render_field_in_row(form.meeting_time_stop)}} + {{ render_field_in_row(form.full_day) }} + {{ render_field_in_row(form.meeting_timezone) }} + {% macro get_after_markdown() %} + {{_('Supports the') }} + + {{ _('Markdown syntax') }} + + + {% endmacro %} + + {{ render_field_in_row(form.information, after=get_after_markdown(), escape_after=True) }} + {{ render_field_in_row(form.wiki_link) }} + {{ render_field_in_row(form.meeting_location) }} + +
+
+

{{ _('Recurring event') }}

+

{{ _('If this is a regular meeting this is where you want to set it as so.') }}

+
+
+ + {{ render_field_in_row(form.frequency) }} + {{ render_field_in_row(form.end_repeats, after=_('Leave empty if there is no end date for the repeat.')) }} + +
+
+

{{ _('Reminder') }}

+

{{ _('You may want fedocal to send an email to a mailing list of your choices.') }}

+

{{ _('Note that fedocal will send the reminder in your name.') }}

+
+
+ + {{ render_field_in_row(form.remind_when) }} + {{ render_field_in_row(form.reminder_from) }} + {{ render_field_in_row(form.remind_who) }} + +
+ + + {{ form.csrf_token }} +
+ +
+ {% endblock %} {% block jscripts %} @@ -93,12 +99,8 @@ $('#meeting_time_stop').val( '{{ form.meeting_time_stop.data or "9:00" }}').timespinner(); {% else %} - $('#meeting_time_start').val('{{ - form.meeting_time_start.data | format_time_spinner - }}').timespinner(); - $('#meeting_time_stop').val('{{ - form.meeting_time_stop.data | format_time_spinner - }}').timespinner(); + $('#meeting_time_start').val('{{ form.meeting_time_start.data | format_time_spinner }}').timespinner(); + $('#meeting_time_stop').val('{{ form.meeting_time_stop.data | format_time_spinner }}').timespinner(); {% endif %} }); diff --git a/fedocal/templates/default/agenda.html b/fedocal/templates/default/agenda.html index 152788b..392f1de 100644 --- a/fedocal/templates/default/agenda.html +++ b/fedocal/templates/default/agenda.html @@ -84,7 +84,7 @@ else %}{{ location }}{% endif %}{% endblock %}
-
+
{% autoescape off%}{{ curmonth_cal }}{% endautoescape %}
@@ -222,11 +222,8 @@ else %}{{ location }}{% endif %}{% endblock %} {% endif %}
-
- - {% endif %} {% endfor %} {% endif %} {% if next_meetings and next_meetings[loopidx - 1] %} {% for next_meeting in next_meetings[loopidx - 1] %} {% if next_meeting.meeting_name == meeting.meeting_name %} -aici trebe comentariu {{ last_meeting.append(False) }} + {% endif %} {% endfor %} {% endif %} @@ -358,7 +355,8 @@ aici trebe comentariu {{ last_meeting.append(False) }}
- --> + + {% endblock %} diff --git a/fedocal/templates/default/delete_meeting.html b/fedocal/templates/default/delete_meeting.html index 80ad3cd..21ba2fc 100644 --- a/fedocal/templates/default/delete_meeting.html +++ b/fedocal/templates/default/delete_meeting.html @@ -5,55 +5,83 @@ {%block tag %}mymeeting{% endblock %} {% block content %} +
+
+

{{ _('Meeting:') }} {{ meeting.meeting_name}}

-

{{ _('Meeting:') }} {{ meeting.meeting_name}}

+
    +
  • {{ _('Date:') }} {{ next_meeting.meeting_date }}
    • +
  • {{ _('Starting time:') }} {{ next_meeting.meeting_time_start }} {{ + next_meeting.meeting_timezone }}
    • +
  • {{ _('Ending time:') }} {{ next_meeting.meeting_time_stop }} {{ + next_meeting.meeting_timezone }}
    • +
-
    -
  • {{ _('Date:') }} {{ next_meeting.meeting_date }}
    • -
  • {{ _('Starting time:') }} {{ next_meeting.meeting_time_start }} {{ - next_meeting.meeting_timezone }}
    • -
  • {{ _('Ending time:') }} {{ next_meeting.meeting_time_stop }} {{ - next_meeting.meeting_timezone }}
    • -
+

{{ _('Stored as:') }}

+
    +
  • + {{ _('Start:') }} {{ meeting.meeting_date }} - {{ meeting.meeting_time_start + }} {{ meeting.meeting_timezone }}
    • +
  • + {{ _('End:') }} {{ meeting.meeting_date_end }} - {{ meeting.meeting_time_stop + }} {{ meeting.meeting_timezone }}
    • +
-

{{ _('Stored as:') }}

-
    -
  • - {{ _('Start:') }} {{ meeting.meeting_date }} - {{ meeting.meeting_time_start - }} {{ meeting.meeting_timezone }}
    • -
  • - {{ _('End:') }} {{ meeting.meeting_date_end }} - {{ meeting.meeting_time_stop - }} {{ meeting.meeting_timezone }}
    • -
+

+ {{ _('You are removing this meeting from the calendar') }} + + {{ meeting.calendar_name }}. +

-

-{{ _('You are removing this meeting from the calendar') }} - -{{ meeting.calendar_name }}. -

+

{{ _("Are you positively sure that's what you want to do?") }}

-

{{ _("Are you positively sure that's what you want to do?") }}

+ -
-{{ render_field_invert(form.confirm_delete) }} -{% if meeting.recursion_frequency %} -

{{ _('This meeting is a regular meeting, are you sure you want to delete all -of them or just this one ? (Check only if you want to delete all future -meetings as well)') }} -

-

- {{ _('This meeting is recurrent, it occurs every %(frequency)s days until %(ends)s', frequency=meeting.recursion_frequency, ends=meeting.recursion_ends) }} -

-{{ render_field_invert(form.confirm_futher_delete) }} -{% endif %} -

- - -

-{{ form.csrf_token }} -
+
+
+
+ {{ render_field_invert(form.confirm_delete) }} + {% if meeting.recursion_frequency %} +

{{ _('This meeting is a regular meeting, are you sure you want to delete all + of them or just this one ? (Check only if you want to delete all future + meetings as well)') }} +

+

+ {{ _('This meeting is recurrent, it occurs every %(frequency)s days until %(ends)s', frequency=meeting.recursion_frequency, ends=meeting.recursion_ends) }} +

+ {{ render_field_invert(form.confirm_futher_delete) }} + {% endif %} +
+
+ +
+ + + {{ form.csrf_token }} +
+
+ +
+
{% endblock %} diff --git a/fedocal/templates/default/edit_meeting.html b/fedocal/templates/default/edit_meeting.html index 72c35b8..d58e013 100644 --- a/fedocal/templates/default/edit_meeting.html +++ b/fedocal/templates/default/edit_meeting.html @@ -7,63 +7,72 @@ {% block content %}
-
-

{{ _('Edit meeting "%(name)s"', name=form.meeting_name.data) }}

-

{{ _('Please enter your meeting details in the above form.') }}

-
+
+
+

{{ _('Edit meeting "%(name)s"', name=form.meeting_name.data) }}

+

{{ _('Please enter your meeting details in the above form.') }}

+
+
- - {{ render_field_in_row(form.calendar_name) }} - {{ render_field_in_row(form.meeting_name) }} - {{ render_field_in_row(form.meeting_date) }} - {{ render_field_in_row(form.meeting_date_end) }} - {{ render_field_in_row(form.meeting_time_start) }} - {{ render_field_in_row(form.meeting_time_stop) }} - {{ render_field_in_row(form.full_day) }} - {{ render_field_in_row(form.meeting_timezone) }} - {{ render_field_in_row(form.comanager) }} - {% macro get_after_markdown() %} - {{_('Supports the') }} {{ _('Markdown syntax') }} - - {% endmacro %} - {{ render_field_in_row( - form.information, - after=get_after_markdown(), - escape_after=True) }} - {{ render_field_in_row(form.meeting_location) }} -
- -

{{ _('Recurring event') }}

-

{{ _('If this is a regular meeting this is where you want to set it as so.') }}

- - {{ render_field_in_row(form.frequency) }} - {{ render_field_in_row(form.end_repeats, - after=_('Leave empty if there is no end date for the repeat.')) }} -
- -

{{ _('Reminder') }}

-

{{ _('You may want fedocal to send an email to a mailing list of your choices.') }}

-

{{ _('Note that fedocal will send the reminder in your name.') }}

- - {{ render_field_in_row(form.remind_when) }} - {{ render_field_in_row(form.reminder_from) }} - {{ render_field_in_row(form.remind_who) }} -
- - {{ form.csrf_token }} - -

- + {{ render_field_in_row(form.calendar_name) }} + {{ render_field_in_row(form.meeting_name) }} + {{ render_field_in_row(form.meeting_date) }} + {{ render_field_in_row(form.meeting_date_end) }} + {{ render_field_in_row(form.meeting_time_start) }} + {{ render_field_in_row(form.meeting_time_stop) }} + {{ render_field_in_row(form.full_day) }} + {{ render_field_in_row(form.meeting_timezone) }} + {{ render_field_in_row(form.comanager) }} + {% macro get_after_markdown() %} + {{_('Supports the') }} + + {{ _('Markdown syntax') }} + + + {% endmacro %} + + {{ render_field_in_row(form.information, after=get_after_markdown(), escape_after=True) }} + {{ render_field_in_row(form.meeting_location) }} + +

+
+

{{ _('Recurring event') }}

+

{{ _('If this is a regular meeting this is where you want to set it as so.') }}

+
+
+ + + {{ render_field_in_row(form.frequency) }} + {{ render_field_in_row(form.end_repeats, after=_('Leave empty if there is no end date for the repeat.')) }} + +
+
+

{{ _('Reminder') }}

+

{{ _('You may want fedocal to send an email to a mailing list of your choices.') }}

+

{{ _('Note that fedocal will send the reminder in your name.') }}

+
+
+ + {{ render_field_in_row(form.remind_when) }} + {{ render_field_in_row(form.reminder_from) }} + {{ render_field_in_row(form.remind_who) }} + + {{ form.csrf_token }} + +

+ +

+ +
+ {% if meeting.recursion_frequency %} - + {% endif %} - -

+ +
-
{% endblock %} {% block jscripts %} diff --git a/fedocal/templates/default/locations.html b/fedocal/templates/default/locations.html index 7b44f95..ed9554b 100644 --- a/fedocal/templates/default/locations.html +++ b/fedocal/templates/default/locations.html @@ -4,23 +4,28 @@ {%block tag %}locations{% endblock %} {% macro render_locations(calendars) -%} + {% for location_row in locations %} -
+ {% for location in location_row %} - + {{ location }} {% endfor %} -
+ {% else %}

{{ _('No locations found') }}

{% endfor %} + {%- endmacro %} {% block content %} -

{{ _('Locations') }}

-
- {{ render_locations(locations) }} -
+
+
+

{{ _('Locations') }}

+
+ {{ render_locations(locations) }} +
+
+
{% endblock %} diff --git a/fedocal/templates/default/master.html b/fedocal/templates/default/master.html index df5c12c..a69c51f 100644 --- a/fedocal/templates/default/master.html +++ b/fedocal/templates/default/master.html @@ -60,8 +60,9 @@ {% endif %} -
  • + {% if g.fas_user %} +
  • @@ -75,11 +76,24 @@
    {{ _('log out') }} -
    + +
    • {% else %} +
  • + +
    +
    + + +
    +
    +
    • + +
  • {{ _('Log In') }} +
    • {% endif %} - diff --git a/fedocal/templates/default/meeting_list.html b/fedocal/templates/default/meeting_list.html index 4e627c1..bd4b83d 100644 --- a/fedocal/templates/default/meeting_list.html +++ b/fedocal/templates/default/meeting_list.html @@ -6,56 +6,88 @@ {%block tag %}home{% endblock %} {% block content %} -
    + +{% if calendar %} + + {{ _('Add meeting') }} + + + {{ _('Calendar view') }} + + + {{ _('iCal Export') }} + +{% endif %} + {% if calendar or location %} -
    + + +
    +
    +

    {% if calendar %} - - {{ calendar.calendar_name }} - {% else %} - - {{ location }} - {% endif %} + + {{ calendar.calendar_name }} + {% else %} + + {{ location }} + {% endif %}

    +

    {{ calendar.calendar_description or '-' }}

    -
    - +

    + + {% else %} -

    {{ _('Search') }}

    {{ _('Result of your search for "%(keyword)s"', keyword=keyword) }}

    -
    {% endif %} - - - - -
    - {% if calendar %} -

    {{ _('Time are expressed in the %(timezone)s time zone.', timezone=tzone) }}

    - {% endif %} - - - - - - - - - {% for meeting in meetings %} - {% if loop.first %} - {% set month = meeting.meeting_date.month %} - {% set past = True %} - {% set future = True %} +
    + {% if calendar %} +

    {{ _('Time are expressed in the %(timezone)s time zone.', timezone=tzone) }}

    {% endif %} +
    {{ _('Date') }}{{ _('Time') }}{{ _('Meeting') }}{{ _('Description') }}{{ _('Location') }}
    + + + + + + + + + + + {% for meeting in meetings %} + {% if loop.first %} + {% set month = meeting.meeting_date.month %} + {% set past = True %} + {% set future = True %} + {% endif %} - {% set class = 'meeting_normal' %} - {% if meeting.meeting_date >= today %} - {% if meeting.meeting_date == today and past %} - {% set class = 'today limit_past' %} - {% set past = False %} - {% elif future %} - {% set class = 'limit_future' %} - {% set future = False %} + {% set class = 'meeting_normal' %} + {% if meeting.meeting_date >= today %} + {% if meeting.meeting_date == today and past %} + {% set class = 'today limit_past' %} + {% set past = False %} + {% elif future %} + {% set class = 'limit_future' %} + {% set future = False %} + {% endif %} + + {% elif month != meeting.meeting_date.month %} + + {% else %} + {% endif %} - - {% elif month != meeting.meeting_date.month %} - - {% else %} - - {% endif %} - - - - - - - {% endfor %} -
    {{ _('Date') }}{{ _('Time') }}{{ _('Meeting') }}{{ _('Description') }}{{ _('Location') }}
    - {{ meeting.meeting_date }} - {% if meeting.meeting_date != meeting.meeting_date_end %} - to {{ meeting.meeting_date_end }} - {% endif %} - - {{ meeting.meeting_time_start }} to - {{ meeting.meeting_time_stop }} - - - {{ meeting.meeting_name }} - - {% autoescape off%} - {{ meeting.meeting_information | markdown_wrap}} - {{ _('show more') }} - {% endautoescape %} {% if meeting.meeting_location - %} {{ meeting.meeting_location }} {% endif %}
    + + {{ meeting.meeting_date }} + {% if meeting.meeting_date != meeting.meeting_date_end %} + to {{ meeting.meeting_date_end }} + {% endif %} + + + {{ meeting.meeting_time_start }} to + {{ meeting.meeting_time_stop }} + + + + {{ meeting.meeting_name }} + + + + {% autoescape off%} + {{ meeting.meeting_information | markdown_wrap}} + + {{ _('show more') }} + + {% endautoescape %} + + + {% if meeting.meeting_location %} + {{ meeting.meeting_location }} + {% endif %} + + + {% endfor %} + + + +
    -
    {% endblock %} -{% block sidebar %} -{% if calendar %} - -{% endif %} -{% endblock %} {% block jscripts %} {{ super() }} diff --git a/fedocal/templates/default/my_meeting.html b/fedocal/templates/default/my_meeting.html index 8073b92..5109ada 100644 --- a/fedocal/templates/default/my_meeting.html +++ b/fedocal/templates/default/my_meeting.html @@ -6,62 +6,55 @@ {%block tag %}mymeeting{% endblock %} {% block content %} -
    -
    + +
    +

    {{ _('Manage your meetings') }}

    {{ _('Below is the list of your past and future meetings.') }}

    -
    -

    {{ _('Meetings times are expressed in the %(timezone)s time zone.', timezone=tzone) }}

    +

    {{ _('Meetings times are expressed in the %(timezone)s time zone.', timezone=tzone) }}

    -

    {{ _('Future meetings') }}

    - {% if single_meetings %} -

    {{ _('This is the list of all non-recurrent meeting you created') }}

    -
    - - {% for meeting in single_meetings %} - - - - - - - - {% endfor %} -
    {{ meeting.meeting_date }} +

    {{ _('Future meetings') }}

    + {% if single_meetings %} +

    {{ _('This is the list of all non-recurrent meeting you created') }}

    +
      + {% for meeting in single_meetings %} +
    • + {{ meeting.meeting_date }} + {{ meeting.meeting_time_start }} to {{ meeting.meeting_time_stop }} -
    		{{ meeting.calendar_name }} {{ meeting.meeting_name }} - - {{ _('Edit') }} - - - {{ _('Delete') }} - -
    -
    - {% endif %} + + {{ meeting.calendar_name }} + {{ meeting.meeting_name }} + + + {{ _('Edit') }} + + + {{ _('Delete') }} + + + {% endfor %} + + {% endif %} - {% if regular_meetings %} -

    {{ _('This is the list of all regular meeting you created') }}

    -
    - - {% for meeting in regular_meetings %} - - - - - - - - {% endfor %} -
    {{ meeting.meeting_date }} + {% if regular_meetings %} +

    {{ _('This is the list of all regular meeting you created') }}

    +
      + {% for meeting in regular_meetings %} +
    • + {{ meeting.meeting_date }} {{ _('%(start)s to %(end)s', start=meeting.meeting_time_start, end=meeting.meeting_time_stop) }} -
    		{{ meeting.calendar_name }} {{ meeting.meeting_name }} + {{ meeting.calendar_name }} + {{ meeting.meeting_name }} - {{ _('Edit') }} -
    -
    - {% endif %} + + {% endfor %} + + {% endif %} -

    {{ _('Past meetings') }}

    -
    - +

    {{ _('Past meetings') }}

    +
      {% for meeting in pas_meetings %} -
    - - - - - +
  • + {{ meeting.meeting_date }} + {{ _('%(start)s to %(end)s', start=meeting.meeting_time_start, end=meeting.meeting_time_stop) }} + {{ meeting.calendar_name }} + {{ meeting.meeting_name }} +
    • {% endfor %} -
    {{ meeting.meeting_date }} - {{ _('%(start)s to %(end)s', start=meeting.meeting_time_start, end=meeting.meeting_time_stop) }} - {{ meeting.calendar_name }} {{ meeting.meeting_name }}
    +
    -
    + + + {% endblock %} diff --git a/fedocal/templates/default/view_meeting.html b/fedocal/templates/default/view_meeting.html index ccc15c2..82b206c 100644 --- a/fedocal/templates/default/view_meeting.html +++ b/fedocal/templates/default/view_meeting.html @@ -10,108 +10,116 @@ {% endif %} {% block content %} -
    + +
    +

    {{ _('Meeting "%(name)s"', name=org_meeting.meeting_name) }}

    -

    ( - {{ org_meeting.calendar_name }}) +

    + ({{ org_meeting.calendar_name }})

    + {% if org_meeting.meeting_location %} +

    {{ _('Location:') }} {{ org_meeting.meeting_location }}

    + {%endif%} + +
      +
    • + + {{ _('Start:') }} + + {{ next_meeting.meeting_date.strftime('%a, %B %d, %Y') }} - {{ + next_meeting.meeting_time_start.strftime('%H:%M') }} {{ tzone }} +
      • +
    • + + {{ _('End:') }} + + {{ next_meeting.meeting_date_end.strftime('%a, %B %d, %Y') }} - {{ + next_meeting.meeting_time_stop.strftime('%H:%M') }} {{ tzone }} +
      • +
    + +
    + +
    + {% autoescape off%} {{ org_meeting.meeting_information | markdown or _('No description') }} {% endautoescape %} +
    + + {% if org_meeting.recursion_frequency and org_meeting.recursion_ends %} +

    + {{ _('This meeting is recurrent, it occurs every %(frequency)s days until %(ends)s', frequency=org_meeting.recursion_frequency, ends=org_meeting.recursion_ends) }} +

    + {% endif %} + + {% macro get_managers(managers) %} + {% for manager in managers %}{{ manager }} + {%- if not loop.last %},{% endif %}{% endfor %}. + {% endmacro %} + +

    {{ _('Meeting organized by %(managers)s', managers=get_managers(org_meeting.meeting_manager)) }}

    + + + {{ _('iCal export') }} + + + {% if reminder_options %} + + + + + {% endif %} + + {% if editor %} +

    {{ _('Stored as:') }}

    +
      +
    • + + {{ _('Start:') }} + + {{ org_meeting.meeting_date }} - {{ org_meeting.meeting_time_start + }} {{ org_meeting.meeting_timezone }}
      • +
    • + + {{ _('End:') }} + + {{ org_meeting.meeting_date_end }} - {{ org_meeting.meeting_time_stop + }} {{ org_meeting.meeting_timezone }}
      • +
    +

    + + {{ _('Edit') }} + + + {{ _('Delete') }} + +

    + {% endif %} + - {% if org_meeting.meeting_location %} -

    {{ _('Location:') }} {{ org_meeting.meeting_location }}

    - {%endif%} - -
      -
    • - - {{ _('Start:') }} - - {{ next_meeting.meeting_date.strftime('%a, %B %d, %Y') }} - {{ - next_meeting.meeting_time_start.strftime('%H:%M') }} {{ tzone }} -
      • -
    • - - {{ _('End:') }} - - {{ next_meeting.meeting_date_end.strftime('%a, %B %d, %Y') }} - {{ - next_meeting.meeting_time_stop.strftime('%H:%M') }} {{ tzone }} -
      • -
    - -
    - -
    - {% autoescape off%} {{ org_meeting.meeting_information | markdown or _('No description') }} {% endautoescape %}
    +
    - {% if org_meeting.recursion_frequency and org_meeting.recursion_ends %} -

    {{ _('This meeting is recurrent, it occurs every %(frequency)s days until %(ends)s', - frequency=org_meeting.recursion_frequency, ends=org_meeting.recursion_ends) }} -

    - {% endif %} - - {% macro get_managers(managers) %} - {% for manager in managers %}{{ manager }} - {%- if not loop.last %},{% endif %}{% endfor %}. - {% endmacro %} -

    {{ _('Meeting organized by %(managers)s', managers=get_managers(org_meeting.meeting_manager)) }}

    - - - {{ _('iCal export') }} - - {% if reminder_options %} - - - - - {% endif %} - - {% if editor %} -

    {{ _('Stored as:') }}

    -
      -
    • - - {{ _('Start:') }} - - {{ org_meeting.meeting_date }} - {{ org_meeting.meeting_time_start - }} {{ org_meeting.meeting_timezone }}
      • -
    • - - {{ _('End:') }} - - {{ org_meeting.meeting_date_end }} - {{ org_meeting.meeting_time_stop - }} {{ org_meeting.meeting_timezone }}
      • -
    -

    - - {{ _('Edit') }} - - - {{ _('Delete') }} - -

    - {% endif %} -
    + {% endblock %} @@ -138,12 +146,9 @@ ) }; FEDOCAL['MESSAGES'] = FEDOCAL.MESSAGES || {}; - FEDOCAL['MESSAGES']['MEETING_IN_PROGRESS'] = "{{ _( - 'Meeting in progress.')|e }}"; + FEDOCAL['MESSAGES']['MEETING_IN_PROGRESS'] = "{{ _('Meeting in progress.')|e }}"; FEDOCAL['MESSAGES']['MEETING_IS_OVER'] = "{{ _('Meeting is over!')|e }}"; - FEDOCAL['MESSAGES']['NEXT_MEETING_IN'] = '{{ _( - "Meeting in: %(weeks)s weeks %(days)s days %(time)s", - weeks='%w', days='%d', time='%H:%M:%S') }}'; + FEDOCAL['MESSAGES']['NEXT_MEETING_IN'] = '{{ _("Meeting in: %(weeks)s weeks %(days)s days %(time)s",weeks='%w', days='%d', time='%H:%M:%S') }}';