parlement 0.6 → 0.7

data/app/views/elt/_elt.rhtml

@@ -1,7 +1,7 @@
-<li id="elt_<%= elt.id %>" class="elt <%= 'titled' if displayTitle?(elt) %>">
+<li id="elt_<%= elt.id %>" class="elt <%= 'titled' if displayTitle? elt %>">
 	<script>setKnobs($('elt_<%= elt.id %>'));</script>
 
-	<!-- Here to make sure a text browser could see it all on one line -->
+	<!-- The form is here to make sure a text browser can see it all on one line -->
 	<%= form_remote_tag(
 		:update => 'eltChoice_'+elt.id,
 		:url => { :action => 'vote', :id => elt },
@@ -9,6 +9,16 @@
 		:loaded => visual_effect(:Grow, 'eltChoice_'+elt.id, { :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)},
+					{ :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>
@@ -16,9 +26,7 @@
 
 		<% 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>
+				<span class="created_on"><%= elt.created_on.strftime('%d/%m/%y %H:%M') %></span>
 			<% end %>
 
 			<% if elt.person %>
@@ -40,52 +48,48 @@
 				</h1>
 			<% end %>
 
-			<%= format elt.body %>
-		<% end %>
-		<% @controller.expire_fragment( :action => 'show', :id => elt.id) if elt.new_record? %>
+			<% formattedBody = format elt.body %>
 
-		<span class="eltQuickAdd" id="eltQuickAdd_<%= elt.id %>" title="<%= elt.created_on %>">
-			<% if !elt.new_record? and elt.elts_count == 0 %>
-				<%= 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)},
-					{ :href => url_for(:controller => 'elt', :action => 'new', :id => @elt)}) %>
-			<% end %>
-		</span>
+			<%= image_tag (elt.person && elt.person.image ? elt.person.image : "/javascripts/blank.gif"),
+					:onload => "setSize(this)",
+					:class => "avatar" \
+				if formattedBody.match(/[.\s]<p>/) %>
+
+			<%= formattedBody %>
 
-		<% for att in elt.attachments %>
-			<%= link_to image_tag('/attachment/file/'+att.file_relative_path),
-				'/attachment/file/'+att.file_relative_path %>
+			<span class="attachments">
+				<% for att in elt.attachments %>
+					<%= link_to image_tag("/attachment/file/#{att.file_relative_path}"),
+						"/attachment/file/#{att.file_relative_path}" %>
+				<% end %>
+			</span>
 		<% 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 %>
+
+	<div class="eltSubs">
 		<span <%= 'style="display: none"' if (eltTop or elt.elts_count < 2) %>
 			class="eltMore" id="eltMore_<%= elt.id %>">
 			<%= link_to_remote(elt.elts_count.to_s+' more',
 				{ :update => 'eltSubs_'+elt.id.to_s,
 					:url => { :controller => 'elt', :action => 'list', :id => elt },
-					:loading => visual_effect(:SwitchOff, 'eltMore_'+elt.id.to_s),
-					:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)+
-						visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s),
-					:complete => "Behaviour.apply();" },
+					:loading => visual_effect(:SwitchOff, "eltMore_#{elt.id.to_s}")+
+						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('Add <span class="icon">&gt;&gt;</span>',
-				{ :update => 'eltNew_'+elt.id.to_s,
+				{ :update => "eltNew_#{elt.id.to_s}",
 					:url => { :controller => 'elt', :action => 'new', :id => elt },
-					:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
-					visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)},
+					: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 %>
-
-	<div class="eltSubs">
 		<!-- Display automatically one element threads -->
 		<ul <%= 'style="display: none"' unless (eltTop or elt.elts_count == 1) %>
 			id="eltSubs_<%= elt.id %>" class="eltSub">
@@ -100,23 +104,16 @@
 			id="eltSubsClose_<%= elt.id %>" title="<%= elt.created_on %>"
 			class="eltSubsClose">
 			<%= link_to_function('<span class="icon">&lt;&lt;</span> Close',
-				visual_effect(:BlindUp, 'eltSubs_'+elt.id)+
-				visual_effect(:BlindUp, 'eltNew_'+elt.id)+
-				visual_effect(:BlindUp, 'eltSubsClose_'+elt.id)+
-				visual_effect(:BlindDown, 'eltMore_'+elt.id)) %>
-
-			<% if elt.person %>
-				<%= link_to(elt.person.name,
-					:controller => 'person', :action => 'show', :id => elt.person) %>
-			<% elsif not displayTitle? elt %>
-				<%= ANONYMOUS_POSTER %>
-			<% end %>
+					visual_effect(:BlindUp, "eltSubs_#{elt.id}")+
+					visual_effect(:BlindUp, "eltNew_#{elt.id}")+
+					visual_effect(:BlindUp, "eltSubsClose_#{elt.id}")+
+					visual_effect(:BlindDown, "eltMore_#{elt.id}")) %>
 
 			<%= link_to_remote('Add <span class="icon">&gt;&gt;</span>',
-				{ :update => 'eltNew_'+elt.id.to_s,
+				{ :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)},
+					: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>

data/app/views/elt/_listByDate.rhtml

@@ -14,13 +14,13 @@
 				:url => { :action => 'listByDate', :id => @elt, :page => e_pages.last },
 				:before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
 				:loading => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
-				if e_pages.last != e_pages.current %>
+					if e_pages.last != e_pages.current %>
 		<%= link_to_remote('&lt;',
 			{ :update => 'listByDate',
 				:url => { :action => 'listByDate', :id => @elt, :page => e_pages.current.next },
 				:before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
 				:loading => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
-				if e_pages.current.next and e_pages.current.next != e_pages.last %>
+					if e_pages.current.next and e_pages.current.next != e_pages.last %>
 
 		<span class="pageCount"><%= e_pages.length-e_pages.current.to_i+1 %></span>
 
@@ -29,22 +29,22 @@
 				:url => { :action => 'listByDate', :id => @elt, :page => e_pages.current.previous },
 				:before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
 				:loading => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
-				if e_pages.current.previous and e_pages.current.previous != e_pages.first %>
+					if e_pages.current.previous and e_pages.current.previous != e_pages.first %>
 		<%= link_to_remote('&gt;|',
 			{ :update => 'listByDate',
 				:url => { :action => 'listByDate', :id => @elt, :page => e_pages.first },
 				:before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
 				:loading => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
-				if e_pages.first != e_pages.current %>
+					if e_pages.first != e_pages.current %>
 	<% end %>
 
 	<ul>
 		<% elts.each do |elt| %>
-			<li class="boxLine elt" title="<%= elt.created_on.strftime('%d/%m %H:%M') %>">
-				<span class="created_on"><%= elt.created_on.strftime('%d/%m %H:%M') %></span>
+			<li class="boxLine elt" title="<%= elt.created_on.strftime '%d/%m %H:%M' %>">
+				<span class="created_on"><%= elt.created_on.strftime '%d/%m %H:%M' %></span>
 				<% if elt.person %>
 					<span class="author">
-						&lt;<%= link_to(elt.person.name, :controller => 'person', :action => 'show', :id => elt.person) %>&gt;
+						&lt;<%= link_to elt.person.name, :controller => 'person', :action => 'show', :id => elt.person %>&gt;
 					</span>
 				<% elsif not displayTitle? elt %>
 					<span class="author">&lt;<%= ANONYMOUS_POSTER %>&gt;</span>

data/app/views/elt/show.rhtml

@@ -8,18 +8,18 @@
 	</div>
 
 	<h3 class="boxTitle">Identity</h3>
-	<div class="box">
+	<div class="box" id="identity">
 		<div id="author_<%= @elt.id %>">
 			<%= render :partial => 'account/show', :locals => { :divId => 'author_'+@elt.id } %>
 		</div>
 	</div>
 
-	<% if @elt.elts_count > 0 %><h3 class="boxTitle">Highest posts</h3><% end %>
+	<h3 class="boxTitle">Highest posts</h3>
 	<div class="box listByVote">
 		<%= render :partial => '/elt/listByVote' %>
 	</div>
 
-	<% if @elt.elts_count > 0 %><h3 class="boxTitle">Latest posts</h3><% end %>
+	<h3 class="boxTitle">Latest posts</h3>
 	<div class="box listByDate">
 		<%= render :partial => '/elt/listByDate' %>
 	</div>

data/app/views/layouts/top.rhtml

@@ -34,6 +34,7 @@
 		<div class="links">
 			<a class="title" href="http://leparlement.org">Parlement</a>
 			<span class="signets">
+				<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>
 			</span>

data/app/views/person/show.rhtml

@@ -1,4 +1,9 @@
 <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" %>
+	</div>
+
 	<% if @person.subscribed_elts.size > 0 %>
 		<div class="boxTitle">Subscribed elts</div>
 	<% end %>

data/config/environment.rb

@@ -64,7 +64,7 @@ require 'rails_file_column'
 require 'jcode'
 $KCODE = 'u'
 
-PARLEMENT_VERSION='0.6'
+PARLEMENT_VERSION='0.7'
 
 # How many elements are displayed at once
 PAGE_ELT_LENGTH = 10

data/db/ROOT/parlement/Parlement_fr.txt

@@ -0,0 +1,46 @@
+Parlement (fr)
+
+Forum, liste de diffusion, blog, page personnelle, salon de discussion,
+journal.
+
+p=. *ET*
+
+Un outil d'écriture collaborative basé sur des principes démoractiques.
+
+!{float:left;margin-right: 2em;}/attachment/file/architecture.png!
+
+Avec le  _paper_ nous votons:
+* un jour
+* un lieu
+* un sujet
+
+Avec _Internet_ nous pouvons voter:
+* n'importe quand
+* n'importe où
+* n'importe quel sujet
+
+C'est une révolution, 
+This is a revolution, breaking rules that go back to antic Greece. Rules that
+probably contribute to the feeling of awe one can resent when comes election
+day, but which also restrict our ability to participate in politics.
+
+Now we can acquire three new freedoms: freedom of time, of place and of object.
+we can vote from our home, in the middle of the night and on the small issues
+that we care about.
+
+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.
+

data/db/ROOT/parlement/news/Version_06.txt

@@ -0,0 +1,25 @@
+Version 0.6
+
+Voting using V and Λ buttons (picturing -1 and +1 values, down and up).
+Clicking on an existing vote resets it (equivalent to a 0 vote).
+
+Votes recorded and replicated as mails. Elements also listed by their approval
+(rss feed available).
+
+* elements are now acts_as_nested_set AND acts_as_tree
+* list by date, dynamic and managing all sub elements
+* rss now manages _all_ sub elements
+* compress_output
+* google analytics plugin
+* visual_effect queues
+* close or open elements and their sub elements
+* optimisations
+* voting on the web page
+* logging in and out changes appropriately +1 and -1 votes
+* element id now generated from element subject
+* element body now cached
+* some spam tests when creating a new element
+* list by vote
+* possibility to see individual votes when clicking on a vote result
+* Correcting a painful "null character" mishandling when mail is quoted printable
+

data/db/ROOT/parlement/news/Version_07.txt

@@ -0,0 +1,12 @@
+Version 0.7
+
+Avatars
+
+* avatar initial upload
+* correcting an automatic elt id generation, now removing all non characters
+* avatar upload, reception and emission by mail
+* addition of a "people" page listing all current and past avatars
+* logout now possible in text based browsers
+* attachments now derive their id from their element's subject
+* >> for one liners now better placed as floats
+

data/db/ROOT/parlement/test.txt

@@ -1,9 +1,18 @@
 Testing
 
-You can use the basic part of the system right now (no mailing list or chat, no
-vote, no delegation, no signatures, no electoral list, no P2P cluster). Just
-click on the *more* links to drill down into the available elements. Click on
-the *>>* links to propose new sub elements.
+You can use the system right now:
 
-Do test this here!
+* click on the *_n_ more* links to drill down into the available elements
+* click on the <span class="icon">>></span> links to propose new sub elements
+* click on <span class="choice" style="float:none"><label class="con">V</label>
+  or <label class="pro">&#x39B;</label></span> buttons to vote against or for
+  an element
 
+No complex registration required, you can participate anonymously or just fill
+a pseudo (top right corner) in order to be differentiated. This pseudo can be
+password protected and email verified, or not. You choose.
+
+I'm open to suggestions and follow closely everything said (every forum also
+being a mailing list, it's easy to follow and answer to)!
+
+Tell me what you think!

data/db/ROOT/parlement.txt

@@ -1,5 +1,7 @@
 Parlement
 
+!/images/ParlementLogo.png!
+
 Forum, mailing list, blog, home page, chat room, newspaper.
 
 p=. *AND*

data/db/development_structure.sql

@@ -32,6 +32,18 @@ CREATE TABLE attachments (
 );
 
 
+--
+-- Name: attachments_id_seq; Type: SEQUENCE; Schema: public; Owner: manu
+--
+
+CREATE SEQUENCE attachments_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
 --
 -- Name: choices; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
@@ -77,6 +89,17 @@ CREATE TABLE elts (
 );
 
 
+--
+-- Name: elts_id_seq; Type: SEQUENCE; Schema: public; Owner: manu
+--
+
+CREATE SEQUENCE elts_id_seq
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
 --
 -- Name: engine_schema_info; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
@@ -100,6 +123,18 @@ CREATE TABLE mails (
 );
 
 
+--
+-- Name: mails_id_seq; Type: SEQUENCE; Schema: public; Owner: manu
+--
+
+CREATE SEQUENCE mails_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
 --
 -- Name: people; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
@@ -108,10 +143,22 @@ CREATE TABLE people (
     id text NOT NULL,
     created_on timestamp with time zone DEFAULT now() NOT NULL,
     name text,
-    email text
+    email text,
+    image text
 );
 
 
+--
+-- Name: people_id_seq; Type: SEQUENCE; Schema: public; Owner: manu
+--
+
+CREATE SEQUENCE people_id_seq
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
 --
 -- Name: schema_info; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
@@ -131,32 +178,38 @@ CREATE TABLE subscribers (
 );
 
 
+--
+-- Name: subscribers_id_seq; Type: SEQUENCE; Schema: public; Owner: manu
+--
+
+CREATE SEQUENCE subscribers_id_seq
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
 --
 -- Name: users; Type: TABLE; Schema: public; Owner: manu; Tablespace: 
 --
 
 CREATE TABLE users (
     id serial NOT NULL,
-    "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,
+    "login" text NOT NULL,
+    salted_password character varying(40) NOT NULL,
+    email character varying(60),
     firstname character varying(40),
     lastname character varying(40),
-    salt character varying(40) DEFAULT ''::character varying NOT NULL,
+    salt character(40) NOT NULL,
     verified integer DEFAULT 0,
     "role" character varying(40),
-    security_token character varying(40),
+    security_token character(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: 
 --
@@ -261,51 +314,65 @@ ALTER TABLE ONLY usersold
 
 
 --
--- Name: attachments_elt_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: elts_parent; Type: INDEX; Schema: public; Owner: manu; Tablespace: 
 --
 
-ALTER TABLE ONLY attachments
-    ADD CONSTRAINT attachments_elt_id_fkey FOREIGN KEY (elt_id) REFERENCES elts(id);
+CREATE INDEX elts_parent ON elts USING btree (parent_id);
 
 
 --
--- Name: delegations_delegate_to_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: elts_parent_key; Type: INDEX; Schema: public; Owner: manu; Tablespace: 
 --
 
-ALTER TABLE ONLY delegations
-    ADD CONSTRAINT delegations_delegate_to_fkey FOREIGN KEY (delegate_to) REFERENCES people(id);
+CREATE INDEX elts_parent_key ON elts USING btree (parent_id);
 
 
 --
--- Name: delegations_elt_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
-ALTER TABLE ONLY delegations
-    ADD CONSTRAINT delegations_elt_id_fkey FOREIGN KEY (elt_id) REFERENCES elts(id);
+ALTER TABLE ONLY usersold
+    ADD CONSTRAINT "$1" FOREIGN KEY (person_id) REFERENCES people(id);
 
 
 --
--- Name: delegations_person_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: manu
+--
+
+ALTER TABLE ONLY subscribers
+    ADD CONSTRAINT "$1" FOREIGN KEY (elt_id) REFERENCES elts(id);
+
+
+--
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
 ALTER TABLE ONLY delegations
-    ADD CONSTRAINT delegations_person_id_fkey FOREIGN KEY (person_id) REFERENCES people(id);
+    ADD CONSTRAINT "$1" FOREIGN KEY (elt_id) REFERENCES elts(id);
 
 
 --
--- Name: elts_parent_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
-ALTER TABLE ONLY elts
-    ADD CONSTRAINT elts_parent_id_fkey FOREIGN KEY (parent_id) REFERENCES elts(id);
+ALTER TABLE ONLY subscribers
+    ADD CONSTRAINT "$2" FOREIGN KEY (person_id) REFERENCES people(id);
 
 
 --
--- Name: elts_person_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
-ALTER TABLE ONLY elts
-    ADD CONSTRAINT elts_person_id_fkey FOREIGN KEY (person_id) REFERENCES people(id);
+ALTER TABLE ONLY delegations
+    ADD CONSTRAINT "$2" FOREIGN KEY (person_id) REFERENCES people(id);
+
+
+--
+-- Name: $3; Type: FK CONSTRAINT; Schema: public; Owner: manu
+--
+
+ALTER TABLE ONLY delegations
+    ADD CONSTRAINT "$3" FOREIGN KEY (delegate_to) REFERENCES people(id);
 
 
 --
@@ -313,51 +380,59 @@ ALTER TABLE ONLY elts
 --
 
 ALTER TABLE ONLY choices
-    ADD CONSTRAINT fk_elt_id FOREIGN KEY (elt_id) REFERENCES elts(id);
+    ADD CONSTRAINT fk_elt_id FOREIGN KEY (elt_id) REFERENCES elts(id) ON UPDATE CASCADE;
 
 
 --
--- Name: fk_person_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: fk_elt_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
-ALTER TABLE ONLY choices
-    ADD CONSTRAINT fk_person_id FOREIGN KEY (person_id) REFERENCES people(id);
+ALTER TABLE ONLY attachments
+    ADD CONSTRAINT fk_elt_id FOREIGN KEY (elt_id) REFERENCES elts(id) ON UPDATE CASCADE;
 
 
 --
--- Name: mails_elt_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: fk_elt_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
+--
+
+ALTER TABLE ONLY elts
+    ADD CONSTRAINT fk_elt_id FOREIGN KEY (parent_id) REFERENCES elts(id) ON UPDATE CASCADE;
+
+
+--
+-- Name: fk_elt_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
 ALTER TABLE ONLY mails
-    ADD CONSTRAINT mails_elt_id_fkey FOREIGN KEY (elt_id) REFERENCES elts(id);
+    ADD CONSTRAINT fk_elt_id FOREIGN KEY (elt_id) REFERENCES elts(id) ON UPDATE CASCADE;
 
 
 --
--- Name: subscribers_elt_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: fk_person_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
-ALTER TABLE ONLY subscribers
-    ADD CONSTRAINT subscribers_elt_id_fkey FOREIGN KEY (elt_id) REFERENCES elts(id);
+ALTER TABLE ONLY users
+    ADD CONSTRAINT fk_person_id FOREIGN KEY ("login") REFERENCES people(name) ON UPDATE CASCADE;
 
 
 --
--- Name: subscribers_person_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: fk_person_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
-ALTER TABLE ONLY subscribers
-    ADD CONSTRAINT subscribers_person_id_fkey FOREIGN KEY (person_id) REFERENCES people(id);
+ALTER TABLE ONLY elts
+    ADD CONSTRAINT fk_person_id FOREIGN KEY (person_id) REFERENCES people(id) ON UPDATE CASCADE;
 
 
 --
--- Name: usersold_person_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: manu
+-- Name: fk_person_id; Type: FK CONSTRAINT; Schema: public; Owner: manu
 --
 
-ALTER TABLE ONLY usersold
-    ADD CONSTRAINT usersold_person_id_fkey FOREIGN KEY (person_id) REFERENCES people(id);
+ALTER TABLE ONLY choices
+    ADD CONSTRAINT fk_person_id FOREIGN KEY (person_id) REFERENCES people(id) ON UPDATE CASCADE;
 
 
 --
 -- PostgreSQL database dump complete
 --
 
-INSERT INTO schema_info (version) VALUES (3)
+INSERT INTO schema_info (version) VALUES (4)

data/db/migrate/004_people_image.rb

@@ -0,0 +1,9 @@
+class PeopleImage < ActiveRecord::Migration
+  def self.up
+		add_column :people, :image, :text
+  end
+
+  def self.down
+		remove_column :people, :image
+  end
+end