2009-09-16 06:17:37 +00:00 · 2009-09-16 06:17:37 +00:00 · 111c11d91c
parent e3850a2e3e
commit 111c11d91c
5 changed files with 163 additions and 73 deletions
--- a/35
+++ b/35
@ -1,6 +1,5 @@

 VER = `cat version.txt`
-VVER = `cat ../version.txt`
 DATE = `svn info | grep Date: | sed 's/.*: //g'`
 REV = `svn info | grep Rev: | sed 's/.*: //g'`

@ -23,34 +22,34 @@ OTHER_FILES =\
 zip:
 	@rm -rf build/fullcalendar
 	@rm -rf build/fullcalendar-*
-	@mkdir -p build/fullcalendar/uncompressed
+	@mkdir -p build/fullcalendar
 	
 	@echo "building js & css..."
-	@cd src; cat misc/head.txt ${JS_SRC_FILES} misc/foot.txt > ../build/fullcalendar/uncompressed/fullcalendar.js
+	@cd src; cat misc/head.txt ${JS_SRC_FILES} misc/foot.txt > ../build/fullcalendar/fullcalendar.js
 	@cd src/css; cat ${CSS_SRC_FILES} > ../../build/fullcalendar/fullcalendar.css
+	@for f in build/fullcalendar/*; do\
+		sed -i "s/* FullCalendar/& v${VER}/" $$f;\
+		sed -i "s/* Date:/& ${DATE}/" $$f;\
+		sed -i "s/* Revision:/& ${REV}/" $$f;\
+		done
 	@cp -rt build/fullcalendar ${OTHER_FILES}
-	@rm -rf `find build/fullcalendar -type d -name .svn`
+	@find build/fullcalendar -type d -name .svn | xargs rm -rf
 	
-	#@for f in build/fullcalendar/*.js; do\
-	#	sed -i "s/* FullCalendar/& v${VER}/" $$f;\
-	#	sed -i "s/* Date:/& ${DATE}/" $$f;\
-	#	sed -i "s/* Revision:/& ${REV}/" $$f;\
-	#	done
+	@echo "compressing js..."
+	@java -jar build/yuicompressor-2.4.2.jar -o build/fullcalendar/fullcalendar.min.js build/fullcalendar/fullcalendar.js
 	
 	@echo "building examples..."
-	@cd build/fullcalendar/examples;\
-	for f in *.html; do\
-		sed -i -n '1h;1!H;$${;g;s/<!--\s*<src>.*<\/src>-->\s*//g;p;}' $$f;\
-		sed -i -n '1h;1!H;$${;g;s/<!--<dist>\s*//g;p;}' $$f;\
-		sed -i -n '1h;1!H;$${;g;s/\s*<\/dist>-->//g;p;}' $$f;\
+	@for f in build/fullcalendar/examples/*.html; do\
+		sed -i -n '1h;1!H;$${;g;s/<!--\s*<src>.*<\/src>\s*-->\s*//g;p;}' $$f;\
+		sed -i -n '1h;1!H;$${;g;s/<!--\s*<dist>\s*//g;p;}' $$f;\
+		sed -i -n '1h;1!H;$${;g;s/<\/dist>\s*-->\s*//g;p;}' $$f;\
 	done
 	
-	@echo "compressing..."
-	@java -jar build/yuicompressor-2.4.2.jar -o build/fullcalendar/fullcalendar.js build/fullcalendar/uncompressed/fullcalendar.js
-	
 	@echo "zipping..."
 	@mv build/fullcalendar build/fullcalendar-${VER}
-	@cd build; zip -q -r fullcalendar-${VVER}.zip fullcalendar-${VVER}
+	@cd build; for f in fullcalendar-*; do\
+		zip -q -r $$f.zip $$f;\
+		done
 	@mv build/fullcalendar-${VER} build/fullcalendar
 	
 	@mkdir -p dist
--- a/changelog.txt
+++ b/changelog.txt
@ -4,63 +4,56 @@ version 1.3 (9/15/09)
 	- more flexible 'header' system for buttons
 	- themable by jQuery UI themes
 	- resizable events (require jQuery UI resizable plugin)
-	- reworked options/API to support idea of multiple views / be consistent with jQuery UI datepicker
-	- refactoring of entire codebase for future of development
-		- broken into different JS files, assembled w/ build scripts
+	- rescoped & rewritten CSS, enhanced default look
+	- reworked options & API to support multiple views / be consistent with jQuery UI datepicker
+	- refactoring of entire codebase
+		- broken into different JS & CSS files, assembled w/ build scripts
 		- new test suite for new features, uses firebug-lite
+	- refactored docs
 	- Options
-		- added:
-			date
-			defaultView
-			aspectRatio
-			disableResizing
-			monthNames (use instead of $.fullCalendar.monthNames)
-			monthNamesShort (use instead of $.fullCalendar.monthAbbrevs)
-			dayNames (use instead of $.fullCalendar.dayNames)
-			dayNamesShort (use instead of $.fullCalendar.dayAbbrevs)
-			theme
-			buttonText
-			buttonIcons
-		- superseded:
-			editable/disableDragging <- draggable
-			weekMode <- fixedWeeks
-			columnFormat <- abbrevDayHeadings
-			header <- buttons/title 
-			dragOpacity <- eventDragOpacity
-			dragRevertDuration <- eventRevertDuration
-			firstDay <- weekStart
-			isRTL <- rightToLeft
-		- removed:
-			showTime (use 'allDay' CalEvent property instead)
+		+ date
+		+ defaultView
+		+ aspectRatio
+		+ disableResizing
+		+ monthNames      (use instead of $.fullCalendar.monthNames)
+		+ monthNamesShort (use instead of $.fullCalendar.monthAbbrevs)
+		+ dayNames        (use instead of $.fullCalendar.dayNames)
+		+ dayNamesShort   (use instead of $.fullCalendar.dayAbbrevs)
+		+ theme
+		+ buttonText
+		+ buttonIcons
+		x draggable           -> editable/disableDragging
+		x fixedWeeks          -> weekMode
+		x abbrevDayHeadings   -> columnFormat
+		x buttons/title       -> header
+		x eventDragOpacity    -> dragOpacity
+		x eventRevertDuration -> dragRevertDuration
+		x weekStart           -> firstDay
+		x rightToLeft         -> isRTL
+		x showTime (use 'allDay' CalEvent property instead)
 	- Triggered Actions
-		- added:
-			eventResizeStart
-			eventResizeStop
-			eventResize
-		- superseded:
-			viewDisplay <- monthDisplay
-			windowResize <- resize
+		+ eventResizeStart
+		+ eventResizeStop
+		+ eventResize
+		x monthDisplay -> viewDisplay
+		x resize       -> windowResize
 	- CalEvent Properties
-		- superseded:
-			allDay <- showTime
-			editable <- draggable
-		- 'end' is now INCLUSIVE when allDay=true
+		x showTime  -> allDay
+		x draggable -> editable
+		'end' is now INCLUSIVE when allDay=true
 	- Methods:
-		- added:
-			renderEvent
-		- superseded:
-			prev <- prevMonth
-			next <- nextMonth
-			moveDate <- prevYear/nextYear
-			rerenderEvents/refetchEvents <- refresh
-			removeEvents <- removeEvent
-			clientEvents <- getEventsByID
+		+ renderEvent
+		x prevMonth         -> prev
+		x nextMonth         -> next
+		x prevYear/nextYear -> moveDate
+		x refresh           -> rerenderEvents/refetchEvents
+		x removeEvent       -> removeEvents
+		x getEventsByID     -> clientEvents
 	- Utilities:
-		- 'formatDate' format string completely changed (inspired by jqueryui datepicker + datejs)
-		- 'formatDates' added to support date-ranges
-	- gcalFeed Options:
-		- superseded:
-			draggable <- editable
+		'formatDate' format string completely changed (inspired by jQuery UI datepicker + datejs)
+		'formatDates' added to support date-ranges
+	- Google Calendar Options:
+		x draggable -> editable

 version 1.2.1 (6/29/09)
 	- bugfixes
--- a/docs/index.txt
+++ b/docs/index.txt
@ -141,9 +141,9 @@ Time & Date Formatting
 Available Views
 ===============

-**month** - `see example <http://google.com/>`_
+**month** - `see example <../../media/fullcalendar-views/month.html>`_

-**basicWeek** - `see example <http://google.com/>`_
+**basicWeek** - `see example <../../media/fullcalendar-views/basicWeek.html>`_

-**basicDay** - `see example <http://google.com/>`_
+**basicDay** - `see example <../../media/fullcalendar-views/basicDay.html>`_
 	
--- a/examples/theme.html
+++ b/examples/theme.html
@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<link rel='stylesheet' type='text/css' href='redmond/theme.css' />
+<!--<src>-->
+<link rel='stylesheet' type='text/css' href='../src/css/main.css' />
+<link rel='stylesheet' type='text/css' href='../src/css/grid.css' />
+<link rel='stylesheet' type='text/css' href='../src/css/agenda.css' />
+<script type='text/javascript' src='../src/jquery/jquery.js'></script>
+<script type='text/javascript' src='../src/jquery/ui.core.js'></script>
+<script type='text/javascript' src='../src/jquery/ui.draggable.js'></script>
+<script type='text/javascript' src='../src/jquery/ui.resizable.js'></script>
+<script type='text/javascript' src='../src/main.js'></script>
+<script type='text/javascript' src='../src/grid.js'></script>
+<script type='text/javascript' src='../src/view.js'></script>
+<script type='text/javascript' src='../src/util.js'></script>
+<!--</src>-->
+<!--
+<dist>
+<link rel='stylesheet' type='text/css' href='../fullcalendar.css' />
+<script type='text/javascript' src='../jquery/jquery.js'></script>
+<script type='text/javascript' src='../jquery/ui.core.js'></script>
+<script type='text/javascript' src='../jquery/ui.draggable.js'></script>
+<script type='text/javascript' src='../jquery/ui.resizable.js'></script>
+<script type='text/javascript' src='../fullcalendar.js'></script>
+</dist>
+-->
+<script type='text/javascript'>
+
+	$(document).ready(function() {
+	
+		var d = new Date();
+		var y = d.getFullYear();
+		var m = d.getMonth();
+		
+		$('#calendar').fullCalendar({
+			theme: true,
+			editable: true,
+			events: [
+				{
+					id: 1,
+					title: "Long Event",
+					start: new Date(y, m, 6, 14, 0),
+					end: new Date(y, m, 11),
+					allDay: false
+				},
+				{
+					id: 2,
+					title: "Repeating Event",
+					start: new Date(y, m, 2),
+					allDay: true
+				},
+				{
+					id: 2,
+					title: "Repeating Event",
+					start: new Date(y, m, 9),
+					allDay: true
+				},
+				{
+					id: 3,
+					title: "Meeting",
+					start: new Date(y, m, 20, 9, 0),
+					allDay: false
+				},
+				{
+					id: 4,
+					title: "Click for Facebook",
+					start: new Date(y, m, 27, 16),
+					end: new Date(y, m, 29),
+					url: "http://facebook.com/",
+					allDay: false
+				}
+			]
+		});
+		
+	});
+
+</script>
+<style type='text/css'>
+
+	body {
+		margin-top: 40px;
+		text-align: center;
+		font-size: 14px;
+		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
+		}
+
+	#calendar {
+		width: 900px;
+		margin: 0 auto;
+		}
+
+</style>
+</head>
+<body>
+<div id='calendar'></div>
+</body>
+</html>
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-1.3
+1.3
 @ -1 +1 @@
 .3
 .3