aboutsummaryrefslogtreecommitdiff
path: root/mod/riverdashboard/views/default
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-29 18:31:27 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-29 18:31:27 +0000
commitb6f99468651309e0b58dbe000958540809df5dcc (patch)
tree2eb822efea669a1f12d44818e001aaa22b331f69 /mod/riverdashboard/views/default
parent6729784c18099d4e34c2ed6146b63f275a2eea54 (diff)
downloadelgg-b6f99468651309e0b58dbe000958540809df5dcc.tar.gz
elgg-b6f99468651309e0b58dbe000958540809df5dcc.tar.bz2
Fixes #2226 moves riverdashboard into secondary plugins from core plugins - most of riverdashboard functionality is now in core (except for displaying who has liked stuff and ajax refreshes)
git-svn-id: http://code.elgg.org/elgg/trunk@7750 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/riverdashboard/views/default')
-rw-r--r--mod/riverdashboard/views/default/river/dashboard.php19
-rw-r--r--mod/riverdashboard/views/default/river/item/list.php63
-rw-r--r--mod/riverdashboard/views/default/river/item/wrapper.php150
-rw-r--r--mod/riverdashboard/views/default/river/item/wrapper_classic.php20
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/container.php52
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/css.php179
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/ecml/activity.php26
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/js.php96
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/menu.php27
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/nav.php57
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/river/body.php38
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/river/footer.php130
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/rivercomment.php18
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/sitemessage.php77
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/welcome.php8
15 files changed, 0 insertions, 960 deletions
diff --git a/mod/riverdashboard/views/default/river/dashboard.php b/mod/riverdashboard/views/default/river/dashboard.php
deleted file mode 100644
index 5fe7c35d3..000000000
--- a/mod/riverdashboard/views/default/river/dashboard.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Elgg river for dashboard.
- */
-
-/// Extract the river
-$river = $vars['river'];
-?>
-<div id="river">
-<?php
-if (($river) && (count($river)>0)) {
- foreach ($river as $r) {
- echo $r;
- }
-} else {
- echo elgg_echo('river:widget:noactivity');
-}
-?>
-</div><!-- /river --> \ No newline at end of file
diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php
deleted file mode 100644
index fb0656022..000000000
--- a/mod/riverdashboard/views/default/river/item/list.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-if (isset($vars['items']) && is_array($vars['items'])) {
-
- $i = 0;
- if (!empty($vars['items'])) {
- foreach($vars['items'] as $item) {
- echo riverdashboard_view_river_item($item);
- $i++;
- if ($i >= $vars['limit']) {
- break;
- }
- }
- }
-}
-
-if ($vars['pagination'] !== false) {
- $baseurl = $_SERVER['REQUEST_URI'];
- $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl);
-
- $nav = '';
-
- if (sizeof($vars['items']) > $vars['limit']) {
- $newoffset = $vars['offset'] + $vars['limit'];
- $urladdition = 'offset='.$newoffset;
- if (substr_count($baseurl,'?')) {
- $nexturl = $baseurl . '&' . $urladdition;
- } else {
- $nexturl=$baseurl . '?' . $urladdition;
- }
-
- $nav .= '<a class="pagination-previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
- }
-
- if ($vars['offset'] > 0) {
- $newoffset = $vars['offset'] - $vars['limit'];
- if ($newoffset < 0) {
- $newoffset = 0;
- }
- $urladdition = 'offset='.$newoffset;
- if (substr_count($baseurl,'?')) {
- $prevurl=$baseurl . '&' . $urladdition;
- } else {
- $prevurl=$baseurl . '?' . $urladdition;
- }
-
- $nav .= '<a class="pagination-next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
- }
-
- if (!empty($nav)) {
- echo '<div class="pagination clearfix">'.$nav.'</div>';
- }
-}
-
-?>
-
-<script type="text/javascript">
-
-// pull in extra comments and likes with ajax
-$(function() {
-
-});
-</script> \ No newline at end of file
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
deleted file mode 100644
index 4f6100114..000000000
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Elgg river item wrapper.
- * Wraps all river items.
- *
- * @todo: Clean up this logic.
- * It looks like this only will allow comments on non user and non group forum
- * topic entities.
- *
- * Different chunks are used depending on if comments exist or not.
- *
- *
- */
-
-$object = get_entity($vars['item']->object_guid);
-$object_url = $object->getURL();
-$likes_count = elgg_count_likes($object);
-
-//user
-//if displaying on the profile get the object owner, else the subject_guid
-if (elgg_get_context() == 'profile' && $object->getSubtype() == 'thewire') {
- $user = get_entity($object->owner_guid);
-} else {
- $user = get_entity($vars['item']->subject_guid);
-}
-
-// get last three comments display
-// want the 3 most recent comments (order by time_created desc = 3 2 1 limit 3)
-// but will display them with the newest at the bottom (1 2 3)
-if ($comments = get_annotations($vars['item']->object_guid, "", "", 'generic_comment', "", "", 3, 0, "desc")) {
- $comments = array_reverse($comments);
-}
-
-// for displaying "+N more"
-// -3 from the count because the 3 displayed don't count in the "more"
-$comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, 'generic_comment');
-if ($comment_count < 3) {
- $more_comments_count = 0;
-} else {
- $more_comments_count = $comment_count - 3;
-}
-
-?>
-<div class="river-item riverdashboard" id="river_entity_<?php echo $object->guid; ?>">
- <span class="river-item-useravatar">
- <?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?>
- </span>
-
- <div class="river-item-contents clearfix">
-<?php
-
-// body contents, generated by the river view in each plugin
-echo $vars['body'];
-
-// display latest 3 comments if there are any
-if ($comments){
- $counter = 0;
-
- echo "<div class='river-comments-tabs clearfix'>";
- echo "<a class='river-more-comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
-
- if ($likes_count != 0) {
- echo elgg_view('forms/likes/display', array('entity' => $object));
- }
-
- echo "</div>"; // close river-comments-tabs
-
- echo "<div class='river-comments'>";
-
- if ($likes_count != 0) {
- //show the users who liked the object
- // this is loaded via ajax to avoid pounding the server with avatar requests.
- echo "<div class='likes-list hidden'></div>";
- }
-
- echo "<div class=\"comments_container\">";
- // display appropriate comment link
- if ($more_comments_count > 0) {
- echo "<a class=\"river-more-comments show_more_button link\">" .
- elgg_echo('riverdashboard:n_more_comments', array($more_comments_count)) . '</a>';
-
- echo "<a style=\"display: none\" class=\"river-more-comments show_less_button link\">" . elgg_echo('riverdashboard:show_less') . '</a>';
- }
- echo "<div class=\"comments_list\">";
- foreach ($comments as $comment) {
- //get the comment owner
- $comment_owner = get_user($comment->owner_guid);
- //get the comment owner's profile url
- $comment_owner_url = $comment_owner->getURL();
- // color-code each of the 3 comments
- // @todo this isn't used in CSS...
- if( ($counter == 2 && $comment_count >= 4) || ($counter == 1 && $comment_count == 2) || ($counter == 0 && $comment_count == 1) || ($counter == 2 && $comment_count == 3) ) {
- $alt = 'latest';
- } else if( ($counter == 1 && $comment_count >= 4) || ($counter == 0 && $comment_count == 2) || ($counter == 1 && $comment_count == 3) ) {
- $alt = 'penultimate';
- }
- //display comment
- echo "<div class='river-comment $alt clearfix'>";
- echo "<span class='river-comment-owner-icon'>";
- echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
- echo "</span>";
-
- //truncate comment to 150 characters and strip tags
- $contents = elgg_get_excerpt($comment->value, 150);
-
- echo "<div class='river-comment-contents'>";
- echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="elgg_excerpt">' . parse_urls($contents) . '</span>';
- echo "<span class='entity-subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
- echo "</div></div>";
- $counter++;
- }
-
- // close comments_list, comments_container and river-comments
- echo '</div></div>' . elgg_make_river_comment($object) . '</div>';
-} else {
- // tab bar nav - for users that liked object
- if ($vars['item']->type != 'user' && $likes_count != 0) {
- echo "<div class='river-comments-tabs clearfix'>";
- }
-
- if ($likes_count != 0) {
- echo elgg_view('forms/likes/display', array('entity' => $object));
- }
-
- if ($vars['item']->type != 'user' && $likes_count != 0) {
- echo "</div>"; // close river-comments-tabs
- }
-
- if ($vars['item']->type != 'user') {
- echo "<div class='river-comments'>";
- }
- if ($likes_count != 0) {
- //show the users who liked the object
- echo "<div class='likes-list hidden'>";
- echo list_annotations($object->getGUID(), 'likes', 99);
- echo "</div>";
- }
-
- // if there are no comments to display
- // and this is not a user - include the inline comment form
- if ($vars['item']->type != 'user') {
- echo elgg_make_river_comment($object);
- }
- if ($vars['item']->type != 'user') {
- echo "</div>";
- }
-}
-?>
- </div>
-</div>
diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
deleted file mode 100644
index 58fe938f4..000000000
--- a/mod/riverdashboard/views/default/river/item/wrapper_classic.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Elgg river item wrapper.
- * Wraps all river items.
- *
- * @package Elgg
- */
-?>
-<div class="river-item riverdashboard">
- <span class="river-item-useravatar">
-<?php
-echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));
-?>
- </span>
- <div class="river-item-contents clearfix">
-<?php
-echo $vars['body'];
-?>
- </div>
-</div> \ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php
deleted file mode 100644
index 09a593622..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/container.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php echo $vars['body']; ?>
-
-<script type="text/javascript">
-$(document).ready(function(){
- var updates = new activityUpdateChecker(10000);
- updates.start();
-});
-
-// check for updates on the wire.
-function activityUpdateChecker(interval) {
- this.intervalID = null;
- this.interval = interval;
- this.url = '<?php echo elgg_get_site_url(); ?>mod/riverdashboard/endpoint/ping.php';
- this.seconds_passed = 0;
-
- this.start = function() {
- // needed to complete closure scope.
- var self = this;
-
- this.intervalID = setInterval(function() { self.checkUpdates(); }, this.interval);
- }
-
- this.checkUpdates = function() {
- this.seconds_passed += this.interval / 1000;
- // more closure fun
- var self = this;
- $.ajax({
- 'type': 'GET',
- 'url': this.url,
- 'data': {'seconds_passed': this.seconds_passed},
- 'success': function(data) {
- if (data) {
- $('#riverdashboard-updates').html(data).slideDown();
- // could crank down the interval here.
- // if we change the message to simply "New Posts!"
- // we could stop the polling altogether.
- }
- }
- })
- }
-
- this.stop = function() {
- clearInterval(this.interval);
- }
-
- this.changeInterval = function(interval) {
- this.stop();
- this.interval = interval;
- this.start();
- }
-}
-</script>
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
deleted file mode 100644
index bb207d33c..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/css.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Elgg riverdashboard CSS
- *
- */
-?>
-#riverdashboard-updates {
- border-bottom:1px solid #cccccc;
-}
-#riverdashboard-updates a.update-link {
- display: inline-table;
- color:white;
- font-weight: bold;
- padding:1px 8px 2px 24px;
- margin-top:9px;
- cursor: pointer;
- background: red url("<?php echo elgg_get_site_url(); ?>mod/riverdashboard/graphics/refresh.png") no-repeat 5px 3px;
- -webkit-border-radius: 10px;
- -moz-border-radius: 10px;
-}
-#riverdashboard-updates a.update-link:hover {
- background: #4690D6 url("<?php echo elgg_get_site_url(); ?>mod/riverdashboard/graphics/refresh.png") no-repeat 5px -22px;
- color:white;
- text-decoration: none;
-}
-.riverdashboard-filtermenu {
- margin:10px 0 10px 0;
- float:right;
-}
-
-/* RIVER ENTRY */
-.elgg-river-item {
- border-bottom:1px solid #cccccc;
- padding:7px 0 7px 0;
-}
-.elgg-river-item p {
- margin:0;
-}
-.elgg-river-item .entity-subtext {
- display: block;
- line-height: 1.4em;
-}
-.river-item-useravatar {
- float:left;
- margin-top:3px;
- margin-left:1px;
-}
-.river-item-contents {
- margin-left:55px;
-}
-.river-item-contents a {
- font-weight: bold;
-}
-.river-content-display {
- border-left:1px solid #DDDDDD;
- font-size:85%;
- line-height:1.5em;
- margin:8px 0 5px 0;
- padding-left:5px;
-}
-.following-icon {
- width:20px;
- height:25px;
- margin:0 2px 0 2px;
- background: url(<?php echo elgg_get_site_url(); ?>mod/riverdashboard/graphics/follow_icon.png) no-repeat left -7px;
-}
-
-/* LATEST COMMENTS IN RIVER */
-.river-comments-tabs {
- max-height: 19px;
- overflow:hidden;
-}
-.river-comments {
- -moz-border-radius-bottomleft:5px;
- -moz-border-radius-bottomright:5px;
- -moz-border-radius-topleft:5px;
- -moz-border-radius-topright:0;
- -webkit-border-top-left-radius:5px;
- -webkit-border-top-right-radius:0;
- -webkit-border-bottom-right-radius:5px;
- -webkit-border-bottom-left-radius:5px;
- background-color: #eeeeee;
-}
-.river-comment {
- padding:3px;
- border-bottom:1px solid white;
-}
-.river-comment.penultimate {
-
-}
-.river-comment.latest {
-
-}
-/* hidden inline comment form */
-.river-comment-form.hidden {
- padding:5px;
- height:26px;
-}
-.river-comment-form.hidden .input-text {
- width:560px;
- padding:3px;
-}
-#profile-content .river-comment-form.hidden .input-text { /* when activity is displayed on profile page */
- width:535px;
-}
-.river-comment-form.hidden .elgg-submit-button {
- margin:0 0 0 10px;
- float:right;
-}
-.river-link-divider {
- color:#999999;
- font-style: normal;
-}
-.river-comment-form-button,
-.river-item-contents .river_user-like-button {
- font-weight:normal;
- font-style: normal;
-}
-.river-comment-form-button {
- margin-left: 7px;
-}
-/* hidden list of users that liked item */
-.elgg-likes-user {
- border-bottom:1px solid white;
- padding:3px;
-}
-.elgg-likes-user .entity-listing-icon {
- margin:3px 0 4px 2px;
-}
-.elgg-likes-user .entity-listing-info {
- width:635px;
-}
-#profile-content .river-item .elgg-likes-user .entity-listing-info { /* when likes is displayed on profile page activity stream */
- width:600px;
-}
-.elgg-likes-user .entity-metadata {
- margin-top:3px;
-}
-p.elgg-likes-owner {
- padding-top:0;
-}
-a.river-more-comments {
- display:block;
- float:right;
- padding:1px 7px 1px 7px;
- margin-left:6px;
- text-align:right;
- font-size:85%;
- font-weight:normal;
- width:auto;
- background-color: #eeeeee;
- -moz-border-radius-topleft:4px;
- -moz-border-radius-topright:4px;
- -webkit-border-top-left-radius:4px;
- -webkit-border-top-right-radius:4px;
-}
-a.river-more-comments.off {
- background-color: white;
-}
-.river-comment-owner-icon {
- float:left;
- margin:3px 8px 4px 2px;
-}
-.river-comment-contents {
- margin-left:34px;
-}
-a.river-more-comments {
- float:right;
- font-size:85%;
- padding-right:7px;
- text-align:right;
-}
-.elgg-river-item form {
- display: block;
- height: auto;
- padding: 0px;
-}
-
-
diff --git a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
deleted file mode 100644
index 527be3d82..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * ECML activity support
- *
- * @package ECML
- */
-
-// get_loggedin_user() is apparently the loggedin user.
-$owner = (isset($vars['owner'])) ? $vars['owner'] : NULL;
-$type = (isset($vars['type'])) ? $vars['type'] : NULL;
-$subtype = (isset($vars['subtype'])) ? $vars['subtype'] : NULL;
-$limit = (isset($vars['limit'])) ? $vars['limit'] : 10;
-
-// resolve usernames to guids
-if ($owner && !is_numeric($owner)) {
- if ($user_obj = get_user_by_username($owner)) {
- $owner = $user_obj->getGUID();
- }
-}
-
-$river = elgg_view_river_items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false) . "</div>";
-
-// Replacing callback calls in the nav with something meaningless
-$river = str_replace('callback=true','replaced=88,334', $river);
-
-echo $river;
diff --git a/mod/riverdashboard/views/default/riverdashboard/js.php b/mod/riverdashboard/views/default/riverdashboard/js.php
deleted file mode 100644
index 4995799f1..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/js.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<script type="text/javascript">
- $(document).ready(function() {
- $('.river-comment-form-button').click(function() {
- elgg_slide_toggle(this, '.elgg-module', '.river-comment-form');
- });
-
- $('.likes-user-list-button').click(function() {
- var myParent = $(this).closest('.elgg-river-item');
- var likesList = myParent.find('.likes-list');
-
- if (likesList.css('display') == 'none') {
- // pull in likes via ajax to save on loading many avatars
- var riverItem = $(this).closest('.elgg-river-item');
- var guid = riverItem.attr('id').replace('river-entity-', '');
-
- var params = {
- 'entity_guid': guid
- }
-
- $(likesList).load('<?php echo elgg_get_site_url();?>mod/riverdashboard/endpoint/get_likes.php', params, function(data) {
- // hide comments
- myParent.find('.comments-container').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 });
- // change selected tab
- myParent.find('.show-comments-button').addClass('off');
- myParent.find('.likes-user-list-button').removeClass('off');
- // show users that liked object
- elgg_slide_toggle(this, '.elgg-river-item', '.likes-list');
- });
- }
- });
-
- $('.show-comments-button').click(function() {
- var myParent = $(this).closest('.elgg-river-item');
- if (myParent.find('.comments-container').css('display') == 'none') {
- // hide likes
- myParent.find('.likes-list').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 });
- // change selected tab
- myParent.find('.show-comments-button').removeClass('off');
- myParent.find('.likes-user-list-button').addClass('off');
- // show users that liked object
- elgg_slide_toggle(this, '.elgg-river-item', '.comments-container');
- }
- });
-
- // grab more comments
- $('.river-more-comments.show-more-button').click(function() {
- var showLess = $(this).next('.show-less-button');
- var showMore = $(this);
- var riverItem = $(this).closest('.elgg-river-item');
-
- var guid = riverItem.attr('id').replace('river-entity-', '');
- var commentsList = riverItem.find('.comments-list');
- var numComments = riverItem.find('.river-comment').length;
-
- var params = {
- 'entity_guid': guid,
- 'offset': numComments
- }
-
- $.post('<?php echo elgg_get_site_url();?>mod/riverdashboard/endpoint/get_comments.php', params, function(data) {
- commentsList.prepend(data);
-
- showLess.toggle();
- showMore.toggle();
-
- });
- });
-
- // hide more comments
- $('.river-more-comments.show-less-button').click(function() {
- var showLess = $(this);
- var showMore = $(this).prev('.show-more-button');
- var riverItem = $(this).closest('.elgg-river-item');
- // want to keep the latest 3 comments
- var comments = riverItem.find('.river-comment')
- comments = $.makeArray(comments).reverse();
- //reverse().splice(0, 3);
-
- len = comments.length;
-
- for (i=3; i<len; i++) {
- $(comments[i]).empty().remove();
- }
-
-
- // remove them so we can force an ajax update when clicked again.
-
- showLess.toggle();
- showMore.toggle();
-
- });
- });
-
- // re-add avatar menus for new avatars
- //setup_avatar_menu($('.river-item_list'));
-</script>
diff --git a/mod/riverdashboard/views/default/riverdashboard/menu.php b/mod/riverdashboard/views/default/riverdashboard/menu.php
deleted file mode 100644
index 889cfbbd2..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/menu.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Elgg activity stream menu
- */
-$allselect = ''; $friendsselect = ''; $mineselect = ''; $display_option = '';
-switch($vars['orient']) {
- case 'all': $allselect = 'class="selected"';
- break;
- case 'friends': $friendsselect = 'class="selected"';
- $display_option = '&amp;display=friends';
- break;
- case 'mine': $mineselect = 'class="selected"';
- $display_option = '&amp;display=mine';
- break;
-}
-?>
-<ul class="submenu riverdashboard">
-<?php
- if(isloggedin()){
-?>
- <li <?php echo $allselect; ?> ><a href="<?php echo elgg_get_site_url(); ?>pg/activity/"><?php echo elgg_echo('all'); ?></a></li>
- <li <?php echo $friendsselect; ?> ><a href="<?php echo elgg_get_site_url(); ?>pg/activity/?display=friends"><?php echo elgg_echo('friends'); ?></a></li>
- <li <?php echo $mineselect; ?> ><a href="<?php echo elgg_get_site_url(); ?>pg/activity/?display=mine"><?php echo elgg_echo('mine'); ?></a></li>
-<?php
- }
-?>
-</ul> \ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
deleted file mode 100644
index cae3d7bcd..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-$contents = array();
-$contents['all'] = 'all';
-if (!empty($vars['config']->registered_entities)) {
- foreach ($vars['config']->registered_entities as $type => $ar) {
- foreach ($vars['config']->registered_entities[$type] as $object) {
- if ($object != 'helppage'){
- if (!empty($object )) {
- $keyname = 'item:'.$type.':'.$object;
- } else {
- $keyname = 'item:'.$type;
- }
- $contents[$keyname] = "{$type},{$object}";
- }
- }
- }
-}
-
-$allselect = $friendsselect = $mineselect = $display_option = '';
-switch($vars['orient']) {
- case '':
- $allselect = 'class="selected"';
- break;
- case 'friends':
- $friendsselect = 'class="selected"';
- $display_option = '&amp;display=friends';
- break;
- case 'mine':
- $mineselect = 'class="selected"';
- $display_option = '&amp;display=mine';
- break;
-}
-?>
-<div class="riverdashboard-filtermenu">
- <?php
- $location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='Notstyled' >";
- $current = get_input('subtype');
- foreach($contents as $label => $content) {
- $get_values = explode(",", $content);
- //select the current filter
- if ($get_values[1] == $current) {
- $selected = "SELECTED";
- }
- //set the drop down filter
- if ($content[0] && $content[1]) {
- $location_filter .= "<option {$selected} class='Nomenuoption' value=\"{$CONFIG->url}pg/activity/?type={$get_values[0]}&subtype={$get_values[1]}{$display_option}\" >" . elgg_echo('Show') . " " . elgg_echo($label) . "</option>";
- }
- //reset selected
- $selected = '';
- }
- $location_filter .= "</select>";
- echo $location_filter;
- ?>
- <input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
-</div>
-<div id="riverdashboard-updates" class="clearfix"></div>
diff --git a/mod/riverdashboard/views/default/riverdashboard/river/body.php b/mod/riverdashboard/views/default/riverdashboard/river/body.php
deleted file mode 100644
index ab1227609..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/river/body.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Body of river item
- *
- * @uses $vars[item]
- */
-
-$item = $vars[item];
-$subject = $item->getSubjectEntity();
-$object = $item->getObjectEntity();
-
-// river item header
-$params = array(
- 'href' => $subject->getURL(),
- 'text' => $subject->name,
-);
-$subject_link = elgg_view('output/url', $params);
-$timestamp = elgg_get_friendly_time($item->getPostedTime());
-$header = "$subject_link <span class=\"elgg-river-timestamp\">$timestamp</span>";
-
-// body
-$body = elgg_view($item->getView(), array('item' => $item));
-if ($object->getType() == 'object' && $vars['item']->annotation_id == 0) {
- $body .= '<div></div>';
- $body .= "<a class='river-comment-form-button link'>Comment</a>";
- $body .= elgg_view('forms/likes/link', array('entity' => $object));
-}
-
-// footer
-$footer = elgg_view('riverdashboard/river/footer', $vars);
-
-$params = array(
- 'header' => $header,
- 'body' => $body,
- 'footer' => $footer,
- 'show_inner' => false,
-);
-echo elgg_view('layout/objects/module', $params);
diff --git a/mod/riverdashboard/views/default/riverdashboard/river/footer.php b/mod/riverdashboard/views/default/riverdashboard/river/footer.php
deleted file mode 100644
index 6df58b5da..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/river/footer.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * River item footer
- */
-
-
-$object = get_entity($vars['item']->object_guid);
-$object_url = $object->getURL();
-$likes_count = elgg_count_likes($object);
-
-//user
-//if displaying on the profile get the object owner, else the subject_guid
-if (elgg_get_context() == 'profile' && $object->getSubtype() == 'thewire') {
- $user = get_entity($object->owner_guid);
-} else {
- $user = get_entity($vars['item']->subject_guid);
-}
-
-// get last three comments display
-// want the 3 most recent comments (order by time_created desc = 3 2 1 limit 3)
-// but will display them with the newest at the bottom (1 2 3)
-if ($comments = get_annotations($vars['item']->object_guid, "", "", 'generic_comment', "", "", 3, 0, "desc")) {
- $comments = array_reverse($comments);
-}
-
-// for displaying "+N more"
-// -3 from the count because the 3 displayed don't count in the "more"
-$comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, 'generic_comment');
-if ($comment_count < 3) {
- $more_comments_count = 0;
-} else {
- $more_comments_count = $comment_count - 3;
-}
-
-// body contents, generated by the river view in each plugin
-echo $vars['body'];
-
-// display latest 3 comments if there are any
-if ($comments){
- $counter = 0;
-
- echo "<div class='river-comments-tabs clearfix'>";
- echo "<a class='river-more-comments show-comments-button link'>" . elgg_echo('comments') . '</a>';
-
- if ($likes_count != 0) {
- echo elgg_view('forms/likes/display', array('entity' => $object));
- }
-
- echo "</div>"; // close river-comments-tabs
-
- echo "<div class='river-comments'>";
-
- if ($likes_count != 0) {
- //show the users who liked the object
- // this is loaded via ajax to avoid pounding the server with avatar requests.
- echo "<div class='likes-list hidden'></div>";
- }
-
- echo "<div class=\"comments-container\">";
- // display appropriate comment link
- if ($more_comments_count > 0) {
- echo "<a class=\"river-more-comments show-more-button link\">" .
- elgg_echo('riverdashboard:n_more_comments', array($more_comments_count)) . '</a>';
-
- echo "<a style=\"display: none\" class=\"river-more-comments show-less-button link\">" . elgg_echo('riverdashboard:show_less') . '</a>';
- }
- echo "<div class=\"comments-list\">";
- foreach ($comments as $comment) {
- //get the comment owner
- $comment_owner = get_user($comment->owner_guid);
- //get the comment owner's profile url
- $comment_owner_url = $comment_owner->getURL();
- // color-code each of the 3 comments
- // @todo this isn't used in CSS...
- if( ($counter == 2 && $comment_count >= 4) || ($counter == 1 && $comment_count == 2) || ($counter == 0 && $comment_count == 1) || ($counter == 2 && $comment_count == 3) ) {
- $alt = 'latest';
- } else if( ($counter == 1 && $comment_count >= 4) || ($counter == 0 && $comment_count == 2) || ($counter == 1 && $comment_count == 3) ) {
- $alt = 'penultimate';
- }
- //display comment
- echo "<div class='river-comment $alt clearfix'>";
- echo "<span class='river-comment-owner-icon'>";
- echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
- echo "</span>";
-
- //truncate comment to 150 characters and strip tags
- $contents = elgg_get_excerpt($comment->value, 150);
-
- echo "<div class='river-comment-contents'>";
- echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="elgg_excerpt">' . parse_urls($contents) . '</span>';
- echo "<span class='entity-subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
- echo "</div></div>";
- $counter++;
- }
-
- // close comments_list, comments_container and river-comments
- echo '</div></div>' . elgg_make_river_comment($object) . '</div>';
-} else {
- // tab bar nav - for users that liked object
- if ($vars['item']->type != 'user' && $likes_count != 0) {
- echo "<div class='river-comments-tabs clearfix'>";
- }
-
- if ($likes_count != 0) {
- echo elgg_view('forms/likes/display', array('entity' => $object));
- }
-
- if ($vars['item']->type != 'user' && $likes_count != 0) {
- echo "</div>"; // close river-comments-tabs
- }
-
- if ($vars['item']->type != 'user') {
- echo "<div class='river-comments'>";
- }
- if ($likes_count != 0) {
- //show the users who liked the object
- echo "<div class='likes-list hidden'>";
- echo list_annotations($object->getGUID(), 'likes', 99);
- echo "</div>";
- }
-
- // if there are no comments to display
- // and this is not a user - include the inline comment form
- if ($vars['item']->type != 'user') {
- echo elgg_make_river_comment($object);
- }
- if ($vars['item']->type != 'user') {
- echo "</div>";
- }
-}
diff --git a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
deleted file mode 100644
index e1c6ab07f..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Elgg comments add on river form
- * @uses $vars['entity']
- */
-
-if (isset($vars['entity']) && isloggedin()) {
- $form_body = "<div class='river-comment-form hidden'>";
- $form_body .= elgg_view('input/text',array(
- 'internalname' => 'generic_comment',
- 'value' => 'Add a comment...',
- 'js' => "onfocus=\"if (this.value=='Add a comment...') { this.value='' };\" onblur=\"if (this.value=='') { this.value='Add a comment...' }\""
- ));
- $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
- $form_body .= elgg_view('input/submit', array('value' => elgg_echo("Comment")));
- $form_body .= "</div>";
- echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/comments/add"));
-} \ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
deleted file mode 100644
index 522b32740..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Elgg thewire view page
- *
- * @package ElggTheWire
- *
- */
-
-//grab the current site message
-$site_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'sitemessage', 'limit' => 1));
-if ($site_message) {
- $mes = $site_message[0];
- $message = $mes->description;
- $dateStamp = elgg_view_friendly_time($mes->time_created);
- $delete = elgg_view("output/confirmlink",array(
- 'href' => "action/riverdashboard/delete?message=" . $mes->guid,
- 'text' => elgg_echo('delete'),
- 'confirm' => elgg_echo('deleteconfirm'),
- ));
-}
-
-//if there is a site message
-if ($site_message) {
-
- echo "<h3>" . elgg_echo("sitemessages:announcements") . "</h3>";
- echo "<p><small>" . elgg_echo("sitemessages:posted") . ": " . $dateStamp;
- //if admin display the delete link
- if (isadminloggedin()) {
- echo " " . $delete . " ";
- }
- echo "</small></p>";
- //display the message
- echo "<p>" . $message . "</p>";
-
- //display the input form to add a new message
- if (isadminloggedin()) {
- //action
- $action = "riverdashboard/add";
- $link = elgg_echo("sitemessages:add");
- $input_area = elgg_view('input/plaintext', array('internalname' => 'sitemessage', 'value' => ''));
- $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
- $form_body = <<<EOT
-
- <p><a class="collapsibleboxlink">{$link}</a></p>
- <div class="collapsible_box">
- {$input_area}<br />{$submit_input}
- </div>
-
-EOT;
- //display the form
- echo elgg_view('input/form', array('action' => "action/$action", 'body' => $form_body));
-
- }//end of admin if statement
-
- //if there is no message, add a form to create one
-} else {
-
- if (isadminloggedin()) {
-
- //action
- $action = "riverdashboard/add";
- $link = elgg_echo("sitemessages:add");
- $input_area = elgg_view('input/text', array('internalname' => 'sitemessage', 'value' => ''));
- $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
- $form_body = <<<EOT
-
- <p><a class="collapsibleboxlink">{$link}</a></p>
- <div class="collapsible_box">
- {$input_area}<br />{$submit_input}
- </div>
-EOT;
- //display the form
- echo elgg_view('input/form', array('action' => "action/$action", 'body' => $form_body));
-
- }//end of admin check
-}//end of main if
diff --git a/mod/riverdashboard/views/default/riverdashboard/welcome.php b/mod/riverdashboard/views/default/riverdashboard/welcome.php
deleted file mode 100644
index f5152135e..000000000
--- a/mod/riverdashboard/views/default/riverdashboard/welcome.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-/**
- * Elgg thewire view page
- */
-
-?>
-<h2><?php echo elgg_echo('welcome:user'), array(get_loggedin_user()->name); ?></h2> \ No newline at end of file