Skip to content

Commit

Permalink
rejiggered event html/css, added print stylesheet, much more printer …
Browse files Browse the repository at this point in the history 
…friendly
  • Loading branch information
@arshaw
arshaw committed Feb 1, 2011
1 parent bef6f92 commit f3fcd57
Show file tree
Hide file tree
Showing 20 changed files with 362 additions and 322 deletions.
4 changes: 4 additions & 0 deletions Makefile
View file
Expand Up @@ -56,6 +56,10 @@ zip:
@echo "building core..."
@$(call concat_js,${SRC_DIR},"${BUILD_DIR}/fullcalendar/fullcalendar/fullcalendar.js")
@$(call concat_css,${SRC_DIR},"${BUILD_DIR}/fullcalendar/fullcalendar/fullcalendar.css")
@cat "${SRC_DIR}/common/print.css" \
| ${VER_SED} \
| ${DATE_SED} \
> "${BUILD_DIR}/fullcalendar/fullcalendar/fullcalendar.print.css"

@echo "compressing core js..."
@java -jar ${BUILD_DIR}/compiler.jar --warning_level VERBOSE --jscomp_off checkTypes --externs build/externs.js \
Expand Down
1 change: 1 addition & 0 deletions demos/agenda-views.html
View file
Expand Up @@ -4,6 +4,7 @@
<script type='text/javascript' src='../src/_loader.js'></script>
<!--[[
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.print.css' media='print' />
<script type='text/javascript' src='../jquery/jquery.js'></script>
<script type='text/javascript' src='../jquery/jquery-ui.js'></script>
<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>
Expand Down
1 change: 1 addition & 0 deletions demos/basic-views.html
View file
Expand Up @@ -4,6 +4,7 @@
<script type='text/javascript' src='../src/_loader.js'></script>
<!--[[
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.print.css' media='print' />
<script type='text/javascript' src='../jquery/jquery.js'></script>
<script type='text/javascript' src='../jquery/jquery-ui.js'></script>
<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>
Expand Down
1 change: 1 addition & 0 deletions demos/default.html
View file
Expand Up @@ -4,6 +4,7 @@
<script type='text/javascript' src='../src/_loader.js'></script>
<!--[[
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.print.css' media='print' />
<script type='text/javascript' src='../jquery/jquery.js'></script>
<script type='text/javascript' src='../jquery/jquery-ui.js'></script>
<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>
Expand Down
1 change: 1 addition & 0 deletions demos/external-dragging.html
View file
Expand Up @@ -4,6 +4,7 @@
<script type='text/javascript' src='../src/_loader.js'></script>
<!--[[
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.print.css' media='print' />
<script type='text/javascript' src='../jquery/jquery.js'></script>
<script type='text/javascript' src='../jquery/jquery-ui.js'></script>
<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>
Expand Down
1 change: 1 addition & 0 deletions demos/gcal.html
View file
Expand Up @@ -5,6 +5,7 @@
<script type='text/javascript' src='../src/gcal/_loader.js'></script>
<!--[[
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.print.css' media='print' />
<script type='text/javascript' src='../jquery/jquery.js'></script>
<script type='text/javascript' src='../jquery/jquery-ui.js'></script>
<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>
Expand Down
1 change: 1 addition & 0 deletions demos/json.html
View file
Expand Up @@ -4,6 +4,7 @@
<script type='text/javascript' src='../src/_loader.js'></script>
<!--[[
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.print.css' media='print' />
<script type='text/javascript' src='../jquery/jquery.js'></script>
<script type='text/javascript' src='../jquery/jquery-ui.js'></script>
<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>
Expand Down
1 change: 1 addition & 0 deletions demos/selectable.html
View file
Expand Up @@ -4,6 +4,7 @@
<script type='text/javascript' src='../src/_loader.js'></script>
<!--[[
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.print.css' media='print' />
<script type='text/javascript' src='../jquery/jquery.js'></script>
<script type='text/javascript' src='../jquery/jquery-ui.js'></script>
<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>
Expand Down
1 change: 1 addition & 0 deletions demos/theme.html
View file
Expand Up @@ -5,6 +5,7 @@
<script type='text/javascript' src='../src/_loader.js'></script>
<!--[[
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />
<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.print.css' media='print' />
<script type='text/javascript' src='../jquery/jquery.js'></script>
<script type='text/javascript' src='../jquery/jquery-ui.js'></script>
<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>
Expand Down
2 changes: 1 addition & 1 deletion src/Header.js
View file
Expand Up @@ -72,7 +72,7 @@ function Header(calendar, options) {
var text = smartProperty(options.buttonText, buttonName);
var button = $(
"<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default'>" +
"<span class='fc-inner'>" +
"<span class='fc-button-inner'>" +
"<span class='fc-button-content'>" +
(icon ?
"<span class='fc-icon-wrap'>" +
Expand Down
6 changes: 6 additions & 0 deletions src/_loader.js
View file
Expand Up @@ -19,6 +19,7 @@ css('main.css');
css('common/common.css');
css('basic/basic.css');
css('agenda/agenda.css');
cssprint('common/print.css');

if (!legacy) {
jslib('../lib/' + JQUERY);
Expand Down Expand Up @@ -119,6 +120,11 @@ function css(file) {
}


function cssprint(file) {
tags.push("<link rel='stylesheet' type='text/css' href='" + prefix + file + "' media='print' />");
}


function js(file) {
tags.push("<script type='text/javascript' src='" + prefix + file + "'></script>");
}
Expand Down
24 changes: 16 additions & 8 deletions src/agenda/AgendaEventRenderer.js
View file
Expand Up @@ -280,10 +280,18 @@ function AgendaEventRenderer() {

function slotSegHtml(event, seg, className) {
return "<div class='" + className + event.className.join(' ') + "' style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px'>" +
"<a" + (event.url ? " href='" + htmlEscape(event.url) + "'" : '') + ">" +
"<span class='fc-event-bg'></span>" +
"<span class='fc-event-time'>" + htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) + "</span>" +
"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
"<a class='fc-event-inner'" + (event.url ? " href='" + htmlEscape(event.url) + "'" : '') + ">" + // good for escaping quotes?
"<div class='fc-event-head'>" +
"<div class='fc-event-time'>" +
htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
"</div>" +
"</div>" +
"<div class='fc-event-content'>" +
"<div class='fc-event-title'>" +
htmlEscape(event.title) +
"</div>" +
"</div>" +
"<div class='fc-event-bg'></div>" +
"</a>" +
((event.editable || event.editable === undefined && opt('editable')) && !opt('disableResizing') && $.fn.resizable ?
"<div class='ui-resizable-handle ui-resizable-s'>=</div>"
Expand Down Expand Up @@ -434,7 +442,7 @@ function AgendaEventRenderer() {
trigger('eventDragStart', eventElement, event, ev, ui);
hideEvents(event, eventElement);
if ($.browser.msie) {
eventElement.find('span.fc-event-bg').hide(); // nested opacities mess up in IE, just hide
eventElement.find('div.fc-event-bg').hide(); // nested opacities mess up in IE, just hide
}
origPosition = eventElement.position();
minuteDelta = prevMinuteDelta = 0;
Expand Down Expand Up @@ -483,11 +491,11 @@ function AgendaEventRenderer() {
resetElement();
eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position
updateTimeText(0);
if ($.browser.msie) {
if ($.browser.msie) { // TODO: dont use browser detection. base off of the presence of filter
eventElement
.css('filter', '') // clear IE opacity side-effects
.find('span.fc-event-bg')
.css('display', ''); // .show() made display=inline
.find('div.fc-event-bg')
.show();
}
showEvents(event, eventElement);
}
Expand Down
2 changes: 1 addition & 1 deletion src/agenda/AgendaView.js
View file
Expand Up @@ -259,7 +259,7 @@ function AgendaView(element, calendar, viewName) {
}

slotScroller =
$("<div style='position:absolute;left:0;width:100%;overflow-x:hidden;overflow-y:auto'/>")
$("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>")
.appendTo(slotLayer);

slotContent =
Expand Down
72 changes: 20 additions & 52 deletions src/agenda/agenda.css
View file
Expand Up @@ -6,6 +6,10 @@
border-collapse: separate;
}

.fc-agenda-days th {
text-align: center;
}

.fc-agenda .fc-agenda-axis {
width: 50px;
padding: 0 4px;
Expand All @@ -19,12 +23,7 @@
padding: 2px 2px 1px;
}




.fc-agenda-days th {
text-align: center;
}
/* make axis border take precedence */

.fc-agenda-days .fc-agenda-axis {
border-right-width: 1px;
Expand All @@ -34,20 +33,18 @@
border-left-width: 0;
}



/* all-day area */

.fc-agenda-allday th {
border-width: 0 1px;
}

.fc-agenda-allday .fc-day-content {
min-height: 34px; /* TODO: doesnt work in quirksmode */
min-height: 34px; /* TODO: doesnt work well in quirksmode */
_height: 34px;
}



/* divider (between all-day and slots) */

.fc-agenda-divider-inner {
height: 2px;
Expand All @@ -58,9 +55,7 @@
background: #eee;
}




/* slot rows */

.fc-agenda-slots th {
border-width: 1px 1px 0;
Expand All @@ -86,10 +81,9 @@
}

.fc-agenda-slots tr.fc-minor th.ui-widget-header {
*border-top-style: solid;
*border-top-style: solid; /* doesn't work with background in IE6/7 */
}




/* Vertical Events
Expand All @@ -99,51 +93,25 @@
border-width: 0 1px;
}

.fc-event-vert a {
border-width: 0;
}

/* for fake rounded corners */

.fc-content .fc-corner-top {
margin-top: 1px;
}

.fc-content .fc-corner-top a {
margin-top: -1px;
border-top-width: 1px;
}

.fc-content .fc-corner-bottom {
margin-bottom: 1px;
}

.fc-content .fc-corner-bottom a {
margin-bottom: -1px;
border-bottom-width: 1px;
.fc-event-vert .fc-event-inner {
display: block; /* might be an <a> */
height: 100%;
}

/* event content */

.fc-event-vert span {
display: block;
.fc-event-vert .fc-event-head,
.fc-event-vert .fc-event-content {
position: relative;
z-index: 2;
width: 100%;
overflow: hidden;
}

.fc-event-vert span.fc-event-time {
.fc-event-vert .fc-event-time {
white-space: nowrap;
_white-space: normal;
overflow: hidden;
border: 0;
font-size: 10px;
}

.fc-event-vert span.fc-event-title {
line-height: 13px;
}

.fc-event-vert span.fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */
.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */
position: absolute;
z-index: 1;
top: 0;
Expand All @@ -152,7 +120,7 @@
height: 100%;
background: #fff;
opacity: .3;
filter: alpha(opacity=30); /* for IE */
filter: alpha(opacity=30);
}

/* resizable */
Expand Down
2 changes: 2 additions & 0 deletions src/basic/basic.css
View file
Expand Up @@ -39,3 +39,5 @@
.fc-rtl .fc-grid .fc-event-time {
float: right;
}


2 changes: 1 addition & 1 deletion src/common/DayEventRenderer.js
View file
Expand Up @@ -157,7 +157,7 @@ function DayEventRenderer() {
}
html +=
"<div class='" + className + event.className.join(' ') + "' style='position:absolute;z-index:8;left:"+left+"px'>" +
"<a" + (event.url ? " href='" + htmlEscape(event.url) + "'" : '') + ">" +
"<a class='fc-event-inner'" + (event.url ? " href='" + htmlEscape(event.url) + "'" : '') + ">" +
(!event.allDay && seg.isStart ?
"<span class='fc-event-time'>" +
htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
Expand Down

0 comments on commit f3fcd57

Please sign in to comment.