Merge pull request #302 from Martii/documentPageFixes

Document page fixes

Author: Martii

controllers/document.js

@@ -14,88 +14,97 @@ exports.view = function (aReq, aRes, aNext) {
   var options = {};
   var tasks = [];
 
-
-  var matches = null;
   var page = null;
-
   var documentPath = null;
-
-  //---
-  function preRender() {};
-  function render() { aRes.render('pages/documentPage', options); }
-  function asyncComplete(err) { if (err) { return aNext(); } else { preRender(); render(); } };
+  var document = aReq.route.params.document;
 
   // Session
   authedUser = options.authedUser = modelParser.parseUser(authedUser);
   options.isMod = authedUser && authedUser.isMod;
   options.isAdmin = authedUser && authedUser.isAdmin;
 
-  //--- Tasks
-
-  var document = aReq.route.params.document;
 
   if (document) {
     documentPath = 'views/includes/documents';
 
-    fs.readdir(documentPath, function (aErr, aFiles) {
-      if (!aErr) {
-        var file = null;
-
-        // Dynamically create a file listing of the pages
-        options.files = [];
-        for (file in aFiles) {
-          if (/\.md$/.test(aFiles[file])) {
-            options.files.push({
-              href: aFiles[file].replace(/\.md$/, ''),
-              textContent: aFiles[file].replace(/\.md$/, '').replace(/-/g, ' ')
-            });
-          }
-        }
-      }
-    });
-
-    fs.readFile(documentPath + '/' + document + '.md', 'UTF8', function (aErr, aData) {
-      if (aErr) {
-        return statusCodePage(aReq, aRes, aNext, {
-          statusCode: 404,
-          statusMessage: 'Page not found.'
-        });
-      }
-
-      var lines = null;
-      var heading = null;
-      var content = null;
-
-      // Check if first line is h2 and use for title/heading if present
-      lines = aData.match(/.*/gm);
-      if (lines) {
-        matches = lines[0].match(/^##\s(.*)$/);
-        if (matches) {
-          heading = lines.shift().replace(/^##\s+/, "");
-        } else {
-          heading = page;
+    //--- Tasks
+    tasks.push(function (aCallback) {
+      async.waterfall([
+
+        // Read file listing
+        function (aCallback) {
+          fs.readdir(documentPath, function (aErr, aFiles) {
+            if (aErr) { aCallback('Error retrieving page list'); return; }
+
+            var file = null;
+
+            // Dynamically create a file listing of the pages
+            options.files = [];
+            for (file in aFiles) {
+              if (/\.md$/.test(aFiles[file])) {
+                options.files.push({
+                  href: aFiles[file].replace(/\.md$/, ''),
+                  textContent: aFiles[file].replace(/\.md$/, '').replace(/-/g, ' ')
+                });
+              }
+            }
+
+            aCallback(null);
+          });
+        },
+
+        // Read md file contents
+        function (aCallback) {
+          fs.readFile(documentPath + '/' + document + '.md', 'UTF8', function (aErr, aData) {
+            if (aErr) { aCallback('Error retrieving page'); return; }
+
+            var lines = null;
+            var matches = null;
+            var heading = null;
+            var content = null;
+
+            // Check if first line is h2 and use for title/heading if present
+            lines = aData.match(/.*/gm);
+            if (lines) {
+              matches = lines[0].match(/^##\s(.*)$/);
+              if (matches) {
+                heading = lines.shift().replace(/^##\s+/, "");
+              } else {
+                heading = page;
+              }
+              content = lines.join('\n');
+            } else {
+              heading = page;
+              content = aData;
+            }
+
+            // Page metadata
+            pageMetadata(options, [heading, 'About']);
+
+            options.pageHeading = heading;
+            options.pageData = renderMd(content);
+
+            aCallback(null);
+          });
         }
-        content = lines.join('\n');
-      } else {
-        heading = page;
-        content = aData;
-      }
-
-      // Page metadata
-      pageMetadata(options, [heading, 'About']);
-
-      options.pageHeading = heading;
-      options.pageData = renderMd(content);
-
-      async.parallel(tasks, asyncComplete);
+      ], aCallback)
     });
   }
   else {
     // Page metadata
     pageMetadata(options, ['About', 'About']);
 
     options.isAbout = true;
-
-    async.parallel(tasks, asyncComplete);
   }
+
+  //---
+  async.parallel(tasks, function (aErr) {
+    if (aErr) {
+      return statusCodePage(aReq, aRes, aNext, {
+        statusMessage: aErr
+      })
+    }
+
+    aRes.render('pages/documentPage', options);
+  });
 };

views/pages/documentPage.html

@@ -39,7 +39,7 @@ <h2 class="page-heading">
         <div class="col-sm-4">
           <div class="panel panel-default">
             <div class="panel-heading">
-              <div class="panel-title">Pages</div>
+              <div class="panel-title"><em class="fa fa-fw fa-file-text-o"></em> Pages</div>
             </div>
             <div class="panel-body">
               <ul class="list-group">