runeblog 0.2.77 → 0.2.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd45d7f160becf53463b3d7155903923442bd09ad5bda3060073ae1ce026451
-  data.tar.gz: b6821e7aa9e5d363bdfbb93545cad68fcdd1d3288ffaef9661691f0fdf9a8925
+  metadata.gz: 6baabb9426c6b2e8d316203e12b941a357a31463425810721d8a72f3add24ecd
+  data.tar.gz: 9e823dba18e88f9e6159724fbdbb228392eb6433d21f91e6e922b2e7d850cb4d
 SHA512:
-  metadata.gz: '04480d91caa79a7373398e29b25c4cb3af1c7057fd766350d03f5a0e7aa6d84edd5d2b12a00fb67c813695723d0423f5a0e5a32c811211679b105d39eb7ae780'
-  data.tar.gz: 4ecaa3247239a822399a494643001c0a70346695284fada297aee876bf441168d44a1c6b0722c2ecc8338e0872087b2b44044470aed03aff6b4544f28b7dfb0d
+  metadata.gz: 8bc8bc41c43fec627fb6184ce3b9b44fb4f442a8f462b1396ce180c64d00663772e306701e6b4c7edf466eb930162a39ede08bc642d724fde0c2327b97852c45
+  data.tar.gz: 4c5f370aa66624daac8355ddf03b7824e890e27b97eaaa27cb81e788c38352e9a6be90ea37c7e501fd7f198e4a6727054c951cb3a26992d88751e45ab0535e16

data/lib/liveblog.rb

@@ -91,10 +91,11 @@ end
 def banner
   count = 0
   span = 1
-  bg = "white"  # outside loop
+  @bg = "white"  # outside loop
   wide = nil
   high = 250
   str2 = ""
+  navbar = nil
   lines = _body.to_a
 
   lines.each do |line|
@@ -107,7 +108,7 @@ def banner
       when "height"
         high = data[0]
       when "bgcolor"
-        bg = data[0] || "white"
+        @bg = data[0] || "white"
       when "image"
         image = data[0] || "banner.jpg"
         image = "banner"/image
@@ -125,13 +126,15 @@ def banner
       when "navbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/" + "\n"
         _make_navbar  # horiz is default
-        stuff = File.read("banner/navbar.html")
-        str2 << "<td colspan=#{span}><div style='text-align: center'>#{stuff}</div></td>" + "\n"
+        file = "banner/navbar.html"
+        navbar = File.read(file)
+        # str2 << "<td colspan=#{span}><div style='text-align: center'>#{stuff}</div></td>" + "\n"
       when "vnavbar"
         dir = @blog.root/:views/@blog.view/"themes/standard/banner/"
         _make_navbar(:vert)
         file = "banner/vnavbar.html"
-        str2 << "<td colspan=#{span}>" + File.read(file) + "</td>" + "\n"
+        navbar = File.read(file)
+        # str2 << "<td colspan=#{span}>" + File.read(file) + "</td>" + "\n"
       when "break"
          span = count - 1
          str2 << "  </tr>\n  <tr>"  + "\n"
@@ -139,11 +142,12 @@ def banner
       str2 << "        '#{tag}' isn't known" + "\n"
     end
   end
-  _out "<table width=100% height=#{high} bgcolor=##{bg}>"
+  _out "<table width=100% height=#{high} bgcolor=##{@bg}>"
   _out "  <tr>"
   _out str2
   _out "  </tr>"
   _out "</table>"
+  _out navbar if navbar
 rescue => err
   STDERR.puts "err = #{err}"
   STDERR.puts err.backtrace.join("\n")
@@ -748,21 +752,28 @@ def _make_navbar(orient = :horiz)
   vdir = @root/:views/@blog.view
   title = _var(:blog)
 
-  extra = ""
-  extra = "navbar-expand-lg" if orient == :horiz
-
+  if orient == :horiz
+    name = "navbar.html"
+    li1, li2 = "", ""
+    extra = "navbar-expand-lg" 
+    list1 = list2 = ""
+  else
+    name = "vnavbar.html"
+    li1, li2 = '<li class="nav-item">', "</li>"
+    extra = ""
+    list1, list2 = '<l class="navbar-nav mr-auto">', "</ul>"
+  end
+  
   start = <<-HTML
        <!-- FIXME weird bug here!!! -->
    <nav class="navbar #{extra} navbar-light bg-light">
-      <ul class="navbar-nav mr-auto">
+      #{list1}
   HTML
   finish = <<-HTML
-      </ul>
+      #{list2}
     </nav>
   HTML
 
-  name = (orient == :horiz) ? "navbar.html" : "vnavbar.html"
-
   html_file = @blog.root/:views/@blog.view/"themes/standard/banner"/name
   output = File.new(html_file, "w")
   output.puts start
@@ -773,11 +784,11 @@ def _make_navbar(orient = :horiz)
     full = :banner/basename+".html"
     href_main = _main(full)
     if basename == "index"  # special case
-      output.puts %[<li class="nav-item active"> <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> </li>]
+      output.puts %[#{li1} <a class="nav-link" href="index.html">#{cdata}<span class="sr-only">(current)</span></a> #{li2}]
     else
       dir = @blog.root/:views/@blog.view/"themes/standard/banner"
       xlate cwd: dir, src: basename, dst: vdir/"remote/banner"/basename+".html" # , debug: true
-      output.puts %[<li class="nav-item"> <a class="nav-link" #{href_main}>#{cdata}</a> </li>]
+      output.puts %[#{li1} <a class="nav-link" #{href_main}>#{cdata}</a> #{li2}]
     end
   end
   output.puts finish

data/lib/runeblog_version.rb

@@ -2,7 +2,7 @@
 if ! (Object.constants.include?(:RuneBlog) && RuneBlog.constants.include?(:Path))
 
 class RuneBlog
-  VERSION = "0.2.77"
+  VERSION = "0.2.78"
 
   path = Gem.find_files("runeblog").grep(/runeblog-/).first
   Path  = File.dirname(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runeblog
 version: !ruby/object:Gem::Version
-  version: 0.2.77
+  version: 0.2.78
 platform: ruby
 authors:
 - Hal Fulton