Permalink
Browse files

adding style.less

  • Loading branch information...
1 parent 828abe7 commit 67afd164b2bc1c45cf5b92a06064fd841eb8b0e7 @peterbe peterbe committed May 29, 2012
Showing with 524 additions and 1,068 deletions.
  1. +1 −0 .gitignore
  2. BIN media/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
  3. BIN media/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
  4. BIN media/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
  5. BIN media/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
  6. BIN media/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
  7. BIN media/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
  8. BIN media/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
  9. BIN media/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
  10. BIN media/css/redmond/images/ui-icons_217bc0_256x240.png
  11. BIN media/css/redmond/images/ui-icons_2e83ff_256x240.png
  12. BIN media/css/redmond/images/ui-icons_469bdd_256x240.png
  13. BIN media/css/redmond/images/ui-icons_6da8d5_256x240.png
  14. BIN media/css/redmond/images/ui-icons_cd0a0a_256x240.png
  15. BIN media/css/redmond/images/ui-icons_d8e7f3_256x240.png
  16. BIN media/css/redmond/images/ui-icons_f9bd01_256x240.png
  17. +0 −406 media/css/redmond/jquery-ui-1.7.2.custom.css
  18. BIN media/css/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png
  19. BIN media/css/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png
  20. BIN media/css/ui-darkness/images/ui-bg_glass_20_555555_1x400.png
  21. BIN media/css/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png
  22. BIN media/css/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png
  23. BIN media/css/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png
  24. BIN media/css/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
  25. BIN media/css/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png
  26. BIN media/css/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png
  27. BIN media/css/ui-darkness/images/ui-icons_222222_256x240.png
  28. BIN media/css/ui-darkness/images/ui-icons_4b8e0b_256x240.png
  29. BIN media/css/ui-darkness/images/ui-icons_a83300_256x240.png
  30. BIN media/css/ui-darkness/images/ui-icons_cccccc_256x240.png
  31. BIN media/css/ui-darkness/images/ui-icons_ffffff_256x240.png
  32. +0 −406 media/css/ui-darkness/jquery-ui-1.7.2.custom.css
  33. +1 −1 pto/apps/dates/forms.py
  34. +15 −16 pto/apps/dates/helpers.py
  35. 0 {media/css/dates → pto/apps/dates/static/dates/css}/about-calendar-url.css
  36. 0 {media/css/dates → pto/apps/dates/static/dates/css}/following.css
  37. 0 {media/css/dates → pto/apps/dates/static/dates/css}/home.css
  38. 0 {media/css/dates → pto/apps/dates/static/dates/css}/hours.css
  39. +40 −0 pto/apps/dates/static/dates/css/list.css
  40. 0 {media/css/dates → pto/apps/dates/static/dates/css}/notify.css
  41. 0 {media/js/dates → pto/apps/dates/static/dates/js}/emails_sent.js
  42. 0 {media/js/dates → pto/apps/dates/static/dates/js}/following.js
  43. 0 {media/js/dates → pto/apps/dates/static/dates/js}/home.js
  44. 0 {media/js/dates → pto/apps/dates/static/dates/js}/hours.js
  45. 0 {media/js/dates → pto/apps/dates/static/dates/js}/list.js
  46. 0 {media/js/dates → pto/apps/dates/static/dates/js}/notify.js
  47. +8 −5 pto/apps/dates/templates/dates/about-calendar-url.html
  48. +20 −21 pto/apps/dates/templates/dates/duplicate-report.html
  49. +12 −4 pto/apps/dates/templates/dates/emails_sent.html
  50. +8 −4 pto/apps/dates/templates/dates/following.html
  51. +19 −13 pto/apps/dates/templates/dates/home.html
  52. +3 −6 pto/apps/dates/templates/dates/hours.html
  53. +23 −68 pto/apps/dates/templates/dates/list.html
  54. +13 −8 pto/apps/dates/templates/dates/notify.html
  55. 0 {media/css/mobile → pto/apps/mobile/static/mobile/css}/mobile.css
  56. BIN {media/img/mobile → pto/apps/mobile/static/mobile/img}/apple-touch-icon.png
  57. 0 {media/js/mobile → pto/apps/mobile/static/mobile/js}/mobile.js
  58. +15 −5 pto/apps/mobile/templates/mobile/base.html
  59. +4 −1 pto/apps/users/email_auth_backend.py
  60. +1 −1 pto/apps/users/forms.py
  61. 0 {media/js/users → pto/apps/users/static/users/js}/profile.js
  62. +3 −7 pto/apps/users/templates/users/profile.html
  63. +14 −6 pto/base/templates/base.html
  64. +70 −77 pto/settings/base.py
  65. +8 −0 pto/settings/local.py
  66. +2 −6 pto/urls.py
  67. 0 {media → static}/css/.gitignore
  68. 0 {media → static}/css/demo_table_jui.css
  69. 0 {media → static}/css/examples/main.css
  70. BIN {media → static}/css/images/asc.gif
  71. BIN {media → static}/css/images/background.jpg
  72. BIN {media → static}/css/images/bg.png
  73. BIN {media → static}/css/images/desc.gif
  74. BIN {media → static}/css/images/pto.png
  75. BIN {media → static}/css/images/sort.gif
  76. BIN {media → static}/css/images/throbber.png
  77. 0 {media → static}/css/libs/datatable/css/demo_table.css
  78. BIN {media → static}/css/libs/datatable/images/back_disabled.jpg
  79. BIN {media → static}/css/libs/datatable/images/back_enabled.jpg
  80. BIN {media → static}/css/libs/datatable/images/forward_disabled.jpg
  81. BIN {media → static}/css/libs/datatable/images/forward_enabled.jpg
  82. BIN {media → static}/css/libs/datatable/images/sort_asc.png
  83. BIN {media → static}/css/libs/datatable/images/sort_asc_disabled.png
  84. BIN {media → static}/css/libs/datatable/images/sort_both.png
  85. BIN {media → static}/css/libs/datatable/images/sort_desc.png
  86. BIN {media → static}/css/libs/datatable/images/sort_desc_disabled.png
  87. 0 {media → static}/css/libs/fireworks.css
  88. 0 {media → static}/css/libs/fullcalendar.css
  89. 0 {media → static}/css/libs/fullcalendar.print.css
  90. BIN {media → static}/css/libs/images/ajax-loader.gif
  91. BIN {media → static}/css/libs/images/ajax-loader.png
  92. BIN {media → static}/css/libs/images/icons-18-black.png
  93. BIN {media → static}/css/libs/images/icons-18-white.png
  94. BIN {media → static}/css/libs/images/icons-36-black.png
  95. BIN {media → static}/css/libs/images/icons-36-white.png
  96. 0 {media → static}/css/libs/jquery.mobile-1.0.1.css
  97. 0 {media → static}/css/libs/jquery.mobile-1.0.1.min.css
  98. 0 {media → static}/css/libs/jquery.mobile-1.1.0.css
  99. 0 {media → static}/css/libs/jquery.mobile-1.1.0.min.css
  100. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
  101. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png
  102. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
  103. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
  104. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
  105. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
  106. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
  107. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
  108. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-icons_217bc0_256x240.png
  109. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-icons_2e83ff_256x240.png
  110. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-icons_469bdd_256x240.png
  111. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-icons_6da8d5_256x240.png
  112. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-icons_cd0a0a_256x240.png
  113. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-icons_d8e7f3_256x240.png
  114. BIN {media → static}/css/libs/jquery_ui/redmond/images/ui-icons_f9bd01_256x240.png
  115. 0 {media → static}/css/libs/jquery_ui/redmond/jquery-ui-1.8.20.datepicker.autocomplete.dialog.css
  116. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  117. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png
  118. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  119. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png
  120. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png
  121. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  122. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png
  123. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  124. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-icons_222222_256x240.png
  125. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png
  126. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-icons_454545_256x240.png
  127. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-icons_888888_256x240.png
  128. BIN {media → static}/css/pto/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png
  129. 0 {media → static}/css/pto/jquery-ui-theme/ui.accordion.css
  130. 0 {media → static}/css/pto/jquery-ui-theme/ui.all.css
  131. 0 {media → static}/css/pto/jquery-ui-theme/ui.base.css
  132. 0 {media → static}/css/pto/jquery-ui-theme/ui.core.css
  133. 0 {media → static}/css/pto/jquery-ui-theme/ui.datepicker.css
  134. 0 {media → static}/css/pto/jquery-ui-theme/ui.dialog.css
  135. 0 {media → static}/css/pto/jquery-ui-theme/ui.progressbar.css
  136. 0 {media → static}/css/pto/jquery-ui-theme/ui.resizable.css
  137. 0 {media → static}/css/pto/jquery-ui-theme/ui.slider.css
  138. 0 {media → static}/css/pto/jquery-ui-theme/ui.tabs.css
  139. 0 {media → static}/css/pto/jquery-ui-theme/ui.theme.css
  140. 0 {media → static}/css/pto/main.css
  141. 0 {media → static}/css/style.css
  142. +242 −0 static/css/style.less
  143. 0 {media → static}/img/.gitignore
  144. BIN {media → static}/img/about-calendar-url/google-adding-calendar.png
  145. BIN {media → static}/img/about-calendar-url/google-click-to-add.png
  146. BIN {media → static}/img/about-calendar-url/zimbra-adding-calendar.png
  147. BIN {media → static}/img/about-calendar-url/zimbra-click-to-add.png
  148. BIN {media → static}/img/blank.gif
  149. BIN {media → static}/img/calendar-icon.png
  150. BIN {media → static}/img/duplicate-icon.png
  151. BIN {media → static}/img/favicon.ico
  152. BIN {media → static}/img/particles.gif
  153. 0 {media → static}/js/.gitignore
  154. 0 {media → static}/js/global.js
  155. BIN {media → static}/js/libs/audio/boom1.mp3
  156. BIN {media → static}/js/libs/audio/boom2.mp3
  157. BIN {media → static}/js/libs/audio/boom3.mp3
  158. BIN {media → static}/js/libs/audio/boom4.mp3
  159. BIN {media → static}/js/libs/audio/pop1.mp3
  160. BIN {media → static}/js/libs/audio/pop2.mp3
  161. BIN {media → static}/js/libs/audio/pop3.mp3
  162. BIN {media → static}/js/libs/audio/pop4.mp3
  163. BIN {media → static}/js/libs/audio/pop5.mp3
  164. BIN {media → static}/js/libs/audio/pop6.mp3
  165. 0 {media → static}/js/libs/date.js
  166. +1 −1 {media → static}/js/libs/fireworks.js
  167. 0 {media → static}/js/libs/format.js
  168. 0 {media → static}/js/libs/fullcalendar.js
  169. 0 {media → static}/js/libs/fullcalendar.min.js
  170. 0 {media → static}/js/libs/jquery-1.7.2.min.js
  171. 0 {media → static}/js/libs/jquery-ui-1.8.20.datepicker.autocomplete.dialog.min.js
  172. 0 {media → static}/js/libs/jquery.cookie.min.js
  173. 0 {media → static}/js/libs/jquery.dataTables.js
  174. 0 {media → static}/js/libs/jquery.dataTables.min.js
  175. 0 {media → static}/js/libs/jquery.mobile-1.1.0.js
  176. 0 {media → static}/js/libs/jquery.mobile-1.1.0.min.js
  177. 0 {media → static}/js/libs/soundmanager2-nodebug-jsmin.js
  178. BIN {media → static}/js/libs/swf/soundmanager2.swf
  179. BIN {media → static}/js/libs/swf/soundmanager2_flash9.swf
  180. 0 {media → static}/js/pto/pto.js
  181. +1 −1 vendor
  182. +0 −5 vendor-local/src/pip-delete-this-directory.txt
View
@@ -21,3 +21,4 @@ TODO
cover/
sample_data.py
build/
+collected/
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered

Large diffs are not rendered by default.

Oops, something went wrong.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -187,7 +187,7 @@ def __init__(self, *args, **kwargs):
for each in (UserProfile.objects.exclude(country='')
.values('country')
- .distinct('country')
+ .distinct()
.order_by('country')):
country = each['country']
self.fields['country'].choices.append((country, country))
View
@@ -10,6 +10,7 @@
from django.conf import settings
from django.utils.encoding import smart_str
from django.core.urlresolvers import reverse
+from django.contrib.staticfiles.storage import staticfiles_storage
import jinja2
from jingo import register
@@ -53,25 +54,23 @@ def truncatewords(context, string, length):
return string
-@register.function
-@jinja2.contextfunction
-def media(context, url, key='MEDIA_URL'):
- """Get a MEDIA_URL link with a cache buster querystring."""
- if url.endswith('.js'):
- build = context['BUILD_ID_JS']
- elif url.endswith('.css'):
- build = context['BUILD_ID_CSS']
- else:
- #build = context['BUILD_ID_IMG']
- build = context['BUILD_ID_JS']
- return context[key] + urlparams(url, b=build)
+#@register.function
+#@jinja2.contextfunction
+#def media(context, url, key='MEDIA_URL'):
+# """Get a MEDIA_URL link with a cache buster querystring."""
+# if url.endswith('.js'):
+# build = context['BUILD_ID_JS']
+# elif url.endswith('.css'):
+# build = context['BUILD_ID_CSS']
+# else:
+# #build = context['BUILD_ID_IMG']
+# build = context['BUILD_ID_JS']
+# return context[key] + urlparams(url, b=build)
@register.function
-@jinja2.contextfunction
-def static(context, url):
- """Get a STATIC_URL link with a cache buster querystring."""
- return media(context, url, 'STATIC_URL')
+def static(path):
+ return staticfiles_storage.url(path)
@register.function
File renamed without changes.
@@ -0,0 +1,40 @@
+table.tablesorter {
+ border-collapse: collapse;
+ font-family:arial;
+ background-color: #CDCDCD;
+ margin:10px 0pt 15px;
+ font-size: 8pt;
+ width: 100%;
+ text-align: left;
+}
+table.tablesorter thead tr th, table.tablesorter tfoot tr th {
+ background-color: #e6EEEE;
+ border: 1px solid #FFF;
+ font-size: 8pt;
+ padding: 4px;
+ border:1px solid #ccc;
+}
+table.tablesorter thead tr .header {
+ background-repeat: no-repeat;
+ background-position: center right;
+ cursor: pointer;
+}
+table.tablesorter tbody td {
+ color: #3D3D3D;
+ padding: 4px;
+ background-color: #FFF;
+ vertical-align: top;
+ border:1px solid #ccc;
+}
+table.tablesorter tbody tr.odd td {
+ background-color:#F0F0F6;
+}
+table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
+ background-color: #8dbdd8;
+}
+
+#load-placeholder {
+ text-align:center;
+ border:1px solid #ccc;
+ padding:30px;
+}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -7,8 +7,11 @@
{% extends "base.html" %}
+
{% block extra_site_css %}
-{{ css('dates.about-calendar-url') }}
+{% compress css %}
+<link rel="stylesheet" href="{{ static("dates/css/about-calendar-url.css") }}">
+{% endcompress %}
{% endblock %}
@@ -31,11 +34,11 @@ <h2>About the calendar URL</h2>
<h2>To import into Zimbra</h2>
<p><strong>1. Click to add a new calendar</strong><br>
-<img class="thumbnail" src="{{ media('img/about-calendar-url/zimbra-click-to-add.png') }}" alt="Click to add">
+<img class="thumbnail" src="{{ static('img/about-calendar-url/zimbra-click-to-add.png') }}" alt="Click to add">
</p>
<p><strong>2. Give it a name and paste in your URL</strong><br>
-<img class="thumbnail" src="{{ media('img/about-calendar-url/zimbra-adding-calendar.png') }}" alt="Enter your URL">
+<img class="thumbnail" src="{{ static('img/about-calendar-url/zimbra-adding-calendar.png') }}" alt="Enter your URL">
</p>
<p><strong>3. Press OK</strong>
@@ -46,11 +49,11 @@ <h2>To import into Zimbra</h2>
<h2>To import into Google Calendar</h2>
<p><strong>1. Click to add a new calendar</strong><br>
-<img class="thumbnail" src="{{ media('img/about-calendar-url/google-click-to-add.png') }}" alt="Click to add">
+<img class="thumbnail" src="{{ static('img/about-calendar-url/google-click-to-add.png') }}" alt="Click to add">
</p>
<p><strong>2. Paste in your URL</strong><br>
-<img class="thumbnail" src="{{ media('img/about-calendar-url/google-adding-calendar.png') }}" alt="Enter your URL">
+<img class="thumbnail" src="{{ static('img/about-calendar-url/google-adding-calendar.png') }}" alt="Enter your URL">
</p>
<p><strong>3. Press Add Calendar</strong>
@@ -7,8 +7,8 @@
{% extends "base.html" %}
+
{% block extra_site_css %}
-{{ css('jquery_ui') }}
<style>
table.group { width: 100%; margin-bottom: 30px; border-top: 1px solid #ccc; }
table.group thead td { font-weight:bold; }
@@ -17,6 +17,25 @@
</style>
{% endblock %}
+
+{% block extra_site_js %}
+<script>
+var MIN_DATE = new Date({{ first_date.year }}, {{ first_date.month }}-1, {{ first_date.day }});
+$(function() {
+ $('input[name="since"]').datepicker({
+ dateFormat: 'd MM yy',
+ changeMonth: true,
+ changeYear: true,
+ minDate: MIN_DATE,
+ maxDate: new Date(),
+ showAnim: 'fadeIn',
+ showButtonPanel: true
+ });
+});
+</script>
+{% endblock %}
+
+
{% block content %}
<form action=".">
@@ -74,24 +93,4 @@ <h2>Instance #{{ loop.index }}</h2>
</p>
{% endfor %}
-
-{% endblock %}
-
-
-{% block extra_site_js %}
-{{ js('jquery_ui') }}
-<script>
-var MIN_DATE = new Date({{ first_date.year }}, {{ first_date.month }}-1, {{ first_date.day }});
-$(function() {
- $('input[name="since"]').datepicker({
- dateFormat: 'd MM yy',
- changeMonth: true,
- changeYear: true,
- minDate: MIN_DATE,
- maxDate: new Date(),
- showAnim: 'fadeIn',
- showButtonPanel: true
- });
-});
-</script>
{% endblock %}
@@ -8,17 +8,25 @@
{% extends "base.html" %}
{% block extra_site_css %}
-{{ css('dates.emails_sent') }}
+
+{% compress css %}
+<link rel="stylesheet" href="{{ static("css/libs/fireworks.css") }}">
+{% endcompress %}
<style>
/* https://bugzilla.mozilla.org/show_bug.cgi?id=745790 */
body { overflow: hidden; }
</style>
{% endblock %}
{% block extra_site_js %}
-{{ js('dates.emails_sent') }}
+{% compress js %}
+<script src="{{ static("js/libs/soundmanager2-nodebug-jsmin.js") }}"></script>
+<script src="{{ static("js/libs/fireworks.js") }}"></script>
+<script src="{{ static("js/libs/jquery.cookie.min.js") }}"></script>
+<script src="{{ static("dates/js/emails_sent.js") }}"></script>
+{% endcompress %}
<script>
-soundManager.url = '/media/js/libs/swf/';
+soundManager.url = '/static/js/libs/swf/';
</script>
{% endblock %}
@@ -38,7 +46,7 @@ <h2>Absolutely brilliant!</h2>
{% if show_fireworks %}
<div id="fireworks-template">
<div id="fw" class="firework"></div>
- <div id="fp" class="fireworkParticle"><img src="/media/img/particles.gif" alt="" /></div>
+ <div id="fp" class="fireworkParticle"><img src="{{ static('img/particles.gif') }}" alt="" /></div>
</div>
<div id="fireContainer"></div>
{% endif %}
@@ -7,17 +7,21 @@
{% extends "base.html" %}
+
{% block extra_site_css %}
-{{ css('jquery_ui') }}
-{{ css('dates.following') }}
+{% compress css %}
+<link rel="stylesheet" href="{{ static("dates/css/following.css") }}">
+{% endcompress %}
{% endblock %}
{% block extra_site_js %}
-{{ js('jquery_ui') }}
-{{ js('dates.following') }}
+{% compress js %}
+<script src="{{ static("dates/js/following.js") }}"></script>
+{% endcompress %}
{% endblock %}
+
{% block page_title %}People you're following (or not){% endblock %}
{% block content %}
@@ -7,8 +7,23 @@
#}
{% block extra_site_css %}
-{{ css('jquery_ui') }}
-{{ css('dates.home') }}
+{% compress css %}
+<link rel="stylesheet" href="{{ static("css/libs/fullcalendar.css") }}">
+<link rel="stylesheet" href="{{ static("dates/css/home.css") }}">
+{% endcompress %}
+{% endblock %}
+
+
+{% block extra_site_js %}
+<script>
+var CALENDAR_FIRST_DAY = {{ first_day }}; // 0=Sunday, 1=Monday
+</script>
+
+{% compress js %}
+<script src="{{ static("js/libs/fullcalendar.min.js") }}"></script>
+<script src="{{ static("dates/js/home.js") }}"></script>
+{% endcompress %}
+
{% endblock %}
@@ -37,15 +52,15 @@
<a href="">Add a new one on top?</a></p>
</div>
-<a href="{{ calendar_url }}"><img src="{{ media('img/calendar-icon.png') }}" alt="Calendar"></a>
+<a href="{{ calendar_url }}"><img src="{{ static('img/calendar-icon.png') }}" alt="Calendar"></a>
To add this to an external calendar (e.g. iCal or Outlook) you need this URL:
<a href="{{ calendar_url }}">{{ calendar_url }}</a>
<span class="reset-link">
(<a href="{{ url('dates.reset_calendar_url') }}" class="small-link">reset your calendar URL</a>,
<a href="{{ url('dates.about_calendar_url') }}" class="small-link" title="Click to find out more about how this works">read more</a>)
</span>
<br>
-<a href="{{ url('dates.duplicate_report') }}"><img src="{{ media('img/duplicate-icon.png') }}" alt="Duplicate report"></a>
+<a href="{{ url('dates.duplicate_report') }}"><img src="{{ static('img/duplicate-icon.png') }}" alt="Duplicate report"></a>
To find suspicious duplicate submissions use the <a href="{{ url('dates.duplicate_report') }}">Duplicate report</a>
</div>
@@ -141,12 +156,3 @@ <h2>Who's on PTO right now?</h2>
{% endif %}
<div class="clearer">&nbsp;</div>
{% endblock %}
-
-
-{% block extra_site_js %}
-<script>
-var CALENDAR_FIRST_DAY = {{ first_day }}; // 0=Sunday, 1=Monday
-</script>
-{{ js('jquery_ui') }}
-{{ js('dates.home') }}
-{% endblock %}
@@ -9,14 +9,11 @@
{% block extra_site_css %}
-{{ css('dates') }}
+{% compress css %}
+<link rel="stylesheet" href="{{ static("dates/css/hours.css") }}">
+{% endcompress %}
{% endblock %}
-{% block extra_site_js %}
-{{ js('jquery_ui') }}
-{% endblock %}
-
-
{% block content %}
<form action="." method="post">{{ csrf() }}
Oops, something went wrong.

0 comments on commit 67afd16

Please sign in to comment.