radiant-event_calendar-extension 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. data/README.md +0 -2
  2. data/VERSION +1 -1
  3. data/app/controllers/admin/events_controller.rb +12 -3
  4. data/app/controllers/admin/icals_controller.rb +2 -2
  5. data/app/models/calendar.rb +1 -1
  6. data/app/models/event.rb +13 -5
  7. data/app/models/ical.rb +15 -5
  8. data/app/views/admin/calendars/edit.html.haml +3 -0
  9. data/app/views/admin/calendars/index.html.haml +3 -0
  10. data/app/views/admin/calendars/new.html.haml +4 -1
  11. data/app/views/admin/event_venues/_event_venue.html.haml +4 -3
  12. data/app/views/admin/event_venues/_form.html.haml +1 -1
  13. data/app/views/admin/event_venues/edit.html.haml +3 -0
  14. data/app/views/admin/event_venues/index.html.haml +3 -0
  15. data/app/views/admin/event_venues/new.html.haml +4 -0
  16. data/app/views/admin/event_venues/remove.html.haml +30 -8
  17. data/app/views/admin/events/_event.html.haml +5 -13
  18. data/app/views/admin/events/_form.html.haml +3 -3
  19. data/app/views/admin/events/edit.html.haml +3 -0
  20. data/app/views/admin/events/index.html.haml +28 -2
  21. data/app/views/admin/events/new.html.haml +3 -0
  22. data/app/views/admin/events/remove.html.haml +11 -6
  23. data/app/views/events/_event.html.haml +2 -4
  24. data/config/routes.rb +2 -2
  25. data/event_calendar_extension.rb +1 -1
  26. data/pkg/radiant-event_calendar-extension-1.1.0.gem +0 -0
  27. data/public/stylesheets/sass/admin/event_calendar.sass +229 -216
  28. data/radiant-event_calendar-extension.gemspec +2 -4
  29. metadata +4 -6
  30. data/public/stylesheets/sass/admin/modules/_grid.sass +0 -56
  31. data/public/stylesheets/sass/constants.sass +0 -80
  32. data/public/stylesheets/sass/event_calendar.sass +0 -279
data/public/stylesheets/sass/admin/event_calendar.sass CHANGED
@@ -1,266 +1,279 @@
1
- @import modules/rounded.sass
2
- @import modules/opacity.sass
3
- @import modules/grid.sass
1
+ @import compass/css3
2
+ @import 960/grid
4
3
 
5
4
  =standard_input
6
- :width 100%
7
- :padding 6px 0
8
- :font-family Monaco,"Courier New",Courier,monospace
9
- :font-size 95%
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
10
 
11
11
  =quiet
12
- :font-family helvetica, arial, sans-serif
13
- :font-weight lighter
14
- :font-size 85%
15
- :color #ccc
16
- :line-height 1.3
17
- :text-shadow none
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
18
 
19
19
  =flatbottom
20
- :margin-bottom 0
20
+ margin-bottom: 0
21
21
 
22
- !radiant_red = #c00
22
+ $radiant_red: #cc0000
23
23
 
24
- //calendars index
24
+ .note
25
+ +quiet
25
26
 
26
- table.index
27
- td.subscription-title
28
- :font-size 115%
29
- :font-weight bold
27
+ table.index
28
+ td.subscription-title
29
+ font-size: 115%
30
+ font-weight: bold
31
+ th
32
+ a
33
+ color: #ccc
34
+ text-decoration: none
35
+ &:hover
36
+ color: white
30
37
 
31
38
  span.calendar_actions
32
- img
33
- :opacity 0.5
34
- a
35
- img
36
- :opacity 1
39
+ img
40
+ opacity: 0.5
41
+ a
42
+ img
43
+ opacity: 1
37
44
 
38
- //events index
45
+ //events index
39
46
 
40
47
  table#events
41
48
  tr
42
49
  td.datemark
43
- :width 40px
44
- :vertical-align top
45
- :text-align center
46
- :line-height 1
50
+ width: 40px
51
+ vertical-align: top
52
+ text-align: center
53
+ line-height: 1
47
54
  a
48
- :text-decoration none
55
+ text-decoration: none
49
56
  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
57
+ display: block
58
+ margin-top: 5px
59
+ font-family: helvetica, arial, sans-serif
60
+ font-weight: lighter
61
+ font-size: 90%
62
+ text-transform: uppercase
56
63
  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
64
- h3
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 #999
73
- p.keywords
74
- :margin 4px 0
75
- :font-size 80%
64
+ display: block
65
+ font-family: helvetica, arial, sans-serif
66
+ font-weight: bold
67
+ font-size: 160%
68
+ td.event
69
+ width: 40%
70
+ vertical-align: center
71
+ h3
72
+ margin: 2px 0 0
73
+ line-height: 1
74
+ a
75
+ text-decoration: none
76
+ p.description
77
+ margin: 0
78
+ font-size: 80%
79
+ color: #999
80
+ p.keywords
81
+ margin: 4px 0
82
+ font-size: 80%
76
83
  td.time, td.location, td.keywords, td.recurrence
77
- :font-size 80%
78
- :padding-top 28px
79
- :vertical-align top
84
+ vertical-align: center
80
85
  td.remove
81
- :padding-top 28px
82
- :vertical-align top
86
+ vertical-align: center
83
87
  span.ineditable
84
- :color #666
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
88
+ color: #666666
89
+ font-size: 80%
90
+ background: url(/images/admin/minus.png) no-repeat scroll 4px 0
91
+ padding-left: 20px
92
+ opacity: 0.3
93
+ tr.continuing, tr.past
94
+ td
95
+ color: #b2aaa4
96
+ a, span
97
+ color: #b2aaa4
98
+ tr.deleted
90
99
  td.datemark
91
- a
92
- :color #b2aaa4
100
+ a, span
101
+ color: #cccccc
93
102
  td.event
94
103
  h3
95
- a
96
- :color #b2aaa4
97
-
104
+ a, span
105
+ color: #cccccc
106
+ text-decoration: line-through
107
+
98
108
  // venues index
99
109
 
100
110
  table#event_venues
101
111
  td.event_venue
102
- :width 40%
103
- :vertical-align top
104
- h3
105
- :margin 0
106
- :line-height 1.2
107
- a
108
- :text-decoration none
109
- p.description
110
- :margin 4px 0
111
- :font-size 80%
112
- :color #999
113
- td.location, td.url
114
- :font-size 80%
115
- :vertical-align top
112
+ width: 40%
113
+ vertical-align: center
114
+ h3
115
+ margin: 0
116
+ line-height: 1.2
117
+ a
118
+ text-decoration: none
119
+ p.description
120
+ margin: 4px 0
121
+ font-size: 80%
122
+ color: #999999
123
+ td.location, td.url
124
+ font-size: 80%
125
+ vertical-align: center
126
+ td.actions
127
+ white-space: nowrap
116
128
 
117
- // event and calendar forms
129
+ // event and calendar forms
118
130
 
119
- #content
120
- #event_form, #calendar_form, #venue_form
121
- div
122
- p
123
- input.textbox, select.textbox, textarea
124
- +standard_input
125
- :margin-top 0.3em
126
- p.note
127
- +grid(4)
128
- :padding-top 1.7em
129
- div.title
130
- :clear left
131
- p.event_title, p.calendar_title, p.keywords, p.venue_title
132
- :margin-bottom 1em
133
- input
134
- :font-family Georgia,Palatino,"Times New Roman",Times,serif
135
- :font-size 200%
136
- p.event_title
137
- +grid(8)
138
- p.keywords
139
- +grid(4)
131
+ #content
132
+ .form-area
133
+ input[disabled='disabled'], textarea[disabled='disabled']
134
+ background-color: #dadada
135
+ border-color: #e7e7e7
136
+
137
+ .main
138
+ position: relative
139
+ width: 73%
140
+ margin-right: 2%
141
+ float: left
142
+ overflow: hidden
143
+ p:first-child
144
+ margin-top: 0
145
+ input.textbox, textarea, select
146
+ width: 99%
147
+ margin-top: 3px
148
+ p.title
149
+ margin-top: 0
150
+ margin-bottom: 1em
140
151
  input
141
- :color = !radiant_red
142
- p.calendar_category, p.calendar_slug
143
- +grid(4)
144
- div.url
145
- +grid(12)
146
- :clear left
147
-
148
- div.description
149
- :clear left
150
- p.description
151
- +grid(8)
152
- textarea
153
- :height 16em
154
- p.calendar
155
- +grid(4)
156
-
157
- div.ical
158
- :clear left
159
- p.url
160
- +grid(8)
161
- :margin-top 0
162
- p.username, p.password
163
- +grid(4)
164
- p.username
165
- :margin-right 2%
152
+ font-family: Georgia, Palatino, "Times New Roman", Times, serif
153
+ font-size: 200%
154
+
155
+ .metadata
156
+ position: relative
157
+ width: 25%
158
+ float: left
159
+ overflow: hidden
160
+ p:first-child
161
+ margin-top: 0
162
+ p.keywords
163
+ margin-bottom: 1em
164
+ input
165
+ margin-top: 4px
166
+ font-family: Georgia, Palatino, "Times New Roman", Times, serif
167
+ font-size: 200%
168
+ color: #c00
169
+
170
+ p.updated_line
171
+ clear: left
172
+ .buttons
173
+ clear: both
174
+
175
+ #calendar_form
176
+ #subscription
177
+ overflow: hidden
178
+ margin-right: 2px
179
+ div
180
+ margin: 0.5em 2% 0 1%
181
+ width: 47%
182
+ float: left
183
+ input.textbox
184
+ +standard_input
185
+ .drawer_handle
186
+ clear: both
187
+ .filing
188
+ p
189
+ margin-top: 0
190
+ p.calendar_category
191
+ width: 47%
192
+ float: left
193
+ margin-right: 4%
194
+ p.calendar_slug
195
+ width: 48%
196
+ float: left
197
+ .description
166
198
 
167
- div.date
168
- :clear left
169
- p.start_date, p.end_date
170
- +grid(4)
171
- :margin-bottom 0
172
- p.problematic
173
- :color = !radiant_red
199
+ #event_form, #venue_form
200
+ p.start_date
201
+ margin: 0
202
+ width: 25%
203
+ float: left
204
+ margin-right: 4%
205
+ p.end_date
206
+ margin: 0
207
+ width: 25%
208
+ float: left
174
209
 
175
210
  div.recurrence
176
- :clear left
211
+ clear: left
177
212
  p.recurrence
178
- :margin-top 0
179
- span.recurrence_detail
180
- :display block
181
- span#recurrence_interval
182
- +grid(2)
183
- span#recurrence_period
184
- +grid(2)
185
- span#recurrence_basis
186
- +grid(2)
187
- span#recurrence_limit
188
- +grid(2)
189
- +flush_right
190
- span#recurrence_count
191
- +grid(2)
192
- +flush_right
193
-
194
- div.venue, div.newvenue
195
- :overflow auto
196
-
213
+ margin: 0
214
+ p#recurrence_detail
215
+ overflow: hidden
216
+ margin-top: 0
217
+ span
218
+ float: left
219
+ margin-right: 1%
220
+ width: 24%
221
+ input, select
222
+ width: 95%
197
223
  div#venue
198
- :clear left
199
- p#existing_venue
200
- +grid(8)
201
- div#new_venue
202
- :clear left
203
- p.venue_title
204
- +grid(8)
205
- p.url
206
- :clear left
207
- +grid(8)
208
- p.venue_location
209
- +grid(8)
210
- textarea
211
- :height 5em
212
- p.venue_postcode
213
- +grid(4)
214
- span.note
215
- :display block
216
- :margin-top 4px
217
- p.venue_description
218
- +grid(12)
219
- :clear both
220
- textarea
221
- :height 5em
222
- .note, label.minor
224
+ select
225
+ +standard_input
226
+
227
+ p.url
228
+ clear: both
229
+ p.description
230
+ clear: both
231
+ div.venue, div.newvenue
232
+ overflow: auto
233
+ clear: left
234
+ textarea
235
+ height: 5em
236
+
237
+ label.minor
223
238
  +quiet
224
- :display inline
239
+ display: inline
225
240
  label.inline
226
- :display inline
227
- .hidden
228
- :display none
229
-
241
+ display: inline
242
+ .hidden
243
+ display: none
230
244
 
231
245
  a.toggleMCE
232
- :display block
233
- :width 24px
234
- :height 24px
235
- :padding-left 24px
236
- :float right
246
+ display: block
247
+ width: 24px
248
+ height: 24px
249
+ padding-left: 24px
250
+ float: right
237
251
 
238
252
  .calendar_popup
239
253
  div.clock_control
240
- :position relative
241
- :display block
242
- :width 300px
243
- :height 200px
254
+ position: relative
255
+ display: block
256
+ width: 300px
257
+ height: 200px
244
258
  form
245
- :text-align center
259
+ text-align: center
246
260
  h4
247
- :margin 10px
248
- :color #999
249
- :font-weight lighter
261
+ margin: 10px
262
+ color: #999999
263
+ font-weight: lighter
250
264
  input.hours, input.minutes
251
- :width 60px
252
- :border 1px solid #ccc
253
- :padding 4px
254
- :font-size 40px
265
+ width: 60px
266
+ border: 1px solid #cccccc
267
+ padding: 4px
268
+ font-size: 40px
255
269
  span.colon
256
- :padding 4px
257
- :font-size 40px
258
- :color #333
259
- :width 10px
270
+ padding: 4px
271
+ font-size: 40px
272
+ color: #333333
273
+ width: 10px
260
274
  input.set_time
261
- :font-size 30px
262
- :width 114px
263
- :margin 20px 0
275
+ font-size: 30px
276
+ width: 114px
277
+ margin: 20px 0
264
278
  a.cancel
265
- :cursor pointer
266
-
279
+ cursor: pointer
data/radiant-event_calendar-extension.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{radiant-event_calendar-extension}
8
- s.version = "1.1.0"
8
+ s.version = "1.1.1"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["spanner"]
@@ -97,6 +97,7 @@ Gem::Specification.new do |s|
97
97
  "pkg/radiant-event_calendar-extension-1.0.0.gem",
98
98
  "pkg/radiant-event_calendar-extension-1.0.1.gem",
99
99
  "pkg/radiant-event_calendar-extension-1.0.2.gem",
100
+ "pkg/radiant-event_calendar-extension-1.1.0.gem",
100
101
  "public/icals/blank",
101
102
  "public/images/admin/calendar.png",
102
103
  "public/images/event_calendar/calendarlinkbg.png",
@@ -107,9 +108,6 @@ Gem::Specification.new do |s|
107
108
  "public/images/event_calendar/several_events.png",
108
109
  "public/javascripts/admin/event_calendar.js",
109
110
  "public/stylesheets/sass/admin/event_calendar.sass",
110
- "public/stylesheets/sass/admin/modules/_grid.sass",
111
- "public/stylesheets/sass/constants.sass",
112
- "public/stylesheets/sass/event_calendar.sass",
113
111
  "radiant-event_calendar-extension.gemspec",
114
112
  "spec/datasets/calendar_events_dataset.rb",
115
113
  "spec/datasets/calendar_pages_dataset.rb",
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: radiant-event_calendar-extension
3
3
  version: !ruby/object:Gem::Version
4
- hash: 19
4
+ hash: 17
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 1
9
- - 0
10
- version: 1.1.0
9
+ - 1
10
+ version: 1.1.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - spanner
@@ -180,6 +180,7 @@ files:
180
180
  - pkg/radiant-event_calendar-extension-1.0.0.gem
181
181
  - pkg/radiant-event_calendar-extension-1.0.1.gem
182
182
  - pkg/radiant-event_calendar-extension-1.0.2.gem
183
+ - pkg/radiant-event_calendar-extension-1.1.0.gem
183
184
  - public/icals/blank
184
185
  - public/images/admin/calendar.png
185
186
  - public/images/event_calendar/calendarlinkbg.png
@@ -190,9 +191,6 @@ files:
190
191
  - public/images/event_calendar/several_events.png
191
192
  - public/javascripts/admin/event_calendar.js
192
193
  - public/stylesheets/sass/admin/event_calendar.sass
193
- - public/stylesheets/sass/admin/modules/_grid.sass
194
- - public/stylesheets/sass/constants.sass
195
- - public/stylesheets/sass/event_calendar.sass
196
194
  - radiant-event_calendar-extension.gemspec
197
195
  - spec/datasets/calendar_events_dataset.rb
198
196
  - spec/datasets/calendar_pages_dataset.rb
data/public/stylesheets/sass/admin/modules/_grid.sass DELETED
@@ -1,56 +0,0 @@
1
- !width = 100%
2
- !grid = 12
3
- !margin = 1%
4
- !box = !width / !grid
5
-
6
- =grid(!count)
7
- :width = (!count * !box) - (2 * !margin)
8
- :display inline
9
- :float left
10
- :position relative
11
- :margin-left = !margin
12
- :margin-right = !margin
13
- =prefix(!count)
14
- :padding-left = !count * !box
15
- =suffix(!count)
16
- :padding-right = !count * !box
17
- =push(!count)
18
- :left = !count * !box
19
- =pull(!count)
20
- :left = !count * !box * -1
21
- =flush_left
22
- :margin-left 0
23
- =flush_right
24
- :margin-right 0
25
- =flush
26
- :margin-left 0
27
- :margin-right 0
28
- =clear
29
- :clear left
30
-
31
- .container_#{!grid}
32
- :width = !width
33
- :position relative
34
- :margin-left auto
35
- :margin-right auto
36
- :overflow hidden
37
- @for !marker from 1 through !grid
38
- .grid_#{!marker}
39
- +grid(!marker)
40
- .prefix_#{!marker}
41
- +prefix(!marker)
42
- .suffix_#{!marker}
43
- +suffix(!marker)
44
- .push_#{!marker}
45
- +push(!marker)
46
- .pull_#{!marker}
47
- +pull(!marker)
48
- .flush_left, .alpha
49
- +flush_left
50
- .flush_right, .omega
51
- +flush_right
52
- .flush
53
- +flush
54
- .row, .newline
55
- +clear
56
-
data/public/stylesheets/sass/constants.sass DELETED
@@ -1,80 +0,0 @@
1
- // layout
2
-
3
- !width = 960px
4
- !grid = 12
5
- !margin = 10px
6
- !box = !width / !grid
7
-
8
- =grid(!count)
9
- :width = (!count * !box) - (2 * !margin)
10
- :display inline
11
- :float left
12
- :position relative
13
- :margin-left = !margin
14
- :margin-right = !margin
15
- =prefix(!count)
16
- :padding-left = !count * !box
17
- =suffix(!count)
18
- :padding-right = !count * !box
19
- =push(!count)
20
- :left = !count * !box
21
- =pull(!count)
22
- :left = !count * !box * -1
23
- =flush
24
- :margin-left 0
25
- =flush_right
26
- :margin-right 0
27
- =snug
28
- :margin-left 0
29
- :margin-right 0
30
- =clearfix
31
-
32
- =newline
33
- :clear left
34
-
35
- // decoration
36
-
37
- !page = #f6f6f4
38
- !darkpage = #efefeb
39
- !text = #616265
40
- !pale = #7f8082
41
- !paler = #a2a3a1
42
- !verypale = #C5C5C0
43
- !link = #9d313d
44
- !hover = #c93f4e
45
- !input = #005b7f
46
- !problem = #d1005d
47
- !shadow = #878786
48
-
49
- =bodyfonts
50
- :font-family Georgia, serif
51
- :line-height 1.6
52
- =headerfonts
53
- :font-family 'Adobe Garamond Pro', Georgia, serif
54
- :font-weight lighter
55
- :line-height 1.05
56
- :letter-spacing -0.03em
57
- =functionalfonts
58
- :font-family helvetica, arial, sans-serif
59
- :letter-spacing -0.03em
60
- =smallfonts
61
- :font-size 80%
62
- :font-style italic
63
- =standard_block
64
- :position relative
65
- :overflow hidden
66
- =inputfonts
67
- :font-family 'Adobe Garamond Pro', Georgia, serif
68
- :font-weight lighter
69
- =rounded(!radius = 3px)
70
- //:-moz-border-radius = !radius
71
- //:-webkit-border-radius = !radius
72
- =shadowed
73
- :-webkit-box-shadow 1px 1px 3px #{!shadow}
74
- :-moz-box-shadow 1px 1px 3px #{!shadow}
75
- =deepshadow
76
- :-webkit-box-shadow 1px 5px 11px #{!shadow}
77
- :-moz-box-shadow 1px 5px 11px #{!shadow}
78
- =blurred(!color=!paler)
79
- :text-shadow #{!color} 0 0 2px
80
-