parlement 0.8 → 0.9

data/app/views/elt/_elt.rhtml

@@ -8,23 +8,6 @@
 		:before => visual_effect(:DropOut, 'eltChoice_'+elt.id.to_s, { :queue => 'end' }),
 		:loaded => visual_effect(:Grow, 'eltChoice_'+elt.id.to_s, { :queue => 'end' })) %>
 
-		<% if !elt.new_record? %>
-			<span class="eltQuickAdd" id="eltQuickAdd_<%= elt.id %>" title="<%= elt.created_on %>">
-				<%= link_to_remote('<span class="icon">&gt;&gt;</span>',
-					{ :update => 'eltNew_'+elt.id.to_s,
-						:url => { :controller => 'elt', :action => 'new', :id => elt },
-						:loading => visual_effect(:SwitchOff, 'eltQuickAdd_'+elt.id.to_s),
-						:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
-							visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)+
-							"Element.scrollTo('eltNew_#{elt.id.to_s}')"},
-					{ :href => url_for(:controller => 'elt', :action => 'new', :id => @elt)}) %>
-			</span>
-
-			<span class="choice" id="eltChoice_<%= elt.id %>">
-				<%= render :partial => '/elt/choice', :locals => { :elt => elt } %>
-			</span>
-		<% end %>
-
 		<% cache :action => 'show', :id => elt.id do %>
 			<% if displayTitle? elt and elt.created_on %>
 				<span class="created_on"><%= elt.created_on.strftime('%d/%m/%y %H:%M') %></span>
@@ -67,14 +50,14 @@
 		<% end %>
 		<% @controller.expire_fragment( :action => 'show', :id => elt.id) if elt.new_record? %>
 
-		<!-- For IE -->&#160;
-
-	<!-- The choice end form, here to make sure it looks nice in text browsers -->
-	<%= end_form_tag %>
+		<% unless elt.new_record? %>
+			<span class="choice" id="eltChoice_<%= elt.id %>">
+				<%= render :partial => '/elt/choice', :locals => { :elt => elt } %>
+			</span>
+		<% end %>
 
-	<div class="eltSubs">
-		<span <%= 'style="display: none"' if (eltTop or elt.elts_count < 2) %>
-			class="eltMore" id="eltMore_<%= elt.id %>">
+		<span class="eltMore" id="eltMore_<%= elt.id %>"
+			<%= 'style="display: none"' if (eltTop or elt.elts_count < 2) %>>
 			<%= link_to_remote(elt.elts_count.to_s+' more',
 				{ :update => 'eltSubs_'+elt.id.to_s,
 					:url => { :controller => 'elt', :action => 'list', :id => elt },
@@ -82,6 +65,7 @@
 						visual_effect(:BlindDown, "eltSubs_#{elt.id.to_s}")+
 						visual_effect(:BlindDown, "eltSubsClose_#{elt.id.to_s}") },
 				{ :href => url_for(:controller => 'elt', :action => 'show', :id => elt) }) %>
+			<!--
 			-
 			<%= link_to_remote('Write <span class="icon">&gt;&gt;</span>',
 				{ :update => "eltNew_#{elt.id.to_s}",
@@ -89,34 +73,38 @@
 					:loaded => visual_effect(:BlindDown, "eltNew_#{elt.id.to_s}")+
 						visual_effect(:BlindDown, "eltSubsClose_#{elt.id.to_s}")},
 				{ :href => url_for(:controller => 'elt', :action => 'new', :id => elt)}) %>
+			-->
 		</span>
+	<!-- The choice end form, here to make sure it looks nice in text browsers -->
+	<%= end_form_tag %>
 
-		<!-- Display automatically one element threads -->
-		<ul <%= 'style="display: none"' unless (eltTop or elt.elts_count == 1) %>
-			id="eltSubs_<%= elt.id %>" class="eltSub">
-			<% if eltTop or elt.elts_count == 1 %>
-				<%= render :partial => '/elt/list', :locals => { :elt => elt } %>
-			<% end %>
-		</ul>
-
-		<ul class="eltNew" id="eltNew_<%= elt.id %>"></ul>
+	<ul class="eltNew" id="eltNew_<%= elt.id %>"></ul>
 
-		<span <%= 'style="display: none"' unless ((eltTop and elt.elts_count > 0) or elt.elts_count == 1) %>
-			id="eltSubsClose_<%= elt.id %>" title="<%= elt.created_on %>"
-			class="eltSubsClose">
-			<%= link_to_function('<span class="icon">&lt;&lt;</span> Close',
-					visual_effect(:BlindUp, "eltNew_#{elt.id}")+
-					visual_effect(:BlindUp, "eltSubsClose_#{elt.id}")+
-					visual_effect(:BlindUp, "eltSubs_#{elt.id}")+
-					visual_effect(:BlindDown, "eltMore_#{elt.id}")) %>
-			- 
-			<%= link_to_remote('Write <span class="icon">&gt;&gt;</span>',
-				{ :update => "eltNew_#{elt.id.to_s}",
-					:url => { :controller => 'elt', :action => 'new', :id => elt },
-					:loading => visual_effect(:BlindDown, "eltNew_#{elt.id.to_s}")+
-						visual_effect(:BlindDown, "eltSubsClose_#{elt.id.to_s}")},
-				{ :href => url_for(:controller => 'elt', :action => 'new', :id => elt)}) %>
-		</span>
-	</div>
+	<!-- Display automatically one element threads -->
+	<ul <%= 'style="display: none"' unless (eltTop or elt.elts_count == 1) %>
+		id="eltSubs_<%= elt.id %>" class="eltSub">
+		<% if eltTop or elt.elts_count == 1 %>
+			<%= render :partial => '/elt/list', :locals => { :elt => elt } %>
+		<% end %>
+	</ul>
+
+	<span <%= 'style="display: none"' unless ((eltTop and elt.elts_count > 0) or elt.elts_count == 1) %>
+		id="eltSubsClose_<%= elt.id %>" title="<%= elt.created_on %>"
+		class="eltSubsClose">
+		<%= link_to_function('<span class="icon">&lt;&lt;</span> Close',
+				visual_effect(:BlindUp, "eltNew_#{elt.id}")+
+				visual_effect(:BlindUp, "eltSubsClose_#{elt.id}")+
+				visual_effect(:BlindUp, "eltSubs_#{elt.id}")+
+				visual_effect(:BlindDown, "eltMore_#{elt.id}")) %>
+		<!--
+		- 
+		<%= link_to_remote('Write <span class="icon">&gt;&gt;</span>',
+			{ :update => "eltNew_#{elt.id.to_s}",
+				:url => { :controller => 'elt', :action => 'new', :id => elt },
+				:loading => visual_effect(:BlindDown, "eltNew_#{elt.id.to_s}")+
+					visual_effect(:BlindDown, "eltSubsClose_#{elt.id.to_s}")},
+			{ :href => url_for(:controller => 'elt', :action => 'new', :id => elt)}) %>
+		-->
+	</span>
 </li>
 

data/app/views/elt/new.rhtml

@@ -7,7 +7,7 @@
 <%= form_remote_tag(
 	:update => 'eltSubs_'+@elt.parent_id,
 	:url => { :action => 'create', :id => @elt.parent },
-	:position => 'bottom',
+	:position => 'top',
 	:before => visual_effect(:BlindUp, 'eltNew_'+@elt.parent_id),
 	:loading => "Element.show('eltSubs_#{@elt.parent_id}');
 		Element.show('eltSubsClose_#{@elt.parent_id}')") %>
@@ -29,13 +29,6 @@
 	<%= text_area 'elt', 'body' %>
 
 	<div class="eltNewButtons">
-		<%= submit_to_remote('Preview', 'Preview',
-			:update => "eltNewPreview_"+@elt.parent_id,
-			:url => { :action => "create", :id => @elt.parent, :submit => "preview" },
-			:loading => visual_effect(:BlindDown, 'eltNewPreview_'+@elt.parent_id)) %>
-
-		<%= submit_tag 'Propose!' %>
-
 		<%= render :partial => '/help',
 			:locals => { :divId => 'body'+@elt.parent_id, :content => '
 				_<em>emphasis</em>_ *<strong>strong</strong>* -<span
@@ -80,6 +73,13 @@
 				</div>
 				<a href="http://hobix.com/textile/quick.html">Textile Reference</a>
 			' } %>
+
+		<%= submit_to_remote('Preview', 'preview',
+			:update => "eltNewPreview_"+@elt.parent_id,
+			:url => { :action => "create", :id => @elt.parent, :submit => "preview" },
+			:loading => visual_effect(:BlindDown, 'eltNewPreview_'+@elt.parent_id)) %>
+
+		<%= submit_tag 'Propose!' %>
 	</div>
 <%= end_form_tag %>
 

data/app/views/elt/show.rhtml

@@ -1,5 +1,12 @@
 <% voters = Choice.count :select => 'person_id', :distinct => true %>
 <div class="sidebar">
+	<h3 class="boxTitle">Identity</h3>
+	<div class="box" id="identity">
+		<div id="author_<%= @elt.id %>">
+			<%= render :partial => 'account/show', :locals => { :divId => 'author_'+@elt.id } %>
+		</div>
+	</div>
+
 	<h3 class="boxTitle">Filter</h3>
 	<div class="box">
 		<div>All voters: <span class="result"><%= voters %></span></div>
@@ -7,9 +14,8 @@
 			<a onclick="return decrementFilter()" href="#" accesskey="<">&lt;</a>
 			<select id="filter" name="filter"
 				onchange="setFilter(this.options[this.selectedIndex].value)">
-				<option value="-<%= voters %>"></option>
-				<option selected="selected">0</option>
-				<% (1..voters).each { |v| %> <option><%= v %></option> <% } %>
+				<%= options_for_select [["", -voters]] %>
+				<%= options_for_select (0..(voters)), 0 %>
 			</select>
 			<a onclick="return incrementFilter()" href="#" accesskey=">">&gt;</a>
 			<%= submit_tag 'Ok' %>
@@ -17,13 +23,6 @@
 		<script>setFilterFromCookie();</script>
 	</div>
 
-	<h3 class="boxTitle">Identity</h3>
-	<div class="box" id="identity">
-		<div id="author_<%= @elt.id %>">
-			<%= render :partial => 'account/show', :locals => { :divId => 'author_'+@elt.id } %>
-		</div>
-	</div>
-
 	<h3 class="boxTitle">Highest posts</h3>
 	<div class="box listByVote">
 		<%= render :partial => '/elt/listByVote' %>
@@ -34,9 +33,9 @@
 		<%= render :partial => '/elt/listByDate' %>
 	</div>
 
-	<h3 class="boxTitle">Subscribe</h3>
+	<h3 class="boxTitle">Subscribers</h3>
 	<div class="box">
-		<div id="subscription">
+		<div id="subscription" <%= "style='display: none'" unless session[:person] %> >
 			<%= link_to_remote(((@session[:person] and @elt.subscribers.include?(@session[:person])) ? 'Unsubscribe!' : 'Subscribe!'),
 				:update => 'subscription',
 				:url => { :controller => 'subscriber', :action => 'subscribe', :id => @elt },
@@ -55,6 +54,16 @@
 			<% end %>
 		</div>
 	</div>
+
+	<h3 class="boxTitle">Search</h3>
+	<div class="box">
+		<form action="http://google.com/search">
+			<input type="hidden" name="q"
+				value="site:<%= ActionMailer::Base.server_settings[:domain] %>"/>
+			<input type="text" name="q"/>
+			<%= submit_tag 'OK' %>
+		</form>
+	</div>
 </div>
 
 <% @flash.each do |key, value| %>

data/app/views/layouts/top.rhtml

@@ -41,6 +41,7 @@
 				<a href="/people">people</a>
 				<a href="http://rubyforge.org/projects/parlement">forge</a>
 				<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>
+				<a id="fr" href="/fr">fr</a>
 			</span>
 		</div>
 

data/app/views/person/_listElts.rhtml

@@ -1,34 +1,55 @@
-<%
-e_pages = ActionController::Pagination::Paginator.new(
+<% e_pages = ActionController::Pagination::Paginator.new(
 		self, person.elts.count, PAGE_LENGTH, @params['page'])
-e = Elt.find_all("person_id = '#{person.id}'",
-		'created_on DESC', e_pages.current.to_sql)
-%>
+	e = Elt.find_all("person_id = '#{person.id}'",
+		'created_on DESC', e_pages.current.to_sql) %>
 
-<%
-# TODO There seems to be a problem with firefox when trying to use a visual_effect
-%>
+<% if e_pages.length > 1 %>
+	<li class="pager">
+		<%= link_to_remote('|&lt;',
+			{ :update => 'personElts_'+person.id.to_s,
+				:url => { :action => 'list', :id => person, :page => e_pages.first },
+				:before => visual_effect(:BlindUp, 'personElts_'+person.id.to_s, { :queue => 'end' }),
+				:loaded => visual_effect(:BlindDown, 'personElts_'+person.id.to_s, { :queue => 'end' }) },
+			{ :href => url_for(:controller => 'person', :action => 'show', :id => @person,
+					:page => e_pages.first)}) if e_pages.first != e_pages.current %>
 
-<%= link_to_remote('< Previous',
-		:update => 'personElts_'+person.id.to_s,
-		:url => { :action => 'list', :id => person, :page => e_pages.current.next },
-		:complete => visual_effect(:BlindDown, 'personElts_'+person.id.to_s)) if e_pages.current.next %>
+		<%= link_to_remote('&lt;',
+			{ :update => 'personElts_'+person.id.to_s,
+				:url => { :action => 'list', :id => person, :page => e_pages.current.previous },
+				:before => visual_effect(:BlindUp, 'personElts_'+person.id.to_s, { :queue => 'end' }),
+				:loaded => visual_effect(:BlindDown, 'personElts_'+person.id.to_s, { :queue => 'end' }) },
+			{ :href => url_for(:controller => 'person', :action => 'show', :id => @person,
+					:page => e_pages.current.previous )}) if e_pages.current.previous and e_pages.current.previous != e_pages.first %>
 
-<span style="display:<%= e_pages.length > 1 ? '' : 'none'%>" class="pageCount">
-	(<%= e_pages.length-e_pages.current.to_i+1 %>/<%= e_pages.length %>)
-</span>
+		<span class="pageCount">
+			<%= e_pages.current.to_i %> / <%= e_pages.length %>
+		</span>
 
-<%= link_to_remote('Next >',
-		:update => 'personElts_'+person.id.to_s,
-		:url => { :action => 'list', :id => person, :page => e_pages.current.previous },
-		:complete => visual_effect(:BlindDown, 'personElts_'+person.id.to_s)) if e_pages.current.previous %>
+		<%= link_to_remote('&gt;',
+			{ :update => 'personElts_'+person.id.to_s,
+				:url => { :action => 'list', :id => person, :page => e_pages.current.next },
+				:before => visual_effect(:BlindUp, 'personElts_'+person.id.to_s, { :queue => 'end' }),
+				:loaded => visual_effect(:BlindDown, 'personElts_'+person.id.to_s, { :queue => 'end' }) },
+			{ :href => url_for(:controller => 'person', :action => 'show', :id => @person,
+					:page => e_pages.current.next )}) if e_pages.current.next and e_pages.current.next != e_pages.last %>
 
-<% for elt in e.reverse[0...PAGE_LENGTH] %>
-	<div class="elt">
-		<span class="result"><%= sprintf("%+d", elt.result) %></span>
-		<%= elt.created_on.strftime('%d/%m %H:%M') %>
-		<%= link_to(elt.subject, :controller => 'elt', :action => 'show', :id => elt) %>
-		(<%= elt.children.size %> sub)
-	</div>
+		<%= link_to_remote('&gt;|',
+			{ :update => 'personElts_'+person.id.to_s,
+				:url => { :action => 'list', :id => person, :page => e_pages.last },
+				:before => visual_effect(:BlindUp, 'personElts_'+person.id.to_s, { :queue => 'end' }),
+				:loaded => visual_effect(:BlindDown, 'personElts_'+person.id.to_s, { :queue => 'end' }) },
+			{ :href => url_for(:controller => 'person', :action => 'show', :id => @person,
+					:page => e_pages.last)}) if e_pages.last != e_pages.current %>
+	</li>
+<% end %>
+
+<% 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(/\[.*\]/, ''), :controller => 'elt', :action => 'show', :id => elt %>
+		(<%= elt.children.size %> sub element(s))
+		<span class="choice result"><%= sprintf("%+d", elt.result) %></span>
+		<% "&#160;"*22 %>
+	</li>
 <% end %>
 

data/app/views/person/show.rhtml

@@ -1,7 +1,7 @@
 <div class="sidebar">
 	<div class="boxTitle">Avatar</div>
 	<div class="box" id="identity">
-		<%= image_tag (@person.image ? url_for_file_column("person", "image") : ""), :id => "avatar", :class => "avatar" %>
+		<%= image_tag (@person && @person.image ? @person.image : "/javascripts/blank.gif"), :class => "avatar" %>
 	</div>
 
 	<% if @person.subscribed_elts.size > 0 %>
@@ -9,31 +9,21 @@
 	<% end %>
 
 	<div class="box">
-		<% for elt in @person.subscribed_elts.reverse[0...PAGE_LENGTH] %>
+		<% 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, :controller => 'elt', :action => 'show', :id => elt) %>
+				<span class="choice result"><%= sprintf("%+d", elt.result) %></span>
+				<%= link_to(elt.subject.gsub(/\[.*\]/, ''), :controller => 'elt', :action => 'show', :id => elt) %>
 			</div>
 		<% end %>
 	</div>
 </div>
 
 
-<h1><%= @person.name %></h1>
-
-<p>Created on <%= @person.created_on %></p>
-
-<p>Posts made by <%= @person.name %></p>
+<p class="created_on"><%= @person.created_on %></p>
 
-<%
-# TODO get the count from the parent element call
-e_pages = ActionController::Pagination::Paginator.new(
-		self, @person.elts.count, PAGE_LENGTH, @params['page'])
-e = Elt.find_all("person_id = '#{@person.id}'",
-		'created_on DESC', e_pages.current.to_sql)
-%>
+<h1><%= @person.name %></h1>
 
-<div class="eltSubs" id="personElts_<%= @person.id %>">
+<ul class="eltSubs" id="personElts_<%= @person.id %>">
 	<%= render :partial => '/person/listElts', :locals => { :person => @person } %>
-</div>
+</ul>
 

data/config/environment.rb

@@ -64,16 +64,17 @@ require 'rails_file_column'
 require 'jcode'
 $KCODE = 'u'
 
-PARLEMENT_VERSION='0.8'
-
 # How many elements are displayed at once in a page
-PAGE_LENGTH = 10
+PAGE_LENGTH = 20
 # How many elements are displayed at once in a sidebar list
 LIST_LENGTH = 10
 
 # What is the name of a quick anonymous poster
 ANONYMOUS_POSTER = 'anon'
 
+# Number of elt's paragraphs to show initially
+NB_PARAGRAPH_TO_DISPLAY = 4
+
 require 'environments/user_environment'
 
 CONFIG = { :default_language => 'en' }
@@ -105,3 +106,5 @@ Engines.start :login
 
 Rubaidh::GoogleAnalytics.tracker_id = 'UA-317241-1'
 
+PARLEMENT_VERSION='0.9'
+

data/db/ROOT/fr.txt

@@ -1,48 +1,51 @@
 fr
 
-!/images/ParlementLogo.png!
+!/images/ParlementLogo_fr.png!
 
 Forum, liste de diffusion, blog, page personnelle, salon de discussion,
 journal.
 
 p=. *ET*
 
-Un outil d'écriture collaborative basé sur des principes démoractiques.
+Un outil d'�criture collaborative bas� sur des principes d�mocratiques.
 
-!{float:left;margin-right: 2em;}/attachment/file/architecture.png!
+!{float:left;margin-right: 2em;}/attachment/file/architecture_fr.png!
 
-Avec le  _paper_ nous votons:
-* un jour
-* un lieu
-* un sujet
+Avec le  _papier_ nous votons:
+* en un lieu
+* sur un sujet
+* sur une journ�e
 
 Avec _Internet_ nous pouvons voter:
-* n'importe quand
-* n'importe où
-* n'importe quel sujet
+* partout
+* sur tout
+* tout le temps
 
-C'est une révolution, remettant en cause des règles datant de la Grèce antique.
-Des règles qui certainement contribuent au sentiment d'émerveillement que l'on
-peut ressentir les jours d'élections, mais qui aussi restreignent nos libertés
+C'est une r�volution, remettant en cause des r�gles datant de la Gr�ce antique.
+Des r�gles qui certainement contribuent au sentiment d'�merveillement que l'on
+peut ressentir les jours d'�lections, mais qui aussi restreignent nos libert�s
 de participation en politique.
 
-Maintenant nous pouvons acquérir trois nouvelles libertés: liberté de temps, de
+Maintenant nous pouvons acqu�rir trois nouvelles libert�s: libert� de temps, de
 lieu et d'objet. Nous pouvons voter depuis chez nous, au milieu de la nuit ou
-sur les petits problèmes donc nous nous préoccupons.
-
-There are consequences. For example if you can vote anytime, why not also
-_change your vote_ if you so wish? If votes are permanent, why have dates and
-agendas, except for outside conditions?
-
-If you can vote on any issue, then why not allow _everybody to propose polls_?
-No technical limitation limits that ability, but for our own capacity to follow
-all of them. And in fact their number growing, _delegating_ your votes will
-become a required feature, allowing you to concentrate on the parts that
-interest you the most, while delegating your voice to someone you trust on
-other matters.
-
-If you can vote from anywhere, then you can vote in front of anybody, this
-means _vote selling_ is a possibility. It is not anti democratic, it's a
-feature. A feature that, yes, could result into an oligarchy, it all depends on
-the value of our votes.
+sur les petits probl�mes dont nous nous pr�occupons.
+
+Il y a des cons�quences, par exemple si l'on peut voter � tout moment, pourquoi
+ne pas aussi _changer votre vote_ si vous le d�sirez? Si les votes sont
+permanents, pourquoi avoir dates et agendas, si ce n'est pour des conditions
+externes?
+
+Si vous pouvez voter sur tous les sujets, alors pourquoi ne pas permettre que
+_tout le monde puisse proposer des �lections_? Aucune limitation technique ne
+limite cette possibilit�, � part nos propres capacit�s � les suivre toutes. Et
+dans les faits, leur nombre grossissant, _d�l�guer_ son vote va devenir une
+fonctionnalit� n�cessaire, vous permettant de vous concentrer sur les parties
+qui vous int�ressent le plus, alors que sur le reste vous d�l�guez votre voix �
+une personne en qui vous avez confiance.
+
+Si vous pouvez voter de n'importe o�, alors vous pouvez voter en face de
+quelqu'un d'autre, ce qui veut dire que la _vente de vote_ est une possibilit�.
+Ceci n'est pas anti d�mocratique, c'est une fonctionnalit�. Une fonctionnalit�
+qui, oui, peut r�sulter en une oligarchie, cela d�pend de la valeur de nos
+votes.