motiro 0.6.10 → 0.6.11

data/lib/stub_hash.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class Hash
   def method_missing(name, *args)

data/lib/tasks/packaging.rake

@@ -4,18 +4,18 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 require File.expand_path(File.dirname(__FILE__) + '/../../app/core/version')
 
@@ -33,7 +33,7 @@ unless MOTIRO_VERSION.include? 'dev'
 
     s.files = Dir.glob('**/*', File::FNM_DOTMATCH).reject do |f| 
       [ /\.$/, /database\.sqlite/, /^(tmp|log)/, /(^|\/)\./,
-        /\.log$/, /^pkg/, /\.svn/, /^vendor\//, /^_darcs/, 
+        /\.log$/, /^pkg/, /\.svn/, /^vendor\//, /^_darcs/,
         /\~$/, /motiro(db|test)\.sqlite$/,
         /^db\/(development_structure\.sql|schema.rb)/,
         %r{public/javascript($|/)},

data/lib/tasks/testing.rake

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 namespace :test do
   desc "Run the tests under test/contract"

data/lib/tick_daemon.rb

@@ -4,18 +4,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require File.dirname(__FILE__) + "/../config/environment"
 

data/lib/wiki_link_handler.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class WikiLinkHandler < MediaWikiLinkHandler
 

data/lib/wiki_renderer.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  Thiago Arrais
 #  
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  GNU Affero General Public License for more details.
 #  
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 require 'mediacloth'

data/public/stylesheets/motiro.css

@@ -1,221 +1,215 @@
 body {
-    font: normal 10pt Verdana,sans-serif;
-    background-color: #f0f0f0; 
-    text-align: left;
-    padding: 1em 2em;   
+  font: normal 10pt Verdana,sans-serif;
+  background-color: #f0f0f0; 
+  text-align: left;
+  padding: 1em 2em;   
 }
 
 #notice {
-    border: 2px solid red;
-    padding: 0.5em;
-    margin-bottom: 1em;
-    background-color: red;
-    font: bold smaller sans-serif;
-    color: #ffffff;
+  border: 2px solid red;
+  padding: 0.5em;
+  margin-bottom: 1em;
+  background-color: red;
+  font: bold smaller sans-serif;
+  color: #ffffff;
 }
 
-#summary {
-    font: smaller courier;
+#summary { font: smaller courier; }
+
+#changes { display: none; }
+
+#header {
+  margin: 0;
+  padding: 0;
+  position: relative;
 }
 
-#changes {
-    display: none;
+#rightside { float: right; }
+
+div.pagetext {
+  background-color: #FFF;
+  margin: 4px 0 4px 0;
+  padding: 0 .8em .4em .8em;
+  border: 1px solid #679cd2;
 }
 
-#header {
-    margin: 0;
-    padding: 0;
-    position: relative;
-    height: 3em;
+div.pagetext div.message {
+  padding-top: .1em;
+  display: table;
 }
 
-div.authorization_cell {
-    width: 9.1em;
-    float: left;
+div.pagetext div.wikierror {
+  border: 1px solid #ff6330;
+  background-color: #eeeeb0;
+  width: 28em;
+  margin: 0 0 1em 0;
 }
 
-#rightside {
-    float: right;
+div.message img {
+  float: left;
+  margin: 0 .2em .1em .2em;
 }
 
-div.pagetext {
-    background-color: #FFF;
-    margin: 4px 0 4px 0;
-    padding: 0 .8em .4em .8em;
-    border: 1px solid #679cd2;
+div.message p {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+div.pagetext pre.wikisource {
+  border: 1px solid #333;
+  background-color: #dddde0;
+  padding: .2em .4em .2em .4em;
 }
 
 div.channel div.pagetext, div.pagetext div.pagetext {
-    background-color: #FFF;
-    margin: 0;
-    padding: 0;
-    border: 0;
+  background-color: #FFF;
+  margin: 0;
+  padding: 0;
+  border: 0;
 }
 
 div#crumbs {
-    border-bottom: solid #d0d0d0 1px;
-    padding: .2em 0 .2em 0;
-    color: #808080
+  border-bottom: solid #d0d0d0 1px;
+  padding: .2em 0 .2em 0;
+  color: #808080
 }
 
 div.page-title {
-    margin-top: .4em;
-    margin-bottom: 1em;
+  margin-top: .4em;
+  margin-bottom: 1em;
 }
 
 span.page-title {
-    font-size: 2em;
-    font-weight: bold;
+  font-size: 2em;
+  font-weight: bold;
 }
 
 span#revision {
-    color: #808080;
-    font-size: 1em;
-    white-space: nowrap;
+  color: #808080;
+  font-size: 1em;
+  white-space: nowrap;
 }
 
-#mainpage {
-    margin: 4px 332px 4px 0;
-}
+#mainpage { margin: 4px 332px 4px 0; }
 
 div.channel {
-    width: 316px;
-    margin: 4px 4px 4px 4px;
+  width: 316px;
+  margin: 4px 4px 4px 4px;
 }
 
 div.channel-title {
-    font-weight: bold;
-    margin:0;
-    padding: 0 2px 1px 8px;
-    color: #000;
-    background: #a0ccee;
+  font-weight: bold;
+  margin:0;
+  padding: 0 2px 1px 8px;
+  color: #000;
+  background: #a0ccee;
 }
             
 div.channel-body-outer {
-    padding: 0 9px 0 9px;
-    background: #a0ccee;
+  padding: 0 9px 0 9px;
+  background: #a0ccee;
 }
 
 div.pagetext a.rss {
-    float: right;
-    margin: .3em;
+  float: right;
+  margin: .3em;
 }
 
 a.feed {
-    display: block;
-    float: right;
-    margin: 14px 10px;
+  display: block;
+  float: right;
+  margin: 14px 10px;
 }
 
 div.window {
-    background-color: #a0ccee;
-    padding: 8px 8px 8px 8px;
-    margin: 0 0 .48em 0;
+  background-color: #a0ccee;
+  padding: 8px 8px 8px 8px;
+  margin: 0 0 .48em 0;
 }
 
 div.inner {
-    background: #FFF;
-    padding: 4px 4px 12px 4px;
+  background: #FFF;
+  padding: 4px 4px 12px 4px;
 }
 
-div.inner span.meta {
-    font-size: 0.8em;
-}
+div.inner span.meta { font-size: 0.8em; }
 
-div.toolbar {
-    font-size: 0.8em;
-}
+div.toolbar { font-size: 0.8em; }
 
-div.bottombar {
-    border-top: 1px dotted #9C9C9C;
-}
+div.bottombar { border-top: 1px dotted #9C9C9C; }
 
 div.bottombar p { margin-top: 0 }
 
-div.channel_toolbar {
-    border-bottom: 1px dotted #9C9C9C;
-}
-
+div.channel_toolbar { border-bottom: 1px dotted #9C9C9C; }
 
-.disabled {
-    color: gray;
-}
+.disabled { color: gray; }
 
 .marked {
-    color: #F00;
-    background: #FFA;
+  color: #F00;
+  background: #FFA;
 }
 
-.changed {
-    background:#FFD;
-}
+.changed { background:#FFD; }
 
 table.diff {
-    border: solid gray;
-    border-width: 1px 0 1px 0;
-    border-collapse: collapse;
-    font-family: monospace;
-    font-size: 0.8em;
-    margin: 0 0 1em 0;
+  border: 0px none;
+  border-bottom: 1px solid #999;
+  border-collapse: separate;
+  font-family: monospace;
+  font-size: 0.8em;
+  margin: 0 0 1em 0;
+  empty-cells: show;
 }
 
 table.diff pre {
-    margin: 0;
-    padding: 0;
-    text-align: left;
-    white-space: pre-wrap;      /* CSS 3 */
-    white-space: -moz-pre-wrap; /* Mozilla, 1999+ */
-    white-space: -pre-wrap;     /* Opera 4-6 */
-    white-space: -o-pre-wrap;   /* Opera 7 */
-    word-wrap: break-word;      /* IE 5.5+ */
+  margin: 0;
+  padding: 0;
+  text-align: left;
+  white-space: pre-wrap;      /* CSS 3 */
+  white-space: -moz-pre-wrap; /* Mozilla, 1999+ */
+  white-space: -pre-wrap;     /* Opera 4-6 */
+  white-space: -o-pre-wrap;   /* Opera 7 */
+  word-wrap: break-word;      /* IE 5.5+ */
 }
 
-table.diff td {
-    padding: .05em .4em .05em .4em;
+table.diff td, table.diff th {
+  padding: .05em .4em .05em .4em;
+  border-style: solid solid none none;
+  border-width: 1px 1px 0px 1px;
+  border-color: #ddd #999 #ddd #999;
 }
 
-table.diff col.line_number {
-    text-align: center;
-    border: solid gray;
-    border-width: 0 1px 0 1px;
+table.diff th {
+  font-weight: normal;
+  text-align: center;
 }
 
-table.diff col.left {
-    border-right: 1px solid gray;
-    width: 50%;
-}
+table.diff th:first-child { border-left-style: solid }
 
-table.diff col.right {
-    width: 50%;
+table.diff tr:first-child td, table.diff tr:first-child th {
+  border-top: 1px solid #999
 }
 
+table.diff col.left { width: 50%; }
+table.diff col.right { width: 50%; }
+
 tbody.unchanged {
-    background: #FFF;
+  background: #FFF;
+  border: none;
 }
 
-tbody.modification {
-    background: #ffffb8;
-    border: #606060 solid;
-    border-width: 1px 0 1px 0;
-}
+tbody.modification { background: #ffffb8; }
+tbody.modification th, tbody.modification td { border-top-color: #dd9 }
 
-tbody.addition {
-    background: #b8ffb8;
-    border: #606060 solid;
-    border-width: 1px 0 1px 0;
-}
+tbody.addition { background: #b8ffb8; }
+tbody.addition th, tbody.addition td { border-top-color: #9d9 }
 
-tbody.deletion {
-    background: #ffb8b8;
-    border: #606060 solid;
-    border-width: 1px 0 1px 0;
-}
+tbody.deletion { background: #ffb8b8; }
+tbody.deletion th, tbody.deletion td { border-top-color: #d99 }
 
 tbody.separator {
-   background: #d0d0c4;
-   text-align: center;
-   border: #606060 solid;
-   border-width: 1px 0 1px 0;
+ background: #d0d0c4;
+ text-align: center;
 }
 
 table.oldernews {
@@ -241,67 +235,57 @@ table.oldernews .date { border-right-width: 0; }
 table.oldernews .relative { border-left-width: 0; }
       
 input {
-    border: solid 1px #80aacc;
-    margin: .2em 0 0 0;
+  border: solid 1px #80aacc;
+  margin: .2em 0 0 0;
 }
 
-input.button {
-    background-color: #b0ddff;
-}
+input.button { background-color: #b0ddff; }
 
-input.checkbox {
-   border: none;
-}
+input.checkbox { border: none; }
 
 input#txtTitle {
-    font-size: x-large;
-    font-family: courier;
-    margin-top: .2em;
-    margin-bottom: .4em;
+  font-size: x-large;
+  font-family: courier;
+  margin-top: .2em;
+  margin-bottom: .4em;
 }
 
 textarea {
-    border: solid 1px #80aacc;
-    width: 100%;
+  border: solid 1px #80aacc;
+  width: 100%;
 }
 
-div#editor div.inner {
-    background-color: #e8f2f2; 
-}
+div#editor div.inner { background-color: #e8f2f2; }
 
 div#page_properties {
-    margin: 0;
-    float: left;
-    width: 42em;
+  margin: 0;
+  float: left;
+  width: 42em;
 }
 
 div#loading {
-    display: none;
-    background-color: #123bd7;
-    color: #fff;
-    float: right;
-    padding: 0.2em;
+  display: none;
+  background-color: #123bd7;
+  color: #fff;
+  float: right;
+  padding: 0.2em;
 }
 
 div#wiki_reference {
-    margin: 0;
-    margin-left: 43.6em;
+  margin: 0;
+  margin-left: 43.6em;
 }
 
-div#page_properties div.inner {
-    background-color: #e8f2f2; 
-}
+div#page_properties div.inner { background-color: #e8f2f2; }
 
-a.done {
-    text-decoration: line-through;
-}
+a.done { text-decoration: line-through; }
 
 #footer {
-    padding: 4px 6px 2px 8px;
-    font-size: x-small;
-    text-align: center;
-    color: gray;
-    clear: left;
+  padding: 4px 6px 2px 8px;
+  font-size: x-small;
+  text-align: center;
+  color: gray;
+  clear: left;
 }
 
 span.warning {
@@ -310,6 +294,14 @@ span.warning {
 	padding: 0 3px 0 3px
 }
 
+#authentication_errors {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  height: 0px;
+}
+
 #username_not_available {
 	position: absolute;
 	top: 12px;
@@ -326,3 +318,4 @@ span.warning {
 
 a:link { color: #3333f0 }
 a:visited { color: #88d }
+