more careful sorting of the menu; readme generator more failure-resistant; add missin...

diff --git a/_config.yml b/_config.yml
index 9ec865f29febbfb0e66e9409f1d1eea322fda86b..7d12ba3aa4941b666a843e4e924fb766ffa03366 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -11,7 +11,11 @@ readmes:
     projects:
       - name: "lilass"
       - name: "dyn-nsupdate"
     projects:
       - name: "lilass"
       - name: "dyn-nsupdate"

+      - name: "zonemaker"

       - name: "schsh"
       - name: "schsh"

+      - name: "rust-101"
+        src: "rust/rust-101"
+      - name: "git-mirror"

 
 defaults:
   - scope:
 
 defaults:
   - scope:

diff --git a/_plugins/menu.rb b/_plugins/menu.rb
index 98614b76616cca1f285c00df29ab1666a958a5b6..befe357a3e318861f34f641398618791afa2a973 100644 (file)
--- a/_plugins/menu.rb
+++ b/_plugins/menu.rb
@@ -30,7 +30,7 @@ module Jekyll
                     end
                 end
                 # sort the result before returning it
                     end
                 end
                 # sort the result before returning it

-                result.sort_by { |a| a['url'] }
+                result.sort_by { |a| [a['sort'], a['url']] }

             end
             
             create_menu(input, "", displayurl.sub('/index.html', ''))
             end
             
             create_menu(input, "", displayurl.sub('/index.html', ''))

diff --git a/_plugins/readmes.rb b/_plugins/readmes.rb
index 272e84936e2f4fab51f5823e61e64be87fcb0b19..82f917f18e1c32597d61849d113f33abb93da559 100644 (file)
--- a/_plugins/readmes.rb
+++ b/_plugins/readmes.rb
@@ -1,7 +1,7 @@
 module Jekyll
 
   class ReadmePage < Page
 module Jekyll
 
   class ReadmePage < Page

-    def initialize(site, base, dir, src)
+    def initialize(site, base, dir, src, idx)

       @site = site
       @base = base
       @dir = dir
       @site = site
       @base = base
       @dir = dir


@@ -13,8 +13,12 @@ module Jekyll
       content = File.read(src, self.merged_file_read_opts({})).each_line.to_a
 
       self.data['layout'] = 'default'
       content = File.read(src, self.merged_file_read_opts({})).each_line.to_a
 
       self.data['layout'] = 'default'

-      self.data['title'] = content[0].match(/^# (.*)\n$/)[1]
-      self.data['slug'] = self.data['title'].match(/^(.*):.*$/)[1]
+      self.data['title'] = content[0].match(/^#* ?(.*)\n$/)[1]
+      slug = self.data['title'].match(/^(.*):.*$/)
+      if slug
+        self.data['slug'] = slug[1]
+      end
+      self.data['sort'] = idx

       self.content = content[1..content.size].join
     end
   end
       self.content = content[1..content.size].join
     end
   end


@@ -26,8 +30,10 @@ module Jekyll
       readmes = site.config['readmes']
       base = readmes['src_base']
       dir = readmes['out_base']
       readmes = site.config['readmes']
       base = readmes['src_base']
       dir = readmes['out_base']

+      idx = 0

       for project in readmes['projects']
       for project in readmes['projects']

-          site.pages << ReadmePage.new(site, site.source, File.join(dir, project['name']), File.join(base, project['name'], 'README.md'))
+          site.pages << ReadmePage.new(site, site.source, File.join(dir, project['name']), File.join(base, project['src'] ? project['src'] : project['name'], 'README.md'), idx)
+          idx += 1

       end
     end
   end
       end
     end
   end