spacepaste

Paste details

reply | raw | toggle line wrapping

  1.  
  2. equinteros@gazelle:~/projects/NOVA-PROJECTS/HELIOS-TENDENCI/aea_helios/helios-server$ git diff
  3. diff --git a/helios/templates/base.html b/helios/templates/base.html
  4. index 075739f..2a1b306 100644
  5. --- a/helios/templates/base.html
  6. +++ b/helios/templates/base.html
  7. @@ -14,6 +14,7 @@
  8. -->
  9. <link rel="stylesheet" type="text/css" media="screen" href="/static/helios/main.css" />
  10. <link type="text/css" href="{{HELIOS_STATIC}}/css/ui-lightness/jquery-ui-1.8.1.custom.css" />
  11. + <link rel="stylesheet" href="/static/css/custom.css">
  12. {% endblock %}
  14. <script language="javascript" src="{{ HELIOS_STATIC }}/js/jquery-1.4.2.min.js"></script>
  15. diff --git a/helios/templates/election_new_2.html b/helios/templates/election_new_2.html
  16. index 16061c2..ea92f07 100644
  17. --- a/helios/templates/election_new_2.html
  18. +++ b/helios/templates/election_new_2.html
  19. @@ -89,4 +89,4 @@ $(document).ready(function() {
  20. otherwise you won't be able to tally your election.)
  21. </form>
  22. {% endifequal %}
  23. -{% endblock %}
  24. \ No newline at end of file
  25. +{% endblock %}
  26. diff --git a/server_ui/media/foundation-tweaks.css b/server_ui/media/foundation-tweaks.css
  27. index cc60e28..2c8bd59 100644
  28. --- a/server_ui/media/foundation-tweaks.css
  29. +++ b/server_ui/media/foundation-tweaks.css
  30. @@ -11,6 +11,11 @@ table.pretty th, td {
  31. padding: 0.3em;
  32. vertical-align: top;
  33. }
  34. +/*======== zOnny Additions ========*/
  35. +table.pretty tr:nth-child(9),
  36. +table.pretty tr:nth-child(10) {
  37. + display: none;
  38. +}
  40. .highlight-box {
  41. background:#eee;
  42. @@ -66,4 +71,4 @@ select {
  44. ul {
  45. margin-left: 20px;
  46. -}
  47. \ No newline at end of file
  48. +}
  49. diff --git a/server_ui/templates/base.html b/server_ui/templates/base.html
  50. index ac5f2d1..fa8c8b3 100644
  51. --- a/server_ui/templates/base.html
  52. +++ b/server_ui/templates/base.html
  53. @@ -9,6 +9,7 @@
  55. <link rel="stylesheet" href="/static/foundation/css/foundation.css">
  56. <link rel="stylesheet" href="/static/foundation-tweaks.css">
  57. + <link rel="stylesheet" href="/static/css/custom.css">
  59. {% if settings.DEBUG %}
  60. <script src="/static/foundation/js/vendor/custom.modernizr.js"></script>
  61. diff --git a/urls.py b/urls.py
  62. index d467499..10001d8 100644
  63. --- a/urls.py
  64. +++ b/urls.py
  65. @@ -15,6 +15,8 @@ urlpatterns = patterns(
  66. (r'static/auth/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/helios_auth/media'}),
  67. (r'static/helios/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/helios/media'}),
  68. (r'static/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/server_ui/media'}),
  69. +
  70. + #(r'static/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/shared'}),
  72. (r'^', include('server_ui.urls')),
  74.  
Powered by spacepaste. Paste removal.