Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

2 files changed, 46 insertions, 0 deletions

diff --git a/mod/identica/views/default/widgets/identica/content.php b/mod/identica/views/default/widgets/identica/content.php
new file mode 100644
index 000000000..42cbd1853
--- /dev/null
+++ b/mod/identica/views/default/widgets/identica/content.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Elgg identi.ca view page
+ *
+ * @package ElggIdentica
+ */
+
+//some required params
+
+$username = $vars['entity']->identica_username;
+$num = $vars['entity']->identica_num;
+
+// if the identi.ca username is empty, then do not show
+if ($username) {
+	elgg_load_js('friendly_time');
+	elgg_load_js('identica');
+?>
+
+<div id="identica_widget">
+	<ul id="identica_update_list" data-username="<?php echo $username; ?>" data-num="<?php echo $num; ?>"></ul>
+	<p class="visit_identica"><a href="http://identi.ca/<?php echo $username; ?>"><?php echo elgg_echo("identica:visit"); ?></a></p>
+</div>
+
+<?php
+} else {
+
+	echo "<p>" . elgg_echo("identica:notset") . ".</p>";
+
+}
diff --git a/mod/identica/views/default/widgets/identica/edit.php b/mod/identica/views/default/widgets/identica/edit.php
new file mode 100644
index 000000000..888f4e908
--- /dev/null
+++ b/mod/identica/views/default/widgets/identica/edit.php
@@ -0,0 +1,16 @@
+<?php
+
+    /**
+	 * Elgg identi.ca edit page
+	 *
+	 * @package ElggIdentica
+	 */
+
+?>
+	<p>
+		<?php echo elgg_echo("identica:username"); ?>
+		<input type="text" name="params[identica_username]" value="<?php echo htmlentities($vars['entity']->identica_username); ?>" />	
+		<br /><?php echo elgg_echo("twitter:num"); ?>
+		<input type="text" name="params[identica_num]" value="<?php echo htmlentities($vars['entity']->identica_num); ?>" />	
+	
+	</p>