parlement 0.2 → 0.3

data/app/models/mail.rb

@@ -1,4 +1,202 @@
+#
+# Receive a mail from which an elt is created.
+#
+# An associated mail is kept to make sure we don't lose any data. Attachments
+# are also created in an associated table
+#
 class Mail < ActiveRecord::Base
+	usesguid
+
 	belongs_to :elt
+
+
+
+	"""                  _           
+		 _ __ ___  ___ ___(_)_   _____ 
+		| '__/ _ \/ __/ _ \ \ \ / / _ \
+		| | |  __/ (_|  __/ |\ V /  __/
+		|_|  \___|\___\___|_| \_/ \___| """
+	#
+	# Receive a mail that will be stored as an elt.
+	#
+	# The algorithm to define its parent is simple:
+	# - header "references"
+	# - or any subject between []
+	# - the "to" part before @#{ActionMailer::Base.server_settings[:domain]}
+	# - in a "mail/lost+found" thread
+	#
+	def receive(mail)
+		logger.info "Receive mail #{mail.message_id}"
+		elt.created_on = mail.date
+		elt.subject = unquote(mail.subject)
+
+		elt.body = ''
+
+		elt.person = Person.find_by_email(mail.from)
+		elt.person = Person.find_by_name(unquote(mail.friendly_from)) if not elt.person
+		elt.person = Person.new if not elt.person
+		elt.person.name = unquote(mail.friendly_from)
+		elt.person.email = mail.from.first
+
+		# Try to find its mail parent in the db
+		if mail.references
+			for parent in mail.references
+				m = Mail.find_by_message(parent.to_s)
+				elt.parent = m.elt if m
+			end
+		end
+
+		# No reference matching an existing parent, let's try a mailing list we
+		# deduce from an eventual [subject]
+		if not elt.parent and elt.subject.match(/\[\w*\]/)
+			parentId = elt.subject.match(/\[\w*\]/)
+			parentId = parentId[0].gsub(/[\[\]]/, '') if parentId
+
+			begin
+				elt.parent = Elt.find(parentId)
+
+			rescue ActiveRecord::RecordNotFound
+				elt.parent = elt.build_parent
+				elt.parent.parent_id = 'mail'
+				elt.parent.subject = parentId
+				elt.parent.body = ''
+				elt.parent.save
+			end
+		end
+
+		# No reference matching an existing parent, let's try the "to" field
+		if not elt.parent and mail.to.to_s.match(/\w*@#{ActionMailer::Base.server_settings[:domain]}/)
+			parentId = mail.to.to_s.match(/\w*@#{ActionMailer::Base.server_settings[:domain]}/)[0] \
+				.gsub(/@#{ActionMailer::Base.server_settings[:domain]}/, '')
+
+			begin
+				elt.parent = Elt.find(parentId)
+
+			rescue ActiveRecord::RecordNotFound
+				elt.parent = elt.build_parent
+				elt.parent.parent_id = 'mail'
+				elt.parent.subject = parentId
+				elt.parent.body = ''
+				elt.parent.save
+			end
+		end
+
+		if not elt.parent
+			parentId = "lost+found"
+
+			begin
+				elt.parent = Elt.find(parentId)
+
+			rescue ActiveRecord::RecordNotFound
+				elt.id = parentId
+				elt.parent = elt.build_parent
+				elt.parent.parent_id = 'mail'
+				elt.parent.subject = parentId
+				elt.parent.body = ''
+				elt.parent.save
+			end
+		end
+
+		#elt.parent = Elt.find('mail') if not elt.parent
+		mngAttachment(mail) if mail
+
+		self.message = mail.message_id
+		self.mail_parents = mail.references
+		self.file = mail.encoded
+	end
+
+
+	"""            _     _ _     _     
+		 _ __  _   _| |__ | (_)___| |__  
+		| '_ \| | | | '_ \| | / __| '_ \ 
+		| |_) | |_| | |_) | | \__ \ | | |
+		| .__/ \__,_|_.__/|_|_|___/_| |_|
+		|_|                              """
+	#
+	# An elt has just been saved, and needs to be published as a mail
+	#
+	def publish
+		logger.info "Publish mail"
+
+		if message and not message.blank? and file
+			mail = TMail::Mail.parse(file)
+		else
+			mail = MailNotify::create_publish(elt)
+			self.mail_parents = mail.references
+			self.file = mail.encoded
+		end
+
+		mail['Precedence'] = 'list'
+		mail['X-Loop'] = ActionMailer::Base.server_settings[:domain]
+		mail['List-Archive'] = "http://"+ActionMailer::Base.server_settings[:domain]
+		mail['Errors-To'] = "errors@"+ActionMailer::Base.server_settings[:domain]
+
+		mail.bcc = elt.all_recipients \
+			.select { |i| i.email and not i.email.blank? } \
+			.collect { |i| i.email } \
+			.uniq \
+			.join(', ')
+
+		#
+		# Redefine the recipients used when delivering the mail to the local smtp server
+		#
+		# In fact, only send the mail to the bcc recipients, the to and/or cc are
+		# just here for information
+		#
+		def mail.destinations(default = nil)
+			ret = []
+			%w( bcc ).each do |nm|
+				if h = @header[nm]
+					h.addrs.each {|i| ret.push i.address }
+				end
+			end
+			ret.empty? ? default : ret
+		end
+
+		# Added to make sure it is not lost, but not modified if already existant
+		mail['X-Message-Id'] = mail.message_id if not mail['X-Message-Id']
+
+
+		MailNotify::deliver(mail) if not mail.destinations.empty?
+
+		# Do it after sending, to get the actual message id as generated by the MTA
+		# Note that the id of a resent mail is regenerated, but we don't record it,
+		# we record the initial id
+		self.message = mail.message_id if not self.message or self.message.blank?
+
+		logger.info "Published with id \"#{message}\""
+	end
+
+
+	private
+
+	#
+	# This is to make sure we only have utf-8, no iso-8859
+	#
+	def unquote(text)
+		text.gsub(/\=\?.*?\?\=/) do |m|
+			TMail::Unquoter.unquote_and_convert_to(m, 'utf-8')
+		end
+	end
+
+	#
+	# Get and store the attachments
+	#
+	def mngAttachment(attachment)
+		if attachment.content_type == 'text/plain'
+			elt.body += attachment.body
+
+		elsif attachment.multipart?
+			attachment.parts.each { |part| mngAttachment(part) }
+
+		elsif attachment.type_param('name')
+			file = File.new('/tmp/'+attachment.type_param('name'), 'w')
+			file << attachment.body
+			file.flush
+
+			attach = elt.attachments.build
+			attach.file = file
+		end
+	end
 end
 

data/app/models/mail_notify.rb

@@ -0,0 +1,63 @@
+#
+# Send a publication email whenever an elt is saved
+#
+# Important:
+# the bcc, which is actually used for sending, is setup in the Mail class
+#
+class MailNotify < ActionMailer::Base
+	def publish(elt)
+		@subject = elt.subject
+		# Try to render the element as html
+		#@body = elt.body
+		@body[:elt] = elt
+
+		@recipients = (mailing_list(elt.parent).subject.blank? ? '' : mailing_list(elt.parent).subject ) \
+			+ ' <' \
+			+ mailing_list(elt.parent).id + '@' + ActionMailer::Base.server_settings[:domain] \
+			+ '>'
+
+		@from = ((elt.person and elt.person.name) ? elt.person.name : ANONYMOUS_POSTER) \
+			+ ' <' \
+			+ ((elt.person and elt.person.email) \
+				? elt.person.email : ANONYMOUS_POSTER + '@' + ActionMailer::Base.server_settings[:domain]) \
+			+ '> '
+
+		# This is the essential of a mailing list, you reply to the mailing list,
+		# where every body sends their mail.
+		# This very mail can be a mailing list all by itself...
+		@headers['Reply-to'] = mailing_list(elt).id + '@' + ActionMailer::Base.server_settings[:domain]
+
+		@headers['In-Reply-To'] = elt.parent.mail.message if elt.parent \
+			and elt.parent.mail and elt.parent.mail.message
+
+		@sent_on = elt.created_on
+
+		parentMsg = elt.parent.mail
+		if parentMsg
+			@headers['references'] = ''
+			@headers['references'] << parentMsg.mail_parents if parentMsg.mail_parents
+			@headers['references'] << parentMsg.message if parentMsg.message
+		end
+
+		@content_type = 'multipart/alternative'
+
+		@headers['X-Mailer'] = ActionMailer::Base.server_settings[:domain] + " v" + PARLEMENT_VERSION
+	end
+
+	private
+
+	#
+	# Try to fine, define, the mailing list id this elt is part of
+	#
+	# The algo used is simple: find a parent id smaller than the usually auto
+	# generated ids
+	#
+	def mailing_list(elt)
+		e = elt
+		while e.id.size > 21 and e.parent_id != 'ROOT'
+			e = e.parent
+		end
+		e
+	end
+end
+

data/app/models/person.rb

@@ -1,9 +1,16 @@
 class Person < ActiveRecord::Base
+	usesguid
+
 	has_many :elts
 
 	validates_presence_of :name, :on => :create
 	validates_length_of :name, :within => 3..40, :on => :create
   validates_uniqueness_of :name, :on => :create
-  validates_uniqueness_of :email, :on => :create
+  validates_uniqueness_of :email, :on => :create,
+		:if => Proc.new { |p| p.email and p.email.length > 0 }
+
+	has_and_belongs_to_many :subscribed_elts,
+		:class_name => "Elt",
+		:join_table => "subscribers"
 end
 

data/app/views/account/_login.rhtml

@@ -1,57 +1,60 @@
-<div class="login">
-	<%= form_remote_tag(
-		:update => divId,
-		:url => { :controller => 'account', :action => 'login' },
-		:interactive => visual_effect(:BlindDown, divId)) %>
-		<!--:position => 'after',-->
+<%= form_remote_tag(
+	:update => divId,
+	:url => { :controller => 'account', :action => 'login' },
+	:complete => visual_effect(:BlindDown, divId)) %>
 
-		<input type="hidden" id="divId" name="divId" value="<%= divId %>"/>
+	<div class="login">
+		<span>
+			<input type="hidden" id="divId" name="divId" value="<%= divId %>"/>
 
-		<label for="person_name">Pseudo:</label>
-		<%= text_field "person", "name", :size => 10 %>
+			<label for="person_name">Pseudo:</label>
+			<%= text_field "person", "name", :size => 10 %>
 
-		<%= link_to_function('+',
-			"Element.toggle(this);"+visual_effect(:Grow, 'user_password_'+divId.to_s)) %>
+			<%= link_to_function('+',
+				"Element.toggle(this);"+visual_effect(:Grow, 'user_password_'+divId.to_s)) %>
+		</span>
 
-		<span style="display:none" id="user_password_<%= divId %>">
+		<span style="display: none;" id="user_password_<%= divId %>">
 			&nbsp;
 			<label for="user_password">Password:</label>
 			<%= password_field "user", "password", :size => 10 %>
 
-			<%= link_to_function('email? >',
+			<%= link_to_function('email? &gt;',
 				"Element.toggle(this);"+visual_effect(:Grow, 'person_email_'+divId.to_s)) %>
 		</span>
 
-		<span style="display:none" id="person_email_<%= divId %>">
+		<span style="display: none;" id="person_email_<%= divId %>">
 			<br/>
 			<!--
-			<label for="user_password_confirmation">Confirm password:</label>
 			<%= password_field "user", "password_confirmation", :size => 10 %>
-			&nbsp;
 			-->
 			<label for="person_email">Email (or check key):</label>
-			<%= text_field "person", "email", :size => 30 %>
+			<%= text_field "person", "email", :size => 20 %>
 		</span>
 
 		<%= submit_tag 'Ok' %>
 
 		<%= render :partial => '/help',
 			:locals => { :divId => 'login'+divId.to_s, :content => '
-				<ul>You can propose an element
+				<p>You can propose an element</p>
+				<ul>
 					<li>with no pseudo</li>
 					<li>with an unprotected pseudo</li>
 					<li>with a password protected pseudo (click on the "+")</li>
 					<li>with a password protected and email verified pseudo (TODO)</li>
 				</ul>
-				The last method is the only secure way to protect a nickname on
-				<strong>this</strong> server.
-				<br/>
-				If a nick is not protected and verified, anybody else can protect it for
-				themselves if they at least supply a password <em>and</em> an email.
-				<br/>
-				A login must contain [3..40] characters, a password [5..40].
+				<p>
+					The last method is the only secure way to protect a nickname on
+					<strong>this</strong> server.
+				</p>
+				<p>
+					If a nick is not protected and verified, anybody else can protect it for
+					themselves if they at least supply a password <em>and</em> an email.
+				</p>
+				<p>
+					A login must contain [3..40] characters, a password [5..40].
+				</p>
 			' } %>
-		</div>
-	<%= end_form_tag %>
-</div>
+	</div>
+<%= end_form_tag %>
 

data/app/views/account/_show.rhtml

@@ -8,18 +8,18 @@
 <% if @session[:person] %>
 	<% if @session[:person].name and @session[:person].name != '' %>
 		<div class="author">
-			&lt;<%= link_to(@session[:person].name,
+			<%= link_to(@session[:person].name,
 					:controller => 'person',
 					:action => 'show',
-					:id => @session[:person]) %>&gt;
+					:id => @session[:person]) %>
 		</div>
 	<% end %>
 
 	<div class="logout">
-		<%= link_to_remote('(X)',
+		<%= link_to_remote('[X]',
 				:update => divId,
 				:url => { :controller => 'account', :action => 'logout', :divId => divId },
-				:loaded => visual_effect(:BlindDown, divId)) %>
+				:complete => visual_effect(:BlindDown, divId)) %>
 	</div>
 <% else %>
 

data/app/views/elt/_elt.rhtml

@@ -1,25 +1,23 @@
 <% eltSubsNb = elt.children.count if eltSubsNb == nil %>
 
-<% if elt.id and not elt.subject.include? elt.parent.subject and not eltTop %>
-	<br />
-<% end %>
-
-<div class="elt" id="elt_<%= elt.id %>">
-	<div class="author">
-		<% if elt.person %>
-			&lt;<%= link_to(elt.person.name,
-					:controller => 'person', :action => 'show', :id => elt.person) %>&gt;
-		<% elsif elt.parent_id != 'ROOT' and elt.subject.include? elt.parent.subject %>
-			&lt;<%= ANONYMOUS_POSTER %>&gt;
-		<% end %>
-	</div>
+<div id="elt_<%= elt.id %>" class="elt">
+	<% if elt.person %>
+		<div class="author">
+			<%= link_to(elt.person.name,
+					:controller => 'person', :action => 'show', :id => elt.person) %>
+		</div>
+	<% elsif not displayTitle? elt %>
+		<div class="author">
+			<%= ANONYMOUS_POSTER %>
+		</div>
+	<% end %>
 
 	<div class="eltInfo" title="<%= elt.created_on %>">
 		<!--
 		<= link_to('@', :action => 'raw_elt', :id => elt) if elt.mail != nil >
 		-->
 		<% if elt.id and elt.children.count == 0 %>
-			<%= link_to_remote('>>',
+			<%= link_to_remote('<span class="icon">&gt;&gt;</span>',
 					:update => 'eltNew_'+elt.id.to_s,
 					:url => { :controller => 'elt', :action => 'new', :id => elt },
 					:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
@@ -27,13 +25,10 @@
 		<% end %>
 	</div>
 
-	<% if elt.parent_id == 'ROOT' or eltTop \
-		or not elt.subject.include? elt.parent.subject %>
-		<% if elt.parent_id != 'ROOT' %>
-			<span class="created_on">
-				<%= elt.created_on.strftime('%d/%m/%y %H:%M') %>
-			</span>
-		<% end %>
+	<% if eltTop or displayTitle? elt %>
+		<span class="created_on">
+			<%= elt.created_on.strftime('%d/%m/%y %H:%M') %>
+		</span>
 
 		<<%= eltTop ? 'h1' : 'h2' %>>
 			<% if elt.id %>
@@ -65,7 +60,7 @@
 						visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s),
 					:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) %>
 
-			<%= link_to_remote('Add >>',
+			<%= link_to_remote('Add <span class="icon">&gt;&gt;</span>',
 					:update => 'eltNew_'+elt.id.to_s,
 					:url => { :controller => 'elt', :action => 'new', :id => elt },
 					:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
@@ -87,20 +82,20 @@
 	<div style="display:<%= ((eltTop and eltSubsNb > 0) or eltSubsNb == 1) ?  '' : 'none' %>"
 		id="eltSubsClose_<%= elt.id %>" title="<%= elt.created_on %>"
 		class="eltSubsClose">
-		<%= link_to_function('<< Close',
+		<%= link_to_function('<span class="icon">&lt;&lt;</span> Close',
 				visual_effect(:BlindUp, 'eltSubs_'+elt.id.to_s)+
 				visual_effect(:BlindUp, 'eltNew_'+elt.id.to_s)+
 				visual_effect(:BlindUp, 'eltSubsClose_'+elt.id.to_s)+
 				visual_effect(:BlindDown, 'eltMore_'+elt.id.to_s)) %>
 
 		<% if elt.person %>
-			&lt;<%= link_to(elt.person.name,
-					:controller => 'person', :action => 'show', :id => elt.person) %>&gt;
-		<% elsif elt.parent_id != 'ROOT' and elt.subject.include? elt.parent.subject %>
-			&lt;<%= ANONYMOUS_POSTER %>&gt;
+			<%= link_to(elt.person.name,
+					:controller => 'person', :action => 'show', :id => elt.person) %>
+		<% elsif not displayTitle? elt %>
+			<%= ANONYMOUS_POSTER %>
 		<% end %>
 
-		<%= link_to_remote('Add >>',
+		<%= link_to_remote('Add <span class="icon">&gt;&gt;</span>',
 				:update => 'eltNew_'+elt.id.to_s,
 				:url => { :controller => 'elt', :action => 'new', :id => elt },
 				:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+

data/app/views/elt/_list.rhtml

@@ -6,11 +6,15 @@ e = Elt.find_all("parent_id = '#{elt.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 => '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 %>
+		:complete => 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 %>)
@@ -20,7 +24,7 @@ e = Elt.find_all("parent_id = '#{elt.id}'",
 		: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 %>
+		:complete => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) if e_pages.current.previous %>
 
 <%= render :partial => '/elt/elt',
 	:collection => e.reverse,

data/app/views/elt/new.rhtml

@@ -97,6 +97,6 @@
 		</div>
 	</p>
 
-		<!--[eoform:elt]-->
+	<!--[eoform:elt]-->
 <%= end_form_tag %>
 

data/app/views/elt/show.rhtml

@@ -1,14 +1,14 @@
 <div class="sidebar">
-	<div class="box">
-		<% if @elt.children.count > 0 %>
-			<div class="boxTitle">Titres</div>
-		<% end %>
+	<% if @elt.children.count > 0 %>
+		<div class="boxTitle">Titres</div>
+	<% end %>
 
-		<% for elt in @elt.children.reverse[0..9] %>
+	<div class="box">
+		<% for elt in @elt.children.reverse[0...PAGE_ELT_LENGTH] %>
 			<div class="boxLine">
-				<span style="float:right;margin-right:0.5em;font-size:smaller;">
+				<div style="float:right;margin-right:0.5em;font-size:smaller;">
 					<%= elt.created_on.strftime('%d/%m') %>
-				</span>
+				</div>
 				<%= link_to elt.subject, :id => elt %>
 			</div>
 		<% end %>
@@ -16,7 +16,29 @@
 		<br/>
 
 		<%= link_to image_tag("/images/webfeed.gif"),
-			:action => 'rss', :id => @elt %>
+				:action => 'rss', :id => @elt %>
+	</div>
+
+	<div class="boxTitle">Subscribe</div>
+	<div class="box">
+		<div id="author_<%= @elt.id %>">
+			<%= render :partial => 'account/show',
+					:locals => { :divId => 'author_'+@elt.id } %>
+		</div>
+
+		<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')) %>
+		</div>
+
+		<div class="boxLine"><%= @elt.subscribers.size %> subscriber(s)</div>
+		<div class="boxLine">
+			<% @elt.subscribers.each do |i| %>
+				<%= link_to(i.name, :controller => 'person', :action => 'show', :id => i) %>
+			<% end %>
+		</div>
 	</div>
 </div>
 
@@ -24,10 +46,10 @@
 	<div class="<%= key %>"><%= value %></div>
 <% end %>
 
-<% if @elt.parent.subject != '' %>
+<% if @elt.parent and @elt.parent.subject != '' %>
 	<div class="parent">
 		<%= link_to(textilize_without_paragraph(@elt.parent.subject),
-			:id => @elt.parent) %>
+				:id => @elt.parent) %>
 	</div>
 <% end %>
 

data/app/views/layouts/top.rhtml

@@ -4,36 +4,42 @@
 <html>
 	<head>
 		<title><%= @title %></title>
-		<%= stylesheet_link_tag 'default' %>
+		<%= stylesheet_link_tag 'default.css' %>
 		<%= javascript_include_tag "/javascripts/prototype" %>
 		<%= javascript_include_tag "/javascripts/scriptaculous" %>
 
+		<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,
-			participative democracy, direct democracy, representative democracy,
-			participative internationalisation, web site, ruby on rails,
-			PostgreSQL"/>
+		<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="sidebar">
+		<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/copyleft/gpl.html">GPL</a>
+				<a href="http://www.gnu.org/licenses/gpl.html">GPL</a>
 			</div>
 		</div>
 
 		<%= @content_for_layout %>
 
-		<a href="<%= url_for :controller => 'elt', :action => 'show', :id => '' %>"
-			class="version">version <%= PARLEMENT_VERSION %></a>
+		<p class="version">
+			<a href="<%= url_for :controller => 'elt', :action => 'show', :id => '' %>">
+				v<%= PARLEMENT_VERSION %></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>