aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-04 12:05:42 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-04 12:05:42 +0000
commitd672c9ed0d507c854e8bd82940e81e90a3d4b186 (patch)
treeb7ee569cb2314e29a3c32479c5fabee51719f35e /views/default
parent3791cda0bb2f35a1f8d57b90600efbff15bfec6d (diff)
downloadelgg-d672c9ed0d507c854e8bd82940e81e90a3d4b186.tar.gz
elgg-d672c9ed0d507c854e8bd82940e81e90a3d4b186.tar.bz2
Refs #3073 first version of horizontal river menu. css still needs work for likes and the comment text bubble needs to be darkened
git-svn-id: http://code.elgg.org/elgg/trunk@8935 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/css/elements/navigation.php7
-rw-r--r--views/default/river/elements/body.php6
-rw-r--r--views/default/river/elements/controls.php11
-rw-r--r--views/default/river/item.php1
4 files changed, 11 insertions, 14 deletions
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 669f44b93..b72124001 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -499,7 +499,14 @@ li:hover > .elgg-menu-site-more {
RIVER
*************************************** */
.elgg-menu-river {
+ float: right;
+ margin-left: 15px;
font-size: 90%;
+ color: #aaa;
+}
+.elgg-menu-river > li {
+ display: inline-block;
+ margin-left: 5px;
}
/* ***************************************
diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index 01db3fbea..f9ecbc03c 100644
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -15,7 +15,9 @@ $params = array(
);
$subject_link = elgg_view('output/url', $params);
$timestamp = elgg_get_friendly_time($item->getPostedTime());
-$header = "$subject_link <span class=\"elgg-river-timestamp\">$timestamp</span>";
+
+$header = elgg_view_menu('river', array('item' => $item, 'sort_by' => 'priority'));
+$header .= "$subject_link <span class=\"elgg-river-timestamp\">$timestamp</span>";
// body
$body = elgg_view($item->getView(), array('item' => $item));
@@ -27,5 +29,5 @@ echo elgg_view('page/components/module', array(
'header' => $header,
'body' => $body,
'footer' => $footer,
- 'show_inner' => false,
+ 'class' => 'mbn',
)); \ No newline at end of file
diff --git a/views/default/river/elements/controls.php b/views/default/river/elements/controls.php
deleted file mode 100644
index 188d01b5a..000000000
--- a/views/default/river/elements/controls.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Controls on an river item
- *
- * @uses $vars['item']
- */
-
-echo elgg_view_menu('river', array(
- 'item' => $vars['item'],
- 'sort_by' => 'priority',
-));
diff --git a/views/default/river/item.php b/views/default/river/item.php
index 0a32818e9..bf7c80b03 100644
--- a/views/default/river/item.php
+++ b/views/default/river/item.php
@@ -10,7 +10,6 @@ $item = $vars['item'];
$vars = array(
'image' => elgg_view('river/elements/image', array('item' => $item)),
'body' => elgg_view('river/elements/body', array('item' => $item)),
- 'image_alt' => elgg_view('river/elements/controls', array('item' => $item)),
'class' => 'elgg-river-item',
);