fedocal-devel November 2012

fedocal-devel@lists.fedorahosted.org

5 participants
251 discussions

[fedocal] master: Change header to better suits mockup (024dbdf)
by trasher＠fedorahosted.org 05 Nov '12

05 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 024dbdf0288cf595f8721a658788da4a74db4d5c Author: Johan Cwiklinski <johan(a)x-tnd.be> Date: Mon Nov 5 17:49:24 2012 +0100 Change header to better suits mockup >--------------------------------------------------------------- fedocal/static/fedocal.css | 18 ++-- fedocal/templates/add_calendar.html | 31 ++++--- fedocal/templates/add_meeting.html | 66 +++++++------ fedocal/templates/edit_meeting.html | 83 +++++++++-------- fedocal/templates/master.html | 2 +- fedocal/templates/my_meeting.html | 172 +++++++++++++++++------------------ fedocal/templates/view_meeting.html | 66 +++++++------ 7 files changed, 232 insertions(+), 206 deletions(-) diff --git a/fedocal/static/fedocal.css b/fedocal/static/fedocal.css index 35d3d94..7aa518a 100644 --- a/fedocal/static/fedocal.css +++ b/fedocal/static/fedocal.css @@ -74,6 +74,11 @@ section nav { vertical-align: middle; } +section > header { + margin-left: -200px; /* Left align with menu */ + margin-bottom: .5em; +} + #content { position: relative; margin: .5em; @@ -81,10 +86,6 @@ section nav { padding-left: 210px; } -#agenda { - margin-top: .5em; -} - #agenda, .my_meetings { margin-bottom: 2em; } @@ -139,8 +140,11 @@ section nav { width: 150px; } -.my_meetings .button { - width: 50px; +.my_meetings .buttons { + width: 1%; + white-space: nowrap; + text-align: center; + padding: .1em .2em; } .my_meetings img { @@ -161,7 +165,7 @@ section nav { width: 200px; margin-right: 0; position: absolute; - top: 0; + top: 70px; left: 0; } diff --git a/fedocal/templates/add_calendar.html b/fedocal/templates/add_calendar.html index 9e9959a..00f6da3 100644 --- a/fedocal/templates/add_calendar.html +++ b/fedocal/templates/add_calendar.html @@ -6,16 +6,23 @@ {% set title_extent = 'add a new calendar' %} {% block content %} -<form action="" method="post"> -{{ render_field(form.calendar_name) }} -{{ render_field(form.calendar_description) }} -{{ render_field(form.calendar_manager_groups) }} -{{ render_field(form.calendar_multiple_meetings) }} -{{ render_field(form.calendar_regional_meetings) }} -<p class="buttons indent"> - <input type="submit" class="submit positive button" value="Create"> - <input type="button" value="Cancel" class="button" onclick="history.back();"> -</p> -{{ form.csrf_token }} -</form> +<section> + <header> + <h2>New calendar</h2> + <p>Please enter your calendar details in the above form.</p> + </header> + + <form action="" method="post"> + {{ render_field(form.calendar_name) }} + {{ render_field(form.calendar_description) }} + {{ render_field(form.calendar_manager_groups) }} + {{ render_field(form.calendar_multiple_meetings) }} + {{ render_field(form.calendar_regional_meetings) }} + <p class="buttons indent"> + <input type="submit" class="submit positive button" value="Create"> + <input type="button" value="Cancel" class="button" onclick="history.back();"> + {{ form.csrf_token }} + </p> + </form> +</section> {% endblock %} diff --git a/fedocal/templates/add_meeting.html b/fedocal/templates/add_meeting.html index a638096..c5b2b07 100644 --- a/fedocal/templates/add_meeting.html +++ b/fedocal/templates/add_meeting.html @@ -4,40 +4,46 @@ {% set title_extent = ('Add new meeting to "%s"') % calendar.calendar_name %} {% block content %} +<section> + <header> + <h2>New meeting</h2> + <p>Please enter your meeting details in the above form.</p> + </header> -<form action="" method="post"> - <table> -{{ render_field_in_row(form.meeting_name) }} -{{ render_field_in_row(form.meeting_date) }} -{{ render_field_in_row(form.meeting_time_start) }} -{{ render_field_in_row(form.meeting_time_stop) }} -{{ render_field_in_row(form.information) }} -{% if calendar.calendar_regional_meetings %} -{{ render_field_in_row(form.meeting_region) }} -{% endif %} - </table> + <form action="" method="post"> + <table> + {{ render_field_in_row(form.meeting_name) }} + {{ render_field_in_row(form.meeting_date) }} + {{ render_field_in_row(form.meeting_time_start) }} + {{ render_field_in_row(form.meeting_time_stop) }} + {{ render_field_in_row(form.information) }} + {% if calendar.calendar_regional_meetings %} + {{ render_field_in_row(form.meeting_region) }} + {% endif %} + </table> -<h4>Recursive event</h4> -<p>If this is a regular meeting this is where you want to set it as so.</p> -<table> -{{ 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.') }} -</table> + <h4>Recursive event</h4> + <p>If this is a regular meeting this is where you want to set it as so.</p> + <table> + {{ 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.') }} + </table> -<h4>Reminder</h4> -<p>You may want fedocal to send an email to a mailing list of your choices. -</p> -<p>Note that fedocal will send the reminder in your name.</p> -<table> -{{ render_field_in_row(form.remind_when) }} -{{ render_field_in_row(form.remind_who) }} -</table> + <h4>Reminder</h4> + <p>You may want fedocal to send an email to a mailing list of your choices.</p> + <p>Note that fedocal will send the reminder in your name.</p> + <table> + {{ render_field_in_row(form.remind_when) }} + {{ render_field_in_row(form.remind_who) }} + </table> -<p class="buttons indent"> - <input type="submit" class="submit positive button" value="Add"> - <input type="button" value="Cancel" class="button" onclick="history.back();"> -{{ form.csrf_token }} -</form> + <p class="buttons indent"> + <input type="submit" class="submit positive button" value="Add"> + <input type="button" value="Cancel" class="button" onclick="history.back();"> + {{ form.csrf_token }} + </p> + </form> +</section> {% endblock %} {% block jscripts %} diff --git a/fedocal/templates/edit_meeting.html b/fedocal/templates/edit_meeting.html index a77263d..7dc93c9 100644 --- a/fedocal/templates/edit_meeting.html +++ b/fedocal/templates/edit_meeting.html @@ -5,50 +5,55 @@ {% set title_extent = ('Edit meeting "%s"') % meeting.calendar_name %} {% block content %} +<section> -<form action="" method="post"> - <table> -{{ render_field_in_row(form.meeting_name) }} -{{ render_field_in_row(form.meeting_date) }} -{{ render_field_in_row(form.meeting_time_start) }} -{{ render_field_in_row(form.meeting_time_stop) }} -{{ render_field_in_row(form.comanager) }} -{{ render_field_in_row(form.information) }} -{% if calendar.calendar_regional_meetings %} -{{ render_field_in_row(form.meeting_region) }} -{% endif %} - </table> + <header> + <h2>New meeting</h2> + <p>Please enter your meeting details in the above form.</p> + </header> -<h4>Recursive event</h4> -<p>If this is a regular meeting this is where you want to set it as so.</p> -<table> -{{ 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.') }} -</table> + <form action="" method="post"> + <table> + {{ render_field_in_row(form.meeting_name) }} + {{ render_field_in_row(form.meeting_date) }} + {{ render_field_in_row(form.meeting_time_start) }} + {{ render_field_in_row(form.meeting_time_stop) }} + {{ render_field_in_row(form.comanager) }} + {{ render_field_in_row(form.information) }} + {% if calendar.calendar_regional_meetings %} + {{ render_field_in_row(form.meeting_region) }} + {% endif %} + </table> -<h4>Reminder</h4> -<p>You may want fedocal to send an email to a mailing list of your choices. -</p> -<p>Note that fedocal will send the reminder in your name.</p> -<table> -{{ render_field_in_row(form.remind_when) }} -{{ render_field_in_row(form.remind_who) }} -</table> + <h4>Recursive event</h4> + <p>If this is a regular meeting this is where you want to set it as so.</p> + <table> + {{ 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.') }} + </table> -{% if meeting.recursion_frequency %} -<h4>Edit all?</h4> -<p>This meeting is a recursive meeting, your changes will -affect all the meetings related. -</p> -{% endif %} + <h4>Reminder</h4> + <p>You may want fedocal to send an email to a mailing list of your choices.</p> + <p>Note that fedocal will send the reminder in your name.</p> + <table> + {{ render_field_in_row(form.remind_when) }} + {{ render_field_in_row(form.remind_who) }} + </table> -<p class="buttons indent"> - <input type="submit" class="submit positive button" value="Edit"> - <input type="button" value="Cancel" class="button" onclick="history.back();"> -</p> -{{ form.csrf_token }} -</form> + {% if meeting.recursion_frequency %} + <h4>Edit all?</h4> + <p>This meeting is a recursive meeting, your changes will + affect all the meetings related.</p> + {% endif %} + + <p class="buttons indent"> + <input type="submit" class="submit positive button" value="Edit"> + <input type="button" value="Cancel" class="button" onclick="history.back();"> + {{ form.csrf_token }} + </p> + </form> +</section> {% endblock %} {% block jscripts %} diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html index 0f640f2..af18f55 100644 --- a/fedocal/templates/master.html +++ b/fedocal/templates/master.html @@ -86,7 +86,7 @@ {% else %} <p> Welcome, {{ g.fas_user.username }}</p> <ul class="checkmark-list"> - <li><a href="{{ url_for('my_meetings') }}"> Manage your meeting </a></li> + <li><a href="{{ url_for('my_meetings') }}"> Manage your meetings </a></li> <li><a href="{{ url_for('auth_logout') }}"> Log-out </a></li> </ul> {% endif %} diff --git a/fedocal/templates/my_meeting.html b/fedocal/templates/my_meeting.html index c94f69f..dfff20d 100644 --- a/fedocal/templates/my_meeting.html +++ b/fedocal/templates/my_meeting.html @@ -6,94 +6,92 @@ {% set title_extent = 'My Fedora meetings' %} {% block content %} +<section> + <header> + <h2>Manage your meetings</h2> + <p> + Below is the list of your past and future meetings. + </p> + </header> - <p> - Below is the list of your past and future meetings. - </p> + <h4>Future meeting</h4> + {% if single_meetings %} + <p> This is the list of all non-recurrent meeting you created </p> + <div class='my_meetings'> + <table> + {% for meeting in single_meetings %} + <tr> + <td class="date">{{ meeting.meeting_date }}</td> + <td class="time"> + {{ meeting.meeting_time_start }} to + {{ meeting.meeting_time_stop }} + </td> + <td class="calendar"> {{ meeting.calendar_name }} </td> + <td> {{ meeting.meeting_name }} </td> + <td class="buttons"> + <a class="button" href="{{ url_for('edit_meeting', + meeting_id=meeting.meeting_id) }}"> + <img src="{{ url_for('static', filename='edit.png') }}" + title="Edit" alt="Edit"/> + </a> + <a class="button" href="{{ url_for('delete_meeting', + meeting_id=meeting.meeting_id) }}"> + <img src="{{ url_for('static', filename='delete.png') }}" + title="Delete" alt="Delete"/> + </a> + </td> + </tr> + {% endfor %} + </table> + </div> + {% endif %} + {% if regular_meetings %} + <p> This is the list of all regular meeting you created </p> + <div class='my_meetings'> + <table> + {% for meeting in regular_meetings %} + <tr> + <td class="date">{{ meeting.meeting_date }}</td> + <td class="time"> + {{ meeting.meeting_time_start }} to + {{ meeting.meeting_time_stop }} + </td> + <td class="calendar"> {{ meeting.calendar_name }} </td> + <td> {{ meeting.meeting_name }} </td> + <td class="buttons"> + <a class="button" href="{{ url_for('edit_meeting', + meeting_id=meeting.meeting_id) }}"> + <img src="{{ url_for('static', filename='edit.png') }}" + title="Edit" alt="Edit"/> + </a> + <a class="button" href="{{ url_for('delete_meeting', + meeting_id=meeting.meeting_id) }}"> + <img src="{{ url_for('static', filename='delete.png') }}" + title="Delete" alt="Delete"/> + </a> + </td> + </tr> + {% endfor %} + </table> + </div> + {% endif %} -<h4>Future meeting</h4> -{% if single_meetings %} -<p> This is the list of all non-recurrent meeting you created </p> -<div class='my_meetings'> - <table> - {% for meeting in single_meetings %} - <tr> - <td class="date">{{ meeting.meeting_date }}</td> - <td class="time"> - {{ meeting.meeting_time_start }} to - {{ meeting.meeting_time_stop }} - </td> - <td class="calendar"> {{ meeting.calendar_name }} </td> - <td> {{ meeting.meeting_name }} </td> - <td class="button"> - <a href="{{ url_for('edit_meeting', - meeting_id=meeting.meeting_id) }}"> - <img src="{{ url_for('static', filename='edit.png') }}" - title="Edit" alt="Edit"/> - </a> - </td> - <td class="button"> - <a href="{{ url_for('delete_meeting', - meeting_id=meeting.meeting_id) }}"> - <img src="{{ url_for('static', filename='delete.png') }}" - title="Delete" alt="Delete"/> - </a> - </td> - </tr> - {% endfor %} - </table> -</div> -{% endif %} - -{% if regular_meetings %} -<p> This is the list of all regular meeting you created </p> -<div class='my_meetings'> - <table> - {% for meeting in regular_meetings %} - <tr> - <td class="date">{{ meeting.meeting_date }}</td> - <td class="time"> - {{ meeting.meeting_time_start }} to - {{ meeting.meeting_time_stop }} - </td> - <td class="calendar"> {{ meeting.calendar_name }} </td> - <td> {{ meeting.meeting_name }} </td> - <td class="button"> - <a href="{{ url_for('edit_meeting', - meeting_id=meeting.meeting_id) }}"> - <img src="{{ url_for('static', filename='edit.png') }}" - title="Edit" alt="Edit"/> - </a> - </td> - <td class="button"> - <a href="{{ url_for('delete_meeting', - meeting_id=meeting.meeting_id) }}"> - <img src="{{ url_for('static', filename='delete.png') }}" - title="Delete" alt="Delete"/> - </a> - </td> - </tr> - {% endfor %} - </table> -</div> -{% endif %} - -<h4>Past meetings</h4> -<div class='my_meetings'> - <table> - {% for meeting in pas_meetings %} - <tr> - <td class="date">{{ meeting.meeting_date }}</td> - <td class="time"> - {{ meeting.meeting_time_start }} to - {{ meeting.meeting_time_stop }} - </td> - <td class="calendar"> {{ meeting.calendar_name }} </td> - <td> {{ meeting.meeting_name }} </td> - </tr> - {% endfor %} - </table> -</div> - + <h4>Past meetings</h4> + <div class='my_meetings'> + <table> + {% for meeting in pas_meetings %} + <tr> + <td class="date">{{ meeting.meeting_date }}</td> + <td class="time"> + {{ meeting.meeting_time_start }} to + {{ meeting.meeting_time_stop }} + </td> + <td class="calendar"> {{ meeting.calendar_name }} </td> + <td> {{ meeting.meeting_name }} </td> + </tr> + {% endfor %} + </table> + </div> +</section> {% endblock %} diff --git a/fedocal/templates/view_meeting.html b/fedocal/templates/view_meeting.html index 00672b7..35e857e 100644 --- a/fedocal/templates/view_meeting.html +++ b/fedocal/templates/view_meeting.html @@ -7,34 +7,40 @@ {% set title_extent = 'Fedora meeting' %} {% block content %} -<p> - You are kindly invited to join to the following meeting: -</p> - -<h4> Meeting: {{ meeting.meeting_name}}</h4> - -<ul> - <li>Date: {{ meeting.meeting_date }} UTC</li> - <li>Starting time: {{ meeting.meeting_time_start }} UTC</li> - <li>Ending time: {{ meeting.meeting_time_stop }} UTC</li> -</ul> - -<pre> - {{ meeting.meeting_information }} -</pre> - -{% if meeting.recursion %} -<p> - This meeting is recurrent, it occures every - {{ meeting.recursion.recursion_frequency }} days until - {{ meeting.recursion.recursion_ends }} -</p> -{% endif %} - -<p> -This meeting is organized by {{ meeting.meeting_manager }} as part of -the calendar <a href="{{ url_for('calendar', calendar_name=meeting.calendar_name) }}"> -{{ meeting.calendar_name }}</a>. -</p> - +<section> + <header> + <h2>{{ meeting.calendar_name }}</h2> + <p>{{ meeting.meeting_name}} meeting details below</p> + </header> + + <p> + You are kindly invited to join to the following meeting: + </p> + + <h4> Meeting: {{ meeting.meeting_name}}</h4> + + <ul> + <li>Date: {{ meeting.meeting_date }} UTC</li> + <li>Starting time: {{ meeting.meeting_time_start }} UTC</li> + <li>Ending time: {{ meeting.meeting_time_stop }} UTC</li> + </ul> + + <pre> + {{ meeting.meeting_information }} + </pre> + + {% if meeting.recursion %} + <p> + This meeting is recurrent, it occures every + {{ meeting.recursion.recursion_frequency }} days until + {{ meeting.recursion.recursion_ends }} + </p> + {% endif %} + + <p> + This meeting is organized by {{ meeting.meeting_manager }} as part of + the calendar <a href="{{ url_for('calendar', calendar_name=meeting.calendar_name) }}"> + {{ meeting.calendar_name }}</a>. + </p> +</section> {% endblock %}

1 0

[fedocal] master: Display calendars menu on every page (711a804)
by trasher＠fedorahosted.org 05 Nov '12

05 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 711a8043aa0839aa4ca9fbfa14d9c9125238798e Author: Johan Cwiklinski <johan(a)x-tnd.be> Date: Mon Nov 5 18:48:34 2012 +0100 Display calendars menu on every page >--------------------------------------------------------------- fedocal/__init__.py | 14 ++++++++------ fedocal/templates/master.html | 2 -- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fedocal/__init__.py b/fedocal/__init__.py index 758ba2b..f281ea7 100644 --- a/fedocal/__init__.py +++ b/fedocal/__init__.py @@ -56,6 +56,12 @@ APP = flask.Flask(__name__) FAS = FAS(APP) APP.secret_key = CONFIG.get('fedocal', 'secret_key') +(a)APP.context_processor +def inject_calendars(): + session = fedocallib.create_session(CONFIG.get('fedocal', 'db_url')) + calendars = Calendar.get_all(session) + + return dict(calendars=calendars) def is_admin(): """ Return wether the user is admin for this application or not. """ @@ -108,7 +114,6 @@ def calendar_fullday(calendar_name, year, month, day): """ session = fedocallib.create_session(CONFIG.get('fedocal', 'db_url')) calendarobj = Calendar.by_id(session, calendar_name) - calendars = Calendar.get_all(session) week_start = fedocallib.get_start_week(year, month, day) weekdays = fedocallib.get_week_days(year, month, day) meetings = fedocallib.get_meetings(session, calendarobj, year, @@ -123,7 +128,6 @@ def calendar_fullday(calendar_name, year, month, day): curmonth_cal = fedocallib.get_html_monthly_cal() return flask.render_template('agenda.html', calendar=calendarobj, - calendars=calendars, month=month_name, weekdays=weekdays, meetings=meetings, @@ -167,9 +171,8 @@ def my_meetings(): flask.g.fas_user.username) past_meetings = fedocallib.get_past_meeting_of_user(session, flask.g.fas_user.username) - calendars = Calendar.get_all(session) admin = is_admin() - return flask.render_template('my_meeting.html', calendars=calendars, + return flask.render_template('my_meeting.html', title='My meeting', regular_meetings=regular_meetings, single_meetings=single_meetings, pas_meetings=past_meetings, admin=admin) @@ -462,10 +465,9 @@ def view_meeting_page(meeting_id, full): if not meeting: flask.flash('No meeting could be found for this identifier') return flask.redirect(flask.url_for('index')) - calendars = Calendar.get_all(session) auth_form = forms.LoginForm() return flask.render_template('view_meeting.html', full=full, - meeting=meeting, calendars=calendars, + meeting=meeting, title=meeting.meeting_name, auth_form=auth_form) diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html index af18f55..425cb3a 100644 --- a/fedocal/templates/master.html +++ b/fedocal/templates/master.html @@ -41,7 +41,6 @@ <li><a href="{{url_for('index')}}">Home</a></li> </ul> <div id="accordion"> - {% if calendar %} <h4>Calendars</h4> <ul id="calendars_menu" class="checkmark-list"> {% for calendar in calendars %} @@ -68,7 +67,6 @@ </li> {% endfor %} </ul> - {% endif %} <h4> User </h4> <div> {% if not g.fas_user %}

1 0

[fedocal] master: Add an update.sql file (fd46d2c)
by pingou＠fedorahosted.org 05 Nov '12

05 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit fd46d2c1f96c0702064ddcb4afe939d915c79b05 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 5 16:53:58 2012 +0100 Add an update.sql file This file contains the database scheme changes as we do them. This is only for development purposes, future database changes will be handled differently >--------------------------------------------------------------- update.sql | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/update.sql b/update.sql new file mode 100644 index 0000000..ee92552 --- /dev/null +++ b/update.sql @@ -0,0 +1,30 @@ +-- Sometime the database scheme from fedocal is changing +-- This file tries to track down these changes allowing you to keep +-- you database structure. +-- However, this file is intended temporarily for development purposes +-- until a better solution can be found (such as using Alembic). + +-- Use at your own risk -- Data may be lost + +USE fedocal; + +-- 2012/11/01 +ALTER TABLE `calendars` ADD calendar_regional_meetings tinyint(1) DEFAULT NULL; +ALTER TABLE `meetings` ADD meeting_region varchar(10) DEFAULT NULL; + +-- 2012/11/05 - Change the Meetings table and drop the recursion table +ALTER TABLE `meetings` ADD recursion_frequency Integer DEFAULT NULL; +ALTER TABLE `meetings` ADD recursion_ends Date DEFAULT NULL; + +-- the foreign key name might change, see "SHOW CREATE TABLE meetings;" +-- to be sure +ALTER TABLE `meetings` DROP FOREIGN KEY `meetings_ibfk_3`; +ALTER TABLE `meetings` DROP COLUMN `recursion_id`; + +DROP TABLE `recursivity`; + + +-- Check the changes: +SHOW TABLES ; +SHOW CREATE TABLE meetings; +DESCRIBE meetings;

1 0

[fedocal] master: Incorrect variable name (a952fc3)
by trasher＠fedorahosted.org 05 Nov '12

05 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit a952fc327e62e3c5051b6f1de75a92b4fddd048e Author: Johan Cwiklinski <johan(a)x-tnd.be> Date: Mon Nov 5 08:26:52 2012 +0100 Incorrect variable name >--------------------------------------------------------------- fedocal/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fedocal/__init__.py b/fedocal/__init__.py index 2118696..758ba2b 100644 --- a/fedocal/__init__.py +++ b/fedocal/__init__.py @@ -264,7 +264,7 @@ def add_meeting(calendar_name): form.meeting_time_start.data): flask.flash('The date you entered is in the past') return flask.redirect(flask.url_for('add_meeting', - calendar=calendarobj.calendar_name)) + calendar_name=calendarobj.calendar_name)) elif int(form.meeting_time_start.data) > \ int(form.meeting_time_stop.data): flask.flash('The start time you have entered is later than'\

1 0

[fedocal] master: Include UI in master template; button'd buttons :) (0a555b1)
by Johan Cwiklinski 05 Nov '12

05 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 0a555b1d6e7b02771d7d7a80fded02639332cbee Author: Johan Cwiklinski <johan(a)x-tnd.be> Date: Mon Nov 5 08:18:21 2012 +0100 Include UI in master template; button'd buttons :) >--------------------------------------------------------------- fedocal/templates/add_calendar.html | 4 ++-- fedocal/templates/add_meeting.html | 8 ++------ fedocal/templates/agenda.html | 4 ---- fedocal/templates/delete_meeting.html | 4 ++-- fedocal/templates/edit_meeting.html | 8 ++------ fedocal/templates/master.html | 4 ++++ 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/fedocal/templates/add_calendar.html b/fedocal/templates/add_calendar.html index 311d7b0..9e9959a 100644 --- a/fedocal/templates/add_calendar.html +++ b/fedocal/templates/add_calendar.html @@ -13,8 +13,8 @@ {{ render_field(form.calendar_multiple_meetings) }} {{ render_field(form.calendar_regional_meetings) }} <p class="buttons indent"> - <input type="submit" class="submit positive" value="Create"> - <input type="button" value="Cancel" onclick="history.back();"> + <input type="submit" class="submit positive button" value="Create"> + <input type="button" value="Cancel" class="button" onclick="history.back();"> </p> {{ form.csrf_token }} </form> diff --git a/fedocal/templates/add_meeting.html b/fedocal/templates/add_meeting.html index 4e4777e..a638096 100644 --- a/fedocal/templates/add_meeting.html +++ b/fedocal/templates/add_meeting.html @@ -34,18 +34,14 @@ </table> <p class="buttons indent"> - <input type="submit" class="submit positive" value="Add"> - <input type="button" value="Cancel" onclick="history.back();"> + <input type="submit" class="submit positive button" value="Add"> + <input type="button" value="Cancel" class="button" onclick="history.back();"> {{ form.csrf_token }} </form> {% endblock %} {% block jscripts %} {{ super() }} -<script type="text/javascript" - src="{{ url_for('static', - filename='jquery-ui-1.9.1.custom.min.js') }}"> -</script> <script type="text/javascript"> $(function(){ $('#meeting_date').datepicker({ diff --git a/fedocal/templates/agenda.html b/fedocal/templates/agenda.html index 3c8ca7c..23daaf2 100644 --- a/fedocal/templates/agenda.html +++ b/fedocal/templates/agenda.html @@ -73,10 +73,6 @@ {% block jscripts %} {{ super() }} -<script type="text/javascript" - src="{{ url_for('static', - filename='jquery-ui-1.9.1.custom.min.js') }}"> -</script> <script type="text/javascript"> $(function(){ $('.event').click(function(){ diff --git a/fedocal/templates/delete_meeting.html b/fedocal/templates/delete_meeting.html index 25e8915..c17bfc6 100644 --- a/fedocal/templates/delete_meeting.html +++ b/fedocal/templates/delete_meeting.html @@ -32,8 +32,8 @@ meetings as well)</p> {{ render_field_invert(form.confirm_futher_delete) }} {% endif %} <p class="buttons indent"> - <input type="submit" class="submit positive" value="Delete"> - <input type="button" value="Cancel" onclick="history.back();"> + <input type="submit" class="submit positive button" value="Delete"> + <input type="button" value="Cancel" class="button" onclick="history.back();"> </p> {{ form.csrf_token }} </form> diff --git a/fedocal/templates/edit_meeting.html b/fedocal/templates/edit_meeting.html index 0089c22..a77263d 100644 --- a/fedocal/templates/edit_meeting.html +++ b/fedocal/templates/edit_meeting.html @@ -44,8 +44,8 @@ affect all the meetings related. {% endif %} <p class="buttons indent"> - <input type="submit" class="submit positive" value="Edit"> - <input type="button" value="Cancel" onclick="history.back();"> + <input type="submit" class="submit positive button" value="Edit"> + <input type="button" value="Cancel" class="button" onclick="history.back();"> </p> {{ form.csrf_token }} </form> @@ -53,10 +53,6 @@ affect all the meetings related. {% block jscripts %} {{ super() }} -<script type="text/javascript" - src="{{ url_for('static', - filename='jquery-ui-1.9.1.custom.min.js') }}"> -</script> <script type="text/javascript"> $(function(){ $('#meeting_date').datepicker({ diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html index 5dd5553..0f640f2 100644 --- a/fedocal/templates/master.html +++ b/fedocal/templates/master.html @@ -111,6 +111,10 @@ src="{{ url_for('static', filename='jquery-1.8.0.min.js') }}"> </script> + <script type="text/javascript" + src="{{ url_for('static', + filename='jquery-ui-1.9.1.custom.min.js') }}"> + </script> <script type="text/javascript"> $(function(){ $('#calendars_menu').menu();

1 0

[fedocal] master: Update the TODO file (f6993b0)
by pingou＠fedorahosted.org 04 Nov '12

04 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit f6993b07ae0d5ce65c364d67ba9adaaa6d2def50 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Sun Nov 4 17:40:53 2012 +0100 Update the TODO file >--------------------------------------------------------------- TODO | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/TODO b/TODO index b4bdfcb..a323a10 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,7 @@ - Unit-tests, unit-tests and more unit-tests - Add documentation on how to install/deploy it + - Port to Flask configuration management - Add setup.py - Add license - Complete the code documentation

1 0

[fedocal] branch 'rewrite_recursive' created
by pingou＠fedorahosted.org 04 Nov '12

04 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git New branch : rewrite_recursive Referencing: bdfec5eb0b1e72bca48e7d617dfed7897e8ef0ed

1 0

[fedocal] branch 'rewrite_recursive' deleted
by pingou＠fedorahosted.org 04 Nov '12

04 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git Deleted branch: rewrite_recursive

1 0

[fedocal] master: Fix the Flask unit-test, the meeting identifier was changed (ebd1632)
by Pierre-YvesChibon 04 Nov '12

04 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit ebd1632edc68011732c01914e0aa0f95407dbe67 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Sun Nov 4 17:08:35 2012 +0100 Fix the Flask unit-test, the meeting identifier was changed >--------------------------------------------------------------- fedocal/tests/test_flask.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fedocal/tests/test_flask.py b/fedocal/tests/test_flask.py index 1a94ae6..d63625a 100644 --- a/fedocal/tests/test_flask.py +++ b/fedocal/tests/test_flask.py @@ -156,7 +156,7 @@ class Flasktests(Modeltests): """ Test the view_meeting function. """ self.__setup_db() - rv = self.app.get('/meeting/3/') + rv = self.app.get('/meeting/4/') self.assertEqual(rv.status_code, 200) self.assertTrue('<title> test-meeting-st-1 - Fedocal</title>' \ in rv.data) @@ -169,7 +169,7 @@ class Flasktests(Modeltests): """ Test the view_meeting_page function. """ self.__setup_db() - rv = self.app.get('/meeting/3/1/') + rv = self.app.get('/meeting/4/1/') self.assertEqual(rv.status_code, 200) self.assertTrue('<title> test-meeting-st-1 - Fedocal</title>' \ in rv.data) @@ -178,7 +178,7 @@ class Flasktests(Modeltests): self.assertTrue('This is a test meeting at the same time' in rv.data) - rv = self.app.get('/meeting/3/0/') + rv = self.app.get('/meeting/4/0/') self.assertEqual(rv.status_code, 200) self.assertTrue('<title> test-meeting-st-1 - Fedocal</title>' \ not in rv.data)

1 0

[fedocal] master: Require SQLAlchemy above 0.7 for the flask unit-tests (8580d34)
by Pierre-YvesChibon 04 Nov '12

04 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 8580d34dc868acfc8a75aef6f741bca4a3cb4baf Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Sun Nov 4 17:06:28 2012 +0100 Require SQLAlchemy above 0.7 for the flask unit-tests >--------------------------------------------------------------- fedocal/tests/test_flask.py | 3 +++ fedocal/tests/test_flask_api.py | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/fedocal/tests/test_flask.py b/fedocal/tests/test_flask.py index fae961e..1a94ae6 100644 --- a/fedocal/tests/test_flask.py +++ b/fedocal/tests/test_flask.py @@ -27,6 +27,9 @@ fedocal.model test script """ +__requires__ = ['SQLAlchemy >= 0.7'] +import pkg_resources + import unittest import sys import os diff --git a/fedocal/tests/test_flask_api.py b/fedocal/tests/test_flask_api.py index 0b8b271..e6514dc 100644 --- a/fedocal/tests/test_flask_api.py +++ b/fedocal/tests/test_flask_api.py @@ -27,6 +27,9 @@ fedocal.model test script """ +__requires__ = ['SQLAlchemy >= 0.7'] +import pkg_resources + import unittest import sys import os

1 0

← Newer
1
...
19
20
21
22
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

fedocal-devel November 2012