From 1fd8bd6e296e2b1fc960fde1dd204b6c4e3e8aec Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Wed, 8 Jun 2011 02:31:30 -0700 Subject: River revamp for 1.8 --- .../views/default/river/object/thewire/create.php | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'mod/thewire/views') diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php index d4dac38ee..2e9cfd83b 100644 --- a/mod/thewire/views/default/river/object/thewire/create.php +++ b/mod/thewire/views/default/river/object/thewire/create.php @@ -7,18 +7,8 @@ $object = $vars['item']->getObjectEntity(); $excerpt = strip_tags($object->description); $excerpt = thewire_filter($excerpt); -$params = array( - 'href' => $object->getURL(), - 'text' => $object->title, -); -$link = elgg_view('output/url', $params); - -echo elgg_echo('thewire:river:create'); - -echo " $link"; - -if ($excerpt) { - echo '
'; - echo $excerpt; - echo '
'; -} +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'message' => $excerpt, + 'summary' => false, +)); \ No newline at end of file -- cgit v1.2.3 From 797f3ab42d2f9cbd1c2150d0f491696d4874b404 Mon Sep 17 00:00:00 2001 From: Ravindra Nath Kakarla Date: Mon, 13 Jun 2011 21:22:02 +0530 Subject: textarea has to be jQuery object --- mod/thewire/views/default/js/thewire.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/thewire/views') diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php index 1eda90bee..d9bf6d10e 100644 --- a/mod/thewire/views/default/js/thewire.php +++ b/mod/thewire/views/default/js/thewire.php @@ -30,7 +30,7 @@ elgg.thewire.init = function() { */ elgg.thewire.textCounter = function(textarea, status, limit) { - var remaining_chars = limit - textarea.value.length; + var remaining_chars = limit - $(textarea).val().length; status.html(remaining_chars); if (remaining_chars < 0) { @@ -83,4 +83,4 @@ elgg.thewire.viewPrevious = function(event) { event.preventDefault(); } -elgg.register_hook_handler('init', 'system', elgg.thewire.init); \ No newline at end of file +elgg.register_hook_handler('init', 'system', elgg.thewire.init); -- cgit v1.2.3 From 58e020e604e7e4f897a9025e73d9afb1ddba62ff Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 22 Jun 2011 20:28:53 -0400 Subject: added @username in the reply text for a wire post --- mod/thewire/languages/en.php | 2 +- mod/thewire/views/default/thewire/reply.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'mod/thewire/views') diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php index 1b9d71c56..9b2b480ae 100644 --- a/mod/thewire/languages/en.php +++ b/mod/thewire/languages/en.php @@ -13,7 +13,7 @@ $english = array( 'thewire:user' => "%s's wire posts", 'thewire:friends' => "Friends' wire posts", 'thewire:reply' => "Reply", - 'thewire:replying' => "Replying to %s who wrote", + 'thewire:replying' => "Replying to %s (@%s) who wrote", 'thewire:thread' => "Thread", 'thewire:charleft' => "characters remaining", 'thewire:tags' => "Wire posts tagged with '%s'", diff --git a/mod/thewire/views/default/thewire/reply.php b/mod/thewire/views/default/thewire/reply.php index 3794e1454..341b691b1 100644 --- a/mod/thewire/views/default/thewire/reply.php +++ b/mod/thewire/views/default/thewire/reply.php @@ -5,7 +5,10 @@ $post = $vars['post']; $poster = $post->getOwnerEntity(); - +$poster_details = array( + htmlspecialchars($poster->name, ENT_QUOTES, 'UTF-8'), + htmlspecialchars($poster->username, ENT_QUOTES, 'UTF-8'), +); ?> -name)); ?>: +: description; \ No newline at end of file -- cgit v1.2.3 From 64dcaa8cdc75669974501eb0627a5d5b348deb29 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 26 Jun 2011 07:07:27 -0400 Subject: Fixes #3368 combining $vars with parameters for object/elements/summary view --- mod/blog/views/default/object/blog.php | 2 ++ mod/bookmarks/views/default/object/bookmarks.php | 4 +++- mod/file/views/default/object/file.php | 2 ++ mod/groups/views/default/group/default.php | 1 + mod/groups/views/default/object/groupforumtopic.php | 2 ++ mod/pages/views/default/object/page_top.php | 2 ++ mod/thewire/views/default/object/thewire.php | 1 + views/default/object/default.php | 1 + views/default/object/elements/summary.php | 6 +++--- 9 files changed, 17 insertions(+), 4 deletions(-) (limited to 'mod/thewire/views') diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 8456829fe..ba08180b1 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -74,6 +74,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); $blog_info = elgg_view_image_block($owner_icon, $list_body); @@ -94,6 +95,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($owner_icon, $list_body); diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 38b0a721a..ca1f5d312 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -65,6 +65,7 @@ if ($full && !elgg_in_context('gallery')) { 'subtitle' => $subtitle, 'tags' => $tags, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); $bookmark_info = elgg_view_image_block($owner_icon, $list_body); @@ -118,7 +119,8 @@ HTML; 'tags' => $tags, 'content' => $content, ); - + $params = $params + $vars; $body = elgg_view('object/elements/summary', $params); + echo elgg_view_image_block($owner_icon, $body); } \ No newline at end of file diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index c6ac2a429..95e190d35 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -76,6 +76,7 @@ if ($full && !elgg_in_context('gallery')) { 'subtitle' => $subtitle, 'tags' => $tags, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); $file_info = elgg_view_image_block($file_icon, $list_body); @@ -104,6 +105,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($file_icon, $list_body); diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php index 2aa377813..fc91f90d0 100644 --- a/mod/groups/views/default/group/default.php +++ b/mod/groups/views/default/group/default.php @@ -31,6 +31,7 @@ if ($vars['full_view']) { 'metadata' => $metadata, 'subtitle' => $group->briefdescription, ); + $params = $params + $vars; $list_body = elgg_view('group/elements/summary', $params); echo elgg_view_image_block($icon, $list_body); diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 3a4decbe4..22589b84d 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -67,6 +67,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); $info = elgg_view_image_block($poster_icon, $list_body); @@ -90,6 +91,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($poster_icon, $list_body); diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php index 2ad44e38c..8ba9fc298 100644 --- a/mod/pages/views/default/object/page_top.php +++ b/mod/pages/views/default/object/page_top.php @@ -82,6 +82,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); $info = elgg_view_image_block($page_icon, $list_body); @@ -103,6 +104,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); + $params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($page_icon, $list_body); diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index 3ae347711..2727df60d 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -51,6 +51,7 @@ $params = array( 'content' => thewire_filter($post->description), 'tags' => false, ); +$params = $params + $vars; $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($owner_icon, $list_body); diff --git a/views/default/object/default.php b/views/default/object/default.php index 27bb1890e..a50f19387 100644 --- a/views/default/object/default.php +++ b/views/default/object/default.php @@ -42,6 +42,7 @@ $params = array( 'subtitle' => $subtitle, 'tags' => $vars['entity']->tags, ); +$params = $params + $vars; $body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($icon, $body); diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php index 9206ada66..10cf0b148 100644 --- a/views/default/object/elements/summary.php +++ b/views/default/object/elements/summary.php @@ -3,15 +3,15 @@ * Object summary * * Sample output - *
  • Public
  • Like this
+ *
  • Public
  • Like this
*

Title

*

Posted 3 hours ago by George

*

one, two

- *
Excerpt text
+ *
Excerpt text
* * @uses $vars['entity'] ElggEntity * @uses $vars['title'] Title link (optional) false = no title, '' = default - * @uses $vars['metadata'] HTML for entity metadata and actions (optional) + * @uses $vars['metadata'] HTML for entity menu and metadata (optional) * @uses $vars['subtitle'] HTML for the subtitle (optional) * @uses $vars['tags'] HTML for the tags (optional) * @uses $vars['content'] HTML for the entity content (optional) -- cgit v1.2.3 From 2f3b6a8aebc55009f066a49b2d9aaa12dc5be008 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 26 Jun 2011 07:48:03 -0400 Subject: provided a way to get to the wire from activity page --- mod/thewire/languages/en.php | 3 ++- .../views/default/river/object/thewire/create.php | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'mod/thewire/views') diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php index e2dd5fdac..9716fc060 100644 --- a/mod/thewire/languages/en.php +++ b/mod/thewire/languages/en.php @@ -29,7 +29,8 @@ $english = array( /** * The wire river */ - 'river:create:object:thewire' => "%s posted to the wire", + 'river:create:object:thewire' => "%s posted to the %s", + 'thewire:wire' => 'wire', /** * Wire widget diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php index 2e9cfd83b..c3c434858 100644 --- a/mod/thewire/views/default/river/object/thewire/create.php +++ b/mod/thewire/views/default/river/object/thewire/create.php @@ -7,8 +7,23 @@ $object = $vars['item']->getObjectEntity(); $excerpt = strip_tags($object->description); $excerpt = thewire_filter($excerpt); +$subject = $vars['item']->getSubjectEntity(); +$subject_link = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-river-subject', +)); + +$object_link = elgg_view('output/url', array( + 'href' => "thewire/owner/$subject->username", + 'text' => elgg_echo('thewire:wire'), + 'class' => 'elgg-river-object', +)); + +$summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link)); + echo elgg_view('river/item', array( 'item' => $vars['item'], 'message' => $excerpt, - 'summary' => false, + 'summary' => $summary, )); \ No newline at end of file -- cgit v1.2.3 From e35b3ffb512dc6b1af2aacb7bd92d85854a42868 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 28 Jun 2011 06:38:34 -0400 Subject: Fixes #3407 added elgg-foot to plugin forms --- mod/bookmarks/views/default/forms/bookmarks/save.php | 2 +- .../views/default/forms/developers/settings.php | 2 +- mod/externalpages/views/default/forms/expages/edit.php | 3 ++- mod/file/views/default/forms/file/upload.php | 2 +- mod/groups/views/default/forms/discussion/reply/save.php | 16 ++++++++++------ mod/groups/views/default/forms/discussion/save.php | 2 +- .../views/default/forms/invitefriends/invite.php | 2 +- mod/messages/views/default/forms/messages/process.php | 2 +- mod/messages/views/default/forms/messages/reply.php | 2 +- mod/messages/views/default/forms/messages/send.php | 2 +- .../default/forms/notificationsettings/groupsave.php | 2 +- mod/pages/views/default/forms/pages/edit.php | 2 +- .../views/default/forms/reportedcontent/add.php | 2 +- mod/thewire/views/default/forms/thewire/add.php | 2 +- 14 files changed, 24 insertions(+), 19 deletions(-) (limited to 'mod/thewire/views') diff --git a/mod/bookmarks/views/default/forms/bookmarks/save.php b/mod/bookmarks/views/default/forms/bookmarks/save.php index 886283202..7d064a55b 100644 --- a/mod/bookmarks/views/default/forms/bookmarks/save.php +++ b/mod/bookmarks/views/default/forms/bookmarks/save.php @@ -44,7 +44,7 @@ if ($categories) {
'access_id', 'value' => $access_id)); ?> -
+
'container_guid', 'value' => $container_guid)); diff --git a/mod/developers/views/default/forms/developers/settings.php b/mod/developers/views/default/forms/developers/settings.php index a442ca0ce..584f6af30 100644 --- a/mod/developers/views/default/forms/developers/settings.php +++ b/mod/developers/views/default/forms/developers/settings.php @@ -29,6 +29,6 @@ foreach ($vars['data'] as $name => $info) { echo '
'; } -echo '
'; +echo '
'; echo elgg_view('input/submit', array('value' => elgg_echo('save'))); echo '
'; diff --git a/mod/externalpages/views/default/forms/expages/edit.php b/mod/externalpages/views/default/forms/expages/edit.php index b0060477e..ca83ea7df 100644 --- a/mod/externalpages/views/default/forms/expages/edit.php +++ b/mod/externalpages/views/default/forms/expages/edit.php @@ -49,9 +49,10 @@ echo <<$external_page_title $input_area
+
$hidden_value $hidden_type $submit_input - +
EOT; diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php index 98b7d9f05..f637a419e 100644 --- a/mod/file/views/default/forms/file/upload.php +++ b/mod/file/views/default/forms/file/upload.php @@ -53,7 +53,7 @@ if ($categories) {
'access_id', 'value' => $access_id)); ?>
-
+
'container_guid', 'value' => $container_guid)); diff --git a/mod/groups/views/default/forms/discussion/reply/save.php b/mod/groups/views/default/forms/discussion/reply/save.php index be258b8fe..40ea07303 100644 --- a/mod/groups/views/default/forms/discussion/reply/save.php +++ b/mod/groups/views/default/forms/discussion/reply/save.php @@ -1,6 +1,6 @@ 'entity_guid', + 'value' => $vars['entity']->getGUID(), + )); + $inline = elgg_extract('inline', $vars, false); if ($inline) { echo elgg_view('input/text', array('name' => 'group_topic_post')); echo elgg_view('input/submit', array('value' => elgg_echo('reply'))); @@ -19,11 +23,11 @@ if (isset($vars['entity']) && elgg_is_logged_in()) { 'group_topic_post')); ?>
+
elgg_echo('reply'))); +?> +
+ 'entity_guid', - 'value' => $vars['entity']->getGUID(), - )); } diff --git a/mod/groups/views/default/forms/discussion/save.php b/mod/groups/views/default/forms/discussion/save.php index 5d50d5c91..a6582ede7 100644 --- a/mod/groups/views/default/forms/discussion/save.php +++ b/mod/groups/views/default/forms/discussion/save.php @@ -42,7 +42,7 @@ $guid = elgg_extract('guid', $vars, null);
'access_id', 'value' => $access_id)); ?>
-
+
'container_guid', 'value' => $container_guid)); diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php index 5af8b5da0..0d7f5d9f2 100644 --- a/mod/invitefriends/views/default/forms/invitefriends/invite.php +++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php @@ -27,7 +27,7 @@ if (elgg_get_config('allow_registration')) {
HTML; - echo '
'; + echo '
'; echo elgg_view('input/submit', array('value' => elgg_echo('send'))); echo '
'; } else { diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php index 01fe0f431..7e182b8f0 100644 --- a/mod/messages/views/default/forms/messages/process.php +++ b/mod/messages/views/default/forms/messages/process.php @@ -17,7 +17,7 @@ echo '
'; echo $messages; echo '
'; -echo '
'; +echo '
'; echo elgg_view('input/submit', array( 'value' => elgg_echo('delete'), 'name' => 'delete', diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php index e8a27f03e..9f3f4b57e 100644 --- a/mod/messages/views/default/forms/messages/reply.php +++ b/mod/messages/views/default/forms/messages/reply.php @@ -33,6 +33,6 @@ echo elgg_view('input/hidden', array( )); ?>
-
+
elgg_echo('messages:send'))); ?>
\ No newline at end of file diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php index c0a095993..b0638e0c0 100644 --- a/mod/messages/views/default/forms/messages/send.php +++ b/mod/messages/views/default/forms/messages/send.php @@ -49,6 +49,6 @@ $recipient_drop_down = elgg_view('input/dropdown', array( )); ?>
-
+
elgg_echo('messages:send'))); ?>
diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php index 2bf0d9628..61b94ff8b 100644 --- a/mod/notifications/views/default/forms/notificationsettings/groupsave.php +++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php @@ -96,7 +96,7 @@ END; '; + echo '
'; echo elgg_view('input/submit', array('value' => elgg_echo('save'))); echo '
'; diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index 5186da11c..c29de1085 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -30,7 +30,7 @@ if (!empty($cats)) { } -echo '
'; +echo '
'; if ($vars['guid']) { echo elgg_view('input/hidden', array( 'name' => 'page_guid', diff --git a/mod/reportedcontent/views/default/forms/reportedcontent/add.php b/mod/reportedcontent/views/default/forms/reportedcontent/add.php index 0b1716a35..f9986849d 100644 --- a/mod/reportedcontent/views/default/forms/reportedcontent/add.php +++ b/mod/reportedcontent/views/default/forms/reportedcontent/add.php @@ -48,7 +48,7 @@ $owner = elgg_get_logged_in_user_entity(); )); ?>
-
+
elgg_echo('reportedcontent:report'), diff --git a/mod/thewire/views/default/forms/thewire/add.php b/mod/thewire/views/default/forms/thewire/add.php index 67585b0df..743294dcc 100644 --- a/mod/thewire/views/default/forms/thewire/add.php +++ b/mod/thewire/views/default/forms/thewire/add.php @@ -25,7 +25,7 @@ if ($post) {
140
-
+
Date: Tue, 28 Jun 2011 07:47:37 -0400 Subject: Fixes #3579 using input/plaintext in the wire form --- mod/thewire/views/default/forms/thewire/add.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mod/thewire/views') diff --git a/mod/thewire/views/default/forms/thewire/add.php b/mod/thewire/views/default/forms/thewire/add.php index 743294dcc..8607b3662 100644 --- a/mod/thewire/views/default/forms/thewire/add.php +++ b/mod/thewire/views/default/forms/thewire/add.php @@ -20,8 +20,13 @@ if ($post) { 'value' => $post->guid, )); } + +echo elgg_view('input/plaintext', array( + 'name' => 'body', + 'class' => 'mtm', + 'id' => 'thewire-textarea', +)); ?> -
140
-- cgit v1.2.3