From 1917ce5cf5784810e5f33e3a83f91fe29761d799 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 12 Sep 2012 18:08:49 +0800 Subject: [PATCH 1/3] Manager fix and bundle update --- Gemfile.lock | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7be6a7e6..63b099bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,6 +159,11 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) + pry (0.9.10-x86-mingw32) + coderay (~> 1.0.5) + method_source (~> 0.8) + slop (~> 3.3.1) + win32console (~> 1.3) rack (1.3.6) rack-cache (1.2) rack (>= 0.4) @@ -260,8 +265,8 @@ GEM rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) - social-share-button (0.0.6) slop (3.3.2) + social-share-button (0.0.6) spork (0.9.0) spork (0.9.0-x86-mingw32) win32-process @@ -302,6 +307,7 @@ GEM win32-api (1.4.8-x86-mingw32) win32-process (0.6.5) windows-pr (>= 1.1.2) + win32console (1.3.2-x86-mingw32) windows-api (0.4.1) win32-api (>= 1.4.5) windows-pr (1.2.1) From 3e3699c873d582c770c5c2c1dfc7935c1336d7aa Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 13 Sep 2012 18:06:18 +0800 Subject: [PATCH 2/3] calendar update --- .../app/assets/javascripts/calendarAPI.js.erb | 88 +++++-- .../app/assets/stylesheets/calendar.css | 102 +++++++- .../calendar/back_end/cals_controller.rb | 16 ++ .../back_end/cals/agenda_view.html.erb | 48 ++++ .../calendar/back_end/cals/day_view.html.erb | 155 +++++++++++++ .../calendar/back_end/cals/index.html.erb | 217 ++---------------- .../back_end/cals/month_view.html.erb | 182 +++++++++++++++ .../panel/calendar/back_end/cals/new.html.erb | 3 + .../calendar/back_end/cals/week_view.html.erb | 1 + .../calendar/config/routes.rb | 4 + 10 files changed, 594 insertions(+), 222 deletions(-) create mode 100644 vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb create mode 100644 vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb create mode 100644 vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb create mode 100644 vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb index 8a23d428..d5999917 100644 --- a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb +++ b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb @@ -3,31 +3,81 @@ $(window).load(function(){ $('.color-picker').miniColors(); // just in category view } + var view_url = 'http://localhost:3000/panel/calendar/back_end/cals/'; + // below calendar start - // month view - if($('#calendar_month').length > 0){ - var $c_table = $('#calendar_month'); - var sum_h = 0; - var context_h = $('#main-sidebar').outerHeight(); - $('#main-wrap > *').not('#orbit_calendar, .modal').each(function(){ - sum_h += $(this).outerHeight(); + $.get(view_url+'month_view', function(data) { + $('#view_holder').html(data); + month_fn(); }); + $.get(view_url+'new', function(data) { + $('#create .modal-body').html(data); + }); + + // view switch (for view test) + $('.mode_switch').click(function(){ + var target = $(this).text(); + $.get(view_url+target+'_view', function(data) { + $('#view_holder').html(data); + switch(target){ + case 'month': + month_fn(); + break; + case 'week': + week_fn(); + break; + case 'day': + day_fn(); + break; + case 'agenda': + agenda_fn(); + break; + } + }); + }); + + // month fn + var month_fn = function(){ + $('.current_day_title').text('September 2012'); + + // month view + if($('#calendar_month').length > 0){ + var $c_table = $('#calendar_month'); + var sum_h = 0; + var context_h = $('#main-sidebar').outerHeight(); + $('#main-wrap > *').not('#orbit_calendar, .modal').each(function(){ + sum_h += $(this).outerHeight(); + }); - $c_table - // .height(context_h-sum_h-64) - .find('.month_row') - .not('.month_row.header') - .height((context_h-sum_h-92) / 6); - - $(window).resize(function(){ $c_table + // .height(context_h-sum_h-64) .find('.month_row') .not('.month_row.header') - .height(($('#main-sidebar').outerHeight()-sum_h-92) / 6); - }); + .height((context_h-sum_h-92) / 6); + + $(window).resize(function(){ + $c_table + .find('.month_row') + .not('.month_row.header') + .height(($('#main-sidebar').outerHeight()-sum_h-92) / 6); + }); + } + }; + + // week fn + var week_fn = function(){ + $('.current_day_title').text('September 2 - 8, 2012'); } - $.get('http://localhost:3000/panel/calendar/back_end/cals/new', function(data) { - $('#create .modal-body').html(data); - }); + + // day fn + var day_fn = function(){ + $('.current_day_title').text('September 2, 2012'); + } + + // agenda fn + var agenda_fn = function(){ + $('.current_day_title').text('September 2, 2012'); + } + }); \ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css index 0af3323d..e7d3e35c 100644 --- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css @@ -13,9 +13,25 @@ margin-right: 4px; vertical-align: bottom; } +.current_day_title { + text-align: center; + line-height: 28px; +} .calendar_mode { float: right; } +.mode_switch { + text-transform: capitalize; +} +.today { + background-color: #D9EDF7; +} +.event { + font-size: 12px; + border-radius: 3px; + cursor: pointer; + padding: 1px 3px; +} /* month view */ #calendar_month { border-bottom: solid 1px #ddd; @@ -65,16 +81,11 @@ text-decoration: underline; } #calendar_month .month_row td.today { - background-color: #D9EDF7; border-bottom: solid 1px #fff; border-top: solid 1px #fff; } #calendar_month .month_row .event { - padding: 1px 3px; margin: 0 -2px; - font-size: 12px; - border-radius: 3px; - cursor: pointer; position: relative; color: #000; } @@ -87,6 +98,87 @@ border-left: solid 1px #ddd; } +/* agenda view */ +#calendar_agenda { + border-bottom: solid 1px #ddd; +} +#calendar_agenda .table { + margin-bottom: 0; +} +.event_time { + font-family: Tahoma, sans-serif; +} + +/* day view */ +#calendar_day .header { + margin-bottom: 10px; +} +#calendar_day .header th { + text-align: center; +} +#calendar_day td { + border: 0; +} +#calendar_day .event { + margin-bottom: 2px; +} +#calendar_day .all_day_event { + background: #eee; + border: solid 1px #ddd +} +#calendar_day .event_list .table { + border-top: solid 1px #ddd; +} +#calendar_day .event_list td { + padding: 0; +} +#calendar_day .event_list .day_time { + height: 30px; + border-bottom: solid 1px #ddd; + border-left: solid 1px #ddd; + text-align: right; + padding: 4px; +} +#calendar_day .event_list .cell { + height: 38px; + border: solid 1px #ddd; + border-top: 0; +} +#calendar_day .event_list .divide { + height: 18px; + margin-bottom: 18px; + border-bottom: solid 1px #eee; +} +#calendar_day .event_holder { + width: 100%; + height: 100%; + position: absolute; + top: 0; +} +#calendar_day .event_holder .event { + padding: 0px; + position: absolute; + width: 100%; +} +#calendar_day .event_holder .event.half { + +} +#calendar_day .event_holder .event.over { + outline: solid 1px #fff; +} +#calendar_day .event dl, #calendar_day .event dt, #calendar_day .event dd { + margin: 0; + padding: 0; +} +#calendar_day .event dl { + padding: 3px; +} +#calendar_day .event dt { + font-size: 11px; + font-weight: normal; + line-height: 12px; +} + /* calendars(category) */ .calendars_color_tag { diff --git a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb index d44cd3be..b55f5a35 100644 --- a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb +++ b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb @@ -8,5 +8,21 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController def new render :layout => false end + + def day_view + render :layout => false + end + + def week_view + render :layout => false + end + + def month_view + render :layout => false + end + + def agenda_view + render :layout => false + end end \ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb new file mode 100644 index 00000000..b7726e4c --- /dev/null +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb @@ -0,0 +1,48 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Thu, Sep 69:00am - 9:30am +
Commuting time, from home to RD
+
9:30am - 12:00am +
Work on Thu project, and ask ika for help if possible
+
13:30pm - 18:00pm +
Template design, at least finish 2 template
+
Fri, Sep 79:00am - 18:00pm +
Take a day off
+
Sat, Sep 87:00am - 7:50pm +
Work out with Joseph
+
+
\ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb new file mode 100644 index 00000000..047be06f --- /dev/null +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb @@ -0,0 +1,155 @@ +
+ + + + + + + + + +
+

Sunday 9/2

+
+
event1
+
event2
+
+
+ + + + + +
+
12am
+
1am
+
2am
+
3am
+
4am
+
5am
+
6am
+
7am
+
8am
+
9am
+
10am
+
11am
+
12am
+
1pm
+
2pm
+
3pm
+
4pm
+
5pm
+
6pm
+
7pm
+
8pm
+
9pm
+
10pm
+
11pm
+ 		+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - template
+
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
+
\ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb index ee6c7126..2dc89700 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb @@ -28,189 +28,7 @@
-
-

Semptember 2012

-
-
-
- - - - -
-
-
-
-
- - - - - - - - - - -
SunMonTueWedThuFriSat
-
-
- - - - - - - - - - -
- - - - - - - - - - -
Aug 262728293031Sep 1
-
-
- - - - - - - - - - -
- - - - - - - - - - -
2345678
-
-
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - -
9101112131415
7pm - 9pm test event
7pm - 9pm test event
-
-
- - - - - - - - - - -
- - - - - - - - - - -
16171819202122
-
-
- - - - - - - - - - -
- - - - - - - - - - -
23242526272829
-
-
- - - - - - - - - - -
- - - - - - - - - - -
30Nov 123456
-
-
-
-
-
-
+
@@ -221,6 +39,24 @@
+
+

Semptember 2012

+
+
+
+ + + + +
+
+
+
+
+
+
+
+
Add
@@ -228,19 +64,4 @@
- \ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb new file mode 100644 index 00000000..bff812b0 --- /dev/null +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb @@ -0,0 +1,182 @@ +
+
+ + + + + + + + + + +
SunMonTueWedThuFriSat
+
+
+ + + + + + + + + + +
+ + + + + + + + + + +
Aug 262728293031Sep 1
+
+
+ + + + + + + + + + +
+ + + + + + + + + + +
2345678
+
+
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
9101112131415
7pm - 9pm test event
7pm - 9pm test event
+
+
+ + + + + + + + + + +
+ + + + + + + + + + +
16171819202122
+
+
+ + + + + + + + + + +
+ + + + + + + + + + +
23242526272829
+
+
+ + + + + + + + + + +
+ + + + + + + + + + +
30Nov 123456
+
+
+ \ No newline at end of file diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/new.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/new.html.erb index 25de617a..9611b121 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/new.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/new.html.erb @@ -1,5 +1,8 @@
+
+ +
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb new file mode 100644 index 00000000..359237f1 --- /dev/null +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb @@ -0,0 +1 @@ +week \ No newline at end of file diff --git a/vendor/built_in_modules/calendar/config/routes.rb b/vendor/built_in_modules/calendar/config/routes.rb index 39d9b60a..36aa3e6f 100644 --- a/vendor/built_in_modules/calendar/config/routes.rb +++ b/vendor/built_in_modules/calendar/config/routes.rb @@ -3,6 +3,10 @@ Rails.application.routes.draw do namespace :calendar do namespace :back_end do + match 'cals/agenda_view' => 'cals#agenda_view', :via => :get + match 'cals/month_view' => 'cals#month_view', :via => :get + match 'cals/day_view' => 'cals#day_view', :via => :get + match 'cals/week_view' => 'cals#week_view', :via => :get resources :cals resources :calendar_categories From 17768867a506ebcc57d7451f9fcadc0473d87907 Mon Sep 17 00:00:00 2001 From: devin Date: Fri, 14 Sep 2012 00:27:35 +0800 Subject: [PATCH 3/3] calendar update - delete unwanted style in bootstrap-responsive.css - yet start repeat panel - please just refer how google works (functionality) --- .../stylesheets/bootstrap-responsive.css | 1306 +++++------------ .../app/assets/stylesheets/calendar.css | 150 +- .../calendar/back_end/cals/day_view.html.erb | 60 +- .../calendar/back_end/cals/index.html.erb | 6 +- .../back_end/cals/month_view.html.erb | 2 +- .../calendar/back_end/cals/week_view.html.erb | 199 ++- 6 files changed, 687 insertions(+), 1036 deletions(-) diff --git a/app/assets/stylesheets/bootstrap-responsive.css b/app/assets/stylesheets/bootstrap-responsive.css index 9259d26d..2f94e343 100644 --- a/app/assets/stylesheets/bootstrap-responsive.css +++ b/app/assets/stylesheets/bootstrap-responsive.css @@ -91,968 +91,348 @@ } } -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 30px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; - } - .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; - } - .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; - } - .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; - } - .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; - } - .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; - } - .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; - } - .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; - } - .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; - } - .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; - } - .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; - } - .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; - } - .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; - } - .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; - } - .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; - } - .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; - } - .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; - } - .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; - } - .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; - } - .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; - } - .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; - } - .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; - } - .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; - } - .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; - } - .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; - } - .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; - } - .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; - } - .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; - } - .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; - } - .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; - } - .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; - } - .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; - } - .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; - } - .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; - } - .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1156px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1056px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 956px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 856px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 756px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 656px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 556px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 456px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 356px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 256px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 156px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 56px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } +.row { + margin-left: -30px; + *zoom: 1; +} +.row:before, +.row:after { + display: table; + line-height: 0; + content: ""; +} +.row:after { + clear: both; +} +[class*="span"] { + float: left; + min-height: 1px; + margin-left: 30px; +} +.container, +.navbar-static-top .container, +.navbar-fixed-top .container, +.navbar-fixed-bottom .container { + width: 1170px; +} +.span12 { + width: 1170px; +} +.span11 { + width: 1070px; +} +.span10 { + width: 970px; +} +.span9 { + width: 870px; +} +.span8 { + width: 770px; +} +.span7 { + width: 670px; +} +.span6 { + width: 570px; +} +.span5 { + width: 470px; +} +.span4 { + width: 370px; +} +.span3 { + width: 270px; +} +.span2 { + width: 170px; +} +.span1 { + width: 70px; +} +.offset12 { + margin-left: 1230px; +} +.offset11 { + margin-left: 1130px; +} +.offset10 { + margin-left: 1030px; +} +.offset9 { + margin-left: 930px; +} +.offset8 { + margin-left: 830px; +} +.offset7 { + margin-left: 730px; +} +.offset6 { + margin-left: 630px; +} +.offset5 { + margin-left: 530px; +} +.offset4 { + margin-left: 430px; +} +.offset3 { + margin-left: 330px; +} +.offset2 { + margin-left: 230px; +} +.offset1 { + margin-left: 130px; +} +.row-fluid { + width: 100%; + *zoom: 1; +} +.row-fluid:before, +.row-fluid:after { + display: table; + line-height: 0; + content: ""; +} +.row-fluid:after { + clear: both; +} +.row-fluid [class*="span"] { + display: block; + float: left; + width: 100%; + min-height: 30px; + margin-left: 2.564102564102564%; + *margin-left: 2.5109110747408616%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.row-fluid [class*="span"]:first-child { + margin-left: 0; +} +.row-fluid .span12 { + width: 100%; + *width: 99.94680851063829%; +} +.row-fluid .span11 { + width: 91.45299145299145%; + *width: 91.39979996362975%; +} +.row-fluid .span10 { + width: 82.90598290598291%; + *width: 82.8527914166212%; +} +.row-fluid .span9 { + width: 74.35897435897436%; + *width: 74.30578286961266%; +} +.row-fluid .span8 { + width: 65.81196581196582%; + *width: 65.75877432260411%; +} +.row-fluid .span7 { + width: 57.26495726495726%; + *width: 57.21176577559556%; +} +.row-fluid .span6 { + width: 48.717948717948715%; + *width: 48.664757228587014%; +} +.row-fluid .span5 { + width: 40.17094017094017%; + *width: 40.11774868157847%; +} +.row-fluid .span4 { + width: 31.623931623931625%; + *width: 31.570740134569924%; +} +.row-fluid .span3 { + width: 23.076923076923077%; + *width: 23.023731587561375%; +} +.row-fluid .span2 { + width: 14.52991452991453%; + *width: 14.476723040552828%; +} +.row-fluid .span1 { + width: 5.982905982905983%; + *width: 5.929714493544281%; +} +.row-fluid .offset12 { + margin-left: 105.12820512820512%; + *margin-left: 105.02182214948171%; +} +.row-fluid .offset12:first-child { + margin-left: 102.56410256410257%; + *margin-left: 102.45771958537915%; +} +.row-fluid .offset11 { + margin-left: 96.58119658119658%; + *margin-left: 96.47481360247316%; +} +.row-fluid .offset11:first-child { + margin-left: 94.01709401709402%; + *margin-left: 93.91071103837061%; +} +.row-fluid .offset10 { + margin-left: 88.03418803418803%; + *margin-left: 87.92780505546462%; +} +.row-fluid .offset10:first-child { + margin-left: 85.47008547008548%; + *margin-left: 85.36370249136206%; +} +.row-fluid .offset9 { + margin-left: 79.48717948717949%; + *margin-left: 79.38079650845607%; +} +.row-fluid .offset9:first-child { + margin-left: 76.92307692307693%; + *margin-left: 76.81669394435352%; +} +.row-fluid .offset8 { + margin-left: 70.94017094017094%; + *margin-left: 70.83378796144753%; +} +.row-fluid .offset8:first-child { + margin-left: 68.37606837606839%; + *margin-left: 68.26968539734497%; +} +.row-fluid .offset7 { + margin-left: 62.393162393162385%; + *margin-left: 62.28677941443899%; +} +.row-fluid .offset7:first-child { + margin-left: 59.82905982905982%; + *margin-left: 59.72267685033642%; +} +.row-fluid .offset6 { + margin-left: 53.84615384615384%; + *margin-left: 53.739770867430444%; +} +.row-fluid .offset6:first-child { + margin-left: 51.28205128205128%; + *margin-left: 51.175668303327875%; +} +.row-fluid .offset5 { + margin-left: 45.299145299145295%; + *margin-left: 45.1927623204219%; +} +.row-fluid .offset5:first-child { + margin-left: 42.73504273504273%; + *margin-left: 42.62865975631933%; +} +.row-fluid .offset4 { + margin-left: 36.75213675213675%; + *margin-left: 36.645753773413354%; +} +.row-fluid .offset4:first-child { + margin-left: 34.18803418803419%; + *margin-left: 34.081651209310785%; +} +.row-fluid .offset3 { + margin-left: 28.205128205128204%; + *margin-left: 28.0987452264048%; +} +.row-fluid .offset3:first-child { + margin-left: 25.641025641025642%; + *margin-left: 25.53464266230224%; +} +.row-fluid .offset2 { + margin-left: 19.65811965811966%; + *margin-left: 19.551736679396257%; +} +.row-fluid .offset2:first-child { + margin-left: 17.094017094017094%; + *margin-left: 16.98763411529369%; +} +.row-fluid .offset1 { + margin-left: 11.11111111111111%; + *margin-left: 11.004728132387708%; +} +.row-fluid .offset1:first-child { + margin-left: 8.547008547008547%; + *margin-left: 8.440625568285142%; +} +input, +textarea, +.uneditable-input { + margin-left: 0; +} +.controls-row [class*="span"] + [class*="span"] { + margin-left: 30px; +} +input.span12, +textarea.span12, +.uneditable-input.span12 { + width: 1156px; +} +input.span11, +textarea.span11, +.uneditable-input.span11 { + width: 1056px; +} +input.span10, +textarea.span10, +.uneditable-input.span10 { + width: 956px; +} +input.span9, +textarea.span9, +.uneditable-input.span9 { + width: 856px; +} +input.span8, +textarea.span8, +.uneditable-input.span8 { + width: 756px; +} +input.span7, +textarea.span7, +.uneditable-input.span7 { + width: 656px; +} +input.span6, +textarea.span6, +.uneditable-input.span6 { + width: 556px; +} +input.span5, +textarea.span5, +.uneditable-input.span5 { + width: 456px; +} +input.span4, +textarea.span4, +.uneditable-input.span4 { + width: 356px; +} +input.span3, +textarea.span3, +.uneditable-input.span3 { + width: 256px; +} +input.span2, +textarea.span2, +.uneditable-input.span2 { + width: 156px; +} +input.span1, +textarea.span1, +.uneditable-input.span1 { + width: 56px; +} +.thumbnails { + margin-left: -30px; +} +.thumbnails > li { + margin-left: 30px; +} +.row-fluid .thumbnails { + margin-left: 0; } -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.7624309392265194%; - *margin-left: 2.709239449864817%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.43646408839778%; - *width: 91.38327259903608%; - } - .row-fluid .span10 { - width: 82.87292817679558%; - *width: 82.81973668743387%; - } - .row-fluid .span9 { - width: 74.30939226519337%; - *width: 74.25620077583166%; - } - .row-fluid .span8 { - width: 65.74585635359117%; - *width: 65.69266486422946%; - } - .row-fluid .span7 { - width: 57.18232044198895%; - *width: 57.12912895262725%; - } - .row-fluid .span6 { - width: 48.61878453038674%; - *width: 48.56559304102504%; - } - .row-fluid .span5 { - width: 40.05524861878453%; - *width: 40.00205712942283%; - } - .row-fluid .span4 { - width: 31.491712707182323%; - *width: 31.43852121782062%; - } - .row-fluid .span3 { - width: 22.92817679558011%; - *width: 22.87498530621841%; - } - .row-fluid .span2 { - width: 14.3646408839779%; - *width: 14.311449394616199%; - } - .row-fluid .span1 { - width: 5.801104972375691%; - *width: 5.747913483013988%; - } - .row-fluid .offset12 { - margin-left: 105.52486187845304%; - *margin-left: 105.41847889972962%; - } - .row-fluid .offset12:first-child { - margin-left: 102.76243093922652%; - *margin-left: 102.6560479605031%; - } - .row-fluid .offset11 { - margin-left: 96.96132596685082%; - *margin-left: 96.8549429881274%; - } - .row-fluid .offset11:first-child { - margin-left: 94.1988950276243%; - *margin-left: 94.09251204890089%; - } - .row-fluid .offset10 { - margin-left: 88.39779005524862%; - *margin-left: 88.2914070765252%; - } - .row-fluid .offset10:first-child { - margin-left: 85.6353591160221%; - *margin-left: 85.52897613729868%; - } - .row-fluid .offset9 { - margin-left: 79.8342541436464%; - *margin-left: 79.72787116492299%; - } - .row-fluid .offset9:first-child { - margin-left: 77.07182320441989%; - *margin-left: 76.96544022569647%; - } - .row-fluid .offset8 { - margin-left: 71.2707182320442%; - *margin-left: 71.16433525332079%; - } - .row-fluid .offset8:first-child { - margin-left: 68.50828729281768%; - *margin-left: 68.40190431409427%; - } - .row-fluid .offset7 { - margin-left: 62.70718232044199%; - *margin-left: 62.600799341718584%; - } - .row-fluid .offset7:first-child { - margin-left: 59.94475138121547%; - *margin-left: 59.838368402492065%; - } - .row-fluid .offset6 { - margin-left: 54.14364640883978%; - *margin-left: 54.037263430116376%; - } - .row-fluid .offset6:first-child { - margin-left: 51.38121546961326%; - *margin-left: 51.27483249088986%; - } - .row-fluid .offset5 { - margin-left: 45.58011049723757%; - *margin-left: 45.47372751851417%; - } - .row-fluid .offset5:first-child { - margin-left: 42.81767955801105%; - *margin-left: 42.71129657928765%; - } - .row-fluid .offset4 { - margin-left: 37.01657458563536%; - *margin-left: 36.91019160691196%; - } - .row-fluid .offset4:first-child { - margin-left: 34.25414364640884%; - *margin-left: 34.14776066768544%; - } - .row-fluid .offset3 { - margin-left: 28.45303867403315%; - *margin-left: 28.346655695309746%; - } - .row-fluid .offset3:first-child { - margin-left: 25.69060773480663%; - *margin-left: 25.584224756083227%; - } - .row-fluid .offset2 { - margin-left: 19.88950276243094%; - *margin-left: 19.783119783707537%; - } - .row-fluid .offset2:first-child { - margin-left: 17.12707182320442%; - *margin-left: 17.02068884448102%; - } - .row-fluid .offset1 { - margin-left: 11.32596685082873%; - *margin-left: 11.219583872105325%; - } - .row-fluid .offset1:first-child { - margin-left: 8.56353591160221%; - *margin-left: 8.457152932878806%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 710px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 648px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 586px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 524px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 462px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 400px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 338px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 276px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 214px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 152px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 90px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 28px; - } -} - -@media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; - margin-left: 0; - } - [class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: 100%; - margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .span12, - .row-fluid .span12 { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - .modal { - position: fixed; - top: 20px; - right: 20px; - left: 20px; - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } -} - -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 20px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .modal { - top: 10px; - right: 10px; - left: 10px; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 20px; - } - .navbar-fixed-bottom { - margin-top: 20px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 10px; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #777777; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 9px 15px; - font-weight: bold; - color: #777777; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: #f2f2f2; - } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { - background-color: #111111; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: block; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu:before, - .nav-collapse .nav > li > .dropdown-menu:after { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: 10px 15px; - margin: 10px 0; - border-top: 1px solid #f2f2f2; - border-bottom: 1px solid #f2f2f2; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: #111111; - border-bottom-color: #111111; - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } -} - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css index e7d3e35c..e8bc4a96 100644 --- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css @@ -31,6 +31,59 @@ border-radius: 3px; cursor: pointer; padding: 1px 3px; + box-shadow: inset 0 0 1px black; + -webkit-box-shadow: inset 0 0 1px black; + -moz-box-shadow: inset 0 0 1px black; +} +.event_list .cell { + height: 38px; + border: solid 1px #ddd; + border-top: 0; +} +.event_list .divide { + height: 18px; + margin-bottom: 18px; + border-bottom: solid 1px #eee; +} +.event_list .day_time { + height: 30px; + border-bottom: solid 1px #ddd; + border-left: solid 1px #ddd; + text-align: right; + padding: 4px; +} +.event dl, .event dt, .event dd { + margin: 0; + padding: 0; +} +.event dl { + padding: 3px; +} +.event dt { + font-size: 11px; + font-weight: normal; + line-height: 12px; +} +#calendar_day .event_holder { + width: 100%; + height: 100%; + position: absolute; + top: 0; +} +.event_holder .inner { + position: relative; + margin: 0 16px 0 2px; +} +.event_holder .event { + padding: 0px; + position: absolute; + width: 100%; +} +.event_holder .event.half { + +} +.event_holder .event.over { + border: solid 1px #fff; } /* month view */ #calendar_month { @@ -97,6 +150,11 @@ color: #ccc; border-left: solid 1px #ddd; } +#calendar_month .event.single { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} /* agenda view */ #calendar_agenda { @@ -105,6 +163,11 @@ #calendar_agenda .table { margin-bottom: 0; } +#calendar_agenda .event { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} .event_time { font-family: Tahoma, sans-serif; } @@ -132,52 +195,61 @@ #calendar_day .event_list td { padding: 0; } -#calendar_day .event_list .day_time { - height: 30px; - border-bottom: solid 1px #ddd; - border-left: solid 1px #ddd; - text-align: right; - padding: 4px; -} -#calendar_day .event_list .cell { - height: 38px; - border: solid 1px #ddd; - border-top: 0; -} -#calendar_day .event_list .divide { - height: 18px; - margin-bottom: 18px; - border-bottom: solid 1px #eee; -} -#calendar_day .event_holder { - width: 100%; - height: 100%; - position: absolute; - top: 0; -} -#calendar_day .event_holder .event { - padding: 0px; - position: absolute; - width: 100%; -} -#calendar_day .event_holder .event.half { + +/* week view */ +#calendar_week { } -#calendar_day .event_holder .event.over { - outline: solid 1px #fff; +#calendar_week .cell_wrapper { + position: absolute; + width: 100%; } -#calendar_day .event dl, #calendar_day .event dt, #calendar_day .event dd { - margin: 0; +#calendar_week td { padding: 0; } -#calendar_day .event dl { - padding: 3px; +#calendar_week .table { + margin-bottom: 0; } -#calendar_day .event dt { - font-size: 11px; - font-weight: normal; - line-height: 12px; +#calendar_week .header { + margin-bottom: 12px; + border-top: 0; + table-layout: fixed; } +#calendar_week .header th { + text-align: center; + font-size: 12px; +} +#calendar_week .header td { + border: solid 1px #ddd; + background-color: #eee; +} +#calendar_week .week_day { + padding: 0 2px; + border: solid 1px #ddd; +} +#calendar_week .header .week_day { + padding: 1px 2px 10px 2px; +} +#calendar_week .event_list .event { + position: absolute; + width: 100%; + margin-bottom: 2px; +} +#calendar_week .cell_map { + margin-bottom: 18px; +} +#calendar_week .cell_map td { + border-top: 0; + border-bottom: 0; +} +#calendar_week .cell_map tr:first-child td { + border-top: solid 1px #ddd; +} +#calendar_week .event_holder .inner { + margin: 0 8px 0 0; +} + + /* calendars(category) */ diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb index 047be06f..cdbc1c47 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb @@ -117,35 +117,37 @@
-
-
-
10:30am - 11:00am
-
template
-
-
-
-
-
10:30am - 11:00am
-
template
-
-
-
-
-
10:30am - template
-
-
-
-
-
-
10:30am - 11:00am
-
template
-
-
-
-
-
10:30am - 11:00am
-
template
-
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - template
+
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+
10:30am - 11:00am
+
template
+
+
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb index 2dc89700..75758aa7 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb @@ -28,7 +28,7 @@
-
+
@@ -39,10 +39,10 @@
-
+

Semptember 2012

-
+
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb index bff812b0..adf5f12e 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb @@ -87,7 +87,7 @@ -
7pm - 9pm test event
+
7pm - 9pm test event
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb index 359237f1..c6136bdd 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb @@ -1 +1,198 @@ -week \ No newline at end of file +
+ + + + + + + + + + + + + + + + + + + + + +
Sun 9/11Mon 9/12Tue 9/13Wed 9/14Thu 9/15Fri 9/16Sat 9/17
+
+
+
10:30am - template
+
+
+
+ 		+ +
+
+
10:30am - template
+
+
+
+
+
+ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
12am
+
1am
+
2am
+
3am
+
4am
+
5am
+
6am
+
7am
+
8am
+
9am
+
10am
+
11am
+
12am
+
1pm
+
2pm
+
3pm
+
4pm
+
5pm
+
6pm
+
7pm
+
8pm
+
9pm
+
10pm
+
11pm
+ 		+
+
+
+
+ 		+
+
+
+
+ 		+
+
+
+
+
10:30am - 11:00am
+
template
+
+
+
+
+ 		+
+
+
+
+ 		+
+
+
+
+ 		+
+
+
+
+ 		+
+
+
+
+
+
+
\ No newline at end of file