@@ -0,0 +1,2 @@ +Merbums +a Merb powered forum, heavily inspired by Beast. README @@ -22,7 +22,7 @@ class Forums < Application def create @forum = Forum.new(params[:forum]) if @forum.save - redirect url(:forum, @forum) + redirect url(:forums) else render :new end @@ -39,7 +39,7 @@ class Forums < Application @forum = Forum.find_by_id(params[:id]) raise NotFound unless @forum if @forum.update_attributes(params[:forum]) - redirect url(:forum, @forum) + redirect url(:forums) else raise BadRequest end app/controllers/forums.rb @@ -1,6 +1,8 @@ <% form_for @forum, :action => url(:forum,@forum) do %> - <p><%= text_control :name, :label => "Forum Name" %></p> - <p><%= text_area_control :description, :rows => 5, :cols => 30, :label => "Forum Description" %></p> - <p><%= text_control :position, :label => "Position" %></p> - <p><%= submit_button "Submit" %></p> + <% fieldset :legend => "#{action_name.titleize} Forum" do %> + <p><%= text_control :name, :label => "Forum Name" %></p> + <p><%= text_area_control :description, :rows => 5, :cols => 30, :label => "Forum Description" %></p> + <p><%= text_control :position, :label => "Position" %></p> + <p><%= submit_button "Submit" %></p> + <% end %> <% end %> \ No newline at end of file app/views/forums/_forum_form.html.erb @@ -1,2 +1 @@ -<h2>Editing <%= @forum.name %></h2> <%= partial :forum_form %> \ No newline at end of file app/views/forums/edit.html.erb @@ -1,4 +1,4 @@ -<% if true # hide for admin later %> +<% if logged_in? %> <div> <p><%= link_to "Add a New Forum", url(:new_forum) %></p> </div> @@ -14,10 +14,16 @@ <% @forums.each do |forum| %> <tr> <td> - <p><%= link_to forum.name, url(:forum_topics, :forum_id => forum) %> <%= link_to 'Edit', url(:edit_forum,forum) %></p> + <%= link_to forum.name, url(:forum_topics, :forum_id => forum), :class => "forum_title" %> + <p><%= forum.topics.size %> Topics - <%= forum.posts.size %> Posts</p> <%= forum.description_html %> + <p><small></small></p> + </td> + <td> + <p> + <%= forum.posts.reverse.first.updated_at %> + </p> </td> - <td><p></p></td> </tr> <% end %> </tbody> app/views/forums/index.html.erb @@ -1,2 +1 @@ -<h2>Adding a New Forum</h2> <%= partial :forum_form %> \ No newline at end of file app/views/forums/new.html.erb @@ -11,7 +11,13 @@ </head> <body> <div class="header"> - <p><%= link_to "home", "/" %></p> + <ul> + <li><%= link_to "home", "/" %></li> + <%= tag :li, link_to("Login/Register",url(:login)) unless logged_in? %> + <% if logged_in? %> + <li><%= link_to "logout", url(:logout) %></li> + <% end %> + </ul> </div> <div class="content"> app/views/layout/application.html.erb @@ -1,4 +1,5 @@ <% form_tag :action => url(:login) do -%> +<% fieldset :legend => ("Login or " + link_to("Register", url(:new_user))) do %> <p><label for="login">Login</label><br/> <%= text_field :name => "login" %></p> @@ -11,4 +12,5 @@ --> <p><%= submit_button 'Log in' %></p> +<% end %> <% end -%> \ No newline at end of file app/views/sessions/new.html.erb @@ -1,11 +1,28 @@ <h2><%= @forum.name %></h2> <div><%= @forum.description_html %></div> -<p><%= link_to 'Create new Topic', url(:new_forum_topic, :forum_id => @forum ) %></p> - -<h3>Topics</h3> -<% @forum.topics.each do |topic| %> - <div> - <p><%= link_to topic.title, url(:forum_topic,topic) %></p> - </div> -<% end %> \ No newline at end of file +<table> + <thead> + <tr> + <th>Topics</th> + <th>Posts</th> + <th>Last Update</th> + </tr> + </thead> + <tbody> + <% @forum.topics.each do |topic| %> + <tr> + <td><%= link_to topic.title, url(:forum_topic,topic) %></td> + <td><%= topic.posts.size %></td> + <td><%= topic.posts.reverse.first.updated_at %></td> + </tr> + <% end %> + </tbody> + <tfoot> + <tr> + <td colspan="3"> + <p><%= link_to 'Create new Topic', url(:new_forum_topic, :forum_id => @forum ) %></p> + </td> + </tr> + </tfoot> +</table> \ No newline at end of file app/views/topics/index.html.erb @@ -1,15 +1,33 @@ <h2><%= @topic.title %></h2> -<% @topic.posts.each do |post| %> - <div> - <%= post.body_html %> - <p><small>Posted by <%= post.user.login %></small></p> - </div> -<% end %> +<table> + <thead> + <tr> + <th>User</th> + <th>Post</th> + </tr> + </thead> + <tbody> + <% @topic.posts.each do |post| %> + <tr> + <td class="author"> + <p><%= image_tag post.user.gravatar %><br /> + <%= post.user.login %><br /> + <%= post.user.posts.size %> Posts</p> + </td> + <td><%= post.body_html %></td> + </tr> + <% end %> + </tbody> +</table> - - -<% form_for @post, :action => url(:forum_topic_post,{:forum_id => @forum, :topic_id => @topic}) do %> - <p><%= text_area_control :body, :label => "Post" %></p> - <p><%= submit_button "Submit" %></p> +<% if logged_in? %> + <% form_for @post, :action => url(:forum_topic_post,{:forum_id => @forum, :topic_id => @topic}) do %> + <% fieldset :legend => "Post a Reply" do %> + <p><%= text_area_control :body, :label => "Reply" %></p> + <p><%= submit_button "Submit" %></p> + <% end %> + <% end %> +<% else %> +<p><%= link_to "Login", url(:login) %> to reply</p> <% end %> \ No newline at end of file app/views/topics/show.html.erb @@ -1,18 +1,20 @@ <%= error_messages_for @user %> <% form_for @user, :action => url(:users) do %> - <p> - <%= text_control :login, :label => "Login" %> - </p> - <p> - <%= text_control :email, :label => "Email" %> - </p> - <p> - <%= password_control :password, :label => "Password" %> - </p> - <p> - <%= password_control :password_confirmation, :label => "Password Confirmation" %> - </p> - <p> - <%= submit_button "Sign up" %> - </p> + <% fieldset :legend => "Register" do %> + <p> + <%= text_control :login, :label => "Login" %> + </p> + <p> + <%= text_control :email, :label => "Email" %> + </p> + <p> + <%= password_control :password, :label => "Password" %> + </p> + <p> + <%= password_control :password_confirmation, :label => "Password Confirmation" %> + </p> + <p> + <%= submit_button "Sign up" %> + </p> + <% end %> <% end %> \ No newline at end of file app/views/users/new.html.erb @@ -44,4 +44,20 @@ td + td { } label { display:block; +} +ul { + list-style:none; +} +ul li { + float:left; +} +li { + display:block; + padding-right:1em; +} +.forum_title { + font-size:1.5em; +} +td.author { + width:10em; } \ No newline at end of file public/stylesheets/master.css c5373747b1186c69fdd603b66c7995a6e62e9cb6 Shay Arnett shayarnett@gmail.com http://github.com/shayarnett/merbums/commit/fc88196cc862e64dc9fd645e3b8a06c7edabe895 fc88196cc862e64dc9fd645e3b8a06c7edabe895

2008-03-21T21:31:16-07:00

little bit prettier 8e593184ec1f600bc39696b706a291cec564262d Shay Arnett shayarnett@gmail.com