equinteros@gazelle:~/projects/NOVA-PROJECTS/HELIOS-TENDENCI/aea_helios/helios-server$ git diff diff --git a/helios/templates/base.html b/helios/templates/base.html index 075739f..2a1b306 100644 --- a/helios/templates/base.html +++ b/helios/templates/base.html @@ -14,6 +14,7 @@ --> + {% endblock %} diff --git a/helios/templates/election_new_2.html b/helios/templates/election_new_2.html index 16061c2..ea92f07 100644 --- a/helios/templates/election_new_2.html +++ b/helios/templates/election_new_2.html @@ -89,4 +89,4 @@ $(document).ready(function() { otherwise you won't be able to tally your election.) {% endifequal %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/server_ui/media/foundation-tweaks.css b/server_ui/media/foundation-tweaks.css index cc60e28..2c8bd59 100644 --- a/server_ui/media/foundation-tweaks.css +++ b/server_ui/media/foundation-tweaks.css @@ -11,6 +11,11 @@ table.pretty th, td { padding: 0.3em; vertical-align: top; } +/*======== zOnny Additions ========*/ +table.pretty tr:nth-child(9), +table.pretty tr:nth-child(10) { + display: none; +} .highlight-box { background:#eee; @@ -66,4 +71,4 @@ select { ul { margin-left: 20px; -} \ No newline at end of file +} diff --git a/server_ui/templates/base.html b/server_ui/templates/base.html index ac5f2d1..fa8c8b3 100644 --- a/server_ui/templates/base.html +++ b/server_ui/templates/base.html @@ -9,6 +9,7 @@ + {% if settings.DEBUG %} diff --git a/urls.py b/urls.py index d467499..10001d8 100644 --- a/urls.py +++ b/urls.py @@ -15,6 +15,8 @@ urlpatterns = patterns( (r'static/auth/(?P.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/helios_auth/media'}), (r'static/helios/(?P.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/helios/media'}), (r'static/(?P.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/server_ui/media'}), + + #(r'static/(?P.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/shared'}), (r'^', include('server_ui.urls')),