Upgraded "add video" page.

diff --git a/pages/videolist/add.php b/pages/videolist/add.php
index 881fba6ff6e9b1ad89355888cbbe4e5b2c296962..0ae06739107753f532dcee31c8e0bed58866728a 100644 (file)
--- a/pages/videolist/add.php
+++ b/pages/videolist/add.php
@@ -1,49 +1,35 @@
 <?php
 /**
- * Elgg Video Plugin
- * This plugin allows users to create a library of youtube/vimeo/metacafe videos
+ * Add a new video
  *
- * @package Elgg
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Prateek Choudhary <synapticfield@gmail.com>
- * @copyright Prateek Choudhary
+ * @package ElggVideolist
  */
 
-// Render the video upload page
-// Load Elgg engine
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+$page_owner = elgg_get_page_owner_entity();
+
 gatekeeper();
+group_gatekeeper();
 
-//get videolist GUID
-$container_guid = get_input('container');
-if(isset($container_guid) && !empty($container_guid)){
-       $container_guid = explode(":", $container_guid);
-       if ($container_guid[0] == "group") {
-               $container = get_entity($container_guid[1]);
-               set_page_owner($container->getGUID());
-               $page_owner = page_owner_entity();
-               set_context("groupsvideos");
-               set_input("container_guid", $container->getGUID());
-       } else {
-               // Get the current page's owner
-               $page_owner = page_owner_entity();
-               if ($page_owner === false || is_null($page_owner)) {
-                       $page_owner = $_SESSION['user'];
-                       set_page_owner($_SESSION['guid']);
-                       set_input("container_guid", $_SESSION['guid']);
-               }
-       }
-}
+$title = elgg_echo('videolist:add');
 
-$title = sprintf(elgg_echo("videolist:add"));
+// set up breadcrumbs
+elgg_push_breadcrumb(elgg_echo('videolist'), "file/all");
+if (elgg_instanceof($owner, 'user')) {
+       elgg_push_breadcrumb($owner->name, "videolist/owner/$owner->username");
+} else {
+       elgg_push_breadcrumb($owner->name, "videolist/group/$owner->guid/all");
+}
+elgg_push_breadcrumb($title);
 
-//set up breadcrumbs
-elgg_push_breadcrumb(elgg_echo('videolist:all'), elgg_get_site_url()."videolist/all/");
-elgg_push_breadcrumb(elgg_echo("videolist:add"));
+// create form
+$form_vars = array();
+$body_vars = array();
+$content = elgg_view_form('videolist/add', $form_vars, $body_vars);
 
-$area1 = elgg_view('navigation/breadcrumbs');
-$area1 .= elgg_view('page_elements/content_header', array('context' => "action", 'type' => 'videolist'));
-$area2 .= elgg_view("forms/add");
-$body = elgg_view_layout('one_column_with_sidebar', $area1 . $area2, $area3);
+$body = elgg_view_layout('content', array(
+       'content' => $content,
+       'title' => $title,
+       'filter' => '',
+));
 
-page_draw($title, $body);
+echo elgg_view_page($title, $body);

diff --git a/pages/videolist/all.php b/pages/videolist/all.php
index adc718d7320b65bcd4f30f23d0f47a60354e0012..cd7500898dc931e72917d8f31a64530b5ae0d83a 100644 (file)
--- a/pages/videolist/all.php
+++ b/pages/videolist/all.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * All files
+ * All videos
  *
- * @package ElggFile
+ * @package ElggVideolist
  */
 
 elgg_push_breadcrumb(elgg_echo('videolist'));

diff --git a/views/default/forms/add.php b/views/default/forms/videolist/add.php
similarity index 100%
rename from views/default/forms/add.php
rename to views/default/forms/videolist/add.php

diff --git a/views/default/forms/browsetube.php b/views/default/forms/videolist/browsetube.php
similarity index 100%
rename from views/default/forms/browsetube.php
rename to views/default/forms/videolist/browsetube.php

diff --git a/views/default/forms/edit.php b/views/default/forms/videolist/edit.php
similarity index 100%
rename from views/default/forms/edit.php
rename to views/default/forms/videolist/edit.php

diff --git a/views/default/forms/labels/googlevideos.php b/views/default/forms/videolist/labels/googlevideos.php
similarity index 100%
rename from views/default/forms/labels/googlevideos.php
rename to views/default/forms/videolist/labels/googlevideos.php

diff --git a/views/default/forms/labels/metacafe.php b/views/default/forms/videolist/labels/metacafe.php
similarity index 100%
rename from views/default/forms/labels/metacafe.php
rename to views/default/forms/videolist/labels/metacafe.php

diff --git a/views/default/forms/labels/vimeo.php b/views/default/forms/videolist/labels/vimeo.php
similarity index 100%
rename from views/default/forms/labels/vimeo.php
rename to views/default/forms/videolist/labels/vimeo.php

diff --git a/views/default/forms/labels/youtube.php b/views/default/forms/videolist/labels/youtube.php
similarity index 100%
rename from views/default/forms/labels/youtube.php
rename to views/default/forms/videolist/labels/youtube.php