From dd489f623628930e527e8112142576bb0de24b57 Mon Sep 17 00:00:00 2001 From: Pete Harris Date: Mon, 29 Mar 2010 16:59:14 +0000 Subject: Beginnings of updating VideoList to v1.8 interface, edit, delete, favorite added. Amongst other updates Friends view and breadcrumbs added. --- actions/add.php | 2 +- actions/tubesearch.php | 2 +- all.php | 8 +- friends.php | 30 ++++++ index.php | 27 +++-- languages/en.php | 6 +- new.php | 13 ++- start.php | 29 +++--- views/default/forms/add.php | 10 +- views/default/forms/browsetube.php | 2 +- views/default/object/videolist.php | 75 +++++-------- views/default/staticvideo/index.php | 16 +-- views/default/videolist/css.php | 116 +++++---------------- views/default/videolist/groupprofile_videolist.php | 1 - views/default/videolist/videoprofile.php | 0 watch.php | 8 +- 16 files changed, 145 insertions(+), 200 deletions(-) create mode 100644 friends.php delete mode 100644 views/default/videolist/videoprofile.php diff --git a/actions/add.php b/actions/add.php index 8be09ca3a..a8a3f2905 100644 --- a/actions/add.php +++ b/actions/add.php @@ -186,7 +186,7 @@ else if($pageContainer == "vimeo"){ $videolist->videotype = "vimeo"; } -// Before we can set metadata, we need to save the blog post +// Before we can set metadata, we need to save the video if (!$videolist->save()) { register_error(elgg_echo("videolist:error")); forward("pg/videolist/new"); diff --git a/actions/tubesearch.php b/actions/tubesearch.php index 51bc6a990..e8836ed04 100644 --- a/actions/tubesearch.php +++ b/actions/tubesearch.php @@ -48,7 +48,7 @@ if (!isset($queryFeed) || empty($queryFeed)) { $startOffset = $counts->startIndex; $endOffset = ($startOffset-1) + $counts->itemsPerPage; - $body = '
'; + $body = ' diff --git a/views/default/videolist/css.php b/views/default/videolist/css.php index e2b9250b3..0b181458e 100644 --- a/views/default/videolist/css.php +++ b/views/default/videolist/css.php @@ -13,8 +13,31 @@ .videolist_error{ color:red; font-weight:bold; - font-size:11px; } + +/* video listing */ +.video_entity .entity_listing:first-child { + border-top:0; +} +.entity_listing_icon .video_icon { + width:150px; + height:95px; + display:table-cell; + text-align:center; + vertical-align: middle; + background-color: black; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; +} +.video_entity .entity_listing_info { + width:560px; + margin-left:15px; +} + + + + +/* /////////////////////////////////////////// @todo clean up / update rules below */ #video-list-main{ padding:10px; } @@ -22,9 +45,6 @@ width:100%; margin-bottom:10px; } -.search_gallery_item{ - border:0px solid #CCCCCC; -} #videobox{ width:98%; text-align:center; @@ -39,69 +59,6 @@ margin:0px 5px 0px 8px; float:left; } -#videothumbnail-box{ - float:left; - width:35%; - background: #333333; - text-align:center; - padding:3px 1px 3px 0px; -} -#videotitle-box{ - width:60%; - float:left; - font-size:12px; - font-weight:bold; - text-align:left; - padding-left:5px; - color:#474B9F; -} -.title{ - font-weight:bold; -} -#profile_video_widget_container{ - margin:0px 10px 10px 10px; - padding:8px; - -moz-border-radius-topleft:8px; - -moz-border-radius-topright:8px; - -moz-border-radius-bottomleft:8px; - -moz-border-radius-bottomright:8px; - border:0px solid #C3C3C3; - background: #FFFFFF; - max-height:250px; - overflow-y:auto; -} -#profile_video_image_container{ - float:left; - width:95%; - margin:6px 2px 0px 6px; - border-bottom:1px solid #CCC; - padding-bottom:3px; -} - -#widget_container_header{ - color:#474B9F; - margin:0px 0px 5px 0px; - font-weight:bold; - font-size:13px; -} -#loadingSearch{ - width:100%; -} -#SearchContainer{ - width:100%; -} -#responseSearch{ - padding:15px; -} -#paginateSearch{ - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - padding:2px 5px 2px 0px; - text-align:right; - background:#FFF; - border:0px solid #CCC; - color:#666; -} th{ text-align:center; font-weight:bold; @@ -141,17 +98,6 @@ th{ background:#FFFFFF; z-index:300000; } -.videolist-content{ - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - -moz-border-radius-bottomleft:5px; - -moz-border-radius-bottomright:5px; - border:1px solid #C3C3C3; - width:675px; - margin:10px 0px 10px 10px; - padding:10px; - background:#FFFFFF; -} .tubesearch{ -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px; @@ -159,20 +105,6 @@ th{ -moz-border-radius-bottomright:5px; border:1px solid #666666; } -#comment_area_video_title{ - padding:10px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - -moz-border-radius-bottomleft:5px; - -moz-border-radius-bottomright:5px; - border:1px solid #CCCCCC; - border:1px solid #CCCCCC; - background:#FFFFFF; -} -.vid-comment-widget{ - font-size:11px; - font-weight:normal; -} .searchvideorow{ padding:10px; -moz-border-radius-topleft:5px; diff --git a/views/default/videolist/groupprofile_videolist.php b/views/default/videolist/groupprofile_videolist.php index d89b8e566..2151a8f87 100644 --- a/views/default/videolist/groupprofile_videolist.php +++ b/views/default/videolist/groupprofile_videolist.php @@ -56,5 +56,4 @@ if ($videos) { } ?> -
diff --git a/views/default/videolist/videoprofile.php b/views/default/videolist/videoprofile.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/watch.php b/watch.php index 20c39f527..6694fca88 100644 --- a/watch.php +++ b/watch.php @@ -31,13 +31,11 @@ if ($videos = get_entity($video_id)) { 'entity_owner' => $page_owner, 'full' => true )); - //$area2 .= elgg_view("videolist/comments", array('entity' => $videos)); - $body = elgg_view_layout("one_column_with_sidebar", $area1 . $area2); + $body = elgg_view_layout("one_column_with_sidebar", $area1.$area2, $area3); } else { - // Display the 'post not found' page instead - $body = elgg_view("videolist/notfound"); + // video not found + $body = "

".elgg_echo('videolist:none:found')."

"; $title = elgg_echo("video:none"); - } // Finally draw the page -- cgit v1.2.3