diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/core/settings/account.php | 2 | ||||
| -rw-r--r-- | views/default/css/elements/forms.php | 4 | ||||
| -rw-r--r-- | views/default/forms/avatar/crop.php | 2 | ||||
| -rw-r--r-- | views/default/forms/avatar/upload.php | 2 | ||||
| -rw-r--r-- | views/default/forms/comments/add.php | 2 | ||||
| -rw-r--r-- | views/default/forms/friends/collections/add.php | 4 | ||||
| -rw-r--r-- | views/default/forms/plugins/settings/save.php | 4 | ||||
| -rw-r--r-- | views/default/forms/profile/edit.php | 2 | ||||
| -rw-r--r-- | views/default/forms/user/requestnewpassword.php | 2 | ||||
| -rw-r--r-- | views/default/forms/useradd.php | 2 | ||||
| -rw-r--r-- | views/default/forms/usersettings/save.php | 2 | ||||
| -rw-r--r-- | views/default/forms/widgets/save.php | 2 | ||||
| -rw-r--r-- | views/default/input/form.php | 15 |
13 files changed, 26 insertions, 19 deletions
diff --git a/views/default/core/settings/account.php b/views/default/core/settings/account.php index 22a58c58a..0c3792ece 100644 --- 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 af7b2be19..5924b8134 100644 --- 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 3deec66bd..68b5a69eb 100644 --- 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 b099b8c4c..d91e8575e 100644 --- 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 40e574338..9acabf3ea 100644 --- 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 644c7adb9..04c87346b 100644 --- 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 efe6d7792..c3d8f231f 100644 --- 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 aaf9ac01e..222935344 100644 --- 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 970938327..22357e728 100644 --- 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 fcb93a6c6..66f8846e2 100644 --- 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 35871144b..ea53f2571 100644 --- 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 aeef37429..4ba911cb5 100644 --- 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 6d5824cd8..df30133b3 100644 --- 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>"; |