parlement 0.12 → 0.13

data/db/migrate/007_create_visits.rb

@@ -0,0 +1,19 @@
+class CreateVisits < ActiveRecord::Migration
+  def self.up
+    create_table :visits do |t|
+      t.column :person_id, :string
+      t.column :elt_id, :string, :null => false
+      t.column :created_on, :datetime, :null => false
+      t.column :updated_on, :datetime
+      t.column :filter, :integer, :default => 0
+    end
+
+		execute 'ALTER TABLE visits ADD CONSTRAINT visits_elt_person_key UNIQUE ( elt_id, person_id ) '
+		execute 'ALTER TABLE visits ADD CONSTRAINT visits_elt_id FOREIGN KEY ( elt_id ) REFERENCES elts( id ) ON UPDATE CASCADE ON DELETE CASCADE'
+		execute 'ALTER TABLE visits ADD CONSTRAINT visits_person_id FOREIGN KEY ( person_id ) REFERENCES people( id ) ON UPDATE CASCADE ON DELETE CASCADE '
+  end
+
+  def self.down
+    drop_table :visits
+  end
+end

data/db/migrate/008_create_old_visits.rb

@@ -0,0 +1,18 @@
+class CreateOldVisits < ActiveRecord::Migration
+  def self.up
+    create_table :old_visits do |t|
+      t.column :person_id, :string
+      t.column :elt_id, :string, :null => false
+      t.column :created_on, :datetime, :null => false
+      t.column :updated_on, :datetime
+      t.column :filter, :integer, :default => 0
+    end
+
+		execute 'ALTER TABLE old_visits ADD CONSTRAINT old_visits_elt_person_key UNIQUE ( elt_id, person_id ) '
+		execute 'ALTER TABLE old_visits ADD CONSTRAINT old_visits_elt_id FOREIGN KEY ( elt_id ) REFERENCES elts( id ) ON UPDATE CASCADE ON DELETE CASCADE'
+  end
+
+  def self.down
+    drop_table :old_visits
+  end
+end

data/db/migrate/009_add_person_last_login.rb

@@ -0,0 +1,9 @@
+class AddPersonLastLogin < ActiveRecord::Migration
+  def self.up
+		add_column :people, :last_login, :datetime
+  end
+
+  def self.down
+		remove_column :people, :last_login
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 6) do
+ActiveRecord::Schema.define(:version => 9) do
 
   create_table "attachments", :force => true do |t|
     t.column "elt_id",       :text,     :null => false
@@ -58,11 +58,22 @@ ActiveRecord::Schema.define(:version => 6) do
     t.column "file",         :text
   end
 
+  create_table "old_visits", :force => true do |t|
+    t.column "person_id",  :string
+    t.column "elt_id",     :string,                  :null => false
+    t.column "created_on", :datetime,                :null => false
+    t.column "updated_on", :datetime
+    t.column "filter",     :integer,  :default => 0
+  end
+
+  add_index "old_visits", ["person_id", "elt_id"], :name => "old_visits_elt_person_key", :unique => true
+
   create_table "people", :force => true do |t|
     t.column "created_on", :datetime, :null => false
     t.column "name",       :text
     t.column "email",      :text
     t.column "image",      :text
+    t.column "last_login", :datetime
   end
 
   add_index "people", ["name"], :name => "people_name_key", :unique => true
@@ -106,4 +117,14 @@ ActiveRecord::Schema.define(:version => 6) do
 
   add_index "usersold", ["person_id"], :name => "usersold_person_id_key", :unique => true
 
+  create_table "visits", :force => true do |t|
+    t.column "person_id",  :string
+    t.column "elt_id",     :string,                  :null => false
+    t.column "created_on", :datetime,                :null => false
+    t.column "updated_on", :datetime
+    t.column "filter",     :integer,  :default => 0
+  end
+
+  add_index "visits", ["person_id", "elt_id"], :name => "visits_elt_person_key", :unique => true
+
 end

data/public/javascripts/mybehaviour.js

@@ -15,6 +15,9 @@ var myrules = {
 
 /* Called for each element to set its knobs */
 function setKnobs(elt) {
+	// To not filter out the top element
+	if (elt.parentNode.getAttribute('class') == 'top') return;
+
 	var knobOpened = document.createElement("a");
 	Element.addClassName(knobOpened, "knobOpened");
 	knobOpened.href = "#";
@@ -37,10 +40,12 @@ function setKnobs(elt) {
  * the filter
  */
 function setKnob(elt, result) {
+	// To not filter out the top element
+	if (elt.parentNode.getAttribute('class') == 'top') return;
+
 	var f = document.filterForm.filter;
 	var filter = parseInt(f.options[f.selectedIndex].value);
 
-	Element.removeClassName(elt, 'opened');
 	if (filter == 'null' || result >= filter) {
 		Element.removeClassName(elt, 'closed');
 	} else if (result < filter) {
@@ -114,9 +119,14 @@ function setCookie(name, value) {
 
 
 /*
- * This is not the value itself, but an index
+ * The parameter 'filter' is not the value itself, but an index!
  */
-function setFilter(filter) {
+function setFilter(filter, elt) {
+	setCookie('filter', document.filterForm.filter.selectedIndex);
+
+	new Ajax.Updater('listByVote', '/elt/listByVote/'+elt, { asynchronous:true, evalScripts:true });
+	new Ajax.Updater('listByDate', '/elt/listByDate/'+elt, { asynchronous:true, evalScripts:true });
+
 	document.getElementsByClassName('result').each( function(result) {
 		//alert(parseInt(result.innerHTML)+', '+filter);
 		Element.removeClassName(result.parentNode.parentNode.parentNode, 'opened');
@@ -126,7 +136,6 @@ function setFilter(filter) {
 			Element.addClassName(result.parentNode.parentNode.parentNode, 'closed');
 		}
 	});
-	setCookie('filter', document.filterForm.filter.selectedIndex);
 }
 
 function setFilterFromCookie() {

data/public/stylesheets/default.css

@@ -67,8 +67,7 @@ h1 input {
 
 #elt_parlement > form > .created_on, #elt_parlement > .knobOpened,
 #elt_parlement > * > h1 a, #elt_fr > form > .created_on, #elt_fr > .knobOpened,
-#elt_fr > * > h1 a {
-	display: none; }
+#elt_fr > * > h1 a { display: none; }
 
 legend, a:link, select, input[type='Button'], input[type='submit'] { color: #3b76ae; }
 a:visited { color: #1b568e; }
@@ -136,6 +135,10 @@ h1 .help {
                       / __| |/ _` |/ _ \ '_ \ / _` | '__|
                       \__ \ | (_| |  __/ |_) | (_| | |   
                       |___/_|\__,_|\___|_.__/ \__,_|_|                        */
+#spinner img {
+	position: absolute;
+	right: 4.5%;
+	top: 3em; }
 .sidebar, .links {
 	text-align: center;
 	background: white;
@@ -168,22 +171,26 @@ h1 .help {
 	letter-spacing: 0.5em; }
 .signets { font-size: smaller; }
 
-.boxTitle {
-	color: #ff4;
-	text-align: left;
-	font-size: medium;
-	font-weight: bolder;
-	padding: 0.3em 0.6em;
-	border: outset thin #3b76ae;
-	background: #3b76ae url(/images/Sleep-Deprivation-5.JPG); }
 .box {
-	padding: 1px;
 	background: #ccc;
 	font-size: smaller;
 	margin-bottom: 1em;
 	padding-bottom: 0.5em;
 	border: outset thin #ccc;
 	border-top: none; }
+.boxTitle {
+	color: #ff4;
+	text-align: left;
+	font-size: medium;
+	font-weight: bolder;
+	padding: 0.3em 0.6em;
+	background: #3b76ae url(/images/Sleep-Deprivation-5.JPG); }
+.feed {
+	width: 28px;
+	height: 28px;
+	float: right;
+	margin: 1px 5px 0 0; }
+.feed img { max-width: 100%; }
 .boxLine {
 	text-align: left;
 	margin-left: 1em; }
@@ -193,30 +200,33 @@ h1 .help {
 .boxMore {
 	text-align: right;
 	font-weight: bolder; }
+.box .filter { display: none; }
+.box:hover .filter { display: inline; }
 
-#identity form { display: block; }
-#identity #edit, #identity iframe { display: none; }
-#identity:hover #edit { display: block; }
-#identity fieldset#edit {
+.identity form { display: block; }
+.identity #edit, .identity iframe { display: none; }
+.identity:hover #edit { display: block; }
+.identity fieldset#edit {
 	border: solid thin yellow;
 	padding: 0.5em 0;
 	margin: 0.5em 0; }
-#identity fieldset#edit label { color: #3b76ae; }
+.identity fieldset#edit label { color: #3b76ae; }
 img.avatar {
 	float: left;
 	width: auto;
 	max-width: 30%;
 	_max-width: none;
 	margin-right: 1em; }
-#identity img.avatar {
+.identity img.avatar {
 	float: none;
 	margin: 0 auto;
 	display: block;
 	max-width: 90%;
 	_max-width: none;
 	width: expression((offsetWidth > document.body.offsetWidth*0.3) ? "100%" : offsetWidth); }
+.elt .identity img.avatar { float: left; }
 
-#filter {
+#filter select {
 	border: none;
 	text-align: center; }
 form#filterForm a {
@@ -224,20 +234,20 @@ form#filterForm a {
 	font-weight: bolder; }
 form#filterForm input[type='submit'] { display: none; }
 
-div.listByDate ul, div.listByVote ul {
+#listByDate ul, #listByVote ul {
 	margin: 0 3px;
 	padding: 0; }
-div#listByDate li.boxLine, div#listByVote li.boxLine {
+#listByDate ul li.boxLine, #listByVote ul li.boxLine {
 	background: none;
 	border-bottom: solid 1px #fd8; }
-div#listByDate .created_on, div#listByVote .created_on { display: none; }
-div#listByDate .author, div#listByVote .author { font-size: smaller; }
-div#listByDate .result, div#listByVote .result {
+#listByDate .created_on, #listByVote .created_on { display: none; }
+#listByDate .author, #listByVote .author { font-size: smaller; }
+#listByDate .result, #listByVote .result {
 	font-weight: bolder;
 	float: right;
 	color: blue; }
 
-div#subscription + .boxLine + .boxLineR { font-size: smaller; }
+div#listSubscribers .boxLineR { font-size: smaller; }
 
 .box h4 {
 	margin: 0;
@@ -417,27 +427,21 @@ li.pager {
 	border: solid 1px #fd8;
 	text-decoration: none;
 	font-weight: bolder;
-	position: absolute;
-	background: white;
-	margin-left: -2%; }
+	background: white; }
+.knobOpened {;
+	margin-left: -16px;
+	position: absolute; }
 .knobOpened:link, .knobOpened:visited, .knobClosed:link, .knobClosed:visited {
 	color: orange; }
 
-.closed ul.eltSub, .closed ul.eltNew { display: block; }
-
-.knobClosed, .closed .knobOpened, .opened .knobClosed, .closed .opened .knobClosed,
-.closed p, .closed pre, .closed blockquote, .closed ol, .closed hr, .closed ul,
-.closed img, .closed label, .closed .result, .closed div.tooLarge,
-.closed .eltQuickAdd, .closed .author {
-	display: none; }
-.knobOpened, .closed .knobClosed, .opened .knobOpened, .opened p, .opened pre,
-.opened blockquote, .opened ol, .opened hr, .opened ul, .opened img, .opened div.tooLarge,
-.opened .eltQuickAdd {
-	display: block; }
-.opened label, .opened .result, .opened .author { display: inline; }
-
-.closed { color: #ddd; }
-.closed .opened { color: black; }
+.closed .knobOpened, .elt .knobClosed,
+.closed form, .closed ul.eltSub, .closed ul.eltNew, .closed .eltSubsClose { display: none; }
+
+.closed, .closed .knobClosed {
+	position: relative;
+	background: white;
+	display: inline;
+	right: 8px; }
 
 /*                                  _                   _           
             _ __ ___   ___ ____    | |__   ___  _ __ __| | ___ _ __ 

data/test/unit/visit_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class VisitTest < Test::Unit::TestCase
+  fixtures :visits
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end