1. Minor changes to front-end text for temporal vis per Katy's requests.

This commit is contained in:
cdtank 2011-04-18 21:37:23 +00:00
parent c52e8362bc
commit a2069d1575
4 changed files with 22 additions and 10 deletions

View file

@ -169,6 +169,8 @@ $(".filter-option").live('click', function() {
temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS"; temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS";
} }
// clearRenderedObjects();
$(this).addClass('active-filter'); $(this).addClass('active-filter');
temporalGraphProcessor.dataTable.fnDraw(); temporalGraphProcessor.dataTable.fnDraw();
@ -532,7 +534,7 @@ var lastCachedAtDateTimeParser = {
var day = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; var day = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
var month = ['January','February','March','April','May','June','July','August','September','October','November']; var month = ['January','February','March','April','May','June','July','August','September','October','November'];
return day[dateObject.getDay()] + ", " + month[dateObject.getMonth()] + " " + dateObject.getDate(); return month[dateObject.getMonth()] + " " + dateObject.getDate() + ", " + dateObject.getFullYear() + ".";
}, },
ascendingDateSorter: function(rawDateStringA, rawDateStringB) { ascendingDateSorter: function(rawDateStringA, rawDateStringB) {
@ -601,10 +603,15 @@ temporalGraphProcessor = {
}); });
if ($("#incomplete-data-disclaimer").length > 0 && lastCachedAtDateTimes.length > 0) { if ($("#incomplete-data-disclaimer").length > 0 && lastCachedAtDateTimes.length > 0) {
var disclaimerText = "This information is based solely on "
+ COMPARISON_PARAMETERS_INFO[currentParameter].value
+ " which have been loaded into the VIVO system"
+ " as of " + lastCachedAtDateTimeParser.getReadableDateString(lastCachedAtDateTimes[0]);
$("#incomplete-data-disclaimer").attr( $("#incomplete-data-disclaimer").attr(
"title", "title",
$("#incomplete-data-disclaimer").attr("title") + " as of " disclaimerText);
+ lastCachedAtDateTimeParser.getReadableDateString(lastCachedAtDateTimes[0]));
} }
}, },

View file

@ -253,9 +253,9 @@ function init(graphContainer) {
$("#comparisonParameter").text("Total Number of " + optionSelected); $("#comparisonParameter").text("Total Number of " + optionSelected);
$('#yaxislabel').html("Number of " + optionSelected).mbFlipText(false); $('#yaxislabel').html("Number of " + optionSelected).mbFlipText(false);
$('#comparisonHeader').html(optionSelected).css('font-weight', 'bold'); $('#comparisonHeader').html(optionSelected).css('font-weight', 'bold');
$('#legend-unknown-bar-text').text(COMPARISON_PARAMETERS_INFO[currentParameter].name + " with unknown year"); $('#legend-unknown-bar-text').text(toTitleCase(COMPARISON_PARAMETERS_INFO[currentParameter].name) + " with unknown year");
$('#legend-known-bar-text').text(COMPARISON_PARAMETERS_INFO[currentParameter].name + " with known year"); $('#legend-known-bar-text').text(toTitleCase(COMPARISON_PARAMETERS_INFO[currentParameter].name) + " with known year");
$('#legend-current-year-bar-text').text(COMPARISON_PARAMETERS_INFO[currentParameter].name + " from current incomplete year"); $('#legend-current-year-bar-text').text(toTitleCase(COMPARISON_PARAMETERS_INFO[currentParameter].name) + " from current incomplete year");
var defaultFlotOptions = { var defaultFlotOptions = {
xaxis : { xaxis : {
@ -1248,7 +1248,6 @@ function reloadDataTablePagination(preselectedEntityURIs, jsonData){
* */ * */
currentDataTable.fnPageChange('first'); currentDataTable.fnPageChange('first');
return currentDataTable; return currentDataTable;
} }

View file

@ -104,3 +104,9 @@ if (typeof String.prototype.trim !== 'function') {
return this.replace(/^\s+|\s+$/g, ''); return this.replace(/^\s+|\s+$/g, '');
} }
} }
function toTitleCase(str) {
return str.replace(/\w\S*/g, function(txt) {
return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
});
}

View file

@ -8,7 +8,7 @@
</div> </div>
<h2 id="header-entity-label"><span><a id="organizationMoniker" href="${organizationVivoProfileURL}">${organizationLabel}</a>&nbsp; <h2 id="header-entity-label"><span><a id="organizationMoniker" href="${organizationVivoProfileURL}">${organizationLabel}</a>&nbsp;
<img id="incomplete-data-disclaimer" class="infoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="This information is based solely on ${currentParameterObject.value} which have been loaded into the VIVO system" /></span></h2> <img id="incomplete-data-disclaimer" class="infoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="This information is based solely on ${currentParameterObject.value} which have been loaded into the VIVO system." /></span></h2>
<div id="leftblock"> <div id="leftblock">
<div id="leftUpper"> <div id="leftUpper">
@ -36,7 +36,7 @@
</select> </select>
<img id="copy-vis-viewlink-icon" title="Link to visualization" class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon" /> <img id="copy-vis-viewlink-icon" title="Persistent link to current visualization" class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon" />
<span id="copy-vis-viewlink"><input type="text" size="21" value="${currentViewLink}" /></span> <span id="copy-vis-viewlink"><input type="text" size="21" value="${currentViewLink}" /></span>
</div> </div>
@ -63,7 +63,7 @@
</div> </div>
<h3>What do you want to compare?</h3> <h3>What do you want to compare?</h3>
<div id="people-organizations-filter"> <div id="people-organizations-filter">
<span id="organizations-filter" class="filter-option active-filter">Organizations</span> <span id="organizations-filter" class="filter-option active-filter">Organizations</span> |
<span id="people-filter" class="filter-option">People</span> <span id="people-filter" class="filter-option">People</span>
</div> </div>