Changes to temporal graph
1) Integrated the small icon. 2) Made styling changes to the datatable.
This commit is contained in:
parent
5eba1f4b80
commit
187a927795
2 changed files with 22 additions and 8 deletions
|
@ -8,6 +8,7 @@
|
||||||
<c:out value="${portalBean.themeDir}" />
|
<c:out value="${portalBean.themeDir}" />
|
||||||
</c:set>
|
</c:set>
|
||||||
<c:set var='jsonContent' value='${requestScope.JsonContent}' />
|
<c:set var='jsonContent' value='${requestScope.JsonContent}' />
|
||||||
|
<c:set var='organizationLabel' value='${requestScope.OrganizationLabel}' />
|
||||||
|
|
||||||
<c:url var="TemporalGraphDownloadFile" value="/visualization">
|
<c:url var="TemporalGraphDownloadFile" value="/visualization">
|
||||||
<c:param name="vis" value="entity_comparison" />
|
<c:param name="vis" value="entity_comparison" />
|
||||||
|
@ -15,9 +16,13 @@
|
||||||
<c:param name="uri" value="${requestScope.OrganizationURI}" />
|
<c:param name="uri" value="${requestScope.OrganizationURI}" />
|
||||||
</c:url>
|
</c:url>
|
||||||
|
|
||||||
|
<c:url var="organizationVivoProfileURL" value="/individual">
|
||||||
|
<c:param name="uri" value="${requestScope.OrganizationURI}" />
|
||||||
|
</c:url>
|
||||||
|
|
||||||
|
|
||||||
<div id="body">
|
<div id="body">
|
||||||
<h2 style="width: 36%; padding-left:50px;">Temporal Graph Visualization<span id="entitylevelheading"><i> School Level</i></span></h2>
|
<h2 style="width: 36%; padding-left:45px;"><a href="" id = "organizationMoniker"></a></h2>
|
||||||
<div id="leftblock">
|
<div id="leftblock">
|
||||||
<div id="leftUpper">
|
<div id="leftUpper">
|
||||||
<h3>How do you want to compare?</h3>
|
<h3>How do you want to compare?</h3>
|
||||||
|
@ -27,16 +32,16 @@
|
||||||
<select class="comparisonValues" style="margin-bottom: 20px;">
|
<select class="comparisonValues" style="margin-bottom: 20px;">
|
||||||
<option value="Publications" selected="selected">by Publications</option>
|
<option value="Publications" selected="selected">by Publications</option>
|
||||||
<option value="Grants">by Grants</option>
|
<option value="Grants">by Grants</option>
|
||||||
|
<!--
|
||||||
<option value="People" disabled="disabled">by People</option>
|
<option value="People" disabled="disabled">by People</option>
|
||||||
<option value="Item4" disabled="disabled">by Item4</option>
|
<option value="Item4" disabled="disabled">by Item4</option>
|
||||||
<option value="Item5" disabled="disabled">by Item5</option>
|
<option value="Item5" disabled="disabled">by Item5</option>
|
||||||
|
-->
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br/>
|
|
||||||
|
|
||||||
<div id="leftLower">
|
<div id="leftLower">
|
||||||
<h3>Who do you want to compare?</h3>
|
<h3>Who do you want to compare?</h3>
|
||||||
<div id="paginatedTable">
|
<div id="paginatedTable">
|
||||||
|
@ -48,7 +53,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div id="rightblock">
|
<div id="rightblock">
|
||||||
|
|
||||||
<h4 style="padding-left:50px;">Comparing <span id="comparisonHeader">Publications</span> of <span id="entityHeader">Institutions</span></h4>
|
<h4 id="headerText" style="padding-left:60px;">Comparing <span id="comparisonHeader">Publications</span> of <span id="entityHeader">Institutions</span> in <span id="organizationLabel"></span></h4>
|
||||||
<div id="graphContainer" style="width: 450px; height: 250px;"></div>
|
<div id="graphContainer" style="width: 450px; height: 250px;"></div>
|
||||||
<div id="yaxislabel"></div>
|
<div id="yaxislabel"></div>
|
||||||
|
|
||||||
|
@ -73,10 +78,17 @@
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
// $("#body").append("<img src = '"+temporalGraphSmallIcon+"'></img>");
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
||||||
var jsonString = '${jsonContent}';
|
var jsonString = '${jsonContent}';
|
||||||
|
var organizationLabel = '${organizationLabel}';
|
||||||
|
|
||||||
|
$("#organizationLabel").text(organizationLabel).css("color", "#2485ae");
|
||||||
|
$("#organizationMoniker").text(organizationLabel);
|
||||||
|
$("#organizationMoniker").attr("href", "${organizationVivoProfileURL}");
|
||||||
|
|
||||||
var jsonObject = {
|
var jsonObject = {
|
||||||
prepare : function(arg1){
|
prepare : function(arg1){
|
||||||
loadData(arg1);
|
loadData(arg1);
|
||||||
|
|
|
@ -30,6 +30,9 @@
|
||||||
<c:url var="entityComparisonStyle" value="/${themeDir}css/visualization/entityComparison/layout.css" />
|
<c:url var="entityComparisonStyle" value="/${themeDir}css/visualization/entityComparison/layout.css" />
|
||||||
<c:url var="vizStyle" value="/${themeDir}css/visualization/visualization.css" />
|
<c:url var="vizStyle" value="/${themeDir}css/visualization/visualization.css" />
|
||||||
|
|
||||||
|
<c:url var="temporalGraphIcon" value="/images/visualization/temporal_vis_small_icon.jpg" />
|
||||||
|
|
||||||
|
|
||||||
<!-- Including jquery, entity comparison related javascript files -->
|
<!-- Including jquery, entity comparison related javascript files -->
|
||||||
|
|
||||||
<script type="text/javascript" src="${jquery}"></script>
|
<script type="text/javascript" src="${jquery}"></script>
|
||||||
|
@ -54,9 +57,8 @@
|
||||||
<link rel="stylesheet" type="text/css" href="${vizStyle}" />
|
<link rel="stylesheet" type="text/css" href="${vizStyle}" />
|
||||||
|
|
||||||
<script language="JavaScript" type="text/javascript">
|
<script language="JavaScript" type="text/javascript">
|
||||||
<!--
|
|
||||||
|
|
||||||
var contextPath = "${contextPath}";
|
var contextPath = "${contextPath}";
|
||||||
|
var temporalGraphSmallIcon = "${temporalGraphIcon}";
|
||||||
|
|
||||||
// -->
|
|
||||||
</script>
|
</script>
|
Loading…
Add table
Add a link
Reference in a new issue