parlement 0.14 → 0.17

data/app/views/elt/rss.rxml

@@ -1,7 +1,7 @@
 xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
 	xml.channel do
 		xml.title @elt.subject
-		xml.link url_for(:only_path => false, :action => 'show', :id => @elt)
+		xml.link url_for(:only_path => false, :id => @elt)
 		xml.description @elt.subject
 
 		Elt.find(:all,
@@ -11,17 +11,10 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
 			xml.item do
 				xml.title item.subject
 				#xml.category(@elt.subject)
-				xml.pubDate item.created_on
+				xml.pubDate item.created_on.strftime('%Y-%m-%d %H:%M:%S%z')
 
-				if url_for(:only_path => false).match(/http:\/\/echarp.dyndns.org/) and @elt.id == 'blog'
-					xml.link(url_for(:only_path => false, :controller => 'perso',
-						:action => 'blog', :id => item.id+'.html'))
-					xml.comments(url_for(:only_path => false, :controller => 'perso',
-						:action => 'blog', :id => item.id+'.html'))
-				else
-					xml.link(url_for(:only_path => false, :action => 'show', :id => item))
-					xml.comments(url_for(:only_path => false, :action => 'show', :id => item))
-				end
+				xml.link(url_for(:only_path => false, :action => 'index', :id => item))
+				xml.comments(url_for(:only_path => false, :action => 'index', :id => item))
 
 				xml.tag!("dc:creator", item.person.name) if item.person
 

data/app/views/elt/show.rhtml

@@ -1,21 +1,23 @@
 <% voters = Choice.count :select => 'person_id', :distinct => true %>
 
-<div id="sidebar" class="sb">
-  <script type="text/javascript">if (displayBorder) { border.render('sidebar'); }</script>
+<div id="sidebar">
 	<%= render :partial => '/layouts/title' %>
 
-  <%= periodically_call_remote(:update => 'spinner', :url => { :action => 'updateView', :id => @elt })%>
-  <span id="spinner"></span>
+	<%= periodically_call_remote(
+		:update => 'spinner',
+		:frequency => UPDATE_VIEW_PERIOD,
+		:url => { :action => 'updateView', :id => @elt })%>
+	<span id="spinner"></span>
 
-  <div class="box identity" id="identity">
-    <%= render :partial => 'account/show', :locals => { :elt => @elt.parent } %>
-  </div>
+	<div class="box identity" id="identity">
+		<%= render :partial => 'account/show', :locals => { :elt => @elt.parent } %>
+	</div>
 
 	<div class="box" id="filter">
 		<h3 class="boxTitle"><%= _('Filter') %></h3>
 		<form id="filterForm" action="">
       <p>
-        <a onclick="return decrementFilter()" href="#" accesskey="-">&#x2012;</a>
+        <a onclick="return decrementFilter()" href="#" accesskey="-">-</a>
         <select name="filter"
           onchange="setFilter(this.options[this.selectedIndex].value, '<%= @elt.id %>')">
           <%= options_for_select [["", -voters]] %>
@@ -28,59 +30,63 @@
 		<script type="text/javascript">setFilterFromCookie();</script>
 	</div>
 
-  <div class="box" id="listVisitors">
-    <%= render :partial => '/elt/list/visitors' %>
-  </div>
-
-  <div class="box" id="listSubscribers">
-    <%= render :partial => '/elt/list/subscribers' %>
-  </div>
-
-  <div class="box" id="listByVote">
-    <%= render :partial => '/elt/list/byVote' %>
-  </div>
-
-  <div class="box" id="listByDate">
-    <%= render :partial => '/elt/list/byDate' %>
-  </div>
-
-  <div class="box">
-    <h3 class="boxTitle"><%= _('Links') %></h3>
-    <h4><%= _('Personal') %></h4>
-    <div class="boxLine"><a href="http://www.alivrouvert.com">
-        À Livr&#8217; Ouvert</a></div>
-    <div class="boxLine"><a href="http://www.baratissus.com">
-        Le bar à tissus</a></div>
-
-    <div class="boxLine"><a href="http://echarp.org/blog">
-        echarp's blog</a></div>
-    <div class="boxLine"><a href="http://www-inf.int-evry.fr/~olberger/weblog/">
-        Olivier's</a></div>
-    <div class="boxLine"><a href="http://www.couchet.org/blog/">
-        mad&#8217;s</a></div>
-    <div class="boxLine"><a href="http://www.grassouille.org/blog/">
-        benj&#8217;s</a></div>
-
-    <h4><%= _('Democracy') %></h4>
-    <div class="boxLine"><a href="http://worldblu.com">
-        World BLU</a></div>
-    <div class="boxLine"><a href="http://www.tdge.org">
-        world Parliament Experiment</a></div>
-    <div class="boxLine"><a href="http://groups.google.com/group/worldcit">
-        The Community of World Citizens</a></div>
-    <div class="boxLine"><a href="http://world-wide.democracy.net">
-        Worldwide Direct Democracy Movement</a></div>
-  </div>
+	<div class="box" id="listVisitors">
+		<%= render :partial => '/elt/list/visitors' %>
+	</div>
+
+	<div class="box" id="listSubscribers">
+		<%= render :partial => '/elt/list/subscribers' %>
+	</div>
+
+	<div class="box" id="listByVote">
+		<%= render :partial => '/elt/list/byVote' %>
+	</div>
+
+	<div class="box" id="listByDate">
+		<%= render :partial => '/elt/list/byDate' %>
+	</div>
+
+	<div class="box">
+		<h3 class="boxTitle"><%= _('Links') %></h3>
+		<div class="boxLine"><a href="http://alivrouvert.fr">
+				À Livr&#8217; Ouvert</a></div>
+		<div class="boxLine"><a href="http://www.baratissus.com">
+				Le bar à tissus</a></div>
+		<div class="boxLine"><a href="http://april.org">
+				April</a></div>
+
+		<h4><%= _('Blogs') %></h4>
+		<div class="boxLine"><a href="http://bookinette.fr">
+				Bookinette's</a></div>
+		<div class="boxLine"><a href="http://blog.echarp.org">
+				echarp's</a></div>
+		<div class="boxLine"><a href="http://www-inf.int-evry.fr/~olberger/weblog/">
+				Olivier's</a></div>
+		<div class="boxLine"><a href="http://www.couchet.org/blog/">
+				mad&#8217;s</a></div>
+		<div class="boxLine"><a href="http://www.grassouille.org/blog/">
+				benj&#8217;s</a></div>
+
+		<h4><%= _('Democracy') %></h4>
+		<div class="boxLine"><a href="http://worldblu.com">
+				World BLU</a></div>
+		<div class="boxLine"><a href="http://groups.google.com/group/worldcit">
+				The Community of World Citizens</a></div>
+		<div class="boxLine"><a href="http://world-wide-democracy.net">
+				Worldwide Direct Democracy Movement</a></div>
+	</div>
 
 	<div class="box">
-    <h3 class="boxTitle"><%= _('Search') %></h3>
+		<h3 class="boxTitle"><%= _('Search') %></h3>
 		<form action="http://google.com/search">
-      <div>
-        <input type="hidden" name="q"
-          value="site:<%= ActionMailer::Base.smtp_settings[:domain] %>" />
-        <input type="text" name="q" />
-        <%= submit_tag 'OK' %>
-      </div>
+			<div>
+				<input type="hidden" name="domains"
+					value="<%= ActionMailer::Base.smtp_settings[:domain] %>" />
+				<input type="hidden" name="sitesearch"
+					value="<%= ActionMailer::Base.smtp_settings[:domain] %>" />
+				<input type="text" name="q" style="width:50%"/>
+				<%= submit_tag 'OK' %>
+			</div>
 		</form>
 	</div>
 
@@ -144,7 +150,5 @@
 </h3>
 
 <ul class="top">
-	<%= render :partial => 'elt', :layout => 'top',
-			:locals => { :elt => @elt, :eltTop => true } %>
+	<%= render :partial => 'elt', :locals => { :elt => @elt, :eltTop => true } %>
 </ul>
-

data/app/views/elt/vote_rss.rxml

@@ -1,7 +1,7 @@
 xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
 	xml.channel do
 		xml.title @elt.subject
-		xml.link url_for(:only_path => false, :action => 'show', :id => @elt)
+		xml.link url_for(:only_path => false, :id => @elt)
 		xml.description @elt.subject
 
 		Elt.find(:all,
@@ -18,17 +18,10 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
 				xml.title item.subject
 				#xml.category(@elt.subject)
 				xml.vote item.result
-				xml.pubDate item.created_on
+				xml.pubDate item.created_on.strftime('%Y-%m-%d %H:%M:%S%z')
 
-				if url_for(:only_path => false).match(/http:\/\/echarp.dyndns.org/) and @elt.id == 'blog'
-					xml.link(url_for(:only_path => false, :controller => 'perso',
-						:action => 'blog', :id => item.id+'.html'))
-					xml.comments(url_for(:only_path => false, :controller => 'perso',
-						:action => 'blog', :id => item.id+'.html'))
-				else
-					xml.link(url_for(:only_path => false, :action => 'show', :id => item))
-					xml.comments(url_for(:only_path => false, :action => 'show', :id => item))
-				end
+				xml.link(url_for(:only_path => false, :action => 'index', :id => item))
+				xml.comments(url_for(:only_path => false, :action => 'index', :id => item))
 
 				xml.tag!("dc:creator", item.person.name) if item.person
 

data/app/views/layouts/top.rhtml

@@ -7,8 +7,6 @@
 		<meta name="verify-v1" content="GQG8JPKekfUN1haTZYQRLP+PvKkH43Rg2HQ53OTLgTg=" />
 		<!-- For www.echarp.org -->
 		<meta name="verify-v1" content="GQG8JPKekfUN1haTZYQRLP+PvKkH43Rg2HQ53OTLgTg=" />
-		<!-- echarp.dyndns.org -->
-		<meta name="verify-v1" content="6espv1bly2noRX0tNze9x9In903DuzgvEzmAQdDw250=" />
 		<title><%= @title %></title>
 
 		<link rel="alternate" type="application/rss+xml" title="<%= _('Latest posts') %> - <%= @title %>"
@@ -16,42 +14,32 @@
 		<link rel="alternate" type="application/rss+xml" title="<%= _('Highest posts') %> - <%= @title %>"
 			href="<%= url_for :action => 'vote_rss', :id => @elt %>"/>
 
+		<%request.subdomains.each { |d|%>
+			<%= stylesheet_link_tag d, :title => d, :rel => 'alternate stylesheet' %>
+		<%}%>
+
+		<link rel="shortcut icon" href="/images/world.png" type="image/png"/>
 		<%= stylesheet_link_tag 'default' %>
-		<%= stylesheet_link_tag 'blue', :title => 'blue', :rel => 'alternate stylesheet' %>
-		<%= javascript_include_tag "/javascripts/prototype" %>
-		<%= javascript_include_tag "/javascripts/scriptaculous" %>
-		<%= javascript_include_tag "/javascripts/shadedborder" %>
 
-		<%= javascript_include_tag "/javascripts/behaviour" %>
-		<%= javascript_include_tag "/javascripts/mybehaviour" %>
+		<script src="http://ajax.googleapis.com/ajax/libs/prototype/1.6.0.2/prototype.js" type="text/javascript"></script>
+		<script src="http://ajax.googleapis.com/ajax/libs/scriptaculous/1.8.1/scriptaculous.js" type="text/javascript"></script>
 
 		<!-- compliance patch for microsoft browsers -->
-    <script type="text/javascript">
-      var displayBorder = true;
-    </script>
-		<!--[if lt IE 7]>
-    <style type="text/css">
-      body { background: white; }
-      #sidebar { background: #ddf; }
-      /* Crazy, without that, the "test" or "blog" elements kill ie6 */
-      a.knobOpened { position: relative !important; }
-      ul.top li.elt {
-        width: auto; !important;
-        background: none !important; }
-      ul.top h1 a, ul.top h2 a {
-        border-right: white;
-        border-left: white; }
-      ul.top li.elt { background: none; }
-    </style>
-    <script type="text/javascript">
-      displayBorder = false;
-      //IE7_PNG_SUFFIX = "architecture.png";
-    </script>
-		<%= javascript_include_tag "/javascripts/ie7.js" %>
+		<!--[if lt IE 8]>
+		<style type="text/css">
+			ul.top li.elt {
+				width: auto; !important;
+				background: white !important; }
+			ul.top h1 a, ul.top h2 a {
+				border-right: white;
+				border-left: white; }
+		</style>
+		<script type="text/javascript">
+			//IE7_PNG_SUFFIX = "architecture.png";
+		</script>
+		<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
 		<![endif]-->
 
-		<link rel="shortcut icon" href="/images/world.png" type="image/png"/>
-
 		<meta name="description" content="Parlement, a mix between direct and representative democracy, in the shape of a website. A mailing list, forum, chat. Democratic mailing list and forum"/>
 		<meta name="author" content="Emmanuel Charpentier"/>
 		<meta name="subject" content="Parlement, democratic mailing list and forum"/>
@@ -66,27 +54,28 @@
 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <script type="text/javascript">
-      if (displayBorder) {
-        var border = RUZEE.ShadedBorder.create({ corner: 8, shadow: 16,  border: 2 });
-      }
-    </script>
+		<%= javascript_include_tag "/javascripts/shadedborder" %>
+		<%= javascript_include_tag "/javascripts/application" %>
 	</head>
 
-	<body id="body" class="<%= session[:person] ? "logged" : "anon" %> sb">
-    <script type="text/javascript">if (displayBorder) { border.render('body'); }</script>
-		<%= @content_for_layout %>
+	<body class="<%= session[:person_id] ? "logged" : "anon" %>">
+		<div id="rounded">
+			<%= @content_for_layout %>
 
-		<p class="version">
-			<a href="<%= url_for :controller => 'elt', :action => 'show', :id => '' %>">
-				v<%= PARLEMENT_VERSION %></a>
-			<a href="http://www.pagerank.net/" title="Search Engine Optimization">
-				<img src="http://www.pagerank.net/pagerank.gif" alt="Search Engine Optimization"/>
-			</a>
-			<a href="http://validator.w3.org/check?uri=referer">
-				<img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Strict"/>
-			</a>
-		</p>
+			<p class="version">
+				<a href="<%= url_for :id => '' %>">v<%= PARLEMENT_VERSION %></a>
+				<a href="http://www.pagerank.net/" title="Search Engine Optimization">
+					<img src="http://www.pagerank.net/pagerank.gif" alt="Search Engine Optimization"/>
+				</a>
+				<a href="http://validator.w3.org/check?uri=referer">
+					<img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Strict"/>
+				</a>
+			</p>
+		</div>
+		<script type="text/javascript">
+			border.render('sidebar');
+			border.render('rounded');
+		</script>
 	</body>
 </html>
 

data/app/views/person/_listElts.rhtml

@@ -48,7 +48,7 @@
 <% for elt in e[0...PAGE_LENGTH] %>
 	<li class="elt">
 		<span class="author">&lt;<%= elt.created_on.strftime('%d/%m %H:%M') %>&gt;</span>
-		<%= link_to elt.subject.gsub(/\[.*\]/, ''), :id => elt, :controller => 'elt', :action => 'show' %>
+		<%= link_to elt.subject.gsub(/\[.*\]/, ''), :id => elt, :controller => 'elt' %>
 		(<%= elt.children.size %> sub element(s))
 		<span class="result"><%= sprintf("%+d", elt.result) %></span>
 		<% "&#160;"*22 %>

data/app/views/person/show.rhtml

@@ -14,7 +14,7 @@
       <% for elt in @person.subscribed_elts.reverse[0...LIST_LENGTH] %>
         <div class="boxLine">
           <span class="result"><%= sprintf("%+d", elt.result) %></span>
-          <%= link_to(elt.subject.gsub(/\[.*\]/, ''), :controller => 'elt', :action => 'show', :id => elt) %>
+          <%= link_to(elt.subject.gsub(/\[.*\]/, ''), :controller => 'elt', :id => elt) %>
         </div>
       <% end %>
     </div>

data/config/boot.rb

@@ -1,45 +1,110 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
 
-unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
-  unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
-    require 'pathname'
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
-  end
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
 
-  RAILS_ROOT = root_path
-end
+    def booted?
+      defined? Rails::Initializer
+    end
 
-unless defined?(Rails::Initializer)
-  if File.directory?("#{RAILS_ROOT}/vendor/rails")
-    require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-  else
-    require 'rubygems'
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
 
-    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
-    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
-    rails_gem_version = $1
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
+    end
+  end
 
-    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
-      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
-      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
 
-      if rails_gem
-        gem "rails", "=#{rails_gem.version.version}"
-        require rails_gem.full_gem_path + '/lib/initializer'
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
       else
-        STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-  )
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion rescue nil
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        require 'rubygems'
+        min_version = '1.3.1'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
-    else
-      gem "rails"
-      require 'initializer'
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
     end
   end
-
-  Rails::Initializer.run(:set_load_path)
 end
+
+# All that for this:
+Rails.boot!