motiro 0.6.10 → 0.6.11

data/app/views/account/_authorization.rhtml

@@ -6,29 +6,37 @@
                   :id => 'passwords_do_not_match', :class => 'warning',
                   :style=> 'display:none' %>
   <% form_tag :controller => 'account', :action=> 'login' do %>
-    <div class="authorization_cell">
-      <%= content_tag :label, 'User'.t, :for=> 'user_login'%><br />
-      <%= text_field 'user', 'login', :size => 12,
-                                      :value => flash[:desired_login] %>
-    </div>
-    <div class="authorization_cell">
-      <%= content_tag :label, 'Password'.t, :for=> 'user_password'%><br />
-      <%= password_field 'user', 'password', :size => 12 %>
-    </div>
-    <div id="password_confirm" class="authorization_cell" style="display: none;">
-      <%= content_tag :label, 'Confirmation'.t, :for=> 'user_password_confirmation'%>
-      <%= password_field 'user', 'password_confirmation',
-                         :size => 12,
-                         :disabled => true %>
-    </div>
-    <div class="authorization_cell">
-      <input type="checkbox" id="chk_new_user"
-             name="chk_new_user" class="checkbox"
-             onClick="tooglePasswordConfirmation(document.forms[0].chk_new_user.checked)" />
-      <%= 'New user?'.t %><br />
-      <input type='hidden' name='return_to' value="<%= request.env['REQUEST_URI'] -%>"/>
-      <input class='button' type="submit" name="login" value="Login &#187;" />
-    </div>
+    <table>
+      <tbody>
+        <tr>
+          <td><%= content_tag :label, 'User'.t, :for=> 'user_login' -%></td>
+          <td><%= content_tag :label, 'Password'.t, :for=> 'user_password' -%></td>
+          <td id="confirm_label" style="display: none;">
+            <%= content_tag :label, 'Confirmation'.t, :for=> 'user_password_confirmation'%>
+          </td>
+          <td>
+            <input type="checkbox" id="chk_new_user"
+                   name="chk_new_user" class="checkbox"
+                   onClick="tooglePasswordConfirmation(document.forms[0].chk_new_user.checked)" />
+            <%= 'New user?'.t %><br />
+            <input type='hidden' name='return_to' value="<%= request.env['REQUEST_URI'] -%>"/>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <%= text_field 'user', 'login', :size => 12,
+                                            :value => flash[:desired_login] %>
+          </td>
+          <td><%= password_field 'user', 'password', :size => 12 %></td>
+          <td id="confirm_field" style="display: none;">
+            <%= password_field 'user', 'password_confirmation',
+                               :size => 12,
+                               :disabled => true %>
+          </td>
+          <td><input class='button' type="submit" name="login" value="Login &#187;" /></td>
+        </tr>
+      </tbody>
+    </table>
     <% if flash[:login_failure] %>
       <%= content_tag(:span,
                       'Incorrect username or password. Please try again.'.t,

data/app/views/account/_availability.rhtml

@@ -1,5 +1,3 @@
 <% if @login_not_available %>
   <span class="warning" id="username_not_available"><%= 'Not available'.t -%></span>
-<% else %>
-  <span style="position: absolute" />
-<% end %>
+<% end %>

data/app/views/javascript/motiro.rjs

@@ -51,15 +51,13 @@ function extraPropertiesLoaded() {
 }
 
 function tooglePasswordConfirmation(show) {
-	var elem = document.getElementById('password_confirm');
-	var state = show ? 'block' : 'none';
-	var action = show ? '#{url_for :controller => 'account', :action => 'signup'}' : '#{url_for :controller => 'account', :action => 'login'}' ;
-            
+	document.getElementById("authentication_errors").style.display =
+    document.getElementById("confirm_field").style.display =
+      document.getElementById("confirm_label").style.display = show ? '':'none';
+
 	document.getElementById("user_password_confirmation").disabled = !show;
-	document.getElementById("authentication_errors").style.display = state;
-	document.forms[0].action = action;
 
-	elem.style.display = state;
+	document.forms[0].action = show ? '#{url_for :controller => 'account', :action => 'signup'}' : '#{url_for :controller => 'account', :action => 'login'}';
 }
 
 function check_password_confirmation() {
@@ -130,4 +128,4 @@ for(i=0;i<v.length;i++){
     }
 return(objlist);
 }
-JS
+JS

data/app/views/layouts/_bottom.rhtml

@@ -1,5 +1,12 @@
       <div id="footer">
         <p>Motiro <%= 'version'.t -%> <%= MOTIRO_VERSION -%></p>
+        <p>
+          <%= link_to 'Source code'.t,
+                      'http://www.motiro.org/wiki/show/Download' -%>
+          <%= 'is available.'.t %> <%= 'See the'.t -%>
+          <%= link_to 'terms and conditions'.t,
+                      :controller => 'root', :action => 'license' -%>.
+        </p>
       </div>
   </body>
 </html>

data/app/views/report/list.rhtml

@@ -1,5 +1,5 @@
 <div class='channel-title'>
-  <%= link_to( image_tag('rss.png', :border => 0, :class => 'rss'),
+  <%= link_to( image_tag('rss.gif', :border => 0, :class => 'rss'),
                { :controller => 'report', :action => 'list', :reporter => @name,
                  :format => 'xml', :locale => @locale },
                :class => 'feed' )

data/app/views/root/license.rhtml

@@ -0,0 +1,5 @@
+<% pagetext('GNU Affero General Public License') do %>
+  <% cache(:controller=> 'root', :action => 'license') do %>
+    <%= render_wiki(LICENSE_WIKI_TEXT) %>
+  <% end %>
+<% end %>

data/app/views/wiki/_editbar.rhtml

@@ -1,22 +1,6 @@
 <div class='toolbar bottombar'>
   <%= render :partial => 'editor' %>
-  <% if current_user.nil? then %>
-    <span class='disabled'>
-      <%= 'Edit'.t -%> <%= '(requires authentication)'.t -%>
-    </span>
-  <% elsif !current_user.can_edit?(@page) then
-       klass = if flash[:not_authorized] then 'marked' else 'none' end
-     %>
-    <span class='disabled'>
-      <%= 'Edit'.t -%> <%= content_tag('span',
-                                       '(not authorized)'.t,
-                                       :class => klass) -%>
-    </span>
-  <% else %>
-      <%= link_to( 'Edit'.t,
-                   { :controller => 'wiki',
-                     :action => 'edit',
-                     :page_name => @page.name } )%>
-  <% end %>
+  <%= edition_link(current_user, @page) -%>
+  <%= switch_view_link(@page) -%>
   <%= page_history_link(@page) -%>
 </div>

data/app/views/wiki/_properties_show.rhtml

@@ -1,4 +1,5 @@
 <% begin %>
-  <%= render(:partial => 'show_' + @page.kind) -%>
+  <%= content_tag :div, render(:partial => 'show_' + @page.kind),
+                  :class => 'message' %>
 <% rescue; end %>
 

data/app/views/wiki/_show_event.rhtml

@@ -1,3 +1,5 @@
-  <%= image_tag 'calendar.png' -%>
+<%= image_tag 'calendar.gif' -%>
+<p>
   <%= 'This event was planned for'.t -%>
   <%= @page.happens_at.localize('%d %B %Y (%A)') -%>
+</p>

data/app/views/wiki/_show_feature.rhtml

@@ -1,2 +1,2 @@
-<%= image_tag(@page.done? ? 'done.png' : 'not-done.png') %>
-<%= 'This feature is'.t + ' ' + (@page.done? ? 'done'.t : 'not done'.t) %>
+<%= image_tag(@page.done? ? 'done.gif' : 'not-done.gif') %>
+<p><%= 'This feature is'.t + ' ' + (@page.done? ? 'done'.t : 'not done'.t) %></p>

data/app/views/wiki/diff.rhtml

@@ -1,4 +1,4 @@
 <% pagetext(@page.title, '(Comparing revisions %s and %s)' / @old_revision_num / @new_revision_num) do %>
-  <%= @renderer.render_wiki_diff(@old_revision.text, @new_revision.text) %>
+  <%= render_wiki_diff(@old_revision, @new_revision) %>
   <%= render :partial => 'diffbar' %>
-<% end %>
+<% end %>

data/app/views/wiki/page_feed.rxml

@@ -11,19 +11,7 @@ xml.rss 'version' => '2.0',
       xml.pubDate @page.modified_at.to_s(:rfc822)
       xml.ttl '60'
       @page.revisions.reverse[0..10].each do |rev|
-        xml.item do
-          xml.title h(rev.title)
-          if rev.position > 1
-            xml.description @renderer.render_wiki_diff(
-              @page.revisions[rev.position - 2].text, rev.text)
-          else
-            xml.description @renderer.render_wiki_text(rev.text)
-          end
-          xml.pubDate h(rev.modified_at.to_s(:rfc822))
-          xml.dc :creator, h(rev.last_editor.login)
-          xml.guid server_url_for(:action => 'show', :page_name => @page.name,
-                                  :revision => rev.position) 
-        end
+        xml << rss_item_for_revision(rev)
     	end
     end
 end

data/app/views/wiki/raw.rhtml

@@ -0,0 +1,7 @@
+<% pagetext(@page.title, @page.position ? '(Raw wiki text from revision %s)' / @page.position.to_s : '(Raw wiki text)'.t) do %>
+  <% cache(:controller=> 'wiki', :action => 'raw', :page => @page.name,
+           :revision => @page_revision_id, :locale_suffix => @locale) do %>
+    <pre class="wikisource"><%= h(@page.text) -%></pre>
+  <% end %>
+  <%= render :partial => 'editbar' %>
+<% end %>

data/app/views/wiki/show.rhtml

@@ -1,4 +1,4 @@
-<% pagetext(@page.title, @page.respond_to?(:position) ? '(Revision %s)' / @page.position.to_s : nil) do %>
+<% pagetext(@page.title, @page.position ? '(Revision %s)' / @page.position.to_s : nil) do %>
   <% cache(:controller=> 'wiki', :action => 'show',
            :page => @page.name, :locale_suffix => @locale,
            :revision => @page_revision_id) do %>

data/app/views/wiki/sourcediff.rhtml

@@ -1,4 +1,4 @@
 <% pagetext(@page.title, '(Comparing revisions %s and %s)' / @old_revision_num / @new_revision_num) do %>
-  <%= render_diff_table(@old_revision.diff(@new_revision_num.to_i))%>
+  <%= render_wiki_sourcediff(@old_revision, @new_revision) %>
   <%= render :partial => 'diffbar' %>
-<% end %>
+<% end %>

data/bin/motiro

@@ -4,18 +4,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require File.expand_path(File.dirname(__FILE__) + '/../vendor/motiro-installer')
 

data/config/initializers/motiro_core.rb

@@ -1,3 +1,4 @@
+require 'core/license'
 require 'core/version'
 require 'core/wiki_page_not_found'
 

data/config/routes.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ActionController::Routing::Routes.draw do |map|
 
@@ -54,6 +53,10 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'wiki/:action/:page_name', :controller => 'wiki'
   map.connect 'wiki/:action/:page_name.:format', :controller => 'wiki'
               
+  map.connect 'license/:locale',
+              :controller => 'root', :action => 'license'
+  map.connect 'license', :controller => 'root', :action => 'license'
+
   map.connect '', locale_defaults.merge(:controller => 'root',
                                         :action => 'index')
 

data/db/translation/pt-BR.rb

@@ -22,9 +22,6 @@
 'Passwords do not match' => 'Senhas não conferem',
 'Sign out' => 'Sair',
 'Last update by %s at %s' => 'Última atualização por %s em %s',
-'Edit' => 'Editar',
-'(requires authentication)' => '(identifique-se, por favor)',
-'(not authorized)' => '(não autorizado)',
 'Latest news from %s' => 'Últimas notícias do %s',
 'Recently changed suggestions' => 'Últimas sugestões modificadas',
 'Scheduled events' => 'Eventos agendados',
@@ -38,6 +35,10 @@
 'Home' => 'Início',
 'Features' => 'Sugestões',
 'Events' => 'Eventos',
+'License' => 'Licença',
+'(Raw wiki text)' => '(Texto original)',
+'(Raw wiki text from revision %s)' => '(Texto original da revisão %s)',
+'The following wiki code contains an error that prevents it from being correctly formatted.' => 'Há um erro no código wiki abaixo impedindo que ele seja formatado corretamente.',
 
 # Source revision details page
 'Revision details' => 'Detalhes de revisão', 
@@ -86,10 +87,23 @@
 
 # Older headlines and history pages
 'Author' => 'Autor',
-'Page has no history yet' => 'Página ainda sem histórico',
 'Page history for %s' => 'Histórico da página %s',
-'Page history (%s revisions)' => 'Histórico da página (%s revisões)',
 'Page history' => 'Histórico da página',
 '(Revision %s)' => '(Revisão %s)',
-'Compare revisions' => 'Comparar revisões'
+'Compare revisions' => 'Comparar revisões',
+
+# Page details bar
+'Edit' => 'Editar',
+'(requires authentication)' => '(identifique-se, por favor)',
+'(not authorized)' => '(não autorizado)',
+'View raw text' => 'Mostrar em texto puro',
+'View wiki output' => 'Mostrar resultado wiki',
+'Page has no history yet' => 'Página ainda sem histórico',
+'Page history (%s revisions)' => 'Histórico da página (%s revisões)',
+
+# Footer
+'Source code' => 'O código-fonte',
+'is available.' => 'está disponível.',
+'See the' => 'Consulte os',
+'terms and conditions' => 'termos e condições'
 }

data/lib/array_extensions.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class Array
   
@@ -27,4 +26,4 @@ class Array
     str
   end
   
-end
+end

data/lib/diff_chunk_builder.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class DiffChunkBuilder
 

data/lib/differ.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'diff/lcs'
 require 'diff/lcs/array'

data/lib/string_extensions.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 require 'mediacloth'