diff options
| author | dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-23 17:33:43 +0000 |
|---|---|---|
| committer | dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-23 17:33:43 +0000 |
| commit | 33b3fae7aeaf94b85bba04a7c1633f892292d5b6 (patch) | |
| tree | a46a326195b30f007b7e2124b5e4b96a85d8f1f1 | |
| parent | 57297a7e814f64bdc844321caabe6dafcef7b246 (diff) | |
| download | elgg-33b3fae7aeaf94b85bba04a7c1633f892292d5b6.tar.gz elgg-33b3fae7aeaf94b85bba04a7c1633f892292d5b6.tar.bz2 | |
new wire work
git-svn-id: https://code.elgg.org/elgg/trunk@2903 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/thewire/actions/add.php | 2 | ||||
| -rw-r--r-- | mod/thewire/everyone.php | 3 | ||||
| -rw-r--r-- | mod/thewire/index.php | 3 | ||||
| -rw-r--r-- | mod/thewire/languages/en.php | 2 | ||||
| -rw-r--r-- | mod/thewire/start.php | 2 | ||||
| -rw-r--r-- | mod/thewire/views/default/thewire/forms/add.php | 3 | ||||
| -rw-r--r-- | mod/thewire/views/default/thewire/profile_status.php | 5 |
7 files changed, 15 insertions, 5 deletions
diff --git a/mod/thewire/actions/add.php b/mod/thewire/actions/add.php index 8c441c0a2..67aab0600 100644 --- a/mod/thewire/actions/add.php +++ b/mod/thewire/actions/add.php @@ -54,7 +54,7 @@ if($location == "activity")
forward("mod/riverdashboard/");
else
- forward("mod/thewire/add.php");
+ forward("mod/thewire/everyone.php");
}
diff --git a/mod/thewire/everyone.php b/mod/thewire/everyone.php index 1ad633655..406e65985 100644 --- a/mod/thewire/everyone.php +++ b/mod/thewire/everyone.php @@ -14,6 +14,9 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
$area2 = elgg_view_title(elgg_echo("thewire:everyone"));
+
+ //add form
+ $area2 .= elgg_view("thewire/forms/add");
$area2 .= list_entities('object','thewire'); // elgg_view("thewire/view",array('entity' => $thewireposts));
$body = elgg_view_layout("two_column_left_sidebar", '', $area2);
diff --git a/mod/thewire/index.php b/mod/thewire/index.php index ffa2ca371..afc68f0b3 100644 --- a/mod/thewire/index.php +++ b/mod/thewire/index.php @@ -23,6 +23,9 @@ // title
$area2 = elgg_view_title(elgg_echo("thewire:read"));
+ //add form
+ $area2 .= elgg_view("thewire/forms/add");
+
// Display the user's wire
$area2 .= list_user_objects($page_owner->getGUID(),'thewire'); // elgg_view("thewire/view",array('entity' => $thewire));
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php index 62c83df91..2e3771385 100644 --- a/mod/thewire/languages/en.php +++ b/mod/thewire/languages/en.php @@ -23,7 +23,7 @@ 'thewire:charleft' => "characters left",
'item:object:thewire' => "Wire posts",
'thewire:notedeleted' => "note deleted",
-
+ 'thewire:doing' => "What are you doing, tell everyone on the wire?",
'thewire:newpost' => 'New wire post',
'thewire:addpost' => 'Post to the wire',
diff --git a/mod/thewire/start.php b/mod/thewire/start.php index 2d65bb517..8af638ada 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -72,7 +72,7 @@ if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {
add_submenu_item(elgg_echo('thewire:read'),$CONFIG->wwwroot."pg/thewire/" . $_SESSION['user']->username);
add_submenu_item(elgg_echo('thewire:everyone'),$CONFIG->wwwroot."mod/thewire/everyone.php");
- add_submenu_item(elgg_echo('thewire:add'),$CONFIG->wwwroot."mod/thewire/add.php");
+ //add_submenu_item(elgg_echo('thewire:add'),$CONFIG->wwwroot."mod/thewire/add.php");
}
}
diff --git a/mod/thewire/views/default/thewire/forms/add.php b/mod/thewire/views/default/thewire/forms/add.php index 00efb61ae..a424e4eb4 100644 --- a/mod/thewire/views/default/thewire/forms/add.php +++ b/mod/thewire/views/default/thewire/forms/add.php @@ -15,7 +15,8 @@ if (!empty($wire_user)) { $msg = '@' . $wire_user . ' '; } else { $msg = ''; } ?> -<div class="contentWrapper"> +<div class="post_to_wire"> +<h3><?php echo elgg_echo("thewire:doing"); ?></h3> <script> function textCounter(field,cntfield,maxlimit) { // if too long...trim it! diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php index 556ae8a9f..52d4d69f5 100644 --- a/mod/thewire/views/default/thewire/profile_status.php +++ b/mod/thewire/views/default/thewire/profile_status.php @@ -5,7 +5,8 @@ */
$owner = $vars['entity']->guid;
-
+ $url_to_wire = $vars['url'] . "mod/thewire/";
+
//grab the users latest from the wire
$latest_wire = get_entities("object", "thewire", $owner, "", 1, 0, false, 0, null);
@@ -19,6 +20,8 @@ if($latest_wire){
echo "<div class=\"profile_status\">";
echo $content . " " . $time;
+ if($owner == $_SESSION['user']->guid)
+ echo " <a href=\"{$url_to_wire}\">update</a>";
echo "</div>";
}
?>
\ No newline at end of file |