r7510 - in dumbhippo/trunk/server/web: javascript/dh tags/3 tags/gnome

[commits mugshot org]

Author: marinaz
Date: 2008-09-22 17:35:53 -0500 (Mon, 22 Sep 2008)
New Revision: 7510

Modified:
   dumbhippo/trunk/server/web/javascript/dh/account.js
   dumbhippo/trunk/server/web/tags/3/accountEditTableExternals.tag
   dumbhippo/trunk/server/web/tags/3/loveEntry.tag
   dumbhippo/trunk/server/web/tags/gnome/loveEntry.tag
Log:
Make sure we include the tag body in the love entry. In particular, use that for Amazon to include the extra links.

Fix up the order of params for the function for saving the Flickr account.

Modified: dumbhippo/trunk/server/web/javascript/dh/account.js
===================================================================
--- dumbhippo/trunk/server/web/javascript/dh/account.js	2008-09-22 04:19:00 UTC (rev 7509)
+++ dumbhippo/trunk/server/web/javascript/dh/account.js	2008-09-22 22:35:53 UTC (rev 7510)
@@ -405,7 +405,7 @@
 	}
 }
 
-dh.account.onFlickrLoveSaved = function(entry, value, id) {
+dh.account.onFlickrLoveSaved = function(entry, id, value) {
 	var oldMode = entry.getMode();
 	entry.setBusy();
 	dh.account.findFlickrAccount(value,
@@ -765,7 +765,8 @@
 						                var linkDiv = document.createElement("div");
 						                amazonDetailsNode.appendChild(linkDiv);
 						                var linkElement = document.createElement("a");
-                                        linkElement.href = dh.util.getPreparedUrl(dh.dom.textContent(urlNode));						            
+                                        linkElement.href = dh.util.getPreparedUrl(dh.dom.textContent(urlNode));		
+                                        linkElement.target = "_blank";				            
                                         var linkTextNode = document.createTextNode(dh.dom.textContent(nameNode));
                                         linkElement.appendChild(linkTextNode);
                                         linkDiv.appendChild(linkElement);						                 

Modified: dumbhippo/trunk/server/web/tags/3/accountEditTableExternals.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/3/accountEditTableExternals.tag	2008-09-22 04:19:00 UTC (rev 7509)
+++ dumbhippo/trunk/server/web/tags/3/accountEditTableExternals.tag	2008-09-22 22:35:53 UTC (rev 7510)
@@ -231,7 +231,7 @@
 								        <div class="dh-amazon-details">
 								        <c:forEach items="${account.amazonLinks}" var="amazonLinkPair">
 									        <div>
-									            <a href="${amazonLinkPair.second}">${amazonLinkPair.first}</a>
+									            <a href="${amazonLinkPair.second}" target="_blank">${amazonLinkPair.first}</a>
 									        </div>
 								        </c:forEach>
 								        </div>
@@ -245,6 +245,15 @@
 							        link="${supportedAccount.externalAccountType.siteLink}"
 							        baseId="dh${supportedAccount.domNodeIdName}"
 							        mode="${supportedAccount.sentiment}">					                 							        
+							        <c:if test="${supportedAccount.siteName == 'Amazon' && supportedAccount.mugshotEnabled}">
+								        <div class="dh-amazon-details">
+								        <c:forEach items="${account.amazonLinks}" var="amazonLinkPair">
+									        <div>
+									            <a href="${amazonLinkPair.second}" target="_blank">${amazonLinkPair.first}</a>
+									        </div>
+								        </c:forEach>
+								        </div>
+							        </c:if>
 						        </dht3:loveEntry>						    
 						    </c:otherwise>
 						</c:choose>

Modified: dumbhippo/trunk/server/web/tags/3/loveEntry.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/3/loveEntry.tag	2008-09-22 04:19:00 UTC (rev 7509)
+++ dumbhippo/trunk/server/web/tags/3/loveEntry.tag	2008-09-22 22:35:53 UTC (rev 7510)
@@ -30,6 +30,7 @@
 		    <dh:png klass="dh-love-hate-icon" src="/images3/${buildStamp}/quiplove_icon.png" style="width: 12; height: 11; overflow: hidden;"/> 
 			<span id="${baseId}LoveValueId"></span>
 		</a>
+		<jsp:doBody/>
 	</div>
 	<div id="${baseId}IndifferentId" style="display: ${indifferentDisplay};">
 		<a href="javascript:dh.love.setMode('${baseId}', 'loveEdit')" title="Add another account"><dh:png klass="dh-add-icon" src="/images3/${buildStamp}/quiplove_icon.png" style="width: 12; height: 11; overflow: hidden;"/>Add another account</a>
@@ -39,6 +40,7 @@
 		<dht:textInput id="${baseId}LoveEntryId" maxlength="255"/>
 		<img src="/images3/${buildStamp}/save_button.gif" onclick="dh.love.saveClicked('${baseId}', 'love')"/>
 		<a href="javascript:dh.love.cancelClicked('${baseId}')" title="Remove the account"><img src="/images3/${buildStamp}/x_button.gif"/></a>
+        <jsp:doBody/>
         <div dhId="DescriptionNormal">
             <div class="dh-love-hate-instruction-editing">
 				Editing <c:out value="${name}"/>.<br/>	

Modified: dumbhippo/trunk/server/web/tags/gnome/loveEntry.tag
===================================================================
--- dumbhippo/trunk/server/web/tags/gnome/loveEntry.tag	2008-09-22 04:19:00 UTC (rev 7509)
+++ dumbhippo/trunk/server/web/tags/gnome/loveEntry.tag	2008-09-22 22:35:53 UTC (rev 7510)
@@ -28,6 +28,7 @@
 		<a href="javascript:dh.love.setMode('${baseId}', 'loveEdit')" title="Click to change">
 			<span id="${baseId}LoveValueId"></span>
 		</a>
+		<jsp:doBody/>
 	</div>
 	<div id="${baseId}IndifferentId" style="display: ${indifferentDisplay};">
 		<a href="javascript:dh.love.setMode('${baseId}', 'loveEdit')" title="Add an account"><dh:png klass="dh-add-icon" src="/images3/${buildStamp}/add_icon.png" style="width: 10; height: 10; overflow: hidden;" />
@@ -37,6 +38,7 @@
 		<dht:textInput id="${baseId}LoveEntryId" maxlength="255"/>
 		<img src="/images-gnome/${buildStamp}/save_button.gif" onclick="dh.love.saveClicked('${baseId}', 'love')"/>
 		<a href="javascript:dh.love.cancelClicked('${baseId}')" title="Remove the account"><img src="/images-gnome/${buildStamp}/x_button.gif"/></a>
+		<jsp:doBody/>
         <div dhId="DescriptionNormal">
             Enter your  
 	        <jsp:element name="a">