Merge branch 'master' into feature/gollum-lib

Conflicts: lib/gollum/markup.rb test/test_gitcode.rb
2013-03-20 07:46:11 +00:00
parent cbc0821928 54e144564c
commit b989f160cf
7 changed files with 45 additions and 3 deletions
@@ -85,6 +85,7 @@ module Precious
      # above will detect base_path when it's used with map in a config.ru
      settings.wiki_options.merge!({ :base_path => @base_url })
      @css = settings.wiki_options[:css]
+      @js = settings.wiki_options[:js]
    end

    get '/' do
@@ -6,6 +6,7 @@
  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/template.css" media="all">
  <link rel="stylesheet" type="text/css" href="{{base_url}}/css/_styles.css" media="all">
  {{#css}}<link rel="stylesheet" type="text/css" href="{{base_url}}/custom.css" media="all">{{/css}}
+  {{#js}}<script type="text/javascript" src="{{base_url}}/custom.js"></script>{{/js}}
  <title>{{title}}</title>
 </head>
 <body>
@@ -43,6 +43,7 @@
  (d.head || d.getElementsByTagName('head')[0]).appendChild(j);
  }(document));
  </script>{{/mathjax}}
+  {{#js}}<script type="text/javascript" src="{{base_url}}/custom.js"></script>{{/js}}

  <title>{{title}}</title>
 </head>
@@ -28,6 +28,10 @@ module Precious
        @css
      end

+      def js # custom js
+        @js
+      end
+
    end
  end
 end