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

there were duplicate freemarker variables being used; resolved this by changing the name of the variable used for the application or site name

Browse source
This commit is contained in:
Tim Worrall 2014-06-20 13:11:50 -04:00
parent e411a2224e
commit 488f7ce265
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@
<div id="error-notification" class="ui-state-error" style="padding:10px; -moz-box-shadow:0 0 6px #980000; -webkit-box-shadow:0 0 6px #980000; box-shadow:0 0 6px #980000;"> <div id="error-notification" class="ui-state-error" style="padding:10px; -moz-box-shadow:0 0 6px #980000; -webkit-box-shadow:0 0 6px #980000; box-shadow:0 0 6px #980000;">
<a class="ui-notify-close" href="#" title="${i18n().error_notification}"><span class="ui-icon ui-icon-close" style="float:right"></span></a> <a class="ui-notify-close" href="#" title="${i18n().error_notification}"><span class="ui-icon ui-icon-close" style="float:right"></span></a>
<span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span> <span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span>
<h1>&#035;{title}</h1> <h1>&#035;{title!}</h1>
<p>&#035;{text}</p> <p>&#035;{text}</p>
<p style="text-align:center"><a class="ui-notify-close" href="#">${i18n().close_me}</a></p> <p style="text-align:center"><a class="ui-notify-close" href="#">${i18n().close_me}</a></p>
</div> </div>
@ -61,7 +61,7 @@
<div id="warning-notification" class="ui-state-highlight ui-corner-all" > <div id="warning-notification" class="ui-state-highlight ui-corner-all" >
<a class="ui-notify-close ui-notify-cross" href="#" title="${i18n().error_notification}">x</a> <a class="ui-notify-close ui-notify-cross" href="#" title="${i18n().error_notification}">x</a>
<span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span> <span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
<h1>&#035;{title}</h1> <h1>&#035;{title!}</h1>
<p>&#035;{text}</p> <p>&#035;{text}</p>
</div> </div>

4
productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
View file

@ -27,7 +27,7 @@ corresponding changes in the included Templates. -->
<div id="error-notification" class="ui-state-error" style="padding:10px; -moz-box-shadow:0 0 6px #980000; -webkit-box-shadow:0 0 6px #980000; box-shadow:0 0 6px #980000;"> <div id="error-notification" class="ui-state-error" style="padding:10px; -moz-box-shadow:0 0 6px #980000; -webkit-box-shadow:0 0 6px #980000; box-shadow:0 0 6px #980000;">
<a class="ui-notify-close" href="#" title="${i18n().error_notification}"><span class="ui-icon ui-icon-close" style="float:right"></span></a> <a class="ui-notify-close" href="#" title="${i18n().error_notification}"><span class="ui-icon ui-icon-close" style="float:right"></span></a>
<span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span> <span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span>
<h1>&#035;{title}</h1> <h1>&#035;{title!}</h1>
<p>&#035;{text}</p> <p>&#035;{text}</p>
<p style="text-align:center"><a class="ui-notify-close" href="#">${i18n().close_me}</a></p> <p style="text-align:center"><a class="ui-notify-close" href="#">${i18n().close_me}</a></p>
</div> </div>
@ -35,7 +35,7 @@ corresponding changes in the included Templates. -->
<div id="warning-notification" class="ui-state-highlight ui-corner-all" > <div id="warning-notification" class="ui-state-highlight ui-corner-all" >
<a class="ui-notify-close ui-notify-cross" href="#" title="${i18n().error_notification}">x</a> <a class="ui-notify-close ui-notify-cross" href="#" title="${i18n().error_notification}">x</a>
<span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span> <span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
<h1>&#035;{title}</h1> <h1>&#035;{title!}</h1>
<p>&#035;{text}</p> <p>&#035;{text}</p>
</div> </div>
</div> </div>

2
themes/wilma/templates/gadgetDetails.ftl
View file

@ -2,7 +2,7 @@
<#-- Template for the body of the GadgetDetails page --> <#-- Template for the body of the GadgetDetails page -->
<div class="pageTitle" id="gadgets-title"><h2>${title}</h2></div> <div class="pageTitle" id="gadgets-title"><h2>${title!}</h2></div>
<#-- VIVO OpenSocial Extension by UCSF --> <#-- VIVO OpenSocial Extension by UCSF -->
<#if openSocial??> <#if openSocial??>

2
themes/wilma/templates/gadgetLogin.ftl
View file

@ -11,7 +11,7 @@ th {
} }
</style> </style>
<div class="pageTitle" id="gadgets-title"><h2>${title}</h2></div> <div class="pageTitle" id="gadgets-title"><h2>${title!}</h2></div>
<#-- VIVO OpenSocial Extension by UCSF --> <#-- VIVO OpenSocial Extension by UCSF -->
<#if openSocial??> <#if openSocial??>

2
themes/wilma/templates/head.ftl
View file

@ -4,7 +4,7 @@
<!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--> <!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>${title}</title> <title>${siteName!}</title>
<#-- VIVO OpenSocial Extension by UCSF --> <#-- VIVO OpenSocial Extension by UCSF -->
<#if openSocial??> <#if openSocial??>