From 5c1f26521ed42546d23f3968226fcb30e9f0a7db Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 13:12:14 +0000 Subject: Refs #3407 adds a footer for forms git-svn-id: http://code.elgg.org/elgg/trunk@9167 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/forms/blog/save.php | 12 +++++++----- mod/groups/actions/groups/delete.php | 7 ++++++- mod/groups/views/default/forms/groups/delete.php | 17 ----------------- mod/groups/views/default/forms/groups/edit.php | 12 +++++++++++- mod/groups/views/default/forms/groups/invite.php | 2 ++ mod/groups/views/default/groups/edit.php | 6 ------ .../views/default/forms/invitefriends/invite.php | 2 ++ .../notifications/subscriptions/forminternals.php | 2 +- 8 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 mod/groups/views/default/forms/groups/delete.php (limited to 'mod') diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php index b2d20579f..cf5a4032e 100644 --- a/mod/blog/views/default/forms/blog/save.php +++ b/mod/blog/views/default/forms/blog/save.php @@ -135,13 +135,15 @@ $body_input $categories_input -
+
+
$save_status $saved -
+
-$guid_input -$container_guid_input + $guid_input + $container_guid_input -$action_buttons + $action_buttons +
___HTML; diff --git a/mod/groups/actions/groups/delete.php b/mod/groups/actions/groups/delete.php index 932d03355..2ff6c339c 100644 --- a/mod/groups/actions/groups/delete.php +++ b/mod/groups/actions/groups/delete.php @@ -3,7 +3,12 @@ * Delete a group */ -$guid = (int) get_input('group_guid'); +$guid = (int) get_input('guid'); +if (!$guid) { + // backward compatible + elgg_deprecated_notice("Use 'guid' for group delete action", 1.8); + $guid = (int)get_input('group_guid'); +} $entity = get_entity($guid); if (!$entity->canEdit()) { diff --git a/mod/groups/views/default/forms/groups/delete.php b/mod/groups/views/default/forms/groups/delete.php deleted file mode 100644 index 28c2eb9bf..000000000 --- a/mod/groups/views/default/forms/groups/delete.php +++ /dev/null @@ -1,17 +0,0 @@ - 'group_guid', - 'value' => $vars['entity']->getGUID(), -)); - -echo elgg_view('input/submit', array( - 'class' => "elgg-button elgg-button-delete right", - 'value' => elgg_echo('groups:delete'), - 'onclick' => "return confirm('$warning');", -)); diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index 1a4e95513..b67134c63 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -126,7 +126,7 @@ if ($tools) { } } ?> -
+
elgg_echo('save'))); + +if (isset($vars['entity'])) { + $delete_url = 'action/groups/delete?guid=' . $vars['entity']->getGUID(); + echo elgg_view('output/confirmlink', array( + 'text' => elgg_echo('groups:delete'), + 'href' => $delete_url, + 'confirm' => elgg_echo('groups:deletewarning'), + 'class' => 'elgg-button elgg-button-delete float-alt', + )); +} ?>
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php index a49bbe2fb..83139c2ee 100644 --- a/mod/groups/views/default/forms/groups/invite.php +++ b/mod/groups/views/default/forms/groups/invite.php @@ -12,9 +12,11 @@ $friends = elgg_get_logged_in_user_entity()->getFriends('', 0); if ($friends) { echo elgg_view('input/friendspicker', array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all')); + echo '
'; echo elgg_view('input/hidden', array('name' => 'forward_url', 'value' => $forward_url)); echo elgg_view('input/hidden', array('name' => 'group_guid', 'value' => $group->guid)); echo elgg_view('input/submit', array('value' => elgg_echo('invite'))); + echo '
'; } else { echo elgg_echo('groups:nofriendsatall'); } \ No newline at end of file diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php index 2434bd14f..5076cc49a 100644 --- a/mod/groups/views/default/groups/edit.php +++ b/mod/groups/views/default/groups/edit.php @@ -10,9 +10,3 @@ $entity = elgg_extract('entity', $vars, null); $form_vars = array('enctype' => 'multipart/form-data'); $body_vars = array('entity' => $entity); echo elgg_view_form('groups/edit', $form_vars, $body_vars); - -if ($entity) { - echo '
'; - echo elgg_view_form('groups/delete', array(), array('entity' => $entity)); - echo '
'; -} diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php index 2597598de..5af8b5da0 100644 --- a/mod/invitefriends/views/default/forms/invitefriends/invite.php +++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php @@ -27,7 +27,9 @@ if (elgg_get_config('allow_registration')) {
HTML; + echo '
'; echo elgg_view('input/submit', array('value' => elgg_echo('send'))); + echo '
'; } else { echo elgg_echo('invitefriends:registration_disabled'); } diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index d286d37a3..b059db487 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -325,7 +325,7 @@ if (!isset($vars['replacement'])) { ?> -
+
elgg_echo('save'), -- cgit v1.2.3