From 4bf0729f04da401157f08fe440e7e3a221e62a11 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 19 Jun 2012 13:37:51 +0000
Subject: [PATCH] NIHVIVO 3722, 3723 and 3725 css and js changes for OpenSocial
 gadgets

---
 webapp/web/css/individual/individual.css      |  5 ++-
 webapp/web/js/openSocial/shindig.js           | 18 ++++++---
 .../body/search/search-pagedResults.ftl       | 37 ++++++++++---------
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css
index 4db01f851..1aeb3a1c3 100644
--- a/webapp/web/css/individual/individual.css
+++ b/webapp/web/css/individual/individual.css
@@ -281,4 +281,7 @@ a.close {
 a#managePropLink {
     display:none;
 }
-
+/* <---- OpenSocial -----*/
+div#openSocial {
+    display:inline-block;
+}
\ No newline at end of file
diff --git a/webapp/web/js/openSocial/shindig.js b/webapp/web/js/openSocial/shindig.js
index 7809a3b7c..b4ca23091 100644
--- a/webapp/web/js/openSocial/shindig.js
+++ b/webapp/web/js/openSocial/shindig.js
@@ -39,7 +39,7 @@ gadgets.pubsubrouter.init(function(id) {
                 return true;
             }
             if (message == 'Y') {
-		        statusId.style.color = 'GREEN';
+/*		        statusId.style.color = 'GREEN';
 		        statusId.innerHTML = 'This section is VISIBLE';
 		        if (my.gadgets[moduleId].visible_scope == 'U') {
 		            statusId.innerHTML += ' to UCSF';
@@ -47,9 +47,13 @@ gadgets.pubsubrouter.init(function(id) {
 		        else {
 		            statusId.innerHTML += ' to the public';
 		        }
+*/
+                /*  changed the gui here -- tlw72 */
+                statusId.style.color = '#5e6363';
+                statusId.innerHTML = 'public';
             }
             else {
-		        statusId.style.color = '#CC0000';
+/*		        statusId.style.color = '#CC0000';
 		        statusId.innerHTML = 'This section is HIDDEN';
 		        if (my.gadgets[moduleId].visible_scope == 'U') {
 		            statusId.innerHTML += ' from UCSF';
@@ -57,6 +61,10 @@ gadgets.pubsubrouter.init(function(id) {
 		        else {
 		            statusId.innerHTML += ' from the public';
 		        }
+*/
+            /*  changed the gui here -- tlw72 */
+	            statusId.style.color = '#5e6363';
+	            statusId.innerHTML = 'private';
             }
          }
       }
@@ -370,7 +378,7 @@ ProfilesGadget.prototype.handleToggle = function() {
       //OPEN
       gadgetContent.parentNode.style.width = (my.gadgets[this.id].open_width || 600) + 'px';
       gadgetContent.style.display = ''; 
-      gadgetImg.src = '/' + location.pathname.split('/')[1] + '/themes/opensocial/images/openSocial/icon_squareDownArrow.gif';
+      gadgetImg.src = '/' + location.pathname.split('/')[1] + '/themes/wilma/images/green_minus_sign.gif';
       // refresh if certain features require so
       //if (this.hasFeature('dynamic-height')) {
 	  if (my.gadgets[this.id].chrome_id == 'gadgets-search') {
@@ -396,7 +404,7 @@ ProfilesGadget.prototype.handleToggle = function() {
       //CLOSE
       gadgetContent.parentNode.style.width = (my.gadgets[this.id].closed_width || 600) + 'px';
       gadgetContent.style.display = 'none'; 
-      gadgetImg.src = '/' + location.pathname.split('/')[1] + '/themes/opensocial/images/openSocial/icon_squareArrow.gif';
+      gadgetImg.src = '/' + location.pathname.split('/')[1] + '/themes/wilma/images/green_plus_sign.gif';
  	  if (my.gadgets[this.id].view == 'home') {
       	// record in google analytics     
         _gaq.push(['_trackEvent', my.gadgets[this.id].name, 'CLOSE_IN_EDIT', 'profile_edit_view']);  
@@ -421,7 +429,7 @@ ProfilesGadget.prototype.getTitleBarContent = function(continuation) {
       this.cssClassTitleButtonBar + '">' + 
       '<a href="#" onclick="shindig.container.getGadget(' + this.id +
       ').handleToggle();return false;" class="' + this.cssClassTitleButton +
-      '"><img id="gadgets-gadget-title-image-' + this.id + '" src="/' + location.pathname.split('/')[1] + '/themes/opensocial/images/openSocial/icon_squareDownArrow.gif"/></a></span> <span id="' +
+      '"><img id="gadgets-gadget-title-image-' + this.id + '" src="/' + location.pathname.split('/')[1] + '/themes/wilma/images/green_minus_sign.gif"/></a></span> <span id="' +
       this.getIframeId() + '_title" class="' + this.cssClassTitle + '">' + 
   	  '<a href="#" onclick="shindig.container.getGadget(' + this.id + ').handleToggle();return false;">' + 
 	  (this.title ? this.title : 'Gadget') + '</a>' + '</span><span id="' + 
diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
index b2784f856..7db886a0e 100644
--- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
+++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
@@ -48,9 +48,28 @@
         </#list>
     </ul>
     
+
+    <#-- Paging controls -->
+    <#if (pagingLinks?size > 0)>
+        <div class="searchpages">
+            Pages: 
+            <#if prevPage??><a class="prev" href="${prevPage}" title="previous">Previous</a></#if>
+            <#list pagingLinks as link>
+                <#if link.url??>
+                    <a href="${link.url}" title="page link">${link.text}</a>
+                <#else>
+                    <span>${link.text}</span> <#-- no link if current page -->
+                </#if>
+            </#list>
+            <#if nextPage??><a class="next" href="${nextPage}" title="next">Next</a></#if>
+        </div>
+    </#if>
+    <br />
+
     <#-- VIVO OpenSocial Extension by UCSF -->
     <#if openSocial??>
         <#if openSocial.visible>
+        <h3>OpenSocial</h3>
             <script type="text/javascript" language="javascript">
                 // find the 'Search' gadget(s).
                 var searchGadgets = my.findGadgetsAttachingTo("gadgets-search");
@@ -68,26 +87,10 @@
                 }
             </script>
 
-            <div id="gadgets-search" class="gadgets-gadget-parent"></div>
+            <div id="gadgets-search" class="gadgets-gadget-parent" style="display:inline-block"></div>
         </#if>
     </#if>
 
-    <#-- Paging controls -->
-    <#if (pagingLinks?size > 0)>
-        <div class="searchpages">
-            Pages: 
-            <#if prevPage??><a class="prev" href="${prevPage}" title="previous">Previous</a></#if>
-            <#list pagingLinks as link>
-                <#if link.url??>
-                    <a href="${link.url}" title="page link">${link.text}</a>
-                <#else>
-                    <span>${link.text}</span> <#-- no link if current page -->
-                </#if>
-            </#list>
-            <#if nextPage??><a class="next" href="${nextPage}" title="next">Next</a></#if>
-        </div>
-    </#if>
-
 </div> <!-- end contentsBrowseGroup -->
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search.css" />')}