Refs #3407 using elgg-form and elgg-foot in core forms. Plugins next

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index d13b2244e2cf5e46972bbc123642a16b8168ef34..0f81597ebf983791f91d3abe25975dc68d39707d 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -262,6 +262,7 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
        $vars = array();
        $vars['id'] = 'blog-post-edit';
        $vars['name'] = 'blog_post';
+       $vars['class'] = 'elgg-form-alt';
 
        if ($page == 'edit') {
                $blog = get_entity((int)$guid);

diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index d99f45f013e209cc5225e90714d125801db2e061..79309b6ef94a3ff8002055f0a07d035a72261c54 100644 (file)
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -150,7 +150,7 @@ $body_input
 
 $categories_input
 
-<div class="elgg-form-footer-alt">
+<div class="elgg-foot">
        <div class="elgg-subtext mbm">
        $save_status <span class="blog-save-status-time">$saved</span>
        </div>

diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index c47ad0ab20a88b8eb2c1b726b35426204f463a16..2747f360ba5186b4c6153e44138848d23838f95c 100644 (file)
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -350,7 +350,7 @@ function groups_handle_invite_page($guid) {
        if ($group && $group->canEdit()) {
                $content = elgg_view_form('groups/invite', array(
                        'id' => 'invite_to_group',
-                       'class' => 'mtm',
+                       'class' => 'elgg-form-alt mtm',
                ), array(
                        'entity' => $group,
                ));

diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index b67134c632820262951c112872d901d22872b133..26436ef0118d42c830ceca85a9a56ed38795b338 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-form-footer-alt">
+<div class="elgg-foot">
 <?php
 
 if (isset($vars['entity'])) {

diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index 83139c2ee5acee6e37d38c831eecb88c2da60957..ef31317827ea78851b26a57a9ec95340d7ca0e60 100644 (file)
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -12,7 +12,7 @@ $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 '<div class="elgg-foot">';
        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')));

diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php
index 5076cc49aad5b0aeee35a3a25fbd4c4f2a135a50..24a1c3f1e5411bb4f8d4d4751ee99b9d549987ad 100644 (file)
--- a/mod/groups/views/default/groups/edit.php
+++ b/mod/groups/views/default/groups/edit.php
@@ -7,6 +7,9 @@
 
 $entity = elgg_extract('entity', $vars, null);
 
-$form_vars = array('enctype' => 'multipart/form-data');
+$form_vars = array(
+       'enctype' => 'multipart/form-data',
+       'class' => 'elgg-form-alt',
+);
 $body_vars = array('entity' => $entity);
 echo elgg_view_form('groups/edit', $form_vars, $body_vars);

diff --git a/mod/notifications/views/default/forms/notificationsettings/save.php b/mod/notifications/views/default/forms/notificationsettings/save.php
index 0306080b8274c33e4f793aab78a6ca2e275432e7..ff32d85581470e93e27f69d19638eb45850308b6 100644 (file)
--- a/mod/notifications/views/default/forms/notificationsettings/save.php
+++ b/mod/notifications/views/default/forms/notificationsettings/save.php
@@ -5,4 +5,9 @@
 
 echo elgg_view('notifications/subscriptions/personal');
 echo elgg_view('notifications/subscriptions/collections');
-echo elgg_view('notifications/subscriptions/forminternals');
\ No newline at end of file
+echo elgg_view('notifications/subscriptions/forminternals');
+
+?>
+<div class="elgg-foot">
+<?php echo elgg_view('input/submit', array('value' => elgg_echo('save'))); ?>
+</div>

diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 008e98554b474d7c8f884e58da20d8a7e22f408d..f2f6238f902527a288da0c67811258ac30f8f4b5 100644 (file)
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -8,4 +8,4 @@ echo elgg_view('subscriptions/form/additions',$vars);
        
 // Display a description
 
-echo elgg_view_form('notificationsettings/save');
+echo elgg_view_form('notificationsettings/save', array('class' => 'elgg-form-alt'));

diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index b059db487f9796ad6d09dc91df6722f570f5ebd8..106eadc543e4b59fb187086625f203ef6b2bed87 100644 (file)
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -324,12 +324,4 @@ if (!isset($vars['replacement'])) {
 }
 
 ?>
-
-       <div class="elgg-form-footer-alt">
-<?php
-echo elgg_view('input/submit', array(
-       'value' => elgg_echo('save'),
-));
-?>
-       </p>
 </div>

diff --git a/views/default/core/settings/account.php b/views/default/core/settings/account.php
index 22a58c58abd230c1c36b23bebf050ef670e6f265..0c3792ece9a913a6d7e32f4a8d4fe3d58897aa85 100644 (file)
--- a/views/default/core/settings/account.php
+++ b/views/default/core/settings/account.php
@@ -6,4 +6,4 @@
  * @subpackage Core
  */
 
-echo elgg_view_form('usersettings/save');
\ No newline at end of file
+echo elgg_view_form('usersettings/save', array('class' => 'elgg-form-alt'));
\ No newline at end of file

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index af7b2be19ff1630e41e0dc097dc905a5653b2e9a..5924b8134ef0164a60d4865680b86fb677b71c96 100644 (file)
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,9 +16,7 @@ fieldset > div {
 fieldset > div:last-child {
        margin-bottom: 0;
 }
-.elgg-form-footer {
-}
-.elgg-form-footer-alt {
+.elgg-form-alt > fieldset > .elgg-foot {
        border-top: 1px solid #CCC;
        padding: 10px 0;
 }

diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 3deec66bdda22df7c687d030ac8d41504756dc12..68b5a69ebfad72a13812fc5206dd7373ca520361 100644 (file)
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -11,7 +11,7 @@ $master_image = $vars['entity']->getIcon('master');
 <div class="clearfix">
        <img id="user-avatar" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" />
 </div>
-<div>
+<div class="elgg-foot">
 <?php
 $coords = array('x1', 'x2', 'y1', 'y2');
 foreach ($coords as $coord) {

diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php
index b099b8c4c9bcadacbe57c57d1dd5cdcea9f42b6c..d91e8575eb087612df0ea1e83b52c21eda7e0a6d 100644 (file)
--- a/views/default/forms/avatar/upload.php
+++ b/views/default/forms/avatar/upload.php
@@ -10,7 +10,7 @@
        <label><?php echo elgg_echo("avatar:upload"); ?></label><br />
        <?php echo elgg_view("input/file",array('name' => 'avatar')); ?>
 </div>
-<div class="elgg-form-footer">
+<div class="elgg-foot">
        <?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 40e5743388359a97d21bdbd694723d68a66e6360..9acabf3ea0379add529dd6caba3c4ce0c644b54a 100644 (file)
--- a/views/default/forms/comments/add.php
+++ b/views/default/forms/comments/add.php
@@ -22,7 +22,7 @@ if (isset($vars['entity']) && elgg_is_logged_in()) {
                <label><?php echo elgg_echo("generic_comments:add"); ?></label>
                <?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
        </div>
-       <div>
+       <div class="elgg-foot">
 <?php
                echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
 ?>

diff --git a/views/default/forms/friends/collections/add.php b/views/default/forms/friends/collections/add.php
index 644c7adb9591368b7cb1312fd82a9d34ea064409..04c87346b2b9db72018bed9cf046b8a48df0856a 100644 (file)
--- a/views/default/forms/friends/collections/add.php
+++ b/views/default/forms/friends/collections/add.php
@@ -42,7 +42,7 @@ echo elgg_view('input/friendspicker', array(
 ));
 echo "</div>";
 
-echo "<div>";
+echo '<div class="elgg-foot">';
 if (isset($vars['collection'])) {
        echo elgg_view('input/hidden', array(
                'name' => 'collection_id',
@@ -50,4 +50,4 @@ if (isset($vars['collection'])) {
        ));
 }
 echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('save')));
-echo "</div>";
+echo '</div>';

diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index efe6d7792bed73e3ac19543a361a12b24f5a22c5..c3d8f231fe0e611910f02ed1ef914949f5b30e85 100644 (file)
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -24,8 +24,8 @@ if (elgg_view_exists("{$type}settings/$plugin_id/edit")) {
        echo elgg_view("plugins/$plugin_id/{$type}settings", $vars);
 }
 
-echo "<div>";
+echo '<div class="elgg-foot">';
 echo elgg_view('input/hidden', array('name' => 'plugin_id', 'value' => $plugin_id));
 echo elgg_view('input/hidden', array('name' => 'user_guid', 'value' => $user_guid));
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
-echo "</div>";
+echo '</div>';

diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index aaf9ac01e4f5cac6d0b6892743202eefdbba849f..222935344e07bcf4fbafd3490630f0c237a905df 100644 (file)
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -59,7 +59,7 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
        }
 }
 ?>
-<div>
+<div class="elgg-foot">
 <?php
        echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
        echo elgg_view('input/submit', array('value' => elgg_echo('save')));

diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php
index 97093832771ad5cc356724311b381dae323844a4..22357e728f65834e0725094628e48705a34139d7 100644 (file)
--- a/views/default/forms/user/requestnewpassword.php
+++ b/views/default/forms/user/requestnewpassword.php
@@ -15,7 +15,7 @@
        <?php echo elgg_view('input/text', array('name' => 'username')); ?>
 </div>
 <?php echo elgg_view('input/captcha'); ?>
-<div>
+<div class="elgg-foot">
        <?php echo elgg_view('input/submit', array('value' => elgg_echo('request'))); ?>
 </div>
 <?php //@todo JS 1.8: no ?>

diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php
index fcb93a6c63bbc7a20b1168655a47dfd6525a05f9..66f8846e236c866165bac28961030d4564028ea6 100644 (file)
--- a/views/default/forms/useradd.php
+++ b/views/default/forms/useradd.php
@@ -80,6 +80,6 @@ if ($admin_option) {
 }
 ?>
 
-<div>
+<div class="elgg-foot">
        <?php echo elgg_view('input/submit', array('value' => elgg_echo('register'))); ?>
 </div>
\ No newline at end of file

diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php
index 35871144b8fdb367314b78d8db85606788c8850d..ea53f25715ee5762b3913812d22d93f2badb206c 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-form-footer-alt">';
+$form_body .= '<div class="elgg-foot">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
 $form_body .= '</div>';
 

diff --git a/views/default/forms/widgets/save.php b/views/default/forms/widgets/save.php
index aeef37429bd4dd107faf28b56969a0aaf2624c66..4ba911cb5a6a3a5487c93ec1fd122ac30d67888e 100644 (file)
--- a/views/default/forms/widgets/save.php
+++ b/views/default/forms/widgets/save.php
@@ -32,7 +32,7 @@ $body = <<<___END
        <div>
                $access
        </div>
-       <div>
+       <div class="elgg-foot">
                $hidden
                $submit
        </div>

diff --git a/views/default/input/form.php b/views/default/input/form.php
index 6d5824cd86b90d4ee6ce820f330c0874a0c1d424..df30133b305395f5082a351bd8bdaa46810f79a3 100644 (file)
--- a/views/default/input/form.php
+++ b/views/default/input/form.php
@@ -1,14 +1,17 @@
 <?php
 /**
  * Create a form for data submission.
- * Use this view for forms rather than creating a form tag in the wild as it provides
- * extra security which help prevent CSRF attacks.
+ * Use this view for forms as it provides protection against CSRF attacks.
  *
  * @package Elgg
  * @subpackage Core
  *
  * @uses $vars['body'] The body of the form (made up of other input/xxx views and html
+ * @uses $vars['action'] The action URL of the form
+ * @uses $vars['method'] The submit method: post (default) or get
+ * @uses $vars['enctype'] Set to 'multipart/form-data' if uploading a file
  * @uses $vars['disable_security'] turn off CSRF security by setting to true
+ * @uses $vars['class'] Additional class for the form
  */
 
 $defaults = array(
@@ -18,6 +21,12 @@ $defaults = array(
 
 $vars = array_merge($defaults, $vars);
 
+if (isset($vars['class'])) {
+       $vars['class'] = "elgg-form {$vars['class']}";
+} else {
+       $vars['class'] = 'elgg-form';
+}
+
 $vars['action'] = elgg_normalize_url($vars['action']);
 $vars['method'] = strtolower($vars['method']);
 
@@ -32,4 +41,4 @@ unset($vars['disable_security']);
 
 $attributes = elgg_format_attributes($vars);
 
-echo "<form $attributes><fieldset>$body</fieldset></form>";
\ No newline at end of file
+echo "<form $attributes><fieldset>$body</fieldset></form>";