Pulled in the interface changes.

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

3 files changed, 118 insertions, 0 deletions

diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php
new file mode 100644
index 000000000..f0e51ccb5
--- /dev/null
+++ b/mod/twitter/views/default/twitter/css.php
@@ -0,0 +1,63 @@
+<?php
+ 
+    /**
+	 * Elgg Twitter CSS
+	 * 
+	 * @package ElggTwitter
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+     
+?>
+
+#twitter_widget {
+    margin:0 10px 0 10px;
+}
+
+#twitter_widget ul {
+	margin:0;
+	padding:0;
+}
+
+#twitter_widget li {
+	background: url(<?php echo $vars['url']; ?>mod/twitter/graphics/thewire_speech_bubble.gif) no-repeat right bottom;
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0 0 5px 0;
+	padding:0;
+	overflow-x: hidden;
+}
+
+#twitter_widget li span {
+	color:#666666;
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	padding:5px;
+	display:block;
+}
+
+p.visit_twitter a {
+    background:url(<?php echo $vars['url']; ?>mod/twitter/graphics/twitter.png) left no-repeat;
+    padding:0 0 0 20px;
+    margin:0;
+}
+.visit_twitter {
+	background:white;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	padding:2px;
+	margin:0 0 5px 0;
+}
+
+#twitter_widget li a {
+	display:block;
+	margin:0 0 0 4px;
+}
+
+#twitter_widget li span a {
+	display:inline !important;
+}
\ No newline at end of file
diff --git a/mod/twitter/views/default/widgets/twitter/edit.php b/mod/twitter/views/default/widgets/twitter/edit.php
new file mode 100644
index 000000000..efb8f622a
--- /dev/null
+++ b/mod/twitter/views/default/widgets/twitter/edit.php
@@ -0,0 +1,20 @@
+<?php
+
+    /**
+	 * Elgg twitter edit page
+	 *
+	 * @package ElggTwitter
+	 * @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/
+	 */
+
+?>
+	<p>
+		<?php echo elgg_echo("twitter:username"); ?>
+		<input type="text" name="params[twitter_username]" value="<?php echo htmlentities($vars['entity']->twitter_username); ?>" />	
+		<br /><?php echo elgg_echo("twitter:num"); ?>
+		<input type="text" name="params[twitter_num]" value="<?php echo htmlentities($vars['entity']->twitter_num); ?>" />	
+	
+	</p>
\ No newline at end of file
diff --git a/mod/twitter/views/default/widgets/twitter/view.php b/mod/twitter/views/default/widgets/twitter/view.php
new file mode 100644
index 000000000..71caaf380
--- /dev/null
+++ b/mod/twitter/views/default/widgets/twitter/view.php
@@ -0,0 +1,35 @@
+<?php
+    
+     /**
+	 * Elgg twitter view page
+	 *
+	 * @package ElggTwitter
+	 * @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/
+	 */
+	 
+	 //some required params
+	 
+	 $username = $vars['entity']->twitter_username;
+	 $num = $vars['entity']->twitter_num;
+	 
+    // if the twitter username is empty, then do not show
+    if($username){
+	 
+?>
+
+<div id="twitter_widget">
+<ul id="twitter_update_list"></ul>
+<p class="visit_twitter"><a href="http://twitter.com/<?php echo $username; ?>"><?php echo elgg_echo("twitter:visit"); ?></a></p>
+<script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
+<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $username; ?>.json?callback=twitterCallback2&count=<?php echo $num; ?>"></script>
+<?php 
+    } else {
+        
+      echo "<div class=\"contentWrapper\"><p>" . elgg_echo("twitter:notset") . ".</p></div>";
+      
+  }
+?>
+</div>
\ No newline at end of file