Merge branch 'master' of gitorious.org:owncloud/owncloud

15 files changed, 60 insertions, 16 deletions

diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index 7a4c6f469e5..7099ea718e9 100644
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -29,6 +29,9 @@ if($starttime != 'undefined' && !is_nan($starttime) && !$allday){
 	$startminutes = '00';
 }else{
 	$starttime = date('H');
+	if(strlen($starttime) == 2 && $starttime <= 9){
+		$starttime = substr($starttime, 1, 1);
+	}
 	$startminutes = date('i');
 }
 
@@ -38,7 +41,18 @@ $endyear     = $startyear;
 $endtime     = $starttime;
 $endminutes  = $startminutes;
 if($endtime == 23) {
-	$endday++;
+	if($startday == date(t, mktime($starttime, $startminutes, 0, $startmonth, $startday, $startyear))){
+		$datetimestamp = mktime(0, 0, 0, $startmonth, $startday, $startyear);
+		$datetimestamp = $datetimestamp + 86400;
+		$endmonth = date("m", $datetimestamp);
+		$endday = date("d", $datetimestamp);
+		$endyear = date("Y", $datetimestamp);
+	}else{
+		$endday++;
+		if($endday <= 9){
+			$endday = "0" . $endday;
+		}
+	}
 	$endtime = 0;
 } else {
 	$endtime++;
diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml
index c846fc1eebc..6b1ecd2337f 100644
--- a/apps/calendar/appinfo/info.xml
+++ b/apps/calendar/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<author>Georg Ehrke (Userinterface), Jakob Sack</author>
 	<require>2</require>
 	<description>Calendar with CalDAV support</description>
+	<default_enable/>
 </info>
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index f8d1c8e650e..1b345452912 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -352,6 +352,10 @@ Calendar={
 					}
 				},"json");
 		},
+		showadvancedoptions:function(){
+			$("#advanced_options").css("display", "block");
+			$("#advanced_options_button").css("display", "none");
+		},
 		createEventPopup:function(e){
 			var popup = $(this).data('popup');
 			if (!popup){
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
index 5bb072cc23b..4c34b3e1fcc 100644
--- a/apps/calendar/templates/part.eventform.php
+++ b/apps/calendar/templates/part.eventform.php
@@ -5,12 +5,6 @@
 			<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
 			</td>
 		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("Location");?>:</th>
-			<td>
-			<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
-			</td>
-		</tr>
 	</table>
 	<table>
 		<tr>
@@ -60,7 +54,12 @@
 			&nbsp;&nbsp;
 			<input type="time" value="<?php echo $_['endtime'];?>" name="totime" id="totime">
 			</td><!--use jquery-->
-		</tr><!--
+		</tr>
+	</table>
+	<input type="button" class="submit" value="<?php echo $l->t("Advanced options"); ?>" onclick="Calendar.UI.showadvancedoptions();" id="advanced_options_button">
+	<div id="advanced_options" style="display: none;">
+	<!--
+	<table>
 		<tr>
 			<th width="75px"><?php echo $l->t("Repeat");?>:</th>
 			<td>
@@ -85,7 +84,16 @@
 	<hr>-->
 	<table>
 		<tr>
-			<th width="75px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
+			<th width="85px"><?php echo $l->t("Location");?>:</th>
+			<td>
+			<input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
+			</td>
+		</tr>
+	</table>
+	<table>
+		<tr>
+			<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
 			<td><textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? $_['description'] : '' ?></textarea></td>
 		</tr>
 	</table>
+	</div>
diff --git a/apps/contacts/appinfo/info.xml b/apps/contacts/appinfo/info.xml
index 77c9dc91bfc..d18a19c3aea 100644
--- a/apps/contacts/appinfo/info.xml
+++ b/apps/contacts/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<author>Jakob Sack</author>
 	<require>2</require>
 	<description>Address book with CardDAV support.</description>
+	<default_enable/>
 </info>
diff --git a/apps/files_imageviewer/appinfo/info.xml b/apps/files_imageviewer/appinfo/info.xml
index f3b5a67960e..00b55c254dd 100644
--- a/apps/files_imageviewer/appinfo/info.xml
+++ b/apps/files_imageviewer/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>2</require>
-</info>
\ No newline at end of file
+	<default_enable/>
+</info>
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 2fbb3300f69..abf847b4483 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<licence>AGPL</licence>
 	<author>Michael Gapczynski</author>
 	<require>2</require>
-</info>
\ No newline at end of file
+	<default_enable/>
+</info>
diff --git a/apps/files_textviewer/appinfo/info.xml b/apps/files_textviewer/appinfo/info.xml
index 209b4140346..becfd5e35c8 100644
--- a/apps/files_textviewer/appinfo/info.xml
+++ b/apps/files_textviewer/appinfo/info.xml
@@ -6,4 +6,5 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>2</require>
+	<default_enable/>
 </info>
diff --git a/apps/media/appinfo/info.xml b/apps/media/appinfo/info.xml
index 044abade53f..795c9a4dd71 100644
--- a/apps/media/appinfo/info.xml
+++ b/apps/media/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>2</require>
-</info>
\ No newline at end of file
+	<default_enable/>
+</info>
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index ddfe3429830..c4db4e05855 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -9,8 +9,9 @@ div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:
 div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; }
 div.jp-play-bar { background:#ccc; width:0; height:100%; }
 div.jp-seeking-bg { background:url("../img/pbar-ani.gif"); }
-div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:1em; left:13.5em; }
-div.jp-duration { left:33em; }
+div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:0.9em; left:13.5em; }
+div.jp-duration { display: none }
+div.jp-current-song { left: 33em; position: absolute; top: 0.9em; }
 div.jp-duration { text-align:right; }
 
 a.jp-mute,a.jp-unmute { left:24em; }
@@ -21,9 +22,11 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 #collection li.album,#collection li.song { margin-left:3em; }
 #leftcontent img.remove { display:none; float:right; cursor:pointer; }
 #leftcontent li:hover img.remove { display:inline; }
+#leftcontent li {white-space: normal; }
 #collection li button { float:right; }
 #collection li,#playlist li { list-style-type:none; }
 .template { display:none; }
+.collection_playing { background:#eee; }
 
 #collection li { padding-right:10px; }
 #searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; }
@@ -34,6 +37,7 @@ tr td { border-top:1px solid #eee; height:2.2em; }
 tr .artist img { vertical-align:middle; }
 tr.album td.artist { padding-left:1em; }
 tr.song td.artist { padding-left:2em; }
+.add {margin: 0 0.5em 0 0; }
 
 #scan { position:absolute; right:13em; top:0em; }
 #scan .start { position:relative; display:inline; float:right; }
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index c04c579d1ca..cac16ac6ff7 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -15,7 +15,7 @@ $(document).ready(function(){
 			PlayList.play(oldSize);
 			PlayList.render();
 		});
-		var button=$('<input type="button" title="'+t('media','Add to playlist')+'" class="add"></input>');
+		var button=$('<input type="button" title="'+t('media','Add album to playlist')+'" class="add"></input>');
 		button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
 		button.click(function(event){
 			event.stopPropagation();
@@ -24,6 +24,7 @@ $(document).ready(function(){
 		});
 		row.find('div.name').append(button);
 	}
+        $('.add').tipsy({gravity:'n', fade:true, delayIn: 400, live:true});
 	Collection.display();
 });
 
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index f696b87bbde..693bf2d70bf 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -39,6 +39,7 @@ var PlayList={
 					PlayList.init(items[index].type,null); // init calls load that calls play
 				}else{
 					PlayList.player.jPlayer("setMedia", items[PlayList.current]);
+                                        $(".jp-current-song").text(items[PlayList.current].name);
 					items[index].playcount++;
 					PlayList.player.jPlayer("play",time);
 					if(index>0){
@@ -67,6 +68,8 @@ var PlayList={
 				PlayList.init(items[index].type,null); // init calls load that calls play
 			}
 		}
+                $(".song").removeClass("collection_playing");
+                $(".jp-playlist-" + index).addClass("collection_playing");
 	},
 	init:function(type,ready){
 		if(!PlayList.player){
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
index cb7f24522a4..c6dc3db2dd4 100644
--- a/apps/media/js/playlist.js
+++ b/apps/media/js/playlist.js
@@ -5,6 +5,7 @@ PlayList.render=function(){
 		var item=PlayList.items[i];
 		var li=$('<li/>');
 		li.append(item.name);
+                li.attr('class', 'jp-playlist-' + i);
 		var img=$('<img class="remove svg action" src="'+OC.imagePath('core','actions/delete')+'"/>');
 		img.click(function(event){
 			event.stopPropagation();
@@ -18,6 +19,7 @@ PlayList.render=function(){
 		li.addClass('song');
 		PlayList.parent.append(li);
 	}
+        $(".jp-playlist-" + PlayList.current).addClass("collection_playing");
 }
 PlayList.getSelected=function(){
 	return $('tbody td.name input:checkbox:checked').parent().parent();
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 6c8d740cc13..2af18fb03c9 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -17,6 +17,7 @@
 	<div class="jp-volume-bar">
 		<div class="jp-volume-bar-value"></div>
 	</div>
+        <div class="jp-current-song"></div>
 
 	<div class="player" id="jp-player"></div>
 
diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml
index 32525009d61..332d2199dd3 100644
--- a/apps/user_openid/appinfo/info.xml
+++ b/apps/user_openid/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>2</require>
-</info>
\ No newline at end of file
+	<default_enable/>
+</info>