From b8b86fb4b905d07aec2f95692abd3215774dff85 Mon Sep 17 00:00:00 2001
From: Mikko Ahlroth <mikko.ahlroth@gmail.com>
Date: Sun, 16 Nov 2014 19:06:31 +0200
Subject: [PATCH] Blog name in header and support for hidden pages

---
 src/components/db/db.js             | 8 ++++++--
 src/components/nav-bar/nav-bar.html | 2 +-
 src/components/nav-bar/nav-bar.js   | 9 ++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/db/db.js b/src/components/db/db.js
index 0968d0a..a7bb0af 100644
--- a/src/components/db/db.js
+++ b/src/components/db/db.js
@@ -131,9 +131,13 @@ define(['knockout', '../transfer/transfer', 'moment'], function(ko, transfer, mo
     self.parsePageData = function(matched) {
       var slug = matched[1];
 
+      var isHidden = _.isUndefined(matched[2]);
+      var linkText = isHidden? '' : matched[2];
+
       var page = ko.observable({
         slug: ko.observable(slug),
-        linkText: ko.observable(matched[2]),
+        isHidden: ko.observable(isHidden),
+        linkText: ko.observable(linkText),
 
         synced: ko.observable(false),
         title: ko.observable(null),
@@ -151,7 +155,7 @@ define(['knockout', '../transfer/transfer', 'moment'], function(ko, transfer, mo
      */
     self.parseIndex = function(posts, pages, indexStr) {
       var post_data_regex = /^(\d{4}-\d{2}-\d{2}) ([a-z0-9\-]+)(\s([^,]+?,?)*)?$/;
-      var page_data_regex = /^([a-z0-9\-]+) (.*)$/;
+      var page_data_regex = /^([a-z0-9\-]+)(?: (.*))?$/;
 
       var lines = indexStr.split('\n');
       var line_no = 1;
diff --git a/src/components/nav-bar/nav-bar.html b/src/components/nav-bar/nav-bar.html
index ec8a0dd..8470784 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -7,7 +7,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#!">Laine</a>
+            <a class="navbar-brand" href="#!" data-bind="text: blogName"></a>
         </div>
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav" data-bind="foreach: { data: pages, as: 'page' }">
diff --git a/src/components/nav-bar/nav-bar.js b/src/components/nav-bar/nav-bar.js
index 84c6248..a7fba64 100644
--- a/src/components/nav-bar/nav-bar.js
+++ b/src/components/nav-bar/nav-bar.js
@@ -1,13 +1,16 @@
-define(['knockout', 'text!./nav-bar.html', '../db/db', '../address-service/address-service'],
-  function(ko, template, DB, addressService) {
+define(['knockout', 'text!./nav-bar.html', '../db/db', '../address-service/address-service', '../config-service/config-service'],
+  function(ko, template, DB, addressService, configService) {
 
   function NavBarViewModel(params) {
     var self = this;
 
     self.AS = addressService;
+    self.blogName = configService.blogName;
     self.route = params.route;
     self.pages = ko.pureComputed(function() {
-      return DB.pages();
+      return _.filter(DB.pages(), function(page) {
+        return !page().isHidden();
+      });
     });
   }