13 files changed, 171 insertions, 115 deletions

diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
index a3fc8afbb75..d3a00bf1728 100755
--- a/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@ -19,13 +19,8 @@
  *************************************************/
 require_once ("../../../lib/base.php");
 if(!OC_USER::isLoggedIn()) {
-	die("0");
+	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
 }
 $currentview = $_GET["v"];
 OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", $currentview);
-if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "currentview") == $currentview){
-	die("1");
-}else{
-	die("0");
-}
 ?>
\ No newline at end of file
diff --git a/apps/calendar/ajax/getcal.php b/apps/calendar/ajax/getcal.php
index 9d28caeb3df..06ebebc83a0 100755
--- a/apps/calendar/ajax/getcal.php
+++ b/apps/calendar/ajax/getcal.php
@@ -19,9 +19,6 @@
  *************************************************/
 require_once ("../../lib/base.php");
 if(!OC_USER::isLoggedIn()) {
-	header("Location: " . OC_HELPER::linkTo("", "index.php"));
-	exit ;
+	die("<script type=\"text/javascript\">document.location = oc_webroot;</script>");
 }
-require_once ("../lib/calendar.php");
-$calendar = new OC_Calendar_Calendar;
 ?>
\ No newline at end of file
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 8cf92baf30a..e989266d401 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -1,5 +1,5 @@
 <?php
-
+$l=new OC_L10N('calendar');
 OC::$CLASSPATH['OC_Calendat_Calendar'] = 'apps/calendar/lib/calendar.php';
 OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
 OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
@@ -15,4 +15,4 @@ OC_App::addNavigationEntry( array(
   'order' => 10,
   'href' => OC_Helper::linkTo( 'calendar', 'index.php' ),
   'icon' => OC_Helper::imagePath( 'calendar', 'icon.png' ),
-  'name' => 'Calendar' ));
+  'name' => $l->t('Calendar')));
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 0d59586a396..a4bae178884 100755
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -45,11 +45,11 @@
 .controls {min-width: 800px;}
 .center {text-align: center;}
 .dateinfo {height: 15px; width: 100%; overflow: hidden; margin: 0; padding: 0; font-size: 12px;background: #F7F7F7;}
-.events {height: 65px; width: 100%; margin: 0; padding: 0;}
+.events {height: 80px; width: 100%; margin: 0; padding: 0;}
 .calendar_row {height: 20px; text-align: center;background: #ffffff;}
 .calendar_time {height: 20px; width: 50px; text-align:right;background: #ffffff;}
 .fourweeksview_item {text-align: center; background: #ffffff;width: 14%;}
-.onemonthview_item {text-align: center; height: 80px; margin: 0; padding: 0;height: 100px; vertical-align: top; background: #ffffff; width: 14%; height: 16%;}
-.weekend{text-align: center;margin: 0;	padding: 0;	vertical-align: top;background: #F3F3F3;}
+.onemonthview_item {text-align: center; height: 80px; margin: 0; padding: 0; vertical-align: top; background: #ffffff; width: 14%; height: 16%;}
+.weekend{text-align: center;margin: 0;	padding: 0;vertical-align: top;background: #F3F3F3; height: 80px;width: 100%; }
 .weekend_thead, .weekend_row{height: 20px;text-align: center;text-align: center;background: #F3F3F3;}
 .thisday{background: #FFFABC;text-align: center;}
\ No newline at end of file
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 535035ba5b6..067d5f53081 100755
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -493,7 +493,7 @@ function oc_cal_load_cal(loadview) {
 		document.getElementById('onedayview_today').title = generate_title;
 	}
 	if(loadview == "oneweek") {
-		document.getElementById("datecontrol_date").value = "CW: " + oc_cal_calw();
+		document.getElementById("datecontrol_date").value = cw_label + ": " + oc_cal_calw();
 		var dates = oc_cal_generate_dates("oneweek");
 		var weekdays = new Array("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday");
 		var weekday = 1;
@@ -569,7 +569,7 @@ function oc_cal_load_cal(loadview) {
 		document.getElementById("fourweeksview_calw2").innerHTML = calw2;
 		document.getElementById("fourweeksview_calw3").innerHTML = calw3;
 		document.getElementById("fourweeksview_calw4").innerHTML = calw4;
-		document.getElementById("datecontrol_date").value = "CWs: " + oc_cal_calw() + " - " + calwplusfour;
+		document.getElementById("datecontrol_date").value = cws_label + ": " + oc_cal_calw() + " - " + calwplusfour;
 	}
 	if(loadview == "onemonth") {
 		document.getElementById("datecontrol_date").value = oc_cal_monthlong[oc_cal_month] + oc_cal_space + oc_cal_year;
diff --git a/apps/calendar/js/calendar_dialog.js b/apps/calendar/js/calendar_dialog.js
deleted file mode 100755
index 5995a378994..00000000000
--- a/apps/calendar/js/calendar_dialog.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************
- * ownCloud - Calendar Plugin                     *
- *                                                *
- * (c) Copyright 2011 Georg Ehrke                 *
- * author: Georg Ehrke                            *
- * email: ownclouddev at georgswebsite dot de     *
- * homepage: ownclouddev.georgswebsite.de         *
- * manual: ownclouddev.georgswebsite.de/manual    *
- * License: GNU AFFERO GENERAL PUBLIC LICENSE     *
- *                                                *
- * <http://www.gnu.org/licenses/>                 *
- * If you are not able to view the License,       *
- * <http://www.gnu.org/licenses/>                 *
- * <http://ownclouddev.georgswebsite.de/license/> *
- * please write to the Free Software Foundation.  *
- * Address:                                       *
- * 59 Temple Place, Suite 330, Boston,            *
- * MA 02111-1307  USA                             *
- **************************************************
- *               list of all fx                   *
- * choosecalendar_dialog - calendar chooser       *
- * newevent_dialog - create event dialog          *
- * editevent_dialog - edit event dialog           *
- * choosecalendar_dialog_submit - submit          *
- * newevent_dialog_submit - submit                *
- * editevent_dialog_submit - submit               *
- *************************************************/
-function oc_cal_choosecalendar_dialog_submit() {
-
-}
-
-function oc_cal_newevent_dialog_submit() {
-
-}
-
-function oc_cal_editevent_dialog_submit() {
-
-}
\ No newline at end of file
diff --git a/apps/calendar/js/calendar_init.js b/apps/calendar/js/calendar_init.js
index c2f13dbfcff..e8f52313297 100755
--- a/apps/calendar/js/calendar_init.js
+++ b/apps/calendar/js/calendar_init.js
@@ -34,10 +34,6 @@ var oc_cal_dayofweek = oc_cal_date.getDay();
 var oc_cal_month = oc_cal_date.getMonth();
 var oc_cal_dayofmonth = oc_cal_date.getDate();
 var oc_cal_year = oc_cal_date.getFullYear();
-var oc_cal_daylong = new Array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday");
-var oc_cal_dayshort = new Array("Sun.", "Mon.", "Tue.", "Wed.", "Thu.", "Fri.", "Sat.");
-var oc_cal_monthlong = new Array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December");
-var oc_cal_monthshort = new Array("Jan.", "Feb.", "Mar.", "Apr.", "May", "Jun.", "Jul.", "Aug.", "Sep.", "Oct.", "Nov.", "Dec.");
 var oc_cal_space = " ";
 var oc_cal_normal_cal = new Array("31","28", "31", "30", "31", "30", "31", "31", "30", "31", "30", "31");
 var oc_cal_leap_cal = new Array("31","29", "31", "30", "31", "30", "31", "31", "30", "31", "30", "31");
diff --git a/apps/calendar/known bugs b/apps/calendar/known bugs
new file mode 100644
index 00000000000..e944720666b
--- /dev/null
+++ b/apps/calendar/known bugs
@@ -0,0 +1 @@
+can't load new event form on allday event, when this is the first new event dialog on this site - will be fixed in next version - js/php fail
\ No newline at end of file
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
new file mode 100644
index 00000000000..82d9f86073a
--- /dev/null
+++ b/apps/calendar/l10n/de.php
@@ -0,0 +1,68 @@
+<?php $TRANSLATIONS = array(
+"Calendar" => "Kalender",
+"Location" => "Ort",
+"Category" => "Kategorie",
+"Create a new event" => "Neuen Termin erstellen",
+"Title of the Event" => "Titel des Termins",
+"Location of the Event" => "Ort des Termins",
+"All Day Event" => "Ganztägig",
+"From" => "Von",
+"To" => "Bis",
+"Repeat" => "Wiederhol.",
+"Attendees" => "Teilnehmer",
+"Description" => "Beschreibung",
+"Submit" => "Speichern",
+"Reset" => "Zurücksetzen",
+"Title" => "Titel",
+"Sunday" => "Sonntag",
+"Monday" => "Montag",
+"Tuesday" => "Dienstag",
+"Wednesday" =>  "Mittwoch",
+"Thursday" =>  "Donnerstag",
+"Friday" =>  "Freitag",
+"Saturday" =>  "Samstag",
+"CW" => "KW",
+"CWs" => "KW",
+"Sun." => "So.",
+"Mon." => "Mo.",
+"Tue." => "Di.",
+"Wed." => "Mi.",
+"Thu." => "Do.",
+"Fri." => "Fr.",
+"Sat." => "Sa.",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "März",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "März",
+"Apr." => "Apr.",
+"May" => "Mai",
+"Jun." => "Juni",
+"Jul." => "Juli",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dez.",
+"Day" => "Tag",
+"Week" => "Woche",
+"Weeks" => "Wochen",
+"Month" => "Monat",
+"Listview" => "Liste",
+"Today" => "Heute",
+"Calendars" => "Kalender",
+"Time" => "Uhrzeit",
+"All day" => "Ganztägig",
+"" => ""
+);
+?>
\ No newline at end of file
diff --git a/apps/calendar/l10n/xgettextfiles b/apps/calendar/l10n/xgettextfiles
new file mode 100644
index 00000000000..37f68b82062
--- /dev/null
+++ b/apps/calendar/l10n/xgettextfiles
@@ -0,0 +1,7 @@
+../appinfo/app.php
+../templates/calendar.php
+../templates/part.editevent.php
+../templates/part.eventinfo.php
+../templates/part.newevent.php
+../js/calendar.js
+../js/calendar_init.js
\ No newline at end of file
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 3178b6c85a6..0cfbea29e55 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -1,3 +1,18 @@
+				<script type="text/javascript">
+				var oc_cal_daylong = new Array("<?php echo $l -> t("Sunday");?>", "<?php echo $l -> t("Monday");?>", "<?php echo $l -> t("Tuesday");?>", "<?php echo $l -> t("Wednesday");?>", "<?php echo $l -> t("Thursday");?>", "<?php echo $l -> t("Friday");?>", "<?php echo $l -> t("Saturday");?>");
+				var oc_cal_dayshort = new Array("<?php echo $l -> t("Sun.");?>", "<?php echo $l -> t("Mon.");?>", "<?php echo $l -> t("Tue.");?>", "<?php echo $l -> t("Wed.");?>", "<?php echo $l -> t("Thu.");?>", "<?php echo $l -> t("Fri.");?>", "<?php echo $l -> t("Sat.");?>");
+				var oc_cal_monthlong = new Array("<?php echo $l -> t("January");?>", "<?php echo $l -> t("February");?>", "<?php echo $l -> t("March");?>", "<?php echo $l -> t("April");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("June");?>", "<?php echo $l -> t("July");?>", "<?php echo $l -> t("August");?>", "<?php echo $l -> t("September");?>", "<?php echo $l -> t("October");?>", "<?php echo $l -> t("November");?>", "<?php echo $l -> t("December");?>");
+				var oc_cal_monthshort = new Array("<?php echo $l -> t("Jan.");?>", "<?php echo $l -> t("Feb.");?>", "<?php echo $l -> t("Mar.");?>", "<?php echo $l -> t("Apr.");?>", "<?php echo $l -> t("May");?>", "<?php echo $l -> t("Jun.");?>", "<?php echo $l -> t("Jul.");?>", "<?php echo $l -> t("Aug.");?>", "<?php echo $l -> t("Sep.");?>", "<?php echo $l -> t("Oct.");?>", "<?php echo $l -> t("Nov.");?>", "<?php echo $l -> t("Dec.");?>");
+				var onedayview_radio = "1 <?php echo $l->t("Day");?>";
+				var oneweekview_radio = "1 <?php echo $l->t("Week");?>";
+				var fourweeksview_radio = "4 <?php echo $l->t("Weeks");?>";
+				var onemonthview_radio = "1 <?php echo $l->t("Month");?>";
+				var listview_radio = "<?php echo $l->t("Listview");?>";
+				var today_button_value = "<?php echo $l->t("Today");?>";
+				var choosecalendar_value = "<?php echo $l->t("Calendars");?>";
+				var cw_label = "<?php echo $l->t("CW");?>";
+				var cws_label = "<?php echo $l->t("CWs");?>";
+				</script>
 				<div id="sysbox"></div>
 				<div id="controls">
 					<div>
@@ -12,11 +27,8 @@
 						</form>
 						<form>
 							<div id="choosecalendar">
-								<input class="button" type="submit" id="today_input" value="Today" onclick="oc_cal_switch2today();"/>
-								<select id="calendar_select" multiple="multiple"> 
-									<option selected="selected">Calendar 1</option>
-									<option disabled="disabled">Calender 2</option>
-								</select>
+								<input type="button" id="today_input" value="Today" onclick="oc_cal_switch2today();"/>
+								<input type="button" id="choosecalendar_input" value="Calendars" onclick="" />
 							</div>
 						</form>
 						<form>
@@ -33,13 +45,13 @@
 						<table>
 							<thead>
 								<tr>
-									<th class="calendar_time">Time</th>
+									<th class="calendar_time"><?php echo $l->t("Time");?></th>
 									<th id="onedayview_today" class="calendar_row" onclick="oc_cal_newevent(document.getElementById('onedayview_today').title);"></th>
 								</tr>
 							</thead>
 							<tbody>
 								<tr>
-									<td class="calendar_time">All day</td>
+									<td class="calendar_time"><?php echo $l->t("All day");?></td>
 									<td id="onedayview_wholeday" class="calendar_row" onclick="oc_cal_newevent(document.getElementById('onedayview_today').title, 'allday');"></td>
 								</tr>
 								<tr>
@@ -145,7 +157,7 @@
 						<table>
 							<thead>
 								<tr>
-									<th class="calendar_time">Time</th>
+									<th class="calendar_time"><?php echo $l->t("Time");?></th>
 									<th id="oneweekview_monday" class="calendar_row" onclick="oc_cal_newevent(document.getElementById('oneweekview_monday').title);"></th>
 									<th id="oneweekview_tuesday" class="calendar_row" onclick="oc_cal_newevent(document.getElementById('oneweekview_tuesday').title);"></th>
 									<th id="oneweekview_wednesday" class="calendar_row" onclick="oc_cal_newevent(document.getElementById('oneweekview_wednesday').title);"></th>
@@ -157,7 +169,7 @@
 							</thead>
 							<tbody>
 								<tr>
-									<td class="calendar_time">All day</td>
+									<td class="calendar_time"><?php echo $l->t("All day");?></td>
 									<td id="oneweekview_monday_allday" class="calendar_row" onclick="oc_cal_newevent(document.getElementById('oneweekview_monday').title, 'allday');"></td>
 									<td id="oneweekview_tuesday_allday" class="calendar_row" onclick="oc_cal_newevent(document.getElementById('oneweekview_tuesday').title, 'allday');"></td>
 									<td id="oneweekview_wednesday_allday" class="calendar_row" onclick="oc_cal_newevent(document.getElementById('oneweekview_wednesday').title, 'allday');"></td>
@@ -413,14 +425,14 @@
 						<table>
 							<thead>
 								<tr>
-									<th id="fourweeksview_calw_label" class="calendar_row">CW</th>
-									<th id="fourweeksview_monday" class="calendar_row">Monday</th>
-									<th id="fourweeksview_tuesday" class="calendar_row">Tuesday</th>
-									<th id="fourweeksview_wednesday" class="calendar_row">Wednesday</th>
-									<th id="fourweeksview_thursday" class="calendar_row">Thursday</th>
-									<th id="fourweeksview_friday" class="calendar_row">Friday</th>
-									<th id="fourweeksview_saturday" class="weekend_thead">Saturday</th>
-									<th id="fourweeksview_sunday" class="weekend_thead">Sunday</th>
+									<th id="fourweeksview_calw_label" class="calendar_row"><?php echo $l -> t("CW");?></th>
+									<th id="fourweeksview_monday" class="calendar_row"><?php echo $l -> t("Monday");?></th>
+									<th id="fourweeksview_tuesday" class="calendar_row"><?php echo $l -> t("Tuesday");?></th>
+									<th id="fourweeksview_wednesday" class="calendar_row"><?php echo $l -> t("Wednesday");?></th>
+									<th id="fourweeksview_thursday" class="calendar_row"><?php echo $l -> t("Thursday");?></th>
+									<th id="fourweeksview_friday" class="calendar_row"><?php echo $l -> t("Friday");?></th>
+									<th id="fourweeksview_saturday" class="weekend_thead"><?php echo $l -> t("Saturday");?></th>
+									<th id="fourweeksview_sunday" class="weekend_thead"><?php echo $l -> t("Sunday");?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -456,16 +468,16 @@
 									<div class="events" id="events_fourweeksview_friday_1" onclick="oc_cal_newevent(document.getElementById('fourweeksview_friday_1').title)">
 									</div>
 									</td>
-									<td id="fourweeksview_saturday_1" class="weekend">
+									<td id="fourweeksview_saturday_1" class="fourweeksview_item">
 									<div class="dateinfo" id="dateinfo_fourweeksview_saturday_1">
 									</div>
-									<div class="events" id="events_fourweeksview_saturday_1" onclick="oc_cal_newevent(document.getElementById('fourweeksview_saturday_1').title)">
+									<div class="weekend" id="events_fourweeksview_saturday_1" onclick="oc_cal_newevent(document.getElementById('fourweeksview_saturday_1').title)">
 									</div>
 									</td>
-									<td id="fourweeksview_sunday_1" class="weekend">
+									<td id="fourweeksview_sunday_1" class="fourweeksview_item">
 									<div class="dateinfo" id="dateinfo_fourweeksview_sunday_1">
 									</div>
-									<div class="events" id="events_fourweeksview_sunday_1" onclick="oc_cal_newevent(document.getElementById('fourweeksview_sunday_1').title)">
+									<div class="weekend" id="events_fourweeksview_sunday_1" onclick="oc_cal_newevent(document.getElementById('fourweeksview_sunday_1').title)">
 									</div>
 									</td>
 								</tr>
@@ -501,16 +513,16 @@
 									<div class="events" id="events_fourweeksview_friday_2" onclick="oc_cal_newevent(document.getElementById('fourweeksview_friday_2').title)">
 									</div>
 									</td>
-									<td id="fourweeksview_saturday_2" class="weekend">
+									<td id="fourweeksview_saturday_2" class="fourweeksview_item">
 									<div class="dateinfo" id="dateinfo_fourweeksview_saturday_2">
 									</div>
-									<div class="events" id="events_fourweeksview_saturday_2" onclick="oc_cal_newevent(document.getElementById('fourweeksview_saturday_2').title)">
+									<div class="weekend" id="events_fourweeksview_saturday_2" onclick="oc_cal_newevent(document.getElementById('fourweeksview_saturday_2').title)">
 									</div>
 									</td>
-									<td id="fourweeksview_sunday_2" class="weekend">
+									<td id="fourweeksview_sunday_2" class="fourweeksview_item">
 									<div class="dateinfo" id="dateinfo_fourweeksview_sunday_2">
 									</div>
-									<div class="events" id="events_fourweeksview_sunday_2" onclick="oc_cal_newevent(document.getElementById('fourweeksview_sunday_2').title)">
+									<div class="weekend" id="events_fourweeksview_sunday_2" onclick="oc_cal_newevent(document.getElementById('fourweeksview_sunday_2').title)">
 									</div>
 									</td>
 								</tr>
@@ -546,16 +558,16 @@
 									<div class="events" id="events_fourweeksview_friday_3" onclick="oc_cal_newevent(document.getElementById('fourweeksview_friday_3').title)">
 									</div>
 									</td>
-									<td id="fourweeksview_saturday_3" class="weekend">
+									<td id="fourweeksview_saturday_3" class="fourweeksview_item">
 									<div class="dateinfo" id="dateinfo_fourweeksview_saturday_3">
 									</div>
-									<div class="events" id="events_fourweeksview_saturday_3" onclick="oc_cal_newevent(document.getElementById('fourweeksview_saturday_3').title)">
+									<div class="weekend" id="events_fourweeksview_saturday_3" onclick="oc_cal_newevent(document.getElementById('fourweeksview_saturday_3').title)">
 									</div>
 									</td>
-									<td id="fourweeksview_sunday_3" class="weekend">
+									<td id="fourweeksview_sunday_3" class="fourweeksview_item">
 									<div class="dateinfo" id="dateinfo_fourweeksview_sunday_3">
 									</div>
-									<div class="events" id="events_fourweeksview_sunday_3" onclick="oc_cal_newevent(document.getElementById('fourweeksview_sunday_3').title)">
+									<div class="weekend" id="events_fourweeksview_sunday_3" onclick="oc_cal_newevent(document.getElementById('fourweeksview_sunday_3').title)">
 									</div>
 									</td>
 								</tr>
@@ -591,16 +603,16 @@
 									<div class="events" id="events_fourweeksview_friday_4" onclick="oc_cal_newevent(document.getElementById('fourweeksview_friday_4').title)">
 									</div>
 									</td>
-									<td id="fourweeksview_saturday_4" class="weekend">
+									<td id="fourweeksview_saturday_4" class="fourweeksview_item">
 									<div class="dateinfo" id="dateinfo_fourweeksview_saturday_4">
 									</div>
-									<div class="events" id="events_fourweeksview_saturday_4" onclick="oc_cal_newevent(document.getElementById('fourweeksview_saturday_4').title)">
+									<div class="weekend" id="events_fourweeksview_saturday_4" onclick="oc_cal_newevent(document.getElementById('fourweeksview_saturday_4').title)">
 									</div>
 									</td>
-									<td id="fourweeksview_sunday_4" class="weekend">
+									<td id="fourweeksview_sunday_4" class="fourweeksview_item">
 									<div class="dateinfo" id="dateinfo_fourweeksview_sunday_4">
 									</div>
-									<div class="events" id="events_fourweeksview_sunday_4"  onclick="oc_cal_newevent(document.getElementById('fourweeksview_sunday_4').title)">
+									<div class="weekend" id="events_fourweeksview_sunday_4"  onclick="oc_cal_newevent(document.getElementById('fourweeksview_sunday_4').title)">
 									</div>
 									</td>
 								</tr>
@@ -611,13 +623,13 @@
 						<table>
 							<thead>
 								<tr>
-									<th id="onemonthview_monday" class="calendar_row">Monday</th>
-									<th id="onemonthview_tuesday" class="calendar_row">Tuesday</th>
-									<th id="onemonthview_wednesday" class="calendar_row">Wednesday</th>
-									<th id="onemonthview_thursday" class="calendar_row">Thursday</th>
-									<th id="onemonthview_friday" class="calendar_row">Friday</th>
-									<th id="onemonthview_saturday" class="weekend_thead">Saturday</th>
-									<th id="onemonthview_sunday" class="weekend_thead">Sunday</th>
+									<th id="onemonthview_monday" class="calendar_row"><?php echo $l -> t("Monday");?></th>
+									<th id="onemonthview_tuesday" class="calendar_row"><?php echo $l -> t("Tuesday");?></th>
+									<th id="onemonthview_wednesday" class="calendar_row"><?php echo $l -> t("Wednesday");?></th>
+									<th id="onemonthview_thursday" class="calendar_row"><?php echo $l -> t("Thursday");?></th>
+									<th id="onemonthview_friday" class="calendar_row"><?php echo $l -> t("Friday");?></th>
+									<th id="onemonthview_saturday" class="weekend_thead"><?php echo $l -> t("Saturday");?></th>
+									<th id="onemonthview_sunday" class="weekend_thead"><?php echo $l -> t("Sunday");?></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -655,13 +667,13 @@
 									<td id="onemonthview_saturday_1" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_saturday_1">
 									</div>
-									<div class="events" id="events_onemonthview_saturday_1" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_1').title)">
+									<div class="weekend" id="events_onemonthview_saturday_1" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_1').title)">
 									</div>
 									</td>
 									<td id="onemonthview_sunday_1" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_sunday_1">
 									</div>
-									<div class="events" id="events_onemonthview_sunday_1" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_1').title)">
+									<div class="weekend" id="events_onemonthview_sunday_1" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_1').title)">
 									</div>
 									</td>
 								</tr>
@@ -699,13 +711,13 @@
 									<td id="onemonthview_saturday_2" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_saturday_2">
 									</div>
-									<div class="events" id="events_onemonthview_saturday_2" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_2').title)">
+									<div class="weekend" id="events_onemonthview_saturday_2" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_2').title)">
 									</div>
 									</td>
 									<td id="onemonthview_sunday_2" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_sunday_2">
 									</div>
-									<div class="events" id="events_onemonthview_sunday_2" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_2').title)">
+									<div class="weekend" id="events_onemonthview_sunday_2" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_2').title)">
 									</div>
 									</td>
 								</tr>
@@ -743,13 +755,13 @@
 									<td id="onemonthview_saturday_3" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_saturday_3">
 									</div>
-									<div class="events" id="events_onemonthview_saturday_3" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_3').title)">
+									<div class="weekend" id="events_onemonthview_saturday_3" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_3').title)">
 									</div>
 									</td>
 									<td id="onemonthview_sunday_3" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_sunday_3">
 									</div>
-									<div class="events" id="events_onemonthview_sunday_3" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_3').title)">
+									<div class="weekend" id="events_onemonthview_sunday_3" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_3').title)">
 									</div>
 									</td>
 								</tr>
@@ -787,13 +799,13 @@
 									<td id="onemonthview_saturday_4" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_saturday_4">
 									</div>
-									<div class="events" id="events_onemonthview_saturday_4" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_4').title)">
+									<div class="weekend" id="events_onemonthview_saturday_4" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_4').title)">
 									</div>
 									</td>
 									<td id="onemonthview_sunday_4" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_sunday_4">
 									</div>
-									<div class="events" id="events_onemonthview_sunday_4"  onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_4').title)">
+									<div class="weekend" id="events_onemonthview_sunday_4"  onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_4').title)">
 									</div>
 									</td>
 								</tr>
@@ -831,13 +843,13 @@
 									<td id="onemonthview_saturday_5" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_saturday_5">
 									</div>
-									<div class="events" id="events_onemonthview_saturday_5" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_5').title)">
+									<div class="weekend" id="events_onemonthview_saturday_5" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_5').title)">
 									</div>
 									</td>
 									<td id="onemonthview_sunday_5" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_sunday_5">
 									</div>
-									<div class="events" id="events_onemonthview_sunday_5" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_5').title)">
+									<div class="weekend" id="events_onemonthview_sunday_5" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_5').title)">
 									</div>
 									</td>
 								</tr>
@@ -875,13 +887,13 @@
 									<td id="onemonthview_saturday_6" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_saturday_6">
 									</div>
-									<div class="events" id="events_onemonthview_saturday_6" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_6').title)">
+									<div class="weekend" id="events_onemonthview_saturday_6" onclick="oc_cal_newevent(document.getElementById('onemonthview_saturday_6').title)">
 									</div>
 									</td>
 									<td id="onemonthview_sunday_6" class="weekend">
 									<div class="dateinfo" id="dateinfo_onemonthview_sunday_6">
 									</div>
-									<div class="events" id="events_onemonthview_sunday_6" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_6').title)">
+									<div class="weekend" id="events_onemonthview_sunday_6" onclick="oc_cal_newevent(document.getElementById('onemonthview_sunday_6').title)">
 									</div>
 									</td>
 								</tr>
@@ -919,5 +931,13 @@
 					document.getElementById(oc_cal_currentview + "_radio").style.color = "#0098E4";
 					oc_cal_update_view(view, task);
 				}
+				document.getElementById("onedayview_radio").value = onedayview_radio;
+				document.getElementById("oneweekview_radio").value = oneweekview_radio;
+				document.getElementById("fourweeksview_radio").value = fourweeksview_radio;
+				document.getElementById("onemonthview_radio").value = onemonthview_radio;
+				document.getElementById("listview_radio").value = listview_radio;
+				document.getElementById("today_input").value = today_button_value;
+				document.getElementById("choosecalendar_input").value = choosecalendar_value;
+				document.getElementById("download_input").src = oc_webroot + "/core/img/actions/download.svg";
 				</script>
 				<script type="text/javascript" id="js_events"></script>
diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php
index ae46cb4ffd9..179903170d1 100644
--- a/apps/calendar/templates/part.editevent.php
+++ b/apps/calendar/templates/part.editevent.php
@@ -95,7 +95,12 @@
 		</tr>
 	</table>
 	<span id="editevent_actions">
+<<<<<<< HEAD
+		<input type="button" style="float: left;" value="<?php echo $l -> t("Submit");?>">
+		<input type="button" style="float: right;" value="<?php echo $l -> t("Reset");?>">
+=======
 		<input type="button" value="<?php echo $l -> t('Submit');?>">
+>>>>>>> b3f6eb22249408e927c8c83e66d60d2aba52ccaf
 	</span>
 </div>
 <script type="text/javascript">
@@ -130,4 +135,8 @@
 			document.getElementById("totime").style.color = "#A9A9A9";
 		}
 	}
+<<<<<<< HEAD
 </script>
+=======
+</script>
+>>>>>>> b3f6eb22249408e927c8c83e66d60d2aba52ccaf
diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php
index 3327ec91df7..3f8e8ff653e 100644
--- a/apps/calendar/templates/part.newevent.php
+++ b/apps/calendar/templates/part.newevent.php
@@ -3,13 +3,13 @@
 		<tr>
 			<td width="75px"><?php echo $l -> t("Title");?>:</td>
 			<td>
-			<input type="text" style="width:350px;" size="100" placeholder="Title of the Event"  maxlength="100" />
+			<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l -> t("Title of the Event");?>"  maxlength="100" />
 			</td>
 		</tr>
 		<tr>
 			<td width="75px"><?php echo $l -> t("Location");?>:</td>
 			<td>
-			<input type="text" style="width:350px;" size="100" placeholder="Location of the Event"  maxlength="100" />
+			<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l -> t("Location of the Event");?>"  maxlength="100" />
 			</td>
 		</tr>
 	</table>
@@ -111,7 +111,8 @@
 		</tr>
 	</table>
 	<span id="newcalendar_actions">
-		<input type="button" value="<?php echo $l -> t('Submit');?>">
+		<input type="button" style="float: left;" value="<?php echo $l -> t("Submit");?>">
+		<input type="button" style="float: right;" value="<?php echo $l -> t("Reset");?>">
 	</span>
 </div>
 <script type="text/javascript">
@@ -145,4 +146,4 @@
 			document.getElementById("totime").style.color = "#A9A9A9";
 		}
 	}
-</script>
+</script>
\ No newline at end of file