radiant-event_calendar-extension 1.0.2 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. data/VERSION +1 -1
  2. data/app/controllers/admin/events_controller.rb +8 -2
  3. data/app/controllers/admin/icals_controller.rb +2 -2
  4. data/app/controllers/events_controller.rb +1 -1
  5. data/app/models/event.rb +30 -14
  6. data/app/models/event_venue.rb +5 -7
  7. data/app/models/ical.rb +6 -2
  8. data/app/views/admin/calendars/_form.html.haml +49 -35
  9. data/app/views/admin/calendars/edit.html.haml +0 -1
  10. data/app/views/admin/event_venues/_event_venue.html.haml +1 -1
  11. data/app/views/admin/event_venues/_form.html.haml +36 -32
  12. data/app/views/admin/event_venues/edit.html.haml +6 -1
  13. data/app/views/admin/event_venues/new.html.haml +6 -1
  14. data/app/views/admin/events/_event.html.haml +6 -11
  15. data/app/views/admin/events/_form.html.haml +87 -83
  16. data/app/views/admin/events/edit.html.haml +6 -1
  17. data/app/views/admin/events/new.html.haml +6 -1
  18. data/app/views/events/_event.html.haml +11 -3
  19. data/db/migrate/20100216080944_more_event_data.rb +1 -1
  20. data/db/migrate/20100927140126_amended_events.rb +11 -0
  21. data/db/migrate/20100927203940_calendar_keywords.rb +14 -0
  22. data/lib/event_calendar_admin_ui.rb +4 -4
  23. data/pkg/radiant-event_calendar-extension-1.0.2.gem +0 -0
  24. data/public/stylesheets/sass/event_calendar.sass +278 -202
  25. data/radiant-event_calendar-extension.gemspec +5 -2
  26. metadata +6 -3
data/public/stylesheets/sass/event_calendar.sass CHANGED
@@ -1,203 +1,279 @@
1
- !page = #fff
2
- !text = #000
3
- !pale = #999
4
- !paler = #ccc
5
- !verypale = #eee
6
- !link = #900
7
- !hover = #c00
8
-
9
- =functionalfonts
10
- :font-family helvetica, arial, sans-serif
11
- :letter-spacing -0.03em
12
- =blurred(!color=!verypale)
13
- :text-shadow #{!color} 0 0 2px
14
-
15
- #events
16
- .event
17
- :position relative
18
- :margin-bottom 20px
19
- .dateholder
20
- :position absolute
21
- :left 15px
22
- :top 2px
23
- :padding 5px 5px 0 5px
24
- :border 0
25
- +functionalfonts
26
- :text-align center
27
- :line-height 1.05
28
- :background-color = !page
29
- :border
30
- :style solid
31
- :width 1px
32
- :color = !verypale
33
- span.month, span.dow
34
- :display block
35
- :font-weight lighter
36
- :font-size 80%
37
- :text-transform uppercase
38
- span.day, span.dom
39
- :display block
40
- :font-weight bold
41
- :font-size 160%
42
- .detail
1
+ @import compass/css3
2
+ @import 960/grid
3
+
4
+ =standard_input
5
+ width: 100%
6
+ padding: 6px 0
7
+ border: 1px solid #666666
8
+ font-family: Monaco, "Courier New", Courier, monospace
9
+ font-size: 95%
10
+
11
+ =quiet
12
+ font-family: helvetica, arial, sans-serif
13
+ font-weight: lighter
14
+ font-size: 85%
15
+ color: #cccccc
16
+ line-height: 1.3
17
+ text-shadow: none
18
+
19
+ =flatbottom
20
+ margin-bottom: 0
21
+
22
+ $radiant_red: #cc0000
23
+
24
+ //calendars index
25
+
26
+ table.index
27
+ td.subscription-title
28
+ font-size: 115%
29
+ font-weight: bold
30
+
31
+ span.calendar_actions
32
+ img
33
+ opacity: 0.5
34
+ a
35
+ img
36
+ opacity: 1
37
+
38
+ //events index
39
+
40
+ table#events
41
+ tr
42
+ td.datemark
43
+ width: 40px
44
+ vertical-align: top
45
+ text-align: center
46
+ line-height: 1
47
+ a
48
+ text-decoration: none
49
+ span.month
50
+ display: block
51
+ margin-top: 5px
52
+ font-family: helvetica, arial, sans-serif
53
+ font-weight: lighter
54
+ font-size: 80%
55
+ text-transform: uppercase
56
+ span.day
57
+ display: block
58
+ font-family: helvetica, arial, sans-serif
59
+ font-weight: bold
60
+ font-size: 160%
61
+ td.event
62
+ width: 40%
63
+ vertical-align: top
43
64
  h3
44
- :margin 0
45
- :font-size 180%
46
- p
47
- :margin-top 0
48
- :font-size 90%
49
- :line-height 1.4
50
- p.venue
51
- :font-style italic
52
- :margin-bottom 6px
53
- p.description
54
- :margin-bottom 16px
55
-
56
- #continuing
57
- h3
58
- +functionalfonts
59
- :font-weight bold
60
- :font-size 1.2em
61
- :margin-bottom 0
62
- ul
63
- +functionalfonts
64
- :font-size 90%
65
- :line-height 1.2
66
- :padding-left 0
67
- li
68
- :margin-top 10px
69
- :font-style normal
70
- a.title
71
- :font-weight bold
72
- span.detail
73
- :font-size 80%
74
-
75
- #faceting
76
- a.defilter
77
- :padding-left 14px
78
- :background transparent url(/images/furniture/detag.png) no-repeat top left
79
- :color #c00
80
-
81
- table.minimonth
82
- +functionalfonts
83
- :font-size 80%
84
- :font-style normal
85
- :border-collapse collapse
86
- :border
87
- :style solid
88
- :width 1px
89
- :color = !verypale
90
- :color = !text
91
- :margin 5px 0
92
- a
93
- :display block
94
- :color = !link
95
- :font-weight lighter
96
- :text-decoration none
97
- a:hover
98
- :background-color = !hover
99
- :color = !page
100
- th, td
101
- :font-weight normal
102
- :border
103
- :style solid
104
- :width 1px
105
- :color = !verypale
106
- :vertical-align top
107
- :text-align center
108
- :height 30px
109
- :width 28px
110
- :line-height 30px
111
- :padding 0
112
- :overflow hidden
113
- th.month_link
114
- :font-size 120%
115
- th.day_name
116
- :color = !verypale
117
- td.other_month
118
- :color = !pale
119
- a
120
- :color = !pale
121
- a:hover
122
- :color = !page
123
- td.today
124
- :background-color = !page
125
- td.eventful
126
- td.uneventful
127
- +blurred
128
- :color = !verypale
129
- td.today
130
- :font-weight bold
131
- td.past
132
- :opacity 0.75
133
-
134
- p.help
135
- +functionalfonts
136
- :color = !pale
137
- :font-size 80%
138
-
139
- #view_control
140
- p
141
- +functionalfonts
142
- :color = !paler
143
- :margin 0 0 10px 0
144
- :line-height 30px
145
- :height 25px
146
- :overflow hidden
147
- :font
148
- :size 80%
149
- a
150
- :color = !pale
151
- :padding-top 4px
152
- a.fg
153
- :color = !text
154
- a:hover
155
- :color = !hover
156
- p.views
157
- :font-size 100%
158
- a.map
159
- :padding 7px 3px 3px 17px
160
- :background transparent url(/images/event_calendar/maplinkbg.png) no-repeat top left
161
- a.calendar
162
- :padding 7px 3px 3px 20px
163
- :background transparent url(/images/event_calendar/calendarlinkbg.png) no-repeat top left
164
- p.feeds
165
- a.rss, a.ical
166
- :padding 3px 3px 3px 17px
167
- :height 24px
168
- a.rss
169
- :background transparent url(/images/icons/rss.png) no-repeat top left
170
- a.ical
171
- :background transparent url(/images/icons/ical.png) no-repeat top left
172
-
173
- div.pagination
174
- +functionalfonts
175
- :color = !text
176
- :line-height 2
177
- :margin-top 50px
178
- :margin-bottom 20px
179
- a, span.current, span.disabled
180
- :padding 6px 7px 3px 7px
181
- :border
182
- :style solid
183
- :width 1px
184
- :color = !link
185
- a:hover
186
- :border-color = !hover
187
- .next_page, .prev_page
188
- span.current
189
- :color = !text
190
- :font-weight bold
191
- :border-color = !text
192
- span.separator
193
- :visibility hidden
194
- span.disabled
195
- :display none
196
- :color = !verypale
197
- :border-color = !verypale
198
- +blurred
199
- span.summary
200
- :padding 6px
201
- :font-size 75%
202
- :color = !verypale
203
- :margin-left 10px
65
+ margin: 0
66
+ line-height: 1.2
67
+ a
68
+ text-decoration: none
69
+ p.description
70
+ margin: 4px 0
71
+ font-size: 80%
72
+ color: #999999
73
+ p.keywords
74
+ margin: 4px 0
75
+ font-size: 80%
76
+ td.time, td.location, td.keywords, td.recurrence
77
+ font-size: 80%
78
+ padding-top: 28px
79
+ vertical-align: top
80
+ td.remove
81
+ padding-top: 28px
82
+ vertical-align: top
83
+ span.ineditable
84
+ color: #666666
85
+ font-size: 80%
86
+ background: url(/images/admin/minus.png) no-repeat scroll 4px 0
87
+ padding-left: 20px
88
+ opacity: 0.3
89
+ tr.continuing, tr.past
90
+ td
91
+ color: #b2aaa4
92
+ a, span
93
+ color: #b2aaa4
94
+ tr.deleted
95
+ td.datemark
96
+ a, span
97
+ color: #cccccc
98
+ td.event
99
+ h3
100
+ a, span
101
+ color: #cccccc
102
+ font-decoration: line-through
103
+
104
+ // venues index
105
+
106
+ table#event_venues
107
+ td.event_venue
108
+ width: 40%
109
+ vertical-align: top
110
+ h3
111
+ margin: 0
112
+ line-height: 1.2
113
+ a
114
+ text-decoration: none
115
+ p.description
116
+ margin: 4px 0
117
+ font-size: 80%
118
+ color: #999999
119
+ td.location, td.url
120
+ font-size: 80%
121
+ vertical-align: top
122
+
123
+ // event and calendar forms
124
+
125
+ #content
126
+ #calendar_form
127
+ .primary
128
+ position: relative
129
+ width: 73%
130
+ margin-right: 2%
131
+ float: left
132
+ overflow: hidden
133
+ input.textbox, textarea
134
+ width: 99%
135
+ .title
136
+ p.calendar_title
137
+ margin-top: 0
138
+ margin-bottom: 1em
139
+ input
140
+ font-family: Georgia, Palatino, "Times New Roman", Times, serif
141
+ font-size: 200%
142
+ #subscription
143
+ width: 98%
144
+ overflow: hidden
145
+ p
146
+ margin: 0.5em 2% 0.5em 2%
147
+ width: 46%
148
+ float: left
149
+ .drawer_handle
150
+ clear: both
151
+ .filing
152
+ p
153
+ margin-top: 0
154
+ p.calendar_category
155
+ width: 47%
156
+ float: left
157
+ margin-right: 4%
158
+ p.calendar_slug
159
+ width: 48%
160
+ float: left
161
+ .description
162
+
163
+ .secondary
164
+ position: relative
165
+ width: 25%
166
+ float: left
167
+ overflow: hidden
168
+ .metadata
169
+ position: relative
170
+ p.calendar_keywords
171
+ margin-top: 0
172
+ margin-bottom: 1em
173
+ input
174
+ font-family: Georgia, Palatino, "Times New Roman", Times, serif
175
+ font-size: 200%
176
+ color: #c00
177
+ p.updated_line
178
+ clear: left
179
+ .buttons
180
+ clear: both
181
+
182
+
183
+ #calendar_form, #event_form, #venue_form
184
+ div.date
185
+ clear: left
186
+ p.start_date, p.end_date
187
+ +grid(4)
188
+ margin-bottom: 0
189
+ p.problematic
190
+ color: $radiant_red
191
+
192
+ div.recurrence
193
+ clear: left
194
+ p.recurrence
195
+ margin-top: 0
196
+ span.recurrence_detail
197
+ display: block
198
+ span#recurrence_interval
199
+ +grid(2)
200
+ span#recurrence_period
201
+ +grid(2)
202
+ span#recurrence_basis
203
+ +grid(2)
204
+ span#recurrence_limit
205
+ +grid(2)
206
+ +omega
207
+ span#recurrence_count
208
+ +grid(2)
209
+ +omega
210
+ div.venue, div.newvenue
211
+ overflow: auto
212
+ div#venue
213
+ clear: left
214
+ p#existing_venue
215
+ +grid(8)
216
+ div#new_venue
217
+ clear: left
218
+ p.venue_title
219
+ +grid(8)
220
+ p.url
221
+ clear: left
222
+ +grid(8)
223
+ p.venue_location
224
+ +grid(8)
225
+ textarea
226
+ height: 5em
227
+ p.venue_postcode
228
+ +grid(4)
229
+ span.note
230
+ display: block
231
+ margin-top: 4px
232
+ p.venue_description
233
+ +grid(12)
234
+ clear: both
235
+ textarea
236
+ height: 5em
237
+ .note, label.minor
238
+ +quiet
239
+ display: inline
240
+ label.inline
241
+ display: inline
242
+ .hidden
243
+ display: none
244
+
245
+ a.toggleMCE
246
+ display: block
247
+ width: 24px
248
+ height: 24px
249
+ padding-left: 24px
250
+ float: right
251
+
252
+ .calendar_popup
253
+ div.clock_control
254
+ position: relative
255
+ display: block
256
+ width: 300px
257
+ height: 200px
258
+ form
259
+ text-align: center
260
+ h4
261
+ margin: 10px
262
+ color: #999999
263
+ font-weight: lighter
264
+ input.hours, input.minutes
265
+ width: 60px
266
+ border: 1px solid #cccccc
267
+ padding: 4px
268
+ font-size: 40px
269
+ span.colon
270
+ padding: 4px
271
+ font-size: 40px
272
+ color: #333333
273
+ width: 10px
274
+ input.set_time
275
+ font-size: 30px
276
+ width: 114px
277
+ margin: 20px 0
278
+ a.cancel
279
+ cursor: pointer
data/radiant-event_calendar-extension.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{radiant-event_calendar-extension}
8
- s.version = "1.0.2"
8
+ s.version = "1.1.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["spanner"]
12
- s.date = %q{2010-09-22}
12
+ s.date = %q{2010-09-30}
13
13
  s.description = %q{An event calendar extension that administers events locally or draws them from any ical or CalDAV publishers (Google Calendar, .Mac, Darwin Calendar Server, etc.)}
14
14
  s.email = %q{will@spanner.org}
15
15
  s.extra_rdoc_files = [
@@ -85,6 +85,8 @@ Gem::Specification.new do |s|
85
85
  "db/migrate/20100219102227_venues_and_categories.rb",
86
86
  "db/migrate/20100221180539_recurrence_rules.rb",
87
87
  "db/migrate/20100222182112_occurrences.rb",
88
+ "db/migrate/20100927140126_amended_events.rb",
89
+ "db/migrate/20100927203940_calendar_keywords.rb",
88
90
  "event_calendar_extension.rb",
89
91
  "lib/calendar_period.rb",
90
92
  "lib/event_calendar_admin_ui.rb",
@@ -94,6 +96,7 @@ Gem::Specification.new do |s|
94
96
  "lib/tasks/event_calendar_extension_tasks.rake",
95
97
  "pkg/radiant-event_calendar-extension-1.0.0.gem",
96
98
  "pkg/radiant-event_calendar-extension-1.0.1.gem",
99
+ "pkg/radiant-event_calendar-extension-1.0.2.gem",
97
100
  "public/icals/blank",
98
101
  "public/images/admin/calendar.png",
99
102
  "public/images/event_calendar/calendarlinkbg.png",
metadata CHANGED
@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
+ - 1
8
9
  - 0
9
- - 2
10
- version: 1.0.2
10
+ version: 1.1.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - spanner
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-09-22 00:00:00 +01:00
18
+ date: 2010-09-30 00:00:00 +01:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -168,6 +168,8 @@ files:
168
168
  - db/migrate/20100219102227_venues_and_categories.rb
169
169
  - db/migrate/20100221180539_recurrence_rules.rb
170
170
  - db/migrate/20100222182112_occurrences.rb
171
+ - db/migrate/20100927140126_amended_events.rb
172
+ - db/migrate/20100927203940_calendar_keywords.rb
171
173
  - event_calendar_extension.rb
172
174
  - lib/calendar_period.rb
173
175
  - lib/event_calendar_admin_ui.rb
@@ -177,6 +179,7 @@ files:
177
179
  - lib/tasks/event_calendar_extension_tasks.rake
178
180
  - pkg/radiant-event_calendar-extension-1.0.0.gem
179
181
  - pkg/radiant-event_calendar-extension-1.0.1.gem
182
+ - pkg/radiant-event_calendar-extension-1.0.2.gem
180
183
  - public/icals/blank
181
184
  - public/images/admin/calendar.png
182
185
  - public/images/event_calendar/calendarlinkbg.png