From 1ace2983e452c12fa22aa8e861207a1687b8cccf Mon Sep 17 00:00:00 2001
From: Hannes Mannerheim <h@nnesmannerhe.im>
Date: Tue, 13 May 2014 20:52:55 +0200
Subject: [PATCH] remove hardcoded quitter stuff

---
 index.php           |  4 ++--
 js/dom-functions.js | 10 +++++-----
 js/qvitter.js       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/index.php b/index.php
index a0bef16..f4dfb73 100644
--- a/index.php
+++ b/index.php
@@ -297,10 +297,10 @@ if($usehistorypushstate) {
 	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery-ui-1.10.3.min.js"></script>
 	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery.easing.1.3.js"></script>	    
 	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery.minicolors.min.js"></script>	    	    
-	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/dom-functions.js?v=13"></script>		    	
+	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/dom-functions.js?v=17"></script>		    	
 	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/misc-functions.js?v=11"></script>		    		    
 	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/ajax-functions.js?v=4"></script>		    		    	    
 	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/lan.js?v=12"></script>	
-	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/qvitter.js?v=11"></script>		
+	    <script type="text/javascript" src="<?php print $qvitterpath; ?>js/qvitter.js?v=12"></script>		
 	</body>
 </html>
\ No newline at end of file
diff --git a/js/dom-functions.js b/js/dom-functions.js
index e5c22ca..90e3357 100644
--- a/js/dom-functions.js
+++ b/js/dom-functions.js
@@ -247,9 +247,9 @@ function groupProfileCard(groupAlias) {
 		
 		data.nickname = data.nickname || '';
 		data.fullname = data.fullname || '';
-		data.stream_logo = data.stream_logo || 'http://quitter.se/theme/quitter-theme2/default-avatar-stream.png';
-		data.homepage_logo = data.homepage_logo || 'http://quitter.se/theme/quitter-theme2/default-avatar-profile.png';
-		data.original_logo = data.original_logo || 'http://quitter.se/theme/quitter-theme2/default-avatar-profile.png';						
+		data.stream_logo = data.stream_logo || window.fullUrlToThisQvitterApp + 'img/default-avatar-stream.png';
+		data.homepage_logo = data.homepage_logo || window.fullUrlToThisQvitterApp + 'img/default-avatar-profile.png';
+		data.original_logo = data.original_logo || window.fullUrlToThisQvitterApp + 'img/default-avatar-profile.png';						
 		data.description = data.description || '';
 		data.homepage = data.homepage || '';
 		data.url = data.url || '';
@@ -1405,7 +1405,7 @@ function addToFeed(feed, after, extraClasses) {
 			if($('#stream-item-' + obj.id).length == 0) {			
 	
 				obj.description = obj.description || '';
-				obj.stream_logo = obj.stream_logo || 'http://quitter.se/theme/quitter-theme2/default-avatar-stream.png';
+				obj.stream_logo = obj.stream_logo || window.fullUrlToThisQvitterApp + 'img/default-avatar-profile.png';
 	
 				// show group actions if logged in
 				var memberClass = '';
@@ -1498,7 +1498,7 @@ function addToFeed(feed, after, extraClasses) {
 					
 				// in-groups html
 				var in_groups_html = '';							
-				if(obj.retweeted_status.statusnet_in_groups !== false) {
+				if(obj.retweeted_status.statusnet_in_groups !== false && typeof obj.retweeted_status.statusnet_in_groups !== 'undefined') {
 					in_groups_html = '<span class="in-groups">' + obj.retweeted_status.statusnet_in_groups + '</span>';
 					}									
 						
diff --git a/js/qvitter.js b/js/qvitter.js
index af47c2c..cfae263 100644
--- a/js/qvitter.js
+++ b/js/qvitter.js
@@ -435,7 +435,7 @@ $('#logout').click(function(){
    
 $('#settings').click(function(){
 	// buttons to add later: '<div class="right"><button class="close">' + window.sL.cancelVerb + '</button><button class="primary disabled">' + window.sL.saveChanges + '</button></div>'
-	popUpAction('popup-settings', window.sL.settings,'<div id="settings-container"><div><label for="link-color-selection">' + window.sL.linkColor + '</label><input id="link-color-selection" type="text" value="#' + window.userLinkColor + '" /></div><div><label for="link-color-selection">' + window.sL.backgroundColor + '</label><input id="background-color-selection" type="text" value="#' + window.userBackgroundColor + '" /></div><a id="moresettings">' + window.sL.moreSettings + '<form action="https://quitter.se/main/login" method="post" target="_blank"><input type="hidden" id="nickname" name="nickname" value="' + $('input#username').val() + '" /><input type="hidden" id="password" name="password" value="' + $('input#password').val() + '" /><input type="hidden" id="returnto" name="returnto" value="/settings/profile" /></form></a></div>',false);
+	popUpAction('popup-settings', window.sL.settings,'<div id="settings-container"><div><label for="link-color-selection">' + window.sL.linkColor + '</label><input id="link-color-selection" type="text" value="#' + window.userLinkColor + '" /></div><div><label for="link-color-selection">' + window.sL.backgroundColor + '</label><input id="background-color-selection" type="text" value="#' + window.userBackgroundColor + '" /></div><a id="moresettings">' + window.sL.moreSettings + '<form action="' + window.siteInstanceURL + '/main/login" method="post" target="_blank"><input type="hidden" id="nickname" name="nickname" value="' + $('input#username').val() + '" /><input type="hidden" id="password" name="password" value="' + $('input#password').val() + '" /><input type="hidden" id="returnto" name="returnto" value="/settings/profile" /></form></a></div>',false);
 	$('#link-color-selection').minicolors({
 		change: function(hex) {
 			changeLinkColor(hex);