resolved merge conflict

13 files changed, 93 insertions, 69 deletions

diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index 4fbbd9c638c..7ae6be5d6e3 100644
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -14,5 +14,5 @@ OC_App::addNavigationEntry( array(
   'id' => 'contacts_index',
   'order' => 10,
   'href' => OC_Helper::linkTo( 'contacts', 'index.php' ),
-  'icon' => OC_Helper::imagePath( 'admin', 'users.svg' ),
+  'icon' => OC_Helper::imagePath( 'settings', 'users.svg' ),
   'name' => 'Contacts' ));
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 4277357b759..119c88486ac 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -24,6 +24,6 @@
 <?php endforeach; ?>
 
 <div id="contacts_cardoptions">
-	<a id="contacts_deletecard"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
-	<a id="contacts_addproperty"><img class="svg" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
+	<a id="contacts_deletecard"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
+	<a id="contacts_addproperty"><img class="svg action" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
 </div>
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
index 06587269202..cdb03068128 100644
--- a/apps/contacts/templates/part.property.php
+++ b/apps/contacts/templates/part.property.php
@@ -3,27 +3,27 @@
 		<div class="contacts_propertyname"><?php echo $l->t('Name'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'BDAY'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Birthday'); ?></div>
 		<div class="contacts_propertyvalue">
 		<?php echo $l->l('date',new DateTime($_['property']['value'])); ?>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'ORG'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Organisation'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'EMAIL'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Email'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'TEL'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Telephone'); ?></div>
@@ -32,8 +32,8 @@
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
 				(<?php echo $l->t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>)
 			<?php endif; ?>
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'ADR'): ?>
 		<div class="contacts_propertyname">
@@ -51,8 +51,8 @@
 			<?php echo $l->t('Region'); ?> <?php echo $_['property']['value'][4]; ?><br>
 			<?php echo $l->t('Postal Code'); ?> <?php echo $_['property']['value'][5]; ?><br>
 			<?php echo $l->t('Country'); ?> <?php echo $_['property']['value'][6]; ?> 
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php endif; ?>
 </div>
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index f9c3b955d6c..f8e41064fd8 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -1,16 +1,16 @@
-#folderlist li{list-style-type:none;margin-bottom:10px;}
-#folderlist button.prettybutton{font-size:1em;width:10ex;}
-li button.right.prettybutton{font-size:1em;}
-#collection{padding-top:1em;position:relative;width:70ex;float:left;}
-#collection li.album,#collection li.song{margin-left:3ex;}
+#folderlist li { margin-bottom:1em; }
+#folderlist button.prettybutton { font-size:1em; width:10em; }
+li button.right.prettybutton { font-size:1em; }
+#collection { padding-top:1em; position:relative; width:70em; float:left; }
+#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; }
-#collection li button{float:right;}
-#collection li,#playlist li{list-style-type:none;}
-.template{display:none}
+#collection li button { float:right; }
+#collection li,#playlist li { list-style-type:none; }
+.template { display:none; }
 
-#collection li{padding-right:10px;}
-#searchresults input.play, #searchresults input.add{float:right; height:16px; width:16px;}
-#collection tr.collapsed td.album, #collection tr.collapsed td.title{color:#ddd}
-a.expander{ float:right; display:block; }
-tr.active { background-color:#ccc; }
+#collection li { padding-right:10px; }
+#searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; }
+#collection tr.collapsed td.album, #collection tr.collapsed td.title { color:#ddd; }
+a.expander { float:right; display:block; }
+tr.active { background-color:#eee; }
diff --git a/apps/media/css/player.css b/apps/media/css/player.css
index 42ef219994c..98a76e82f0d 100644
--- a/apps/media/css/player.css
+++ b/apps/media/css/player.css
@@ -1,25 +1,16 @@
-#controls ul.jp-controls{list-style-type:none;padding:0;}
-#controls ul.jp-controls li{display:inline;}
-#controls ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;}
-a.jp-play,a.jp-pause{width:3.1em;height:3.1em;z-index:1;top:0;left:3.8em;}
-a.jp-play{background:url("../img/jplayer.blue.monday.png") 0 0 no-repeat;}
-a.jp-play:hover{background:url("../img/jplayer.blue.monday.png") -41px 0 no-repeat;}
-a.jp-pause{background:url("../img/jplayer.blue.monday.png") 0 -42px no-repeat;display:none;}
-a.jp-pause:hover{background:url("../img/jplayer.blue.monday.png") -41px -42px no-repeat;}
-a.jp-previous{left:20px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -112px no-repeat;width:2.3em;height:2.3em;}
-a.jp-previous:hover{background:url("../img/jplayer.blue.monday.png") -29px -112px no-repeat;}
-a.jp-next{left:88px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -141px no-repeat;width:2.3em;height:2.3em;}
-a.jp-next:hover{background:url("../img/jplayer.blue.monday.png") -29px -141px no-repeat;}
-div.jp-progress{position:absolute;overflow:hidden;background-color:#293b51;top:1em;left:10em;width:15em;height:1.2em;}
-div.jp-seek-bar{background:url("../img/jplayer.blue.monday.png") 0 -202px repeat-x;width:0;height:100%;cursor:pointer;}
-div.jp-play-bar{background:url("../img/jplayer.blue.monday.png") 0 -218px repeat-x;width:0;height:100%;}
-div.jp-seeking-bg{background:url("../img/pbar-ani.gif");}
-a.jp-mute,a.jp-unmute{height:1.2em;width:1.5em;top:1em;left:26em;}
-a.jp-mute{background:url("../img/jplayer.blue.monday.png") 0 -186px no-repeat;}
-a.jp-mute:hover{background:url("../img/jplayer.blue.monday.png") -19px -170px no-repeat;}
-a.jp-unmute{background:url("../img/jplayer.blue.monday.png") 0 -170px no-repeat;display:none;}
-a.jp-unmute:hover{background:url("../img/jplayer.blue.monday.png") -19px -186px no-repeat;}
-div.jp-volume-bar{position:absolute;overflow:hidden;background:url("../img/jplayer.blue.monday.png") 0 -250px repeat-x;width:4em;height:0.4em;cursor:pointer;top:1.3em;left:28em;}
-div.jp-volume-bar-value{background:url("../img/jplayer.blue.monday.png") 0 -256px repeat-x;width:0;height:0.4em;}
-div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique;top:1em;left:16.8em;width:22em;}
-div.jp-duration{text-align:right;}
+#controls ul.jp-controls { padding:0; }
+#controls ul.jp-controls li { display:inline; }
+#controls ul.jp-controls li a { position:absolute; padding:.8em 1em; }
+a.jp-play, a.jp-pause { left:2.5em; }
+a.jp-next { left:5em; }
+
+div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:15em; height:1.2em; padding:0; }
+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; width:22em; }
+div.jp-duration { text-align:right; }
+
+a.jp-mute,a.jp-unmute { left:24em; }
+div.jp-volume-bar { position:absolute; overflow:hidden; background:#eee; width:4em; height:0.4em; cursor:pointer; top:1.3em; left:27em; }
+div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 8ef10951b6b..98d21b236e0 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -34,7 +34,7 @@ Collection={
 					}
 					if(collection.length==0){
 						$('#scan input.start').val(t('media','Scan Collection'));
-						$('#plugins a[href="#collection"]').trigger('click');
+						$('#scan input.start').click();
 					}
 					
 				}
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index d37196a89f5..0b0502c7780 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -204,4 +204,7 @@ $(document).ready(function(){
 	$(window).bind('beforeunload', function (){
 		PlayList.save();
 	});
+
+	$('jp-previous').tipsy({gravity:'n', fade:true, live:true});
+	$('jp-next').tipsy({gravity:'n', fade:true, live:true});
 })
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
index 778939db01c..cb7f24522a4 100644
--- a/apps/media/js/playlist.js
+++ b/apps/media/js/playlist.js
@@ -5,7 +5,7 @@ PlayList.render=function(){
 		var item=PlayList.items[i];
 		var li=$('<li/>');
 		li.append(item.name);
-		var img=$('<img class="remove" src="'+OC.imagePath('core','actions/delete')+'"/>');
+		var img=$('<img class="remove svg action" src="'+OC.imagePath('core','actions/delete')+'"/>');
 		img.click(function(event){
 			event.stopPropagation();
 			PlayList.remove($(this).parent().data('index'));
diff --git a/apps/media/l10n/de.php b/apps/media/l10n/de.php
new file mode 100644
index 00000000000..9f664b78d80
--- /dev/null
+++ b/apps/media/l10n/de.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musik",
+"Songs scanned" => "Lieder gescannt",
+"Rescan Collection" => "Sammlung scannen",
+"Pause" => "Pause",
+"Artist" => "Künstler",
+"Album" => "Album",
+"Title" => "Titel"
+);
diff --git a/apps/media/l10n/fr.php b/apps/media/l10n/fr.php
new file mode 100644
index 00000000000..619ee9bc835
--- /dev/null
+++ b/apps/media/l10n/fr.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musique",
+"Songs scanned" => "Pistes scannées",
+"Rescan Collection" => "Réanalyser la Collection",
+"Pause" => "Pause",
+"Artist" => "Artiste",
+"Album" => "Album",
+"Title" => "Titre"
+);
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index a89c5421b4a..3cbb1c50a95 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -1,22 +1,23 @@
 <div id="controls">
 	<ul class="jp-controls">
-		<li><a href="#" class="jp-play" tabindex="1">play</a></li>
-		<li><a href="#" class="jp-pause" tabindex="1">pause</a></li>
-		<li><a href="#" class="jp-mute" tabindex="1">mute</a></li>
-		<li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li>
-		<li><a href="#" class="jp-previous" tabindex="1">previous</a></li>
-		<li><a href="#" class="jp-next" tabindex="1">next</a></li>
+		<li><a href="#" class="jp-play action"><img class="svg" src="<?php echo image_path('core', 'actions/play-big.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-pause action"><img class="svg" src="<?php echo image_path('core', 'actions/pause-big.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-previous action"><img class="svg" src="<?php echo image_path('core', 'actions/play-previous.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-next action"><img class="svg" src="<?php echo image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-mute action"><img class="svg" src="<?php echo image_path('core', 'actions/sound.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-unmute action"><img class="svg" src="<?php echo image_path('core', 'actions/sound-off.svg'); ?>" /></a></li>
 	</ul>
 	<div class="jp-progress">
 		<div class="jp-seek-bar">
 			<div class="jp-play-bar"></div>
 		</div>
 	</div>
+	<div class="jp-current-time"></div>
+	<div class="jp-duration"></div>
 	<div class="jp-volume-bar">
 		<div class="jp-volume-bar-value"></div>
 	</div>
-	<div class="jp-current-time"></div>
-	<div class="jp-duration"></div>
+
 	<div class="player" id="jp-player"></div>
 </div>
 
@@ -24,10 +25,11 @@
 
 <div id="rightcontent">
 <div id="scan">
-	<p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?></p>
-	<div id="scanprogressbar"></div>
+	<p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?>
 	<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>"></input>
-	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input>
+	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input></p>
+	<div id="scanprogressbar"></div>
+	
 </div>
 <table id="collection">
 	<thead>
diff --git a/apps/user_openid/js/settings.js b/apps/user_openid/js/settings.js
index b85ce2d3522..cfecd7b1cb4 100644
--- a/apps/user_openid/js/settings.js
+++ b/apps/user_openid/js/settings.js
@@ -1,5 +1,5 @@
 $(document).ready(function(){
-	$('#openidform input').blur(function(event){
+	$('#openidform #identity').blur(function(event){
 		event.preventDefault();
 		var post = $( "#openidform" ).serialize();
 		$.post( 'ajax/openid.php', post, function(data){
@@ -9,4 +9,12 @@ $(document).ready(function(){
 			}
 		});
 	});
+
+	// reset value when edited, workaround because of .select() not working with disabled inputs
+	$('#openid').focus(function(event){
+		openidValue = $('#openid').val();
+	});
+	$('#openid').blur(function(event){
+		$('#openid').val(openidValue);
+	});
 });
diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php
index fff1eff09e0..51c80e566b6 100644
--- a/apps/user_openid/templates/settings.php
+++ b/apps/user_openid/templates/settings.php
@@ -1,6 +1,8 @@
 <form id="openidform">
-	<fieldset>
-		<legend><?php echo $l->t( 'OpenID' );?></legend>
-		<input type="text" name='identity' id='identity' value="<?php echo $_['identity']; ?>" placeholder="OpenID for <?php echo OC_User::getUser();?>" />
+	<fieldset class="personalblock">
+		<label for="openid"><strong>OpenID</strong></label>
+		<input type="text" id="openid" value="<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/?'; echo OC_User::getUser(); ?>" title="you can authenticate to other sites with this address" />
+		<label for="identity">Authorized</label>
+		<input type="text" name="identity" id="identity" value="<?php echo $_['identity']; ?>" placeholder="OpenID provider" title="Wordpress, Identi.ca, Launchpad, &hellip;" />
 	</fieldset>
-</form>
\ No newline at end of file
+</form>