aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'views/default')
-rw-r--r--views/default/css/elements/forms.php9
-rw-r--r--views/default/forms/avatar/crop.php6
-rw-r--r--views/default/forms/avatar/upload.php5
-rw-r--r--views/default/forms/comments/add.php14
-rw-r--r--views/default/forms/usersettings/save.php2
5 files changed, 25 insertions, 11 deletions
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 0230cbc54..4e302dff1 100644
--- 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 857a54e1f..3deec66bd 100644
--- 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 08db1f7e0..b099b8c4c 100644
--- 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 6d674838a..40e574338 100644
--- 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 62593e699..35871144b 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-divide-top">';
+$form_body .= '<div class="elgg-form-footer-alt">';
$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
$form_body .= '</div>';