From 4aa4b5ec7670d98c2e988f8d9687f3311c36dae7 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 11 Aug 2011 15:55:40 +0000
Subject: [PATCH] NIHVIVO-2164 Now that the stylesheets object is available to
 all templates through configuration shared variables, can move styles out of
 dump.ftl into dump.css.

---
 webapp/web/css/dump.css                       | 52 +++++++------------
 .../freemarker/body/partials/dump/dump.ftl    | 40 +-------------
 2 files changed, 21 insertions(+), 71 deletions(-)

diff --git a/webapp/web/css/dump.css b/webapp/web/css/dump.css
index adab1cbd0..2c0b7c45b 100644
--- a/webapp/web/css/dump.css
+++ b/webapp/web/css/dump.css
@@ -2,47 +2,35 @@
 
 /* Styles for Freemarker template variable dump */
 
-.dump {
-    border-top: 3px solid #ccc;
-    border-bottom: 3px solid #ccc;
-    padding: 1em 0;
-    margin: 1em 0;
-}
-
-.dump li {
-    list-style-type: none;
-}
-
-.dump .directive h6 {
+.div.dump {
     margin-top: 1em;
+    border-top: 2px solid #ccc; 
+    padding-top: .75em;
 }
 
-.dump.datamodel .var, 
-.dump.datamodel .directive {
-    border-bottom: 1px solid #ccc; 
-    padding: 1em 0;
-    margin: 1em 0;   
-}
-
-.dump ol li, 
-.dump ul li {
+.dump ul li.variable {
     margin-bottom: .5em;
+    border-bottom: 1px solid #ccc; 
+    padding-top: .75em;
+    padding-bottom: .75em;
 }
 
-.dump .var p {
-    margin-bottom: .3em;
-}
-
-.dump .directive ol, 
-.dump .directive ul {
+.dump ul ul {
     margin-left: 1.5em;
 }
 
-.dump .directive ol li {
-    list-style: decimal inside none;
+.dump ul li {
+    list-style: none;
 }
 
-.dump .var .var,
-.dump.datamodel .var .var {
-    margin-left: 1.5em;
+.dump ul li p {
+    margin-bottom: .25em;  
 }
+
+.dump ul li.item {
+    margin-bottom: 1.25em;
+}
+
+.dump ul li.item .value { 
+    margin-left: 1.5em;
+}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
index ac8bc9dd7..9276b43ba 100644
--- a/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
+++ b/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
@@ -2,41 +2,7 @@
 
 <#-- Template for dump directives -->
 
-<#-- Styles here are temporary; use stylesheets.add() once that's working (see below) -->
-<style>
-div.dump {
-    margin-top: 1em;
-    border-top: 2px solid #ccc; 
-    padding-top: .75em;
-}
-
-.dump ul li.variable {
-    margin-bottom: .5em;
-    border-bottom: 1px solid #ccc; 
-    padding-top: .75em;
-    padding-bottom: .75em;
-}
-
-.dump ul ul {
-    margin-left: 1.5em;
-}
-
-.dump ul li {
-    list-style: none;
-}
-
-.dump ul li p {
-    margin-bottom: .25em;  
-}
-
-.dump ul li.item {
-    margin-bottom: 1.25em;
-}
-
-.dump ul li.item .value { 
-    margin-left: 1.5em;
-}
-</style>
+ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/dump.css" />')}
 
 <div class="dump">
     <h3>${title}</h3>
@@ -205,7 +171,3 @@ div.dump {
     <li class="item"><#nested></li>
 </#macro>
 
-
-<#-- This will work after we move stylesheets to Configuration sharedVariables 
-${stylesheets.add('<link rel="stylesheet" href="/css/fmdump.css">')}
--->