parlement 0.3 → 0.4

data/app/views/elt/_list.rhtml

@@ -10,23 +10,31 @@ e = Elt.find_all("parent_id = '#{elt.id}'",
 # TODO There seems to be a problem with firefox when trying to use a visual_effect
 %>
 
-<%= link_to_remote('< Previous',
-		:update => 'eltSubs_'+elt.id.to_s,
+<%= link_to_remote('< Previous page',
+	{ :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),
-		:complete => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) if e_pages.current.next %>
+		:loading => visual_effect(:BlindUp, 'eltSubs_'+elt.id.to_s),
+		:complete => 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,
+			:page => (@params['page'] ? @params['page'].to_i+1 : 2))}) 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>
+<% if e_pages.length > 1 %>
+	<span class="pageCount">
+		(<%= e_pages.length-e_pages.current.to_i+1 %>/<%= e_pages.length %>)
+	</span>
+<% end %>
 
-<%= link_to_remote('Next >',
-		:update => 'eltSubs_'+elt.id.to_s,
+<%= link_to_remote('Next page >',
+	{ :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),
-		:complete => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) if e_pages.current.previous %>
+		:loading => visual_effect(:BlindUp, 'eltSubs_'+elt.id.to_s),
+		:complete => 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,
+			:page => (@params['page'] ? @params['page'].to_i-1 : e_pages.length-1))}) if e_pages.current.previous %>
 
-<%= render :partial => '/elt/elt',
-	:collection => e.reverse,
-	:locals => { :eltTop => false } %>
+<ul class="eltSubs" style="padding: 0; margin: 0;">
+	<%= render :partial => '/elt/elt', :collection => e.reverse, :locals => { :eltTop => false } %>
+</ul>
 

data/app/views/elt/new.rhtml

@@ -22,7 +22,7 @@
 	<%= hidden_field 'elt', 'parent_id' %></p>
 
 	<h2>
-		<%= text_field 'elt', 'subject', :style => 'font-weight:bolder' %>
+		<%= text_field 'elt', 'subject' %>
 
 		<%= render :partial => '/help',
 			:locals => { :divId => 'title'+@elt.parent_id, :content => '

data/app/views/elt/show.rhtml

@@ -1,25 +1,22 @@
 <div class="sidebar">
 	<% if @elt.children.count > 0 %>
-		<div class="boxTitle">Titres</div>
+		<h3 class="boxTitle">Titres</h3>
 	<% end %>
 
 	<div class="box">
-		<% for elt in @elt.children.reverse[0...PAGE_ELT_LENGTH] %>
-			<div class="boxLine">
-				<div style="float:right;margin-right:0.5em;font-size:smaller;">
-					<%= elt.created_on.strftime('%d/%m') %>
-				</div>
-				<%= link_to elt.subject, :id => elt %>
-			</div>
-		<% end %>
-
-		<br/>
+		<ul>
+			<% for elt in @elt.children.reverse[0...PAGE_ELT_LENGTH] %>
+				<li class="boxLine" title="<%= elt.created_on.strftime('%d/%m') %>">
+					<%= link_to elt.subject, :id => elt %>
+				</li>
+			<% end %>
+		</ul>
 
 		<%= link_to image_tag("/images/webfeed.gif"),
 				:action => 'rss', :id => @elt %>
 	</div>
 
-	<div class="boxTitle">Subscribe</div>
+	<h3 class="boxTitle">Subscribe</h3>
 	<div class="box">
 		<div id="author_<%= @elt.id %>">
 			<%= render :partial => 'account/show',
@@ -47,12 +44,14 @@
 <% end %>
 
 <% if @elt.parent and @elt.parent.subject != '' %>
-	<div class="parent">
+	<h3 class="parent">
 		<%= link_to(textilize_without_paragraph(@elt.parent.subject),
 				:id => @elt.parent) %>
-	</div>
+	</h3>
 <% end %>
 
-<%= render :partial => 'elt', :layout => 'top',
-		:locals => { :elt => @elt, :eltTop => true } %>
+<ul>
+	<%= render :partial => 'elt', :layout => 'top',
+			:locals => { :elt => @elt, :eltTop => true } %>
+</ul>
 

data/app/views/layouts/top.rhtml

@@ -7,6 +7,16 @@
 		<%= stylesheet_link_tag 'default.css' %>
 		<%= javascript_include_tag "/javascripts/prototype" %>
 		<%= javascript_include_tag "/javascripts/scriptaculous" %>
+		<!--
+		<%= javascript_include_tag "/javascripts/borders" %>
+		-->
+
+		<!-- compliance patch for microsoft browsers -->
+		<!--[if lt IE 7]>
+		<script type="text/javascript">IE7_PNG_SUFFIX = ".png";</script>
+		<%= javascript_include_tag "/javascripts/ie7.js" %>
+		<![endif]-->
+
 
 		<link rel="shortcut icon" href="/images/world.png" type="image/png"/>
 
@@ -35,11 +45,13 @@
 		<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" target="_blank">
+				<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>
-
 	</body>
 </html>
 

data/app/views/person/show.rhtml

@@ -20,13 +20,7 @@
 
 <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>
+<p>Posts made by <%= @person.name %></p>
 
 <%
 # TODO get the count from the parent element call

data/config/boot.rb

@@ -2,18 +2,43 @@
 
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
+
   unless RUBY_PLATFORM =~ /mswin32/
     require 'pathname'
     root_path = Pathname.new(root_path).cleanpath(true).to_s
   end
+
   RAILS_ROOT = root_path
 end
 
-if File.directory?("#{RAILS_ROOT}/vendor/rails")
-  require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-else
-  require 'rubygems'
-  require 'initializer'
-end
+unless defined?(Rails::Initializer)
+  if File.directory?("#{RAILS_ROOT}/vendor/rails")
+    require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+  else
+    require 'rubygems'
+
+    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
+
+    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
+      rails_gem = Gem.cache.search('rails', "=#{version}").first
+
+      if rails_gem
+        require_gem "rails", "=#{version}"
+        require rails_gem.full_gem_path + '/lib/initializer'
+      else
+        STDERR.puts %(Cannot find gem for Rails =#{version}:
+    Install the missing gem with 'gem install -v=#{version} rails', or
+    change environment.rb to define RAILS_GEM_VERSION with your desired version.
+  )
+        exit 1
+      end
+    else
+      require_gem "rails"
+      require 'initializer'
+    end
+  end
 
-Rails::Initializer.run(:set_load_path)
+  Rails::Initializer.run(:set_load_path)
+end

data/config/database.yml

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

data/config/environment.rb

@@ -39,6 +39,8 @@ Rails::Initializer.run do |config|
   # Use Active Record's schema dumper instead of SQL when creating the test database
   # (enables use of different database adapters for development and test environments)
   # config.active_record.schema_format = :ruby
+	# echarp
+  config.active_record.schema_format = :sql
 
   # See Rails::Configuration for more options
 end
@@ -62,7 +64,7 @@ require 'rails_file_column'
 require 'jcode'
 $KCODE = 'u'
 
-PARLEMENT_VERSION='0.3'
+PARLEMENT_VERSION='0.4'
 
 # How many elements are displayed at once
 PAGE_ELT_LENGTH = 10

data/config/environments/development.rb

@@ -16,4 +16,4 @@ config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = true
 
 # Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = true
+config.action_mailer.raise_delivery_errors = false

data/db/ROOT/parlement/ddRing.txt

@@ -0,0 +1,14 @@
+DIRECT DEMOCRACY
+
+<img style="float: left; padding-bottom: 1em" src="http://www.acthum.net/directdemocracy/images/dd-sml.gif"/>
+
+<a href="http://www.acthum.net/directdemocracy/">Web Ring</a>
+<br/>
+<a href="http://www.software-zone.com/cgi-bin/ringlink/prev5.pl?ringid=common1;siteid=parlement">|<</a>
+<a href="http://www.software-zone.com/cgi-bin/ringlink/prev.pl?ringid=common1;siteid=parlement"><</a>
+<a href="http://www.software-zone.com/cgi-bin/ringlink/list.pl?ringid=common1;siteid=parlement">Site List</a>
+<a href="http://www.software-zone.com/cgi-bin/ringlink/next.pl?ringid=common1;siteid=parlement">></a>
+<a href="http://www.software-zone.com/cgi-bin/ringlink/next5.pl?ringid=common1;siteid=parlement">>|</a>
+<br/>
+<a href="http://www.software-zone.com/cgi-bin/ringlink/rand.pl?ringid=common1;siteid=parlement">Random Site</a>
+

data/db/ROOT/parlement/top-politics.txt

@@ -0,0 +1,12 @@
+top-politics
+
+This group was started with the goal of creating a network of different
+initiatives which reside on the TOP (Transparent Open Public) principles of
+political activities. We hope that we will soon be able to share concepts,
+ideas and suggestions about the Internet as a media, OpenSource as a paradigm
+and Democracy as the ultimate goal.
+
+http://groups.google.com/group/top-politics
+
+(historically here: http://groups.yahoo.com/group/top-politics)
+

data/db/ROOT/perso.txt

@@ -12,7 +12,7 @@ echarp
 			<a href="http://www.motorun.net">motos!</a>
 		</div>
 		<div class="boxLine">
-			<a href="http://www.copinedegeek.org">Copine De Geek</a>
+			<a href="http://www.copinedegeek.com">Copine De Geek</a>
 		</div>
 		<div class="boxLine"><a href="http://www.paulhac.org">Coralie</a></div>
 		<div class="boxLine">

data/db/development_structure.sql

@@ -2,7 +2,7 @@
 -- PostgreSQL database dump
 --
 
-SET client_encoding = 'UTF8';
+SET client_encoding = 'LATIN9';
 SET check_function_bodies = false;
 SET client_min_messages = warning;
 
@@ -71,6 +71,16 @@ CREATE TABLE elts (
 );
 
 
+--
+-- Name: engine_schema_info; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
+--
+
+CREATE TABLE engine_schema_info (
+    engine_name character varying(255),
+    version integer
+);
+
+
 --
 -- Name: mails; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
@@ -96,6 +106,15 @@ CREATE TABLE people (
 );
 
 
+--
+-- Name: schema_info; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
+--
+
+CREATE TABLE schema_info (
+    version integer
+);
+
+
 --
 -- Name: subscribers; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
@@ -106,29 +125,32 @@ CREATE TABLE subscribers (
 );
 
 
-SET default_with_oids = true;
-
 --
 -- Name: users; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
 
 CREATE TABLE users (
     id serial NOT NULL,
-    "login" text NOT NULL,
-    salted_password character varying(40) NOT NULL,
-    email character varying(60),
+    "login" character varying(80) DEFAULT ''::character varying NOT NULL,
+    salted_password character varying(40) DEFAULT ''::character varying NOT NULL,
+    email character varying(60) DEFAULT ''::character varying NOT NULL,
     firstname character varying(40),
     lastname character varying(40),
-    salt character(40) NOT NULL,
+    salt character varying(40) DEFAULT ''::character varying NOT NULL,
     verified integer DEFAULT 0,
     "role" character varying(40),
-    security_token character(40),
+    security_token character varying(40),
     token_expiry timestamp without time zone,
+    created_at timestamp without time zone,
+    updated_at timestamp without time zone,
+    logged_in_at timestamp without time zone,
     deleted integer DEFAULT 0,
     delete_after timestamp without time zone
 );
 
 
+SET default_with_oids = true;
+
 --
 -- Name: usersold; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
@@ -312,14 +334,6 @@ ALTER TABLE ONLY subscribers
     ADD CONSTRAINT subscribers_person_id_fkey FOREIGN KEY (person_id) REFERENCES people(id);
 
 
---
--- Name: users_login_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
---
-
-ALTER TABLE ONLY users
-    ADD CONSTRAINT users_login_fkey FOREIGN KEY ("login") REFERENCES people(name);
-
-
 --
 -- Name: usersold_person_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --

data/db/schema.rb

@@ -2,11 +2,11 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define() do
+ActiveRecord::Schema.define(:version => 0) do
 
   create_table "attachments", :force => true do |t|
     t.column "elt_id", :text, :null => false
-    t.column "created_on", :datetime, :default => Tue Feb 07 10:25:26 CET 2006, :null => false
+    t.column "created_on", :datetime, :null => false
     t.column "content_type", :text
     t.column "file", :text
   end
@@ -14,13 +14,13 @@ ActiveRecord::Schema.define() do
   create_table "choices", :id => false, :force => true do |t|
     t.column "elt_id", :text, :null => false
     t.column "person_id", :text, :null => false
-    t.column "created_on", :datetime, :default => Tue Feb 07 10:25:26 CET 2006, :null => false
+    t.column "created_on", :datetime, :null => false
   end
 
   create_table "delegations", :id => false, :force => true do |t|
     t.column "elt_id", :text, :null => false
     t.column "person_id", :text, :null => false
-    t.column "created_on", :datetime, :default => Tue Feb 07 10:25:26 CET 2006, :null => false
+    t.column "created_on", :datetime, :null => false
     t.column "temporary", :boolean, :default => false, :null => false
     t.column "delegate_to", :text, :null => false
   end
@@ -28,12 +28,17 @@ ActiveRecord::Schema.define() do
   create_table "elts", :force => true do |t|
     t.column "parent_id", :text
     t.column "position", :float
-    t.column "created_on", :datetime, :default => Tue Feb 07 10:25:26 CET 2006, :null => false
+    t.column "created_on", :datetime, :null => false
     t.column "person_id", :text
     t.column "subject", :text
     t.column "body", :text
   end
 
+  create_table "engine_schema_info", :id => false, :force => true do |t|
+    t.column "engine_name", :string
+    t.column "version", :integer
+  end
+
   create_table "mails", :force => true do |t|
     t.column "elt_id", :text, :null => false
     t.column "message", :text
@@ -42,7 +47,7 @@ ActiveRecord::Schema.define() do
   end
 
   create_table "people", :force => true do |t|
-    t.column "created_on", :datetime, :default => Tue Feb 07 10:25:26 CET 2006, :null => false
+    t.column "created_on", :datetime, :null => false
     t.column "name", :text
     t.column "email", :text
   end
@@ -55,16 +60,19 @@ ActiveRecord::Schema.define() do
   end
 
   create_table "users", :force => true do |t|
-    t.column "login", :text, :null => false
-    t.column "salted_password", :string, :limit => 40, :null => false
-    t.column "email", :string, :limit => 60
+    t.column "login", :string, :limit => 80, :default => "", :null => false
+    t.column "salted_password", :string, :limit => 40, :default => "", :null => false
+    t.column "email", :string, :limit => 60, :default => "", :null => false
     t.column "firstname", :string, :limit => 40
     t.column "lastname", :string, :limit => 40
-    t.column "salt", :string, :limit => 40, :null => false
+    t.column "salt", :string, :limit => 40, :default => "", :null => false
     t.column "verified", :integer, :default => 0
     t.column "role", :string, :limit => 40
     t.column "security_token", :string, :limit => 40
     t.column "token_expiry", :datetime
+    t.column "created_at", :datetime
+    t.column "updated_at", :datetime
+    t.column "logged_in_at", :datetime
     t.column "deleted", :integer, :default => 0
     t.column "delete_after", :datetime
   end

data/db/schema.sql

@@ -13,17 +13,17 @@ DROP DATABASE parlement_development;
 -- Name: parlement_development; Type: DATABASE; Schema: -; Owner: manu
 --
 CREATE DATABASE parlement_development
-  WITH TEMPLATE = template0 ENCODING = 'UNICODE';
+WITH TEMPLATE = template0 ENCODING = 'UNICODE';
 --  WITH TEMPLATE = template0 ENCODING = 'LATIN9';
 
 \connect parlement_development manu
 
 
 CREATE TABLE people (
-    id text PRIMARY KEY,
-    created_on timestamp with time zone NOT NULL DEFAULT now(),
-		name TEXT UNIQUE,
-		email text
+	id text PRIMARY KEY,
+	created_on timestamp with time zone NOT NULL DEFAULT now(),
+	name TEXT UNIQUE,
+	email text
 );
 
 INSERT INTO people (id, name, email)
@@ -69,55 +69,55 @@ CREATE TABLE "users" (
 
 
 CREATE TABLE elts (
-    id text PRIMARY KEY,
-    parent_id text REFERENCES elts,
-    position float,
-    created_on timestamp with time zone NOT NULL DEFAULT now(),
-    person_id text REFERENCES people,
-		subject text,
-		body text
+	id text PRIMARY KEY,
+	parent_id text REFERENCES elts,
+	position float,
+	created_on timestamp with time zone NOT NULL DEFAULT now(),
+	person_id text REFERENCES people,
+	subject text,
+	body text
 );
 
 INSERT INTO elts (id, subject) VALUES ('ROOT', '');
 
 CREATE TABLE mails (
-    id text PRIMARY KEY,
-    elt_id text NOT NULL REFERENCES elts,
-		message text,
-		mail_parents text,
-		file text
+	id text PRIMARY KEY,
+	elt_id text NOT NULL REFERENCES elts,
+	message text,
+	mail_parents text,
+	file text
 );
 
 CREATE TABLE attachments (
-    id text PRIMARY KEY,
-		elt_id text NOT NULL REFERENCES elts,
-    created_on timestamp with time zone NOT NULL DEFAULT now(),
-		content_type text,
-		file text
+	id text PRIMARY KEY,
+	elt_id text NOT NULL REFERENCES elts,
+	created_on timestamp with time zone NOT NULL DEFAULT now(),
+	content_type text,
+	file text
 );
 
 -- The people_elts relationship
 CREATE TABLE subscribers (
-    elt_id text NOT NULL REFERENCES elts,
-		person_id text NOT NULL REFERENCES people
+	elt_id text NOT NULL REFERENCES elts,
+	person_id text NOT NULL REFERENCES people
 );
 
 INSERT INTO subscribers(elt_id, person_id)
 VALUES ('ROOT', 'echarp');
 
 CREATE TABLE choices (
-    elt_id text NOT NULL REFERENCES elts,
-		person_id text NOT NULL REFERENCES people,
-    created_on timestamp with time zone NOT NULL DEFAULT now(),
-		PRIMARY KEY (elt_id, person_id)
+	elt_id text NOT NULL REFERENCES elts,
+	person_id text NOT NULL REFERENCES people,
+	created_on timestamp with time zone NOT NULL DEFAULT now(),
+	PRIMARY KEY (elt_id, person_id)
 );
 
 CREATE TABLE delegations (
-    elt_id text NOT NULL REFERENCES elts,
-		person_id text NOT NULL REFERENCES people,
-    created_on timestamp with time zone NOT NULL DEFAULT now(),
-		temporary boolean NOT NULL DEFAULT false,
-		delegate_to text NOT NULL REFERENCES people,
-		PRIMARY KEY (elt_id, person_id)
+	elt_id text NOT NULL REFERENCES elts,
+	person_id text NOT NULL REFERENCES people,
+	created_on timestamp with time zone NOT NULL DEFAULT now(),
+	temporary boolean NOT NULL DEFAULT false,
+	delegate_to text NOT NULL REFERENCES people,
+	PRIMARY KEY (elt_id, person_id)
 );
 

data/public/javascripts/application.js

@@ -0,0 +1,2 @@
+// Place your application-specific JavaScript functions and classes here
+// This file is automatically included by javascript_include_tag :defaults