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

Moved call for individual.css and menupages.css to respective templates now that controllers are in place

Browse source
This commit is contained in:
nac26 2010-12-23 15:05:03 +00:00
parent ae6311188a
commit cea493de32
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/web/templates/freemarker/body/individual/individual.ftl
View file

@ -123,7 +123,7 @@
<p id="keywords">Keywords: ${individual.keywordString}</p> <p id="keywords">Keywords: ${individual.keywordString}</p>
</#if> </#if>
${stylesheets.addFromTheme("/css/entity.css")} ${stylesheets.add("/css/individual/individual.css")}
<#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) --> <#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) -->
${headScripts.add("/js/jquery_plugins/getUrlParam.js", ${headScripts.add("/js/jquery_plugins/getUrlParam.js",
@ -135,6 +135,4 @@ ${headScripts.add("/js/jquery_plugins/getUrlParam.js",
"http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D", "http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D",
"/js/toggle.js")} "/js/toggle.js")}
${scripts.add("/js/imageUpload/imageUploadUtils.js")} ${scripts.add("/js/imageUpload/imageUploadUtils.js")}

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

@ -131,3 +131,4 @@
</section> </section>
</section> </section>
${stylesheets.add("/css/menupage/menupage.css")}

4
webapp/web/templates/freemarker/body/menupage/menupage.ftl
View file

@ -79,4 +79,6 @@
<article class="vcard individual" role="article"><h1 class="fn">&lt;individualName&gt;</h1></article> <article class="vcard individual" role="article"><h1 class="fn">&lt;individualName&gt;</h1></article>
<article class="vcard individual" role="article"><h1 class="fn">&lt;individualName&gt;</h1></article> <article class="vcard individual" role="article"><h1 class="fn">&lt;individualName&gt;</h1></article>
</section> </section>
</section> </section>
${stylesheets.add("/css/menupage/menupage.css")}

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

@ -1,7 +1,5 @@
<#-- $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")}
${stylesheets.add("/css/individual/individual.css")}
${stylesheets.tags} ${stylesheets.tags}