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

NIHVIVO-1518: - Changed "${urls.siteIcons} to ${urls.images), so images are rendered from images folder and not site_icons folder.

Browse source
This commit is contained in:
mb863 2010-12-14 18:39:19 +00:00
parent bf1d320d01
commit 8b322b960d
5 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
View file

@ -6,7 +6,7 @@
<#if errorMessage?has_content> <#if errorMessage?has_content>
<div id="error-alert"><img src="${urls.siteIcons}/iconAlert.png"/> <div id="error-alert"><img src="${urls.images}/iconAlert.png"/>
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </div>

2
webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
View file

@ -11,7 +11,7 @@ ${stylesheets.addFromTheme("/css/uploadImages.css")}
<h2>Photo Upload</h2> <h2>Photo Upload</h2>
<#if errorMessage??> <#if errorMessage??>
<div id="error-alert"><img src="${urls.siteIcons}/iconAlert.png"/> <div id="error-alert"><img src="${urls.images}/iconAlert.png"/>
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </div>
</#if> </#if>

2
webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
View file

@ -10,7 +10,7 @@ ${stylesheets.addFromTheme("/css/uploadImages.css")}
<div id="photoUploadContainer"> <div id="photoUploadContainer">
<h2>Photo Upload</h2> <h2>Photo Upload</h2>
<#if errorMessage??> <#if errorMessage??>
<div id="error-alert"><img src="${urls.siteIcons}/iconAlert.png"/> <div id="error-alert"><img src="${urls.images}/iconAlert.png"/>
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </div>
</#if> </#if>

18
webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
View file

@ -1,25 +1,11 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<section id="#intro-menupage" role="region"> <section id="intro-menupage" role="region">
<h3>People</h3> <h3>People</h3>
<@widget name="browse" classGroup="people"/>
<section id="content-foaf-person" role="region"> <section id="content-foaf-person" role="region">
<h4>Visual Graph</h4> <h4>Visual Graph</h4>
<nav role="navigation"> <@widget name="browse" classGroup="people"/>
<ul id="foaf-person-childClasses">
<li><a href="#">foaf:person childClass 1<span class="count-classes"> (280)</span></a></li>
<li><a href="#">foaf:person childClass 2<span class="count-classes"> (280)</span></a></li>
<li><a href="#">foaf:person childClass 3<span class="count-classes"> (280)</span></a></li>
<li><a class="selected" href="#">foaf:person childClass 4<span class="count-classes"> (280)</span></a></li>
<li><a href="#">foaf:person childClass 5<span class="count-classes"> (280)</span></a></li>
<li><a href="#">foaf:person childClass 6<span class="count-classes"> (280)</span></a></li>
<li><a href="#">foaf:person childClass 7<span class="count-classes"> (280)</span></a></li>
<li><a href="#">foaf:person childClass 8<span class="count-classes"> (280)</span></a></li>
<li><a href="#">foaf:person childClass 9<span class="count-classes"> (280)</span></a></li>
</ul>
</nav>
<section id="foaf-person-graph" role="region"> <section id="foaf-person-graph" role="region">
<img src="${urls.images}/menupage/visual-graph.jpg" alt="" /> <img src="${urls.images}/menupage/visual-graph.jpg" alt="" />

6
webapp/web/templates/freemarker/widgets/widget-login.ftl
View file

@ -19,7 +19,7 @@
<noscript> <noscript>
<section id="error-alert"> <section id="error-alert">
<img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/> <img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
<p>In order to edit VIVO content, you'll need to enable JavaScript.</p> <p>In order to edit VIVO content, you'll need to enable JavaScript.</p>
</section> </section>
</noscript> </noscript>
@ -29,7 +29,7 @@
</#if> </#if>
<#if errorMessage??> <#if errorMessage??>
<div id="error-alert"><img src="${urls.siteIcons}/iconAlert.png" alert="Error alert icon"/> <div id="error-alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon"/>
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </div>
</#if> </#if>
@ -64,7 +64,7 @@
<h2>Log in</h2> <h2>Log in</h2>
<#if errorMessage??> <#if errorMessage??>
<div id="error-alert" role="alert"><img src="${urls.siteIcons}/iconAlert.png" width="24" height="24" alert="Error alert icon"/> <div id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
<p>${errorMessage}</p> <p>${errorMessage}</p>
</div> </div>
</#if> </#if>