From 9bb7b4c8afddc734adfd2717d766d1711cf8127c Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 4 Dec 2010 13:07:09 +0000 Subject: blog sidebar html updates finished - uses modules! git-svn-id: http://code.elgg.org/elgg/trunk@7526 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/annotation/latest_comments.php | 8 ++-- views/default/css/screen.php | 4 +- views/default/layout_elements/module.php | 55 ++++++++++++++++++++++++++++ views/default/layouts/module.php | 44 ---------------------- views/default/output/tagcloud.php | 44 +++++++++++----------- 5 files changed, 83 insertions(+), 72 deletions(-) create mode 100644 views/default/layout_elements/module.php delete mode 100644 views/default/layouts/module.php (limited to 'views/default') diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php index a43ec4fee..d603a3830 100644 --- a/views/default/annotation/latest_comments.php +++ b/views/default/annotation/latest_comments.php @@ -1,12 +1,12 @@ " . elgg_echo('generic_comments:latest') . ""; - foreach($vars['comments'] as $comment){ + //echo "

" . elgg_echo('generic_comments:latest') . "

"; + foreach ($vars['comments'] as $comment) { //grab the entity the comment is on $entity = get_entity($comment->entity_guid); //comment owner diff --git a/views/default/css/screen.php b/views/default/css/screen.php index 18e4a0bad..a33586aa7 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -207,14 +207,14 @@ h2 { background-position: -250px top; text-indent: -1000em; } -.tags { +.elgg-tags { background-image:url(_graphics/elgg_sprites.png); background-repeat: no-repeat; background-position: left -196px; padding:1px 0 0 14px; font-size: 85%; } -.tagcloud { +.elgg-tagcloud { text-align:justify; } .ajax-loader { diff --git a/views/default/layout_elements/module.php b/views/default/layout_elements/module.php new file mode 100644 index 000000000..46ddcfbfd --- /dev/null +++ b/views/default/layout_elements/module.php @@ -0,0 +1,55 @@ +

$title

"; +//if ($header) { +// $header = "
$header
"; +//} + +$body_class = 'elgg-body'; +$additional_class = elgg_get_array_value('body_class', $vars, ''); +if ($additional_class) { + $body_class = "$body_class $additional_class"; +} +$body = "
$body
"; + + +if ($footer) { + $footer = "
$footer
"; +} + +echo << +
+ $header + $body + $footer +
+ +HTML; diff --git a/views/default/layouts/module.php b/views/default/layouts/module.php deleted file mode 100644 index db940aedc..000000000 --- a/views/default/layouts/module.php +++ /dev/null @@ -1,44 +0,0 @@ -$header"; -} - -if ($footer) { - $footer = "
$footer
"; -} - -echo << -
- $header -
$body
- $footer -
- -HTML; diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php index d28fbf05f..b0737c6f1 100644 --- a/views/default/output/tagcloud.php +++ b/views/default/output/tagcloud.php @@ -31,26 +31,18 @@ if (empty($vars['tagcloud']) && !empty($vars['value'])) { if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) { $counter = 0; - $cloud = "
"; $max = 0; - if ($context != 'tags') { - $title = elgg_echo('tagcloud'); - $cloud .= "

$title

"; - } - - $cloud .= '
'; - - foreach($vars['tagcloud'] as $tag) { + foreach ($vars['tagcloud'] as $tag) { if ($tag->total > $max) { $max = $tag->total; } } - $list = ''; - foreach($vars['tagcloud'] as $tag) { - if ($list != '') { - $list .= ', '; + $cloud = ''; + foreach ($vars['tagcloud'] as $tag) { + if ($cloud != '') { + $cloud .= ', '; } // protecting against division by zero warnings $size = round((log($tag->total) / log($max + .0001)) * 100) + 30; @@ -58,18 +50,26 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) { $size = 100; } $url = elgg_get_site_url()."pg/search/?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype"; - $list .= "tag)." ($tag->total)\" style=\"text-decoration:none;\">" . htmlspecialchars($tag->tag, ENT_QUOTES, 'UTF-8') . ""; + $cloud .= "tag)." ($tag->total)\" style=\"text-decoration:none;\">" . htmlspecialchars($tag->tag, ENT_QUOTES, 'UTF-8') . ""; } - - $cloud .= "$list
"; - + if ($context != 'tags') { - $cloud .= '

'; - $cloud .= "All site tags"; + $text = elgg_echo('tagcloud:allsitetags'); + $cloud .= '

'; + $cloud .= "$text"; $cloud .= '

'; } $cloud .= elgg_view('tagcloud/extend'); - $cloud .= '
'; - echo $cloud; -} \ No newline at end of file + + if ($context != 'tags') { + $params = array( + 'title' => elgg_echo('tagcloud'), + 'body' => $cloud, + 'body_class' => 'elgg-tagcloud', + ); + echo elgg_view('layout_elements/module', $params); + } else { + echo "
$cloud
"; + } +} -- cgit v1.2.3