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

vivo-basic wasn't rendering property. Now It is fixed.

Browse source
This commit is contained in:
mb863 2010-11-18 18:50:52 +00:00
parent c64483785c
commit d4c96c6ba9
5 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
View file

@ -38,6 +38,8 @@ public class FreemarkerComponentGenerator extends FreemarkerHttpServlet {
request.setAttribute("ftl_identity", get("identity", root, config, vreq)); request.setAttribute("ftl_identity", get("identity", root, config, vreq));
request.setAttribute("ftl_menu", get("menu", root, config, vreq)); request.setAttribute("ftl_menu", get("menu", root, config, vreq));
request.setAttribute("ftl_stylesheets", get("stylesheets", root, config, vreq));
request.setAttribute("ftl_headScripts", get("headScripts", root, config, vreq));
request.setAttribute("ftl_search", get("search", root, config, vreq)); request.setAttribute("ftl_search", get("search", root, config, vreq));
request.setAttribute("ftl_footer", get("footer", root, config, vreq)); request.setAttribute("ftl_footer", get("footer", root, config, vreq));
request.setAttribute("ftl_googleAnalytics", get("googleAnalytics", root, config, vreq)); request.setAttribute("ftl_googleAnalytics", get("googleAnalytics", root, config, vreq));

18
webapp/web/css/login.css
View file

@ -148,20 +148,4 @@ p.passwordNote {
.or { .or {
display:inline; display:inline;
vertical-align:middle; vertical-align:middle;
} }
/* WILMA THEME ------> */
#error-alert{
width:260px;
position:relative;
}
#error-alert img{
padding-left:38px;
}
#error-alert p.error-message{
position:absolute;
width:200px;
top:8px;
left:82px;
font-size:0.7em;
color:#b30d1c;
}

3
webapp/web/templates/freemarker/page/partials/headScripts.ftl
View file

@ -2,4 +2,7 @@
<#-- Template for scripts that must be loaded in the head --> <#-- Template for scripts that must be loaded in the head -->
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
<script type="text/javascript" src="${urls.base}/js/html5.js"></script>
${headScripts.tags} ${headScripts.tags}

4
webapp/web/templates/freemarker/page/partials/stylesheets.ftl
View file

@ -1,10 +1,6 @@
<#-- $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$ -->
<#-- Template for loading stylesheets in the head --> <#-- Template for loading stylesheets in the head -->
${stylesheets.add("/css/edit.css")} <#-- temporary until edit controller can include this when needed --> ${stylesheets.add("/css/edit.css")} <#-- temporary until edit controller can include this when needed -->
${stylesheets.add("/css/menupage/menupage.css")} <#-- we need to call it from the theme until freemarker controller and menupage.ftl are created --> ${stylesheets.add("/css/menupage/menupage.css")} <#-- we need to call it from the theme until freemarker controller and menupage.ftl are created -->
${stylesheets.add("/css/individual/individual.css")} <#-- we need to call it from the theme until freemarker controller and individual.ftl are created --> ${stylesheets.add("/css/individual/individual.css")} <#-- we need to call it from the theme until freemarker controller and individual.ftl are created -->
${stylesheets.tags} ${stylesheets.tags}

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

@ -31,10 +31,8 @@
</#if> </#if>
<#if errorMessage??> <#if errorMessage??>
<section id="error-alert" role='region'> <section id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png" alert="Error alert icon"/>
<img src="${urls.siteIcons}/iconAlert.png" alert="Error alert icon" /> <p>${errorMessage}</p>
<p class="error-message">${errorMessage}</p>
</section> </section>
</#if> </#if>
@ -54,7 +52,7 @@
</form> </form>
<p class="forgot-password"><a href="#">Forgot your password?</a></p> <p class="forgot-password"><a href="#">Forgot your password?</a></p>
<p class="request-account"><a class=" blue button" href="#">Request an account</a> </p> <p class="request-account"><a class="blue button" href="#">Request an account</a> </p>
</section> </section>
</section><!-- #log-in --> </section><!-- #log-in -->
</#macro> </#macro>