From 36ef345eb6425106f061fb866d9fa66d051e16df Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 5 Apr 2010 16:08:42 +0000
Subject: Merged 5530:5604 from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5622 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../views/default/thewire/activity_view.php        | 48 ----------------------
 mod/thewire/views/default/thewire/css.php          |  1 +
 mod/thewire/views/default/widgets/thewire/edit.php | 30 +++++++++-----
 mod/thewire/views/default/widgets/thewire/view.php | 40 ++++++------------
 .../views/rss/search/object/thewire/entity.php     | 28 +++++++++++++
 5 files changed, 61 insertions(+), 86 deletions(-)
 delete mode 100644 mod/thewire/views/default/thewire/activity_view.php
 create mode 100644 mod/thewire/views/rss/search/object/thewire/entity.php

(limited to 'mod/thewire/views')

diff --git a/mod/thewire/views/default/thewire/activity_view.php b/mod/thewire/views/default/thewire/activity_view.php
deleted file mode 100644
index 7edd64680..000000000
--- a/mod/thewire/views/default/thewire/activity_view.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-	/**
-	 * New wire post view for the activity stream
-	 */
-
-	//grab the users latest from the wire
-	$latest_wire = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire', 'owner_guid' => $_SESSION['user']->getGUID(), 'limit' => 1, 'full_view' => TRUE, 'view_type_toggle' => FALSE, 'pagination' => FALSE));
-
-?>
-
-<script>
-function textCounter(field,cntfield,maxlimit) {
-    // if too long...trim it!
-    if (field.value.length > maxlimit) {
-        field.value = field.value.substring(0, maxlimit);
-    } else {
-        // otherwise, update 'characters left' counter
-        cntfield.value = maxlimit - field.value.length;
-    }
-}
-</script>
-
-<div class="sidebarBox">
-
-	<form action="<?php echo $vars['url']; ?>action/thewire/add" method="post" name="noteForm">
-			
-		<?php
-			$display .= "<h3>" . elgg_echo('thewire:newpost') . "</h3><textarea name='note' value='' onKeyDown=\"textCounter(document.noteForm.note,document.noteForm.remLen1,140)\" onKeyUp=\"textCounter(document.noteForm.note,document.noteForm.remLen1,140)\" id=\"thewire_sidebarInputBox\">{$msg}</textarea><br />";
-			$display .= "<div class='thewire_characters_remaining'><input readonly type=\"text\" name=\"remLen1\" size=\"3\" maxlength=\"3\" value=\"140\" class=\"thewire_characters_remaining_field\">";
-			echo $display;
-			echo elgg_echo("thewire:charleft") . "</div>";
-		?>
-			<input type="hidden" name="method" value="site" />
-			<input type="hidden" name="location" value="activity" />
-			<input type="hidden" name="access_id" value="2" />
-			<input type="submit" value="<?php echo elgg_echo('save'); ?>" id="thewire_submit_button" />
-	</form>
-
-	<div class="last_wirepost">
-		<?php
-			echo $latest_wire;
-		?>
-	</div>
-	
-	<img src="<?php echo $vars['url']; ?>mod/thewire/graphics/river_icon_thewire.gif" alt="the wire" align="left" style="margin-right:5px;"/><a href="<?php echo $vars['url']; ?>mod/thewire/everyone.php" />Read the wire</a>
-
-</div>
\ No newline at end of file
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index 8b46f4b18..30959e5d3 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -75,6 +75,7 @@
 	margin-top:-3px;
 	float:left;
 	width:620px;
+	overflow: hidden;
 }
 .wire_post_options {
 	float:right;
diff --git a/mod/thewire/views/default/widgets/thewire/edit.php b/mod/thewire/views/default/widgets/thewire/edit.php
index 32a5c8bf7..969015ab8 100644
--- a/mod/thewire/views/default/widgets/thewire/edit.php
+++ b/mod/thewire/views/default/widgets/thewire/edit.php
@@ -1,14 +1,22 @@
 <?php
+// set default value
+if (!isset($vars['entity']->num_display)) {
+	$vars['entity']->num_display = 4;
+}
+?>
+<p>
+	<?php echo elgg_echo("thewire:num"); ?>
+	<select name="params[num_display]">
+<?php
+$options = array(1,2,3,4,5,6);
+foreach ($options as $option)  {
+	$selected = '';
+	if ($vars['entity']->num_display == $option) {
+		$selected = "selected='selected'";
+	}
 
+	echo "	<option value='{$option}' $selected >{$option}</option>\n";
+}
 ?>
-	<p>
-		<?php echo elgg_echo("thewire:num"); ?>
-		<select name="params[num_display]">
-		    <option value="1" <?php if($vars['entity']->num_display == 1) echo "SELECTED"; ?>>1</option>
-		    <option value="2" <?php if($vars['entity']->num_display == 2) echo "SELECTED"; ?>>2</option>
-		    <option value="3" <?php if($vars['entity']->num_display == 3) echo "SELECTED"; ?>>3</option>
-		    <option value="4" <?php if($vars['entity']->num_display == 4) echo "SELECTED"; ?>>4</option>
-		    <option value="5" <?php if($vars['entity']->num_display == 5) echo "SELECTED"; ?>>5</option>
-		    <option value="6" <?php if($vars['entity']->num_display == 6) echo "SELECTED"; ?>>6</option>
-		</select>
-	</p>
\ No newline at end of file
+	</select>
+</p>
\ No newline at end of file
diff --git a/mod/thewire/views/default/widgets/thewire/view.php b/mod/thewire/views/default/widgets/thewire/view.php
index 4821b854b..39fe368d0 100644
--- a/mod/thewire/views/default/widgets/thewire/view.php
+++ b/mod/thewire/views/default/widgets/thewire/view.php
@@ -1,29 +1,15 @@
+<?php
+		
+$num = $vars['entity']->num_display;
+if (!$num) {
+	$num = 4;
+}
 
-	<?php
+$content = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire', 'container_guid' => $vars['entity']->owner_guid, 'limit' => $num, 'full_view' => FALSE, 'pagination' => FALSE));
 
-		// Get any wire notes to display
-		// Get the current page's owner
-		$page_owner = page_owner_entity();
-		if ($page_owner === false || is_null($page_owner)) {
-			$page_owner = $_SESSION['user'];
-			set_page_owner($page_owner->getGUID());
-		}
-		
-		$num = $vars['entity']->num_display;
-		if(!$num)
-			$num = 4;
-		
-		$thewire = $page_owner->getObjects('thewire', $num);
-		
-		// If there are any thewire to view, view them
-		if (is_array($thewire) && sizeof($thewire) > 0) {
-			
-			foreach($thewire as $shout) {
-				
-				echo elgg_view_entity($shout);
-				
-			}
-			
-		}
-	
-	?>
+echo $content;
+
+if ($content) {
+	$blogurl = $vars['url'] . "pg/thewire/" . page_owner_entity()->username;
+	echo "<div class=\"shares_widget_wrapper\"><a href=\"{$blogurl}\">".elgg_echo('thewire:moreposts')."</a></div>";
+}
diff --git a/mod/thewire/views/rss/search/object/thewire/entity.php b/mod/thewire/views/rss/search/object/thewire/entity.php
new file mode 100644
index 000000000..ff0b5b480
--- /dev/null
+++ b/mod/thewire/views/rss/search/object/thewire/entity.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg thewire.
+ * Search entity view for RSS feeds.
+ *
+ * @package ElggTheWire
+ * @link http://elgg.org/
+ */
+
+if (!array_key_exists('entity', $vars)) {
+	return FALSE;
+}
+
+$owner = $vars['entity']->getOwnerEntity();
+if ($owner) {
+	$title = sprintf(elgg_echo('thewire:by'), $owner->name);
+}
+$description = $vars['entity']->getVolatileData('search_matched_description');
+
+?>
+
+<item>
+	<guid isPermaLink='false'><?php echo $vars['entity']->getGUID(); ?></guid>
+	<pubDate><?php echo date("r", $vars['entity']->time_created) ?></pubDate>
+	<link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
+	<title><![CDATA[<?php echo $title; ?>]]></title>
+	<description><![CDATA[<?php	echo $description; ?>]]></description>
+</item>
-- 
cgit v1.2.3