From 98664daa72a390fe760b69116af8bfa9327826e3 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 19 Nov 2011 18:43:35 -0500 Subject: album creation and editing is working --- pages/photos/album/add.php | 34 ++++++++++++++++++++++++ pages/photos/album/edit.php | 47 ++++++++++++++++++++++++++++++++ pages/photos/album/view.php | 3 ++- pages/photos/image/upload.php | 62 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 pages/photos/album/add.php create mode 100644 pages/photos/album/edit.php create mode 100644 pages/photos/image/upload.php (limited to 'pages/photos') diff --git a/pages/photos/album/add.php b/pages/photos/album/add.php new file mode 100644 index 000000000..d34d39177 --- /dev/null +++ b/pages/photos/album/add.php @@ -0,0 +1,34 @@ +name, "photos/owner/$owner->username"); +} else { + elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); +} +elgg_push_breadcrumb($title); + +$vars = tidypics_prepare_form_vars(); +$content = elgg_view_form('photos/album/save', array('method' => 'post'), $vars); + +$body = elgg_view_layout('content', array( + 'content' => $content, + 'title' => $title, + 'filter' => '', +)); + +echo elgg_view_page($title, $body); diff --git a/pages/photos/album/edit.php b/pages/photos/album/edit.php new file mode 100644 index 000000000..6fff50b29 --- /dev/null +++ b/pages/photos/album/edit.php @@ -0,0 +1,47 @@ +canEdit()) { + // @todo cannot change it + forward('photos/all'); +} + +elgg_set_page_owner_guid($entity->getContainerGUID()); +$owner = elgg_get_page_owner_entity(); + +gatekeeper(); +group_gatekeeper(); + +$title = elgg_echo('album:edit'); + +// set up breadcrumbs +elgg_push_breadcrumb(elgg_echo('photos'), "photos/all"); +if (elgg_instanceof($owner, 'user')) { + elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); +} else { + elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); +} +elgg_push_breadcrumb($title); + +$vars = tidypics_prepare_form_vars($entity); +$content = elgg_view_form('photos/album/save', array('method' => 'post'), $vars); + +$body = elgg_view_layout('content', array( + 'content' => $content, + 'title' => $title, + 'filter' => '', +)); + +echo elgg_view_page($title, $body); diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php index adb5a1b51..aafcf14bc 100644 --- a/pages/photos/album/view.php +++ b/pages/photos/album/view.php @@ -12,7 +12,8 @@ group_gatekeeper(); $album_guid = (int) get_input('guid'); $album = get_entity($album_guid); if (!$album) { - + // @todo album deleted or don't have access + forward('photos/all'); } elgg_set_page_owner_guid($album->getContainerGUID()); diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php new file mode 100644 index 000000000..6580c6f52 --- /dev/null +++ b/pages/photos/image/upload.php @@ -0,0 +1,62 @@ +canEdit()) { + // throw warning and forward to previous page + forward($_SERVER['HTTP_REFERER']); +} + +// set page owner based on container (user or group) +set_page_owner($album->container_guid); + +$page_owner = page_owner_entity(); +if ($page_owner instanceof ElggGroup) { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); +} + +set_context('photos'); +$title = elgg_echo('album:addpix') . ': ' . $album->title; +$area2 .= elgg_view_title($title); + +if ($uploader == 'basic') { + $area2 .= elgg_view('input/form', array( + 'action' => "{$CONFIG->wwwroot}action/tidypics/upload", + 'body' => elgg_view('forms/tidypics/basic_upload', array('album' => $album)), + 'internalid' => 'tidypicsUpload', + 'enctype' => 'multipart/form-data', + 'method' => 'post', + )); + +} else { + $area2 .= elgg_view("forms/tidypics/ajax_upload", array('album' => $album)); +} + +$body = elgg_view_layout('two_column_left_sidebar', '', $area2); + +page_draw($title, $body); -- cgit v1.2.3