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

trunk merge

Browse source
This commit is contained in:
anupsawant 2011-06-13 15:22:16 +00:00
commit fe54171ffd
4 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
example.deploy.properties
View file

@ -63,7 +63,7 @@ email.replyTo = vivoAdmin@my.domain.edu
# #
# The basic parameters for a database connection. Change the end of the # The basic parameters for a database connection. Change the end of the
# URL to reflect your database name (if it is not "vitro"). Change the username # URL to reflect your database name (if it is not "vitrodb"). Change the username
# and password to match the authorized database user you created. # and password to match the authorized database user you created.
# #
VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb

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

@ -15,8 +15,14 @@
#subject-parent-entity { #subject-parent-entity {
display: none; display: none;
font-size:.7em;
color:#aaa;
margin-left:10px;
}
#subject-parent-entity-spacer {
color:#aaa;
margin-left:-18px;
} }
#error-container { #error-container {
display: none; display: none;
} }

15
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
View file

@ -2,13 +2,13 @@
<div id="body"> <div id="body">
<div id="subject-parent-entity">
<a id="subject-parent-entity-profile-url" href="#"></a>&nbsp;
<a id="subject-parent-entity-temporal-url" href="#"><img src="${temporalGraphSmallIcon}" width="15px" height="15px"/></a>
</div>
<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> <h2 id="header-entity-label"><span><a id="organizationMoniker" href="${organizationVivoProfileURL}">${organizationLabel}</a></span>
<span id="subject-parent-entity"><span>|&nbsp;&nbsp;</span>
<a id="subject-parent-entity-profile-url" href="#" title="Parent organization of ${organizationLabel}"></a>&nbsp;
<a id="subject-parent-entity-temporal-url" href="#"><img src="${temporalGraphSmallIcon}" width="15px" height="15px"/></a>
</span></h2><br>
<div id="leftblock"> <div id="leftblock">
<div id="leftUpper"> <div id="leftUpper">
@ -94,7 +94,8 @@
</div> </div>
<div id="bottom"> <div id="bottom">
<h3><span id="comparisonParameter"></span></h3> <h3><span id="comparisonParameter"></span>&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" width="15px" height="15px"/></h3>
<p class="displayCounter">You have selected <span id="counter">0</span> of a maximum <p class="displayCounter">You have selected <span id="counter">0</span> of a maximum
<span id="total">10</span> <span id="entityleveltext"> schools</span>. <span id="total">10</span> <span id="entityleveltext"> schools</span>.
<span id="legend-row-header"> <span id="legend-row-header">

3
themes/wilma/css/wilma.css
View file

@ -1550,7 +1550,7 @@ form.customForm #reset-password {
#add-account .note { #add-account .note {
padding-bottom: 20px; padding-bottom: 20px;
padding-top: 0; padding-top: 0;
margin-top: 5px; margin-top: 25px;
} }
/* -------------------------------------------------> */ /* -------------------------------------------------> */
/* DROP DOWN USER MENU ----------------------------> */ /* DROP DOWN USER MENU ----------------------------> */
@ -1612,7 +1612,6 @@ ul.dropdown ul.sub_menu li {
} }
ul.dropdown ul.sub_menu li:last-child { ul.dropdown ul.sub_menu li:last-child {
width: 96px; width: 96px;
} }
/* IE 6 & 7 Needs Inline Block */ /* IE 6 & 7 Needs Inline Block */
/* ADD IN IE6.css and IE7.css*/ /* ADD IN IE6.css and IE7.css*/