Skip to content

O
opening-hours
Commit 01bc7ab3 authored by Johannes Bill's avatar Johannes Bill
Browse files
Options

fixed style for columncount in weekview

parent 815c30ec
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
lib/dateView.js
View file @ 01bc7ab3
...@@ -44,7 +44,7 @@ function createWeekView(dataObj, now) { ...@@ -44,7 +44,7 @@ function createWeekView(dataObj, now) {
var hasMaybe = hoursMaybe(oHours); var hasMaybe = hoursMaybe(oHours);
var className = 'weekview'; var className = 'weekview';
var content = '<div class="weekview-container"><table class="weekview-table weekview-' + (tableWidth + 2) + 'col">'; var content = '<div class="weekview-container"><table class="weekview-table weekview-' + (tableWidth + 2 + hasMaybe ? 1 : 0) + 'col">';
content += '<tbody>'; content += '<tbody>';
for (var i = 0; i < noOfDays; i++) { for (var i = 0; i < noOfDays; i++) {
...@@ -108,7 +108,7 @@ function createWeekView(dataObj, now) { ...@@ -108,7 +108,7 @@ function createWeekView(dataObj, now) {
} }
content += ('<td class="' + className + '-td ' content += ('<td class="' + className + '-td '
+ className + '-maybe' + cls + '" '+ tooltip + '>' + displString + '</td>'); + className + '-maybe' + cls + '" ' + tooltip + '>' + displString + '</td>');
} }
else { else {
content += ('<td class="' + className + '-td ' + className + '-empty' + cls + '"></td>'); content += ('<td class="' + className + '-td ' + className + '-empty' + cls + '"></td>');
...@@ -214,10 +214,10 @@ function createWeekViewVerticalRaw(dataObj, now, className, offset, addDayOfWeek ...@@ -214,10 +214,10 @@ function createWeekViewVerticalRaw(dataObj, now, className, offset, addDayOfWeek
else { else {
displString = maybeString; displString = maybeString;
} }
if(!rowInfo[column.length]) rowInfo[column.length] = className + "-tr-maybe"; if (!rowInfo[column.length]) rowInfo[column.length] = className + "-tr-maybe";
column.push('<td class="' + className + '-td ' column.push('<td class="' + className + '-td '
+ className + '-maybe' + cls + '" '+ tooltip + '>' + displString + '</td>'); + className + '-maybe' + cls + '" ' + tooltip + '>' + displString + '</td>');
} }
else { else {
column.push('<td class="' + className + '-td ' + className + '-empty' + cls + '"></td>'); column.push('<td class="' + className + '-td ' + className + '-empty' + cls + '"></td>');
...@@ -249,7 +249,7 @@ function createTwoWeekViewVertical(dataObj, now) { ...@@ -249,7 +249,7 @@ function createTwoWeekViewVertical(dataObj, now) {
for (var j = 0; j < jLim; j++) { for (var j = 0; j < jLim; j++) {
var trClass = className + '-tr'; var trClass = className + '-tr';
if(rowInfo[j]) trClass += " " + rowInfo[j]; if (rowInfo[j]) trClass += " " + rowInfo[j];
content += '<tr class="' + trClass + '">'; content += '<tr class="' + trClass + '">';
for (var i = 0; i < iLim; i++) { for (var i = 0; i < iLim; i++) {
content += matrix[i][j]; content += matrix[i][j];
...@@ -276,7 +276,7 @@ function createWeekViewVertical(dataObj, now) { ...@@ -276,7 +276,7 @@ function createWeekViewVertical(dataObj, now) {
for (var j = 0; j < jLim; j++) { for (var j = 0; j < jLim; j++) {
var trClass = className + "-tr"; var trClass = className + "-tr";
if(rowInfo[j]) trClass += " " + rowInfo[j]; if (rowInfo[j]) trClass += " " + rowInfo[j];
content += '<tr class="' + trClass + '">'; content += '<tr class="' + trClass + '">';
for (var i = 0; i < iLim; i++) { for (var i = 0; i < iLim; i++) {
content += matrix[i][j]; content += matrix[i][j];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment