diff options
| -rw-r--r-- | mod/groups/views/default/forms/discussion/save.php | 25 | ||||
| -rw-r--r-- | mod/groups/views/default/forms/groups/edit.php | 30 | ||||
| -rw-r--r-- | views/default/css/elements/forms.php | 6 |
3 files changed, 34 insertions, 27 deletions
diff --git a/mod/groups/views/default/forms/discussion/save.php b/mod/groups/views/default/forms/discussion/save.php index 418a7532f..751cd521d 100644 --- a/mod/groups/views/default/forms/discussion/save.php +++ b/mod/groups/views/default/forms/discussion/save.php @@ -13,19 +13,19 @@ $container_guid = elgg_get_array_value('container_guid', $vars); $guid = elgg_get_array_value('guid', $vars, null); ?> -<p> +<div> <label><?php echo elgg_echo('title'); ?></label><br /> <?php echo elgg_view('input/text', array('internalname' => 'title', 'value' => $title)); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo('groups:topicmessage'); ?></label> <?php echo elgg_view('input/longtext', array('internalname' => 'description', 'value' => $desc)); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo('tags'); ?></label> <?php echo elgg_view('input/tags', array('internalname' => 'tags', 'value' => $tags)); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo("groups:topicstatus"); ?></label><br /> <?php echo elgg_view('input/dropdown', array( @@ -36,12 +36,13 @@ $guid = elgg_get_array_value('guid', $vars, null); 'closed' => elgg_echo('groups:topicclosed'), ), )); - ?> -<p> + ?> +</div> +<div> <label><?php echo elgg_echo('access'); ?></label><br /> <?php echo elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id)); ?> -</p> -<p> +</div> +<div> <?php echo elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $container_guid)); @@ -53,4 +54,4 @@ if ($guid) { echo elgg_view('input/submit', array('value' => elgg_echo("save"))); ?> -</p> +</div> diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index a40cd38f8..13d42998a 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -11,20 +11,20 @@ if (isset($vars['entity'])) { } else { $membership = ACCESS_PUBLIC; } - + ?> -<p> +<div> <label><?php echo elgg_echo("groups:icon"); ?></label><br /> <?php echo elgg_view("input/file", array('internalname' => 'icon')); ?> -</p> -<p> +</div> +<div> <label><?php echo elgg_echo("groups:name"); ?></label><br /> <?php echo elgg_view("input/text", array( 'internalname' => 'name', 'value' => $vars['entity']->name, )); ?> -</p> +</div> <?php $group_profile_fields = elgg_get_config('group'); @@ -34,19 +34,19 @@ if ($group_profile_fields > 0) { if ($valtype == 'longtext') { $line_break = ''; } - echo '<p><label>'; + echo '<div><label>'; echo elgg_echo("groups:{$shortname}"); echo "</label>$line_break"; echo elgg_view("input/{$valtype}", array( 'internalname' => $shortname, 'value' => $vars['entity']->$shortname, )); - echo '</p>'; + echo '</div>'; } } ?> -<p> +<div> <label> <?php echo elgg_echo('groups:membership'); ?><br /> <?php echo elgg_view('input/access', array( @@ -59,7 +59,7 @@ if ($group_profile_fields > 0) { )); ?> </label> -</p> +</div> <?php @@ -83,7 +83,7 @@ if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') { $current_access = $vars['entity']->access_id ? $vars['entity']->access_id : ACCESS_PUBLIC; ?> -<p> +<div> <label> <?php echo elgg_echo('groups:visibility'); ?><br /> <?php echo elgg_view('input/access', array( @@ -93,7 +93,7 @@ if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') { )); ?> </label> -</p> +</div> <?php } @@ -110,7 +110,7 @@ if ($tools) { } $value = $vars['entity']->$group_option_toggle_name ? $vars['entity']->$group_option_toggle_name : $group_option_default_value; ?> -<p> +<div> <label> <?php echo $group_option->label; ?><br /> <?php echo elgg_view("input/radio", array( @@ -123,12 +123,12 @@ if ($tools) { )); ?> </label> -</p> +</div> <?php } } ?> -<p class="bta"> +<div class="bta"> <?php if (isset($vars['entity'])) { @@ -140,4 +140,4 @@ if (isset($vars['entity'])) { echo elgg_view('input/submit', array('value' => elgg_echo('save'))); ?> -</p> +</div> diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index 402006ebc..2e0022ca8 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -12,6 +12,12 @@ *************************************** */ .elgg-fieldset { } +fieldset > div { + margin-bottom: 15px; +} +fieldset > div:last-child { + margin-bottom: 0; +} label { font-weight: bold; color: #333333; |