Refs #3407 adds a footer for forms

git-svn-id: http://code.elgg.org/elgg/trunk@9167 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index b2d20579f465d699ff834a9eab69ed90de150827..cf5a4032e0d1a2bdea4fab8dc82ab2bd5408e253 100644 (file)
--- 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
 
-<div class="elgg-subtext pvm mbn elgg-divide-top">
+<div class="elgg-form-footer-alt">
+       <div class="elgg-subtext mbm">
        $save_status <span class="blog-save-status-time">$saved</span>
-</div>
+       </div>
 
-$guid_input
-$container_guid_input
+       $guid_input
+       $container_guid_input
 
-$action_buttons
+       $action_buttons
+</div>
 
 ___HTML;

diff --git a/mod/groups/actions/groups/delete.php b/mod/groups/actions/groups/delete.php
index 932d03355600333574263a37ecb4fc36f921751f..2ff6c339cde807b57841eefcad59272fa1c610ef 100644 (file)
--- 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 (file)
index 28c2eb9..0000000
--- a/mod/groups/views/default/forms/groups/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Group delete form body
- */
-
-$warning = elgg_echo("groups:deletewarning");
-
-echo elgg_view('input/hidden', array(
-       'name' => '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 1a4e955135ea5cd515ea42f5036ce2cd94df1f5d..b67134c632820262951c112872d901d22872b133 100644 (file)
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -126,7 +126,7 @@ if ($tools) {
        }
 }
 ?>
-<div class="elgg-divide-top">
+<div class="elgg-form-footer-alt">
 <?php
 
 if (isset($vars['entity'])) {
@@ -137,5 +137,15 @@ if (isset($vars['entity'])) {
 }
 
 echo elgg_view('input/submit', array('value' => 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',
+       ));
+}
 ?>
 </div>

diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index a49bbe2fb96833ce0302c22251b68f3661c702e3..83139c2ee5acee6e37d38c831eecb88c2da60957 100644 (file)
--- 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 '<div class="elgg-form-footer">';
        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 '</div>';
 } 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 2434bd14fc9cf4709bb0710f03d6a366b235beb3..5076cc49aad5b0aeee35a3a25fbd4c4f2a135a50 100644 (file)
--- 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 '<div class="delete_group">';
-       echo elgg_view_form('groups/delete', array(), array('entity' => $entity));
-       echo '</div>';
-}

diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php
index 2597598de9a4c0530b1c2caabab35306e0c2b779..5af8b5da0c92673b0f7e8039ef9e402845ea135d 100644 (file)
--- 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')) {
 </div>
 HTML;
 
+       echo '<div>';
        echo elgg_view('input/submit', array('value' => elgg_echo('send')));
+       echo '</div>';
 } 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 d286d37a39213c322ee32b018c2f53598d662925..b059db487f9796ad6d09dc91df6722f570f5ebd8 100644 (file)
--- 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'])) {
 
 ?>
 
-       <div class="elgg-divide-top mtm ptm">
+       <div class="elgg-form-footer-alt">
 <?php
 echo elgg_view('input/submit', array(
        'value' => elgg_echo('save'),

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 0230cbc547c3244975ad4ec7b3a100ba2218bd1a..4e302dff1b64a1408bb2f2b51434b65b562c416d 100644 (file)
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,6 +16,12 @@ fieldset > div {
 fieldset > div:last-child {
        margin-bottom: 0;
 }
+.elgg-form-footer {
+}
+.elgg-form-footer-alt {
+       border-top: 1px solid #CCC;
+       padding: 10px 0;
+}
 
 label {
        font-weight: bold;
@@ -76,6 +82,9 @@ input[type="radio"] {
 /* ***************************************
        FRIENDS PICKER
 *************************************** */
+.friends-picker-main-wrapper {
+       margin-bottom: 15px;
+}
 .friends-picker-container h3 {
        font-size:4em !important;
        text-align: left;

diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 857a54e1f36c816aef97792fd23041bd24bb6fa7..3deec66bdda22df7c687d030ac8d41504756dc12 100644 (file)
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -8,11 +8,10 @@
 $master_image = $vars['entity']->getIcon('master');
 
 ?>
-<div>
+<div class="clearfix">
        <img id="user-avatar" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" />
 </div>
-
-<div class="clearfloat"></div>
+<div>
 <?php
 $coords = array('x1', 'x2', 'y1', 'y2');
 foreach ($coords as $coord) {
@@ -24,6 +23,7 @@ echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity'
 echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 
 ?>
+</div>
 <!-- grab the required js for icon cropping -->
 <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.8.min.js"></script>
 <?php //@todo JS 1.8: no ?>

diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php
index 08db1f7e03654c786363de4e99def96d0392e736..b099b8c4c9bcadacbe57c57d1dd5cdcea9f42b6c 100644 (file)
--- a/views/default/forms/avatar/upload.php
+++ b/views/default/forms/avatar/upload.php
@@ -5,11 +5,12 @@
  * @uses $vars['entity']
  */
 
-echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
 ?>
 <div>
        <label><?php echo elgg_echo("avatar:upload"); ?></label><br />
        <?php echo elgg_view("input/file",array('name' => 'avatar')); ?>
-<br />
+</div>
+<div class="elgg-form-footer">
+       <?php echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); ?>
        <?php echo elgg_view('input/submit', array('value' => elgg_echo('upload'))); ?>
 </div>

diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php
index 6d674838aff63f28db9c7610ecbd6863af4f962b..40e5743388359a97d21bdbd694723d68a66e6360 100644 (file)
--- a/views/default/forms/comments/add.php
+++ b/views/default/forms/comments/add.php
@@ -18,16 +18,20 @@ if (isset($vars['entity']) && elgg_is_logged_in()) {
                echo elgg_view('input/submit', array('value' => elgg_echo('comment')));
        } else {
 ?>
-               <div>
-                       <label><?php echo elgg_echo("generic_comments:add"); ?></label>
-                       <?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
-               </div>
+       <div>
+               <label><?php echo elgg_echo("generic_comments:add"); ?></label>
+               <?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
+       </div>
+       <div>
 <?php
                echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
+?>
+       </div>
+<?php
        }
        
        echo elgg_view('input/hidden', array(
                'name' => 'entity_guid',
                'value' => $vars['entity']->getGUID()
        ));
-}
\ No newline at end of file
+}

diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php
index 62593e6990e2e505bd1de76d33c23f16c7ae6042..35871144b8fdb367314b78d8db85606788c8850d 100644 (file)
--- a/views/default/forms/usersettings/save.php
+++ b/views/default/forms/usersettings/save.php
@@ -1,7 +1,7 @@
 <?php
 $form_body = elgg_view("forms/account/settings");
 
-$form_body .= '<div class="elgg-divide-top">';
+$form_body .= '<div class="elgg-form-footer-alt">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
 $form_body .= '</div>';