olelo 0.9.2 → 0.9.3

data/plugins/editor/ace/main.rb

@@ -0,0 +1,7 @@
+description 'Use ace editor'
+dependencies 'utils/assets'
+export_scripts '*.js'
+
+Application.hook :head do
+  %{<script src="http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript"/>}
+end

data/plugins/editor/markup/main.rb

@@ -1,3 +1,3 @@
-description 'Markup editor'
+description 'Adds markup toolbar to the editor'
 dependencies 'misc/variables', 'utils/assets'
 export_scripts '*.js'

data/plugins/editor/markup/script.js

@@ -1,10 +1,10 @@
-(function(){var i=function(){var f=typeof document.selection!=="undefined"&&typeof document.selection.createRange!=="undefined";return{getSelectionRange:function(a){var b,c,d;a.focus();if(typeof a.selectionStart!=="undefined"){b=a.selectionStart;c=a.selectionEnd}else if(f){b=document.selection.createRange();c=b.text.length;if(b.parentElement()!==a)throw"Unable to get selection range.";if(a.type==="textarea"){d=b.duplicate();d.moveToElementText(a);d.setEndPoint("EndToEnd",b);b=d.text.length-c}else{a=
-a.createTextRange();a.setEndPoint("EndToStart",b);b=a.text.length}c=b+c}else throw"Unable to get selection range.";return{start:b,end:c}},getSelectionStart:function(a){return this.getSelectionRange(a).start},getSelectionEnd:function(a){return this.getSelectionRange(a).end},setSelectionRange:function(a,b,c){var d;a.focus();if(typeof c==="undefined")c=b;if(typeof a.selectionStart!=="undefined")a.setSelectionRange(b,c);else if(f){d=a.value;a=a.createTextRange();c-=b+d.slice(b+1,c).split("\n").length-
-1;b-=d.slice(0,b).split("\n").length-1;a.move("character",b);a.moveEnd("character",c);a.select()}else throw"Unable to set selection range.";},getSelectedText:function(a){var b=this.getSelectionRange(a);return a.value.substring(b.start,b.end)},insertText:function(a,b,c,d,g){d=d||c;var h=c+b.length,l=a.value.substring(0,c);d=a.value.substr(d);a.value=l+b+d;g===true?this.setSelectionRange(a,c,h):this.setSelectionRange(a,h)},replaceSelectedText:function(a,b,c){var d=this.getSelectionRange(a);this.insertText(a,
-b,d.start,d.end,c)},wrapSelectedText:function(a,b,c,d){b=b+this.getSelectedText(a)+c;this.replaceSelectedText(a,b,d)}}}();window.Selection=i})();
-(function(i){i.fn.extend({getSelectionRange:function(){return Selection.getSelectionRange(this[0])},getSelectionStart:function(){return Selection.getSelectionStart(this[0])},getSelectionEnd:function(){return Selection.getSelectionEnd(this[0])},getSelectedText:function(){return Selection.getSelectedText(this[0])},setSelectionRange:function(f,a){return this.each(function(){Selection.setSelectionRange(this,f,a)})},insertText:function(f,a,b,c){return this.each(function(){Selection.insertText(this,f,a,
-b,c)})},replaceSelectedText:function(f,a){return this.each(function(){Selection.replaceSelectedText(this,f,a)})},wrapSelectedText:function(f,a,b){return this.each(function(){Selection.wrapSelectedText(this,f,a,b)})}})})(jQuery);(function(i){var f={creole:{link:["[[","link text","]]"],bold:["**","bold text","**"],italic:["//","italic text","//"],ul:["* ","list item","",true],ol:["# ","list item","",true],h1:["= ","headline","",true],h2:["== ","headline","",true],h3:["=== ","headline","",true],sub:["~~","subscript","~~"],sup:["^^","superscript","^^"],del:["--","deleted text","--"],ins:["++","inserted text","++"],image:["{{","image","}}"],preformatted:["{{{","preformatted","}}}"]},markdown:{link:function(a){return(a=prompt("link target:",
+(function(){var e=function(){var g=typeof document.selection!=="undefined"&&typeof document.selection.createRange!=="undefined";return{getSelectionRange:function(a){var b,c,d;a.focus();if(typeof a.selectionStart!=="undefined"){b=a.selectionStart;c=a.selectionEnd}else if(g){b=document.selection.createRange();c=b.text.length;if(b.parentElement()!==a)throw"Unable to get selection range.";if(a.type==="textarea"){d=b.duplicate();d.moveToElementText(a);d.setEndPoint("EndToEnd",b);b=d.text.length-c}else{a=
+a.createTextRange();a.setEndPoint("EndToStart",b);b=a.text.length}c=b+c}else throw"Unable to get selection range.";return{start:b,end:c}},getSelectionStart:function(a){return this.getSelectionRange(a).start},getSelectionEnd:function(a){return this.getSelectionRange(a).end},setSelectionRange:function(a,b,c){var d;a.focus();if(typeof c==="undefined")c=b;if(typeof a.selectionStart!=="undefined")a.setSelectionRange(b,c);else if(g){d=a.value;a=a.createTextRange();c-=b+d.slice(b+1,c).split("\n").length-
+1;b-=d.slice(0,b).split("\n").length-1;a.move("character",b);a.moveEnd("character",c);a.select()}else throw"Unable to set selection range.";},getSelectedText:function(a){var b=this.getSelectionRange(a);return a.value.substring(b.start,b.end)},insertText:function(a,b,c,d,h){d=d||c;var i=c+b.length,l=a.value.substring(0,c);d=a.value.substr(d);a.value=l+b+d;h===true?this.setSelectionRange(a,c,i):this.setSelectionRange(a,i)},replaceSelectedText:function(a,b,c){var d=this.getSelectionRange(a);this.insertText(a,
+b,d.start,d.end,c)},wrapSelectedText:function(a,b,c,d){b=b+this.getSelectedText(a)+c;this.replaceSelectedText(a,b,d)}}}();window.Selection=e})();
+(function(e){e.fn.extend({getSelectionRange:function(){return Selection.getSelectionRange(this[0])},getSelectionStart:function(){return Selection.getSelectionStart(this[0])},getSelectionEnd:function(){return Selection.getSelectionEnd(this[0])},getSelectedText:function(){return Selection.getSelectedText(this[0])},setSelectionRange:function(g,a){return this.each(function(){Selection.setSelectionRange(this,g,a)})},insertText:function(g,a,b,c){return this.each(function(){Selection.insertText(this,g,a,
+b,c)})},replaceSelectedText:function(g,a){return this.each(function(){Selection.replaceSelectedText(this,g,a)})},wrapSelectedText:function(g,a,b){return this.each(function(){Selection.wrapSelectedText(this,g,a,b)})}})})(jQuery);(function(e){var g={creole:{link:["[[","link text","]]"],bold:["**","bold text","**"],italic:["//","italic text","//"],ul:["* ","list item","",true],ol:["# ","list item","",true],h1:["= ","headline","",true],h2:["== ","headline","",true],h3:["=== ","headline","",true],sub:["~~","subscript","~~"],sup:["^^","superscript","^^"],del:["--","deleted text","--"],ins:["++","inserted text","++"],image:["{{","image","}}"],preformatted:["{{{","preformatted","}}}"]},markdown:{link:function(a){return(a=prompt("link target:",
 a))?["[","link text","]("+a+")"]:null},bold:["**","bold text","**"],italic:["*","italic text","*"],ul:["* ","list item","",true],ol:["1. ","list item","",true],h1:["","headline","\n========",true],h2:["","headline","\n--------",true],image:function(a){return(a=prompt("image path:",a))?["![","image alt text","]("+a+")"]:null},preformatted:["    ","preformatted","",true]},orgmode:{bold:["*","bold text","*"],italic:["/","italic text","/"],ul:["- ","list item",""],ol:["1. ","list item",""],h1:["* ","headline",
 ""],h2:["** ","headline",""],h3:["*** ","headline",""]},textile:{link:function(a){return(a=prompt("link target:",a))?['"',"link text",'":'+a]:null},bold:["*","bold text","*"],italic:["_","italic text","_"],ul:["* ","list item","",true],ol:["# ","list item","",true],h1:["h1. ","headline","",true],h2:["h2. ","headline","",true],h3:["h3. ","headline","",true],em:["_","emphasized text","_"],sub:["~","subscript","~"],sup:["^","superscript","^"],del:["-","deleted text","-"],ins:["+","inserted text","+"],
-image:["!","image","!"]}};i.fn.markupEditor=function(a){if(a=f[a]){var b=i('<ul class="button-bar" id="markup-editor"/>'),c=[];for(k in a)c.push(k);c.sort();for(var d=0;d<c.length;++d)b.append('<li><a href="#" id="markup-editor-'+c[d]+'">'+c[d]+"</a></li>");this.before(b);var g=this;i("a",b).click(function(){var h=a[this.id.substr(14)],l=g.getSelectedText();if(typeof h=="function")h=h(l);if(h){var e=g.getSelectionRange(),j=h[0],n=h[1],m=h[2];if(h[3]){g.setSelectionRange(e.start-1,e.start);if(e.start!==
-0&&g.getSelectedText()!="\n")j="\n"+j;g.setSelectionRange(e.end,e.end+1);if(g.getSelectedText()!="\n")m+="\n"}if(e.start==e.end){g.insertText(j+n+m,e.start,e.start,false);g.setSelectionRange(e.start+j.length,e.start+j.length+n.length)}else g.insertText(j+l+m,e.start,e.end,false)}return false})}}})(jQuery);if(window.Olelo){var mime=Olelo.page_mime;if(mime=="application/x-empty"||mime=="inode/directory")mime=Olelo.default_mime;var match=/text\/x-(\w+)/.exec(mime);match&&$("#edit-content").markupEditor(match[1])};
+image:["!","image","!"]}};e.fn.markupEditor=function(a){if(a=g[a]){var b=e('<ul class="button-bar" id="markup-editor"/>'),c=[];for(k in a)c.push(k);c.sort();for(var d=0;d<c.length;++d)b.append('<li><a href="#" id="markup-editor-'+c[d]+'">'+c[d]+"</a></li>");this.before(b);var h=this;e("a",b).click(function(){var i=a[this.id.substr(14)],l=h.getSelectedText();if(typeof i=="function")i=i(l);if(i){var f=h.getSelectionRange(),j=i[0],n=i[1],m=i[2];if(i[3]){h.setSelectionRange(f.start-1,f.start);if(f.start!==
+0&&h.getSelectedText()!="\n")j="\n"+j;h.setSelectionRange(f.end,f.end+1);if(h.getSelectedText()!="\n")m+="\n"}if(f.start==f.end){h.insertText(j+n+m,f.start,f.start,false);h.setSelectionRange(f.start+j.length,f.start+j.length+n.length)}else h.insertText(j+l+m,f.start,f.end,false)}return false})}}})(jQuery);$(function(){var e=Olelo.page_mime;if(e=="application/x-empty"||e=="inode/directory")e=Olelo.default_mime;(e=/text\/x-(\w+)/.exec(e))&&$("#edit-content").markupEditor(e[1])});

data/plugins/editor/markup/script/init.js

@@ -1,10 +1,10 @@
-if (window.Olelo) {
+$(function() {
     var mime = Olelo.page_mime;
     if (mime == 'application/x-empty' || mime == 'inode/directory') {
-        mime = Olelo.default_mime;
+	mime = Olelo.default_mime;
     }
     var match = /text\/x-(\w+)/.exec(mime);
     if (match) {
 	$('#edit-content').markupEditor(match[1]);
     }
-}
+});

data/plugins/editor/recaptcha.rb

@@ -1,11 +1,11 @@
-description 'reCAPTCHA support to avoid spamming'
+description 'Adds a reCAPTCHA to the editor to avoid spamming'
 require 'net/http'
 
 RECAPTCHA_PUBLIC = Config['recaptcha.public']
 RECAPTCHA_PRIVATE = Config['recaptcha.private']
 
 class ::Olelo::Application
-  hook :script do
+  hook :head do
     %{<script type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js"/>
 <script type="text/javascript">
   $(function() {

data/plugins/filters/interwiki.rb

@@ -9,7 +9,6 @@ class Interwiki < Filter
 
   def filter(context, content)
     content.gsub!(@regexp) do
-      wiki, page = $1, $2
       %{href="#{escape_html @map[$1]}#{$2}"}
     end
     content

data/plugins/gallery/main.rb

@@ -9,7 +9,7 @@ Aspects::Aspect.create(:gallery, :priority => 3, :layout => true, :hidden => tru
     per_page = @per_row * 4
     @page_nr = [context.params[:page].to_i, 1].max
     @page = page
-    @images = @page.children.select {|page| page.mime.image? }
+    @images = @page.children.select {|p| p.mime.image? }
     @page_count = @images.size / per_page + 1
     @images = @images[((@page_nr - 1) * per_page) ... (@page_nr * per_page)].to_a
     render :gallery

data/plugins/login/persistent.rb

@@ -8,7 +8,7 @@ class ::Olelo::Application
     if !User.current
       token = request.cookies[TOKEN_NAME]
       if token
-        user, hash = token.split('-', 2)
+        hash, user = token.split('-', 2)
         User.current = User.find(user) if sha256(user + Config['rack.session_secret']) == hash
       end
     end
@@ -22,7 +22,7 @@ class ::Olelo::Application
   after :action do |method, path|
     if path == '/login'
       if User.logged_in? && params[:persistent]
-        token = "#{User.current.name}-#{sha256(User.current.name + Config['rack.session_secret'])}"
+        token = "#{sha256(User.current.name + Config['rack.session_secret'])}-#{User.current.name}"
         response.set_cookie(TOKEN_NAME, :value => token, :expires => Time.now + TOKEN_LIFETIME)
       end
     elsif path == '/logout'

data/plugins/misc/fancybox/script.js

@@ -34,4 +34,4 @@ if(h.opacity)n.opacity=1;o.empty().hide();D.prop=1;a(D).animate({prop:0},{durati
 j.append(k=a('<div id="fancybox-content"></div>'),w=a('<a id="fancybox-close"></a>'),o=a('<div id="fancybox-title"></div>'),x=a('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),C=a('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));w.click(a.fancybox.close);f.click(a.fancybox.cancel);x.click(function(c){c.preventDefault();a.fancybox.prev()});C.click(function(c){c.preventDefault();a.fancybox.next()});
 a.fn.mousewheel&&d.bind("mousewheel.fb",function(c,g){if(m)c.preventDefault();else if(a(c.target).get(0).clientHeight==0||a(c.target).get(0).scrollHeight===a(c.target).get(0).clientHeight){c.preventDefault();a.fancybox[g>0?"prev":"next"]()}});a.support.opacity||d.addClass("fancybox-ie");if(M){f.addClass("fancybox-ie6");d.addClass("fancybox-ie6");a('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(j)}}};
 a.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",
-easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};a(document).ready(function(){a.fancybox.init()})})(jQuery);(function(){function a(){$("a.fancybox").each(function(){var b=this.href.replace(/aspect=\w+/g,"");this.href=b+(b.indexOf("?")<0?"?":"&")+"aspect=image&geometry=800x800>"});$("a.fancybox").fancybox({transitionIn:"none",transitionOut:"none",titlePosition:"over",titleFormat:function(b,f,e){return'<span id="fancybox-title-over">'+(e+1)+" / "+f.length+" "+(b?b:"")+"</span>"}})}$("#content").bind("pageLoaded",a);a()})();
+easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};a(document).ready(function(){a.fancybox.init()})})(jQuery);$(function(){function a(){$("a.fancybox").each(function(){var b=this.href.replace(/aspect=\w+/g,"");this.href=b+(b.indexOf("?")<0?"?":"&")+"aspect=image&geometry=800x800>"});$("a.fancybox").fancybox({transitionIn:"none",transitionOut:"none",titlePosition:"over",titleFormat:function(b,f,e){return'<span id="fancybox-title-over">'+(e+1)+" / "+f.length+" "+(b?b:"")+"</span>"}})}$("#content").bind("pageLoaded",a);a()});

data/plugins/misc/fancybox/script/init.js

@@ -1,4 +1,4 @@
-(function() {
+$(function() {
     function initFancybox() {
         $('a.fancybox').each(function() {
             var href = this.href.replace(/aspect=\w+/g, '');
@@ -15,4 +15,4 @@
 
     $('#content').bind('pageLoaded', initFancybox);
     initFancybox();
-})();
+});

data/plugins/misc/variables.rb

@@ -2,7 +2,7 @@ description  'Export variables to context and javascript'
 dependencies 'aspects'
 
 def self.exported_variables(page)
-  vars = {
+  {
     'base_path'             => Config['base_path'],
     'page_name'             => page.name,
     'page_new'              => page.new?,
@@ -23,7 +23,7 @@ Aspects::Context.hook(:initialized) do
 end
 
 # Export variables to javascript for client extensions
-Application.hook :head do
+Application.hook :head, 1 do
   vars = page ? params.merge(PLUGIN.exported_variables(page)) : params
   vars = vars.merge('user_logged_in' => !User.logged_in?, 'user_name' => User.current.name)
   %{<script type="text/javascript">Olelo = #{escape_javascript(vars.to_json)};</script>}

data/plugins/tags/math.rb

@@ -1,4 +1,4 @@
-description  'Math tag for LaTeX rendering'
+description  'Wiki tags for TeX math rendering'
 dependencies 'utils/image_magick'
 
 class MathRenderer
@@ -98,18 +98,17 @@ Tag.define :math, :optional => 'display' do |context, attrs, code|
 end
 
 class ::Olelo::Application
-  hook :script do
+  hook :head do
     if page && Config['math_renderer'] == 'mathjax'
       %{<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"/>}
     end
   end
 
-  get '/_/blahtex/:name', :name => /[\w\.]+/ do
+  get '/_/blahtex/:name', :name => /\w+\.\w+/ do
     begin
-      response['Content-Type'] = 'image/png'
-      file = File.join(Config['blahtex_directory'], params[:name])
-      response['Content-Length'] ||= File.stat(file).size.to_s
-      halt BlockFile.open(file, 'rb')
+      file = Rack::File.new(nil)
+      file.path = File.join(Config['blahtex_directory'], params[:name])
+      file.serving(env)
     rescue => ex
       ImageMagick.label(ex.message)
     end

data/plugins/tags/scripting.rb

@@ -1,4 +1,4 @@
-description  'Scripting tags'
+description  'Wiki syntax tags for scripting'
 require 'evaluator'
 
 Tag.define :value, :requires => 'of', :immediate => true, :description => 'Print value' do |context, attrs|

data/plugins/tags/tabs.rb

@@ -1,4 +1,4 @@
-description 'Tabs'
+description 'Wiki syntax tag for tabs'
 
 Tag.define :tabs do |context, attrs, content|
   tabs = context[:tabs] = []

data/plugins/treeview/script.js

@@ -1,5 +1,5 @@
 (function(c){c.fn.treeView=function(a){function l(b,e){if(a.stateStore){var d=jStorage.get(a.stateStore,[]);if(e)c.inArray(b,d)<0&&d.push(b);else d=c.grep(d,function(f){return f!=b});jStorage.set(a.stateStore,d)}}function m(b){var e=b[2],d=c('<li><div class="'+(b[0]?"hitarea collapsed":"placeholder")+'"><div class="arrow"/><div class="'+b[1]+'"/></div><a href="'+e+'">'+b[3]+"</a></li>"),f=d.children(".hitarea");d.data("name",b[3]);f.click(function(){if(f.hasClass("collapsed")){n(d,e);f.removeClass("collapsed").addClass("expanded")}else{d.children("ul").hide();
 f.removeClass("expanded").addClass("collapsed")}l(e,f.hasClass("expanded"));return false});if(a.stateStore&&c.inArray(e,jStorage.get(a.stateStore,[]))>=0){n(d,e);f.removeClass("collapsed").addClass("expanded")}return d}function n(b,e){function d(i){var j=c("<ul/>");c.each(i,function(o,k){j.append(m(k))});e==a.root&&b.empty();b.children("ul").remove();b.append(j)}function f(i){g&&jStorage.set(g,i);var j={},o=[];c.each(i,function(k,h){j[h[3]]=h});c("> ul > li",b).each(function(){var k=c(this),h=k.data("name");
 if(j[h])delete j[h];else k.remove();o.push(c(this))});c.each(j,function(k,h){var p=false;c.each(o,function(t,q){if(k<q.data("name")){p=true;q.before(m(h));return false}});p||b.children("ul").append(m(h))})}function r(){setTimeout(function(){a.ajax(e,f,function(){g&&jStorage.remove(g)})},a.delay)}var g=a.cacheStore?a.cacheStore+":"+e:null;if(b.children("ul").length!==0){b.children("ul").show();r()}else{var s=g?jStorage.get(g):null;if(s){d(s);r()}else{b.addClass("wait");a.ajax(e,function(i){b.removeClass("wait");
-d(i);g&&jStorage.set(g,i)},function(){b.removeClass("wait")})}}}a||(a={});if(!a.root)a.root="/";if(!a.url)a.url="/treeview.json";if(!a.delay)a.delay=2E3;if(!a.ajax)a.ajax=function(b,e,d){c.ajax({url:a.url,data:{dir:b},success:e,error:d,dataType:"json"})};this.each(function(){n(c(this),a.root)})}})(jQuery);$.translations({en:{menu:"Menu",tree:"Tree"},de:{menu:"Men\u00fc",tree:"Baumansicht"},cs:{menu:"Menu",tree:"Strom"}});$("#sidebar").wrapInner('<div id="sidebar-menu"/>').prepend('<div id="sidebar-tree" style="display: none"><h1>'+$.t("tree")+'</h1><div id="treeview"/></div>');$("#menu").prepend('<ul><li class="selected" id="sidebar-tab-menu"><a href="#sidebar-menu">'+$.t("menu")+'</a></li><li id="sidebar-tab-tree"><a href="#sidebar-tree">'+$.t("tree")+"</a></li></ul>");$("#sidebar-tab-menu, #sidebar-tab-tree").tabWidget({store:"sidebar-tab"});
-$("#treeview").treeView({stateStore:"treeview-state",cacheStore:"treeview-cache",root:Olelo.base_path,ajax:function(c,a,l){$.ajax({url:c,data:{aspect:"treeview.json"},success:a,error:l,dataType:"json"})}});
+d(i);g&&jStorage.set(g,i)},function(){b.removeClass("wait")})}}}a||(a={});if(!a.root)a.root="/";if(!a.url)a.url="/treeview.json";if(!a.delay)a.delay=2E3;if(!a.ajax)a.ajax=function(b,e,d){c.ajax({url:a.url,data:{dir:b},success:e,error:d,dataType:"json"})};this.each(function(){n(c(this),a.root)})}})(jQuery);$(function(){$.translations({en:{menu:"Menu",tree:"Tree"},de:{menu:"Men\u00fc",tree:"Baumansicht"},cs:{menu:"Menu",tree:"Strom"}});$("#sidebar").wrapInner('<div id="sidebar-menu"/>').prepend('<div id="sidebar-tree" style="display: none"><h1>'+$.t("tree")+'</h1><div id="treeview"/></div>');$("#menu").prepend('<ul><li class="selected" id="sidebar-tab-menu"><a href="#sidebar-menu">'+$.t("menu")+'</a></li><li id="sidebar-tab-tree"><a href="#sidebar-tree">'+$.t("tree")+"</a></li></ul>");$("#sidebar-tab-menu, #sidebar-tab-tree").tabWidget({store:"sidebar-tab"});
+$("#treeview").treeView({stateStore:"treeview-state",cacheStore:"treeview-cache",root:Olelo.base_path,ajax:function(c,a,l){$.ajax({url:c,data:{aspect:"treeview.json"},success:a,error:l,dataType:"json"})}})});

data/plugins/treeview/script/init.js

@@ -1,25 +1,27 @@
-// Add treeview translations
-$.translations({
-    en: {
-      menu: 'Menu',
-      tree: 'Tree'
-    },
-    de: {
-      menu: 'Menü',
-      tree: 'Baumansicht'
-    },
-    cs: {
-      menu: 'Menu',
-      tree: 'Strom'
-    }
-});
+$(function() {
+    // Add treeview translations
+    $.translations({
+	en: {
+	    menu: 'Menu',
+	    tree: 'Tree'
+	},
+	de: {
+	    menu: 'Menü',
+	    tree: 'Baumansicht'
+	},
+	cs: {
+	    menu: 'Menu',
+	    tree: 'Strom'
+	}
+    });
 
-// Start tree view
-$('#sidebar').wrapInner('<div id="sidebar-menu"/>').prepend('<div id="sidebar-tree" style="display: none"><h1>' + $.t('tree') +
-                                                            '</h1><div id="treeview"/></div>');
-$('#menu').prepend('<ul><li class="selected" id="sidebar-tab-menu"><a href="#sidebar-menu">' + $.t('menu') +
-                   '</a></li><li id="sidebar-tab-tree"><a href="#sidebar-tree">' + $.t('tree') + '</a></li></ul>');
-$('#sidebar-tab-menu, #sidebar-tab-tree').tabWidget({store: 'sidebar-tab'});
-$('#treeview').treeView({stateStore: 'treeview-state', cacheStore: 'treeview-cache', root: Olelo.base_path, ajax: function(path, success, error) {
-    $.ajax({url: path, data: { aspect: 'treeview.json' }, success: success, error: error, dataType: 'json'});
-}});
+    // Start tree view
+    $('#sidebar').wrapInner('<div id="sidebar-menu"/>').prepend('<div id="sidebar-tree" style="display: none"><h1>' + $.t('tree') +
+								'</h1><div id="treeview"/></div>');
+    $('#menu').prepend('<ul><li class="selected" id="sidebar-tab-menu"><a href="#sidebar-menu">' + $.t('menu') +
+                       '</a></li><li id="sidebar-tab-tree"><a href="#sidebar-tree">' + $.t('tree') + '</a></li></ul>');
+    $('#sidebar-tab-menu, #sidebar-tab-tree').tabWidget({store: 'sidebar-tab'});
+    $('#treeview').treeView({stateStore: 'treeview-state', cacheStore: 'treeview-cache', root: Olelo.base_path, ajax: function(path, success, error) {
+	$.ajax({url: path, data: { aspect: 'treeview.json' }, success: success, error: error, dataType: 'json'});
+    }});
+});

data/plugins/utils/assets.rb

@@ -10,20 +10,20 @@ class ::Olelo::Application
 
   attr_reader? :disable_assets
 
-  hook :script, 1 do
+  hook :head, 2 do
+    return if disable_assets?
     js = Application.scripts['js']
-    if js && !disable_assets?
-      path = build_path "_/assets/assets.js?#{js.first.to_i}"
-      %{<script src="#{escape_html path}" type="text/javascript"/>}
-    end
-  end
-
-  hook :head, 1 do
     css = Application.scripts['css']
-    if css && !disable_assets?
+    result = ''
+    if css
       path = build_path "_/assets/assets.css?#{css.first.to_i}"
-      %{<link rel="stylesheet" href="#{escape_html path}" type="text/css"/>}
+      result << %{<link rel="stylesheet" href="#{escape_html path}" type="text/css"/>}
+    end
+    if js
+      path = build_path "_/assets/assets.js?#{js.first.to_i}"
+      result << %{<script src="#{escape_html path}" type="text/javascript"/>}
     end
+    result
   end
 
   get "/_/assets/assets.:type", :type => 'js|css' do
@@ -39,10 +39,16 @@ class ::Olelo::Application
 
   get "/_/assets/:name", :name => '.*' do
     if asset = Application.assets[params[:name]]
-      cache_control :last_modified => asset.mtime, :max_age => :static
-      response['Content-Type'] = asset.mime.to_s
-      response['Content-Length'] = asset.size.to_s
-      halt asset.open
+      if path = asset.real_path
+        file = Rack::File.new(nil)
+        file.path = path
+        file.serving(env)
+      else
+        cache_control :last_modified => asset.mtime, :max_age => :static
+        response['Content-Type'] = (MimeMagic.by_path(asset.name) || 'application/octet-stream').to_s
+        response['Content-Length'] = asset.size.to_s
+        asset.read
+      end
     else
       :not_found
     end

data/views/layout.slim

@@ -33,4 +33,3 @@ html.no-js lang=Olelo::Config['locale'].sub('_', '-') class={page && !page.head?
       .noprint.powered_by
         ' Powered by
         a href='http://github.com/minad/olelo' Ōlelo
-      = script

data/views/login.slim

@@ -1,6 +1,7 @@
 - title :login.t
+- signup_enabled = Olelo::Config['authentication.enable_signup'] && Olelo::User.supports?(:signup)
 p
-  = Olelo::Config['authentication.enable_signup'] ? tabs(:login, :signup) : tabs(:login)
+  = signup_enabled ? tabs(:login, :signup) : tabs(:login)
   form action=build_path(:login) method='post'
     #tab-login.tab.fieldset
       h2 Login
@@ -15,7 +16,7 @@ p
         = render_block :login_buttons do
           button&submit= :login.t
       br
-  - if Olelo::Config['authentication.enable_signup']
+  - if signup_enabled
     form action=build_path(:signup) method='post'
       #tab-signup.tab.fieldset
         h2= :signup.t

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &9036000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *9036000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &9035100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *9035100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &9034140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *9034140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &9114880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +69,31 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *9114880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: mimemagic
-  requirement: &9114140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *9114140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &9113600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +101,31 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *9113600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &9112980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *9112980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &9111460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,31 @@ dependencies:
         version: 0.17.0b6
   type: :runtime
   prerelease: false
-  version_requirements: *9111460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.17.0b6
+- !ruby/object:Gem::Dependency
+  name: evaluator
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9110780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,18 +165,60 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *9110780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &9110120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *9110120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 description: Olelo is a git-based wiki which supports many markup languages, tags,
   embedded TeX and much more. It can be extended through plugins.
 email:
@@ -133,7 +231,8 @@ files:
 - .gitignore
 - .gitmodules
 - Gemfile
-- README.markdown
+- LICENSE
+- README.creole
 - Rakefile
 - bin/olelo
 - config.ru
@@ -142,8 +241,6 @@ files:
 - config/initializers/00-mime_types.rb
 - config/initializers/01-slim.rb
 - config/interwiki.yml
-- doc/AUTHORS
-- doc/LICENSE
 - lib/olelo.rb
 - lib/olelo/application.rb
 - lib/olelo/attributes.rb
@@ -169,14 +266,8 @@ files:
 - lib/olelo/util.rb
 - lib/olelo/version.rb
 - lib/olelo/virtualfs.rb
-- lib/rack/olelo_patches.rb
 - lib/rack/relative_redirect.rb
 - lib/rack/static_cache.rb
-- lib/yard/addons.rb
-- lib/yard/addons/hook_handler.rb
-- lib/yard/addons/override_tag.rb
-- lib/yard/addons/route_handler.rb
-- lib/yard/addons/sanitize_anchor.rb
 - olelo.gemspec
 - plugins/aspects/changelog.rb
 - plugins/aspects/documentbrowser.rb
@@ -197,6 +288,8 @@ files:
 - plugins/blog/blog.scss
 - plugins/blog/locale.yml
 - plugins/blog/main.rb
+- plugins/editor/ace/init.js
+- plugins/editor/ace/main.rb
 - plugins/editor/locale.yml
 - plugins/editor/markup/main.rb
 - plugins/editor/markup/script.js
@@ -432,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: olelo
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Olelo is a git-based wiki.