parlement 0.1 → 0.2

data/Rakefile

@@ -1,7 +1,8 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/switchtower.rake, and they will automatically be available to Rake.
 
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+#require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+require(File.join(File.dirname(__FILE__), 'config', 'environment'))
 
 require 'rake'
 require 'rake/testtask'
@@ -13,7 +14,8 @@ require 'tasks/rails'
 require 'meta_project'
 
 require 'rake/contrib/rubyforgepublisher'
-
+require 'meta_project/release/freshmeat'
+require 'meta_project/release/raa'
 
 desc "Deploy basic application directories" 
 task :deploy => :environment do
@@ -27,7 +29,7 @@ end
 
 
 PKG_NAME = "parlement"
-PKG_VERSION = "0.1"
+PKG_VERSION = PARLEMENT_VERSION
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 PKG_FILES = FileList[
@@ -39,7 +41,7 @@ spec = Gem::Specification.new do |s|
 	## Basic information.
 	s.name = PKG_NAME
 	s.version = PKG_VERSION
-	s.summary = "Secure Direct Democracy on a forum"
+	s.summary = "Trusted Direct Democracy on a forum"
 	s.description = <<EOF
 		This is a forum and mailing list project, which aims to be a complete Direct
 		Democracy implementation where everybody can propose polls, vote on them, or
@@ -78,6 +80,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
 	#pkg.package_files.include("*")
 end
 
+
 # Support Tasks ------------------------------------------------------
 
 desc "Look for TODO and FIXME tags in the code"
@@ -87,25 +90,53 @@ task :todo do
   end
 end
 
-task :release => [:verify_env_vars, :release_files, :publish_doc, :publish_news, :tag]
+#task :release => [:verify_env_vars, :release_files, :publish_doc, :publish_news, :tag]
+task :release => [:verify_env_vars, :release_files, :publish_news]
 
 task :verify_env_vars do
+	if not ENV["RUBYFORGE_USER"]
+		print "rubyforge.org's user: "
+		ENV["RUBYFORGE_USER"] = STDIN.gets.chomp
+	end
+
+	# This echos password to shell which is a bit sucky
+	if ENV["RUBYFORGE_PASSWORD"]
+		password = ENV["RUBYFORGE_PASSWORD"]
+	else
+		print "#{ENV['RUBYFORGE_USER']}@rubyforge.org's password: "
+		ENV["RUBYFORGE_PASSWORD"] = STDIN.gets.chomp
+	end
+
   raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
   raise "RUBYFORGE_PASSWORD environment variable not set!" unless ENV['RUBYFORGE_PASSWORD']
-	puts ENV['RUBYFORGE_USER']
-	puts ENV['RUBYFORGE_PASSWORD']
+
+	if not ENV["FRESHMEAT_USER"]
+		print "freshmeat user: "
+		ENV["FRESHMEAT_USER"] = STDIN.gets.chomp
+	end
+
+	# This echos password to shell which is a bit sucky
+	if ENV["FRESHMEAT_PASSWORD"]
+		password = ENV["FRESHMEAT_PASSWORD"]
+	else
+		print "freshmeat's password: "
+		ENV["FRESHMEAT_PASSWORD"] = STDIN.gets.chomp
+	end
+
 end
 
 task :publish_doc do
-  publisher = Rake::RubyForgePublisher.new('xforge', ENV['RUBYFORGE_USER'])
+  publisher = Rake::RubyForgePublisher.new(PKG_NAME, ENV['RUBYFORGE_USER'])
   publisher.upload
 end
 
 desc "Release files on RubyForge"
 task :release_files => [:gem] do
-	release_files = FileList[ "pkg/#{PKG_FILE_NAME}.gem" ]
+	release_files = FileList[ "pkg/#{PKG_FILE_NAME}.gem",
+		"pkg/#{PKG_FILE_NAME}.tgz",
+		"pkg/#{PKG_FILE_NAME}.zip" ]
 
-  Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new('xforge')) do |release|
+  Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |release|
     # Never hardcode user name and password in the Rakefile!
     release.user_name = ENV['RUBYFORGE_USER']
     release.password = ENV['RUBYFORGE_PASSWORD']
@@ -115,15 +146,32 @@ task :release_files => [:gem] do
   end
 end
 
-desc "Publish news on RubyForge"
+
+desc "Publish news"
 task :publish_news => [:gem] do
-	release_files = FileList[ "pkg/#{PKG_FILE_NAME}.gem" ]
+  Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news|
+    # Never hardcode user name and password in the Rakefile!
+    news.user_name = ENV['RUBYFORGE_USER']
+    news.password = ENV['RUBYFORGE_PASSWORD']
+  end
 
-  Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new('xforge')) do |news|
+	fm = DevTools::Freshmeat::FreshmeatService.new(ENV['FRESHMEAT_USER'], ENV['FRESHMEAT_PASSWORD'])
+	fm.get_project_list.each do |p|
+		puts p
+		branches = fm.get_branch_list( p.shortName )
+		puts branches.inspect
+		release = fm.get_release( p.shortName, branches[0], p.version )
+		puts release
+	end
+	puts fm.logout
+
+	"""
+  Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::Fresh.new(PKG_NAME)) do |news|
     # Never hardcode user name and password in the Rakefile!
     news.user_name = ENV['RUBYFORGE_USER']
     news.password = ENV['RUBYFORGE_PASSWORD']
   end
+	"""
 end
 
 desc "Tag all the CVS files with the latest release number (REL=x.y.z)"
@@ -133,4 +181,3 @@ task :tag do
   sh %{cvs tag #{reltag}}
 end
 
-

data/app/controllers/elt_controller.rb

@@ -27,7 +27,7 @@ class EltController < ApplicationController
 
   def list
     @elt = Elt.find(params[:id]) if @elt == nil
-		render :partial => 'list', :locals => { :elt => @elt }
+		render :partial => '/elt/list', :locals => { :elt => @elt }
   end
 
   def rss
@@ -67,10 +67,10 @@ class EltController < ApplicationController
       #redirect_to :action => 'top', :id => @elt.parent_id
 			#render_component(:action => 'show', :id => @elt.id )
 
-			render :partial => 'elt', :locals => { :elt => @elt, :eltTop => false }
+			render :partial => '/elt/elt', :locals => { :elt => @elt, :eltTop => false }
     else
       flash[:notice] = 'Error'
-      render :action => 'new'
+      render :controller => 'elt', :action => 'new'
     end
   end
 

data/app/controllers/person_controller.rb

@@ -0,0 +1,13 @@
+class PersonController < ApplicationController
+	layout 'top'
+	model :person
+
+  def show
+    @person = Person.find(params[:id])
+		@title = @person.name+' (parlement)'
+
+		rescue ActiveRecord::RecordNotFound => e
+			flash[:error] = "Person '#{params[:id]}' does not exist"
+			redirect_to '/'
+  end
+end

data/app/helpers/person_helper.rb

@@ -0,0 +1,2 @@
+module PersonHelper
+end

data/app/views/account/_login.rhtml

@@ -35,7 +35,7 @@
 
 		<%= submit_tag 'Ok' %>
 
-		<%= render :partial => 'account/help',
+		<%= render :partial => '/help',
 			:locals => { :divId => 'login'+divId.to_s, :content => '
 				<ul>You can propose an element
 					<li>with no pseudo</li>

data/app/views/account/_show.rhtml

@@ -5,19 +5,16 @@
 <%= error_messages_for 'person' if @person %>
 <%= error_messages_for 'user' if @user %>
 
-<% if @session[:person] != nil %>
-	<% if @session[:person] != nil and @session[:person].name != nil \
-		and @session[:person].name != '' %>
+<% if @session[:person] %>
+	<% if @session[:person].name and @session[:person].name != '' %>
 		<div class="author">
-			<% if @session[:person] != nil and @session[:person].email != nil %>
-				&lt;<%= mail_to @session[:person].email, @session[:person].name %>&gt;
-			<% else %>
-				&lt;<%= @session[:person].name %>&gt;
-			<% end %>
+			&lt;<%= link_to(@session[:person].name,
+					:controller => 'person',
+					:action => 'show',
+					:id => @session[:person]) %>&gt;
 		</div>
 	<% end %>
 
-
 	<div class="logout">
 		<%= link_to_remote('(X)',
 				:update => divId,
@@ -26,6 +23,6 @@
 	</div>
 <% else %>
 
-	<%= render :partial => 'account/login', :locals => { :divId => divId } %>
+	<%= render :partial => '/account/login', :locals => { :divId => divId } %>
 <% end %>
 

data/app/views/elt/_elt.rhtml

@@ -1,41 +1,48 @@
 <% eltSubsNb = elt.children.count if eltSubsNb == nil %>
 
+<% if elt.id and not elt.subject.include? elt.parent.subject and not eltTop %>
+	<br />
+<% end %>
+
 <div class="elt" id="elt_<%= elt.id %>">
-	<% if elt.person != nil and elt.person.name != nil \
-		and elt.person.name != '' %>
-		<div class="author">
-			<% if elt.person != nil and elt.person.email != nil %>
-				&lt;<%= mail_to elt.person.email, elt.person.name,
-					:subject => elt.subject %>&gt;
-			<% else %>
-				&lt;<%= elt.person.name %>&gt;
-			<% end %>
-		</div>
-	<% end %>
+	<div class="author">
+		<% if elt.person %>
+			&lt;<%= link_to(elt.person.name,
+					:controller => 'person', :action => 'show', :id => elt.person) %>&gt;
+		<% elsif elt.parent_id != 'ROOT' and elt.subject.include? elt.parent.subject %>
+			&lt;<%= ANONYMOUS_POSTER %>&gt;
+		<% end %>
+	</div>
 
 	<div class="eltInfo" title="<%= elt.created_on %>">
 		<!--
 		<= link_to('@', :action => 'raw_elt', :id => elt) if elt.mail != nil >
 		-->
-
 		<% if elt.id and elt.children.count == 0 %>
 			<%= link_to_remote('>>',
 					:update => 'eltNew_'+elt.id.to_s,
-					:url => { :action => 'new', :id => elt },
+					:url => { :controller => 'elt', :action => 'new', :id => elt },
 					:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
 						visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)) %>
 		<% end %>
 	</div>
 
-	<% if elt.parent_id == 'ROOT' or not elt.subject.include? elt.parent.subject %>
-		<h<%= eltTop ? '1' : '2' %>>
+	<% if elt.parent_id == 'ROOT' or eltTop \
+		or not elt.subject.include? elt.parent.subject %>
+		<% if elt.parent_id != 'ROOT' %>
+			<span class="created_on">
+				<%= elt.created_on.strftime('%d/%m/%y %H:%M') %>
+			</span>
+		<% end %>
+
+		<<%= eltTop ? 'h1' : 'h2' %>>
 			<% if elt.id %>
 				<%= link_to(textilize_without_paragraph(elt.subject),
 						:controller => 'elt', :action => 'show', :id => elt) %>
 			<% else %>
 				<%= textilize_without_paragraph(elt.subject) %>
 			<% end %>
-		</h<%= eltTop ? '1' : '2' %>>
+		</<%= eltTop ? 'h1' : 'h2' %>>
 	<% end %>
 
 	<div class="eltBody">
@@ -53,14 +60,14 @@
 			class="eltMore" id="eltMore_<%= elt.id %>">
 			<%= link_to_remote(eltSubsNb.to_s+' more',
 					:update => 'eltSubs_'+elt.id.to_s,
-					:url => { :action => 'list', :id => elt },
+					:url => { :controller => 'elt', :action => 'list', :id => elt },
 					:loading => visual_effect(:SwitchOff, 'eltMore_'+elt.id.to_s)+
 						visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s),
 					:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) %>
 
 			<%= link_to_remote('Add >>',
 					:update => 'eltNew_'+elt.id.to_s,
-					:url => { :action => 'new', :id => elt },
+					:url => { :controller => 'elt', :action => 'new', :id => elt },
 					:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
 					visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)) %>
 		</div>
@@ -68,7 +75,7 @@
 		<div style="display:<%= (eltTop or eltSubsNb == 1) ? '' : 'none' %>"
 			class="eltSubs" id="eltSubs_<%= elt.id %>">
 			<% if eltTop or eltSubsNb == 1 %>
-				<%= render :partial => 'list', :locals => { :elt => elt } %>
+				<%= render :partial => '/elt/list', :locals => { :elt => elt } %>
 			<% end %>
 		</div>
 
@@ -86,18 +93,16 @@
 				visual_effect(:BlindUp, 'eltSubsClose_'+elt.id.to_s)+
 				visual_effect(:BlindDown, 'eltMore_'+elt.id.to_s)) %>
 
-		<% if elt.person != nil and elt.person.name != nil \
-			and elt.person.name != '' %>
-			<% if elt.person != nil and elt.person.email != nil %>
-				&lt;<%= mail_to elt.person.email, elt.person.name %>&gt;
-			<% else %>
-				&lt;<%= elt.person.name %>&gt;
-			<% end %>
+		<% if elt.person %>
+			&lt;<%= link_to(elt.person.name,
+					:controller => 'person', :action => 'show', :id => elt.person) %>&gt;
+		<% elsif elt.parent_id != 'ROOT' and elt.subject.include? elt.parent.subject %>
+			&lt;<%= ANONYMOUS_POSTER %>&gt;
 		<% end %>
 
 		<%= link_to_remote('Add >>',
 				:update => 'eltNew_'+elt.id.to_s,
-				:url => { :action => 'new', :id => elt },
+				:url => { :controller => 'elt', :action => 'new', :id => elt },
 				:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
 					visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)) %>
 	</div>

data/app/views/elt/_list.rhtml

@@ -22,7 +22,7 @@ e = Elt.find_all("parent_id = '#{elt.id}'",
 		:loading => visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s),
 		:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) if e_pages.current.previous %>
 
-<%= render :partial => 'elt',
+<%= render :partial => '/elt/elt',
 	:collection => e.reverse,
 	:locals => { :eltTop => false } %>
 

data/app/views/elt/new.rhtml

@@ -24,7 +24,7 @@
 	<h2>
 		<%= text_field 'elt', 'subject', :style => 'font-weight:bolder' %>
 
-		<%= render :partial => 'account/help',
+		<%= render :partial => '/help',
 			:locals => { :divId => 'title'+@elt.parent_id, :content => '
 				This is the title of your proposition.
 				<br/>
@@ -47,7 +47,7 @@
 				:loaded => visual_effect(:BlindDown, 'eltNewPreview_'+@elt.parent_id)) %>
 		<%= submit_tag 'Propose' %>
 
-		<%= render :partial => 'account/help',
+		<%= render :partial => '/help',
 			:locals => { :divId => 'body'+@elt.parent_id, :content => '
 				_<em>emphasis</em>_ *<strong>strong</strong>* -<span
 				style="text-decoration:line-through;">strike-through</span>- +added+

data/app/views/elt/show.rhtml

@@ -1,4 +1,4 @@
-<div class="sidebar" style="clear:right">
+<div class="sidebar">
 	<div class="box">
 		<% if @elt.children.count > 0 %>
 			<div class="boxTitle">Titres</div>
@@ -18,14 +18,6 @@
 		<%= link_to image_tag("/images/webfeed.gif"),
 			:action => 'rss', :id => @elt %>
 	</div>
-
-	<!--
-	<a href="http://echarp.dyndns.org/perso/image/echarp.jpg"
-		title="Oui oui, je fais mon style ;)">
-		<img src="/perso/image/echarpSmall.jpg" style="margin-top:1em"/>
-		<img src="http://echarp.dyndns.org/perso/CV/20030520echarp.jpg"/>
-	</a>
-	-->
 </div>
 
 <% @flash.each do |key, value| %>
@@ -42,5 +34,3 @@
 <%= render :partial => 'elt', :layout => 'top',
 		:locals => { :elt => @elt, :eltTop => true } %>
 
-<div class="version">version <%= PARLEMENT_VERSION %></div>
-

data/app/views/layouts/top.rhtml

@@ -1,16 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html>
 	<head>
 		<title><%= @title %></title>
-		<!--<title><%= controller.action_name %></title>-->
-
 		<%= stylesheet_link_tag 'default' %>
-		<!--
-		<%= stylesheet_link_tag 'scaffold' %>
-		<%= javascript_include_tag "/javascripts/live_tree.js" %>
-		-->
 		<%= javascript_include_tag "/javascripts/prototype" %>
 		<%= javascript_include_tag "/javascripts/scriptaculous" %>
 
@@ -28,7 +22,7 @@
 
 	<body>
 		<div class="sidebar">
-			<a class="title" href="/">Parlement</a>
+			<a class="title" href="http://leparlement.org">Parlement</a>
 
 			<div class="signets">
 				<a href="http://rubyforge.org/projects/parlement">forge</a>
@@ -38,8 +32,8 @@
 
 		<%= @content_for_layout %>
 
-		<!-- To make sure the content goes beyond the sidebar -->
-		<div style="clear:both"/>
+		<a href="<%= url_for :controller => 'elt', :action => 'show', :id => '' %>"
+			class="version">version <%= PARLEMENT_VERSION %></a>
 	</body>
 </html>
 

data/app/views/person/show.rhtml

@@ -0,0 +1,40 @@
+<h1><%= @person.name %></h1>
+
+<p>Created on <%= @person.created_on %></p>
+
+
+<p>Posts made by <%= @person.name %> 
+	<%= render :partial => '/help',
+		:locals => { :divId => 'body'+@person.id, :content => '
+			posts can be displayed more than once depending on their occurence in sub
+			threads
+			' } %></p>
+
+<%
+# TODO get the count from the parent element call
+e_pages = ActionController::Pagination::Paginator.new(
+		self, @person.elts.count, PAGE_ELT_LENGTH, @params['page'])
+e = Elt.find_all("person_id = '#{@person.id}'",
+		'created_on DESC', e_pages.current.to_sql)
+%>
+
+<%= link_to_remote('< Previous',
+		:update => 'eltSubs_'+elt.id.to_s,
+		:url => { :action => 'list', :id => elt, :page => e_pages.current.next },
+		:loading => visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s),
+		:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) if e_pages.current.next %>
+
+<span style="display:<%= e_pages.length > 1 ? '' : 'none'%>" class="pageCount">
+	(<%= e_pages.length-e_pages.current.to_i+1 %>/<%= e_pages.length %>)
+</span>
+
+<%= link_to_remote('Next >',
+		:update => 'eltSubs_'+elt.id.to_s,
+		:url => { :action => 'list', :id => elt, :page => e_pages.current.previous },
+		:loading => visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s),
+		:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) if e_pages.current.previous %>
+
+<%= render :partial => '/elt/elt',
+	:collection => e.reverse,
+	:locals => { :eltTop => false } %>
+

data/config/environment.rb

@@ -58,10 +58,13 @@ require 'rails_file_column'
 require 'jcode'
 $KCODE = 'u'
 
+PARLEMENT_VERSION='0.2'
+
 # How many elements are displayed at once
 PAGE_ELT_LENGTH = 20
 
-PARLEMENT_VERSION=0.1
+# What is the name of a quick anonymous poster
+ANONYMOUS_POSTER = 'anon'
 
 require 'environments/user_environment'
 

data/config/routes.rb

@@ -11,6 +11,7 @@ ActionController::Routing::Routes.draw do |map|
   # map.connect '', :controller => "welcome"
 
 	map.connect '', :controller => 'elt', :action => 'show', :id => 'parlement'
+	map.connect 'index.rss', :controller => 'elt', :action => 'rss', :id => 'parlement'
 	map.connect ':id', :controller => 'elt', :action => 'show', :id => 'parlement'
 	map.connect ':id/index.rss', :controller => 'elt', :action => 'rss'
 

data/db/ROOT/CV.txt

@@ -50,8 +50,8 @@ Langages : java, ruby, J2EE, XML/XSLT, SQL, UML.
 Bases de donn�es : "PostgreSQL":http://www.postgresql.org,
 "HsqlDB":http://hsqldb.org, "MySQL":http://www.mysql.com.
 
-Frameworks : "Cocoon":http://cocoon.apache.org, "ruby on
-rails":http://rubyonrails.org, "struts":http://struts.apache.org.
+Frameworks : "Cocoon":http://cocoon.apache.org, "Ruby on
+Rails":http://rubyonrails.org, "struts":http://struts.apache.org.
 
 Logiciels : "JBoss":http://jboss.org, "JOnAS":http://jonas.objectweb.org,
 "Tomcat":http://tomcat.apache.org, "Jetty":http://jetty.mortbay.org,

data/db/ROOT/parlement/news/release0.1.txt

@@ -0,0 +1,8 @@
+Version 0.1
+
+Initial release
+
+* Simple threaded forum
+* Optional registration
+
+

data/db/ROOT/parlement/news.txt

@@ -0,0 +1,2 @@
+News
+

data/db/ROOT/parlement/security/anonymity.txt

@@ -0,0 +1,17 @@
+Anonymity
+
+In the virtual world, it is impossible to be totally anonymous while still
+ensuring that one person can only vote once. Because at one moment or another
+you need to link a vote to a person.
+
+In the physical world this connection is lost in the voting box. But on
+internet everything can be traced, no matter what you do you can never be
+totally certain that a relation is lost.
+
+So to have anonymity a scheme can be constructed using trust. Trust that a
+voter can have into a third party of *his* choice. It is a trustee who will
+vouch for the voter's reinscription on the electoral list using a pseudonym.
+
+Thus you have two identities, the real person, knwown and accounted on the
+electoral list, but unable to vote because she is marked as anonymous. And a
+pseudonym.

data/db/ROOT/parlement/security.txt

@@ -3,8 +3,8 @@ Security
 Of course a large scale Direct Democracy relying on electrons is difficult to
 accept, due to one very valid reason: we can't trust internet.
 
-It is so easy to change rules, to break into systems, to subvert data, how,
-why? Can we ever use it for such an important things as politics?
+It is so easy to change rules, to break into servers, to subvert data. Can we
+ever use it for such an important things as politics?
 
 There is a way, a simple one relying on three elements:
 * p2p servers
@@ -18,17 +18,22 @@ When you cast a vote you sign it with your private key.
 Anybody can setup electoral lists that contain public keys.
 
 
-There you have it. Basic isn't it? Of course all data is totally transparent,
-to the point of being replicated among any number of servers. No anonimity (in
-the basic and simplest setup).
+There you have it. Basic isn't it? Of course it requires that *all* data is
+totally transparent, to the point it can be replicated among any number of
+server. No anonimity (in the basic and simplest setup).
 
 pgp signatures being what they are, can not be subverted (nowadays and in the
 near future), thus the votes can take any path available to them. They can be
 cast from any server. But to be sure that one's vote is not simply erased from
-that first node, it is recommended to check that it has been replicated to few
-other ones. Or better, to send it directly to different servers.
+that first node, it is recommended to check that it has been replicated to a
+few other ones. Or better, to send it directly to different servers.
 
-There can be any number of participants, votes, issues, but at the end of the
+There can be any number of participants, votes or issues, but at the end of the
 day the results are calculated using one electoral list and on one server.
 Everybody can check if thoses results are valid or not.
 
+This doesn't bring 100%% security, no such thing can exist even in the physical
+world, but it can bring trust. An active trust, if you care about the issues,
+the process, the participants, you can supervise it and make sure it goes as it
+should. The more eyes, the more trust.
+

data/db/ROOT/parlement.txt

@@ -5,7 +5,7 @@ unities: unity of time, unity of place and unity of object. It's a principle
 taking its roots in ancient Greece, and it certainly contributes to the awe we
 can feel when comes election day. But it is also a limitation...
 
-<div style="float:left;">
+<table align="center"><tr><td>
 
 In the physical world we vote on:
 
@@ -13,13 +13,11 @@ In the physical world we vote on:
 * one place
 * one issue
 
-</div>
-
-<div style="float:left;margin-top:3em;margin-right:3em;margin-bottom:1em">
+</td><td style="padding-right:3em;" vertical-align="center">
 
 =>
 
-</div>
+</td><td>
 
 In Internet we can vote:
 
@@ -27,6 +25,8 @@ In Internet we can vote:
 * any where
 * any issue
 
+</td></tr></table>
+
 It is us, individuals, citizens, who choose what we want to do.
 
 These three freedom have consequences, for example if you can vote anytime, you

data/db/ROOT/perso.txt

@@ -1,7 +1,7 @@
 echarp / manu
 
 <style>
-	.eltSub { display:none; }
+	.eltSub, .eltSubsClose { display:none; }
 </style>
 
 <div class="sidebar" style="clear:right">