summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien MUETTON <the.mouette@gmail.com>2010-06-24 18:46:32 +0200
committerJulien MUETTON <the.mouette@gmail.com>2010-06-24 18:46:32 +0200
commit9debd666aabed6a20a9cec7237224d8c46eff68c (patch)
tree2b9a33422c05c04fca17e8bd35210597dd526436
parent6d61f428f2b1f3a33eaf826596ea0e09eecf2097 (diff)
parentdf245a0fa5365f0aaefd3cee534d4abc5a6aaa8c (diff)
downloadjquery-week-calendar-9debd666aabed6a20a9cec7237224d8c46eff68c.zip
jquery-week-calendar-9debd666aabed6a20a9cec7237224d8c46eff68c.tar.gz
jquery-week-calendar-9debd666aabed6a20a9cec7237224d8c46eff68c.tar.bz2
Merge branch 'master' into gh-pages
Diffstat
-rw-r--r--full_demo/demo.css9
-rw-r--r--full_demo/weekcalendar_full_demo.html10
-rw-r--r--jquery.weekcalendar.css2
-rw-r--r--jquery.weekcalendar.js8
-rw-r--r--skins/default.css17
-rw-r--r--skins/gcalendar.css19
-rw-r--r--weekcalendar.html4
-rw-r--r--weekcalendar_demo_2.html6
-rw-r--r--weekcalendar_demo_3.html1
9 files changed, 46 insertions, 30 deletions
diff --git a/full_demo/demo.css b/full_demo/demo.css
index e8912ac..1aadea8 100644
--- a/full_demo/demo.css
+++ b/full_demo/demo.css
@@ -27,12 +27,12 @@ p {
#about_button_container {
position: absolute;
- top: 1em;
- right: 1em;
+ top: 0em;
+ right: 0em;
padding: 0.5em 2em;
background: #ddf;
border: 1px solid #bbd;
- width: 10em;
+ width: 25em;
text-align: center;
}
@@ -75,4 +75,5 @@ ul.formatted li {
ol.formatted li {
list-style-type: decimal;
-} \ No newline at end of file
+}
+#switcher{float:left;}
diff --git a/full_demo/weekcalendar_full_demo.html b/full_demo/weekcalendar_full_demo.html
index 61af81b..04df807 100644
--- a/full_demo/weekcalendar_full_demo.html
+++ b/full_demo/weekcalendar_full_demo.html
@@ -12,6 +12,9 @@
<link rel='stylesheet' type='text/css' href='../jquery.weekcalendar.css' />
<link rel='stylesheet' type='text/css' href='demo.css' />
+ <link type="text/css" rel="stylesheet" href="http://jqueryui.com/themes/base/ui.all.css" />
+
+ <link rel='stylesheet' type='text/css' href='../skins/default.css' />
<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js'></script>
@@ -20,6 +23,12 @@
-->
<script type='text/javascript' src='../libs/jquery-ui-1.8.min.js'></script>
+ <script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
+ <script>
+ $(document).ready(function(){
+ $('#switcher').themeswitcher();
+ });
+ </script>
<script type="text/javascript" src="../libs/date.js"></script>
<script type='text/javascript' src='../jquery.weekcalendar.js'></script>
<script type='text/javascript' src='demo.js'></script>
@@ -28,6 +37,7 @@
<body>
<h1>jQuery Week Calendar (full demo)</h1>
<div id="about_button_container">
+ <div id="switcher"></div>
<button type="button" id="about_button">About this demo</button>
</div>
<div id='calendar'></div>
diff --git a/jquery.weekcalendar.css b/jquery.weekcalendar.css
index 1afcb90..2a43485 100644
--- a/jquery.weekcalendar.css
+++ b/jquery.weekcalendar.css
@@ -82,6 +82,7 @@ table.wc-time-slots {
width: 100%;
table-layout: fixed;
cursor: default;
+ overflow:hidden;
}
.wc-day-column {
@@ -149,6 +150,7 @@ table.wc-time-slots {
.wc-hour-header {
text-align: right;
+ border-top:none !important;
}
.wc-hour-end, .wc-hour-header {
diff --git a/jquery.weekcalendar.js b/jquery.weekcalendar.js
index 76a3bea..3d808ac 100644
--- a/jquery.weekcalendar.js
+++ b/jquery.weekcalendar.js
@@ -576,7 +576,7 @@
var self = this;
var options = this.options;
- $calendarContainer = $("<div class=\"wc-container\">").appendTo(self.element);
+ $calendarContainer = $("<div class=\"ui-widget wc-container\">").appendTo(self.element);
//render the different parts
// nav links
@@ -604,7 +604,7 @@
var self = this, options = this.options;
if (options.buttons) {
var calendarNavHtml = "\
- <div class=\"wc-toolbar\">\
+ <div class=\"ui-widget-header wc-toolbar\">\
<div class=\"wc-display\">\
</div>\
<div class=\"wc-nav\">\
@@ -686,7 +686,7 @@
}
//first row
- calendarHeaderHtml = "<div class=\"wc-header\">";
+ calendarHeaderHtml = "<div class=\"ui-widget-content wc-header\">";
calendarHeaderHtml+= "<table><tbody><tr><td class=\"wc-time-column-header\"></td>";
for (var i = 1; i <= options.daysToShow; i++) {
calendarHeaderHtml += "<td class=\"wc-day-column-header wc-day-" + i + "\""+colspan+"></td>";
@@ -915,7 +915,7 @@
renderRow = "<tr class=\"wc-grid-row-events\">";
renderRow+= "<td class=\"wc-grid-timeslot-header\">"
for (var i = start; i < end; i++){
- var bhClass = (options.businessHours.start <= i && options.businessHours.end > i) ? "wc-business-hours" : "";
+ var bhClass = (options.businessHours.start <= i && options.businessHours.end > i) ? "ui-state-active wc-business-hours" : "ui-state-default";
renderRow+= "<div class=\"wc-hour-header " + bhClass + "\">";
if (options.use24Hour){
renderRow+= "<div class=\"wc-time-header-cell\">" + self._24HourForIndex(i) + "</div>";
diff --git a/skins/default.css b/skins/default.css
index a8b62af..6a3dcab 100644
--- a/skins/default.css
+++ b/skins/default.css
@@ -10,21 +10,4 @@
.wc-am-pm,
.wc-business-hours .wc-am-pm {font-size:1em;}
-/* colors */
-.wc-container{border-left:5px solid #BBCCFF;}
-.wc-toolbar{background-color:#BBCCFF;}
-.wc-header{background-color:#E3E9FF;border:none;}
-.wc-header{border-bottom:2px solid #BBCCFF;}
-.wc-hour-end, .wc-hour-header{color:#666666;border-color:#ccc}
-.wc-grid-timeslot-header,
-.wc-business-hours{background-color:#F6F9FC;}
-/*calendar*/
-.wc-day-column-first,
-.wc-day-column-last,
-.wc-day-column-middle,
-.wc-time-slot{border-color: #ccc;}
-.wc-header .wc-day-column-header.wc-today{background-color:#FAD163;border-right:3px solid #FAD163;border-left:3px solid #FAD163;}
-.wc-header .wc-today.wc-user-header{font-weight:normal;}
-.wc-today.wc-day-column-last{border-right:3px double #FAD163;}
-.wc-today.wc-day-column-first{border-left:3px double #FAD163;}
diff --git a/skins/gcalendar.css b/skins/gcalendar.css
new file mode 100644
index 0000000..281de38
--- /dev/null
+++ b/skins/gcalendar.css
@@ -0,0 +1,19 @@
+/* colors */
+.wc-container{border-left:5px solid #BBCCFF;}
+.wc-toolbar{background:#BBCCFF;border:none;}
+.wc-header{background:#E3E9FF;border:none;}
+.wc-header{border-bottom:2px solid #BBCCFF;}
+.wc-hour-end, .wc-hour-header{color:#666666;border-color:#ccc}
+.wc-hour-header,
+.wc-grid-timeslot-header,
+.wc-business-hours{background:#F6F9FC;}
+/*calendar*/
+.wc-day-column-first,
+.wc-day-column-last,
+.wc-day-column-middle,
+.wc-time-slot{border-color: #ccc;}
+.wc-header .wc-day-column-header.wc-today{background-color:#FAD163;border-right:3px solid #FAD163;border-left:3px solid #FAD163;}
+.wc-header .wc-today.wc-user-header{font-weight:normal;}
+.wc-today.wc-day-column-last{border-right:3px double #FAD163;}
+.wc-today.wc-day-column-first{border-left:3px double #FAD163;}
+
diff --git a/weekcalendar.html b/weekcalendar.html
index 4d61e53..21b9558 100644
--- a/weekcalendar.html
+++ b/weekcalendar.html
@@ -9,7 +9,7 @@
}
h1 {
- margin: 0;
+ margin: 0 0 1em;
padding: 0.5em;
}
@@ -78,7 +78,7 @@
$('#calendar').weekCalendar({
timeslotsPerHour: 4,
height: function($calendar){
- return $(window).height() - $("h1").outerHeight();
+ return $(window).height() - $("h1").outerHeight(true);
},
eventRender : function(calEvent, $event) {
if(calEvent.end.getTime() < new Date().getTime()) {
diff --git a/weekcalendar_demo_2.html b/weekcalendar_demo_2.html
index 6be6b7e..64eb12f 100644
--- a/weekcalendar_demo_2.html
+++ b/weekcalendar_demo_2.html
@@ -9,7 +9,7 @@
}
h1 {
- margin: 0;
+ margin:0 0 2em;
padding: 0.5em;
font-size: 1.3em;
}
@@ -51,11 +51,11 @@
<link rel='stylesheet' type='text/css' href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/start/jquery-ui.css' />
-->
- <link rel='stylesheet' type='text/css' href='../libs/css/smoothness/jquery-ui-1.8.css' />
+ <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/smoothness/jquery-ui.css" />
<link rel='stylesheet' type='text/css' href='jquery.weekcalendar.css' />
- <link rel='stylesheet' type='text/css' href='demo.css' />
+ <link rel='stylesheet' type='text/css' href='skins/default.css' />
<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js'></script>
diff --git a/weekcalendar_demo_3.html b/weekcalendar_demo_3.html
index 941c338..fe99b25 100644
--- a/weekcalendar_demo_3.html
+++ b/weekcalendar_demo_3.html
@@ -7,6 +7,7 @@
<link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/smoothness/jquery-ui.css" />
<link rel="stylesheet" type="text/css" href="jquery.weekcalendar.css" />
<link rel="stylesheet" type="text/css" href="skins/default.css" />
+ <link rel="stylesheet" type="text/css" href="skins/gcalendar.css" />
<style type="text/css">
body {
font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
generated by cgit v1.1 at 2025-05-11 23:38:54 +0000