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 + '">' + ' ' + '' + (this.title ? this.title : 'Gadget') + '' + ' + Pages: + <#if prevPage??>Previous#if> + <#list pagingLinks as link> + <#if link.url??> + ${link.text} + <#else> + ${link.text} <#-- no link if current page --> + #if> + #list> + <#if nextPage??>Next#if> + + #if> + + <#-- VIVO OpenSocial Extension by UCSF --> <#if openSocial??> <#if openSocial.visible> + OpenSocial - + #if> #if> - <#-- Paging controls --> - <#if (pagingLinks?size > 0)> - - Pages: - <#if prevPage??>Previous#if> - <#list pagingLinks as link> - <#if link.url??> - ${link.text} - <#else> - ${link.text} <#-- no link if current page --> - #if> - #list> - <#if nextPage??>Next#if> - - #if> - ${stylesheets.add('')}