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 %}