From 81aec6b950416c19c991753b41ae20a8e16039eb Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 10 Mar 2011 18:35:19 -0500
Subject: [PATCH] wiki pages

---
 app/logical/post_sets/wiki_page.rb      |   5 +
 app/models/wiki_page.rb                 |   4 +
 app/views/wiki_pages/_form.html.erb     |   4 +-
 app/views/wiki_pages/_sidebar.html.erb  |   4 +-
 app/views/wiki_pages/new.html.erb       |   1 +
 app/views/wiki_pages/show.html.erb      |   2 +
 public/stylesheets/compiled/default.css | 441 ------------------------
 public/stylesheets/src/default.scss     |  38 +-
 8 files changed, 48 insertions(+), 451 deletions(-)

diff --git a/app/logical/post_sets/wiki_page.rb b/app/logical/post_sets/wiki_page.rb
index 770acfb6c..100515c4a 100644
--- a/app/logical/post_sets/wiki_page.rb
+++ b/app/logical/post_sets/wiki_page.rb
@@ -4,6 +4,7 @@ module PostSets
     
     def initialize(tag_name)
       @tag_name = tag_name
+      super()
     end
     
     def load_posts
@@ -17,6 +18,10 @@ module PostSets
     def offset
       0
     end
+    
+    def tags
+      [@tag_name]
+    end
 
     def use_sequential_paginator?
       false
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index eaa1e2f63..868009134 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -56,6 +56,10 @@ class WikiPage < ActiveRecord::Base
   def creator_name
     User.id_to_name(user_id).tr("_", " ")
   end
+  
+  def category_name
+    Tag.category_for(title)
+  end
 
   def pretty_title
     title.tr("_", " ")
diff --git a/app/views/wiki_pages/_form.html.erb b/app/views/wiki_pages/_form.html.erb
index 324bcd9d3..975c6f482 100644
--- a/app/views/wiki_pages/_form.html.erb
+++ b/app/views/wiki_pages/_form.html.erb
@@ -5,4 +5,6 @@
 <% if CurrentUser.is_janitor? %>
   <%= f.input :is_locked %>
 <% end %>
-<%= f.button :submit, "Save" %><%= f.button :submit, "Cancel" %><%= f.button :submit "Preview" %>
+<div id="multiple-buttons">
+  <%= f.button :submit, "Save" %><%= f.button :submit, "Cancel" %><%= f.button :submit, "Preview" %>  
+</div>
diff --git a/app/views/wiki_pages/_sidebar.html.erb b/app/views/wiki_pages/_sidebar.html.erb
index 06b86cccb..cfa2cf00d 100644
--- a/app/views/wiki_pages/_sidebar.html.erb
+++ b/app/views/wiki_pages/_sidebar.html.erb
@@ -1,8 +1,8 @@
 <aside id="sidebar">
   <section>
     <h1>Search</h1>
-    <%= simple_form_for(@search) do |f| %>
-      <%= f.input :title_contains %>
+    <%= form_tag(wiki_pages_path, :method => :get) do %>
+      <%= text_field_tag "title", params[:title], :size => 20 %>
     <% end %>
   </section>
 
diff --git a/app/views/wiki_pages/new.html.erb b/app/views/wiki_pages/new.html.erb
index 2c1ccccdb..6a0fc7a68 100644
--- a/app/views/wiki_pages/new.html.erb
+++ b/app/views/wiki_pages/new.html.erb
@@ -3,6 +3,7 @@
     <%= render "sidebar" %>
 
     <section id="content">
+      <h1>New Wiki Page</h1>
       <div id="preview">
       </div>
 
diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb
index fd744e36d..4c66cb189 100644
--- a/app/views/wiki_pages/show.html.erb
+++ b/app/views/wiki_pages/show.html.erb
@@ -15,3 +15,5 @@
     </section>
   </div>
 </div>
+
+<%= render "secondary_links" %>
\ No newline at end of file
diff --git a/public/stylesheets/compiled/default.css b/public/stylesheets/compiled/default.css
index a87ff61ff..e69de29bb 100644
--- a/public/stylesheets/compiled/default.css
+++ b/public/stylesheets/compiled/default.css
@@ -1,441 +0,0 @@
-.blacklisted {
-  display: none !important; }
-
-body, div, h1, h2, h3, h4, h5, h6, p, ul, li, dd, dt {
-  font-family: Verdana, Geneva, sans-serif;
-  font-size: 100%;
-  margin: 0;
-  padding: 0;
-  border: 0;
-  vertical-align: baseline; }
-
-h1, h2, h3, h4 {
-  font-family: Tahoma;
-  line-height: 1em; }
-
-body {
-  font-size: 80%;
-  padding: 1em 2em;
-  margin: 0; }
-
-article, section {
-  display: block; }
-
-a:link {
-  color: #006ffa;
-  text-decoration: none; }
-
-a:visited {
-  color: #006ffa;
-  text-decoration: none; }
-
-a:hover {
-  color: #9093ff;
-  text-decoration: none; }
-
-a:active {
-  color: #006ffa;
-  text-decoration: none; }
-
-blockquote {
-  margin: 0 0 1em 0;
-  padding: 1em;
-  border: 1px solid #666;
-  background: #EEE; }
-
-code {
-  font-family: monospace;
-  font-size: 1.2em; }
-
-dd {
-  margin-bottom: 1em; }
-
-dt {
-  font-weight: bold; }
-
-h1 {
-  font-size: 2em; }
-
-h2 {
-  font-size: 1.8em; }
-
-h3 {
-  font-size: 1.6em; }
-
-h4 {
-  font-size: 1.4em; }
-
-h5 {
-  font-size: 1.2em; }
-
-h6 {
-  font-size: 1em; }
-
-header {
-  margin: 0 0 1em 0;
-  padding: 0;
-  display: block; }
-
-img {
-  border: none;
-  vertical-align: middle; }
-
-input[type=text], input[type=password], input[type=url], textarea, button {
-  /*  border: 1px solid #AAA;*/
-  font-size: 1em;
-  /*  -moz-border-radius: 4px;*/
-  /*  -webkit-border-radius: 4px;*/ }
-
-input[type=submit] {
-  padding: 1px 4px;
-  /*  border: 1px solid #AAA;*/
-  /*  background-color: #EEE;*/
-  /*  -moz-border-radius: 4px;*/
-  /*  -webkit-border-radius: 4px;*/
-  font-size: 1em;
-  cursor: pointer; }
-
-input:focus, textarea:focus {
-  /*  background-color: #FFD;*/ }
-
-input[type=submit]:hover {
-  /*  background-color: #F6F6F6;*/ }
-
-menu {
-  margin: 0;
-  padding: 0; }
-  menu ul {
-    margin: 0;
-    padding: 0; }
-  menu li {
-    margin: 0 1em 0 0;
-    padding: 0;
-    list-style-type: none;
-    display: inline; }
-
-section {
-  display: block; }
-
-span.link {
-  color: #006ffa;
-  cursor: pointer; }
-
-span.wait {
-  color: #CCC; }
-
-table tfoot {
-  margin-top: 2em; }
-
-table.striped tbody tr:hover {
-  background-color: #FFE; }
-table.striped tr.even {
-  background-color: #EEE; }
-
-div#notice {
-  margin: 1em;
-  padding: 1em;
-  border: 2px solid #666;
-  background: #EEE; }
-
-div#page aside#sidebar {
-  width: 20%;
-  float: left; }
-div#page aside#sidebar > section {
-  margin-bottom: 1em; }
-div#page section#content {
-  width: 75%;
-  float: left;
-  margin-left: 2em; }
-
-div.clearfix {
-  clear: both; }
-
-/*** Paginator ***/
-div.paginator {
-  display: block;
-  padding: 2em 0 1em 0;
-  font-size: 1em;
-  text-align: center;
-  font-weight: bold;
-  clear: both; }
-  div.paginator a {
-    margin: 0 3px;
-    padding: 2px 6px;
-    font-weight: normal;
-    border: 1px solid #EAEAEA; }
-  div.paginator a.arrow {
-    border: none; }
-  div.paginator a.arrow:hover {
-    background: white;
-    color: #9093FF; }
-  div.paginator a.current {
-    border: 1px solid #AAA; }
-  div.paginator a:hover {
-    background: #3c3cdc;
-    color: white; }
-  div.paginator span {
-    margin: 0 3px;
-    padding: 2px 6px; }
-
-/*** Header ***/
-body > header > h1 {
-  font-size: 3em;
-  font-family: Tahoma, Helvetica, sans-serif; }
-
-/*** Simple Form ***/
-form.simple_form input[type=submit] {
-  margin-left: 10.3em; }
-form.simple_form div.input {
-  margin-bottom: 0.5em; }
-  form.simple_form div.input input[type=text], form.simple_form div.input input[type=file], form.simple_form div.input textarea {
-    width: 300px; }
-  form.simple_form div.input textarea {
-    height: 100px; }
-  form.simple_form div.input label {
-    vertical-align: top;
-    display: inline-block;
-    width: 10em;
-    cursor: pointer;
-    font-weight: bold;
-    margin-top: 3px;
-    margin-right: 10px;
-    text-align: right; }
-  form.simple_form div.input span.hint {
-    margin-left: 11em;
-    color: #666;
-    font-style: italic;
-    vertical-align: top;
-    display: block; }
-  form.simple_form div.input fieldset {
-    border: none;
-    display: inline;
-    margin: 0;
-    padding: 0; }
-    form.simple_form div.input fieldset label {
-      font-weight: normal;
-      width: auto;
-      margin-right: 2em; }
-
-/*** DText Preview ***/
-div.dtext p {
-  margin-bottom: 1em; }
-
-/*** Pools Posts ***/
-div#c-pools-posts div#a-new form {
-  margin-bottom: 1em; }
-div#c-pools-posts div#a-new h1 {
-  font-size: 1.2em;
-  font-weight: bold; }
-div#c-pools-posts div#a-new li {
-  margin-left: 1em;
-  cursor: pointer; }
-
-/*** Pools ***/
-div#c-pools div#a-edit p {
-  margin-bottom: 1em;
-  width: 40em; }
-div#c-pools div#a-edit ul.ui-sortable {
-  list-style-type: none; }
-  div#c-pools div#a-edit ul.ui-sortable span {
-    margin: 0;
-    float: right;
-    cursor: pointer; }
-  div#c-pools div#a-edit ul.ui-sortable li {
-    padding: 0.5em; }
-  div#c-pools div#a-edit ul.ui-sortable li.ui-state-default {
-    margin-bottom: 20px;
-    width: 250px;
-    background: none; }
-  div#c-pools div#a-edit ul.ui-sortable li.ui-state-placeholder {
-    margin-bottom: 20px;
-    width: 250px;
-    height: 150px;
-    background: none; }
-
-/*** Comments ***/
-div.comments-for-post div.list-of-comments article {
-  margin-bottom: 2em; }
-  div.comments-for-post div.list-of-comments article span.comment-score {
-    color: #CCC; }
-  div.comments-for-post div.list-of-comments article div.author {
-    width: 20%;
-    float: left; }
-  div.comments-for-post div.list-of-comments article div.content {
-    margin-left: 2em;
-    width: 40em;
-    float: left; }
-div.comments-for-post div.comment-preview {
-  width: 40em;
-  margin-bottom: 2em; }
-
-div#c-comments div#a-index div.header span.info {
-  margin-right: 1.5em; }
-div#c-comments div#a-index div.header strong, div#c-comments div#a-index div.header time {
-  margin-right: 0.3em; }
-div#c-comments div#a-index div.header time {
-  font-weight: bold; }
-div#c-comments div#a-index div.header div.list-of-tags a {
-  margin-right: 0.5em; }
-div#c-comments div#a-index div.header div.notices {
-  margin: 1em 0; }
-div#c-comments div#a-index div.preview {
-  float: left;
-  width: 180px; }
-div#c-comments div#a-index div.post {
-  margin-bottom: 4em; }
-  div#c-comments div#a-index div.post div.comments-for-post {
-    float: left;
-    width: 55em; }
-    div#c-comments div#a-index div.post div.comments-for-post h1 {
-      font-size: 1.2em; }
-
-/*** Favorites ***/
-div.favorites aside#sidebar h1 {
-  font-size: 1.2em; }
-div.favorites section#content > h1 {
-  display: none; }
-
-/*** Posts ***/
-article.post-preview {
-  margin-right: 4em;
-  margin-bottom: 4em;
-  float: left; }
-
-div#c-posts h1 {
-  font-size: 1.2em; }
-div#c-posts h2 {
-  font-size: 1.1em; }
-div#c-posts aside#sidebar > section > ul li {
-  list-style-type: none; }
-div#c-posts aside#sidebar > section > ul ul li {
-  margin-left: 1em; }
-div#c-posts section#tag-and-wiki-box {
-  padding: 0; }
-  div#c-posts section#tag-and-wiki-box menu li {
-    display: inline-block; }
-  div#c-posts section#tag-and-wiki-box menu li.active a {
-    color: #000; }
-  div#c-posts section#tag-and-wiki-box h1 {
-    font-size: 1.2em; }
-  div#c-posts section#tag-and-wiki-box div#tag-box h2 {
-    display: none; }
-  div#c-posts section#tag-and-wiki-box div#tag-box li {
-    list-style-type: none; }
-  div#c-posts section#tag-and-wiki-box div#wiki-box h2 {
-    display: none; }
-div#c-posts section#content > h1 {
-  display: none; }
-div#c-posts section#content section > h2 {
-  display: none; }
-div#c-posts section#content menu#post-sections {
-  margin-bottom: 1em; }
-  div#c-posts section#content menu#post-sections li {
-    font-size: 1.1em;
-    font-weight: bold; }
-  div#c-posts section#content menu#post-sections li.active a {
-    color: black; }
-
-/*** Post Histories ***/
-div.post_histories div.index div.post {
-  margin-bottom: 2em; }
-  div.post_histories div.index div.post div.preview {
-    width: 20%;
-    float: left; }
-  div.post_histories div.index div.post div.history {
-    width: 70%;
-    float: left; }
-    div.post_histories div.index div.post div.history table {
-      width: 100%; }
-    div.post_histories div.index div.post div.history ins {
-      color: green;
-      text-decoration: none; }
-    div.post_histories div.index div.post div.history del {
-      color: red;
-      text-decoration: line-through; }
-
-/*** Post Unapprovals ***/
-div#unapprove-dialog p {
-  margin-bottom: 1em; }
-
-/*** Sessions ***/
-div#sessions div#new section {
-  width: 30em;
-  float: left; }
-div#sessions div#new aside {
-  width: 20em;
-  float: left; }
-  div#sessions div#new aside li {
-    display: list-item;
-    margin-bottom: 0.5em;
-    list-style-type: square;
-    margin-left: 1em; }
-div#sessions div#new h2 {
-  margin-bottom: 5px; }
-
-/*** Artists ***/
-div#artists span.new-artist {
-  font-weight: bold;
-  color: #A00; }
-div#artists div#show {
-  max-width: 60em; }
-  div#artists div#show h1 {
-    font-size: 1.5em;
-    margin-bottom: 5px; }
-  div#artists div#show p.legend {
-    margin-bottom: 2em;
-    font-size: 0.8em;
-    font-style: italic; }
-
-/*** Users ***/
-div.users div.new {
-  max-width: 60em; }
-  div.users div.new h1 {
-    margin-bottom: 0.5em; }
-  div.users div.new p {
-    margin-bottom: 1em; }
-  div.users div.new li {
-    margin-left: 1em; }
-  div.users div.new div#account-comparison h1 {
-    font-size: 1.4em;
-    margin-bottom: 3px; }
-  div.users div.new div#account-comparison li {
-    font-size: 0.9em;
-    line-height: 1.5em; }
-  div.users div.new div#account-comparison section {
-    width: 18em;
-    float: left;
-    padding: 1em; }
-  div.users div.new footer.nav-links {
-    font-size: 1.5em;
-    font-weight: bold;
-    text-align: center;
-    display: block; }
-  div.users div.new div#p2 ul {
-    margin-bottom: 2em; }
-
-/*** Uploads ***/
-div.uploads div.new div#upload-guide-notice {
-  margin-bottom: 2em; }
-
-/*** notify ***/
-.notify-container {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  z-index: 1000; }
-  .notify-container .notify-notification {
-    position: relative; }
-    .notify-container .notify-notification .notify-background {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      background-color: #333;
-      z-index: 1; }
-    .notify-container .notify-notification .notify-message {
-      position: relative;
-      z-index: 2;
-      padding: 20px;
-      text-align: center;
-      color: #FFF; }
diff --git a/public/stylesheets/src/default.scss b/public/stylesheets/src/default.scss
index afb55edbf..72a487dc3 100644
--- a/public/stylesheets/src/default.scss
+++ b/public/stylesheets/src/default.scss
@@ -49,6 +49,10 @@ a:active {
   text-decoration: none;
 }
 
+abbr[title=required] {
+  display: none;
+}
+
 blockquote {
   margin: 0 0 1em 0;
   padding: 1em;
@@ -186,6 +190,14 @@ div#page {
   aside#sidebar {
     width: 20%;
     float: left;
+
+    h1 {
+      font-size: 1.2em;
+    }
+    
+    ul {
+      list-style-type: none;
+    }
   }
 
   aside#sidebar > section {
@@ -258,6 +270,24 @@ form.simple_form {
     margin-left: 10.3em;
   }
   
+  div.input.boolean {
+    padding-left: 10em;
+    
+    label {
+      margin: 0;
+      text-align: left;
+      display: inline;
+      width: none;
+    }
+  }
+  
+  div#multiple-buttons {
+    margin-left: 10em;
+    input {
+      margin: 0 0.5em 0 0;
+    }
+  }
+  
   div.input {
     margin-bottom: 0.5em;
     
@@ -452,13 +482,7 @@ div#c-comments {
 
 
 /*** Favorites ***/
-div.favorites {
-  aside#sidebar {
-    h1 {
-      font-size: 1.2em;
-    }
-  }
-  
+div#c-favorites {
   section#content > h1 {
     display: none;
   }