parlement 0.5 → 0.6

data/app/views/elt/new.rhtml

@@ -4,24 +4,15 @@
 
 <%= error_messages_for 'elt' %>
 
-<!--
-<span id="author_<%= @elt.parent_id %>">
-	<%= render :partial => 'account/show',
-		:locals => { :divId => 'author_'+@elt.parent_id } %>
-</span>
--->
-
 <%= form_remote_tag(
 	:update => 'eltSubs_'+@elt.parent_id,
-	:url => { :action => 'create' },
+	:url => { :action => 'create', :id => @elt.parent },
 	:position => 'bottom',
-	:loading => visual_effect(:BlindUp, 'eltNew_'+@elt.parent.id.to_s),
-	:complete => "Element.show('eltSubs_#{@elt.parent_id.to_s}');
-		Element.show('eltSubsClose_#{@elt.parent_id.to_s}');",
-	:loaded => visual_effect(:BlindDown, 'elt_'+@elt.id.to_s)) %>
+	:before => visual_effect(:BlindUp, 'eltNew_'+@elt.parent_id),
+	:loading => "Element.show('eltSubs_#{@elt.parent_id}');
+		Element.show('eltSubsClose_#{@elt.parent_id}')") %>
 
-	<!--[form:elt]-->
-	<%= hidden_field 'elt', 'parent_id' %></p>
+	<%= hidden_field 'elt', 'parent_id' %>
 
 	<h2>
 		<%= text_field 'elt', 'subject' %>
@@ -35,18 +26,14 @@
 			' } %>
 	</h2>
 
-	<div style="display:none">
-		<label for="elt_position">Position:</label>
-		<%= text_field 'elt', 'position', 'size' => 1, 'align' => 'right' %>
-	</div>
-
 	<%= text_area 'elt', 'body' %>
 
 	<div class="eltNewButtons">
 		<%= submit_to_remote('Preview', 'Preview',
-				:update => 'eltNewPreview_'+@elt.parent_id,
-				:url => { :action => 'create', :submit => :preview },
-				:loaded => visual_effect(:BlindDown, 'eltNewPreview_'+@elt.parent_id)) %>
+			: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',
@@ -94,9 +81,7 @@
 				<a href="http://hobix.com/textile/quick.html">Textile Reference</a>
 			' } %>
 	</div>
-
-	<span class="eltNew" id="eltNewPreview_<%= @elt.parent_id %>"/>
-
-	<!--[eoform:elt]-->
 <%= end_form_tag %>
 
+<span class="elt" id="eltNewPreview_<%= @elt.parent_id %>"/>
+

data/app/views/elt/rss.rxml

@@ -1,16 +1,17 @@
 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 => nil, :id => @elt.id))
-		xml.description @elt.subject+" (parlement)"
-		xml.language "en"
-		xml.language "fr"
+		xml.title @elt.subject
+		xml.link url_for(:only_path => false, :action => 'show', :id => @elt)
+		xml.description @elt.subject
 
-		for item in @elt.children.reverse
+		Elt.find(:all,
+			:conditions => "lft > #{@elt.lft} AND rgt < #{@elt.rgt}",
+			:order => 'created_on DESC',
+			:limit => PAGE_ELT_LENGTH).each do |item|
 			xml.item do
-				xml.title(item.subject)
+				xml.title item.subject
 				#xml.category(@elt.subject)
-				xml.pubDate(item.created_on)
+				xml.pubDate item.created_on
 
 				if url_for(:only_path => false).match(/http:\/\/echarp.dyndns.org/) and @elt.id == 'blog'
 					xml.link(url_for(:only_path => false, :controller => 'perso',
@@ -18,14 +19,15 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
 					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.id))
-					xml.comments(url_for(:only_path => false, :action => 'show', :id => item.id))
+					xml.link(url_for(:only_path => false, :action => 'show', :id => item))
+					xml.comments(url_for(:only_path => false, :action => 'show', :id => item))
 				end
 
-				xml.tag!("dc:creator", item.person.name) if item.person != nil
+				xml.tag!("dc:creator", item.person.name) if item.person
 
-				xml.description("<p>"+format(item.body)+"</p>")
+				xml.description "<p>"+format(item.body)+"</p>"
 			end
 		end
 	end
 end
+

data/app/views/elt/show.rhtml

@@ -2,7 +2,7 @@
 	<h3 class="boxTitle">Electoral list</h3>
 	<div class="box">
 		All voters:
-		<span class="result" style="float: none">
+		<span class="result selected" style="float: none">
 			<%= Choice.count :select => 'person_id', :distinct => true %>
 		</span>
 	</div>
@@ -10,36 +10,27 @@
 	<h3 class="boxTitle">Identity</h3>
 	<div class="box">
 		<div id="author_<%= @elt.id %>">
-			<%= render :partial => 'account/show',
-					:locals => { :divId => 'author_'+@elt.id } %>
+			<%= render :partial => 'account/show', :locals => { :divId => 'author_'+@elt.id } %>
 		</div>
 	</div>
 
-	<% if @elt.children.count > 0 %>
-		<h3 class="boxTitle">Titres</h3>
-	<% end %>
-
-	<div class="box">
-		<ul>
-			<% for elt in @elt.children.reverse[0...PAGE_ELT_LENGTH] %>
-				<li class="boxLine" title="<%= elt.created_on.strftime('%d/%m') %>">
-					<span class="result"><%= sprintf("%+d", elt.result) %></span>
-					<%= link_to elt.subject, :id => elt %>
-				</li>
-			<% end %>
-		</ul>
+	<% if @elt.elts_count > 0 %><h3 class="boxTitle">Highest posts</h3><% end %>
+	<div class="box listByVote">
+		<%= render :partial => '/elt/listByVote' %>
+	</div>
 
-		<%= link_to image_tag("/images/webfeed.gif"),
-				:action => 'rss', :id => @elt %>
+	<% if @elt.elts_count > 0 %><h3 class="boxTitle">Latest posts</h3><% end %>
+	<div class="box listByDate">
+		<%= render :partial => '/elt/listByDate' %>
 	</div>
 
 	<h3 class="boxTitle">Subscribe</h3>
 	<div class="box">
 		<div id="subscription">
 			<%= link_to_remote(((@session[:person] and @elt.subscribers.include?(@session[:person])) ? 'Unsubscribe!' : 'Subscribe!'),
-					:update => 'subscription',
-					:url => { :controller => 'subscriber', :action => 'subscribe', :id => @elt },
-					:loaded => visual_effect(:BlindDown, 'subscription')) %>
+				:update => 'subscription',
+				:url => { :controller => 'subscriber', :action => 'subscribe', :id => @elt },
+				:loaded => visual_effect(:BlindDown, 'subscription')) %>
 		</div>
 
 		<div class="boxLine">
@@ -47,7 +38,12 @@
 				<%= link_to(i.name, :controller => 'person', :action => 'show', :id => i) %>
 			<% end %>
 		</div>
-		<div class="boxLineR"><%= @elt.subscribers.size %> subscriber(s)</div>
+
+		<div class="boxLineR">
+			<% @elt.parent.all_recipients.each do |i| %>
+				<%= link_to(i.name, :controller => 'person', :action => 'show', :id => i) %>
+			<% end %>
+		</div>
 	</div>
 </div>
 
@@ -55,14 +51,12 @@
 	<div class="<%= key %>"><%= value %></div>
 <% end %>
 
-<% if @elt.parent and @elt.parent.subject != '' %>
-	<h3 class="parent">
-		<%= link_to(textilize_without_paragraph(@elt.parent.subject),
-				:id => @elt.parent) %>
-	</h3>
-<% end %>
+<h3 class="parent">
+	<%= link_to textilize_without_paragraph(@elt.parent.subject), :id => @elt.parent \
+			if @elt.parent %>
+</h3>
 
-<ul>
+<ul class="top">
 	<%= render :partial => 'elt', :layout => 'top',
 			:locals => { :elt => @elt, :eltTop => true } %>
 </ul>

data/app/views/elt/vote_rss.rxml

@@ -0,0 +1,40 @@
+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.description @elt.subject
+
+		Elt.find(:all,
+			:select => 'SUM(value), elts.id, parent_id, elts.created_on, parent_id,' \
+				+'elts_count, position, elts.person_id, subject, body, lft, rgt',
+			:conditions => "lft > #{@elt.lft} AND rgt < #{@elt.rgt}",
+			:order => 'SUM(value) IS NULL, SUM(value) DESC, created_on DESC',
+			:group => 'elts.id, parent_id, elts.created_on, parent_id, elts_count,' \
+				+'position, elts.person_id, subject, body, lft, rgt',
+			:limit  => PAGE_ELT_LENGTH,
+			:joins => "LEFT JOIN choices ON elt_id = elts.id").each do |item|
+
+			xml.item do
+				xml.title item.subject
+				#xml.category(@elt.subject)
+				xml.vote item.result
+				xml.pubDate item.created_on
+
+				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.tag!("dc:creator", item.person.name) if item.person
+
+				xml.description "<p>"+format(item.body)+"</p>"
+			end
+		end
+	end
+end
+

data/app/views/layouts/top.rhtml

@@ -7,9 +7,9 @@
 		<%= stylesheet_link_tag 'default.css' %>
 		<%= javascript_include_tag "/javascripts/prototype" %>
 		<%= javascript_include_tag "/javascripts/scriptaculous" %>
-		<!--
-		<%= javascript_include_tag "/javascripts/borders" %>
-		-->
+
+		<%= javascript_include_tag "/javascripts/behaviour" %>
+		<%= javascript_include_tag "/javascripts/mybehaviour" %>
 
 		<!-- compliance patch for microsoft browsers -->
 		<!--[if lt IE 7]>
@@ -17,7 +17,6 @@
 		<%= javascript_include_tag "/javascripts/ie7.js" %>
 		<![endif]-->
 
-
 		<link rel="shortcut icon" href="/images/world.png" type="image/png"/>
 
 		<meta name="ROBOTS" content="ALL"/>
@@ -34,10 +33,10 @@
 	<body>
 		<div class="links">
 			<a class="title" href="http://leparlement.org">Parlement</a>
-			<div class="signets">
+			<span class="signets">
 				<a href="http://rubyforge.org/projects/parlement">forge</a>
 				<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>
-			</div>
+			</span>
 		</div>
 
 		<%= @content_for_layout %>
@@ -52,13 +51,6 @@
 				<img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Strict"/>
 			</a>
 		</p>
-
-		<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-		</script>
-		<script type="text/javascript">
-			_uacct = "UA-317241-1";
-			urchinTracker();
-		</script>
 	</body>
 </html>
 

data/config/environment.rb

@@ -64,7 +64,7 @@ require 'rails_file_column'
 require 'jcode'
 $KCODE = 'u'
 
-PARLEMENT_VERSION='0.5'
+PARLEMENT_VERSION='0.6'
 
 # How many elements are displayed at once
 PAGE_ELT_LENGTH = 10
@@ -101,3 +101,5 @@ module LoginEngine
 end
 Engines.start :login
 
+Rubaidh::GoogleAnalytics.tracker_id = 'UA-317241-1'
+

data/config/routes.rb

@@ -12,16 +12,20 @@ ActionController::Routing::Routes.draw do |map|
 
 	map.connect '', :controller => 'elt', :action => 'show', :id => 'parlement'
 	map.connect 'index.rss', :controller => 'elt', :action => 'rss', :id => 'parlement'
+	map.connect 'vote.rss', :controller => 'elt', :action => 'vote_rss', :id => 'parlement'
 
 	map.connect ':id', :controller => 'elt', :action => 'rss', :requirements => { :id => /.*\.rss/ }
 	map.connect ':id', :controller => 'elt', :action => 'show'
 	map.connect ':id/index.rss', :controller => 'elt', :action => 'rss'
+	map.connect ':id/vote.rss', :controller => 'elt', :action => 'vote_rss'
 	map.connect ':id//index.rss', :controller => 'elt', :action => 'rss'
+	map.connect ':id//vote.rss', :controller => 'elt', :action => 'vote_rss'
 
 	map.connect 'perso/:id', :controller => 'elt', :action => 'show'
 	map.connect 'perso/:id/index.rss', :controller => 'elt', :action => 'rss'
 	map.connect 'perso/blog/:id', :controller => 'elt'
 	map.connect 'perso/blog/:id/index.rss', :controller => 'elt', :action => 'rss'
+	map.connect 'perso/blog/:id/vote.rss', :controller => 'elt', :action => 'vote_rss'
 
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'

data/db/development_structure.sql

@@ -70,7 +70,10 @@ CREATE TABLE elts (
     created_on timestamp with time zone DEFAULT now() NOT NULL,
     person_id text,
     subject text,
-    body text
+    body text,
+    lft integer,
+    rgt integer,
+    elts_count integer DEFAULT 0
 );
 
 
@@ -357,4 +360,4 @@ ALTER TABLE ONLY usersold
 -- PostgreSQL database dump complete
 --
 
-INSERT INTO schema_info (version) VALUES (1)
+INSERT INTO schema_info (version) VALUES (3)

data/db/migrate/002_nested_set.rb

@@ -0,0 +1,22 @@
+class NestedSet < ActiveRecord::Migration
+
+	def NestedSet.nested_set_construction(e)
+		e.children.each { |c|
+			e.add_child c
+			nested_set_construction c
+		}
+	end
+
+  def self.up
+		add_column :elts, :lft, :integer
+		add_column :elts, :rgt, :integer
+
+		e = Elt.find 'ROOT'
+		NestedSet.nested_set_construction e
+  end
+
+  def self.down
+		remove_column :elts, :lft
+		remove_column :elts, :rgt
+  end
+end

data/db/migrate/003_elt_children_count.rb

@@ -0,0 +1,12 @@
+class EltChildrenCount < ActiveRecord::Migration
+  def self.up
+		add_column :elts, :elts_count, :integer, :default => 0
+		execute 'UPDATE elts SET elts_count = (SELECT COUNT(*) FROM elts e2 WHERE e2.parent_id = elts.id)'
+		add_index "elts", ["lft"], :name => "elts_lft_key", :unique => true
+		add_index "elts", ["parent_id"], :name => "elts_parent_key"
+  end
+
+  def self.down
+		remove_column :elts, :elts_count
+  end
+end

data/public/javascripts/behaviour.js

@@ -0,0 +1,254 @@
+/*
+   Behaviour v1.1 by Ben Nolan, June 2005. Based largely on the work
+   of Simon Willison (see comments by Simon below).
+
+   Description:
+   	
+   	Uses css selectors to apply javascript behaviours to enable
+   	unobtrusive javascript in html documents.
+   	
+   Usage:   
+   
+	var myrules = {
+		'b.someclass' : function(element){
+			element.onclick = function(){
+				alert(this.innerHTML);
+			}
+		},
+		'#someid u' : function(element){
+			element.onmouseover = function(){
+				this.innerHTML = "BLAH!";
+			}
+		}
+	};
+	
+	Behaviour.register(myrules);
+	
+	// Call Behaviour.apply() to re-apply the rules (if you
+	// update the dom, etc).
+
+   License:
+   
+   	This file is entirely BSD licensed.
+   	
+   More information:
+   	
+   	http:/ipcord.co.nz/behaviour/
+   
+*/   
+
+var Behaviour = {
+	list : new Array,
+	
+	register : function(sheet){
+		Behaviour.list.push(sheet);
+	},
+	
+	start : function(){
+		Behaviour.addLoadEvent(function(){
+			Behaviour.apply();
+		});
+	},
+	
+	apply : function(){
+		for (h=0;sheet=Behaviour.list[h];h++){
+			for (selector in sheet){
+				list = document.getElementsBySelector(selector);
+				
+				if (!list){
+					continue;
+				}
+
+				for (i=0;element=list[i];i++){
+					sheet[selector](element);
+				}
+			}
+		}
+	},
+	
+	addLoadEvent : function(func){
+		var oldonload = window.onload;
+		
+		if (typeof window.onload != 'function') {
+			window.onload = func;
+		} else {
+			window.onload = function() {
+				oldonload();
+				func();
+			}
+		}
+	}
+}
+
+Behaviour.start();
+
+/*
+   The following code is Copyright (C) Simon Willison 2004.
+
+   document.getElementsBySelector(selector)
+   - returns an array of element objects from the current document
+     matching the CSS selector. Selectors can contain element names, 
+     class names and ids and can be nested. For example:
+     
+       elements = document.getElementsBySelect('div#main p a.external')
+     
+     Will return an array of all 'a' elements with 'external' in their 
+     class attribute that are contained inside 'p' elements that are 
+     contained inside the 'div' element which has id="main"
+
+   New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
+   See http://www.w3.org/TR/css3-selectors/#attribute-selectors
+
+   Version 0.4 - Simon Willison, March 25th 2003
+   -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
+   -- Opera 7 fails 
+*/
+
+function getAllChildren(e) {
+  // Returns all children of element. Workaround required for IE5/Windows. Ugh.
+  return e.all ? e.all : e.getElementsByTagName('*');
+}
+
+document.getElementsBySelector = function(selector) {
+  // Attempt to fail gracefully in lesser browsers
+  if (!document.getElementsByTagName) {
+    return new Array();
+  }
+  // Split selector in to tokens
+  var tokens = selector.split(' ');
+  var currentContext = new Array(document);
+  for (var i = 0; i < tokens.length; i++) {
+    token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');;
+    if (token.indexOf('#') > -1) {
+      // Token is an ID selector
+      var bits = token.split('#');
+      var tagName = bits[0];
+      var id = bits[1];
+      var element = document.getElementById(id);
+      if (tagName && element.nodeName.toLowerCase() != tagName) {
+        // tag with that ID not found, return false
+        return new Array();
+      }
+      // Set currentContext to contain just this element
+      currentContext = new Array(element);
+      continue; // Skip to next token
+    }
+    if (token.indexOf('.') > -1) {
+      // Token contains a class selector
+      var bits = token.split('.');
+      var tagName = bits[0];
+      var className = bits[1];
+      if (!tagName) {
+        tagName = '*';
+      }
+      // Get elements matching tag, filter them for class selector
+      var found = new Array;
+      var foundCount = 0;
+      for (var h = 0; h < currentContext.length; h++) {
+        var elements;
+        if (tagName == '*') {
+            elements = getAllChildren(currentContext[h]);
+        } else {
+            elements = currentContext[h].getElementsByTagName(tagName);
+        }
+        for (var j = 0; j < elements.length; j++) {
+          found[foundCount++] = elements[j];
+        }
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      for (var k = 0; k < found.length; k++) {
+        if (found[k].className && found[k].className.match(new RegExp('\\b'+className+'\\b'))) {
+          currentContext[currentContextIndex++] = found[k];
+        }
+      }
+      continue; // Skip to next token
+    }
+    // Code to deal with attribute selectors
+    if (token.match(/^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/)) {
+      var tagName = RegExp.$1;
+      var attrName = RegExp.$2;
+      var attrOperator = RegExp.$3;
+      var attrValue = RegExp.$4;
+      if (!tagName) {
+        tagName = '*';
+      }
+      // Grab all of the tagName elements within current context
+      var found = new Array;
+      var foundCount = 0;
+      for (var h = 0; h < currentContext.length; h++) {
+        var elements;
+        if (tagName == '*') {
+            elements = getAllChildren(currentContext[h]);
+        } else {
+            elements = currentContext[h].getElementsByTagName(tagName);
+        }
+        for (var j = 0; j < elements.length; j++) {
+          found[foundCount++] = elements[j];
+        }
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      var checkFunction; // This function will be used to filter the elements
+      switch (attrOperator) {
+        case '=': // Equality
+          checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
+          break;
+        case '~': // Match one of space seperated words 
+          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };
+          break;
+        case '|': // Match start with value followed by optional hyphen
+          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('^'+attrValue+'-?'))); };
+          break;
+        case '^': // Match starts with value
+          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) == 0); };
+          break;
+        case '$': // Match ends with value - fails with "Warning" in Opera 7
+          checkFunction = function(e) { return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };
+          break;
+        case '*': // Match ends with value
+          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) > -1); };
+          break;
+        default :
+          // Just test for existence of attribute
+          checkFunction = function(e) { return e.getAttribute(attrName); };
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      for (var k = 0; k < found.length; k++) {
+        if (checkFunction(found[k])) {
+          currentContext[currentContextIndex++] = found[k];
+        }
+      }
+      // alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
+      continue; // Skip to next token
+    }
+    
+    if (!currentContext[0]){
+    	return;
+    }
+    
+    // If we get here, token is JUST an element (not a class or ID selector)
+    tagName = token;
+    var found = new Array;
+    var foundCount = 0;
+    for (var h = 0; h < currentContext.length; h++) {
+      var elements = currentContext[h].getElementsByTagName(tagName);
+      for (var j = 0; j < elements.length; j++) {
+        found[foundCount++] = elements[j];
+      }
+    }
+    currentContext = found;
+  }
+  return currentContext;
+}
+
+/* That revolting regular expression explained 
+/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
+  \---/  \---/\-------------/    \-------/
+    |      |         |               |
+    |      |         |           The value
+    |      |    ~,|,^,$,* or =
+    |   Attribute 
+   Tag
+*/