aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoricewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-05 16:30:06 +0000
committericewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-05 16:30:06 +0000
commit5731593e9ff92f55a7ed759c1152dfd9c35c6249 (patch)
treeb1e37bf4f0ddb6f8c7672ea76dcf193e4002859f
parente8427e2979647eeb121f411bc9789a1e9ad30aa8 (diff)
downloadelgg-5731593e9ff92f55a7ed759c1152dfd9c35c6249.tar.gz
elgg-5731593e9ff92f55a7ed759c1152dfd9c35c6249.tar.bz2
Marcus Povey <marcus@dushka.co.uk>
* Some basic river code git-svn-id: https://code.elgg.org/elgg/trunk@810 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--languages/en.php8
-rw-r--r--views/default/river/ElggUser/login.php5
-rw-r--r--views/default/river/ElggUser/logout.php5
-rw-r--r--views/default/river/shell.php9
4 files changed, 20 insertions, 7 deletions
diff --git a/languages/en.php b/languages/en.php
index 92eb2af77..c5f8e113a 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -133,7 +133,13 @@
'friends:of' => "Friends of",
'friends:of:owned' => "People who have made %s a friend",
-
+
+ /**
+ * River
+ */
+ 'river' => "River",
+
+
/**
* Search
*/
diff --git a/views/default/river/ElggUser/login.php b/views/default/river/ElggUser/login.php
index d0966dbef..fbd0ef7ca 100644
--- a/views/default/river/ElggUser/login.php
+++ b/views/default/river/ElggUser/login.php
@@ -8,4 +8,7 @@
* @copyright Curverider Ltd 2008
* @link http://elgg.com/
*/
-?> \ No newline at end of file
+
+ $log_entry = $vars['log_entry'];
+ $object = $vars['object'];
+?>
diff --git a/views/default/river/ElggUser/logout.php b/views/default/river/ElggUser/logout.php
index 8fff7bbfb..094617d72 100644
--- a/views/default/river/ElggUser/logout.php
+++ b/views/default/river/ElggUser/logout.php
@@ -9,7 +9,8 @@
* @link http://elgg.com/
*/
-
+ $log_entry = $vars['log_entry'];
+ $object = $vars['object'];
?>
-out \ No newline at end of file
+Logged in out \ No newline at end of file
diff --git a/views/default/river/shell.php b/views/default/river/shell.php
index 8e0df328f..c0f2c6820 100644
--- a/views/default/river/shell.php
+++ b/views/default/river/shell.php
@@ -11,8 +11,11 @@
/// Extract the river
$river = $vars['river'];
-
+?>
+<div id="river">
+ <h1><?php elgg_echo('river'); ?></h1>
+ <?
foreach ($river as $r)
echo $r;
-
-?> \ No newline at end of file
+ ?>
+</div> \ No newline at end of file