Introduced a new template tag called 'header' to replace the macro-tag-with-header-attribute construct.

1 files changed, 3 insertions, 6 deletions

diff --git a/server/src/server.cc b/server/src/server.cc
index 884284a..8bfd827 100644
--- a/server/src/server.cc
+++ b/server/src/server.cc
@@ -148,17 +148,14 @@ static std::string handleTransaction(Transaction *transaction,
       while(mi2 != templ->course.macros.end()) {
         Macro &macro = (*mi2);
 
-        // FIXME: This is to be made in some other way in a later version.
-        if(macro.attributes.find("header") != macro.attributes.end()) {
-          // Macro is a special headline macro
-          // Simply output a headline, and ignore the rest of it.
-          answer += "    <macro header=\"" + macro.attributes["header"] + "\"></macro>\n";
+        if(macro.isHeader) {
+          answer += "    <header caption=\"" + macro.attributes["caption"] + "\"/>\n";
           mi2++;
           continue;
         }
 
         bool completed = db->checkMacro(transaction->cpr, macro.attributes["name"]);
-        
+
         answer += "    <macro completed=";
         if(completed) answer += "\"true\"";
         else answer += "\"false\"";