From 4525beb985f8e874f11c0e95df2b1544c8b0b1ba Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Sat, 31 Aug 2013 23:45:48 -0700
Subject: Cleaning up content macro. Adding favicon. Fixing static content.

---
 src/templates/macros/common.ftl      | 1 -
 src/templates/macros/content.ftl     | 4 ++--
 src/templates/macros/noticebox.ftl   | 4 ++--
 src/templates/macros/textcontent.ftl | 8 --------
 4 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 src/templates/macros/textcontent.ftl

(limited to 'src/templates/macros')

diff --git a/src/templates/macros/common.ftl b/src/templates/macros/common.ftl
index 966afdb..513fc57 100644
--- a/src/templates/macros/common.ftl
+++ b/src/templates/macros/common.ftl
@@ -1,5 +1,4 @@
 <#include "content.ftl">
-<#include "textcontent.ftl">
 <#include "noticebox.ftl">
 
 <#assign dynamicRoot = "">
diff --git a/src/templates/macros/content.ftl b/src/templates/macros/content.ftl
index dc474f0..eaf0b17 100644
--- a/src/templates/macros/content.ftl
+++ b/src/templates/macros/content.ftl
@@ -1,6 +1,6 @@
-<#macro content>
+<#macro content class="">
     <div id="content">
-        <article>
+        <article class="${class}">
             <#nested>
         </article>
     </div>
diff --git a/src/templates/macros/noticebox.ftl b/src/templates/macros/noticebox.ftl
index eca1428..9cd99f9 100644
--- a/src/templates/macros/noticebox.ftl
+++ b/src/templates/macros/noticebox.ftl
@@ -1,6 +1,6 @@
-<#macro noticebox>
+<#macro noticebox class="">
     <div id="middlebar">
-        <div id="noticebox">
+        <div id="noticebox" class="${class}">
             <img class="icon" src="${staticRoot}/images/noticeicon.png">
             <p>
                 <#nested>
diff --git a/src/templates/macros/textcontent.ftl b/src/templates/macros/textcontent.ftl
deleted file mode 100644
index 408c05c..0000000
--- a/src/templates/macros/textcontent.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#macro textcontent>
-    <div id="content">
-        <article class="text">
-            <#nested>
-        </article>
-    </div>
-</#macro>
-
-- 
cgit v1.2.3