parlement 0.12 → 0.13

data/app/views/elt/_listVisitors.rhtml

@@ -0,0 +1,20 @@
+<h3 class="boxTitle"><%= _('Visitors') %></h3>
+
+<%visitors = Person.find :all,
+  :select => 'people.id, people.name, MAX(updated_on) AS updated_on, MAX(filter) AS filter',
+  :joins => "JOIN visits ON people.id = visits.person_id \
+    JOIN elts elts ON visits.elt_id = elts.id
+      AND ((#{@elt.lft} <= elts.lft AND elts.rgt <= #{@elt.rgt}) \
+        OR (elts.lft < #{@elt.lft} AND #{@elt.rgt} < elts.rgt))",
+  :group => [ 'people.id, ', 'people.name' ],
+  :order => 'MAX(visits.updated_on) DESC' %>
+
+<% visitors.each do |visitor| %>
+  <span class="person">
+    <span class="author" title="<%= visitor.updated_on %>">
+      <%= link_to visitor.name, :controller => 'person', :action => 'show', :id => visitor.id %>
+    </span>
+    <span class="filter"><%= "(#{ visitor.filter })" if visitor.filter %></span>
+  </span>
+<% end %>
+

data/app/views/elt/new.rhtml

@@ -8,33 +8,46 @@
 	:update => 'eltSubs_'+@elt.parent_id,
 	:url => { :action => 'create', :id => @elt.parent },
 	:position => 'top',
-	:before => visual_effect(:BlindUp, 'eltNew_'+@elt.parent_id),
+  :before => visual_effect(:BlindUp, "eltNew_#{@elt.parent_id}"),
 	:loading => "Element.show('eltSubs_#{@elt.parent_id}');
 		Element.show('eltSubsClose_#{@elt.parent_id}')") do %>
 
 	<%= hidden_field 'elt', 'parent_id' %>
 
-	<h2>
-		<%= text_field 'elt', 'subject' %>
-
-		<%= render :partial => '/help',
-			:locals => { :divId => 'title'+@elt.parent_id, :content => _('This is the title of your proposition.<br/>If you leave it as it is then it won\'t be displayed (recommanded if your text is short, like in a conversation).') } %>
-	</h2>
-
-	<%= 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 style="text-decoration: line-through;">strike-through</span>- +added+^<sup>sup</sup>^ ~<sub>sub</sub>~<div>bg. blockquote =&gt; </div><blockquote>blockquote</blockquote> "Google":http://google.com =&gt; <a href="http://google.com">Google</a><br/><pre>@code@</pre><div style="float:left">ordered list<br/># first item<br/># second item<br/># third item</div><div style="margin-left:10em"><ol>ordered list<li>first item</li><li>second item</li><li>third item</li></ol></div><div style="float:left">unordered list<br/>* item<br/>* item<br/>* item</div><div style="margin-left:10em"><ul>unordered list<li>item</li><li>item</li><li>item</li></ul></div><a href="http://hobix.com/textile/quick.html">Textile Reference</a>') } %>
-	</div>
+  <span id="eltNewWrite_<%= @elt.parent_id %>">
+    <h2>
+      <%= text_field 'elt', 'subject' %>
+
+      <%= render :partial => '/help',
+        :locals => { :divId => 'title'+@elt.parent_id,
+          :content => _('This is the title of your proposition.<br/>If you leave it as it is then it won\'t be displayed (recommanded if your text is short, like in a conversation).') } %>
+    </h2>
+
+    <%= 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" },
+        :before => visual_effect(:BlindUp, 'eltNewWrite_'+@elt.parent_id),
+        :loading => visual_effect(:BlindDown, 'eltNewPropose_'+@elt.parent_id)) %>
+
+      <%= 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+^<sup>sup</sup>^ ~<sub>sub</sub>~<div>bg. blockquote =&gt; </div><blockquote>blockquote</blockquote> "Google":http://google.com =&gt; <a href="http://google.com">Google</a><br/><pre>@code@</pre><div style="float:left">ordered list<br/># first item<br/># second item<br/># third item</div><div style="margin-left:10em"><ol>ordered list<li>first item</li><li>second item</li><li>third item</li></ol></div><div style="float:left">unordered list<br/>* item<br/>* item<br/>* item</div><div style="margin-left:10em"><ul>unordered list<li>item</li><li>item</li><li>item</li></ul></div><a href="http://hobix.com/textile/quick.html">Textile Reference</a>') } %>
+    </div>
+  </span>
+
+  <span id="eltNewPropose_<%= @elt.parent_id %>" style="display: none">
+    <span class="elt" id="eltNewPreview_<%= @elt.parent_id %>"></span>
+
+    <div class="eltNewButtons">
+      <%= link_to_function('<span class="icon">&lt;&lt;</span> '+_('Modify'),
+        visual_effect(:BlindDown, 'eltNewWrite_'+@elt.parent_id) \
+          +visual_effect(:BlindUp, 'eltNewPropose_'+@elt.parent_id)) %>
+
+      <%= submit_tag _('Propose!') %>
+    </div>
+  </span>
 <% end %>
 
-<span class="elt" id="eltNewPreview_<%= @elt.parent_id %>"/>
-

data/app/views/elt/show.rhtml

@@ -1,15 +1,23 @@
 <% voters = Choice.count :select => 'person_id', :distinct => true %>
+
+<%= periodically_call_remote(:update => 'spinner', :url => { :action => 'updateView', :id => @elt })%>
+<span id="spinner">
+  <!--
+  <%= image_tag "/images/live_tree_loading_spinner.gif" %>
+  -->
+</span>
+
 <div class="sidebar">
-  <h3 class="boxTitle"><%= _('Identity')%></h3>
-	<div class="box" id="identity"><%= render :partial => 'account/show' %></div>
+  <div class="box identity" id="identity">
+    <%= render :partial => 'account/show', :locals => { :elt => @elt.parent } %>
+  </div>
 
-  <h3 class="boxTitle"><%= _('Filter') %></h3>
-	<div class="box">
-  <div><%= _('All voters:') %> <span class="result"><%= voters %></span></div>
-		<form id="filterForm" name="filterForm">
+	<div class="box" id="filter">
+    <h3 class="boxTitle"><%= _('Filter') %></h3>
+    <form id="filterForm" name="filterForm">
 			<a onclick="return decrementFilter()" href="#" accesskey="<">&lt;</a>
 			<select id="filter" name="filter"
-				onchange="setFilter(this.options[this.selectedIndex].value)">
+        onchange="setFilter(this.options[this.selectedIndex].value, '<%= @elt.id %>')">
 				<%= options_for_select [["", -voters]] %>
 				<%= options_for_select (0..(voters)), 0 %>
 			</select>
@@ -19,17 +27,24 @@
 		<script>setFilterFromCookie();</script>
 	</div>
 
-  <h3 class="boxTitle"><%= _('Subscribers') %></h3>
-	<div class="box"><%= render :partial => '/subscriber/list' %></div>
+  <div class="box" id="listVisitors">
+    <%= render :partial => '/elt/listVisitors' %>
+  </div>
 
-  <h3 class="boxTitle"><%= _('Highest posts') %></h3>
-	<div class="box listByVote"><%= render :partial => '/elt/listByVote' %></div>
+  <div class="box" id="listSubscribers">
+    <%= render :partial => '/subscriber/list' %>
+  </div>
 
-  <h3 class="boxTitle"><%= _('Latest posts') %></h3>
-	<div class="box listByDate"><%= render :partial => '/elt/listByDate' %></div>
+  <div class="box" id="listByVote">
+    <%= render :partial => '/elt/listByVote' %>
+  </div>
+
+  <div class="box" id="listByDate">
+    <%= render :partial => '/elt/listByDate' %>
+  </div>
 
-  <h3 class="boxTitle"><%= _('Links') %></h3>
   <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>
@@ -58,8 +73,8 @@
         Worldwide Direct Democracy Movement</a></div>
   </div>
 
-  <h3 class="boxTitle"><%= _('Search') %></h3>
 	<div class="box">
+    <h3 class="boxTitle"><%= _('Search') %></h3>
 		<form action="http://google.com/search">
 			<input type="hidden" name="q"
 				value="site:<%= ActionMailer::Base.smtp_settings[:domain] %>"/>

data/app/views/subscriber/_list.rhtml

@@ -1,18 +1,27 @@
-<div id="subscription">
-	<div class="boxLine">
-		<% @elt.all_subscriptions.each do |p| %>
-			<%= link_to p.person.name, :controller => 'person', :action => 'show', :id => p.person %>
-			<%= "(#{ p.filter })" if p.filter %>
-		<% end %>
-	</div>
+<h3 class="boxTitle"><%= _('Subscribers') %></h3>
 
-	<div id="subscriptionLink" class="boxLineR"
-		<%= "style='display: none'" unless session[:person] %> >
-		<%= link_to_remote _('Add/remove me!'),
-			:update => 'subscription',
-			:url => { :controller => 'subscriber', :action => 'subscribe', :id => @elt },
-			:before => visual_effect(:BlindUp, 'subscription', { :queue => 'end' }),
-			:loaded => visual_effect(:BlindDown, 'subscription', { :queue => 'end' }) %>
-	</div>
+<% subscribers = Person.find :all,
+  :select => 'people.id, people.name, MIN(subscriptions.created_on) AS created_on, MAX(filter) AS filter',
+  :joins => "JOIN subscriptions ON people.id = subscriptions.person_id \
+    JOIN elts elts ON subscriptions.elt_id = elts.id
+      AND ((#{@elt.lft} <= elts.lft AND elts.rgt <= #{@elt.rgt}) \
+        OR (elts.lft < #{@elt.lft} AND #{@elt.rgt} < elts.rgt))",
+  :group => [ 'people.id, ', 'people.name' ],
+  :order => 'MIN(subscriptions.created_on) DESC' %>
+
+<% subscribers.each do |s| %>
+  <span class="author">
+    <%= link_to s.name, :controller => 'person', :action => 'show', :id => s.id %>
+  </span>
+  <span class="filter"><%= "(#{ s.filter })" if s.filter %></span>
+<% end %>
+
+<div id="subscriptionLink" class="boxLineR"
+  <%= "style='display: none'" unless session[:person] %> >
+  <%= link_to_remote _('Add/remove me!'),
+    :update => 'listSubscribers',
+    :url => { :controller => 'subscriber', :action => 'subscribe', :id => @elt },
+    :before => visual_effect(:BlindUp, 'listSubscribers', { :queue => 'end' }),
+    :loaded => visual_effect(:BlindDown, 'listSubscribers', { :queue => 'end' }) %>
 </div>
 

data/config/database.yml

@@ -10,7 +10,7 @@ development:
   database: parlement_development
   username: manu
   password: manu
-	#encoding: unicode
+  #encoding: unicode
 
   # Connect on a TCP socket.  If omitted, the adapter will connect on the
   # domain socket given by socket instead.
@@ -25,14 +25,14 @@ test:
   database: parlement_test
   username: manu
   password:
-	#encoding: unicode
+  #encoding: unicode
 
 production:
   adapter: postgresql
   database: parlement_production
   username: manu
   password: manu
-	#encoding: unicode
+  #encoding: unicode
 
 
 # PostgreSQL versions 7.4 - 8.1

data/config/environment.rb

@@ -112,5 +112,5 @@ end
 
 Rubaidh::GoogleAnalytics.tracker_id = 'UA-317241-1'
 
-PARLEMENT_VERSION='0.12'
+PARLEMENT_VERSION='0.13'
 

data/db/ROOT/Titemagli.txt

@@ -0,0 +1,3 @@
+Titemagli
+
+

data/db/ROOT/titemagli.txt

@@ -0,0 +1,9 @@
+Titemagli
+
+Bonjour, c'est moi
+
+<style>
+	.links, #identity, #filter, .choice label, div#listByVote { display: none; }
+	.sidebar { margin-top: 1.5em; }
+</style>
+