From d5f0d44d4ddf33db2248ef0bdd44633d57c31683 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 8 Oct 2011 08:22:08 -0400
Subject: Fixes #3411 output/url now has a is_trusted parameter - defaults to
 false

---
 mod/thewire/views/default/object/thewire.php              | 1 +
 mod/thewire/views/default/river/object/thewire/create.php | 2 ++
 mod/thewire/views/default/thewire/profile_status.php      | 1 +
 mod/thewire/views/default/widgets/thewire/content.php     | 1 +
 4 files changed, 5 insertions(+)

(limited to 'mod/thewire/views/default')

diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 2727df60d..134c87243 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -26,6 +26,7 @@ $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(
 	'href' => "thewire/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
 $date = elgg_view_friendly_time($post->time_created);
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index c3c434858..fbf592664 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -12,12 +12,14 @@ $subject_link = elgg_view('output/url', array(
 	'href' => $subject->getURL(),
 	'text' => $subject->name,
 	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
 ));
 
 $object_link = elgg_view('output/url', array(
 	'href' => "thewire/owner/$subject->username",
 	'text' => elgg_echo('thewire:wire'),
 	'class' => 'elgg-river-object',
+	'is_trusted' => true,
 ));
 
 $summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link));
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index 6ab47bccb..ab20b5341 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -28,6 +28,7 @@ if ($latest_wire && count($latest_wire) > 0) {
 			'text' => elgg_echo('thewire:update'),
 			'href' => $url_to_wire,
 			'class' => 'elgg-button elgg-button-action right',
+			'is_trusted' => true,
 		));
 	}
 
diff --git a/mod/thewire/views/default/widgets/thewire/content.php b/mod/thewire/views/default/widgets/thewire/content.php
index 835a328b0..7212d4397 100644
--- a/mod/thewire/views/default/widgets/thewire/content.php
+++ b/mod/thewire/views/default/widgets/thewire/content.php
@@ -22,6 +22,7 @@ if ($content) {
 	$more_link = elgg_view('output/url', array(
 		'href' => $owner_url,
 		'text' => elgg_echo('thewire:moreposts'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
-- 
cgit v1.2.3


From 82da6bff73a99d18bbe2363c7e30aaf6d3fc949f Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 29 Oct 2011 12:33:10 -0400
Subject: adds a river layout view that all river views should use

---
 engine/lib/views.php                               |  2 +-
 .../views/default/river/object/blog/create.php     |  2 +-
 .../default/river/object/bookmarks/create.php      |  2 +-
 .../views/default/river/object/file/create.php     |  2 +-
 .../river/annotation/group_topic_post/reply.php    |  2 +-
 mod/groups/views/default/river/group/create.php    |  2 +-
 .../river/object/groupforumtopic/create.php        |  2 +-
 .../default/river/relationship/member/create.php   |  2 +-
 .../default/river/object/messageboard/create.php   |  2 +-
 .../views/default/river/object/page/create.php     |  2 +-
 .../views/default/river/object/thewire/create.php  |  2 +-
 .../river/annotation/generic_comment/create.php    |  2 +-
 views/default/river/elements/layout.php            | 14 +++++++++++
 views/default/river/item.php                       | 28 +++++++++++++++++-----
 views/default/river/relationship/friend/create.php |  2 +-
 .../river/user/default/profileiconupdate.php       |  3 +--
 views/default/river/user/default/profileupdate.php |  2 +-
 17 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100644 views/default/river/elements/layout.php

(limited to 'mod/thewire/views/default')

diff --git a/engine/lib/views.php b/engine/lib/views.php
index e8cb20232..3b26fb169 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1225,7 +1225,7 @@ function elgg_view_river_item($item, array $vars = array()) {
 
 	$vars['item'] = $item;
 
-	return elgg_view($item->getView(), $vars);
+	return elgg_view('river/item', $vars);
 }
 
 /**
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index 613cbb165..a054c1061 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -7,7 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->excerpt);
 $excerpt = elgg_get_excerpt($excerpt);
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 ));
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 984d109be..388f54ac9 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -8,7 +8,7 @@
 $object = $vars['item']->getObjectEntity();
 $excerpt = elgg_get_excerpt($object->description);
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 	'attachments' => elgg_view('output/url', array('href' => $object->address)),
diff --git a/mod/file/views/default/river/object/file/create.php b/mod/file/views/default/river/object/file/create.php
index dad629120..e8e6142e0 100644
--- a/mod/file/views/default/river/object/file/create.php
+++ b/mod/file/views/default/river/object/file/create.php
@@ -7,7 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 ));
\ No newline at end of file
diff --git a/mod/groups/views/default/river/annotation/group_topic_post/reply.php b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
index cc94fbd43..afc823bde 100644
--- a/mod/groups/views/default/river/annotation/group_topic_post/reply.php
+++ b/mod/groups/views/default/river/annotation/group_topic_post/reply.php
@@ -6,7 +6,7 @@ $object = $vars['item']->getObjectEntity();
 $reply = $vars['item']->getAnnotation();
 $excerpt = elgg_get_excerpt($reply->value);
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 ));
\ No newline at end of file
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index cacb5ad3f..ea42b5b00 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -7,7 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 ));
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php
index 80e7b09aa..e7d92bc08 100644
--- a/mod/groups/views/default/river/object/groupforumtopic/create.php
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -15,7 +15,7 @@ if (elgg_is_logged_in() && $object->canAnnotate(0, 'group_topic_post')) {
 	$responses = elgg_view_form('discussion/reply/save', $form_vars, $body_vars);
 }
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 	'responses' => $responses,
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index d1c4c3ed3..0afd87e4b 100644
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -3,6 +3,6 @@
  * Group join river view.
  */
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 ));
diff --git a/mod/messageboard/views/default/river/object/messageboard/create.php b/mod/messageboard/views/default/river/object/messageboard/create.php
index 975598805..7ce7f6b4e 100644
--- a/mod/messageboard/views/default/river/object/messageboard/create.php
+++ b/mod/messageboard/views/default/river/object/messageboard/create.php
@@ -5,7 +5,7 @@
 
 $messageboard = $vars['item']->getAnnotation();
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $messageboard->value,
 ));
diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index ca15ddea7..4c31def33 100644
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -7,7 +7,7 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->description);
 $excerpt = elgg_get_excerpt($excerpt);
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 ));
\ No newline at end of file
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index fbf592664..c75a42b3f 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -24,7 +24,7 @@ $object_link = elgg_view('output/url', array(
 
 $summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link));
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 	'summary' => $summary,
diff --git a/views/default/river/annotation/generic_comment/create.php b/views/default/river/annotation/generic_comment/create.php
index d3db68e41..7d586450d 100644
--- a/views/default/river/annotation/generic_comment/create.php
+++ b/views/default/river/annotation/generic_comment/create.php
@@ -5,7 +5,7 @@
 $object = $vars['item']->getObjectEntity();
 $comment = $vars['item']->getAnnotation();
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => elgg_get_excerpt($comment->value),
 ));
diff --git a/views/default/river/elements/layout.php b/views/default/river/elements/layout.php
new file mode 100644
index 000000000..94622e272
--- /dev/null
+++ b/views/default/river/elements/layout.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Layout of a river item
+ *
+ * @uses $vars['item'] ElggRiverItem
+ */
+
+$item = $vars['item'];
+
+echo elgg_view('page/components/image_block', array(
+	'image' => elgg_view('river/elements/image', $vars),
+	'body' => elgg_view('river/elements/body', $vars),
+	'class' => 'elgg-river-item',
+));
diff --git a/views/default/river/item.php b/views/default/river/item.php
index 94622e272..75767e08d 100644
--- a/views/default/river/item.php
+++ b/views/default/river/item.php
@@ -1,14 +1,30 @@
 <?php
 /**
- * Layout of a river item
+ * Primary river item view
+ *
+ * Calls the individual view saved for that river item. Most of these
+ * individual river views then use the views in river/elements.
  *
  * @uses $vars['item'] ElggRiverItem
  */
 
+// @todo remove this in Elgg 1.9
+global $_elgg_special_river_catch;
+if (!isset($_elgg_special_river_catch)) {
+	$_elgg_special_river_catch = false;
+}
+if ($_elgg_special_river_catch) {
+	// we changed the views a little in 1.8.1 so this catches the plugins that
+	// were updated in 1.8.0 and redirects to the layout view
+	echo elgg_view('river/elements/layout', $vars);
+	return true;
+}
+$_elgg_special_river_catch = true;
+
+
 $item = $vars['item'];
 
-echo elgg_view('page/components/image_block', array(
-	'image' => elgg_view('river/elements/image', $vars),
-	'body' => elgg_view('river/elements/body', $vars),
-	'class' => 'elgg-river-item',
-));
+echo elgg_view($item->getView(), $vars);
+
+
+$_elgg_special_river_catch = false;
diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php
index a191e7b1e..0408d79e1 100644
--- a/views/default/river/relationship/friend/create.php
+++ b/views/default/river/relationship/friend/create.php
@@ -8,7 +8,7 @@ $object = $vars['item']->getObjectEntity();
 $subject_icon = elgg_view_entity_icon($subject, 'tiny');
 $object_icon = elgg_view_entity_icon($object, 'tiny');
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'attachments' => $subject_icon . elgg_view_icon('arrow-right') . $object_icon,
 ));
diff --git a/views/default/river/user/default/profileiconupdate.php b/views/default/river/user/default/profileiconupdate.php
index 90daab1a7..160ffd252 100644
--- a/views/default/river/user/default/profileiconupdate.php
+++ b/views/default/river/user/default/profileiconupdate.php
@@ -3,7 +3,6 @@
  * Update avatar river view
  */
 
-
 $subject = $vars['item']->getSubjectEntity();
 
 $subject_link = elgg_view('output/url', array(
@@ -15,7 +14,7 @@ $subject_link = elgg_view('output/url', array(
 
 $string = elgg_echo('river:update:user:avatar', array($subject_link));
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'summary' => $string,
 	'attachments' => elgg_view_entity_icon($subject, 'tiny', array('hover' => false)),
diff --git a/views/default/river/user/default/profileupdate.php b/views/default/river/user/default/profileupdate.php
index 69b69b106..ce72970d6 100644
--- a/views/default/river/user/default/profileupdate.php
+++ b/views/default/river/user/default/profileupdate.php
@@ -14,7 +14,7 @@ $subject_link = elgg_view('output/url', array(
 
 $string = elgg_echo('river:update:user:profile', array($subject_link));
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'summary' => $string,
 ));
-- 
cgit v1.2.3


From 5c0bd8a19a294f178ddd6607dd3f624ca34fa5b7 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Tue, 1 Nov 2011 19:36:27 -0400
Subject: added semi-colons after function expressions

---
 .../coding_standards/javascript_coding_standards.txt       | 11 +++++++++++
 js/lib/avatar_cropper.js                                   |  6 +++---
 js/lib/configuration.js                                    |  2 +-
 js/lib/elgglib.js                                          |  8 ++++----
 js/lib/hooks.js                                            |  8 ++++----
 js/lib/ui.js                                               | 14 +++++++-------
 js/lib/ui.widgets.js                                       | 12 ++++++------
 js/lib/userpicker.js                                       | 10 +++++-----
 mod/blog/views/default/js/blog/save_draft.php              |  4 ++--
 mod/bookmarks/views/default/bookmarks/js.php               |  2 +-
 mod/developers/views/default/js/developers/developers.php  |  4 ++--
 mod/embed/views/default/js/embed/embed.php                 |  8 ++++----
 mod/messageboard/views/default/messageboard/js.php         |  6 +++---
 mod/thewire/views/default/js/thewire.php                   |  6 +++---
 mod/tinymce/views/default/js/tinymce.php                   |  4 ++--
 .../views/default/uservalidationbyemail/js.php             |  2 +-
 16 files changed, 59 insertions(+), 48 deletions(-)

(limited to 'mod/thewire/views/default')

diff --git a/documentation/coding_standards/javascript_coding_standards.txt b/documentation/coding_standards/javascript_coding_standards.txt
index 7d3b842ec..9939e80ab 100644
--- a/documentation/coding_standards/javascript_coding_standards.txt
+++ b/documentation/coding_standards/javascript_coding_standards.txt
@@ -1,2 +1,13 @@
 *** JAVASCRIPT CODING STANDARDS ***
 
+*	Same formatting standards as PHP.
+
+*	All functions should be in the elgg namespace.
+
+*	Function expressions should end with a semi-colon:
+
+	elgg.ui.toggles = function(event) {
+		event.preventDefault();
+		$(target).slideToggle('medium');
+	};
+
diff --git a/js/lib/avatar_cropper.js b/js/lib/avatar_cropper.js
index df6ba7866..fc32a0832 100644
--- a/js/lib/avatar_cropper.js
+++ b/js/lib/avatar_cropper.js
@@ -32,7 +32,7 @@ elgg.avatarCropper.init = function() {
 		var selection = ias.getSelection();
 		elgg.avatarCropper.preview($('#user-avatar-cropper'), selection);
 	}
-}
+};
 
 /**
  * Handler for changing select area.
@@ -57,7 +57,7 @@ elgg.avatarCropper.preview = function(img, selection) {
 		marginLeft: '-' + Math.round(scaleX * selection.x1) + 'px',
 		marginTop: '-' + Math.round(scaleY * selection.y1) + 'px'
 	});
-}
+};
 
 /**
  * Handler for updating the form inputs after select ends
@@ -71,6 +71,6 @@ elgg.avatarCropper.selectChange = function(img, selection) {
 	$('input[name=x2]').val(selection.x2);
 	$('input[name=y1]').val(selection.y1);
 	$('input[name=y2]').val(selection.y2);
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.avatarCropper.init);
\ No newline at end of file
diff --git a/js/lib/configuration.js b/js/lib/configuration.js
index f724a2f01..6e221c957 100644
--- a/js/lib/configuration.js
+++ b/js/lib/configuration.js
@@ -7,4 +7,4 @@ elgg.provide('elgg.config');
  */
 elgg.get_site_url = function() {
 	return elgg.config.wwwroot;
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js
index 628adccfc..d963a62be 100644
--- a/js/lib/elgglib.js
+++ b/js/lib/elgglib.js
@@ -467,7 +467,7 @@ elgg.parse_url = function(url, component, expand) {
 		}
 	}
 	return results;
-}
+};
 
 /**
  * Returns an object with key/values of the parsed query string.
@@ -540,7 +540,7 @@ elgg.push_to_object_array = function(object, parent, value) {
 	}
 
 	return false;
-}
+};
 
 /**
  * Tests if object[parent] contains child
@@ -554,7 +554,7 @@ elgg.is_in_object_array = function(object, parent, value) {
 	elgg.assertTypeOf('string', parent);
 
 	return typeof(object[parent]) != 'undefined' && object[parent].indexOf(value) >= 0;
-}
+};
 
 /**
  * Triggers the init hook when the library is ready
@@ -569,4 +569,4 @@ elgg.initWhenReady = function() {
 		elgg.trigger_hook('init', 'system');
 		elgg.trigger_hook('ready', 'system');
 	}
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/js/lib/hooks.js b/js/lib/hooks.js
index edfd28f24..7bac471f6 100644
--- a/js/lib/hooks.js
+++ b/js/lib/hooks.js
@@ -136,7 +136,7 @@ elgg.register_instant_hook = function(name, type) {
 	elgg.assertTypeOf('string', type);
 
 	return elgg.push_to_object_array(elgg.config.instant_hooks, name, type);
-}
+};
 
 /**
  * Is this hook registered as an instant hook?
@@ -146,7 +146,7 @@ elgg.register_instant_hook = function(name, type) {
  */
 elgg.is_instant_hook = function(name, type) {
 	return elgg.is_in_object_array(elgg.config.instant_hooks, name, type);
-}
+};
 
 /**
  * Records that a hook has been triggered.
@@ -156,7 +156,7 @@ elgg.is_instant_hook = function(name, type) {
  */
 elgg.set_triggered_hook = function(name, type) {
 	return elgg.push_to_object_array(elgg.config.triggered_hooks, name, type);
-}
+};
 
 /**
  * Has this hook been triggered yet?
@@ -166,7 +166,7 @@ elgg.set_triggered_hook = function(name, type) {
  */
 elgg.is_triggered_hook = function(name, type) {
 	return elgg.is_in_object_array(elgg.config.triggered_hooks, name, type);
-}
+};
 
 elgg.register_instant_hook('init', 'system');
 elgg.register_instant_hook('ready', 'system');
diff --git a/js/lib/ui.js b/js/lib/ui.js
index 6cc1bc78a..16ef2dc96 100644
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -25,7 +25,7 @@ elgg.ui.init = function () {
 	if ($('.elgg-input-date').length) {
 		elgg.ui.initDatePicker();
 	}
-}
+};
 
 /**
  * Toggles an element based on clicking a separate element
@@ -43,7 +43,7 @@ elgg.ui.toggles = function(event) {
 	var target = $(this).toggleClass('elgg-state-active').attr('href');
 
 	$(target).slideToggle('medium');
-}
+};
 
 /**
  * Pops up an element based on clicking a separate element
@@ -105,7 +105,7 @@ elgg.ui.popsUp = function(event) {
 	$('body')
 		.die('click', elgg.ui.popupClose)
 		.live('click', elgg.ui.popupClose);
-}
+};
 
 /**
  * Catches clicks that aren't in a popup and closes all popups.
@@ -143,7 +143,7 @@ elgg.ui.popupClose = function(event) {
 
 		$('body').die('click', elgg.ui.popClose);
 	}
-}
+};
 
 /**
  * Toggles a child menu when the parent is clicked
@@ -155,7 +155,7 @@ elgg.ui.toggleMenu = function(event) {
 	$(this).siblings().slideToggle('medium');
 	$(this).toggleClass('elgg-menu-closed elgg-menu-opened');
 	event.preventDefault();
-}
+};
 
 /**
  * Initialize the hover menu
@@ -215,7 +215,7 @@ elgg.ui.initHoverMenu = function(parent) {
 			$(".elgg-menu-hover").fadeOut();
 		}
 	});
-}
+};
 
 /**
  * Calls a confirm() and prevents default if denied.
@@ -276,7 +276,7 @@ elgg.ui.initDatePicker = function() {
 			}
 		}
 	});
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.ui.init);
 elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.LoginHandler);
\ No newline at end of file
diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
index fb256672a..6435d2147 100644
--- a/js/lib/ui.widgets.js
+++ b/js/lib/ui.widgets.js
@@ -65,7 +65,7 @@ elgg.ui.widgets.add = function(event) {
 		}
 	});
 	event.preventDefault();
-}
+};
 
 /**
  * Persist the widget's new position
@@ -96,7 +96,7 @@ elgg.ui.widgets.move = function(event, ui) {
 	// @hack fixes jquery-ui/opera bug where draggable elements jump
 	ui.item.css('top', 0);
 	ui.item.css('left', 0);
-}
+};
 
 /**
  * Removes a widget from the layout
@@ -134,7 +134,7 @@ elgg.ui.widgets.remove = function(event) {
 		}
 	});
 	event.preventDefault();
-}
+};
 
 /**
  * Toggle the collapse state of the widget
@@ -146,7 +146,7 @@ elgg.ui.widgets.collapseToggle = function(event) {
 	$(this).toggleClass('elgg-widget-collapsed');
 	$(this).parent().parent().find('.elgg-body').slideToggle('medium');
 	event.preventDefault();
-}
+};
 
 /**
  * Save a widget's settings
@@ -178,7 +178,7 @@ elgg.ui.widgets.saveSettings = function(event) {
 		}
 	});
 	event.preventDefault();
-}
+};
 
 /**
  * Make all elements have the same min-height
@@ -197,6 +197,6 @@ elgg.ui.widgets.equalHeight = function(selector) {
 		}
 	})
 	$(selector).css('min-height', maxHeight);
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.ui.widgets.init);
diff --git a/js/lib/userpicker.js b/js/lib/userpicker.js
index ae2add53f..8287ba91c 100644
--- a/js/lib/userpicker.js
+++ b/js/lib/userpicker.js
@@ -34,7 +34,7 @@ elgg.userpicker.init = function() {
 	});
 
 	$('.elgg-userpicker-remove').live('click', elgg.userpicker.removeUser);
-}
+};
 
 /**
  * Adds a user to the select user list
@@ -59,7 +59,7 @@ elgg.userpicker.addUser = function(event, ui) {
 
 	$(this).val('');
 	event.preventDefault();
-}
+};
 
 /**
  * Remove a user from the selected user list
@@ -75,7 +75,7 @@ elgg.userpicker.removeUser = function(event) {
 
 	item.remove();
 	event.preventDefault();
-}
+};
 
 /**
  * Render the list item for insertion into the selected user list
@@ -96,7 +96,7 @@ elgg.userpicker.viewUser = function(info) {
 	html += "</div";
 	
 	return html;
-}
+};
 
 /**
  * Get the parameters to use for autocomplete
@@ -112,6 +112,6 @@ elgg.userpicker.getSearchParams = function(obj) {
 	} else {
 		return {'match_on[]': 'users', 'term' : obj.term};
 	}
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.userpicker.init);
\ No newline at end of file
diff --git a/mod/blog/views/default/js/blog/save_draft.php b/mod/blog/views/default/js/blog/save_draft.php
index fd76c870c..8a994ffb0 100644
--- a/mod/blog/views/default/js/blog/save_draft.php
+++ b/mod/blog/views/default/js/blog/save_draft.php
@@ -28,7 +28,7 @@ elgg.blog.saveDraftCallback = function(data, textStatus, XHR) {
 	} else {
 		$(".blog-save-status-time").html(elgg.echo('error'));
 	}
-}
+};
 
 elgg.blog.saveDraft = function() {
 	if (typeof(tinyMCE) != 'undefined') {
@@ -55,7 +55,7 @@ elgg.blog.saveDraft = function() {
 	});
 
 	$.post(draftURL, postData, elgg.blog.saveDraftCallback, 'json');
-}
+};
 
 elgg.blog.init = function() {
 	// get a copy of the body to compare for auto save
diff --git a/mod/bookmarks/views/default/bookmarks/js.php b/mod/bookmarks/views/default/bookmarks/js.php
index 0e55c510a..c36823c09 100644
--- a/mod/bookmarks/views/default/bookmarks/js.php
+++ b/mod/bookmarks/views/default/bookmarks/js.php
@@ -7,6 +7,6 @@ elgg.bookmarks.init = function() {
 	var e = $('a.elgg-bookmark-page');
 	var link = e.attr('href') + '&title=' + encodeURIComponent(title);
 	e.attr('href', link);
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.bookmarks.init);
diff --git a/mod/developers/views/default/js/developers/developers.php b/mod/developers/views/default/js/developers/developers.php
index 09e6ddd12..6e82295aa 100644
--- a/mod/developers/views/default/js/developers/developers.php
+++ b/mod/developers/views/default/js/developers/developers.php
@@ -8,7 +8,7 @@ elgg.provide('elgg.dev');
 
 elgg.dev.init = function() {
 	$('.developers-form-inspect').live('submit', elgg.dev.inspectSubmit);
-}
+};
 
 /**
  * Submit the inspect form through Ajax
@@ -39,6 +39,6 @@ elgg.dev.inspectSubmit = function(event) {
 	});
 
 	event.preventDefault();
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.dev.init);
\ No newline at end of file
diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index 3126e12f7..8e543ac37 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -19,7 +19,7 @@ elgg.embed.init = function() {
 	$('.embed-section').live('click', elgg.embed.forward);
 
 	$('.elgg-form-embed').live('submit', elgg.embed.submit);
-}
+};
 
 /**
  * Inserts data attached to an embed list item in textarea
@@ -48,7 +48,7 @@ elgg.embed.insert = function(event) {
 	$.fancybox.close();
 
 	event.preventDefault();
-}
+};
 
 /**
  * Submit an upload form through Ajax
@@ -85,7 +85,7 @@ elgg.embed.submit = function(event) {
 	// this was bubbling up the DOM causing a submission
 	event.preventDefault();
 	event.stopPropagation();
-}
+};
 
 /**
  * Loads content within the lightbox
@@ -96,6 +96,6 @@ elgg.embed.submit = function(event) {
 elgg.embed.forward = function(event) {
 	$('.embed-wrapper').parent().load($(this).attr('href'));
 	event.preventDefault();
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.embed.init);
diff --git a/mod/messageboard/views/default/messageboard/js.php b/mod/messageboard/views/default/messageboard/js.php
index e5495409a..3295c68de 100644
--- a/mod/messageboard/views/default/messageboard/js.php
+++ b/mod/messageboard/views/default/messageboard/js.php
@@ -13,7 +13,7 @@ elgg.messageboard.init = function() {
 		// double whammy for in case the load order changes.
 		.unbind('click', elgg.ui.requiresConfirmation)
 		.removeClass('elgg-requires-confirmation');
-}
+};
 
 elgg.messageboard.submit = function(e) {
 	var form = $(this).parents('form');
@@ -35,7 +35,7 @@ elgg.messageboard.submit = function(e) {
 	});
 
 	e.preventDefault();
-}
+};
 
 elgg.messageboard.deletePost = function(e) {
 	var link = $(this);
@@ -50,6 +50,6 @@ elgg.messageboard.deletePost = function(e) {
 	}
 
 	e.preventDefault();
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.messageboard.init);
diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php
index d9bf6d10e..0a6eba134 100644
--- a/mod/thewire/views/default/js/thewire.php
+++ b/mod/thewire/views/default/js/thewire.php
@@ -18,7 +18,7 @@ elgg.thewire.init = function() {
 	});
 
 	$(".thewire-previous").live('click', elgg.thewire.viewPrevious);
-}
+};
 
 /**
  * Update the number of characters left with every keystroke
@@ -42,7 +42,7 @@ elgg.thewire.textCounter = function(textarea, status, limit) {
 		$("#thewire-submit-button").removeAttr('disabled', 'disabled');
 		$("#thewire-submit-button").removeClass('elgg-state-disabled');
 	}
-}
+};
 
 /**
  * Display the previous wire post
@@ -81,6 +81,6 @@ elgg.thewire.viewPrevious = function(event) {
 	}
 
 	event.preventDefault();
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.thewire.init);
diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php
index 55e0c7ae1..c6973d878 100644
--- a/mod/tinymce/views/default/js/tinymce.php
+++ b/mod/tinymce/views/default/js/tinymce.php
@@ -18,7 +18,7 @@ elgg.tinymce.toggleEditor = function(event) {
 		tinyMCE.execCommand('mceRemoveControl', false, id);
 		$(this).html(elgg.echo('tinymce:add'));
 	}
-}
+};
 
 /**
  * TinyMCE initialization script
@@ -69,6 +69,6 @@ elgg.tinymce.init = function() {
 		content_css: elgg.config.wwwroot + 'mod/tinymce/css/elgg_tinymce.css'
 	});
 
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.tinymce.init);
\ No newline at end of file
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
index abd29c0e1..50c98406e 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
@@ -23,6 +23,6 @@ elgg.uservalidationbyemail.init = function() {
 
 		$form.attr('action', $(this).attr('href')).submit();
 	});
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.uservalidationbyemail.init);
-- 
cgit v1.2.3


From 1101c234b508089cbf4cdb81758336d574f02576 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 6 Nov 2011 17:51:59 -0500
Subject: removed uses of CSS class .right from plugins

---
 mod/embed/views/default/js/embed/embed.php                             | 3 +--
 mod/likes/views/default/annotation/likes.php                           | 2 +-
 mod/messages/views/default/object/messages.php                         | 2 +-
 mod/thewire/views/default/thewire/profile_status.php                   | 2 +-
 .../views/default/forms/twitter_api/interstitial_settings.php          | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'mod/thewire/views/default')

diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index 8e543ac37..8a8f0290c 100644
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -41,10 +41,9 @@ elgg.embed.insert = function(event) {
 	
 <?php
 // See the TinyMCE plugin for an example of this view
- echo elgg_view('embed/custom_insert_js');
+echo elgg_view('embed/custom_insert_js');
 ?>
 
-
 	$.fancybox.close();
 
 	event.preventDefault();
diff --git a/mod/likes/views/default/annotation/likes.php b/mod/likes/views/default/annotation/likes.php
index 314d0790d..d41522fc4 100644
--- a/mod/likes/views/default/annotation/likes.php
+++ b/mod/likes/views/default/annotation/likes.php
@@ -30,7 +30,7 @@ $friendlytime = elgg_view_friendly_time($like->time_created);
 if ($like->canEdit()) {
 	$delete_button = elgg_view("output/confirmlink",array(
 						'href' => "action/likes/delete?annotation_id={$like->id}",
-						'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
+						'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>",
 						'confirm' => elgg_echo('deleteconfirm'),
 						'encode_text' => false,
 					));
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index e8e745e94..b12f98522 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -66,7 +66,7 @@ $subject_info .= elgg_view('output/url', array(
 
 $delete_link = elgg_view("output/confirmlink", array(
 						'href' => "action/messages/delete?guid=" . $message->getGUID(),
-						'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
+						'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>",
 						'confirm' => elgg_echo('deleteconfirm'),
 						'encode_text' => false,
 					));
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index ab20b5341..b5d9dbd80 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -27,7 +27,7 @@ if ($latest_wire && count($latest_wire) > 0) {
 		$button = elgg_view('output/url', array(
 			'text' => elgg_echo('thewire:update'),
 			'href' => $url_to_wire,
-			'class' => 'elgg-button elgg-button-action right',
+			'class' => 'elgg-button elgg-button-action float-alt',
 			'is_trusted' => true,
 		));
 	}
diff --git a/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php b/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
index 2592013c6..cad2be345 100644
--- a/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
+++ b/mod/twitter_api/views/default/forms/twitter_api/interstitial_settings.php
@@ -55,7 +55,7 @@ echo elgg_view('input/submit', array(
 ));
 
 echo elgg_view('output/url', array(
-	'class' => 'right',
+	'class' => 'float-alt',
 	'text' => elgg_echo('twitter_api:interstitial:no_thanks'),
 	'href' => '/',
 	'is_trusted' => true,
-- 
cgit v1.2.3