Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 197 insertions, 0 deletions

diff --git a/mod/groups/views/default/forum/topicposts.php b/mod/groups/views/default/forum/topicposts.php
new file mode 100644
index 000000000..20a545eec
--- /dev/null
+++ b/mod/groups/views/default/forum/topicposts.php
@@ -0,0 +1,106 @@
+<?php
+
+	/**
+	 * Elgg Topic individual post view. This is all the follow up posts on a particular topic
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The posted comment to view
+	 */
+	 
+	
+?>
+
+	<div class="topic_post"><!-- start the topic_post -->
+	
+	    <table width="100%">
+            <tr>
+                <td>
+                	<a name="<?php echo $vars['entity']->id; ?>"></a>
+                    <?php
+                        //get infomation about the owner of the comment
+                        if ($post_owner = get_user($vars['entity']->owner_guid)) {
+	                        
+	                        //display the user icon
+	                        echo "<div class=\"post_icon\">" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'small')) . "</div>";
+	                        
+	                        //display the user name
+	                        echo "<p><b>" . $post_owner->name . "</b><br />";
+	                        
+                        } else {
+                        	echo "<div class=\"post_icon\"><img src=\"" . elgg_view('icon/user/default/small') . "\" /></div>";
+                        	echo "<p><b>" . elgg_echo('profile:deleteduser') . "</b><br />";
+                        }
+                        
+                        //display the date of the comment
+                        echo "<small>" . friendly_time($vars['entity']->time_created) . "</small></p>";
+                    ?>
+                </td>
+                <td width="70%">       
+                    <?php
+                        //display the actual message posted
+                       echo parse_urls(elgg_view("output/longtext",array("value" => $vars['entity']->value)));
+                    ?>
+                </td>
+            </tr>
+        </table>
+		<?php
+
+		    //if the comment owner is looking at it, or admin, or group owner they can edit
+		    if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
+        ?>
+		        <p class="topic-post-menu">
+		        <?php
+             				
+			        echo elgg_view("output/confirmlink",array(
+														'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),
+                										'text' => elgg_echo('delete'),
+														'confirm' => elgg_echo('deleteconfirm'),
+													));
+						
+					//display an edit link that will open up an edit area							
+					echo " <a class=\"collapsibleboxlink\">".elgg_echo('edit')."</a>";
+					echo "<div class=\"collapsible_box\">";
+					//get the edit form and details
+					$submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+					$text_textarea = elgg_view('input/longtext', array('internalname' => 'postComment'.$vars['entity']->id, 'value' => $vars['entity']->value));
+                	$post = elgg_view('input/hidden', array('internalname' => 'post', 'value' => $vars['entity']->id));
+		  			$field = elgg_view('input/hidden', array('internalname' => 'field_num', 'value' => $vars['entity']->id));
+                	$topic = elgg_view('input/hidden', array('internalname' => 'topic', 'value' => get_input('topic')));
+		  			$group = elgg_view('input/hidden', array('internalname' => 'group', 'value' => get_input('group_guid')));
+		  			
+					$form_body = <<<EOT
+					
+					<div class='edit_forum_comments'>
+					<p class='longtext_editarea'>	
+						$text_textarea
+					</p>
+					$post
+					$topic
+					$group
+					$field
+					<p>
+						$submit_input
+					</p>
+						
+					</div>
+					
+EOT;
+				
+?>
+
+				<?php
+					echo elgg_view('input/form', array('action' => "{$vars['url']}action/groups/editpost", 'body' => $form_body, 'internalid' => 'editforumpostForm'));
+				?>
+					</div>
+		        </p>
+		
+        <?php
+            }
+	    ?>
+		
+	</div><!-- end the topic_post -->
\ No newline at end of file
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
new file mode 100644
index 000000000..c4cd9becf
--- /dev/null
+++ b/mod/groups/views/default/forum/topics.php
@@ -0,0 +1,33 @@
+<?php
+	/**
+	 * Elgg groups plugin
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+	 
+?>
+
+<div id="content_area_group_title"><h2><?php echo elgg_echo("groups:forum"); ?></h2></div>
+
+<?php
+    //only show the add link if the user is a member
+    if(page_owner_entity()->isMember($vars['user'])){
+     
+?>
+        <!-- display the add a topic link -->
+        <div class="add_topic"><a href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo get_input('group_guid'); ?>" class="add_topic_button"><?php echo elgg_echo("groups:addtopic"); ?></a></div>
+
+<?php
+    }
+?>    
+<?php
+	if($vars['topics'])
+		echo $vars['topics'];
+	else
+		echo "<div class='contentWrapper'>". elgg_echo("grouptopic:notcreated") . "</div>";
+
+?>
\ No newline at end of file
diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php
new file mode 100644
index 000000000..e7e194691
--- /dev/null
+++ b/mod/groups/views/default/forum/viewposts.php
@@ -0,0 +1,58 @@
+<?php
+
+    /**
+	 * Elgg groups plugin display topic posts
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+?>
+
+<div id="topic_posts"><!-- open the topic_posts div -->
+<div id="pages_breadcrumbs"><b><a href="<?php echo $vars['url']; ?>pg/groups/forum/<?php echo $vars['entity']->container_guid; ?>/"><?php echo elgg_echo("groups:forum"); ?></a></b> > <?php echo $vars['entity']->title; ?></div>
+  
+<?php
+    //display follow up comments
+    $count = $vars['entity']->countAnnotations('group_topic_post');
+    $offset = (int) get_input('offset',0);
+    
+    $baseurl = $vars['url'] . "mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$vars['entity']->container_guid}";
+    echo elgg_view('navigation/pagination',array(
+    												'limit' => 50,
+    												'offset' => $offset,
+    												'baseurl' => $baseurl,
+    												'count' => $count,
+    											));
+
+?>
+    <!-- grab the topic title -->
+        <div id="content_area_group_title"><h2><?php echo $vars['entity']->title; ?></h2></div>
+<?php
+    											
+    foreach($vars['entity']->getAnnotations('group_topic_post', 50, $offset, "asc") as $post) {
+    		    
+	     echo elgg_view("forum/topicposts",array('entity' => $post));
+		
+	}
+	
+	// check to find out the status of the topic and act
+    if($vars['entity']->status != "closed" && page_owner_entity()->isMember($vars['user'])){
+        
+        //display the add comment form, this will appear after all the existing comments
+	    echo elgg_view("forms/forums/addpost", array('entity' => $vars['entity']));
+	    
+    } elseif($vars['entity']->status == "closed") {
+        
+        //this topic has been closed by the owner
+        echo "<h2>" . elgg_echo("groups:topicisclosed") . "</h2>";
+        echo "<p>" . elgg_echo("groups:topiccloseddesc") . "</p>";
+        
+    } else {
+    }
+
+?>
+</div>
\ No newline at end of file