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

Separate some theme classes from the generic widget classes

Joan Karadimov пре 8 година
родитељ
комит
67b4707fbe
5 измењених фајлова са 24 додато и 8 уклоњено
  1. 1 1
      src/common/DayGrid.js
  2. 3 3
      src/common/DayGrid.limit.js
  3. 1 1
      src/common/DayTableMixin.js
  4. 18 2
      src/common/Theme.js
  5. 1 1
      src/list/ListView.js

+ 1 - 1
src/common/DayGrid.js

@@ -77,7 +77,7 @@ var DayGrid = FC.DayGrid = Grid.extend(DayTableMixin, {
 	// `row` is the row number.
 	renderDayRowHtml: function(row, isRigid) {
 		var view = this.view;
-		var classes = [ 'fc-row', 'fc-week', view.calendar.theme.getClass('widgetContent') ];
+		var classes = [ 'fc-row', 'fc-week', view.calendar.theme.getClass('tableContent') ];
 
 		if (isRigid) {
 			classes.push('fc-rigid');

+ 3 - 3
src/common/DayGrid.limit.js

@@ -239,7 +239,7 @@ DayGrid.mixin({
 		}
 
 		options = {
-			className: 'fc-more-popover',
+			className: 'fc-more-popover ' + this.view.calendar.theme.getClass('popover'),
 			content: this.renderSegPopoverContent(row, col, segs),
 			parentEl: this.view.el, // attach to root of view. guarantees outside of scrollbars.
 			top: topEl.offset().top,
@@ -285,7 +285,7 @@ DayGrid.mixin({
 		var isTheme = view.opt('theme');
 		var title = this.getCellDate(row, col).format(view.opt('dayPopoverFormat'));
 		var content = $(
-			'<div class="fc-header ' + view.calendar.theme.getClass('widgetHeader') + '">' +
+			'<div class="fc-header ' + view.calendar.theme.getClass('popoverHeader') + '">' +
 				'<span class="fc-close ' +
 					(isTheme ? 'ui-icon ui-icon-closethick' : 'fc-icon fc-icon-x') +
 				'"></span>' +
@@ -294,7 +294,7 @@ DayGrid.mixin({
 				'</span>' +
 				'<div class="fc-clear"/>' +
 			'</div>' +
-			'<div class="fc-body ' + view.calendar.theme.getClass('widgetContent') + '">' +
+			'<div class="fc-body ' + view.calendar.theme.getClass('popoverContent') + '">' +
 				'<div class="fc-event-container"></div>' +
 			'</div>'
 		);

+ 1 - 1
src/common/DayTableMixin.js

@@ -252,7 +252,7 @@ var DayTableMixin = FC.DayTableMixin = {
 		var view = this.view;
 
 		return '' +
-			'<div class="fc-row ' + view.calendar.theme.getClass('widgetHeader') + '">' +
+			'<div class="fc-row ' + view.calendar.theme.getClass('tableHeader') + '">' +
 				'<table class="' + this.view.calendar.theme.getClass('tableGrid') + '">' +
 					'<thead>' +
 						this.renderHeadTrHtml() +

+ 18 - 2
src/common/Theme.js

@@ -1,7 +1,10 @@
 var themes = {
 	builtin: {
+		listContent: 'fc-widget-content',
 		widgetHeader: 'fc-widget-header',
 		widgetContent: 'fc-widget-content',
+		popoverHeader: 'fc-widget-header',
+		popoverContent: 'fc-widget-content',
 		stateHighlight: 'fc-state-highlight',
 		stateDefault: 'fc-state-default',
 		stateActive: 'fc-state-active',
@@ -11,11 +14,16 @@ var themes = {
 		button: 'fc-button',
 		cornerLeft: 'fc-corner-left',
 		cornerRight: 'fc-corner-right',
-		buttonGroup: 'fc-button-group'
+		buttonGroup: 'fc-button-group',
+		tableHeader: 'fc-widget-header',
+		tableContent: 'fc-widget-content'
 	},
 	jQueryUI: {
+		listContent: 'ui-widget-content',
 		widgetHeader: 'ui-widget-header',
 		widgetContent: 'ui-widget-content',
+		popoverHeader: 'ui-widget-header',
+		popoverContent: 'ui-widget-content',
 		stateHighlight: 'ui-state-highlight',
 		stateDefault: 'ui-state-default',
 		stateActive: 'ui-state-active',
@@ -25,13 +33,21 @@ var themes = {
 		button: 'ui-button',
 		cornerLeft: 'ui-corner-left',
 		cornerRight: 'ui-corner-right',
-		buttonGroup: 'fc-button-group'
+		buttonGroup: 'fc-button-group',
+		tableHeader: 'ui-widget-header',
+		tableContent: 'ui-widget-content'
 	},
 	bootstrap3: {
+		listContent: 'panel-default',
+		popover: 'panel panel-default',
+		popoverHeader: 'panel-heading',
+		popoverContent: 'panel-body',
 		stateActive: 'active',
 		stateDisabled: 'disabled',
 		button: 'btn btn-default',
 		buttonGroup: 'btn-group',
+		tableHeader: 'panel-default',
+		tableContent: 'panel-default',
 		tableGrid: 'table-bordered',
 		tableList: 'table'
 	}

+ 1 - 1
src/list/ListView.js

@@ -18,7 +18,7 @@ var ListView = View.extend({
 	renderSkeleton: function() {
 		this.el.addClass(
 			'fc-list-view ' +
-			this.calendar.theme.getClass('widgetContent')
+			this.calendar.theme.getClass('listContent')
 		);
 
 		this.scroller.render();