litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1. Fixed a design bug for IE where the y-axis legen did not get the padding-top.

Browse source 
2. Reflected the changes for publication version of temporal-graphs into grants version.
This commit is contained in:
cdtank 2011-01-20 00:18:51 +00:00
parent 7739c19ad4
commit fa2f4be087
3 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/css/visualization/entitycomparison/layout.css
View file

@ -48,7 +48,7 @@ a.temporalGraphLinks {
display: block;
height: 150px;
text-align: center;
padding-top: 50px;
margin-top: 50px;
position: absolute !important;
}

16
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl
View file

@ -200,14 +200,6 @@ var organizationLabel = '${organizationLabel}';
prepareTableForDataTablePagination(jsonData);
setEntityLevel();
/*
calcMinandMaxYears(labelToEntityRecord, year);
yearRange = (year.max - year.min);
setLineWidthAndTickSize(yearRange, FlotOptions);
setTickSizeOfYAxis(calcMaxOfComparisonParameter(labelToEntityRecord), FlotOptions);
*/
$(".disabled-checkbox-event-receiver").live("click", function () {
if ($(this).next().is(':disabled')) {
@ -313,9 +305,10 @@ var organizationLabel = '${organizationLabel}';
</div>
<h3>Who do you want to compare?</h3>
<div id="paginatedTable"></div>
<br />
<div id="paginated-table-footer">
<a id="csv" href="${TemporalGraphDownloadFile}" class="temporalGraphLinks">Save as CSV</a>
</div>
</div>
<#--
<div id = "stopwordsdiv">
* The entity types core:Person, foaf:Organization have been excluded as they are too general.
@ -337,7 +330,10 @@ var organizationLabel = '${organizationLabel}';
<h3><span id="comparisonParameter"></span></h3>
<p class="displayCounter">You have selected <span id="counter">0</span> of a maximum
<span id="total">10</span> <span id="entityleveltext"> schools</span> to compare.
<a id="clear" class="temporalGraphLinks">Clear</a></p>
<span id="legend-row-header">
<a id="clear" class="temporalGraphLinks">Clear</a>
</span>
</p>
</div>
</div>

4
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
View file

@ -141,13 +141,9 @@ var organizationLabel = '${organizationLabel}';
}
});
//console.log("parse jaon", jQuery.parseJSON(jsonString));
//parse the json object and pass it to loadData
jsonObject.prepare(jQuery.parseJSON(jsonString));
//console.log(jsonObject);
function performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox) {
removeUsedColor(entity);