RubyGems - simple_forum - Versions diffs - 0.0.1 → 0.0.2 - Mend

simple_forum 0.0.1 → 0.0.2

Files changed (86) hide show

data/app/assets/javascripts/simple_forum/markitup/templates/preview.css ADDED

@@ -0,0 +1,5 @@
+/* preview style examples */
+body {
+	background-color:#EFEFEF;
+	font:70% Verdana, Arial, Helvetica, sans-serif;
+}

data/app/assets/javascripts/simple_forum/markitup/templates/preview.html ADDED

@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>markItUp! preview template</title>
+<link rel="stylesheet" type="text/css" href="~/templates/preview.css" />
+</head>
+<body>
+<!-- content -->
+</body>
+</html>

data/app/assets/stylesheets/simple_forum/application.css ADDED

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require simple_forum/base
+*/

data/app/assets/stylesheets/simple_forum/base.css ADDED

@@ -0,0 +1,124 @@
+body {
+    background-color: #e1ddd9;
+    font-size: 13px;
+    font-family: Arial, SunSans-Regular, Sans-Serif;
+    color: #564b47;
+    padding: 0;
+    margin: 0;
+}
+a {
+    color: #ff66cc;
+    text-decoration: none;
+}
+h1 {
+    font-size: 16px;
+    text-transform: uppercase;
+    color: #564b47;
+    background-color: #90897a;
+    padding: 5px 15px;
+    margin: 0px
+}
+h2 {
+    font-size: 16px;
+    padding-top: 10px;
+    text-transform: uppercase;
+    color: #564b47;
+    background-color: transparent;
+}
+.logo {
+    margin: 20px 0;
+}
+p, h2, pre {
+    margin: 0;
+    padding: 5px 20px;
+}
+/*  positioning-layers statisch und absolut */
+#left {
+    position: absolute;
+    left: 0;
+    width: 220px;
+}
+#content {
+    margin: 0 220px;
+    border: 2px solid #564b47;
+    border-top: none;
+    background-color: #ffffff;
+}
+#right {
+    position: absolute;
+    right: 0;
+    width: 220px;
+    background-color: #f9c;
+}
+#breadcrumbs {
+    font-size: 14px;
+    color: #564b47;
+    background-color: transparent;
+}
+#content .category .body {
+    width: 60%;
+    margin: 20px;
+}
+table.forum-table {
+    width: 100%;
+}
+table.forum-table td.icon-cell {
+    width: 40px;
+}
+table.forum-table td.posts-cell {
+    width: 80px;
+}
+table.forum-table td.topics-cell {
+    width: 80px;
+}
+table.forum-table td.last-post-cell {
+    width: 140px;
+}
+table.topic-table {
+}
+table.topic-table td.user-cell {
+    width: 200px;
+}
+#flash_messages {
+    text-align: center;
+    font-size: 24px;
+}
+#flash_messages .notice {
+    color: green;
+}
+#flash_messages .alert {
+    color: red;
+}
+div.postbody div.post-deleted {
+    font-size: 16px;
+    color: #6495ed;
+}
+div.postbody div.post-edited {
+    margin-top: 12px;
+    font-size: 14px;
+    color: #556b2f;
+}

data/app/assets/stylesheets/simple_forum/markitup.css ADDED

@@ -0,0 +1,5 @@
+/*
+ *= require simple_forum/markitup/skins/markitup/style
+ *= require simple_forum/markitup/sets/bbcode/style
+ *= require_self
+*/

data/app/controllers/simple_forum/application_controller.rb CHANGED

@@ -1,5 +1,6 @@
 module SimpleForum
   class ApplicationController < ::ApplicationController #::ActionController::Base
+    respond_to :html
     protect_from_forgery
     layout SimpleForum.layout

data/app/controllers/simple_forum/forums_controller.rb CHANGED

@@ -1,6 +1,5 @@
 module SimpleForum
   class ForumsController < ApplicationController
-    respond_to :html
     before_filter :find_forum, :except => [:index]

data/app/controllers/simple_forum/posts_controller.rb CHANGED

@@ -13,7 +13,7 @@ module SimpleForum
       respond_to do |format|
         format.html do
-          redirect_to simple_forum_forum_topic_url(@forum, @topic), :status => :moved_permanently
+          redirect_to simple_forum.forum_topic_url(@forum, @topic), :status => :moved_permanently
         end
       end
     end
@@ -21,7 +21,7 @@ module SimpleForum
     def show
       respond_to do |format|
-        format.html { redirect_to simple_forum_forum_topic_url(@forum, @topic, :page => @post.on_page, :anchor => "post-#{@post.id}") }
+        format.html { redirect_to simple_forum.forum_topic_url(@forum, @topic, :page => @post.on_page, :anchor => "post-#{@post.id}") }
       end
     end
@@ -31,10 +31,10 @@ module SimpleForum
       respond_to do |format|
         format.html do
           if success
-            redirect_to simple_forum_forum_topic_url(@forum, @topic, :page => @post.on_page, :anchor => "post-#{@post.id}"),
+            redirect_to simple_forum.forum_topic_url(@forum, @topic, :page => @post.on_page, :anchor => "post-#{@post.id}"),
                         :notice => t('simple_forum.controllers.posts.post_created')
           else
-            redirect_to simple_forum_forum_topic_url(@forum, @topic, :page => @topic.last_page, :anchor => (@topic.recent_post ? "post-#{@topic.recent_post.id}" : nil)),
+            redirect_to simple_forum.forum_topic_url(@forum, @topic, :page => @topic.last_page, :anchor => (@topic.recent_post ? "post-#{@topic.recent_post.id}" : nil)),
                         :alert => @post.errors.full_messages.join(', ')
           end
         end
@@ -62,7 +62,7 @@ module SimpleForum
       respond_to do |format|
         format.html do
           if success
-            redirect_to simple_forum_forum_topic_url(@forum, @topic, :page => @post.on_page, :anchor => "post-#{@post.id}"),
+            redirect_to simple_forum.forum_topic_url(@forum, @topic, :page => @post.on_page, :anchor => "post-#{@post.id}"),
                         :notice => t('simple_forum.controllers.posts.post_updated')
           else
             redirect_to :back, :alert => @post.errors.full_messages.join(', ')

data/app/controllers/simple_forum/topics_controller.rb CHANGED

@@ -14,7 +14,7 @@ module SimpleForum
       respond_to do |format|
         format.html do
-          redirect_to simple_forum_forum_url(@forum), :status => :moved_permanently
+          redirect_to simple_forum.forum_url(@forum), :status => :moved_permanently
         end
       end
     end
@@ -45,7 +45,7 @@ module SimpleForum
         format.html do
           if success
             flash[:notice] = t('simple_forum.controllers.topics.topic_created')
-            redirect_to simple_forum_forum_topic_url(@forum, @topic)
+            redirect_to simple_forum.forum_topic_url(@forum, @topic)
           else
             flash.now[:alert] = @topic.errors.full_messages.join(' ')
             render :new

data/app/models/simple_forum.rb CHANGED

@@ -2,5 +2,4 @@ module SimpleForum
   def self.table_name_prefix
     'simple_forum_'
   end
 end

data/app/models/simple_forum/category.rb CHANGED

@@ -1,8 +1,5 @@
 module SimpleForum
   class Category < ::ActiveRecord::Base
-    set_table_name 'simple_forum_categories' #should work table_name_prefix in SimpleForum module but it's not!'
     has_many :forums,
              :order => "#{SimpleForum::Forum.quoted_table_name}.position ASC",
              :dependent => :nullify,

data/app/models/simple_forum/forum.rb CHANGED

@@ -1,8 +1,5 @@
 module SimpleForum
   class Forum < ::ActiveRecord::Base
-    set_table_name 'simple_forum_forums' #should work table_name_prefix in SimpleForum module but it's not!'
     #acts_as_nested_set
     has_many :topics,

data/app/models/simple_forum/moderatorship.rb CHANGED

@@ -1,8 +1,5 @@
 module SimpleForum
   class Moderatorship < ::ActiveRecord::Base
-    set_table_name 'simple_forum_moderatorships' #should work table_name_prefix in SimpleForum module but it's not!'
     belongs_to :forum,
                :class_name => "SimpleForum::Forum"

data/app/models/simple_forum/post.rb CHANGED

@@ -1,8 +1,5 @@
 module SimpleForum
   class Post < ::ActiveRecord::Base
-    set_table_name 'simple_forum_posts' #should work table_name_prefix in SimpleForum module but it's not!'
     belongs_to :user,
                :class_name => instance_eval(&AbstractAuth.invoke(:user_class)).name

data/app/models/simple_forum/topic.rb CHANGED

@@ -1,8 +1,5 @@
 module SimpleForum
   class Topic < ::ActiveRecord::Base
-    set_table_name 'simple_forum_topics' #should work table_name_prefix in SimpleForum module but it's not!'
     belongs_to :user, :class_name => instance_eval(&AbstractAuth.invoke(:user_class)).name
     belongs_to :forum,
@@ -17,7 +14,7 @@ module SimpleForum
                :class_name => "SimpleForum::Post"
     has_one :last_post,
-                :order => "#{SimpleForum::Post.table_name}.created_at DESC",
+                :order => "#{SimpleForum::Post.quoted_table_name}.created_at DESC",
                 :class_name => "SimpleForum::Post"
     has_one :first_post,

data/app/views/layouts/simple_forum.html.erb CHANGED

@@ -5,18 +5,17 @@
   <title><%= yield(:title) || '' %></title>
   <%= favicon_link_tag %>
-  <%= stylesheet_link_tag('/simple_forum_engine/stylesheets/simple_forum') %>
+  <%= stylesheet_link_tag "simple_forum/application" %>
   <%= yield :stylesheets %>
-  <%= javascript_include_tag('https://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js') %>
-  <%= javascript_include_tag('rails') %>
+  <%= csrf_meta_tag %>
+  <%= javascript_include_tag "simple_forum/application" %>
   <%= yield :javascripts %>
   <%= yield :head %>
-  <%= csrf_meta_tag %>
 </head>
 <body>

data/app/views/simple_forum/forums/index.html.erb CHANGED

@@ -35,13 +35,13 @@
           <tr>
             <td class="icon-cell">
               <% if f.recent_activity?(authenticated_user) %>
-                  <%= image_tag('/simple_forum_engine/images/forumNewPosts.gif', :alt => t('simple_forum.new_posts_present'), :title => t('simple_forum.new_posts_present')) %>
+                  <%= image_tag('simple_forum/forumNewPosts.gif', :alt => t('simple_forum.new_posts_present'), :title => t('simple_forum.new_posts_present')) %>
               <% else %>
-                  <%= image_tag('/simple_forum_engine/images/forumNoNewPosts.gif', :alt => t('simple_forum.new_posts_absent'), :title => t('simple_forum.new_posts_absent')) %>
+                  <%= image_tag('simple_forum/forumNoNewPosts.gif', :alt => t('simple_forum.new_posts_absent'), :title => t('simple_forum.new_posts_absent')) %>
               <% end %>
             </td>
             <td class="forum-cell">
-              <span><%= link_to f.name, simple_forum_forum_path(f) %></span><br/>
+              <span><%= link_to f.name, simple_forum.forum_path(f) %></span><br/>
               <span><%= f.body %></span><br/>
               <span>
                 (
@@ -60,7 +60,7 @@
               <% if f.recent_post %>
                   <%= content_tag :span, :title => l(f.recent_post.created_at) do %>
                       <%= link_to "#{time_ago_in_words(f.recent_post.created_at)} #{t('simple_forum.ago', :default => 'ago')}",
-                                  simple_forum_forum_topic_path(f, f.recent_post.topic, :page => f.recent_post.topic.last_page, :anchor => "post-#{f.recent_post.id}")
+                                  simple_forum.forum_topic_path(f, f.recent_post.topic, :page => f.recent_post.topic.last_page, :anchor => "post-#{f.recent_post.id}")
                       %>
                   <% end %>
                   <br/>

data/app/views/simple_forum/forums/show.html.erb CHANGED

@@ -1,7 +1,7 @@
 <div id="breadcrumbs">
   <%= link_to SimpleForum.root_application_name, root_path %>
   &gt;
-  <%= link_to 'Forum', simple_forum_root_path %>
+  <%= link_to 'Forum', simple_forum.root_path %>
   &gt;
   <%= @forum.name %>
 </div>
@@ -11,7 +11,7 @@
       <% if @forum.is_topicable? && user_authenticated? %>
           <li>
-            <%= link_to t(".new_topic"), new_simple_forum_forum_topic_path(@forum) %>
+            <%= link_to t(".new_topic"), simple_forum.new_forum_topic_path(@forum) %>
           </li>
       <% end %>
     </ul>
@@ -42,13 +42,13 @@
           <% end %>
         </td>
         <td class="topic-cell">
-          <span><%= link_to t.title, simple_forum_forum_topic_path(@forum, t) %></span>
+          <span><%= link_to t.title, simple_forum.forum_topic_path(@forum, t) %></span>
           <% if t.paged? %>
             <span>
               <ul>
                 <% t.page_numbers.each do |p| %>
                     <% if p %>
-                        <li><%= link_to p, simple_forum_forum_topic_path(@forum, t, :page => p) %></li>
+                        <li><%= link_to p, simple_forum.forum_topic_path(@forum, t, :page => p) %></li>
                     <% else %>
                         <li class="gap">&hellip;</li>
                     <% end %>
@@ -75,7 +75,7 @@
           <% if t.recent_post %>
               <%= content_tag :span, :title => l(t.recent_post.created_at) do %>
                   <%= link_to "#{time_ago_in_words(t.recent_post.created_at)} #{t('simple_forum.ago', :default => 'ago')}",
-                              simple_forum_forum_topic_path(@forum, t, :page => t.last_page, :anchor => "post-#{t.recent_post.id}")
+                              simple_forum.forum_topic_path(@forum, t, :page => t.last_page, :anchor => "post-#{t.recent_post.id}")
                   %>
               <% end %>
               <br/>

data/app/views/simple_forum/posts/edit.html.erb CHANGED

@@ -9,18 +9,18 @@
 <% end %>
 <% content_for :head do %>
     <script type="text/javascript">
-        var post_preview_path = "<%= preview_simple_forum_forum_topic_posts_path(@forum, @topic) %>";
+        var post_preview_path = "<%= simple_forum.preview_forum_topic_posts_path(@forum, @topic) %>";
     </script>
 <% end %>
 <div id="breadcrumbs">
   <%= link_to SimpleForum.root_application_name, root_path %>
   &gt;
-  <%= link_to 'Forum', simple_forum_root_path %>
+  <%= link_to 'Forum', simple_forum.root_path %>
   &gt;
-  <%= link_to @forum.name, simple_forum_forum_path(@forum) %>
+  <%= link_to @forum.name, simple_forum.forum_path(@forum) %>
   &gt;
-  <%= link_to @topic.title, simple_forum_forum_topic_path(@forum, @topic) %>
+  <%= link_to @topic.title, simple_forum.forum_topic_path(@forum, @topic) %>
   &gt;
   <%= t('.post_edit') %>
 </div>
@@ -29,7 +29,7 @@
 </table>
-<%= form_for @post, :url => simple_forum_forum_topic_post_path(@forum, @topic, @post), :as => :post, :html => {:id => 'new_post_form'} do |f| -%>
+<%= form_for @post, :url => simple_forum.forum_topic_post_path(@forum, @topic, @post), :as => :post, :html => {:id => 'new_post_form'} do |f| -%>
     <p>
       <%= f.label :body %>
       <%= f.text_area :body, :class => 'markitup post-body' %>

data/app/views/simple_forum/topics/_post.html.erb CHANGED

@@ -27,10 +27,10 @@
         <td class="actions">
           <% if user_authenticated? %>
               <% if post.editable_by?(authenticated_user, @forum.moderated_by?(authenticated_user)) %>
-                  <%= link_to t('.edit'), edit_simple_forum_forum_topic_post_path(@forum, @topic, post) %>
+                  <%= link_to t('.edit'), simple_forum.edit_forum_topic_post_path(@forum, @topic, post) %>
               <% end %>
               <% if post.deletable_by?(authenticated_user, @forum.moderated_by?(authenticated_user)) %>
-                  <%= link_to t('.delete'), delete_simple_forum_forum_topic_post_path(@forum, @topic, post), :method => :delete, :confirm => t('simple_forum.are_you_sure') %>
+                  <%= link_to t('.delete'), simple_forum.delete_forum_topic_post_path(@forum, @topic, post), :method => :delete, :confirm => t('simple_forum.are_you_sure') %>
               <% end %>
               <% if @topic.is_open? %>
                   <%= link_to t('.cite'), "#", :onclick => "$('#new_post_form textarea').val('[quote=\"#{post.user.name}\"]\\n#{escape_javascript(post.body)}\\n[/quote]'); return false;" %>

data/app/views/simple_forum/topics/new.html.erb CHANGED

@@ -1,14 +1,14 @@
 <div id="breadcrumbs">
   <%= link_to SimpleForum.root_application_name, root_path %>
   &gt;
-  <%= link_to 'Forum', simple_forum_root_path %>
+  <%= link_to 'Forum', simple_forum.root_path %>
   &gt;
-  <%= link_to @forum.name, simple_forum_forum_path(@forum) %>
+  <%= link_to @forum.name, simple_forum.forum_path(@forum) %>
   &gt;
   <%= t('.new_topic') %>
 </div>
-<%= form_for @topic, :as => :topic, :url => simple_forum_forum_topics_path(@forum) do |f| %>
+<%= form_for @topic, :as => :topic, :url => simple_forum.forum_topics_path(@forum) do |f| %>
     <p>
       <%= f.label :title %><br/>
       <%= f.text_field :title %>