[fedocal] master: Incorrect method name, add unit test (f345b97)
by Johan Cwiklinski
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit f345b97e16619cd92acc0e5f842668c0825826cb
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sun Nov 4 12:18:40 2012 +0100
Incorrect method name, add unit test
>---------------------------------------------------------------
fedocal/__init__.py | 2 +-
fedocal/fedocallib/__init__.py | 2 +-
fedocal/tests/test_fedocallib.py | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index 2100223..996fe9e 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -121,7 +121,7 @@ def calendar_fullday(calendar_name, year, month, day):
auth_form = forms.LoginForm()
admin = is_admin()
month_name = fedocallib.MONTH[week_start.month - 1]
- curmonth_cal = fedocallib.getHtmlMonthlyCal()
+ curmonth_cal = fedocallib.get_html_monthly_cal()
return flask.render_template('agenda.html',
calendar=calendarobj,
calendars=calendars,
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index 8143207..3f1080e 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -514,7 +514,7 @@ def add_meetings_to_vcal(ical, meetings):
for meeting in meetings:
add_meeting_to_vcal(ical, meeting)
-def getHtmlMonthlyCal():
+def get_html_monthly_cal():
htmlcal = pycalendar.HTMLCalendar()
curdate = date.today()
curmonth_cal_nf = htmlcal.formatmonth(curdate.year, curdate.month)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index d6ab40c..b5e1ee8 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -696,6 +696,9 @@ class Fedocallibtests(Modeltests):
self.assertNotEqual(obj, None)
self.assertEqual(len(obj), 0)
+ def test_get_html_monthly_cal(self):
+ self.assertEqual('string' in output)
+
if __name__ == '__main__':
SUITE = unittest.TestLoader().loadTestsFromTestCase(Fedocallibtests)
10 years, 4 months
[fedocal] master: Use specific function to build monthly calendar (bc4a200)
by trasher@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit bc4a200b654b77f22970c3ef212f4b72a0b9f42b
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sun Nov 4 12:06:27 2012 +0100
Use specific function to build monthly calendar
>---------------------------------------------------------------
fedocal/__init__.py | 6 +-----
fedocal/fedocallib/__init__.py | 7 +++++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index a9bc9a5..2100223 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -43,8 +43,6 @@ import fedocallib as fedocallib
from fedocallib.model import (Calendar, Meeting, Reminder,
Recursive)
-import calendar as pycalendar
-
CONFIG = ConfigParser.ConfigParser()
if os.path.exists('/etc/fedocal.cfg'): # pragma: no cover
CONFIG.readfp(open('/etc/fedocal.cfg'))
@@ -123,9 +121,7 @@ def calendar_fullday(calendar_name, year, month, day):
auth_form = forms.LoginForm()
admin = is_admin()
month_name = fedocallib.MONTH[week_start.month - 1]
- htmlcal = pycalendar.HTMLCalendar()
- curdate = datetime.date.today()
- curmonth_cal = htmlcal.formatmonth(curdate.year, curdate.month)
+ curmonth_cal = fedocallib.getHtmlMonthlyCal()
return flask.render_template('agenda.html',
calendar=calendarobj,
calendars=calendars,
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index a91256e..8143207 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -27,6 +27,7 @@ from sqlalchemy.orm import sessionmaker
from week import Week
from model import Calendar, Reminder, Meeting
+import calendar as pycalendar
MONTH = ['January', 'February', 'March', 'April', 'May', 'June', 'July',
'August', 'September', 'October', 'November', 'December']
@@ -512,3 +513,9 @@ def add_meetings_to_vcal(ical, meetings):
"""
for meeting in meetings:
add_meeting_to_vcal(ical, meeting)
+
+def getHtmlMonthlyCal():
+ htmlcal = pycalendar.HTMLCalendar()
+ curdate = date.today()
+ curmonth_cal_nf = htmlcal.formatmonth(curdate.year, curdate.month)
+ return curmonth_cal_nf
10 years, 4 months
[fedocal] master: Add iCal URL (6c507c6)
by trasher@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 6c507c6b0490c784eb9ac1ccf05c40dc8f3a3e14
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sun Nov 4 12:04:12 2012 +0100
Add iCal URL
>---------------------------------------------------------------
fedocal/templates/master.html | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html
index 7ebdabf..5dd5553 100644
--- a/fedocal/templates/master.html
+++ b/fedocal/templates/master.html
@@ -58,7 +58,8 @@
</li>
{% endif %}
<li>
- <a href="#">iCal export</a>
+ <a href="{{url_for('ical_out',
+ calendar_name=calendar.calendar_name)}}">iCal export</a>
</li>
<li>
<a href="#">Contact admin</a>
10 years, 4 months
[fedocal] master: Use current date to set monthly calendar instead of week_start (957a0bd)
by Johan Cwiklinski
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 957a0bdaceb6aeadb9fa2c3a0b6206c04afa43fb
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sun Nov 4 11:44:34 2012 +0100
Use current date to set monthly calendar instead of week_start
>---------------------------------------------------------------
fedocal/__init__.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index 21d6e4a..a9bc9a5 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -124,7 +124,8 @@ def calendar_fullday(calendar_name, year, month, day):
admin = is_admin()
month_name = fedocallib.MONTH[week_start.month - 1]
htmlcal = pycalendar.HTMLCalendar()
- curmonth_cal = htmlcal.formatmonth(week_start.year, week_start.month)
+ curdate = datetime.date.today()
+ curmonth_cal = htmlcal.formatmonth(curdate.year, curdate.month)
return flask.render_template('agenda.html',
calendar=calendarobj,
calendars=calendars,
10 years, 4 months
[fedocal] master: Fix HTML issues (1d70845)
by Johan Cwiklinski
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 1d70845cad6d4d24293c3b367cb3720ec82e39f1
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sat Nov 3 20:28:57 2012 +0100
Fix HTML issues
>---------------------------------------------------------------
fedocal/templates/agenda.html | 2 +-
fedocal/templates/master.html | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fedocal/templates/agenda.html b/fedocal/templates/agenda.html
index 672eb65..e3431c0 100644
--- a/fedocal/templates/agenda.html
+++ b/fedocal/templates/agenda.html
@@ -68,7 +68,7 @@
{% endfor %}
</table>
</div>
-
+</section>
{% endblock %}
{% block jscripts %}
diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html
index ff07a8d..7ebdabf 100644
--- a/fedocal/templates/master.html
+++ b/fedocal/templates/master.html
@@ -63,7 +63,6 @@
<li>
<a href="#">Contact admin</a>
</li>
- </li>
</ul>
</li>
{% endfor %}
@@ -101,9 +100,8 @@
{% endif %}
</div>
</aside>
- </div>
<footer>
- <a href="https://fedorahosted.org/fedocal/">FedoCal</a> - <a href="#">License</a> - <a href="{{ url_for('api') }}">API</a> - <a href="#">Author</a> - <a href="https://fedorahosted.org/fedocal/report">Bugs & Improvements</a>
+ <a href="https://fedorahosted.org/fedocal/">Fedocal</a> - <a href="#">License</a> - <a href="{{ url_for('api') }}">API</a> - <a href="#">Author</a> - <a href="https://fedorahosted.org/fedocal/report">Bugs & Improvements</a>
</footer>
</div>
10 years, 4 months
[fedocal] master: Add some links in footer (fixes commit 7653c57b17) (744d368)
by trasher@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 744d3688aad47090504112f5715d150b52b1ca1e
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sat Nov 3 20:03:09 2012 +0100
Add some links in footer (fixes commit 7653c57b17)
>---------------------------------------------------------------
fedocal/templates/master.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html
index 63d6371..ff07a8d 100644
--- a/fedocal/templates/master.html
+++ b/fedocal/templates/master.html
@@ -103,7 +103,7 @@
</aside>
</div>
<footer>
- <a href="#">Fedocal</a> - <a href="#">License</a> - <a href="{{ url_for('api') }}">API</a> - <a href="#">Author</a> - <a href="#">Website</a>
+ <a href="https://fedorahosted.org/fedocal/">FedoCal</a> - <a href="#">License</a> - <a href="{{ url_for('api') }}">API</a> - <a href="#">Author</a> - <a href="https://fedorahosted.org/fedocal/report">Bugs & Improvements</a>
</footer>
</div>
10 years, 4 months
[fedocal] master: Add some links in footer (7653c57)
by Johan Cwiklinski
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 7653c57b17a8ec2a937c923630e8341164879761
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sat Nov 3 19:34:45 2012 +0100
Add some links in footer
>---------------------------------------------------------------
fedocal/templates/master.html | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html
index bcbd004..63d6371 100644
--- a/fedocal/templates/master.html
+++ b/fedocal/templates/master.html
@@ -101,6 +101,7 @@
{% endif %}
</div>
</aside>
+ </div>
<footer>
<a href="#">Fedocal</a> - <a href="#">License</a> - <a href="{{ url_for('api') }}">API</a> - <a href="#">Author</a> - <a href="#">Website</a>
</footer>
10 years, 4 months
[fedocal] master: UI Accordion and UI Menu on main menu (2988981)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 2988981219d4d422651cf987a3d8197b04badcab
Author: Johan Cwiklinski <johan(a)x-tnd.be>
Date: Sat Nov 3 18:33:31 2012 +0100
UI Accordion and UI Menu on main menu
Add jquery-ui js files required, also change fedocal ui custom css to suits our needs
>---------------------------------------------------------------
Diff suppressed because of size. To see it, use:
git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^2988981219d4d422651cf987a3d8197b04badcab~1 2988981219d4d422651cf987a3d8197b04badcab
10 years, 4 months
[fedocal] master: Change footer to fit the cast of fedocal (59370d1)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 59370d17ef69876665e20acdf6570e79eda22d95
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sat Nov 3 19:39:38 2012 +0100
Change footer to fit the cast of fedocal
>---------------------------------------------------------------
fedocal/templates/master.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html
index f2825f3..8ed847b 100644
--- a/fedocal/templates/master.html
+++ b/fedocal/templates/master.html
@@ -89,7 +89,7 @@
</aside>
</div>
<footer>
- <a href="#">FedoCal</a> - <a href="#">License</a> - <a href="{{ url_for('api') }}">API</a> - <a href="#">Author</a> - <a href="#">Website</a>
+ <a href="#">Fedocal</a> - <a href="#">License</a> - <a href="{{ url_for('api') }}">API</a> - <a href="#">Author</a> - <a href="#">Website</a>
</footer>
</div>
10 years, 4 months