olelo 0.9.8 → 0.9.9

data/plugins/aspects/source.rb

@@ -1,6 +1,18 @@
+# -*- coding: utf-8 -*-
 description 'Source aspect'
 
 Aspect.create(:source, priority: 3, layout: true, cacheable: true) do
   def accepts?(page); page.mime.text?; end
   def call(context, page); "<pre>#{escape_html page.content}</pre>"; end
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  aspect_source: 'Zdroj stránky'
+de:
+  aspect_source: 'Quellcode'
+en:
+  aspect_source: 'Page Source'
+fr:
+  aspect_source: "Source de la page"

data/plugins/aspects/subpages.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description 'Subpages aspect'
 
 Aspect.create(:subpages, priority: 2, layout: true, cacheable: true) do
@@ -15,7 +16,7 @@ end
 __END__
 @@ subpages.slim
 = pagination(@page, @page_count, @page_nr, aspect: 'subpages')
-table#subpages-table
+table#subpages
   thead
     tr
       th= :name.t
@@ -42,3 +43,18 @@ table#subpages-table
           a.action-move href=build_path(child, action: :move) title=:move.t = :move.t
           a.action-delete href=build_path(child, action: :delete) title=:delete.t = :delete.t
 = pagination(@page, @page_count, @page_nr, aspect: 'subpages')
+
+__END__
+@@ locale.yml
+cs_CZ:
+  aspect_subpages: 'Podstránky'
+  author:          'Autor'
+de:
+  aspect_subpages: 'Unterseiten'
+  author:          'Autor'
+en:
+  aspect_subpages: 'Subpages'
+  author:          'Author'
+fr:
+  aspect_subpages: "Sous-pages"
+  author:          "Auteur"

data/plugins/aspects/text.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description 'Text aspect'
 
 Aspect.create(:text, mime: 'text/plain; charset=utf-8') do
@@ -7,3 +8,14 @@ Aspect.create(:text, mime: 'text/plain; charset=utf-8') do
     page.content
   end
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  aspect_text: 'Stažení textu'
+de:
+  aspect_text: 'Quellcode herunterladen'
+en:
+  aspect_text: 'Text Download'
+fr:
+  aspect_text: "Téléchargement en texte"

data/plugins/blog/main.rb

@@ -15,7 +15,7 @@ Tags::Tag.define 'menu', optional: 'path', description: 'Show blog menu', dynami
       page.children.each do |child|
         (years[child.version.date.year] ||= [])[child.version.date.month] = true
       end
-      render :menu, locals: {years: years, page: page}
+      render :blog_menu, locals: {years: years, page: page}
     end
   end
 end
@@ -53,12 +53,12 @@ Aspects::Aspect.create(:blog, priority: 3, layout: true, cacheable: true, hidden
       end
       [article, content]
     end
-    render :blog, locals: {full: context.params[:full]}
+    render :blog_page, locals: {full: context.params[:full]}
   end
 end
 
 __END__
-@@ blog.slim
+@@ blog_page.slim
 - if @articles.empty?
   .error= :no_articles.t
 - else
@@ -73,7 +73,7 @@ __END__
         - if !full
           a.full href=build_path(page.path) = :full_article.t
 = pagination(@page, @page_count, @page_nr, aspect: 'blog')
-@@ menu.slim
+@@ blog_menu.slim
 table.blog-menu
   - years.keys.sort.each do |year|
     tr

data/plugins/editor/preview.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description  'Enhance editor form with preview and diff'
 dependencies 'aspects'
 
@@ -50,3 +51,18 @@ class ::Olelo::Application
     halt render(request.xhr? ? flash.now[:changes] : :edit)
   end
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  changes: 'Změny'
+  preview: 'Náhled'
+de:
+  changes: 'Änderungen'
+  preview: Vorschau
+en:
+  changes: Changes
+  preview: Preview
+fr:
+  changes: "Changement"
+  preview: "Prévisualisez"

data/plugins/editor/recaptcha.rb

@@ -58,3 +58,22 @@ class ::Olelo::Application
     end
   end
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  captcha_invalid: 'Neplatný captcha kód'
+  captcha_valid: 'Platný captcha kód'
+  enter_captcha: 'Vložte laskavě captcha kód.'
+de:
+  captcha_invalid: 'Ungültiges Captcha'
+  captcha_valid: 'Gültiges Captcha'
+  enter_captcha: 'Bitte geben Sie ein Captcha ein.'
+en:
+  captcha_invalid: Invalid captcha
+  captcha_valid: Valid captcha
+  enter_captcha: 'Please enter the captcha.'
+fr:
+  captcha_invalid: "Captcha invalide"
+  captcha_valid: "Captcha valide"
+  enter_captcha: "Veuillez entrer le captcha."

data/plugins/filters/editsection.rb

@@ -65,3 +65,22 @@ class EditSection < Filters::NestingFilter
 end
 
 Filters::Filter.register :editsection, EditSection
+
+__END__
+@@ locale.yml
+cs_CZ:
+  attribute_no_editsection: 'Zablokovat editaci sekcí'
+  edit_section: 'Edituj sekci "%{section}"'
+  section_edited: 'Sekce "%{section}" editována'
+de:
+  attribute_no_editsection: 'Bearbeiten von Bereichen deaktivieren'
+  edit_section: 'Bearbeite Bereich "%{section}"'
+  section_edited: 'Bereich "%{section}" bearbeitet'
+en:
+  attribute_no_editsection: 'Disable Section Editing'
+  edit_section: 'Edit section "%{section}"'
+  section_edited: 'Section "%{section}" edited'
+fr:
+  attribute_no_editsection: "Désactiver l'édition"
+  edit_section: "Éditer la section \"%{section}\""
+  section_edited: "Section \"%{section}\" éditée"

data/plugins/filters/locale.yml

@@ -1,20 +1,15 @@
 cs_CZ:
-  attribute_no_editsection: 'Zablokovat editaci sekcí'
-  attribute_toc: 'Vytvořit obsah'
-  edit_section: 'Edituj sekci "%{section}"'
-  section_edited: 'Sekce "%{section}" editována'
+  aspect_latex: 'LaTeX'
+  aspect_page: 'Stránce'
 de:
-  attribute_no_editsection: 'Bearbeiten von Bereichen deaktivieren'
-  attribute_toc: 'Inhaltsverzeichnis erzeugen'
-  edit_section: 'Bearbeite Bereich "%{section}"'
-  section_edited: 'Bereich "%{section}" bearbeitet'
+  aspect_latex: 'LaTeX'
+  aspect_page: 'Seite'
+  aspect_s5: 'S5 Präsentation'
 en:
-  attribute_no_editsection: 'Disable Section Editing'
-  attribute_toc: 'Generate Table of Contents'
-  edit_section: 'Edit section "%{section}"'
-  section_edited: 'Section "%{section}" edited'
+  aspect_latex: 'LaTeX'
+  aspect_page: 'Page'
+  aspect_s5: 'S5 Presentation'
 fr:
-  attribute_no_editsection: "Désactiver l'édition"
-  attribute_toc: "Générer Table des Matières"
-  edit_section: "Éditer la section \"%{section}\""
-  section_edited: "Section \"%{section}\" éditée"
+  aspect_latex: "LaTeX"
+  aspect_page: "Page"
+  aspect_s5: "Presentation S5"

data/plugins/filters/toc.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description  'Auto-generated table of contents'
 dependencies 'utils/xml'
 
@@ -48,3 +49,14 @@ Filter.create :toc do |context, content|
 
   toc + doc.to_xhtml
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  attribute_toc: 'Vytvořit obsah'
+de:
+  attribute_toc: 'Inhaltsverzeichnis erzeugen'
+en:
+  attribute_toc: 'Generate Table of Contents'
+fr:
+  attribute_toc: "Générer Table des Matières"

data/{views → plugins/history}/compare.slim

@@ -1,7 +1,7 @@
 - title :compare.t(name: page.title, from: @diff.from.short, to: @diff.to.short)
 = define_block :from do
   a.version href=build_path(page, version: @diff.from) = @diff.from.short
-=  define_block :to do
+= define_block :to do
   a.version href=build_path(page, version: @diff.to) = @diff.to.short
-h1== :compare.t(name: escape_html(page.title), from: blocks[:from], to: blocks[:to])
+h1== :compare.t(name: escape_html(page.title), from: render_block(:from), to: render_block(:to))
 = format_diff(@diff)

data/{views → plugins/history}/history.slim

@@ -1,7 +1,7 @@
 - title :history_of.t(page: page.title)
 h1= title
 = pagination(page, @page_count, @page_nr, action: :history, unlimited: true)
-table#history-table
+table#history
   thead
     tr
       th= :comment.t

data/plugins/history/locale.yml

@@ -0,0 +1,40 @@
+cs_CZ:
+  author:                 'Autor'
+  changes:                'Změny'
+  changes_of:             'Změny stránky %{page}'
+  compare:                'Porovnat %{name}: %{from} → %{to}'
+  date:                   'Datum'
+  history_of:             'Historie stránky %{page}'
+  menu_actions_history:   'Historie'
+  menu_actions_history_head: 'Aktuální'
+  menu_actions_history_newer: 'Novější'
+  menu_actions_history_older: 'Starší'
+  parents:                'Rodiče'
+de:
+  author:                 'Autor'
+  changes:                'Änderungen'
+  changes_of:             'Änderungen von %{page}'
+  compare:                'Vergleiche %{name}: %{from} → %{to}'
+  date:                   'Datum'
+  history_of:             'Historie von %{page}'
+  menu_actions_history:   'Historie'
+  menu_actions_history_newer: 'Neuer'
+  menu_actions_history_older: 'Älter'
+  parents:                'Eltern'
+en:
+  author:                 'Author'
+  changes:                'Changes'
+  changes_of:             'Changes of %{page}'
+  compare:                'Compare %{name}: %{from} → %{to}'
+  date:                   'Date'
+  history_of:             'History of %{page}'
+  parents:                'Parents'
+fr:
+  author:                 "Auteur"
+  changes:                "Changement"
+  changes_of:             "Chamgements de %{page}"
+  compare:                "Comparer %{name}: %{from} → %{to}"
+  date:                   "Date"
+  history_of:             "Historique de %{page}"
+  menu_actions_history_newer: "Plus récent"
+  parents:                "Parents"

data/plugins/history/main.rb

@@ -0,0 +1,67 @@
+description 'History menu'
+dependencies 'utils/assets'
+export_scripts '*.js'
+
+class ::Olelo::Application
+  get '/compare/:versions(/:path)', versions: '(?:\w+)\.{2,3}(?:\w+)' do
+    @page = Page.find!(params[:path])
+    versions = params[:versions].split(/\.{2,3}/)
+    begin
+      @diff = page.diff(versions.first, versions.last)
+    rescue => ex
+      Olelo.logger.debug ex
+      raise NotFound
+    end
+    render :compare
+  end
+
+  get '/compare(/:path)' do
+    versions = params[:versions] || []
+    redirect build_path(params[:path], action: versions.size < 2 ? :history : "compare/#{versions.first}...#{versions.last}")
+  end
+
+  get '/changes/:version(/:path)' do
+    @page = Page.find!(params[:path])
+    begin
+      @diff = page.diff(nil, params[:version])
+    rescue => ex
+      Olelo.logger.debug ex
+      raise NotFound
+    end
+    @version = @diff.to
+    cache_control etag: @version.to_s
+    render :changes
+  end
+
+  get '/history(/:path)' do
+    per_page = 30
+    @page = Page.find!(params[:path])
+    @page_nr = [params[:page].to_i, 1].max
+    @history = page.history((@page_nr - 1) * per_page, per_page + 1)
+    @page_count = @page_nr + (@history.length > per_page ? 1 : 0)
+    @history = @history[0...per_page]
+    cache_control etag: page.etag
+    render :history
+  end
+
+  before :action do |method, path|
+    @history_versions_menu = method == :get && (path == '/version/:version(/:path)' || path == '/(:path)')
+  end
+
+  hook :menu do |menu|
+    if menu.name == :actions && page && !page.new?
+      history_menu = menu.item(:history, href: build_path(page, action: :history), accesskey: 'h')
+
+      if @history_versions_menu
+        head = !page.head? && (Olelo::Page.find(page.path) rescue nil)
+        if page.previous_version || head || page.next_version
+          history_menu.item(:older, href: build_path(page, original_params.merge(version: page.previous_version)),
+                            accesskey: 'o') if page.previous_version
+          history_menu.item(:head, href: build_path(page.path, original_params), accesskey: 'c') if head
+          history_menu.item(:newer, href: build_path(page, original_params.merge(version: page.next_version)),
+                            accesskey: 'n') if page.next_version
+        end
+      end
+    end
+  end
+end

data/plugins/history/script.js

@@ -0,0 +1,2 @@
+(function(a){a.fn.historyTable=function(){function f(){var b=[];g.each(function(){this.checked&&b.push(this.name)});return b}a("thead tr",this).prepend('<th class="compare"><button>&#177;</button></th>');a("tbody tr",this).each(function(){var b=a(this).attr("id").substr(8);a(this).prepend('<td class="compare"><input type="checkbox" name="'+b+'"/></td>')});var c=a.storage.get("historyTable");if(c)for(var d=0;d<c.length;++d)a("input[name="+c[d]+"]").attr("checked","checked");var g=a("tbody input",this),
+e=a("th button",this);e.click(function(){var b=f();a.storage.set("historyTable",b);location.href=location.pathname.replace("/history","/compare/"+b[b.length-1]+"..."+b[0])});a("td input",this).change(function(){f().length>1?e.removeAttr("disabled"):e.attr("disabled","disabled")}).change()}})(jQuery);$(function(){$("#content").bind("pageLoaded",function(){$("#history",this).historyTable()});$("#history").historyTable()});

data/plugins/history/script/init.js

@@ -0,0 +1,7 @@
+$(function() {
+    "use strict";
+    $('#content').bind('pageLoaded', function pageLoaded() {
+        $('#history', this).historyTable();
+    });
+    $('#history').historyTable();
+});

data/plugins/login/persistent.rb

@@ -30,3 +30,14 @@ class ::Olelo::Application
     end
   end
 end
+
+__END__
+@@ locale.yml
+cs_CZ:
+  persistent_login:     'Trvalé přihlášení'
+de:
+  persistent_login:     'Dauerhaft anmelden'
+en:
+  persistent_login:     'Persistent login'
+fr:
+  persistent_login:     'Connexion persistente'

data/plugins/repositories/git_grep.rb

@@ -46,7 +46,7 @@ class ::Olelo::Application
       a[1].length == b[1].length ? a[0] <=> b[0] : b[1].length <=> a[1].length
     end.map {|path, content| [path, content.join] }
 
-    render :grep
+    render :git_grep
   end
 
   private
@@ -57,7 +57,7 @@ class ::Olelo::Application
 end
 
 __END__
-@@ grep.slim
+@@ git_grep.slim
 - title :search_results.t(pattern: params[:pattern])
 h1= title
 p= :match.t(count: @matches.length)
@@ -67,3 +67,20 @@ p= :match.t(count: @matches.length)
       h2
         a.name href=build_path(path) = emphasize(path)
       .content= emphasize(content)
+@@ locale.yml
+cs_CZ:
+  match:          'Jeden výsledek'
+  match_plural:   '%{count} výsledků'
+  search_results: 'Výsledky hledání pro %{pattern}'
+de:
+  match:          'Ein Treffer'
+  match_plural:   '%{count} Treffer'
+  search_results: 'Suchergebnisse für %{pattern}'
+en:
+  match:          'One match'
+  match_plural:   '%{count} matches'
+  search_results: 'Search results for %{pattern}'
+fr:
+  match:          "Une correspondance"
+  match_plural:   "%{count} correspondaces"
+  search_results: "Chercher les résultats pour %{pattern}"

data/plugins/repositories/gitrb_repository.rb

@@ -40,6 +40,7 @@ class GitrbRepository < Repository
 
   # @override
   def get_history(path, skip, limit)
+    check_path(path)
     @git.log(max_count:  limit, skip: skip,
              path: [path, path + ATTRIBUTE_EXT, path + CONTENT_EXT]).map do |c|
       commit_to_version(c)
@@ -48,6 +49,8 @@ class GitrbRepository < Repository
 
   # @override
   def get_path_version(path, version)
+    check_path(path)
+
     commits = @git.log(max_count:  2, start: version, path: [path, path + ATTRIBUTE_EXT, path + CONTENT_EXT])
 
     succ = nil
@@ -65,12 +68,14 @@ class GitrbRepository < Repository
 
   # @override
   def get_children(path, version)
+    check_path(path)
     object = get_object(path, version)
     object && object.type != :tree ? [] : object.names.reject {|name| reserved_name?(name) }
   end
 
   # @override
   def get_content(path, version)
+    check_path(path)
     tree = get_commit(version).tree
     object = tree[path]
     object = tree[path + CONTENT_EXT] if object && object.type == :tree
@@ -85,6 +90,7 @@ class GitrbRepository < Repository
 
   # @override
   def get_attributes(path, version)
+    check_path(path)
     object = get_object(path + ATTRIBUTE_EXT, version)
     object && object.type == :blob ? YAML.load(object.data) : {}
   end
@@ -129,6 +135,7 @@ class GitrbRepository < Repository
 
   # @override
   def delete(path)
+    check_path(path)
     @git.root.delete(path)
     @git.root.delete(path + CONTENT_EXT)
     @git.root.delete(path + ATTRIBUTE_EXT)
@@ -137,6 +144,7 @@ class GitrbRepository < Repository
 
   # @override
   def diff(path, from, to)
+    check_path(path)
     diff = @git.diff(from: from && from.to_s, to: to.to_s,
                     path: [path, path + CONTENT_EXT, path + ATTRIBUTE_EXT], detect_renames:  true)
     Diff.new(commit_to_version(diff.from), commit_to_version(diff.to), diff.patch)