diff options
Diffstat (limited to 'mod/groups')
| -rw-r--r-- | mod/groups/views/default/forms/forums/edittopic.php | 3 | ||||
| -rw-r--r-- | mod/groups/views/default/object/groupforumtopic.php | 19 | ||||
| -rw-r--r-- | mod/groups/views/default/river/object/group/create.php | 13 |
3 files changed, 15 insertions, 20 deletions
diff --git a/mod/groups/views/default/forms/forums/edittopic.php b/mod/groups/views/default/forms/forums/edittopic.php index 00145edce..089ba9882 100644 --- a/mod/groups/views/default/forms/forums/edittopic.php +++ b/mod/groups/views/default/forms/forums/edittopic.php @@ -29,7 +29,6 @@ echo elgg_view_title(elgg_echo("groups:edittopic")); ?> - <!-- display the input form --> <form id="group_edittopic" action="<?php echo $vars['url']; ?>action/groups/edittopic" method="post"> <?php echo elgg_view('input/securitytoken'); ?> @@ -98,4 +97,4 @@ <input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" /> </p> - </form> + </form>
\ No newline at end of file diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 9ebf81642..8c95dd594 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -25,7 +25,7 @@ if ($last_post) { $u = get_user($last_user); //select the correct output depending on where you are -if(get_context() == "search"){ +if (get_context() == "search") { var_export($counter); if($counter == 1){ $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "<br />"; @@ -42,7 +42,7 @@ if(get_context() == "search"){ $info .= "<p class='entity_title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>"; } -}else{ +} else { if($counter == 1){ $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "</p>"; }else{ @@ -52,11 +52,20 @@ if(get_context() == "search"){ if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) { // display the delete link to those allowed to delete - $info .= "<div class='delete_button'>" . elgg_view("output/confirmlink", array( + $info .= "<div class='entity_metadata'>"; + $info .= '<span class="entity_edit">' . elgg_view("output/url", array( + 'href' => $vars['url'] . "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}", + 'text' => elgg_echo('edit'), + )); + $info .= '</span>'; + + // display the delete link to those allowed to delete + $info .= '<span class="delete_button">' . elgg_view("output/confirmlink", array( 'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid, - 'text' => " ", + 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm'), - )) . "</div>"; + )); + $info .= "</span></div>"; } diff --git a/mod/groups/views/default/river/object/group/create.php b/mod/groups/views/default/river/object/group/create.php deleted file mode 100644 index 94903fd66..000000000 --- a/mod/groups/views/default/river/object/group/create.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php - - $statement = $vars['statement']; - $performed_by = $statement->getSubject(); - $object = $statement->getObject(); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("group:river:created"),$url) . " "; - $string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("group:river:create") . "</a>"; - -?> - -<?php echo $string; ?>
\ No newline at end of file |