Merge branch 'wiki'

Conflicts:
	app/helpers/pages_helper.rb
	public/stylesheets/main.css
	public/stylesheets/print.css

public/stylesheets/sass/main.sass

@@ -162,7 +162,7 @@ span.click-me
 #main 
   :background #FFF
   :padding 0
-  :margin 0
+  :margin 0 15px 0 15px
 
 //  ************************************* infobar
 #infobar 
@@ -226,10 +226,10 @@ span.click-me
 // ************************************** content
 #content 
   :padding .5em 0 2.5em 0
-  :margin 0 0 0 1em
+  :margin 0
   :background #FFF
   :font-size 1.3em
-  :width 95%
+  :width 100%
   :float left
 
 
@@ -342,9 +342,6 @@ div.box
   :border-left 2px solid #78b74e
   :padding-left 5px
 
-div.single_column, div.left_column, div.right_column
-  :margin .5em .5em 1.5em .5em
-
 div.single_column 
   :width 100%
 
@@ -352,6 +349,11 @@ div.left_column
   :width 40%
   :float left
 
+div.middle_column
+  :width 40%
+  :margin-left 10px
+  :float left
+
 div.right_column
   :margin-bottom 3em
   :width 55%
@@ -497,21 +499,73 @@ ul.autocomplete
   text-align: center
   margin: 0 10px 10px 0
 // *** wiki
+#wiki_content
+  border-style: none
+  color: black
+  line-height: 1.5em
+
 .wiki_show, .wiki_version, .wiki_new, .wiki_edit, .wiki_all
+  margin-top: 30px
+  padding: 10px
   h1
     padding-left: 0
     padding-top: 10px
+    border-bottom:
+      :style solid
+  .column_content
+    margin-bottom: 0
+
+#wiki_content
+  min-height: 400px
+  span.editsection
+    display: none
+  h2, h3, h4, h5, h6
+    background: transparent none repeat scroll 0 0
+    border-bottom: 1px solid #AAAAAA
+    padding-bottom: 0,17em
+    padding-top: 0,5em
+    font-weight: normal
+    font-size: 150%
+    color: black
+  h3, h4, h5, h6
+    border-bottom: medium none
+    font-weight: bold
+  h3
+    font-size: 132%
+  h4
+    font-size: 116%
+  ul
+    line-height: 1.5em
+    margin: 0.3em 0 0 1.5em
+    padding: 0
+  ol
+    line-height: 1.5em
+    margin: 0.3em 0 0 3.2em
+    padding: 0
+    list-style-image: none
+  li margin-bottom: 0.1em
+
 a.new_wiki_link
   color: grey
 #preview
   border: 1px dotted grey
   padding: 0 1em
-#toc
-  float: right
+#wikitoc
+  padding: 5px
+  margin-bottom: 2em
+  width: 25em
+  border: 1px solid grey
+  :background-color= !lightGrey
+  h2
+    font-size: 1em
+    color: black
+    span a
+      font-size: 0.5em
+      color: grey
+
 #breadcrump
   font-size: 0.5em
   margin-bottom: 5px
-  margin-top: 30px
   height: 1em
   color: #ED0606
   a
@@ -521,21 +575,25 @@ a.new_wiki_link
     :text-decoration = underline
 #sidebar
   float: right
-  width: 20%
+  width: 290px
+  margin-top: -60px
   #page-versions
-    margin-top: -60px
+    margin-bottom: 18px
     text-align: right
   #subpages
-    margin-top: 2em
-
-
-#wiki_content
-  h1, h2, h3, h4, h5
-    color: black
-  span.editsection
-    display: none
+    border: 1px solid #78b74e
+    margin-top: 10px
+    padding: 0 0 0 0
+  #versions
+    margin-top: 10px
+    border: 1px solid #78b74e
 
 #wiki-syntax-help
   float: right
   table
     border-color: #78b74e
+
+.wiki_version
+  #sidebar
+    margin-top: -23px
+    border: 1px solid #78b74e