Преглед изворни кода

adjustments to jqui theme classes on cells

Adam Shaw пре 11 година
родитељ
комит
5bdecb0cf0
6 измењених фајлова са 46 додато и 44 уклоњено
  1. 8 4
      src/agenda/AgendaView.js
  2. 0 32
      src/basic/basic.css
  3. 1 5
      src/common/DayGrid.js
  4. 1 1
      src/common/TimeGrid.js
  5. 0 2
      src/common/View.js
  6. 36 0
      src/common/common.css

+ 8 - 4
src/agenda/AgendaView.js

@@ -100,8 +100,6 @@ $.extend(AgendaView.prototype, {
 			.appendTo(this.timeGrid.el); // inject it into the time-grid
 
 		if (this.dayGrid) {
-			this.dayRowThemeClass = this.widgetHeaderClass; // forces this class on each day-row
-
 			this.dayGrid.el = this.el.find('.fc-day-grid');
 			this.dayGrid.render();
 
@@ -141,7 +139,7 @@ $.extend(AgendaView.prototype, {
 				'</thead>' +
 				'<tbody>' +
 					'<tr>' +
-						'<td class="' + this.widgetHeaderClass + '">' +
+						'<td class="' + this.widgetContentClass + '">' +
 							(this.dayGrid ?
 								'<div class="fc-day-grid"/>' +
 								'<hr class="' + this.widgetHeaderClass + '"/>' :
@@ -194,7 +192,7 @@ $.extend(AgendaView.prototype, {
 	// Queried by the DayGrid subcomponent when generating rows. Ordering depends on isRTL.
 	dayIntroHtml: function() {
 		return '' +
-			'<td class="' + this.widgetHeaderClass + ' fc-axis" ' + this.axisStyleAttr() + '>' +
+			'<td class="fc-axis ' + this.widgetContentClass + '" ' + this.axisStyleAttr() + '>' +
 				'<span>' + // needed for matchCellWidths
 					(this.opt('allDayHtml') || htmlEscape(this.opt('allDayText'))) +
 				'</span>' +
@@ -202,6 +200,12 @@ $.extend(AgendaView.prototype, {
 	},
 
 
+	// Generates the HTML that goes before the bg of the TimeGrid slot area. Long vertical column.
+	slotBgIntroHtml: function() {
+		return '<td class="fc-axis ' + this.widgetContentClass + '" ' + this.axisStyleAttr() + '></td>';
+	},
+
+
 	// Generates the HTML that goes before all other types of cells.
 	// Affects content-skeleton, helper-skeleton, highlight-skeleton for both the time-grid and day-grid.
 	// Queried by the TimeGrid and DayGrid subcomponents when generating rows. Ordering depends on isRTL.

+ 0 - 32
src/basic/basic.css

@@ -65,35 +65,3 @@
 	   might want to set the 'color' property instead
 	   making day-numbers bold also fixes the problem */
 }
-
-/* "more" link that represents hidden events */
-
-a.fc-more {
-	margin: 1px 2px;
-	font-size: .85em;
-	cursor: pointer;
-	text-decoration: none;
-}
-
-a.fc-more:hover {
-	text-decoration: underline;
-}
-
-.fc-limited { /* rows and cells that are hidden because of a "more" link */
-	display: none;
-}
-
-/* popover that appears when "more" link is clicked */
-
-.fc-day-grid .fc-row {
-	z-index: 1; /* make the "more" popover one higher than this */
-}
-
-.fc-more-popover {
-	z-index: 2;
-	width: 220px;
-}
-
-.fc-more-popover .fc-event-container {
-	padding: 10px;
-}

+ 1 - 5
src/common/DayGrid.js

@@ -54,16 +54,12 @@ $.extend(DayGrid.prototype, {
 	// Generates the HTML for a single row. `row` is the row number.
 	dayRowHtml: function(row, isRigid) {
 		var view = this.view;
-		var classes = [ 'fc-row', 'fc-week' ];
+		var classes = [ 'fc-row', 'fc-week', view.widgetContentClass ];
 
 		if (isRigid) {
 			classes.push('fc-rigid');
 		}
 
-		if (view.dayRowThemeClass) { // provides the view a hook to inject a theme className
-			classes.push(view.dayRowThemeClass);
-		}
-
 		return '' +
 			'<div class="' + classes.join(' ') + '">' +
 				'<div class="fc-bg">' +

+ 1 - 1
src/common/TimeGrid.js

@@ -82,7 +82,7 @@ $.extend(TimeGrid.prototype, {
 			minutes = slotDate.minutes();
 
 			axisHtml =
-				'<td class="fc-axis fc-time ' + view.widgetHeaderClass + '" ' + view.axisStyleAttr() + '>' +
+				'<td class="fc-axis fc-time ' + view.widgetContentClass + '" ' + view.axisStyleAttr() + '>' +
 					((!slotNormal || !minutes) ? // if irregular slot duration, or on the hour, then display the time
 						'<span>' + // for matchCellWidths
 							htmlEscape(calendar.formatDate(slotDate, view.opt('axisFormat'))) +

+ 0 - 2
src/common/View.js

@@ -30,8 +30,6 @@ View.prototype = {
 	widgetContentClass: null,
 	highlightStateClass: null,
 
-	dayRowThemeClass: null, // sets the theme className applied to DayGrid rows (none by default)
-
 	// document handlers, bound to `this` object
 	documentMousedownProxy: null,
 	documentDragStartProxy: null,

+ 36 - 0
src/common/common.css

@@ -508,3 +508,39 @@ tr:first-child > td > .fc-day-grid-event {
 	left: -3px;
 	cursor: w-resize;
 }
+
+
+/* Event Limiting
+--------------------------------------------------------------------------------------------------*/
+
+/* "more" link that represents hidden events */
+
+a.fc-more {
+	margin: 1px 2px;
+	font-size: .85em;
+	cursor: pointer;
+	text-decoration: none;
+}
+
+a.fc-more:hover {
+	text-decoration: underline;
+}
+
+.fc-limited { /* rows and cells that are hidden because of a "more" link */
+	display: none;
+}
+
+/* popover that appears when "more" link is clicked */
+
+.fc-day-grid .fc-row {
+	z-index: 1; /* make the "more" popover one higher than this */
+}
+
+.fc-more-popover {
+	z-index: 2;
+	width: 220px;
+}
+
+.fc-more-popover .fc-event-container {
+	padding: 10px;
+}