diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2013-08-31 23:45:48 -0700 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2013-08-31 23:46:11 -0700 |
| commit | 55e19559739d879f31ff5bd2fdcfa8a6cc055a34 (patch) | |
| tree | e111deec329365068f788b11ff03ab8e07ed7447 /src/templates/macros | |
| parent | ec17ac7fca60b87449355f8c240fc7e0512eba33 (diff) | |
Cleaning up content macro. Adding favicon. Fixing static content.
Diffstat (limited to 'src/templates/macros')
| -rw-r--r-- | src/templates/macros/common.ftl | 1 | ||||
| -rw-r--r-- | src/templates/macros/content.ftl | 4 | ||||
| -rw-r--r-- | src/templates/macros/noticebox.ftl | 4 | ||||
| -rw-r--r-- | src/templates/macros/textcontent.ftl | 8 |
4 files changed, 4 insertions, 13 deletions
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> - |