From 6b47329954e1d4c99352b8c69a3f35ea03fbdef5 Mon Sep 17 00:00:00 2001 From: nac26 Date: Thu, 13 Jan 2011 14:05:14 +0000 Subject: [PATCH] Refactored approach for inserting visualization links on menu pages. Still hoping to remove JavaScript altogether based on outcome of NIHVIVO-1681. Also introduced the initial version of application-wide styles with vitro.css. --- webapp/web/css/vitro.css | 26 +++++++++++++++++++ .../freemarker/body/menupage/menupage.ftl | 4 +-- .../freemarker/page/partials/stylesheets.ftl | 3 +++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 webapp/web/css/vitro.css diff --git a/webapp/web/css/vitro.css b/webapp/web/css/vitro.css new file mode 100644 index 000000000..c680d88ef --- /dev/null +++ b/webapp/web/css/vitro.css @@ -0,0 +1,26 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/**************************************** + Vitro base styles + + Styles declared here are intended for + application-wide use. + + Original version + 2011-01-12 UI Team + + Last updated + 2011-01-13 +*****************************************/ + +/************************ +Miscellaneous +************************/ + +.clear { + clear: both; +} + +.hidden { + display: none !important; +} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/menupage/menupage.ftl b/webapp/web/templates/freemarker/body/menupage/menupage.ftl index a7f8b0b05..b5fe5de48 100644 --- a/webapp/web/templates/freemarker/body/menupage/menupage.ftl +++ b/webapp/web/templates/freemarker/body/menupage/menupage.ftl @@ -4,12 +4,12 @@

${page.title}

-

Visual Graph

- <#-- This will allow us to keep menupage.ftl generic and keep vivo-specific extensions in VIVO --> <#if visualizationLink??> ${visualizationLink} + +

Visual Graph

<#include "menupage-vClassesInClassgroup.ftl"> diff --git a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl index 3d35e8df9..93b91c41a 100644 --- a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl +++ b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl @@ -2,4 +2,7 @@ <#-- Template for loading stylesheets in the head --> ${stylesheets.add("/css/edit.css")} <#--temporary until edit controller can include this when needed --> + + + ${stylesheets.tags} \ No newline at end of file