r7325 - in dumbhippo/trunk/server: src/com/dumbhippo/server/impl web/tags/3

[commits mugshot org]

Author: marinaz
Date: 2008-02-20 15:51:11 -0600 (Wed, 20 Feb 2008)
New Revision: 7325

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/server/impl/InvitationSystemBean.java
   dumbhippo/trunk/server/web/tags/3/accountEditTable.tag
Log:
Improve messages we display when someone tries to invite themselves.

Make some text on the account page bold.

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/InvitationSystemBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/InvitationSystemBean.java	2008-02-20 21:00:40 UTC (rev 7324)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/InvitationSystemBean.java	2008-02-20 21:51:11 UTC (rev 7325)
@@ -596,8 +596,9 @@
 			user = spider.lookupUserByResource(viewpoint, invitee);
 			String hasAccount = invitee.getHumanReadableString() + " already has an account '" + user.getNickname() + "'";
 			if (accounts.isSpecialCharacter(inviter) && viewpoint.getSite().getAccountType() != user.getAccount().getAccountType())
-				hasAccount= hasAccount + ". This " + user.getAccount().getAccountType().getName() + " account can be used to log in to " + viewpoint.getSite().getSiteName();
-			
+				hasAccount = hasAccount + ". This " + user.getAccount().getAccountType().getName() + " account can be used to log in to " + viewpoint.getSite().getSiteName();
+			else if (accounts.isSpecialCharacter(inviter) && viewpoint.getSite() == Site.GNOME) 
+				hasAccount = hasAccount + ". Use the form to the left to log in";				
 			// special character invites you on the /signup page if you have no account
 			if (!accounts.isSpecialCharacter(inviter))
 				return hasAccount + "(now added to your friends list).";
@@ -608,8 +609,9 @@
 			if (result == CreateInvitationResult.REPEAT_INVITE) {
 				note = INVITATION_SUCCESS_STRING + ", another invitation was sent to " + invitee.getHumanReadableString() + ".";				
 			} else if (result == CreateInvitationResult.NEW_INVITER || result == CreateInvitationResult.ALREADY_HAS_INACTIVE_ACCOUNT) {
-				note = INVITATION_SUCCESS_STRING + ", an invitation was sent to " + invitee.getHumanReadableString() + "."
-				       + " You didn't have to spend an invitation because they were already invited by someone else."; 		
+				note = INVITATION_SUCCESS_STRING + ", an invitation was sent to " + invitee.getHumanReadableString() + ".";
+				if (!accounts.isSpecialCharacter(inviter))
+				    note = note + " You didn't have to spend an invitation because they were already invited by someone else."; 		
 				if (result == CreateInvitationResult.ALREADY_HAS_INACTIVE_ACCOUNT)
 				    user = spider.lookupUserByResource(viewpoint, invitee);
 			} else if (result == CreateInvitationResult.INVITE_CREATED) {

Modified: dumbhippo/trunk/server/web/tags/3/accountEditTable.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/3/accountEditTable.tag	2008-02-20 21:00:40 UTC (rev 7324)
+++ dumbhippo/trunk/server/web/tags/3/accountEditTable.tag	2008-02-20 21:51:11 UTC (rev 7325)
@@ -241,7 +241,7 @@
 	            Disabling your account means that we will not use any information about you
 	            for any of the GNOME Online services, and we will never send you email for any reason.
 	            <c:if test="${signin.user.account.publicPage}">	            
-		            This will also disable your Mugshot account.
+		            This will also disable your <b>Mugshot</b> account.
 		        </c:if>	     	            	        
 	        </c:when>
 	        <c:otherwise>
@@ -249,7 +249,7 @@
 		        public Home page, and we will never send you email for any reason.
 		        You can enable your account again at any time.		            	
 	            <c:if test="${dh:enumIs(signin.user.account.accountType, 'GNOME')}">	            
-		            This will not disable your GNOME Online account.
+		            This will <b>not</b> disable your <b>GNOME Online</b> account.
 		        </c:if>	        
 	        </c:otherwise>
         </c:choose>