fedora_elections/__init__.py | 2 +-
fedora_elections/static/elections.css | 16 ++++++++++++++++
fedora_elections/templates/base.html | 13 +++++++++++++
fedora_elections/templates/results.html | 2 --
files/fedora-elections.spec | 7 ++++++-
5 files changed, 36 insertions(+), 4 deletions(-)
New commits:
commit d4b11b726c1d5baf240cf681bcaeee3c75c7c71c
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Wed Apr 29 12:14:57 2015 +0200
Release 2.5.2
diff --git a/fedora_elections/__init__.py b/fedora_elections/__init__.py
index 7c1d48b..0e7fe48 100644
--- a/fedora_elections/__init__.py
+++ b/fedora_elections/__init__.py
@@ -24,7 +24,7 @@
# Pierre-Yves Chibon <pingou(a)fedoraproject.org>
#
-__version__ = '2.5.1'
+__version__ = '2.5.2'
import logging
import os
diff --git a/files/fedora-elections.spec b/files/fedora-elections.spec
index a5493b1..cdd1237 100644
--- a/files/fedora-elections.spec
+++ b/files/fedora-elections.spec
@@ -1,7 +1,7 @@
%define modname fedora_elections
Name: fedora-elections
-Version: 2.5.1
+Version: 2.5.2
Release: 1%{?dist}
Summary: Fedora elections application
@@ -111,6 +111,11 @@ install -m 644 files/update_1_to_2.sql \
%changelog
+* Wed Apr 29 2015 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 2.5.2-1
+- Update to 2.5.2
+- Make elections prettier on high resolution displays
+- Add fedmenu
+
* Mon Apr 13 2015 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 2.5.1-1
- Update to 2.5.1
- Close the DB connection at the end of the request
commit 154957f7ffaff61fcf390b8d31845a89a1bc8d6d
Merge: dc2d372 1f3b125
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Apr 28 17:13:40 2015 +0200
Merge pull request #43 from fedora-infra/fedmenu
Fedmenu
commit 1f3b125ebd5801f23979ceb29271b2f2e546bcb0
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Apr 28 17:10:50 2015 +0200
Drop fedora-libravatar
diff --git a/fedora_elections/templates/base.html b/fedora_elections/templates/base.html
index 2754e07..78c0669 100644
--- a/fedora_elections/templates/base.html
+++ b/fedora_elections/templates/base.html
@@ -93,7 +93,6 @@
<script type="text/javascript" src="{{
url_for('static', filename='jquery-1.10.2.min.js') }}">
</script>
{% if config['FEDMENU_URL'] %}
- <script src="{{ config['FEDMENU_URL']
}}/js/fedora-libravatar.js"></script>
<script src="{{ config['FEDMENU_URL']
}}/js/fedmenu.js"></script>
<script>
fedmenu({
commit 36d7039e2e2ac086587189effaae18c09719ad3f
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Apr 28 17:05:52 2015 +0200
Add the fedmenu to the master template but only display it if configured
diff --git a/fedora_elections/templates/base.html b/fedora_elections/templates/base.html
index cd06d20..2754e07 100644
--- a/fedora_elections/templates/base.html
+++ b/fedora_elections/templates/base.html
@@ -92,6 +92,17 @@
{% block jscripts %}
<script type="text/javascript" src="{{
url_for('static', filename='jquery-1.10.2.min.js') }}">
</script>
+ {% if config['FEDMENU_URL'] %}
+ <script src="{{ config['FEDMENU_URL']
}}/js/fedora-libravatar.js"></script>
+ <script src="{{ config['FEDMENU_URL']
}}/js/fedmenu.js"></script>
+ <script>
+ fedmenu({
+ 'url': '{{ config["FEDMENU_DATA_URL"] }}',
+ 'mimeType': 'application/javascript',
+ 'position': 'bottom-right',
+ });
+ </script>
+ {% endif %}
{% endblock %}
commit 91dfd4a920488f7ae2c0df93c6f685f86d1f2c2b
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Apr 28 17:03:15 2015 +0200
Move the import to jquery into the master template
diff --git a/fedora_elections/templates/base.html b/fedora_elections/templates/base.html
index 9ec43ff..cd06d20 100644
--- a/fedora_elections/templates/base.html
+++ b/fedora_elections/templates/base.html
@@ -90,6 +90,9 @@
</div>
{% block jscripts %}
+ <script type="text/javascript" src="{{
+ url_for('static', filename='jquery-1.10.2.min.js') }}">
</script>
+
{% endblock %}
</body>
diff --git a/fedora_elections/templates/results.html
b/fedora_elections/templates/results.html
index 1388ebd..4554e1e 100644
--- a/fedora_elections/templates/results.html
+++ b/fedora_elections/templates/results.html
@@ -104,8 +104,6 @@
{% block jscripts %}
{{ super() }}
<script type="text/javascript" src="{{
- url_for('static', filename='jquery-1.10.2.min.js') }}">
</script>
-<script type="text/javascript" src="{{
url_for('static', filename='jquery-ui-1.9.2.custom.min.js')
}}"> </script>
<script language="javascript" type="text/javascript"
src="{{ url_for('static', filename='jquery.flot.js')
}}"></script>
commit 8a108d65797ff4318a2b32d9e70c1b3089b300e1
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Mon Apr 13 23:19:21 2015 +0200
Make elections prettier on high resolution display
diff --git a/fedora_elections/static/elections.css
b/fedora_elections/static/elections.css
index 18a2e2b..cd90a28 100644
--- a/fedora_elections/static/elections.css
+++ b/fedora_elections/static/elections.css
@@ -14,6 +14,22 @@
color: #FF8000;
}
+input {
+ font-size: 100%;
+}
+
+textarea {
+ font-size: 100%;
+}
+
+button {
+ font-size: 100%;
+}
+
+select {
+ font-size: 100%;
+}
+
#galleria{
height: 250px;
}
commit dc2d372f64d184fb45a006928c7a203af0880500
Merge: ce7c56b a0b79b3
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Apr 14 23:44:35 2015 +0200
Merge pull request #42 from fedora-infra/css_fix
Make elections prettier on high resolution display
commit a0b79b3bf691deb72002f3a6ba1446e21648a63f
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Mon Apr 13 23:19:21 2015 +0200
Make elections prettier on high resolution display
diff --git a/fedora_elections/static/elections.css
b/fedora_elections/static/elections.css
index 18a2e2b..cd90a28 100644
--- a/fedora_elections/static/elections.css
+++ b/fedora_elections/static/elections.css
@@ -14,6 +14,22 @@
color: #FF8000;
}
+input {
+ font-size: 100%;
+}
+
+textarea {
+ font-size: 100%;
+}
+
+button {
+ font-size: 100%;
+}
+
+select {
+ font-size: 100%;
+}
+
#galleria{
height: 250px;
}
Show replies by date