diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/admin/appearance/profile_fields/list.php | 2 | ||||
| -rw-r--r-- | views/default/css/walled_garden.php | 4 | ||||
| -rw-r--r-- | views/default/forms/profile/fields/add.php | 4 | ||||
| -rw-r--r-- | views/default/object/elements/full.php | 45 | ||||
| -rw-r--r-- | views/default/object/elements/summary.php | 3 | ||||
| -rw-r--r-- | views/default/page/walled_garden.php | 1 |
6 files changed, 56 insertions, 3 deletions
diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php index 3e287ceac..b9440a95d 100644 --- a/views/default/admin/appearance/profile_fields/list.php +++ b/views/default/admin/appearance/profile_fields/list.php @@ -26,7 +26,7 @@ if ($fieldlist) { } } ?> -<ul id="elgg-profile-fields"> +<ul id="elgg-profile-fields" class="mvm"> <?php $save = elgg_echo('save'); diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php index 75bf0f29e..47850425b 100644 --- a/views/default/css/walled_garden.php +++ b/views/default/css/walled_garden.php @@ -28,6 +28,10 @@ $url = elgg_get_site_url(); margin: 35px 15px 15px 35px; } +#elgg-walledgarden-intro ul { + float: left; +} + #elgg-walledgarden-login { width: 230px; float: left; diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php index bd58ae381..1ea9c57a9 100644 --- a/views/default/forms/profile/fields/add.php +++ b/views/default/forms/profile/fields/add.php @@ -20,8 +20,8 @@ $type_control = elgg_view('input/dropdown', array('name' => 'type', 'options_val $submit_control = elgg_view('input/submit', array('name' => elgg_echo('add'), 'value' => elgg_echo('add'))); $formbody = <<< END - <div class="elgg-foot">$label_text: $label_control - $type_text: $type_control + <div>$label_text: $label_control</div> + <div class="elgg-foot">$type_text: $type_control $submit_control</div> END; diff --git a/views/default/object/elements/full.php b/views/default/object/elements/full.php new file mode 100644 index 000000000..4a2991442 --- /dev/null +++ b/views/default/object/elements/full.php @@ -0,0 +1,45 @@ +<?php +/** + * Object full rendering + * + * Sample output + * <h2>Title</h3> + * <div class="elgg-content"> + * <div class="elgg-image-block"> + * </div> + * <div class="elgg-output"> + * </div> + * </div> + * + * @uses $vars['entity'] ElggEntity + * @uses $vars['title'] Title (false for no title) + * @uses $vars['icon'] HTML for the content icon + * @uses $vars['summary'] HTML for the content summary + * @uses $vars['body'] HTML for the content body + * @uses $vars['class'] Optional additional class for the content wrapper + */ + +$title = elgg_extract('title', $vars); +$icon = elgg_extract('icon', $vars); +$summary = elgg_extract('summary', $vars); +$body = elgg_extract('body', $vars); +$class = elgg_extract('class', $vars); +if ($class) { + $class = "elgg-content $class"; +} else { + $class = "elgg-content"; +} + +if ($title) { + $title = elgg_view_title($title); +} + +$header = elgg_view_image_block($icon, $summary); + +echo <<<HTML +$title +<div class="$class"> +$header +$body +</div> +HTML; diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php index 3ca4de2be..8d82bc52a 100644 --- a/views/default/object/elements/summary.php +++ b/views/default/object/elements/summary.php @@ -49,6 +49,9 @@ if ($metadata) { echo "<h3>$title_link</h3>"; echo "<div class=\"elgg-subtext\">$subtitle</div>"; echo $tags; + +echo elgg_view('object/summary/extend', $vars); + if ($content) { echo "<div class=\"elgg-content\">$content</div>"; } diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php index 95d17fcff..62d8bb077 100644 --- a/views/default/page/walled_garden.php +++ b/views/default/page/walled_garden.php @@ -31,6 +31,7 @@ $title = $site->name; echo $title; ?> </h1> + <?php echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz')); ?> </div> <div id="elgg-walledgarden-login"> <?php echo $vars['body']; ?> |