RubyGems - parlement - Versions diffs - 0.2 → 0.3 - Mend

parlement 0.2 → 0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (125) hide show

data/CHANGES +14 -4
data/README +25 -5
data/Rakefile +21 -21
data/app/controllers/account_controller.rb +5 -1
data/app/controllers/elt_controller.rb +7 -10
data/app/controllers/person_controller.rb +9 -0
data/app/controllers/subscriber_controller.rb +21 -0
data/app/helpers/elt_helper.rb +25 -13
data/app/helpers/mailman.rb +9 -92
data/app/helpers/subscriber_helper.rb +2 -0
data/app/models/attachment.rb +2 -0
data/app/models/elt.rb +64 -2
data/app/models/mail.rb +198 -0
data/app/models/mail_notify.rb +63 -0
data/app/models/person.rb +8 -1
data/app/views/account/_login.rhtml +31 -28
data/app/views/account/_show.rhtml +4 -4
data/app/views/elt/_elt.rhtml +23 -28
data/app/views/elt/_list.rhtml +6 -2
data/app/views/elt/new.rhtml +1 -1
data/app/views/elt/show.rhtml +32 -10
data/app/views/layouts/top.rhtml +16 -10
data/app/views/mail_notify/publish.text.html.rhtml +46 -0
data/app/views/mail_notify/publish.text.plain.rhtml +2 -0
data/app/views/person/_listElts.rhtml +33 -0
data/app/views/person/show.rhtml +21 -19
data/config/boot.rb +2 -0
data/config/environment.rb +19 -13
data/config/environments/development.rb +3 -1
data/config/environments/production.rb +2 -0
data/config/environments/test.rb +2 -0
data/config/routes.rb +5 -2
data/db/ROOT/mail.txt +2 -0
data/db/ROOT/parlement/news/release0.2.txt +8 -0
data/db/ROOT/parlement/news/release0.3.txt +11 -0
data/db/ROOT/parlement/test.txt +6 -1
data/db/ROOT/parlement.txt +23 -30
data/db/ROOT/perso.txt +17 -18
data/db/development_structure.sql +133 -217
data/db/schema.rb +83 -0
data/db/schema.sql +11 -15
data/lib/data_import.rb +3 -1
data/public/attachment/file/architecture.png +0 -0
data/public/attachment/file/architecture.svg +8972 -0
data/public/attachment/file/security.svg +8960 -0
data/public/images/Sleep-Deprivation-5.JPG +0 -0
data/public/images/eltBackground.png +0 -0
data/public/images/eltBackground.svg +89 -0
data/public/images/orange_by_darren_Hester_350o.jpg +0 -0
data/public/images/rails.png +0 -0
data/public/images/smile.png +0 -0
data/public/images/smile.svg +257 -0
data/public/images/world.png +0 -0
data/public/images/world.svg +170 -0
data/public/javascripts/controls.js +30 -1
data/public/javascripts/dragdrop.js +210 -145
data/public/javascripts/effects.js +261 -399
data/public/javascripts/ie7.js +6 -0
data/public/javascripts/prototype.js +131 -72
data/public/oldindex.html +270 -71
data/public/stylesheets/default.css +189 -215
data/script/about +1 -1
data/script/breakpointer +1 -1
data/script/console +1 -1
data/script/destroy +1 -1
data/script/generate +1 -1
data/script/performance/benchmarker +1 -1
data/script/performance/profiler +1 -1
data/script/plugin +1 -1
data/script/process/reaper +1 -1
data/script/process/spawner +1 -1
data/script/process/spinner +1 -1
data/script/runner +1 -1
data/script/server +1 -1
data/test/fixtures/elts.yml +2 -0
data/test/fixtures/mail/mail_ruby +27 -0
data/test/fixtures/mail/mail_rubyChild +28 -0
data/test/fixtures/mail/mail_rubyWithAttachment +7932 -0
data/test/fixtures/mail/mail_rubyWithSubject +27 -0
data/test/fixtures/mails.yml +7 -1
data/test/fixtures/people.yml +5 -0
data/test/fixtures/subscribers.yml +11 -0
data/test/functional/account_controller_test.rb +38 -37
data/test/functional/subscriber_controller_test.rb +128 -0
data/test/test_helper.rb +44 -0
data/test/unit/attachment_test.rb +1 -1
data/test/unit/elt_test.rb +3 -2
data/test/unit/mail_notify_test.rb +37 -0
data/test/unit/mail_test.rb +124 -1
data/test/unit/notifier_test.rb +0 -14
data/test/unit/person_test.rb +2 -1
data/test/unit/subscriber_test.rb +35 -0
data/test/unit/user_test.rb +3 -3
data/vendor/plugins/file_column/CHANGELOG +64 -0
data/vendor/plugins/file_column/README +54 -0
data/vendor/plugins/file_column/Rakefile +36 -0
data/vendor/plugins/file_column/TODO +6 -0
data/vendor/plugins/file_column/init.rb +12 -0
data/vendor/plugins/file_column/lib/file_column.rb +719 -0
data/vendor/plugins/file_column/lib/file_column_helper.rb +145 -0
data/vendor/plugins/file_column/lib/file_compat.rb +28 -0
data/vendor/plugins/file_column/lib/magick_file_column.rb +188 -0
data/vendor/plugins/file_column/lib/validations.rb +112 -0
data/vendor/plugins/file_column/test/abstract_unit.rb +90 -0
data/vendor/plugins/file_column/test/connection.rb +17 -0
data/vendor/plugins/file_column/test/file_column_helper_test.rb +97 -0
data/vendor/plugins/file_column/test/file_column_test.rb +630 -0
data/vendor/plugins/file_column/test/fixtures/entry.rb +32 -0
data/vendor/plugins/file_column/test/fixtures/invalid-image.jpg +1 -0
data/vendor/plugins/file_column/test/fixtures/kerb.jpg +0 -0
data/vendor/plugins/file_column/test/fixtures/mysql.sql +25 -0
data/vendor/plugins/file_column/test/fixtures/schema.rb +10 -0
data/vendor/plugins/file_column/test/fixtures/skanthak.png +0 -0
data/vendor/plugins/file_column/test/magick_test.rb +251 -0
data/vendor/plugins/file_column/test/magick_view_only_test.rb +21 -0
data/vendor/plugins/guid/README.TXT +19 -0
data/vendor/plugins/guid/init.rb +23 -0
data/vendor/plugins/guid/lib/usesguid.rb +37 -0
data/vendor/plugins/guid/lib/uuid22.rb +43 -0
data/vendor/plugins/guid/lib/uuidtools.rb +565 -0
metadata +83 -15
data/db/ROOT/CV.txt +0 -166
data/lib/file_column.rb +0 -263
data/lib/file_column_helper.rb +0 -45
/data/{lib → vendor/plugins/file_column/lib}/rails_file_column.rb +0 -0

data/app/views/mail_notify/publish.text.html.rhtml ADDED Viewed

@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+	<head>
+		<title><%= @elt.subject %></title>
+		<!-- Yes I use the mail domain for lack of another variable :-( -->
+		<base href="http://<%= ActionMailer::Base.server_settings[:domain] %>"/>
+		<link href="/stylesheets/default.css" media="screen" rel="Stylesheet" type="text/css" />
+		<script src="/javascripts/prototype.js" type="text/javascript"></script>
+		<script src="/javascripts/scriptaculous.js" type="text/javascript"></script>
+		<link rel="shortcut icon" href="/images/world.png" type="image/png"/>
+		<meta name="ROBOTS" content="ALL"/>
+		<meta name="author" content="Emmanuel Charpentier"/>
+		<meta name="description" content="Parlement, a mix between direct and
+			representative democracy, in the shape of a website. A mailing list,
+			forum, chat."/>
+		<meta name="keywords" content="collaborative writing, democracy, direct
+			democracy, representative democracy, forum, mailing list, chat, ruby on
+			rails, PostgreSQL"/>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	</head>
+	<body>
+		<div class="links">
+			<a class="title" href="http://leparlement.org">Parlement</a>
+			<div class="signets">
+				<a href="http://rubyforge.org/projects/parlement">forge</a>
+				<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>
+			</div>
+		</div>
+		<div class="elt">
+			<h1><%= textilize_without_paragraph @elt.subject %></h1>
+			<div class="eltBody">
+				<%= RedCloth.new(@elt.body).to_html%>
+			</div>
+		</div>
+	</body>
+</html>

data/app/views/mail_notify/publish.text.plain.rhtml ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ <%= @elt.body %>
2	+

data/app/views/person/_listElts.rhtml ADDED Viewed

@@ -0,0 +1,33 @@
+<%
+e_pages = ActionController::Pagination::Paginator.new(
+		self, person.elts.count, PAGE_ELT_LENGTH, @params['page'])
+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
+%>
+<%= 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 %>
+<span style="display:<%= e_pages.length > 1 ? '' : 'none'%>" class="pageCount">
+	(<%= e_pages.length-e_pages.current.to_i+1 %>/<%= 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 %>
+<% for elt in e.reverse[0...PAGE_ELT_LENGTH] %>
+	<div class="boxLine">
+		<%= elt.created_on.strftime('%d/%m %H:%M') %>
+		<%= link_to(elt.subject, :controller => 'elt', :action => 'show', :id => elt) %>
+		(<%= elt.children.size %> sub)
+	</div>
+<% end %>

data/app/views/person/show.rhtml CHANGED Viewed

@@ -1,3 +1,21 @@
+<div class="sidebar">
+	<% if @person.subscribed_elts.size > 0 %>
+		<div class="boxTitle">Subscribed elts</div>
+	<% end %>
+	<div class="box">
+		<% for elt in @person.subscribed_elts.reverse[0...PAGE_ELT_LENGTH] %>
+			<div class="boxLine">
+				<span style="float:right;margin-right:0.5em;font-size:smaller;">
+					<%= elt.created_on.strftime('%d/%m') %>
+				</span>
+				<%= link_to(elt.subject, :controller => 'elt', :action => 'show', :id => elt) %>
+			</div>
+		<% end %>
+	</div>
+</div>
 <h1><%= @person.name %></h1>
 <p>Created on <%= @person.created_on %></p>
@@ -18,23 +36,7 @@ e = Elt.find_all("person_id = '#{@person.id}'",
 		'created_on DESC', e_pages.current.to_sql)
 %>
-<%= link_to_remote('< Previous',
-		: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),
-		:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) 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>
-<%= link_to_remote('Next >',
-		: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),
-		:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) if e_pages.current.previous %>
-<%= render :partial => '/elt/elt',
-	:collection => e.reverse,
-	:locals => { :eltTop => false } %>
+<div class="eltSubs" id="personElts_<%= @person.id %>">
+	<%= render :partial => '/person/listElts', :locals => { :person => @person } %>
+</div>

data/config/boot.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
   unless RUBY_PLATFORM =~ /mswin32/

data/config/environment.rb CHANGED Viewed

@@ -1,23 +1,27 @@
 # Be sure to restart your web server when you modify this file.
 # Uncomment below to force Rails into production mode
-# (Use only when you can't set environment variables through your web/app server)
+# you don't control web/app server and can't set it the proper way
 # ENV['RAILS_ENV'] ||= 'production'
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 Rails::Initializer.run do |config|
+  # Settings in config/environments/* take precedence those specified here
   # Skip frameworks you're not going to use
   # config.frameworks -= [ :action_web_service, :action_mailer ]
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
-  # Force all environments to use the same logger level
+  # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
+	config.log_level = :info
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake create_sessions_table')
   # config.action_controller.session_store = :active_record_store
@@ -31,7 +35,7 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
   # 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
@@ -58,10 +62,10 @@ require 'rails_file_column'
 require 'jcode'
 $KCODE = 'u'
-PARLEMENT_VERSION='0.2'
+PARLEMENT_VERSION='0.3'
 # How many elements are displayed at once
-PAGE_ELT_LENGTH = 20
+PAGE_ELT_LENGTH = 10
 # What is the name of a quick anonymous poster
 ANONYMOUS_POSTER = 'anon'
@@ -70,18 +74,20 @@ require 'environments/user_environment'
 CONFIG = { :default_language => 'en' }
+# This variable is of course used for mails, but also in the html mail
+# template, to set the base url for the generated html
 ActionMailer::Base.server_settings = {
   :domain  => 'leparlement.org'
 }
-"""
-  :address  => 'smtp.postoffice.net',
-  :port  => 25,
-  :domain  => 'www.mywebsite.com',
-  :user_name  => 'me@postoffice.net',
-  :password  => 'mypass',
-  :authentication  => :login
-"""
+#
+#  :address  => 'smtp.postoffice.net',
+#  :port  => 25,
+#  :domain  => 'www.mywebsite.com',
+#  :user_name  => 'me@postoffice.net',
+#  :password  => 'mypass',
+#  :authentication  => :login
+#
 module LoginEngine
 	config :salt, 'parle'

data/config/environments/development.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# Settings specified here will take precedence over those in config/environment.rb
 # In the development environment your application's code is reloaded on
 # every request.  This slows down response time but is perfect for development
 # since you don't have to restart the webserver when you make code changes.
@@ -14,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 = false
+config.action_mailer.raise_delivery_errors = true

data/config/environments/production.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# Settings specified here will take precedence over those in config/environment.rb
 # The production environment is meant for finished, "live" apps.
 # Code is not reloaded between requests
 config.cache_classes = true

data/config/environments/test.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# Settings specified here will take precedence over those in config/environment.rb
 # The test environment is used exclusively to run your application's
 # test suite.  You never need to work with it otherwise.  Remember that
 # your test database is "scratch space" for the test suite and is wiped

data/config/routes.rb CHANGED Viewed

@@ -12,10 +12,13 @@ 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 ':id', :controller => 'elt', :action => 'show', :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//index.rss', :controller => 'elt', :action => 'rss'
-	map.connect 'perso/:id', :controller => 'elt'
+	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'

data/db/ROOT/mail.txt ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ mails
2	+

data/db/ROOT/parlement/news/release0.2.txt ADDED Viewed

@@ -0,0 +1,8 @@
+Version 0.2
+Evolutions
+* Anonymous users doing a quick post (where the subject is not modified) will be marked as "anon"
+* Each person has a public page listing its posts (this page can also be used to post...)
+* Display the creation time for the most important posts

data/db/ROOT/parlement/news/release0.3.txt ADDED Viewed

@@ -0,0 +1,11 @@
+Version 0.3
+Major version, adding the possibility to use not only the web forums, but mails
+* mailing list functionality!!!
+* new look
+* tests all pass
+* rails 1.0
+* plugin guid
+* W3C xhtml 1.0 compliant

data/db/ROOT/parlement/test.txt CHANGED Viewed

@@ -1,4 +1,9 @@
 Testing
-You can do anything you want here. Have fun!
+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.
+Do test this here!

data/db/ROOT/parlement.txt CHANGED Viewed

@@ -1,51 +1,44 @@
 Parlement
-Traditionally, our political lives are organised with the rule of the three
-unities: unity of time, unity of place and unity of object. It's a principle
-taking its roots in ancient Greece, and it certainly contributes to the awe we
-can feel when comes election day. But it is also a limitation...
+Forum, mailing list, blog, home page, chat room, newspaper.
-<table align="center"><tr><td>
+p=. *AND*
-In the physical world we vote on:
+A collaborative writing system based on democratic principles.
+!{float:left;margin-right: 2em;}/attachment/file/architecture.png!
+With _paper_ we vote:
 * one day
 * one place
 * one issue
-</td><td style="padding-right:3em;" vertical-align="center">
-=>
-</td><td>
-In Internet we can vote:
+With _Internet_ we can vote:
 * any time
 * any where
 * any issue
-</td></tr></table>
+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.
-It is us, individuals, citizens, who choose what we want to do.
+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.
-These three freedom have consequences, for example if you can vote anytime, you
-can probably also _change your vote_. There is also no need to have dates and
-agendas (except when outside conditions require it).
+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_?
-Their number growing, then _delegating_ your votes become a very useful
-feature, allowing you to concentrate on the parts that interest you the most,
-while adding your voice to someone you trust on other matters.
+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.
-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). Just click on the
-*more* links to drill down into the available elements. Click on the *>>* links
-to propose new sub elements.
+feature. A feature that, yes, could result into an oligarchy, it all depends on
+the value of our votes.

data/db/ROOT/perso.txt CHANGED Viewed

@@ -1,12 +1,12 @@
-echarp / manu
+echarp
 <style>
-	.eltSub, .eltSubsClose { display:none; }
+	.eltSubs, .eltSubsClose { display: none; }
 </style>
 <div class="sidebar" style="clear:right">
+	<div class="boxTitle">Amis et famille</div>
 	<div class="box">
-		<div class="boxTitle">Amis et famille</div>
 		<div class="boxLine">
 			Fr�rot <a href="http://www.christhalie.free.fr">christophe</a>,et des
 			<a href="http://www.motorun.net">motos!</a>
@@ -26,8 +26,8 @@ echarp / manu
 		</div>
 	</div>
+	<div class="boxTitle">Un ptit peu de logiciels libres</div>
 	<div class="box">
-		<div class="boxTitle">Un ptit peu de logiciels libres</div>
 		<a href="http://www.fsf.org">FSF</a>
 		<a href="http://april.org">APRIL</a>
 		<a href="http://debian.org">debian</a>                                                   <a href="http://cocoon.apache.org">Cocoon</a>
@@ -39,8 +39,8 @@ echarp / manu
 		<a href="http://kuro5hin.org">kuro5hin</a>                                               <a href="http://javalobby.org">javalobby</a>
 	</div>
+	<div class="boxTitle">Int�ressants</div>
 	<div class="box">
-		<div class="boxTitle">Int�ressants</div>
 		<div class="boxLineR">
 			<a href="http://www.radioparadise.com">Radio Paradise</a>
 		</div>
@@ -64,8 +64,8 @@ echarp / manu
 		</div>
 	</div>
+	<div class="boxTitle">De mon histoire</div>
 	<div class="box">
-		<div class="boxTitle">De mon histoire</div>
 		<div class="boxLine">
 			<a href="http://www.editronics-edu.fr" title="liquid�">Editronics</a>
 		</div>
@@ -107,18 +107,17 @@ echarp / manu
 	</div>
 </div>
-!{width:10em;float:right;margin:1em;}/images/image/viveLeSki.jpg!:/images/image/viveLeSki.jpg
 Bonjour le monde
 Je suis un parisien d'origine paysanne. Cru 1973 et �lev� dans une bonne ferme
-pleine de poules et de ch�vres. Quand j'�tais petit, et c'est m�me pas une
-blague, il m'arrivait d'aller garder les biquettes dans les pr�s et les
-chemins. Autant vous dire que j'�tais un grand fan d'heidi!
+pleine de poules et de ch�vres. Quand j'�tais petit, je passais du temps dans
+les pr�s et les chemins. Autant vous dire que j'�tais un grand fan d'heidi!
+!{width:10em;float:right;margin:1em;}/images/image/viveLeSki.jpg!:/images/image/viveLeSki.jpg
-Dans les faits j'ai trahi mes origines, et je suis devenu un intello qui aime
-se prendre la t�te sur toutes de sujets. Genre la politique, philosophie,
-science fiction hard.
+Dire qu'aujourd'hui je suis devenu un intello qui aime se prendre la t�te sur
+toutes sortes de sujets. Politique, philosophie, psychologie, science fiction
+hard.
 En 1997 j'ai imagin� une chose qui me tient � coeur, un outil d'�criture
 collaborative o� un groupe peut �crire n'importe quel genre de texte structur�
@@ -143,7 +142,7 @@ j'adore construire, imaginer. D
 inutilies avec des l�gos. Comme quoi avec les ann�es on ne change pas tant que
 �a...
-<pre style="float:left">
+<pre style="float: left; color: #aa0;">
      �
    \ | /
      |
@@ -152,7 +151,7 @@ inutilies avec des l
    \_|_/
   \  |  /
 </pre>
-<pre style="float:left">
+<pre style="float: left; color: #aa0;">
      �
    \ | /
      |
@@ -164,11 +163,11 @@ inutilies avec des l
 Les deux figures bizarres � gauche sont le clavier d'un alphabet imaginaire. Je
 l'appelle smile :)
+!{float:right; margin-left:1em; width:14em;}/images/image/smileCircles.png!:/images/image/smileCircles.png
 Cela consiste en six traits qui forment un carr� et ses diagonales. Six carr�s
 forment les six faces d'un cube. En vue isom�trique cela donne deux hexagones.
-!{float:right; margin-left:1em; width:6em;}/images/image/smileCircles.png!:/images/image/smileCircles.png
 Mais bon, c'est bien gentil d'avoir des mots qui peuvent �tre repr�sent�s en 3D
 ou sous des projections �tranges, mais je n'ai aucune s�mantique � leur
 appliquer... Pourtant il y a plein de combinaisons/mots possibles! Si vous avez