From 83697cf3e561ceaf0365cd2b4e56fb4bcd00d1fa Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sat, 23 May 2015 22:35:02 +0200
Subject: [PATCH 1/6] Delete attachments on item deletion Delete video from
 videos page

---
 include/items.php            | 13 +++++
 mod/videos.php               | 96 ++++++++++++++++++++++++++++++------
 view/templates/video_top.tpl |  6 +++
 3 files changed, 101 insertions(+), 14 deletions(-)

diff --git a/include/items.php b/include/items.php
index 5a0aa9ed51..c5de29a6de 100644
--- a/include/items.php
+++ b/include/items.php
@@ -4745,6 +4745,18 @@ function drop_item($id,$interactive = true) {
 			// ignore the result
 		}
 
+		// If item has attachments, drop them
+
+		foreach(explode(",",$item['attach']) as $attach){
+			preg_match("|attach/(\d+)|", $attach, $matches);
+			q("DELETE FROM `attach` WHERE `id` = %d AND `uid` = %d",
+				intval($matches[1]),
+				local_user()
+			);
+			// ignore the result
+		}
+
+
 		// clean up item_id and sign meta-data tables
 
 		/*
@@ -4821,6 +4833,7 @@ function drop_item($id,$interactive = true) {
 			// Add a relayable_retraction signature for Diaspora.
 			store_diaspora_retract_sig($item, $a->user, $a->get_baseurl());
 		}
+
 		$drop_id = intval($item['id']);
 
 		// send the notification upstream/downstream as the case may be
diff --git a/mod/videos.php b/mod/videos.php
index 0f29e631bd..607c900eb5 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -43,12 +43,12 @@ function videos_init(&$a) {
 		if(count($albums)) {
 			$a->data['albums'] = $albums;
 
-			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);	
+			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
 
 			if($albums_visible) {
 				$o .= '<div id="side-bar-photos-albums" class="widget">';
 				$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
-					
+
 				$o .= '<ul>';
 				foreach($albums as $album) {
 
@@ -57,7 +57,7 @@ function videos_init(&$a) {
 
 					if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
 						continue;
-					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
+					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>';
 				}
 				$o .= '</ul>';
 			}
@@ -92,9 +92,76 @@ function videos_init(&$a) {
 
 function videos_post(&$a) {
 
-	return;
+	$owner_uid = $a->data['user']['uid'];
+
+	if (local_user() != $owner_uid) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+
+	if(($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
+
+		// Check if we should do HTML-based delete confirmation
+		if(!x($_REQUEST,'confirm')) {
+			if(x($_REQUEST,'canceled')) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+
+			$drop_url = $a->query_string;
+			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+				'$method' => 'post',
+				'$message' => t('Do you really want to delete this video?'),
+				'$extra_inputs' => [
+					['name'=>'id', 'value'=> $_POST['id']],
+					['name'=>'delete', 'value'=>'x']
+				],
+				'$confirm' => t('Delete Video'),
+				'$confirm_url' => $drop_url,
+				'$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement
+				'$cancel' => t('Cancel'),
+
+			));
+			$a->error = 1; // Set $a->error so the other module functions don't execute
+			return;
+		}
+
+		$video_id = $_POST['id'];
+
+
+		$r = q("SELECT `id`  FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1",
+			intval(local_user()),
+			dbesc($video_id)
+		);
+
+		if(count($r)) {
+			q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'",
+				intval(local_user()),
+				dbesc($video_id)
+			);
+			$i = q("SELECT * FROM `item` WHERE `attach` like '%%attach/%s%%' AND `uid` = %d LIMIT 1",
+				dbesc($video_id),
+				intval(local_user())
+			);
+			#echo "<pre>"; var_dump($i); killme();
+			if(count($i)) {
+				q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
+					dbesc(datetime_convert()),
+					dbesc(datetime_convert()),
+					dbesc($i[0]['uri']),
+					intval(local_user())
+				);
+				create_tags_from_itemuri($i[0]['uri'], local_user());
+				delete_thread_uri($i[0]['uri'], local_user());
+
+				$url = $a->get_baseurl();
+				$drop_id = intval($i[0]['id']);
+
+				if($i[0]['visible'])
+					proc_run('php',"include/notifier.php","drop","$drop_id");
+			}
+		}
+
+		goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+		return; // NOTREACHED
+	}
+
+    goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
 
-	// DELETED -- look at mod/photos.php if you want to implement
 }
 
 
@@ -115,8 +182,8 @@ function videos_content(&$a) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
-	
-	
+
+
 	require_once('include/bbcode.php');
 	require_once('include/security.php');
 	require_once('include/conversation.php');
@@ -131,7 +198,7 @@ function videos_content(&$a) {
 	$_SESSION['video_return'] = $a->cmd;
 
 	//
-	// Parse arguments 
+	// Parse arguments
 	//
 
 	if($a->argc > 3) {
@@ -233,7 +300,7 @@ function videos_content(&$a) {
 
 	// tabs
 	$_is_owner = (local_user() && (local_user() == $owner_uid));
-	$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);	
+	$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);
 
 	//
 	// dispatch request
@@ -251,7 +318,7 @@ function videos_content(&$a) {
 		return; // no albums for now
 
 		// DELETED -- look at mod/photos.php if you want to implement
-	}	
+	}
 
 
 	if($datatype === 'video') {
@@ -307,20 +374,21 @@ function videos_content(&$a) {
 					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
-				
+
 			);
 		}
 	}
-	
-	$tpl = get_markup_template('videos_recent.tpl'); 
+
+	$tpl = get_markup_template('videos_recent.tpl');
 	$o .= replace_macros($tpl, array(
 		'$title' => t('Recent Videos'),
 		'$can_post' => $can_post,
 		'$upload' => array(t('Upload New Videos'), $a->get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'),
 		'$videos' => $videos,
+        '$delete_url' => (($can_post)?$a->get_baseurl().'/videos/'.$a->data['user']['nickname']:False)
 	));
 
-	
+
 	$o .= paginate($a);
 	return $o;
 }
diff --git a/view/templates/video_top.tpl b/view/templates/video_top.tpl
index 3a8680fd9d..207dd83f2f 100644
--- a/view/templates/video_top.tpl
+++ b/view/templates/video_top.tpl
@@ -9,5 +9,11 @@
 	</video>
 
 	{{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}}
+	{{if $delete_url }}
+		<form method="post" action="{{$delete_url}}">
+		<input type="submit" name="delete" value="X"></input>
+		<input type="hidden" name="id" value="{{$video.id}}"></input>
+		</form>
+	{{/if}}
 </div>
 

From 7c2608e07d54fe9f861cc9bcafa9e204adb05251 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sat, 23 May 2015 22:51:34 +0200
Subject: [PATCH 2/6] quattro: style video delete button

---
 view/templates/video_top.tpl       |   2 +-
 view/theme/quattro/dark/style.css  |  28 ++-
 view/theme/quattro/green/style.css |  28 ++-
 view/theme/quattro/lilac/style.css |  28 ++-
 view/theme/quattro/quattro.less    | 283 ++++++++++++++++-------------
 5 files changed, 219 insertions(+), 150 deletions(-)

diff --git a/view/templates/video_top.tpl b/view/templates/video_top.tpl
index 207dd83f2f..8348d702cd 100644
--- a/view/templates/video_top.tpl
+++ b/view/templates/video_top.tpl
@@ -11,7 +11,7 @@
 	{{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}}
 	{{if $delete_url }}
 		<form method="post" action="{{$delete_url}}">
-		<input type="submit" name="delete" value="X"></input>
+		<input type="submit" name="delete" value="X" class="video-delete"></input>
 		<input type="hidden" name="id" value="{{$video.id}}"></input>
 		</form>
 	{{/if}}
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 5f4b005c8e..3c109a440e 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -514,7 +514,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -844,7 +843,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -926,7 +924,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1208,7 +1205,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1283,9 +1279,6 @@ section {
     opacity: 0.5;
 }*/
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1969,6 +1962,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index c2826a3c0c..5e355ffa70 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -514,7 +514,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -844,7 +843,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -926,7 +924,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1208,7 +1205,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1283,9 +1279,6 @@ section {
     opacity: 0.5;
 }*/
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1969,6 +1962,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 28c5cd47a9..0f497d492f 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -514,7 +514,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -844,7 +843,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -926,7 +924,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1208,7 +1205,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1283,9 +1279,6 @@ section {
     opacity: 0.5;
 }*/
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1969,6 +1962,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 172fad31b5..56eab54cc9 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -36,7 +36,7 @@ h4 { font-size: 1.1em }
 	-o-transition: all @d ease-in-out;
 	-ms-transition: all @d ease-in-out;
 	transition: all @d ease-in-out;
-}	
+}
 
 
 a, a:link { color: @Link; text-decoration: none; }
@@ -56,7 +56,7 @@ blockquote {
     padding: 1em;
     margin-left: 1em;
     border-left: 1em solid @BlockquoteBorderColor;
-    
+
 }
 
 code {
@@ -68,7 +68,7 @@ code {
 	background: #EEE;
 	color: #444;
 	padding: 10px;
-	margin-top: 20px; 
+	margin-top: 20px;
 }
 
 #panel {
@@ -81,8 +81,8 @@ code {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
-	.shadow();	
+
+	.shadow();
 }
 
 
@@ -134,7 +134,7 @@ header {
 	#site-location {
 		display: none;
 	}
-	
+
 	#banner {
 		overflow: hidden;
                 text-align: center;
@@ -145,7 +145,7 @@ header {
 	}
 }
 /* nav */
-nav { 
+nav {
 	width: 100%; height: 32px;
 	position: fixed; left: 0px; top: 0px;
 	padding: 0px;
@@ -159,13 +159,13 @@ nav {
 		ul {
 			margin: 0px;
 			padding: 0px 20px;
-			li { 
-				list-style: none; 
+			li {
+				list-style: none;
 				margin: 0px; padding: 0px;
 				float: left;
 				.menu-popup{ left: 0px; right: auto; }
 			}
-			
+
 		}
 
 		.nav-menu-icon {
@@ -174,11 +174,11 @@ nav {
 			padding: 5px;
 			margin: 0px 10px;
 			.roundtop();
-			
+
 			&.selected {
 				background-color: @NavbarSelectedBg;
 			}
-			
+
 				img { width: 22px; height: 22px; }
 				.nav-notify { top: 3px; }
 		}
@@ -193,7 +193,7 @@ nav {
 			&.selected {
 				border-bottom: 3px solid @NavbarSelectedBorder;
 			}
-			
+
 		}
 
 		.nav-notify {
@@ -207,26 +207,26 @@ nav {
 			right: -10px;
 			min-width: 15px;
 			text-align: right;
-			
+
 				&.show{ display: block; }
 		}
-		
-		
+
+
 		#nav-help-link,
 		#nav-search-link,
 		#nav-directory-link,
 		#nav-apps-link,
-		#nav-site-linkmenu { 
+		#nav-site-linkmenu {
 			float: right;
 			.menu-popup{ right: 0px; left: auto; }
 		}
-	
+
 		#nav-notifications-linkmenu.on .icon.s22.notify,
 		#nav-notifications-linkmenu.selected .icon.s22.notify   { background-image: url("../../../images/icons/22/notify_on.png") }
         #nav-introductions-link.on .icon.s22.intro,
 		#nav-introductions-link.selected .icon.s22.intro        { background-image: url("icons/contacts_on.png") }
 		#nav-messages-link.on .icon.s22.mail,
-		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }		
+		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }
 		#nav-apps-link.selected { background-color: @NavbarSelectedBg; }
 }
 
@@ -242,9 +242,9 @@ ul.menu-popup {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
+
 	.shadow();
-	
+
 		a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;}
 		a:hover { background-color: @MenuItemHoverBg; }
 		.menu-sep  { border-top: 1px solid @MenuItemSeparator; }
@@ -256,12 +256,12 @@ ul.menu-popup {
 			color: @MenuEmpty;
 		}
 		.toolbar {
-			background-color:  @MenuEmpty; 
+			background-color:  @MenuEmpty;
 			height: auto; overflow: auto;
 			a { float: right; }
 			a:hover { background-color: @MenuBg; }
 		}
-		
+
 }
 
 /* autocomplete popup */
@@ -275,7 +275,7 @@ ul.menu-popup {
 	z-index:100000;
 	.shadow();
 }
-.autocomplete > div, 
+.autocomplete > div,
 .acpopupitem {
 	color: @MenuItem; padding: 4px;
 	clear:left;
@@ -305,7 +305,7 @@ ul.menu-popup {
 
 
 /* aside 230px*/
-aside { 
+aside {
 	display: table-cell;
 	vertical-align: top;
 	width: 200px;
@@ -320,7 +320,7 @@ aside {
 		dl { height: auto; overflow: auto; }
 		dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
 		dd {float: left; margin-left: 4px; width: 60%;}
-	
+
 	}
 
 	#profile-extra-links {
@@ -337,7 +337,7 @@ aside {
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
                 margin-top: 3px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 	#dfrn-request-link {
@@ -348,7 +348,7 @@ aside {
 		font-weight: bold;
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 
@@ -420,11 +420,11 @@ aside {
 	width: 60px;
 	height: 60px;
 }*/
- 
+
 /* widget */
 .widget {
 	margin-bottom: 2em;
-	
+
 	h3 { padding: 0px; margin: 2px;}
 	.action { .opaque(0.1); }
 	input.action { .opaque(0.5); }
@@ -434,14 +434,14 @@ aside {
 
 	ul { padding: 0px;}
 	ul li {padding-left: 16px; min-height: 16px; list-style: none; }
-	
+
 	.tool.selected {
 		background: url('../../../images/selected.png') no-repeat left center;
 	}
-	
+
 	/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-	
+
 }
 
 /* widget: search */
@@ -452,7 +452,7 @@ aside {
 
 
 /* section 800px */
-section { 
+section {
 	display: table-cell;
 	vertical-align: top;
 	width: 770px;
@@ -464,7 +464,7 @@ section {
 }
 
 /* wall item */
-.tread-wrapper { 
+.tread-wrapper {
 	background-color: @ThreadBackgroundColor;
 	position: relative;
 	padding: 10px;
@@ -478,10 +478,10 @@ section {
 .wall-item-container {
 	display: table;
 	width: 750px;
-	
+
 	.wall-item-item,
 	.wall-item-bottom { display: table-row; }
-	
+
 	.wall-item-bottom { .opaque(0.5); }
 	&:hover .wall-item-bottom { .opaque(1); }
 	.wall-item-info {
@@ -489,8 +489,8 @@ section {
 		vertical-align: top;
 		text-align: left;
 		width: 60px;
-		
-	} 
+
+	}
 	.wall-item-location {
 		word-wrap: break-word;
 		width: 50px;
@@ -503,45 +503,45 @@ section {
 	}
 	.wall-item-content img { max-width: 700px; }
 	.wall-item-links,
-	.wall-item-actions { 
-		display: table-cell; 
-		vertical-align: middle; 
-		
+	.wall-item-actions {
+		display: table-cell;
+		vertical-align: middle;
+
 		.icon {
 			.opaque(0.5);
 		}
 		.icon:hover  {
 			.opaque(1.0);
-		}		
+		}
 	}
-	
+
 	.wall-item-ago { padding-right: 40px; }
 	.wall-item-name { font-weight: bold; }
-	
+
 	.wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; }
 	.wall-item-actions-social { float: left; margin-top: 0.5em;
 		a { margin-right: 3em; }
 	 }
-	.wall-item-actions-tools { float: right; width: 15%; 
+	.wall-item-actions-tools { float: right; width: 15%;
 		a { float: right; }
 		input { float: right; }
 	}
-		
+
 }
 
 
 .wall-item-container.comment {
 	.contact-photo-wrapper { margin-left: 16px; }
-	.contact-photo { 
-		width: 32px; height: 32px; 
+	.contact-photo {
+		width: 32px; height: 32px;
 	}
-	
+
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 0px !important;
 	}
 	.wall-item-links { padding-left: 12px; }
-	
+
 	.commentbox {
 		height: 0px;
 		overflow: hidden;
@@ -551,7 +551,7 @@ section {
 		}
 		.transition();
 	}
-	
+
 	&:hover .commentbox {
 		height:auto; overflow: visible;
 		.wall-item-comment-wrapper {
@@ -568,9 +568,9 @@ section {
 		.opaque(0.5);
 	}
 	.contact-photo-wrapper { margin-left: 32px; }
-	.contact-photo { 
+	.contact-photo {
 		width: 16px; height: 16px;
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -581,8 +581,8 @@ section {
 .wall-item-comment-wrapper {
 	margin: 1em 2em 1em 60px;
 	.comment-edit-photo { display: none; }
-	
-	textarea {	
+
+	textarea {
 		height: 1em; width: 100%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
 		border: 1px solid @CommentBoxEmptyBorderColor;
@@ -593,7 +593,7 @@ section {
 		color: @CommentBoxFullColor;
 		border: 1px solid @CommentBoxFullBorderColor;
 	}
-	
+
 	&.photo {
 		margin: 1em 2em 1em 0px;
 	}
@@ -606,10 +606,10 @@ section {
 	border: 1px solid @Grey5;
 	margin-top: 10px;
 	background-color: @JotPreviewBackgroundColor;
-	
+
 	.contact-photo { width: 32px; height: 32px; margin-left: 16px;
 		/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -617,8 +617,8 @@ section {
 	.wall-item-links { padding-left: 12px; }
 
 	.wall-item-container { width: 90%; }
-	.tread-wrapper { 
-		width: 90%; padding: 0; margin: 10px 0; 
+	.tread-wrapper {
+		width: 90%; padding: 0; margin: 10px 0;
 		background-color: @JotPreviewBackgroundColor;
 		border-bottom: 0px;
 	}
@@ -664,9 +664,9 @@ section {
     opacity: 0.5;
 }*/
 
-.wwto { 
-	position: absolute !important; 
-	width: 25px; height: 25px; 
+.wwto {
+	position: absolute !important;
+	width: 25px; height: 25px;
     background: #FFFFFF;
     border: 2px solid @Metalic3;
     height: 25px;
@@ -676,7 +676,7 @@ section {
     position: absolute !important;
     top: 40px;
     left: 30px;
-    
+
     .shadow(0px, 0px)
 }
 .wwto .contact-photo { width: 25px; height: 25px; }
@@ -695,7 +695,7 @@ section {
 		float: none;
 		margin-right: 0px;
 	}
-	
+
 }
 .type-link {
     blockquote {
@@ -715,14 +715,14 @@ section {
     border-top: 1px solid @ThreadBottomBorderColor;
     padding-top: 5px;
     margin-top: 5px;
-    
+
     img {
         -webkit-border-radius: 4px;
         -moz-border-radius: 4px;
         border-radius: 4px;
         float: left;
     }
-    
+
     span { margin-left: 9px; }
 }
 
@@ -735,7 +735,7 @@ blockquote.shared_content {
 
 
 .oembed.video {
-	> a.embed_video { 
+	> a.embed_video {
 		display: block;
 		float: none;
 		> div {
@@ -753,45 +753,45 @@ blockquote.shared_content {
 .children {
 	margin-top: 1em;
 	.hide-comments-outer { margin-left:60px; }
-	
+
 	.wwto { display: none; }
-	
+
 	.comment-edit-preview { width: 660px;
 		.wall-item-container { width: 610px; }
 	 }
-	
+
 	& .children {
-		
+
 		margin-left: 40px;
 		.wall-item-container { width: 710px; }
 		.comment-edit-preview { width: 620px;
 			.wall-item-container { width: 620px; }
 		 }
-	
+
 		& .children {
 			.wall-item-container { width: 670px; }
-			.comment-edit-preview { width: 580px; 
+			.comment-edit-preview { width: 580px;
 				.wall-item-container { width: 580px; }
 			}
-		
+
 			& .children {
 				.wall-item-container { width: 630px; }
-				.comment-edit-preview { width: 540px; 
+				.comment-edit-preview { width: 540px;
 					.wall-item-container { width: 540px; }
 				}
 
 				& .children {
 					.wall-item-container { width: 590px; }
-					.comment-edit-preview { width: 500px; 
+					.comment-edit-preview { width: 500px;
 						.wall-item-container { width: 500px; }
 					}
-					
+
 					.children {
 						margin-left: 0px;
 						.hide-comments-outer { margin-left: 0px; }
 					}
 				}
-			}		
+			}
 		}
 	}
 }
@@ -820,8 +820,8 @@ span[id^="showmore-wrap"] {
 .contact-select {	position: absolute; top:64px; left:64px; display:none; }
 .contact-select:checked,
 .contact-photo:hover .contact-select {	display:block; }
-#contacts-actions { 
-	position: absolute; 
+#contacts-actions {
+	position: absolute;
 	left: 800px;
 	width: 200px;
 	background-color: @MenuBg;
@@ -845,12 +845,12 @@ span[id^="showmore-wrap"] {
 	#contacts-actions { left: 40px; }
 }
 
-.contact-photo { 
+.contact-photo {
 	width: 48px; height: 48px;
 	img { width: 48px; height: 48px; }
 	overflow: hidden;
 	display: block;
- }		
+ }
 .contact-photo-menu-button {
 	display: none;
 	position: absolute;
@@ -864,30 +864,30 @@ span[id^="showmore-wrap"] {
 	height: 90px;
 	padding-right: 10px;
 	margin: 0 10px 10px 0px;
-	.contact-photo-wrapper { 
-		float: left; 
+	.contact-photo-wrapper {
+		float: left;
 		margin-right: 10px;
 	}
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 .directory-item {
 	float: left;
 	width: 200px;
 	height: 200px;
-	.contact-photo { 
+	.contact-photo {
 		width: 175px; height: 175px;
 		img { width: 175px; height: 175px; }
 	}
 }
 .contact-name { font-weight: bold; padding-top: 15px; }
-.contact-details { 
+.contact-details {
 	color: @Grey3; white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -899,8 +899,8 @@ span[id^="showmore-wrap"] {
 
 	width: 100%;
 	margin: 0px 2em 20px 0px;
-	
-	
+
+
 	.profile-jot-text {
 		height: 1em; width: 99%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
@@ -947,7 +947,7 @@ span[id^="showmore-wrap"] {
 				border-left: 10px solid @JotPermissionLockBackgroundColor;
 				background-color: @JotPermissionLockBackgroundColor;
 			}
-			
+
 		}
 		li.submit {
 			float: right;
@@ -993,12 +993,12 @@ span[id^="showmore-wrap"] {
 
 		&:-moz-placeholder {
 			font-weight: normal;
-		}		
-	
+		}
+
 		&:hover { border: 1px solid @CommentBoxEmptyBorderColor }
 		&:focus { border: 1px solid @CommentBoxEmptyBorderColor }
 	}
-	
+
 	#character-counter {
 		width: 40px;
 		float: right;
@@ -1007,7 +1007,7 @@ span[id^="showmore-wrap"] {
 		line-height: 20px;
 		padding-right: 20px;
 	}
-	
+
 	#jot-category {
 		border: 0px;
 		margin: 0px;
@@ -1076,7 +1076,7 @@ span[id^="showmore-wrap"] {
 	overflow: auto;
 }
 #acl-list-content {
-	
+
 }
 .acl-list-item {
 	display: block;
@@ -1093,7 +1093,7 @@ span[id^="showmore-wrap"] {
 	margin: 4px;
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
+.acl-list-item a {
 	font-size: 8px;
 	display: block;
 	width: 40px;
@@ -1138,12 +1138,12 @@ ul.tabs {
     li {
         float: left;
         margin-left: 20px;
-        
+
         .active {
 			border-bottom: 1px solid @LinkVisited;
         }
     }
-    
+
 }
 
 
@@ -1152,7 +1152,7 @@ ul.tabs {
 #group-update-wrapper{
 	height: auto; overflow: auto;
 	#group {
-		width:300px; 
+		width:300px;
 		float:left;
 		margin-right:20px;
 	}
@@ -1194,13 +1194,13 @@ ul.tabs {
 	input[type="checkbox"], input[type="radio"]{
 		width: auto;
 	}
-	
+
 	textarea { height: 100px; }
 	.field_help {
 		display: block;
 		margin-left: 200px;
 		color: @FieldHelpColor;
-		
+
 	}
 
 
@@ -1275,7 +1275,7 @@ ul.tabs {
 }
 #profile-edit-profile-name,
 #profile-edit-name,
-#gender-select, 
+#gender-select,
 #profile-edit-pdesc,
 #profile-edit-gender,
 #profile-edit-dob,
@@ -1300,7 +1300,7 @@ ul.tabs {
 	height: auto; overflow: auto;
 	border-bottom: 2px solid #cccccc;
 	padding-bottom: 1em;
-	margin-bottom: 1em;	
+	margin-bottom: 1em;
 }
 .oauthapp img {
 	float: left;
@@ -1321,11 +1321,38 @@ ul.tabs {
 	width: 50px; float: left;
 }
 
+/* videos page */
+.videos {
+    .video-top-wrapper {
+        width: 200px; float: left;
+        margin: 0px 10px 10px 0px;
+        position: relative;
+
+        .video-js {
+            width: 200px!important;
+            height: 132px!important;
+        }
+
+        .video-delete {
+            position: absolute;
+            opacity: 0;
+            right: 0px;
+            top: 0px;
+            transition: opacity 0.5s;
+        }
+
+        &:hover .video-delete {
+            opacity: 1;
+        }
+    }
+}
+
+
 /* photo albums */
 @photosize: 150px;
 
 #photo-edit-link-wrap { margin-bottom: 10px; }
-	
+
 #album-edit-link {
 	border-right: 1px solid @MenuBorder;
 	float: left;
@@ -1358,21 +1385,21 @@ ul.tabs {
 	width:@photosize; height: @photosize;
 	position: relative;
 	overflow: hidden;
-	
+
 	img { width: @photosize; }
-		
+
 	.photo-top-album-name,
 	.caption{
 		position: absolute;
 		color: @Menu;
 		background-color: @MenuBg;
-		
+
 		width: 100%;
 		.shadow(0px, 5px);
 		.transition(0.5s);
 		bottom: -@photosize;
 	}
-	
+
 	&:hover .photo-top-album-name,
 	&:hover .caption {
 		bottom: 0px;
@@ -1392,8 +1419,8 @@ ul.tabs {
 	background: url("../../../images/icons/22/image.png") no-repeat top left;
 	padding-left: 23px;
 	min-height: 22px;
-	padding-top: 6px; 
-	/* a { display: block;}*/ 
+	padding-top: 6px;
+	/* a { display: block;}*/
 }
 
 #photo-caption {
@@ -1441,14 +1468,14 @@ ul.tabs {
             top: 10px;
 	    left: -10px;
         }
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 
 /* messages */
@@ -1469,10 +1496,10 @@ ul.tabs {
 	background-color: @MailListBackgroundColor;
 	margin-bottom: 5px;
 	width: 100%; height: auto; overflow: hidden;
-	
+
 	span { display: block; float: left; width: 20%; overflow: hidden;}
-	
-	.mail-subject { 
+
+	.mail-subject {
 		width: 30%;
 		padding:4px 0px 0px 4px;
 		a { display: block; }
@@ -1481,7 +1508,7 @@ ul.tabs {
 	.mail-date { padding: 4px 4px 0px 4px; }
 	.mail-from { padding: 4px 4px 0px 4px; }
 	.mail-count { padding: 4px 4px 0px 4px; text-align: right;}
-	
+
 	.mail-delete { float: right; }
 }
 
@@ -1493,7 +1520,7 @@ ul.tabs {
 	span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;}
 	.mail-delete { float: right;  .opaque(0.5);}
 	&:hover .mail-delete { .opaque(1); }
-	
+
 }
 
 /* theme screenshot */
@@ -1522,7 +1549,7 @@ footer { height: 100px; display: table-row; }
 	font-weight: bold;
 	background-color: #FF0000;
 	padding: 0em 0.3em;
-	
+
 }
 #adminpage {
     dl {
@@ -1569,20 +1596,20 @@ footer { height: 100px; display: table-row; }
     }
     table {
         width:100%;
-        border-bottom: 1px solid #000000; 
+        border-bottom: 1px solid #000000;
         margin: 5px 0px;
-        th { 
+        th {
             text-align: left;
         }
-        td .icon { 
+        td .icon {
             float: left;
         }
-        tr:hover { 
+        tr:hover {
             background-color: #bbc7d7;
         }
     }
-    table#users img { 
-            width: 16px; height: 16px; 
+    table#users img {
+            width: 16px; height: 16px;
     }
     .selectall { text-align: right; }
 }

From 646ea377acd4ed15e54b65a33c8e3a9c7b347b15 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 10:28:15 +0200
Subject: [PATCH 3/6] quattro: readd video delete button styles because i'm not
 so good at resolving merge conflicts...

---
 view/theme/quattro/dark/style.css  |  21 +++
 view/theme/quattro/green/style.css |  21 +++
 view/theme/quattro/lilac/style.css |  21 +++
 view/theme/quattro/quattro.less    | 270 ++++++++++++++++-------------
 4 files changed, 211 insertions(+), 122 deletions(-)

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 1ec672d227..c8bd7d406b 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1965,6 +1965,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 89dc3dad86..9c18771fff 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1965,6 +1965,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 11adc44b92..97cf540fc2 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -1965,6 +1965,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 480effd501..fbfb4bcb30 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -56,7 +56,7 @@ blockquote {
         padding: 1em;
         margin-left: 1em;
         border-left: 1em solid @BlockquoteBorderColor;
-    
+
 }
 
 code {
@@ -81,8 +81,8 @@ code {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
-	.shadow();	
+
+	.shadow();
 }
 
 
@@ -134,7 +134,7 @@ header {
 	#site-location {
 		display: none;
 	}
-	
+
 	#banner {
 		overflow: hidden;
                 text-align: center;
@@ -145,7 +145,7 @@ header {
 	}
 }
 /* nav */
-nav { 
+nav {
 	width: 100%; height: 32px;
 	position: fixed; left: 0px; top: 0px;
 	padding: 0px;
@@ -159,13 +159,13 @@ nav {
 		ul {
 			margin: 0px;
 			padding: 0px 20px;
-			li { 
-				list-style: none; 
+			li {
+				list-style: none;
 				margin: 0px; padding: 0px;
 				float: left;
 				.menu-popup{ left: 0px; right: auto; }
 			}
-			
+
 		}
 
 		.nav-menu-icon {
@@ -174,11 +174,11 @@ nav {
 			padding: 5px;
 			margin: 0px 10px;
 			.roundtop();
-			
+
 			&.selected {
 				background-color: @NavbarSelectedBg;
 			}
-			
+
 				img { width: 22px; height: 22px; }
 				.nav-notify { top: 3px; }
 		}
@@ -193,7 +193,7 @@ nav {
 			&.selected {
 				border-bottom: 3px solid @NavbarSelectedBorder;
 			}
-			
+
 		}
 
 		.nav-notify {
@@ -207,26 +207,26 @@ nav {
 			right: -10px;
 			min-width: 15px;
 			text-align: right;
-			
+
 				&.show{ display: block; }
 		}
-		
-		
+
+
 		#nav-help-link,
 		#nav-search-link,
 		#nav-directory-link,
 		#nav-apps-link,
-		#nav-site-linkmenu { 
+		#nav-site-linkmenu {
 			float: right;
 			.menu-popup{ right: 0px; left: auto; }
 		}
-	
+
 		#nav-notifications-linkmenu.on .icon.s22.notify,
 		#nav-notifications-linkmenu.selected .icon.s22.notify   { background-image: url("../../../images/icons/22/notify_on.png") }
                 #nav-introductions-link.on .icon.s22.intro,
 		#nav-introductions-link.selected .icon.s22.intro        { background-image: url("icons/contacts_on.png") }
 		#nav-messages-link.on .icon.s22.mail,
-		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }		
+		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }
 		#nav-apps-link.selected { background-color: @NavbarSelectedBg; }
 }
 
@@ -242,9 +242,9 @@ ul.menu-popup {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
+
 	.shadow();
-	
+
 		a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;}
 		a:hover { background-color: @MenuItemHoverBg; }
 		.menu-sep  { border-top: 1px solid @MenuItemSeparator; }
@@ -256,12 +256,12 @@ ul.menu-popup {
 			color: @MenuEmpty;
 		}
 		.toolbar {
-			background-color:  @MenuEmpty; 
+			background-color:  @MenuEmpty;
 			height: auto; overflow: auto;
 			a { float: right; }
 			a:hover { background-color: @MenuBg; }
 		}
-		
+
 }
 
 /* autocomplete popup */
@@ -275,7 +275,7 @@ ul.menu-popup {
 	z-index:100000;
 	.shadow();
 }
-.autocomplete > div, 
+.autocomplete > div,
 .acpopupitem {
 	color: @MenuItem; padding: 4px;
 	clear:left;
@@ -305,7 +305,7 @@ ul.menu-popup {
 
 
 /* aside 230px*/
-aside { 
+aside {
 	display: table-cell;
 	vertical-align: top;
 	width: 200px;
@@ -320,7 +320,7 @@ aside {
 		dl { height: auto; overflow: auto; }
 		dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
 		dd {float: left; margin-left: 4px; width: 60%;}
-	
+
 	}
 
 	#profile-extra-links {
@@ -337,7 +337,7 @@ aside {
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
                 margin-top: 3px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 	#dfrn-request-link {
@@ -348,12 +348,12 @@ aside {
 		font-weight: bold;
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 
 	#profiles-menu { width: 20em; }
-        
+
         .posted-date-selector-months { margin-left: 10px; }
 }
 
@@ -420,11 +420,11 @@ aside {
 	width: 60px;
 	height: 60px;
 }*/
- 
+
 /* widget */
 .widget {
 	margin-bottom: 2em;
-	
+
 	h3 { padding: 0px; margin: 2px;}
 	.action { .opaque(0.1); }
 	input.action { .opaque(0.5); }
@@ -434,14 +434,14 @@ aside {
 
 	ul { padding: 0px;}
 	ul li {padding-left: 16px; min-height: 16px; list-style: none; }
-	
+
 	.tool.selected {
 		background: url('../../../images/selected.png') no-repeat left center;
 	}
-	
+
 	/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-	
+
 }
 
 /* widget: search */
@@ -452,7 +452,7 @@ aside {
 
 
 /* section 800px */
-section { 
+section {
 	display: table-cell;
 	vertical-align: top;
 	width: 770px;
@@ -464,7 +464,7 @@ section {
 }
 
 /* wall item */
-.tread-wrapper { 
+.tread-wrapper {
 	background-color: @ThreadBackgroundColor;
 	position: relative;
 	padding: 10px;
@@ -478,10 +478,10 @@ section {
 .wall-item-container {
 	display: table;
 	width: 750px;
-	
+
 	.wall-item-item,
 	.wall-item-bottom { display: table-row; }
-	
+
 	.wall-item-bottom { .opaque(0.5); }
 	&:hover .wall-item-bottom { .opaque(1); }
 	.wall-item-info {
@@ -489,8 +489,8 @@ section {
 		vertical-align: top;
 		text-align: left;
 		width: 60px;
-		
-	} 
+
+	}
 	.wall-item-location {
 		word-wrap: break-word;
 		width: 50px;
@@ -503,45 +503,45 @@ section {
 	}
 	.wall-item-content img { max-width: 700px; }
 	.wall-item-links,
-	.wall-item-actions { 
-		display: table-cell; 
-		vertical-align: middle; 
-		
+	.wall-item-actions {
+		display: table-cell;
+		vertical-align: middle;
+
 		.icon {
 			.opaque(0.5);
 		}
 		.icon:hover  {
 			.opaque(1.0);
-		}		
+		}
 	}
-	
+
 	.wall-item-ago { padding-right: 40px; }
 	.wall-item-name { font-weight: bold; }
-	
+
 	.wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; }
 	.wall-item-actions-social { float: left; margin-top: 0.5em;
 		a { margin-right: 3em; }
 	 }
-	.wall-item-actions-tools { float: right; width: 15%; 
+	.wall-item-actions-tools { float: right; width: 15%;
 		a { float: right; }
 		input { float: right; }
 	}
-		
+
 }
 
 
 .wall-item-container.comment {
 	.contact-photo-wrapper { margin-left: 16px; }
-	.contact-photo { 
-		width: 32px; height: 32px; 
+	.contact-photo {
+		width: 32px; height: 32px;
 	}
-	
+
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 0px !important;
 	}
 	.wall-item-links { padding-left: 12px; }
-	
+
 	.commentbox {
 		height: 0px;
 		overflow: hidden;
@@ -551,7 +551,7 @@ section {
 		}
 		.transition();
 	}
-	
+
 	&:hover .commentbox {
 		height:auto; overflow: visible;
 		.wall-item-comment-wrapper {
@@ -568,9 +568,9 @@ section {
 		.opaque(0.5);
 	}
 	.contact-photo-wrapper { margin-left: 32px; }
-	.contact-photo { 
+	.contact-photo {
 		width: 16px; height: 16px;
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -581,8 +581,8 @@ section {
 .wall-item-comment-wrapper {
 	margin: 1em 2em 1em 60px;
 	.comment-edit-photo { display: none; }
-	
-	textarea {	
+
+	textarea {
 		height: 1em; width: 100%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
 		border: 1px solid @CommentBoxEmptyBorderColor;
@@ -593,7 +593,7 @@ section {
 		color: @CommentBoxFullColor;
 		border: 1px solid @CommentBoxFullBorderColor;
 	}
-	
+
 	&.photo {
 		margin: 1em 2em 1em 0px;
 	}
@@ -606,10 +606,10 @@ section {
 	border: 1px solid @Grey5;
 	margin-top: 10px;
 	background-color: @JotPreviewBackgroundColor;
-	
+
 	.contact-photo { width: 32px; height: 32px; margin-left: 16px;
 		/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -617,8 +617,8 @@ section {
 	.wall-item-links { padding-left: 12px; }
 
 	.wall-item-container { width: 90%; }
-	.tread-wrapper { 
-		width: 90%; padding: 0; margin: 10px 0; 
+	.tread-wrapper {
+		width: 90%; padding: 0; margin: 10px 0;
 		background-color: @JotPreviewBackgroundColor;
 		border-bottom: 0px;
 	}
@@ -664,7 +664,7 @@ section {
     opacity: 0.5;
 }*/
 
-.wwto { 
+.wwto {
         position: absolute !important;
         background: #FFFFFF;
         border: 2px solid @Metalic3;
@@ -693,7 +693,7 @@ section {
                     float: none;
                     margin-right: 0px;
             }
-	
+
 }
 .type-link {
         blockquote {
@@ -733,7 +733,7 @@ blockquote.shared_content {
 
 
 .oembed.video {
-	> a.embed_video { 
+	> a.embed_video {
 		display: block;
 		float: none;
 		> div {
@@ -751,45 +751,45 @@ blockquote.shared_content {
 .children {
 	margin-top: 1em;
 	.hide-comments-outer { margin-left:60px; }
-	
+
 	.wwto { display: none; }
-	
+
 	.comment-edit-preview { width: 660px;
 		.wall-item-container { width: 610px; }
 	 }
-	
+
 	& .children {
-		
+
 		margin-left: 40px;
 		.wall-item-container { width: 710px; }
 		.comment-edit-preview { width: 620px;
 			.wall-item-container { width: 620px; }
 		 }
-	
+
 		& .children {
 			.wall-item-container { width: 670px; }
-			.comment-edit-preview { width: 580px; 
+			.comment-edit-preview { width: 580px;
 				.wall-item-container { width: 580px; }
 			}
-		
+
 			& .children {
 				.wall-item-container { width: 630px; }
-				.comment-edit-preview { width: 540px; 
+				.comment-edit-preview { width: 540px;
 					.wall-item-container { width: 540px; }
 				}
 
 				& .children {
 					.wall-item-container { width: 590px; }
-					.comment-edit-preview { width: 500px; 
+					.comment-edit-preview { width: 500px;
 						.wall-item-container { width: 500px; }
 					}
-					
+
 					.children {
 						margin-left: 0px;
 						.hide-comments-outer { margin-left: 0px; }
 					}
 				}
-			}		
+			}
 		}
 	}
 }
@@ -818,8 +818,8 @@ span[id^="showmore-wrap"] {
 .contact-select {	position: absolute; top:64px; left:64px; display:none; }
 .contact-select:checked,
 .contact-photo:hover .contact-select {	display:block; }
-#contacts-actions { 
-	position: absolute; 
+#contacts-actions {
+	position: absolute;
 	left: 800px;
 	width: 200px;
 	background-color: @MenuBg;
@@ -843,12 +843,12 @@ span[id^="showmore-wrap"] {
 	#contacts-actions { left: 40px; }
 }
 
-.contact-photo { 
+.contact-photo {
 	width: 48px; height: 48px;
 	img { width: 48px; height: 48px; }
 	overflow: hidden;
 	display: block;
- }		
+ }
 .contact-photo-menu-button {
 	display: none;
 	position: absolute;
@@ -862,30 +862,30 @@ span[id^="showmore-wrap"] {
 	height: 90px;
 	padding-right: 10px;
 	margin: 0 10px 10px 0px;
-	.contact-photo-wrapper { 
-		float: left; 
+	.contact-photo-wrapper {
+		float: left;
 		margin-right: 10px;
 	}
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 .directory-item {
 	float: left;
 	width: 200px;
 	height: 200px;
-	.contact-photo { 
+	.contact-photo {
 		width: 175px; height: 175px;
 		img { width: 175px; height: 175px; }
 	}
 }
 .contact-name { font-weight: bold; padding-top: 15px; }
-.contact-details { 
+.contact-details {
 	color: @Grey3; white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -896,8 +896,8 @@ span[id^="showmore-wrap"] {
 #jot {
 
 	width: 100%;
-	margin: 0px 2em 20px 0px;	
-	
+	margin: 0px 2em 20px 0px;
+
 	.profile-jot-text {
 		height: 1em; width: 99%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
@@ -944,7 +944,7 @@ span[id^="showmore-wrap"] {
 				border-left: 10px solid @JotPermissionLockBackgroundColor;
 				background-color: @JotPermissionLockBackgroundColor;
 			}
-			
+
 		}
 		li.submit {
 			float: right;
@@ -990,12 +990,12 @@ span[id^="showmore-wrap"] {
 
 		&:-moz-placeholder {
 			font-weight: normal;
-		}		
-	
+		}
+
 		&:hover { border: 1px solid @CommentBoxEmptyBorderColor }
 		&:focus { border: 1px solid @CommentBoxEmptyBorderColor }
 	}
-	
+
 	#character-counter {
 		width: 40px;
 		float: right;
@@ -1004,7 +1004,7 @@ span[id^="showmore-wrap"] {
 		line-height: 20px;
 		padding-right: 20px;
 	}
-	
+
 	#jot-category {
 		border: 0px;
 		margin: 0px;
@@ -1073,7 +1073,7 @@ span[id^="showmore-wrap"] {
 	overflow: auto;
 }
 #acl-list-content {
-	
+
 }
 .acl-list-item {
 	display: block;
@@ -1090,7 +1090,7 @@ span[id^="showmore-wrap"] {
 	margin: 4px;
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
+.acl-list-item a {
 	font-size: 8px;
 	display: block;
 	width: 40px;
@@ -1135,12 +1135,12 @@ ul.tabs {
     li {
         float: left;
         margin-left: 20px;
-        
+
         .active {
 			border-bottom: 1px solid @LinkVisited;
         }
     }
-    
+
 }
 
 
@@ -1149,7 +1149,7 @@ ul.tabs {
 #group-update-wrapper{
 	height: auto; overflow: auto;
 	#group {
-		width:300px; 
+		width:300px;
 		float:left;
 		margin-right:20px;
 	}
@@ -1191,13 +1191,13 @@ ul.tabs {
 	input[type="checkbox"], input[type="radio"]{
 		width: auto;
 	}
-	
+
 	textarea { height: 100px; }
 	.field_help {
 		display: block;
 		margin-left: 200px;
 		color: @FieldHelpColor;
-		
+
 	}
 
 
@@ -1272,7 +1272,7 @@ ul.tabs {
 }
 #profile-edit-profile-name,
 #profile-edit-name,
-#gender-select, 
+#gender-select,
 #profile-edit-pdesc,
 #profile-edit-gender,
 #profile-edit-dob,
@@ -1297,7 +1297,7 @@ ul.tabs {
 	height: auto; overflow: auto;
 	border-bottom: 2px solid #cccccc;
 	padding-bottom: 1em;
-	margin-bottom: 1em;	
+	margin-bottom: 1em;
 }
 .oauthapp img {
 	float: left;
@@ -1318,11 +1318,37 @@ ul.tabs {
 	width: 50px; float: left;
 }
 
+/* videos page */
+.videos {
+	.video-top-wrapper {
+		width: 200px; float: left;
+		margin: 0px 10px 10px 0px;
+		position: relative;
+
+		.video-js {
+			width: 200px!important;
+			height: 132px!important;
+		}
+
+		.video-delete {
+			position: absolute;
+			opacity: 0;
+			right: 0px;
+			top: 0px;
+			transition: opacity 0.5s;
+		}
+
+		&:hover .video-delete {
+			opacity: 1;
+		}
+	}
+}
+
 /* photo albums */
 @photosize: 150px;
 
 #photo-edit-link-wrap { margin-bottom: 10px; }
-	
+
 #album-edit-link {
 	border-right: 1px solid @MenuBorder;
 	float: left;
@@ -1355,21 +1381,21 @@ ul.tabs {
 	width:@photosize; height: @photosize;
 	position: relative;
 	overflow: hidden;
-	
+
 	img { width: @photosize; }
-		
+
 	.photo-top-album-name,
 	.caption{
 		position: absolute;
 		color: @Menu;
 		background-color: @MenuBg;
-		
+
 		width: 100%;
 		.shadow(0px, 5px);
 		.transition(0.5s);
 		bottom: -@photosize;
 	}
-	
+
 	&:hover .photo-top-album-name,
 	&:hover .caption {
 		bottom: 0px;
@@ -1389,8 +1415,8 @@ ul.tabs {
 	background: url("../../../images/icons/22/image.png") no-repeat top left;
 	padding-left: 23px;
 	min-height: 22px;
-	padding-top: 6px; 
-	/* a { display: block;}*/ 
+	padding-top: 6px;
+	/* a { display: block;}*/
 }
 
 #photo-caption {
@@ -1438,14 +1464,14 @@ ul.tabs {
             top: 10px;
 	    left: -10px;
         }
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 
 /* messages */
@@ -1466,10 +1492,10 @@ ul.tabs {
 	background-color: @MailListBackgroundColor;
 	margin-bottom: 5px;
 	width: 100%; height: auto; overflow: hidden;
-	
+
 	span { display: block; float: left; width: 20%; overflow: hidden;}
-	
-	.mail-subject { 
+
+	.mail-subject {
 		width: 30%;
 		padding:4px 0px 0px 4px;
 		a { display: block; }
@@ -1478,7 +1504,7 @@ ul.tabs {
 	.mail-date { padding: 4px 4px 0px 4px; }
 	.mail-from { padding: 4px 4px 0px 4px; }
 	.mail-count { padding: 4px 4px 0px 4px; text-align: right;}
-	
+
 	.mail-delete { float: right; }
 }
 
@@ -1490,7 +1516,7 @@ ul.tabs {
 	span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;}
 	.mail-delete { float: right;  .opaque(0.5);}
 	&:hover .mail-delete { .opaque(1); }
-	
+
 }
 
 /* theme screenshot */
@@ -1519,7 +1545,7 @@ footer { height: 100px; display: table-row; }
 	font-weight: bold;
 	background-color: #FF0000;
 	padding: 0em 0.3em;
-	
+
 }
 #adminpage {
     dl {
@@ -1566,20 +1592,20 @@ footer { height: 100px; display: table-row; }
     }
     table {
         width:100%;
-        border-bottom: 1px solid #000000; 
+        border-bottom: 1px solid #000000;
         margin: 5px 0px;
-        th { 
+        th {
             text-align: left;
         }
-        td .icon { 
+        td .icon {
             float: left;
         }
-        tr:hover { 
+        tr:hover {
             background-color: #bbc7d7;
         }
     }
-    table#users img { 
-            width: 16px; height: 16px; 
+    table#users img {
+            width: 16px; height: 16px;
     }
     .selectall { text-align: right; }
 }

From d204e2524b5e61f56f98ba8bfeda286c2fe79d6f Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 10:34:17 +0200
Subject: [PATCH 4/6] vier: style video delete button

---
 view/theme/vier/style.css | 77 +++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 28 deletions(-)

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index e75934c8c5..e36bad4e31 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -7,7 +7,7 @@
 @import url("css/font-awesome.css") all;
 @import url("css/font2.css") all;
 
-img { 
+img {
   border: 0px;
 }
 
@@ -32,7 +32,7 @@ img {
 }
 
 .admin.linklist {
-        border: 0px; 
+        border: 0px;
 	padding: 0px;
 	list-style: none;
 	margin-top: 0px;
@@ -135,7 +135,7 @@ img {
   padding: 1px;
   color: #999;
   vertical-align: text-top;
-} 
+}
 
 .icon:hover {
   text-decoration: none;
@@ -201,8 +201,8 @@ div.pager a {
   margin-left: 5px;
   margin-right: 5px;
 }
- 
-span.pager_first a, span.pager_n a, 
+
+span.pager_first a, span.pager_n a,
 span.pager_last a, span.pager_prev a, span.pager_next a,
 span.scroll_loader_text {
   color: darkgray;
@@ -389,7 +389,7 @@ code {
   opacity: 1;
 }
 
-.sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover, 
+.sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover,
 #sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover,
 .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, #message-new:hover {
   /* background-color: #ddd; */
@@ -1466,7 +1466,7 @@ section.minimal {
 }
 
 #profile-jot-form #jot-title, #profile-jot-form #jot-category {
-    
+
          border-radius: 5px 5px 5px 5px;
     font-weight: bold;
     height: 20px;
@@ -1966,13 +1966,13 @@ ul.tabs a {
     margin-bottom: 2px;
 }
 
-#event-notice:hover, #birthday-notice:hover, ul.tabs li .active, 
+#event-notice:hover, #birthday-notice:hover, ul.tabs li .active,
 .comment-edit-submit-wrapper .fakelink:hover {
     color: black;
 }
 
-span.pager_current, span.pager_n a:hover, 
-span.pager_first a:hover, span.pager_last a:hover, 
+span.pager_current, span.pager_n a:hover,
+span.pager_first a:hover, span.pager_last a:hover,
 span.pager_prev a:hover, span.pager_next a:hover,
 ul.tabs a:hover {
   border-bottom: 2px solid #244C5E;
@@ -2092,7 +2092,7 @@ aside form .field label {
 
 .profile-edit-side-div {
 /*  display: none; */
-  float: right; 
+  float: right;
 }
 
 /* aside div.clear {
@@ -2169,9 +2169,9 @@ aside form .field label {
 .contact-photo-menu-button {
         position: relative;
         background-image: url("../../../images/icons/16/menu.png");
-        background-position: top left; 
+        background-position: top left;
         background-repeat: no-repeat;
-        margin: 0px 0px -16px 0px; 
+        margin: 0px 0px -16px 0px;
 	padding: 0px;
         width: 16px;
         height: 16px;
@@ -2179,7 +2179,7 @@ aside form .field label {
         overflow: hidden;
         text-indent: 40px;
         display: none;
-        
+
 }
 .contact-photo-menu {
         width: 11em;
@@ -2194,13 +2194,13 @@ aside form .field label {
 }
 .contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
 .contact-photo-menu li a {
-	display: block; 
-	padding: 5px 10px; 
+	display: block;
+	padding: 5px 10px;
 	color: #2d2d2d;
 	text-decoration: none;
 }
 .contact-photo-menu li a:hover {
-	background-color: #bdcdd4; 
+	background-color: #bdcdd4;
 }
 
 /* page footer */
@@ -2237,7 +2237,7 @@ blockquote {
 }
 
 .contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; } 
+#contact-block-end { clear: both; }
 
 #group-edit-wrapper {
         margin-bottom: 10px;
@@ -2426,7 +2426,7 @@ a.mail-list-link {
         clear: both;
 }
 
- 
+
 .calendar {
         font-family: Courier, monospace;
 }
@@ -2574,14 +2574,14 @@ a.mail-list-link {
         float: left;
         margin-top: 15px;
         margin-right: 15px;
-        width: 200px; height: 200px; 
-        overflow: hidden; 
+        width: 200px; height: 200px;
+        overflow: hidden;
 }
 .photo-top-album-name {
         width: 100%;
         min-height: 2em;
-        position: absolute; 
-        bottom: 0px; 
+        position: absolute;
+        bottom: 0px;
         padding: 0px 3px;
         padding-top: 0.5em;
         background-color: rgb(255, 255, 255);
@@ -2612,15 +2612,15 @@ a.mail-list-link {
 .menu-profile-list-item{
         padding-left: 5px;
         vertical-align: middle;
-        }       
-.menu-profile-list-item:hover{  
+        }
+.menu-profile-list-item:hover{
         text-decoration: none;
    }
 
 .autocomplete {
   width: 350px;
-  color: black; 
-  border: 1px solid rgb(210, 210, 210); 
+  color: black;
+  border: 1px solid rgb(210, 210, 210);
   background-color: white;
   cursor: pointer;
   text-align: left;
@@ -2628,7 +2628,7 @@ a.mail-list-link {
   overflow: auto;
   display: block;
   background-position: initial initial;
-  background-repeat: initial initial; 
+  background-repeat: initial initial;
 }
 .mail-list-wrapper {
   background-color: #f6f7f8;
@@ -2828,3 +2828,24 @@ a.mail-list-link {
 .profile-view-actions{
   float:right;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 300px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 300px!important;
+  height: 232px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}

From 8990a22dc066d91e1ca5613d1365a855677b4bdc Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 10:35:55 +0200
Subject: [PATCH 5/6] duepuntozer: style video delete button

---
 view/theme/duepuntozero/style.css | 140 +++++++++++++++++-------------
 1 file changed, 81 insertions(+), 59 deletions(-)

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 024e63f5f6..34d7f1c25c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -22,7 +22,7 @@ a:hover {text-decoration: underline; }
 input {
 	border: 1px solid #666666;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 	padding: 3px;
 }
 
@@ -50,7 +50,7 @@ code {
 	background: #EEE;
 	color: #444;
 	padding: 10px;
-	margin-top: 20px; 
+	margin-top: 20px;
 }
 
 blockquote {
@@ -91,7 +91,7 @@ nav {
 	display: block;
 	margin: 0px 10%;
 	border-bottom: 1px solid #babdb6;
-	position: relative; 
+	position: relative;
 }
 nav #site-location {
 	color: #888a85;
@@ -151,9 +151,9 @@ nav #banner #logo-text a:hover { text-decoration: none; }
 	border: 1px solid #babdb6;
 	border-bottom: 0px;
 	background-color: #aec0d3;
-	color: #565854;		
+	color: #565854;
 	-moz-border-radius: 3px 3px 0px 0px;
-	border-radius: 3px 3px 0px 0px;	
+	border-radius: 3px 3px 0px 0px;
 }
 nav .nav-link {
 	float: right;
@@ -173,7 +173,7 @@ nav .nav-link {
 .nav-ajax-left {
 	font-size: 0.8em;
 	float: left;
-	margin-top: 62px;	
+	margin-top: 62px;
 }
 
 
@@ -228,12 +228,12 @@ section {
 	background-position: top right;
 	background-repeat: no-repeat;
 	min-height: 112px;
-	
+
 }
 .tabs {
 	height: 27px;
 	background-image: url(head.jpg);
-	background-repeat: repeat-x;	
+	background-repeat: repeat-x;
 	background-position: 0px -20px;
 	border-bottom: 1px solid #babdb6;
 	padding:0px;
@@ -248,7 +248,7 @@ section {
 }
 .tab.active {
 	font-weight: bold;
-	
+
 }
 
 
@@ -278,14 +278,14 @@ div.wall-item-content-wrapper.shiny {
 }
 
 /* from default */
-#jot-perms-icon, 
+#jot-perms-icon,
 #profile-location,
 #profile-nolocation,
-#profile-youtube, 
-#profile-video, 
+#profile-youtube,
+#profile-video,
 #profile-audio,
 #profile-link,
-#profile-title, 
+#profile-title,
 #wall-image-upload,
 #wall-file-upload,
 #profile-upload-wrapper,
@@ -313,13 +313,13 @@ div.wall-item-content-wrapper.shiny {
 #jot-category::-webkit-input-placeholder{font-weight: normal;}
 #jot-title:-moz-placeholder{font-weight: normal;}
 #jot-category:-moz-placeholder{font-weight: normal;}
-		
-	
+
+
 #jot-title:hover,
 #jot-title:focus,
 #jot-category:hover,
 #jot-category:focus {
-	border: 1px solid #cccccc; 
+	border: 1px solid #cccccc;
 }
 
 .jothidden { display:none; }
@@ -343,7 +343,7 @@ div.wall-item-content-wrapper.shiny {
 .group-selected, .nets-selected, .fileas-selected, .categories-selected {
 	padding: 3px;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 	border: 1px solid #CCCCCC;
 	background: #F8F8F8;
 	font-weight: bold;
@@ -352,7 +352,7 @@ div.wall-item-content-wrapper.shiny {
 .settings-widget .selected {
 	padding: 3px;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 	border: 1px solid #CCCCCC;
 	background: #F8F8F8;
 	font-weight: bold;
@@ -813,7 +813,7 @@ input#dfrn-url {
     clear: left;
     color: #666666;
     display: block;
-    margin-bottom: 20px	
+    margin-bottom: 20px
 }
 
 #profile-edit-profile-name-end,
@@ -944,7 +944,7 @@ input#dfrn-url {
 	border: 1px solid #CCC;
 	position: relative;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 }
 
 .tread-wrapper .tread-wrapper {
@@ -987,7 +987,7 @@ input#dfrn-url {
 	display: block;
 	position: absolute;
 	background-image: url("photo-menu.jpg");
-	background-position: top left; 
+	background-position: top left;
 	background-repeat: no-repeat;
 	margin: 0px; padding: 0px;
 	width: 16px;
@@ -996,7 +996,7 @@ input#dfrn-url {
 	overflow: hidden;
 	text-indent: 40px;
 	display: none;
-	
+
 }
 .wall-item-photo-menu {
 	width: auto;
@@ -1047,7 +1047,7 @@ input#dfrn-url {
 	/*margin-top: 10px;*/
     left: 105px;
     position: absolute;
-    top: 1px;	
+    top: 1px;
 }
 .comment .wall-item-lock {
 	left: 65px;
@@ -1100,11 +1100,11 @@ input#dfrn-url {
 }
 .star-item {
 	margin-left: 10px;
-	float: left;	
+	float: left;
 }
 .tag-item {
 	margin-left: 10px;
-	float: left;	
+	float: left;
 }
 
 .filer-item {
@@ -1141,7 +1141,7 @@ input#dfrn-url {
 	border: none;
 }
 .comment .wall-item-photo {
-	width: 50px !important; 
+	width: 50px !important;
 	height: 50px !important;
 }
 .wall-item-content {
@@ -1240,7 +1240,7 @@ blockquote.shared_content {
 
 .comment .wall-item-tools {
 	background:none;
-} 
+}
 
 .comment-edit-wrapper {
 	margin-top: 15px;
@@ -1270,7 +1270,7 @@ blockquote.shared_content {
 	float: left;
 	margin-top: 10px;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 	border: 1px solid #cccccc;
 	padding: 3px 1px 1px 3px;
 }
@@ -1676,7 +1676,7 @@ blockquote.shared_content {
 .contact-photo-menu-button {
 	position: absolute;
 	background-image: url("photo-menu.jpg");
-	background-position: top left; 
+	background-position: top left;
 	background-repeat: no-repeat;
 	margin: 0px; padding: 0px;
 	width: 16px;
@@ -1685,7 +1685,7 @@ blockquote.shared_content {
 	overflow: hidden;
 	text-indent: 40px;
 	display: none;
-	
+
 }
 .contact-photo-menu {
 	width: auto;
@@ -1723,7 +1723,7 @@ blockquote.shared_content {
 	border: 1px solid #cccccc;
 	padding: 3px 0px 0px 5px;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 }
 
 
@@ -1777,7 +1777,7 @@ blockquote.shared_content {
 	overflow: auto;
 }
 #acl-list-content {
-	
+
 }
 .acl-list-item {
 	display: block;
@@ -1794,7 +1794,7 @@ blockquote.shared_content {
 	margin: 4px;
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
+.acl-list-item a {
 	font-size: 8px;
 	display: block;
 	width: 40px;
@@ -2111,15 +2111,15 @@ aside input[type='text'] {
 	margin-top: 15px;
 	margin-right: 15px;
 	margin-left: 15px;
-/*	width: 200px; height: 200px; 
-	overflow: hidden; 
+/*	width: 200px; height: 200px;
+	overflow: hidden;
 	position: relative; */
 }
 .photo-album-image-wrapper .caption {
-	display: none; 
+	display: none;
  	width: 100%;
 /* 	position: absolute; */
- 	bottom: 0px; 
+ 	bottom: 0px;
  	padding: 0.5em 0.5em 0px 0.5em;
  	background-color: rgba(245, 245, 255, 0.8);
  	border-bottom: 2px solid #CCC;
@@ -2141,14 +2141,14 @@ aside input[type='text'] {
 	margin-right: 15px;
 	margin-left: 15px;
 	margin-bottom: 15px;
-/*	width: 200px; height: 200px; 
+/*	width: 200px; height: 200px;
 	overflow: hidden; */
 }
 .photo-top-album-name {
  	width: 100%;
  	min-height: 2em;
 /* 	position: absolute;  */
- 	bottom: 0px; 
+ 	bottom: 0px;
  	padding: 0px 3px;
  	padding-top: 0.5em;
  	background-color: rgb(255, 255, 255);
@@ -2236,7 +2236,7 @@ aside input[type='text'] {
 }
 
 #profile-jot-banner-end {
-	/* clear: both; */ 
+	/* clear: both; */
 }
 
 #photos-upload-select-files-text {
@@ -2464,7 +2464,7 @@ aside input[type='text'] {
 }
 
 /* end from default */
-	
+
 
 .fn {
 	padding: 0px 0px 5px 12px;
@@ -2483,7 +2483,7 @@ aside input[type='text'] {
 
 #birthday-title {
 	float: left;
-	font-weight: bold;	
+	font-weight: bold;
 }
 
 #birthday-adjust {
@@ -2607,7 +2607,7 @@ aside input[type='text'] {
 	clear: both;
 }
 
- 
+
 .calendar {
 	font-family: Courier, monospace;
 }
@@ -2791,7 +2791,7 @@ aside input[type='text'] {
 
 
 #netsearch-box {
-	margin-top: 20px;	
+	margin-top: 20px;
 }
 
 #netsearch-box #search-submit {
@@ -2898,7 +2898,7 @@ aside input[type='text'] {
 .settings-heading {
 	border-bottom: 1px solid #babdb6;
 }
- 
+
 
 /**
  * Form fields
@@ -2924,7 +2924,7 @@ aside input[type='text'] {
 	display: block;
 	margin-left: 200px;
 	color: #666666;
-	
+
 }
 
 
@@ -2972,7 +2972,7 @@ aside input[type='text'] {
 	font-weight: bold;
 	background-color: #FF0000;
 	padding: 0em 0.3em;
-	
+
 }
 #adminpage dl {
 	clear: left;
@@ -3027,7 +3027,7 @@ aside input[type='text'] {
 /*
  * UPDATE
  */
-.popup { 	
+.popup {
 	width: 100%; height: 100%;
 	top:0px; left:0px;
 	position: absolute;
@@ -3048,7 +3048,7 @@ aside input[type='text'] {
 	border: 4px solid #000000;
 	background-color: #FFFFFF;
 }
-.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } 
+.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
 .popup .panel .panel_in { width: 100%; height: 100%;	position: relative; }
 .popup .panel .panel_actions {  width: 100%; bottom: 4px; left: 0px; position: absolute; }
 .panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
@@ -3061,7 +3061,7 @@ aside input[type='text'] {
 	height: auto; overflow: auto;
 	border-bottom: 2px solid #cccccc;
 	padding-bottom: 1em;
-	margin-bottom: 1em;	
+	margin-bottom: 1em;
 }
 .oauthapp img {
 	float: left;
@@ -3365,7 +3365,7 @@ ul.menu-popup {
 }
 
 #recip {
-	
+
 }
 .autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
 .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
@@ -3400,10 +3400,10 @@ ul.menu-popup {
 }
 @media all and (max-width: 760px) {
 	body { background-image: none; }
-	nav, aside, section, footer { 
-		margin: 0px; 
-		float: none; 
-		position: relative; 
+	nav, aside, section, footer {
+		margin: 0px;
+		float: none;
+		position: relative;
 		width: 100%;
 		padding: 0.5em;
 		height: auto;
@@ -3416,11 +3416,11 @@ ul.menu-popup {
 	aside { overflow: hidden; min-height: 0; height: 1em;}
 	aside:hover, aside:focus { height: auto; }
 
-	nav .nav-link { 
+	nav .nav-link {
 		float: left;
 		width: 23%;
 		min-width: 100px;
-		height: 15px;	
+		height: 15px;
 		display: block;
 		margin: 0.4em 2px 0 0;
 
@@ -3431,11 +3431,11 @@ ul.menu-popup {
 		background-color: rgb(174, 192,211)!important;
 	}
 	.nav-commlink.selected,
-	.nav-commlink { 
+	.nav-commlink {
 		border-bottom: 0px;
 		padding: 6px 3px;
 		min-width: 100px;
-		float: left; 
+		float: left;
 		margin-top: 0.4em;
 		width: 23%;
 		bottom: auto;
@@ -3446,3 +3446,25 @@ ul.menu-popup {
 	ul.menu-popup { left: 0px; top 20px; }
 
 }
+
+/* videos page */
+.videos .video-top-wrapper {
+  width: 300px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 300px!important;
+  height: 232px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}

From 258612d20c799f316f9787d953302ddb8fe86c85 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 10:39:36 +0200
Subject: [PATCH 6/6] update messages.po

---
 util/messages.po | 328 ++++++++++++++++++++++++-----------------------
 1 file changed, 168 insertions(+), 160 deletions(-)

diff --git a/util/messages.po b/util/messages.po
index 8303b778be..bf91a8fa58 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-21 10:43+0200\n"
+"POT-Creation-Date: 2015-05-24 10:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,9 +29,9 @@ msgstr ""
 #: ../../mod/photos.php:1084 ../../mod/photos.php:1203
 #: ../../mod/photos.php:1514 ../../mod/photos.php:1565
 #: ../../mod/photos.php:1609 ../../mod/photos.php:1697
-#: ../../mod/invite.php:140 ../../mod/events.php:491 ../../mod/mood.php:137
+#: ../../mod/invite.php:140 ../../mod/events.php:500 ../../mod/mood.php:137
 #: ../../mod/message.php:335 ../../mod/message.php:564
-#: ../../mod/profiles.php:686 ../../mod/install.php:248
+#: ../../mod/profiles.php:682 ../../mod/install.php:248
 #: ../../mod/install.php:286 ../../mod/crepair.php:190
 #: ../../mod/content.php:710 ../../mod/poke.php:199 ../../mod/localtime.php:45
 msgid "Submit"
@@ -233,7 +233,7 @@ msgid "Your photos"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:127 ../../boot.php:2156
-#: ../../include/nav.php:80 ../../mod/events.php:382
+#: ../../include/nav.php:80 ../../mod/events.php:385
 msgid "Events"
 msgstr ""
 
@@ -260,7 +260,7 @@ msgid "event"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:466
-#: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:2060
+#: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:2061
 #: ../../include/conversation.php:121 ../../include/conversation.php:130
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../mod/like.php:149 ../../mod/like.php:319 ../../mod/subthread.php:87
@@ -268,14 +268,14 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:2060
+#: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:2061
 #: ../../include/conversation.php:126 ../../include/conversation.php:253
 #: ../../include/text.php:1995 ../../mod/like.php:149
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62
 msgid "photo"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:2076
+#: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:2077
 #: ../../include/conversation.php:137 ../../mod/like.php:166
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -375,7 +375,7 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../index.php:382 ../../include/items.php:4838 ../../mod/attach.php:33
+#: ../../index.php:382 ../../include/items.php:4851 ../../mod/attach.php:33
 #: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
 #: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
 #: ../../mod/group.php:19 ../../mod/delegate.php:12
@@ -389,9 +389,9 @@ msgstr ""
 #: ../../mod/notes.php:20 ../../mod/network.php:4 ../../mod/photos.php:134
 #: ../../mod/photos.php:1050 ../../mod/follow.php:9 ../../mod/follow.php:39
 #: ../../mod/follow.php:78 ../../mod/uimport.php:23 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/events.php:152 ../../mod/mood.php:114
+#: ../../mod/invite.php:101 ../../mod/events.php:155 ../../mod/mood.php:114
 #: ../../mod/message.php:38 ../../mod/message.php:174
-#: ../../mod/profiles.php:165 ../../mod/profiles.php:618
+#: ../../mod/profiles.php:165 ../../mod/profiles.php:614
 #: ../../mod/install.php:151 ../../mod/crepair.php:119 ../../mod/poke.php:135
 #: ../../mod/display.php:501 ../../mod/dfrn_confirm.php:55
 #: ../../mod/item.php:169 ../../mod/item.php:185
@@ -415,8 +415,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: ../../boot.php:751 ../../include/contact_widgets.php:205
-#: ../../object/Item.php:393 ../../mod/content.php:606
+#: ../../boot.php:751 ../../include/items.php:4962
+#: ../../include/contact_widgets.php:205 ../../object/Item.php:393
+#: ../../mod/content.php:606
 msgid "show more"
 msgstr ""
 
@@ -515,28 +516,28 @@ msgstr ""
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1600 ../../boot.php:1626 ../../mod/profiles.php:804
+#: ../../boot.php:1600 ../../boot.php:1626 ../../mod/profiles.php:800
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../boot.php:1601 ../../mod/profiles.php:805
+#: ../../boot.php:1601 ../../mod/profiles.php:801
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../boot.php:1611 ../../mod/profiles.php:816
+#: ../../boot.php:1611 ../../mod/profiles.php:812
 msgid "Profile Image"
 msgstr ""
 
-#: ../../boot.php:1614 ../../mod/profiles.php:818
+#: ../../boot.php:1614 ../../mod/profiles.php:814
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../boot.php:1615 ../../mod/profiles.php:819
+#: ../../boot.php:1615 ../../mod/profiles.php:815
 msgid "Edit visibility"
 msgstr ""
 
 #: ../../boot.php:1637 ../../include/event.php:42
-#: ../../include/bb2diaspora.php:155 ../../mod/events.php:483
+#: ../../include/bb2diaspora.php:155 ../../mod/events.php:492
 #: ../../mod/directory.php:136
 msgid "Location:"
 msgstr ""
@@ -803,12 +804,12 @@ msgstr ""
 msgid "Ability to mute notifications for a thread"
 msgstr ""
 
-#: ../../include/items.php:2330 ../../include/datetime.php:477
+#: ../../include/items.php:2330 ../../include/datetime.php:457
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/items.php:2331 ../../include/datetime.php:478
+#: ../../include/items.php:2331 ../../include/datetime.php:458
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@@ -839,21 +840,22 @@ msgstr ""
 #: ../../mod/contacts.php:411 ../../mod/register.php:233
 #: ../../mod/dfrn_request.php:845 ../../mod/api.php:105
 #: ../../mod/suggest.php:29 ../../mod/follow.php:54 ../../mod/message.php:209
-#: ../../mod/profiles.php:661 ../../mod/profiles.php:664
+#: ../../mod/profiles.php:657 ../../mod/profiles.php:660
 msgid "Yes"
 msgstr ""
 
 #: ../../include/items.php:4686 ../../include/conversation.php:1128
 #: ../../mod/settings.php:622 ../../mod/settings.php:648
-#: ../../mod/contacts.php:414 ../../mod/editpost.php:148
-#: ../../mod/dfrn_request.php:859 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/suggest.php:32
-#: ../../mod/photos.php:203 ../../mod/photos.php:292 ../../mod/follow.php:65
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/message.php:212
+#: ../../mod/contacts.php:414 ../../mod/videos.php:116
+#: ../../mod/editpost.php:148 ../../mod/dfrn_request.php:859
+#: ../../mod/fbrowser.php:81 ../../mod/fbrowser.php:116
+#: ../../mod/suggest.php:32 ../../mod/photos.php:203 ../../mod/photos.php:292
+#: ../../mod/follow.php:65 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/message.php:212
 msgid "Cancel"
 msgstr ""
 
-#: ../../include/items.php:4904
+#: ../../include/items.php:4956
 msgid "Archives"
 msgstr ""
 
@@ -1349,11 +1351,11 @@ msgstr ""
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:714
+#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:710
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:716
+#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:712
 msgid "Hometown:"
 msgstr ""
 
@@ -1361,7 +1363,7 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:717
+#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:713
 msgid "Political Views:"
 msgstr ""
 
@@ -1373,11 +1375,11 @@ msgstr ""
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:721
+#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:717
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:722
+#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:718
 msgid "Dislikes:"
 msgstr ""
 
@@ -1783,71 +1785,75 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/datetime.php:153 ../../include/datetime.php:290
-msgid "year"
+#: ../../include/datetime.php:141
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:158 ../../include/datetime.php:291
-msgid "month"
-msgstr ""
-
-#: ../../include/datetime.php:163 ../../include/datetime.php:293
-msgid "day"
-msgstr ""
-
-#: ../../include/datetime.php:276
+#: ../../include/datetime.php:256
 msgid "never"
 msgstr ""
 
-#: ../../include/datetime.php:282
+#: ../../include/datetime.php:262
 msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/datetime.php:290
+#: ../../include/datetime.php:270
+msgid "year"
+msgstr ""
+
+#: ../../include/datetime.php:270
 msgid "years"
 msgstr ""
 
-#: ../../include/datetime.php:291
+#: ../../include/datetime.php:271
+msgid "month"
+msgstr ""
+
+#: ../../include/datetime.php:271
 msgid "months"
 msgstr ""
 
-#: ../../include/datetime.php:292
+#: ../../include/datetime.php:272
 msgid "week"
 msgstr ""
 
-#: ../../include/datetime.php:292
+#: ../../include/datetime.php:272
 msgid "weeks"
 msgstr ""
 
-#: ../../include/datetime.php:293
+#: ../../include/datetime.php:273
+msgid "day"
+msgstr ""
+
+#: ../../include/datetime.php:273
 msgid "days"
 msgstr ""
 
-#: ../../include/datetime.php:294
+#: ../../include/datetime.php:274
 msgid "hour"
 msgstr ""
 
-#: ../../include/datetime.php:294
+#: ../../include/datetime.php:274
 msgid "hours"
 msgstr ""
 
-#: ../../include/datetime.php:295
+#: ../../include/datetime.php:275
 msgid "minute"
 msgstr ""
 
-#: ../../include/datetime.php:295
+#: ../../include/datetime.php:275
 msgid "minutes"
 msgstr ""
 
-#: ../../include/datetime.php:296
+#: ../../include/datetime.php:276
 msgid "second"
 msgstr ""
 
-#: ../../include/datetime.php:296
+#: ../../include/datetime.php:276
 msgid "seconds"
 msgstr ""
 
-#: ../../include/datetime.php:305
+#: ../../include/datetime.php:285
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr ""
@@ -1986,7 +1992,7 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2493
+#: ../../include/diaspora.php:2494
 msgid "Attachments:"
 msgstr ""
 
@@ -2261,7 +2267,7 @@ msgstr ""
 #: ../../include/conversation.php:1125 ../../object/Item.php:690
 #: ../../mod/editpost.php:145 ../../mod/photos.php:1566
 #: ../../mod/photos.php:1610 ../../mod/photos.php:1698
-#: ../../mod/events.php:489 ../../mod/content.php:719
+#: ../../mod/events.php:498 ../../mod/content.php:719
 msgid "Preview"
 msgstr ""
 
@@ -2533,7 +2539,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1424 ../../mod/videos.php:301
+#: ../../include/text.php:1424 ../../mod/videos.php:368
 msgid "View Video"
 msgstr ""
 
@@ -2546,7 +2552,7 @@ msgid "Click to open/close"
 msgstr ""
 
 #: ../../include/text.php:1674 ../../include/text.php:1684
-#: ../../mod/events.php:347
+#: ../../mod/events.php:350
 msgid "link to source"
 msgstr ""
 
@@ -3868,8 +3874,8 @@ msgstr ""
 #: ../../mod/settings.php:1108 ../../mod/settings.php:1109
 #: ../../mod/settings.php:1110 ../../mod/register.php:234
 #: ../../mod/dfrn_request.php:845 ../../mod/api.php:106
-#: ../../mod/follow.php:54 ../../mod/profiles.php:661
-#: ../../mod/profiles.php:665
+#: ../../mod/follow.php:54 ../../mod/profiles.php:657
+#: ../../mod/profiles.php:661
 msgid "No"
 msgstr ""
 
@@ -4643,30 +4649,38 @@ msgstr ""
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/videos.php:115 ../../mod/dfrn_request.php:777
+#: ../../mod/videos.php:108
+msgid "Do you really want to delete this video?"
+msgstr ""
+
+#: ../../mod/videos.php:113
+msgid "Delete Video"
+msgstr ""
+
+#: ../../mod/videos.php:182 ../../mod/dfrn_request.php:777
 #: ../../mod/viewcontacts.php:19 ../../mod/photos.php:920
 #: ../../mod/search.php:89 ../../mod/community.php:18
 #: ../../mod/display.php:214 ../../mod/directory.php:33
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/videos.php:125
+#: ../../mod/videos.php:192
 msgid "No videos selected"
 msgstr ""
 
-#: ../../mod/videos.php:226 ../../mod/photos.php:1031
+#: ../../mod/videos.php:293 ../../mod/photos.php:1031
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/videos.php:308 ../../mod/photos.php:1808
+#: ../../mod/videos.php:375 ../../mod/photos.php:1808
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/videos.php:317
+#: ../../mod/videos.php:384
 msgid "Recent Videos"
 msgstr ""
 
-#: ../../mod/videos.php:319
+#: ../../mod/videos.php:386
 msgid "Upload New Videos"
 msgstr ""
 
@@ -6642,72 +6656,67 @@ msgstr ""
 msgid "is interested in:"
 msgstr ""
 
-#: ../../mod/events.php:68 ../../mod/events.php:70
+#: ../../mod/events.php:71 ../../mod/events.php:73
 msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:303
+#: ../../mod/events.php:306
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:325
+#: ../../mod/events.php:328
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:383
+#: ../../mod/events.php:386
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:384
+#: ../../mod/events.php:387
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:385 ../../mod/install.php:207
+#: ../../mod/events.php:388 ../../mod/install.php:207
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:458
-msgid "hour:minute"
-msgstr ""
-
-#: ../../mod/events.php:468
+#: ../../mod/events.php:480
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:469
-#, php-format
-msgid "Format is %s %s. Starting date and Title are required."
+#: ../../mod/events.php:481
+msgid "Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:471
+#: ../../mod/events.php:482
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:471 ../../mod/events.php:485
+#: ../../mod/events.php:482 ../../mod/events.php:494
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:474
+#: ../../mod/events.php:484
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:476
+#: ../../mod/events.php:486
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:479
+#: ../../mod/events.php:488
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:481
+#: ../../mod/events.php:490
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:485
+#: ../../mod/events.php:494
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:487
+#: ../../mod/events.php:496
 msgid "Share this event"
 msgstr ""
 
@@ -6842,7 +6851,7 @@ msgid "Not available."
 msgstr ""
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:133
-#: ../../mod/profiles.php:179 ../../mod/profiles.php:630
+#: ../../mod/profiles.php:179 ../../mod/profiles.php:626
 #: ../../mod/dfrn_confirm.php:64
 msgid "Profile not found."
 msgstr ""
@@ -6867,278 +6876,277 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:340
+#: ../../mod/profiles.php:336
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:344
+#: ../../mod/profiles.php:340
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:348
+#: ../../mod/profiles.php:344
 msgid "Likes"
 msgstr ""
 
-#: ../../mod/profiles.php:352
+#: ../../mod/profiles.php:348
 msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/profiles.php:356
+#: ../../mod/profiles.php:352
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:359
+#: ../../mod/profiles.php:355
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:363
+#: ../../mod/profiles.php:359
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:367
+#: ../../mod/profiles.php:363
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:371
+#: ../../mod/profiles.php:367
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:375
+#: ../../mod/profiles.php:371
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:379 ../../mod/profiles.php:698
+#: ../../mod/profiles.php:375 ../../mod/profiles.php:694
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:379
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:390 ../../mod/profiles.php:694
+#: ../../mod/profiles.php:386 ../../mod/profiles.php:690
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:473
+#: ../../mod/profiles.php:469
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:568
+#: ../../mod/profiles.php:564
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:576
+#: ../../mod/profiles.php:572
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:579
+#: ../../mod/profiles.php:575
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:580
+#: ../../mod/profiles.php:576
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:583
+#: ../../mod/profiles.php:579
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:658
+#: ../../mod/profiles.php:654
 msgid "Hide contacts and friends:"
 msgstr ""
 
-#: ../../mod/profiles.php:663
+#: ../../mod/profiles.php:659
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:685
+#: ../../mod/profiles.php:681
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:687
+#: ../../mod/profiles.php:683
 msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/profiles.php:688
+#: ../../mod/profiles.php:684
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:689
+#: ../../mod/profiles.php:685
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:690
+#: ../../mod/profiles.php:686
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:691
+#: ../../mod/profiles.php:687
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:692
+#: ../../mod/profiles.php:688
 msgid "Basic information"
 msgstr ""
 
-#: ../../mod/profiles.php:693
+#: ../../mod/profiles.php:689
 msgid "Profile picture"
 msgstr ""
 
-#: ../../mod/profiles.php:695
+#: ../../mod/profiles.php:691
 msgid "Preferences"
 msgstr ""
 
-#: ../../mod/profiles.php:696
+#: ../../mod/profiles.php:692
 msgid "Status information"
 msgstr ""
 
-#: ../../mod/profiles.php:697
+#: ../../mod/profiles.php:693
 msgid "Additional information"
 msgstr ""
 
-#: ../../mod/profiles.php:699 ../../mod/newmember.php:36
+#: ../../mod/profiles.php:695 ../../mod/newmember.php:36
 #: ../../mod/profile_photo.php:244
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profiles.php:700
+#: ../../mod/profiles.php:696
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:701
+#: ../../mod/profiles.php:697
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:702
+#: ../../mod/profiles.php:698
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:703
+#: ../../mod/profiles.php:699
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:704
-#, php-format
-msgid "Birthday (%s):"
+#: ../../mod/profiles.php:700
+msgid "Birthday :"
 msgstr ""
 
-#: ../../mod/profiles.php:705
+#: ../../mod/profiles.php:701
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:706
+#: ../../mod/profiles.php:702
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:707
+#: ../../mod/profiles.php:703
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:708
+#: ../../mod/profiles.php:704
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:709
+#: ../../mod/profiles.php:705
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:710
+#: ../../mod/profiles.php:706
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:711
+#: ../../mod/profiles.php:707
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:712
+#: ../../mod/profiles.php:708
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:713
+#: ../../mod/profiles.php:709
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:715
+#: ../../mod/profiles.php:711
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:718
+#: ../../mod/profiles.php:714
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:719
+#: ../../mod/profiles.php:715
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:720
+#: ../../mod/profiles.php:716
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:723
+#: ../../mod/profiles.php:719
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:724
+#: ../../mod/profiles.php:720
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:725
+#: ../../mod/profiles.php:721
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:726
+#: ../../mod/profiles.php:722
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:727
+#: ../../mod/profiles.php:723
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:728
+#: ../../mod/profiles.php:724
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:729
+#: ../../mod/profiles.php:725
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:730
+#: ../../mod/profiles.php:726
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:731
+#: ../../mod/profiles.php:727
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:732
+#: ../../mod/profiles.php:728
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:733
+#: ../../mod/profiles.php:729
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:734
+#: ../../mod/profiles.php:730
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:735
+#: ../../mod/profiles.php:731
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:740
+#: ../../mod/profiles.php:736
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:750 ../../mod/directory.php:113
+#: ../../mod/profiles.php:746 ../../mod/directory.php:113
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:803
+#: ../../mod/profiles.php:799
 msgid "Edit/Manage Profiles"
 msgstr ""