developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calendar update 

- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
This commit is contained in:
devin 2012-09-14 00:27:35 +08:00 committed by Christophe Vilayphiou
parent f1485556bd
commit af19f11668
5 changed files with 430 additions and 1040 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1306
app/assets/stylesheets/bootstrap-responsive.css vendored
View File

File diff suppressed because it is too large Load Diff

94
vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css vendored
View File

@ -249,8 +249,6 @@
margin: 0 8px 0 0; margin: 0 8px 0 0;
} }
/* agenda view */ /* agenda view */
#calendar_agenda { #calendar_agenda {
border-bottom: solid 1px #ddd; border-bottom: solid 1px #ddd;
@ -258,6 +256,11 @@
#calendar_agenda .table { #calendar_agenda .table {
margin-bottom: 0; margin-bottom: 0;
} }
#calendar_agenda .event {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.event_time { .event_time {
font-family: Tahoma, sans-serif; font-family: Tahoma, sans-serif;
} }
@ -285,52 +288,61 @@
#calendar_day .event_list td { #calendar_day .event_list td {
padding: 0; padding: 0;
} }
#calendar_day .event_list .day_time {
height: 30px; /* week view */
border-bottom: solid 1px #ddd; #calendar_week {
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 { #calendar_week .cell_wrapper {
outline: solid 1px #fff; position: absolute;
width: 100%;
} }
#calendar_day .event dl, #calendar_day .event dt, #calendar_day .event dd { #calendar_week td {
margin: 0;
padding: 0; padding: 0;
} }
#calendar_day .event dl { #calendar_week .table {
padding: 3px; margin-bottom: 0;
} }
#calendar_day .event dt { #calendar_week .header {
font-size: 11px; margin-bottom: 12px;
font-weight: normal; border-top: 0;
line-height: 12px; 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) */ /* calendars(category) */

60
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb vendored
View File

@ -117,35 +117,37 @@
<div class="divide"></div> <div class="divide"></div>
</div> </div>
<div class="event_holder"> <div class="event_holder">
<div class="event" style="background-color: #66cc00; top: 0;"> <div class="inner">
<dl> <div class="event" style="background-color: #66cc00; top: 0;">
<dt>10:30am - 11:00am</dt> <dl>
<dd>template</dd> <dt>10:30am - 11:00am</dt>
</dl> <dd>template</dd>
</div> </dl>
<div class="event" style="background-color: #00aacc; top: 39px;"> </div>
<dl> <div class="event" style="background-color: #00aacc; top: 39px;">
<dt>10:30am - 11:00am</dt> <dl>
<dd>template</dd> <dt>10:30am - 11:00am</dt>
</dl> <dd>template</dd>
</div> </dl>
<div class="event half" style="background-color: #ccffee; top: 117px;"> </div>
<dl> <div class="event half" style="background-color: #ccffee; top: 117px;">
<dt>10:30am - template</dt> <dl>
<dd></dd> <dt>10:30am - template</dt>
</dl> <dd></dd>
</div> </dl>
<div class="event" style="background-color: #00ffee; top: 195px; width: 85%;"> </div>
<dl> <div class="event" style="background-color: #00ffee; top: 195px; width: 85%;">
<dt>10:30am - 11:00am</dt> <dl>
<dd>template</dd> <dt>10:30am - 11:00am</dt>
</dl> <dd>template</dd>
</div> </dl>
<div class="event over" style="background-color: #00ffee; top: 214px; left: 50%; width: 50%;"> </div>
<dl> <div class="event over" style="background-color: #00ccee; top: 214px; left: 50%; width: 50%;">
<dt>10:30am - 11:00am</dt> <dl>
<dd>template</dd> <dt>10:30am - 11:00am</dt>
</dl> <dd>template</dd>
</dl>
</div>
</div> </div>
</div> </div>
</td> </td>

6
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb vendored
View File

@ -28,7 +28,7 @@
</div> </div>
<div id="orbit_calendar" class="month_view"> <div id="orbit_calendar" class="month_view">
<div class="row-fluid"> <div class="row-fluid">
<div class="span2"> <div class="span3">
<div class="btn-toolbar" style="margin:0;"> <div class="btn-toolbar" style="margin:0;">
<div class="btn-group"> <div class="btn-group">
<button class="btn">Today</button> <button class="btn">Today</button>
@ -39,10 +39,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="span7"> <div class="span5">
<h4 class="current_day_title">Semptember 2012</h4> <h4 class="current_day_title">Semptember 2012</h4>
</div> </div>
<div class="span3"> <div class="span4">
<div class="btn-group calendar_mode" data-toggle="buttons-radio"> <div class="btn-group calendar_mode" data-toggle="buttons-radio">
<button class="btn mode_switch">day</button> <button class="btn mode_switch">day</button>
<button class="btn mode_switch">week</button> <button class="btn mode_switch">week</button>

4
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb vendored
View File

@ -87,11 +87,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="3"></td> <td colspan="3"></td>
<<<<<<< HEAD
<td><div class="event single" style="color: #ffcc00;">7pm - 9pm test event</div></td>
=======
<td><div class="event" style="color: #ffcc00;">7pm - 9pm test event</div></td> <td><div class="event" style="color: #ffcc00;">7pm - 9pm test event</div></td>
>>>>>>> calendar update
<td colspan="3"></td> <td colspan="3"></td>
</tr> </tr>
</table> </table>