Updates to Twitter and TwitterService UI.

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

2 files changed, 32 insertions, 40 deletions

diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php
index f0e51ccb5..96b4d415f 100644
--- a/mod/twitter/views/default/twitter/css.php
+++ b/mod/twitter/views/default/twitter/css.php
@@ -1,26 +1,22 @@
-<?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/
-	 */
-     
+<?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;
@@ -30,7 +26,6 @@
 	padding:0;
 	overflow-x: hidden;
 }
-
 #twitter_widget li span {
 	color:#666666;
 	background:white;
@@ -39,12 +34,14 @@
 	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;
 }
+p.twitter_username .input_text {
+	width:200px;
+}
 .visit_twitter {
 	background:white;
 	-webkit-border-radius: 8px; 
@@ -52,12 +49,10 @@ p.visit_twitter a {
 	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/view.php b/mod/twitter/views/default/widgets/twitter/view.php
index 71caaf380..4ae0d7f27 100644
--- a/mod/twitter/views/default/widgets/twitter/view.php
+++ b/mod/twitter/views/default/widgets/twitter/view.php
@@ -1,22 +1,21 @@
-<?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){
+<?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){
 	 
 ?>
 
@@ -27,9 +26,7 @@
 <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>";
-      
+      echo "<p>" . elgg_echo("twitter:notset") . ".</p>";
   }
 ?>
 </div>
\ No newline at end of file