parlement 0.13 → 0.14

data/public/stylesheets/default.css

@@ -10,74 +10,32 @@ html {
 	border: none;
 	background: url("/images/Sleep-Deprivation-5.JPG"); }
 
-body {
-	color: black;
-	padding: 0 3%;
-	background: white;
-	font-size: smaller;
-	margin: 3em 4% 4% 4%; }
+body { margin: 3em 3%; }
+body .sb-inner, body .sb-border { background: white; }
 
 /*                 _               _        _     _             _ 
                ___| | __ _ ___ ___(_) ___  | |__ | |_ _ __ ___ | |
               / __| |/ _` / __/ __| |/ __| | '_ \| __| '_ ` _ \| |
              | (__| | (_| \__ \__ \ | (__  | | | | |_| | | | | | |
               \___|_|\__,_|___/___/_|\___| |_| |_|\__|_| |_| |_|_|           */
-form {
-	margin: 0;
-	padding: 0;
-	display: inline; }
-
-input, textarea {
-	color: inherit;
-	max-width: 100%;
-	font-size: inherit;
-	font-weight: inherit;
-	background: transparent; }
-
-img {
-	border: none;
-	max-width: 50%;
-	_max-width: none;
-	width: expression((offsetWidth > document.body.offsetWidth*0.5) ? "50%" : offsetWidth); }
-textarea { width: 60%; }
-select { background: transparent; }
-input[type='button'], input[type='submit'] { font-weight: bolder; }
-
+img { border: none; }
 pre { overflow: auto; }
 
+legend, a:link, select { color: #3b76ae; }
+a:visited { color: #1b568e; }
+a:hover, a:active, select:hover, input[type='Button']:hover, input[type='submit']:hover { color: purple; }
+a:active, input[type='Button']:active, input[type='submit']:active { color: orange; }
+a:link, a:visited { text-decoration: none; }
+a:hover { text-decoration: underline; }
+
 /*                      _                    _           
                        | |__   ___  __ _  __| | ___ _ __ 
                        | '_ \ / _ \/ _` |/ _` |/ _ \ '__|
                        | | | |  __/ (_| | (_| |  __/ |   
                        |_| |_|\___|\__,_|\__,_|\___|_|                       */
-h1, h2 {
-	margin: 0;
-	padding: 1%;
-	font-weight: bolder; }
-body > ul > .elt > * > h1 { letter-spacing: 0.2em; }
-.elt .elt h1 {
-	font-size: larger;
-	_background: #eef; }
-h3 { margin: 0px; }
-
-h1 input {
-	width: 90%;
-	_font-size: medium;
-	_font-weight: bolder; }
-
-#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; }
-
-legend, a:link, select, input[type='Button'], input[type='submit'] { color: #3b76ae; }
-a:visited { color: #1b568e; }
-a:hover, a:active, select:hover, input[type='Button']:hover, input[type='submit']:hover { color: purple; }
-a:active, input[type='Button']:active, input[type='submit']:active { color: orange; }
-
 .notice, .warning, .error {
 	font-weight: bolder;
-	text-align: center;
-	font-size: larger; }
+	text-align: center; }
 .error { color: #f00; }
 .notice { color: #080; }
 .warning { color: #f84; }
@@ -88,20 +46,8 @@ a:active, input[type='Button']:active, input[type='submit']:active { color: oran
                             | | (_) | (_| | | | | |
                             |_|\___/ \__, |_|_| |_|
                                      |___/                                   */
-.choicesToUpdate {
-	font-size: smaller;
-	color: #ddd;
-	float: left; }
-.login {
-	color: white;
-	margin: 0.5em;
-	padding: 0.3em;
-	background: red;
-	font-size: larger;
-	font-weight: bolder; }
+.choicesToUpdate { display: none; }
 .logout {
-	float: right;
-	padding-right: 1em;
 	font-weight: bolder;
 	font-family: sans-serif; }
 
@@ -117,194 +63,162 @@ a:active, input[type='Button']:active, input[type='submit']:active { color: oran
 .helpLink { cursor: help; }
 .helpLinkClose { text-decoration: line-through; }
 
-.help {
-	padding: 1em;
-	text-align: left; }
-h1 .help {
-	font-size: smaller;
-	font-weight: normal; }
-
-.helpTitle, .helpTitle:link, .helpTitle:visited {
-	font-weight: bolder;
-	font-size: larger; }
-
-
+.icon {
+	color: orange;
+	font-weight: bolder; }
+.icon:hover, .icon:active { color: #f0f; }
 
 /*                         _     _      _                
                        ___(_) __| | ___| |__   __ _ _ __ 
                       / __| |/ _` |/ _ \ '_ \ / _` | '__|
                       \__ \ | (_| |  __/ |_) | (_| | |   
                       |___/_|\__,_|\___|_.__/ \__,_|_|                        */
-#spinner img {
-	position: absolute;
-	right: 4.5%;
-	top: 3em; }
-.sidebar, .links {
-	text-align: center;
-	background: white;
-	width: 30%; }
+#sidebar {
+	width: 30%;
+	z-index: 10;
+	float: right;
+	padding: 1em;
+	font-size: smaller;
+	margin: -3em -3% 1em 1em; }
+#sidebar .sb-inner, #sidebar .sb-border { background: #ddf; }
+
+#sidebar h2 {
+	margin: 0;
+	font-style: italic;
+	letter-spacing: 2px;
+	font-variant: small-caps; }
+#sidebar ul { margin: 0; }
+#sidebar ul li { list-style-type: none; }
+#sidebar ul li:hover { background: #ddf; }
+
 .links {
-	position: absolute;
-	background: white;
-	margin-top: -3em;
-	height: 3em;
-	right: 4%; }
+	background: #ddf;
+	text-align: center; }
 .links #fr {
-	width: 1em;
+	width: 0.7em;
 	color: white;
 	background: white;
-	border-left: 1em blue solid;
-	border-right: 1em red solid; }
-.sidebar {
-	float: right;
-	padding-left: 2%;
-	margin-right: -1%; }
-/* Big hack for ie */
-* html .links {
-	width: 33%;
-	margin-right: -1px; }
-
-.title {
-	display: block;
-	font-size: larger;
-	font-weight: bolder;
-	letter-spacing: 0.5em; }
-.signets { font-size: smaller; }
+	border-left: 0.7em blue solid;
+	border-right: 0.7em red solid; }
 
 .box {
-	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;
+	background: #ccf;
+	margin-top: 0.5em; }
+.box h3 {
+	margin: 0;
+	color: yellow;
+	padding: 0.2em 0.4em;
+	background: url("/images/Sleep-Deprivation-5.JPG"); }
+.box h4 { margin: 0; }
+a.feed { z-index: 10; }
+a.feed img {
 	float: right;
-	margin: 1px 5px 0 0; }
-.feed img { max-width: 100%; }
-.boxLine {
-	text-align: left;
-	margin-left: 1em; }
-.boxLineR {
-	text-align: right;
-	padding-right: 1em; }
-.boxMore {
-	text-align: right;
-	font-weight: bolder; }
+	margin: 0.2em 0.2em 0 0; }
+.boxLineR, .boxMore { text-align: right; }
+
 .box .filter { display: none; }
 .box:hover .filter { display: inline; }
 
-.identity form { display: block; }
+.identity form { margin: 0; }
+.identity fieldset {
+	border: none;
+	padding: 0; }
 .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; }
-img.avatar {
-	float: left;
-	width: auto;
-	max-width: 30%;
-	_max-width: none;
-	margin-right: 1em; }
-.identity img.avatar {
-	float: none;
-	margin: 0 auto;
+#sidebar img.avatar {
 	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 select {
-	border: none;
-	text-align: center; }
-form#filterForm a {
-	font-size: larger;
-	font-weight: bolder; }
-form#filterForm input[type='submit'] { display: none; }
+	max-width: 30%;
+	margin: 0 auto; }
 
-#listByDate ul, #listByVote ul {
-	margin: 0 3px;
-	padding: 0; }
-#listByDate ul li.boxLine, #listByVote ul li.boxLine {
-	background: none;
-	border-bottom: solid 1px #fd8; }
-#listByDate .created_on, #listByVote .created_on { display: none; }
-#listByDate .author, #listByVote .author { font-size: smaller; }
-#listByDate .result, #listByVote .result {
+form#filterForm input { display: none; }
+form#filterForm, form#filterForm * {
 	font-weight: bolder;
-	float: right;
-	color: blue; }
+	text-align: center;
+	font-size: large;
+	padding: 0;
+	margin: 0; }
 
-div#listSubscribers .boxLineR { font-size: smaller; }
+#sidebar ul { padding: 0; }
+#sidebar ul li.boxLine { border-bottom: solid 1px #fd8; }
+#sidebar .author, .boxLineR { font-size: smaller; }
+#sidebar .created_on { display: none; }
+#sidebar .result { float: right; }
 
-.box h4 {
-	margin: 0;
-	padding: 0;
-	color: #333;
-	font-style: italic; }
+body.anon #listVisitors, body.anon #listSubscribers { display: none; }
 
 /*                                      _ _   
                                     ___| | |_ 
                                    / _ \ | __|
                                   |  __/ | |_ 
                                    \___|_|\__|                                */
-body > ul {
-	margin: 0;
-	padding: 0;
-	background: white; }
-
-body > ul > .elt { background: none; }
-
-.parent {
-	left: 4%;
+ul.top {
+	padding-left: 0;
+	margin-right: 3px;
+	margin-left: 1.2em; }
+ul.top * {
+	z-index: auto;
+	position: auto; }
+h3.parent {
 	margin-top: -2em;
-	position: absolute;
-	font-style: italic;
-	font-weight: bolder; }
-.parent a:link, .parent a:visited { color: white; background: transparent; }
-.parent a:hover, .parent a:active { color: #ffa500; background: transparent; }
+	position: absolute; }
+h3.parent a:link, h3.parent a:visited { color: #ddd; }
 
-.elt {
-	margin: 0;
-	clear: left;
+h1, h2 { margin-top: 0em; }
+h1 {
+	padding-top: 1em;
+	_padding-top: 0em; }
+
+h1 a, h2 a {
+	display: block;
+	color: #bbd !important;
+	padding: 0 0.5em 0em 0.5em; }
+h1 a:after, h2 a:after {
+	display: block;
+	color: #1b568e;
+	margin-top: -1.3em;
+	_margin-top: -1.2em;
+	margin-left: -0.1em;
+	content: attr(title); }
+ul.top h1 a, ul.top h2 a {
+	border-right: solid transparent;
+	border-left: solid transparent;
+	border-bottom: solid #3b76ae; }
+ul.top h1 a { border-width: 7px; }
+ul.top h2 a { border-width: 3px; }
+
+#elt_parlement > .created_on, #elt_parlement h1 a, #elt_parlement h1:after,
+#elt_fr > .created_on, #elt_fr h1 a, #elt_fr h1:after {
+	display: none; }
+
+ul.top li.elt {
 	width: 100%;
-	_width: auto;
-	margin-top: 1px;
+	clear: left;
 	list-style-type: none;
-	background: url(/images/eltBackground.jng) repeat-x;
-	/* So that IE doesn't go into some strange mode */
-	_background: none; }
-
-.titled { margin-top: 1em; }
-
-.author {
-	color: #888;
-	font-style: italic;
-	font-weight: bolder; }
+	background: url(/images/eltBackground.jng) repeat-x; }
+ul.top li.elt.closed, ul.top > li.elt { background: none; }
 
 .created_on {
 	float: right;
 	font-size: smaller; }
 
-.position { display: none; }
-#form:hover .position { display: inline; }
+ul.top img.avatar {
+	float: left;
+	z-index: 10;
+	margin-right: 1em; }
+
+ul.top .attachments img {
+	max-width: 30%;
+	_max-width: none;
+	width: expression((offsetWidth > document.body.offsetWidth*0.5) ? "50%" : offsetWidth); }
 
 a.readMore { font-style: italic; }
 div.tooLarge { display: none; }
-body > ul > .elt > form a.readMore { display: none; }
-body > ul > .elt > form div.tooLarge { display: block; }
+ul.top > li.elt > p > a.readMore { display: none; }
+ul.top > li.elt > div.tooLarge { display: block; }
+
+.nav {
+	text-align: center;
+	list-style-type: none; }
 
 /*                                          _       
                              _ __ ___ _ __ | |_   _ 
@@ -315,21 +229,13 @@ body > ul > .elt > form div.tooLarge { display: block; }
 blockquote {
 	margin: 0 1%;
 	padding: 0 1%;
+	background: #ddd;
 	font-size: smaller;
-	border-left: solid 4px #aaf;
-	background: #ddd url("/images/eltBackground.jng") repeat-x;
-	/* So that IE doesn't go into some strange mode */
-	_background: #ddd; }
-
-blockquote > p {
-	margin: 0;
-	padding: 0.5em 0; }
+	border-left: solid 4px #aaf; }
 
 /* To make sure it is still readable */
 blockquote blockquote blockquote { font-size: x-small; }
 
-.eltQuickAdd { margin-left: 1em; }
-
 /*                             _           _          
                            ___| |__   ___ (_) ___ ___ 
                           / __| '_ \ / _ \| |/ __/ _ \
@@ -337,35 +243,30 @@ blockquote blockquote blockquote { font-size: x-small; }
                           \___|_| |_|\___/|_|\___\___|                       */
 .choice {
 	float: right;
-	text-align: right;
+	font-size: large;
 	margin-top: -1.2em;
-	padding-right: 64px;
-	_padding-right: 0px;
-	white-space: nowrap; }
-.choice form { display: inline; }
-/* Important, no "display: none", or IE can't manage event */
-.choice input {
+	position: relative;
+	font-weight: bolder; }
+body.anon .choice .con, body.anon .choice .result, body.anon .choice .pro {
+	/* Not really hidden, or it would mess up with avatar sizing */
 	position: absolute;
-	left: -100em; }
-.choice label { cursor: pointer; }
-.choice img { margin-bottom: -4px; }
-.result { color: blue; }
-label.selected, .choice label:hover { border: solid 3px; }
-.choice label:hover { border-color: cyan; }
-.choice label.selected { border-color: yellow; }
-.choice label.selected:hover { border-color: magenta; }
-.choices {
-	right: 0;
+	margin-left: -200em; }
+.choice .result { display: none; }
+.choice .result.selected { display: inline; }
+.choice img {
+	border: solid 3px transparent;
+	_border-color: white;
+	margin-bottom: -6px; }
+.choice img:hover { border-color: cyan; }
+.choice img.selected { border-color: yellow; }
+.choice img.selected:hover { border-color: magenta; }
+table.choices {
 	z-index: 10;
+	right: -10px;
 	background: white;
+	margin-top: -1.5em;
 	position: absolute;
-	border: solid 5px pink; }
-.closeChoices {
-	font-size: larger;
-	font-weight: bolder;
-	font-family: sans-serif; }
-.choices .created_on, .choices caption { display: none; }
-.personalChoice { display: inline; margin-right: 1em; }
+	border: outset 3px blue; }
 
 /*                                        _     
                                 ___ _   _| |__  
@@ -376,31 +277,19 @@ label.selected, .choice label:hover { border: solid 3px; }
 	margin-left: 1%;
 	padding-left: 1%;
 	border-left: solid 0.4em #ffc;
-	border-bottom: solid 1px #fd8; }
+	border-bottom: solid 1px #ffc; }
 
-.eltMore {
-	display: block;
-	margin-left: 3%; }
+body.logged .for_anon { display: none; }
 
-li.pager {
-	text-align: center;
-	list-style-type: none; }
-
-.icon {
-	color: orange;
-	margin-right: 0.5em;
-	font-weight: bolder;
-	letter-spacing: -5px;
-	text-decoration: none; }
-.icon:hover, .icon:active { color: #f0f; }
+.position { display: none; }
+ul.top label { font-weight: bolder; }
 
-.pageCount { margin: 0 2em; }
+li.elt textarea { width: 64%; }
+li.elt li.elt textarea { width: 62%; }
+li.elt li.elt li.elt textarea { width: 60%; }
+form:hover .position { display: inline; }
 
-.eltNew {
-	background: url("/images/eltBackground.jng") repeat-x;
-	/* So that IE doesn't go into some strange mode */
-	_background: none; }
-.eltNewButtons { text-align: right; }
+.eltNewButtons { text-align: center; }
 
 /*                                         _             
                        __   _____ _ __ ___(_) ___  _ __  
@@ -410,56 +299,22 @@ li.pager {
 .version {
 	/* To make sure the sidebar is not the last element at the bottom */
 	clear: right;
-	text-align: center; }
-.version > * + * { display: none; }
-.version:hover > * + * { display: inline; }
-.version > a {
-	color: #aaa;
-	font-size: smaller; }
+	text-align: right; }
 
 /*                           _                _     
                             | | ___ __   ___ | |__  
                             | |/ / '_ \ / _ \| '_ \ 
                             |   <| | | | (_) | |_) |
                             |_|\_\_| |_|\___/|_.__/                          */
-.knobOpened, .knobClosed {
-	font-family: sans-serif;
-	border: solid 1px #fd8;
-	text-decoration: none;
-	font-weight: bolder;
-	background: white; }
-.knobOpened {;
-	margin-left: -16px;
-	position: absolute; }
-.knobOpened:link, .knobOpened:visited, .knobClosed:link, .knobClosed:visited {
-	color: orange; }
-
-.closed .knobOpened, .elt .knobClosed,
-.closed form, .closed ul.eltSub, .closed ul.eltNew, .closed .eltSubsClose { display: none; }
-
-.closed, .closed .knobClosed {
-	position: relative;
+.closed, .closed a.knobClosed { display: inline; }
+a.knobClosed, .closed * { display: none; }
+a.knobOpened { position: absolute; }
+a.knobOpened, a.knobClosed {
+ 	border: solid thin #fd8;
 	background: white;
-	display: inline;
-	right: 8px; }
-
-/*                                  _                   _           
-            _ __ ___   ___ ____    | |__   ___  _ __ __| | ___ _ __ 
-           | '_ ` _ \ / _ \_  /____| '_ \ / _ \| '__/ _` |/ _ \ '__|
-           | | | | | | (_) / /_____| |_) | (_) | | | (_| |  __/ |   
-           |_| |_| |_|\___/___|    |_.__/ \___/|_|  \__,_|\___|_|            */
-body { -moz-border-radius: 1em 0 1em 1em; }
-input, textarea {
-	-moz-border-radius: 1em 0 0 1em; }
-input[type='button'], input[type='submit'], blockquote {
-	-moz-border-radius: 0 1em 1em 0; }
-.links { -moz-border-radius: 1em 1em 0 0; }
-.box, .sidebar, .choices { -moz-border-radius: 0 0 1em 1em; }
-.login { -moz-border-radius: 1em; }
-.eltSub { -moz-border-radius: 0 0 0 1em; }
-.choice label { -moz-border-radius: 1em; }
+	color: orange;
+	left: -16px; }
 
 /*                          _                       
                            |_)_.._| _ ._ _  _ .__|_ 
                            | (_|| |(/_| | |(/_| ||_                          */
-

data/vendor/plugins/engines/README

@@ -30,6 +30,8 @@ Include these files in an <tt>app</tt> directory just like you would in a normal
 
 Model code can similarly be placed in an <tt>app/models/</tt> directory. Unfortunately, it's not possible to automatically override methods within a model; if your application needs to change the way a model behaves, consider creating a subclass, or replacing the model entirely within your application's <tt>app/models/</tt> directory. See Engines::RailsExtensions::Dependencies for more information.
 
+IMPORTANT NOTE: when you load code from within plugins, it is typically not handled well by Rails in terms of unloading and reloading changes. Look here for more information - http://rails-engines.org/development/common-issues-when-overloading-code-from-plugins/
+
 === Routes
 
 Include your route declarations in a <tt>routes.rb</tt> file at the root of your plugins, e.g.:

data/vendor/plugins/engines/Rakefile

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/rdoctask'
+require 'tmpdir'
 
 task :default => :doc
 
@@ -11,4 +12,21 @@ Rake::RDocTask.new(:doc) do |doc|
   doc.rdoc_files.include("README", "UPGRADING", "CHANGELOG", "MIT-LICENSE")
   doc.rdoc_files.include('lib/**/*.rb')
   doc.options << '--line-numbers' << '--inline-source'
+end
+
+desc 'Run the engine plugin tests within their test harness'
+task :cruise do
+  # checkout the project into a temporary directory
+  version = "rails_1.2"
+  test_dir = "#{Dir.tmpdir}/engines_plugin_#{version}_test"
+  puts "Checking out test harness for #{version} into #{test_dir}"
+  `svn co http://svn.rails-engines.org/test/engines/#{version} #{test_dir}`
+
+  # run all the tests in this project
+  Dir.chdir(test_dir)
+  load 'Rakefile'
+  puts "Running all tests in test harness"
+  ['db:migrate', 'test', 'test:plugins'].each do |t|
+    Rake::Task[t].invoke
+  end  
 end

data/vendor/plugins/engines/lib/engines/testing.rb

@@ -2,7 +2,6 @@
 # for more details.
 
 require 'test/unit'
-require 'test_help'
 
 require 'tmpdir'
 require 'fileutils'

data/vendor/plugins/engines/tasks/engines.rake

@@ -1,4 +1,4 @@
-# This code lets us redefine existing Rake tasks, which is extermely
+# This code lets us redefine existing Rake tasks, which is extremely
 # handy for modifying existing Rails rake tasks.
 # Credit for this snippet of code goes to Jeremy Kemper
 # http://pastie.caboo.se/9620
@@ -70,7 +70,9 @@ namespace :doc do
         options << '-T html'
 
         # Include every file in the plugin's code_paths (see Plugin#code_paths)
-        files.include("#{plugin_base}/{#{Rails.plugins[plugin].code_paths.join(",")}}/**/*.rb")
+        if Rails.plugins[plugin]
+          files.include("#{plugin_base}/{#{Rails.plugins[plugin].code_paths.join(",")}}/**/*.rb")
+        end
         if File.exists?("#{plugin_base}/README")
           files.include("#{plugin_base}/README")    
           options << "--main '#{plugin_base}/README'"

data/vendor/plugins/login_engine/app/controllers/user_controller.rb

@@ -1,5 +1,6 @@
 class UserController < ApplicationController
-  model   :user
+  # echarp
+  #model   :user
 
   # Override this function in your own application to define a custom home action.
   def home