3 files changed, 45 insertions, 100 deletions

diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 742789589..51d11751e 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -21,7 +21,7 @@
 	position: relative;
 }
 #facebox .body {
-	padding: 10px;
+	padding: 10px 15px 20px 15px;
 	background-color: white;
 	width: 730px;
 	min-height:400px;
@@ -67,135 +67,79 @@
 	height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
 }
 
-/* entity listing overrides */
-#media_upload,
-#media_embed {
-	margin:0 5px 10px 5px;
-	padding:10px;
-	border:2px solid #dedede;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	background: #dedede;
-}
-#media_embed .entity_listing {
-	margin:0;
-	padding:0;
-	background-color: white;
-}
-#media_embed .entity_listing_info {
-	width:610px;
-}
-#media_upload .input_textarea {
-	height:100px;
-	width:682px;
-}
-#media_embed .embed_instructions {
-	margin:10px 0 5px 0;
+#facebox .body .content h2 {
+	color:#333333;
 }
 
+
 /* embeded content links */
-.embeded_file.link img {
-	height:18px;
-	width:auto;
-	margin-right:4px;
-	position:relative;
-	top:4px;
-}
 .embeded_file.link {
 	display: inline;
 	margin-right: 5px;
-	
 	background-repeat:no-repeat;
 	-webkit-background-size: 12px 16px;
 	-moz-background-size: 12px 16px; 
 	padding-left:14px;
 }
 
-/* modal tabs */
-#embed_media_tabs {
-	margin:10px 0 0 10px;
-	padding:0;
+/* entity listings */
+.embed_data .entity_listing_icon img {
+	cursor: pointer;
 }
-#embed_media_tabs ul {
-	list-style: none;
-	padding-left: 0;
+.embed_data .entity_listing  {
+	border-bottom:none;
 }
-#embed_media_tabs ul li {
-	float: left;
-	margin:0;
-	background:white;
+.embed_data:last-child {
+	border-bottom:1px dotted #CCCCCC;
 }
-#embed_media_tabs ul li a {
-	font-weight: bold;
-	font-size:1.2em;
-	text-align: center;
-	text-decoration: none;
-	color:#b6b6b6;
-	background: white;
-	display: block;
-	padding: 3px 10px 0 10px;
-	margin:0 10px 0 10px;
-	height:20px;
+.embed_modal_videolist .entity_listing_icon img {
+	width:75px;
+	height:auto;
+}
+.embed_modal_document .embed_data .entity_listing_info {
+	margin-top:0;
+	margin-left:7px;
+}
+.embed_data .entity_listing_info {
 	width:auto;
-	border-top:2px solid #dedede;
-	border-left:2px solid #dedede;
-	border-right:2px solid #dedede;
-	-moz-border-radius-topleft: 8px;
-	-moz-border-radius-topright: 8px;
-	-webkit-border-top-left-radius: 8px;
-	-webkit-border-top-right-radius: 8px;
-}
-#embed_media_tabs ul li a:hover {
-	background:#b6b6b6;
-	color:white;
-	border-top:2px solid #b6b6b6;
-	border-left:2px solid #b6b6b6;
-	border-right:2px solid #b6b6b6;
-}
-#embed_media_tabs ul li a.embed_tab_selected {
-	border-top:2px solid #dedede;
-	border-left:2px solid #dedede;
-	border-right:2px solid #dedede;
-	-webkit-border-top-left-radius: 8px;
-	-webkit-border-top-right-radius: 8px;
-	-moz-border-radius-topleft: 8px;
-	-moz-border-radius-topright: 8px;
-	background: #dedede;
-	color:#666666;
-	position: relative;
+	margin-top:15px;
+	margin-left:15px;
+}
+.embed_data .entity_listing {
+	cursor:pointer;
+}
+
+
+/* navigation overrides */
+.elgg_horizontal_tabbed_nav .selected a.embed_section,
+.elgg_horizontal_tabbed_nav a.embed_section:hover {
+	color:#333333;
 }
-/* IE6 fix */
-* html #embed_media_tabs ul li a { display: inline; }
 
 
 /* Pagination (override core elgg css defaults) */
-#media_embed .pagination,
-#media_upload .pagination {
-	float:right;
-	padding:5px;
-	background-color:white;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;	
-}
-#media_embed .pagination .pagination_number {
+#facebox .body .pagination {
+	float:right;	
+}
+#facebox .body .pagination .pagination_number {
 	border:1px solid #999999; 
 	color:#666666;
 }
-#media_embed .pagination .pagination_number:hover {
+#facebox .body .pagination .pagination_number:hover {
 	background-color:#aaaaaa; 
 	color:black;
 }
-#media_embed .pagination .pagination_previous,
-#media_embed .pagination .pagination_next {
+#facebox .body .pagination .pagination_previous,
+#facebox .body .pagination .pagination_next {
 	border:1px solid #999999; 
 	color:#666666;
 }
-#media_embed .pagination .pagination_previous:hover,
-#media_embed .pagination .pagination_next:hover {
+#facebox .body .pagination .pagination_previous:hover,
+#facebox .body .pagination .pagination_next:hover {
 	background-color:#aaaaaa; 
 	color:black;
 }
-#media_embed .pagination .pagination_currentpage {
+#facebox .body .pagination .pagination_currentpage {
 	background-color:#666666; 
 	border:1px solid #666666; 
 	color:white;
diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php
index 027d389bd..258e01aed 100644
--- a/mod/embed/views/default/embed/item/list.php
+++ b/mod/embed/views/default/embed/item/list.php
@@ -41,7 +41,8 @@ if ($ecml_keyword) {
 }
 
 $icon = "<img src=\"{$item->getIcon($icon_size)}\" />";
-$info = htmlentities($title, ENT_QUOTES, 'UTF-8');
+$info = "<p class='entity_title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>";
+$info .= "<p class='entity_subtext'>" . friendly_time($vars['item']->time_created) . "</p>";
 
 // @todo is this approach better than inline js?
 echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_listing($icon, $info) . '</div>';
diff --git a/mod/embed/views/default/embed/upload/content.php b/mod/embed/views/default/embed/upload/content.php
index 381867567..8e50adf6a 100644
--- a/mod/embed/views/default/embed/upload/content.php
+++ b/mod/embed/views/default/embed/upload/content.php
@@ -20,7 +20,7 @@ if ($upload_sections) {
 	));
 
 	echo "<div class='embed_modal_upload'>";
-	echo "<p>$input</p>";
+	echo "<p>Choose upload type: $input</p>";
 
 	if (!$upload_content = elgg_view($upload_sections[$active_section]['view'])) {
 		$upload_content = elgg_echo('embed:no_upload_content');