From b6f99468651309e0b58dbe000958540809df5dcc Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 29 Dec 2010 18:31:27 +0000 Subject: 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 --- .../views/default/river/dashboard.php | 19 --- .../views/default/river/item/list.php | 63 -------- .../views/default/river/item/wrapper.php | 150 ----------------- .../views/default/river/item/wrapper_classic.php | 20 --- .../views/default/riverdashboard/container.php | 52 ------ .../views/default/riverdashboard/css.php | 179 --------------------- .../views/default/riverdashboard/ecml/activity.php | 26 --- .../views/default/riverdashboard/js.php | 96 ----------- .../views/default/riverdashboard/menu.php | 27 ---- .../views/default/riverdashboard/nav.php | 57 ------- .../views/default/riverdashboard/river/body.php | 38 ----- .../views/default/riverdashboard/river/footer.php | 130 --------------- .../views/default/riverdashboard/rivercomment.php | 18 --- .../views/default/riverdashboard/sitemessage.php | 77 --------- .../views/default/riverdashboard/welcome.php | 8 - .../views/json/riverdashboard/container.php | 1 - .../views/rss/riverdashboard/container.php | 1 - 17 files changed, 962 deletions(-) delete mode 100644 mod/riverdashboard/views/default/river/dashboard.php delete mode 100644 mod/riverdashboard/views/default/river/item/list.php delete mode 100644 mod/riverdashboard/views/default/river/item/wrapper.php delete mode 100644 mod/riverdashboard/views/default/river/item/wrapper_classic.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/container.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/css.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/ecml/activity.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/js.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/menu.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/nav.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/river/body.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/river/footer.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/rivercomment.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/sitemessage.php delete mode 100644 mod/riverdashboard/views/default/riverdashboard/welcome.php delete mode 100644 mod/riverdashboard/views/json/riverdashboard/container.php delete mode 100644 mod/riverdashboard/views/rss/riverdashboard/container.php (limited to 'mod/riverdashboard/views') 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 @@ - -
-0)) { - foreach ($river as $r) { - echo $r; - } -} else { - echo elgg_echo('river:widget:noactivity'); -} -?> -
\ 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 @@ -= $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 .= '« ' . elgg_echo('previous') . ' '; - } - - 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 .= '' . elgg_echo('next') . ' » '; - } - - if (!empty($nav)) { - echo ''; - } -} - -?> - - \ 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 @@ -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; -} - -?> -
- - $user, 'size' => 'small')); ?> - - -
-"; - echo "" . elgg_echo('comments') . ''; - - if ($likes_count != 0) { - echo elgg_view('forms/likes/display', array('entity' => $object)); - } - - echo "
"; // close river-comments-tabs - - echo "
"; - - 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 ""; - } - - echo "
"; - // display appropriate comment link - if ($more_comments_count > 0) { - echo "" . - elgg_echo('riverdashboard:n_more_comments', array($more_comments_count)) . ''; - - echo "" . elgg_echo('riverdashboard:show_less') . ''; - } - echo "
"; - 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 "
"; - echo ""; - echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny')); - echo ""; - - //truncate comment to 150 characters and strip tags - $contents = elgg_get_excerpt($comment->value, 150); - - echo "
"; - echo "" . $comment_owner->name . ' ' . parse_urls($contents) . ''; - echo "" . elgg_view_friendly_time($comment->time_created) . ""; - echo "
"; - $counter++; - } - - // close comments_list, comments_container and river-comments - echo '
' . elgg_make_river_comment($object) . '
'; -} else { - // tab bar nav - for users that liked object - if ($vars['item']->type != 'user' && $likes_count != 0) { - echo "
"; - } - - if ($likes_count != 0) { - echo elgg_view('forms/likes/display', array('entity' => $object)); - } - - if ($vars['item']->type != 'user' && $likes_count != 0) { - echo "
"; // close river-comments-tabs - } - - if ($vars['item']->type != 'user') { - echo "
"; - } - if ($likes_count != 0) { - //show the users who liked the object - echo ""; - } - - // 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 "
"; - } -} -?> -
- 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 @@ - -
- - get_entity($vars['item']->subject_guid), 'size' => 'small')); -?> - -
- -
-
\ 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 @@ - - - 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 @@ - -#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("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("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(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 @@ -getGUID(); - } -} - -$river = elgg_view_river_items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false) . ""; - -// 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 @@ - 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 @@ - - \ 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 @@ -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 = '&display=friends'; - break; - case 'mine': - $mineselect = 'class="selected"'; - $display_option = '&display=mine'; - break; -} -?> -
- "; - $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 .= ""; - } - //reset selected - $selected = ''; - } - $location_filter .= ""; - echo $location_filter; - ?> - -
-
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 @@ -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 $timestamp"; - -// body -$body = elgg_view($item->getView(), array('item' => $item)); -if ($object->getType() == 'object' && $vars['item']->annotation_id == 0) { - $body .= '
'; - $body .= "Comment"; - $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 @@ -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 "
"; - echo "" . elgg_echo('comments') . ''; - - if ($likes_count != 0) { - echo elgg_view('forms/likes/display', array('entity' => $object)); - } - - echo "
"; // close river-comments-tabs - - echo "
"; - - 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 ""; - } - - echo "
"; - // display appropriate comment link - if ($more_comments_count > 0) { - echo "" . - elgg_echo('riverdashboard:n_more_comments', array($more_comments_count)) . ''; - - echo "" . elgg_echo('riverdashboard:show_less') . ''; - } - echo "
"; - 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 "
"; - echo ""; - echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny')); - echo ""; - - //truncate comment to 150 characters and strip tags - $contents = elgg_get_excerpt($comment->value, 150); - - echo "
"; - echo "" . $comment_owner->name . ' ' . parse_urls($contents) . ''; - echo "" . elgg_view_friendly_time($comment->time_created) . ""; - echo "
"; - $counter++; - } - - // close comments_list, comments_container and river-comments - echo '
' . elgg_make_river_comment($object) . '
'; -} else { - // tab bar nav - for users that liked object - if ($vars['item']->type != 'user' && $likes_count != 0) { - echo "
"; - } - - if ($likes_count != 0) { - echo elgg_view('forms/likes/display', array('entity' => $object)); - } - - if ($vars['item']->type != 'user' && $likes_count != 0) { - echo "
"; // close river-comments-tabs - } - - if ($vars['item']->type != 'user') { - echo "
"; - } - if ($likes_count != 0) { - //show the users who liked the object - echo ""; - } - - // 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 "
"; - } -} 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 @@ -"; - $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 .= ""; - 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 @@ - '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 "

" . elgg_echo("sitemessages:announcements") . "

"; - echo "

" . elgg_echo("sitemessages:posted") . ": " . $dateStamp; - //if admin display the delete link - if (isadminloggedin()) { - echo " " . $delete . " "; - } - echo "

"; - //display the message - echo "

" . $message . "

"; - - //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 = <<{$link}

-
- {$input_area}
{$submit_input} -
- -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 = <<{$link}

-
- {$input_area}
{$submit_input} -
-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 @@ - -

name); ?>

\ No newline at end of file diff --git a/mod/riverdashboard/views/json/riverdashboard/container.php b/mod/riverdashboard/views/json/riverdashboard/container.php deleted file mode 100644 index 871a6cc7e..000000000 --- a/mod/riverdashboard/views/json/riverdashboard/container.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mod/riverdashboard/views/rss/riverdashboard/container.php b/mod/riverdashboard/views/rss/riverdashboard/container.php deleted file mode 100644 index 871a6cc7e..000000000 --- a/mod/riverdashboard/views/rss/riverdashboard/container.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file -- cgit v1.2.3