public
Fork of halorgium/mephisto
Description: A mirror of the mephisto code-base
Homepage: http://mephistoblog.com/
Clone URL: git://github.com/technoweenie/mephisto.git
Search Repo:
Click here to lend your support to: mephisto and make a donation at www.pledgie.com !
Merge commit 'francois/bugfixing'
technoweenie (author)
Mon Mar 10 22:55:13 -0700 2008
commit  e36ec5e981e24cf84bbad049d5ac6ecdf0e2c92b
tree    f7bc4221faf930f75832682e5244f2ed0436582f
parent  690efcf9364da291d62e9b83e192907c4e815fa4 parent  a1407eb22655e040d394c2b34b203d190891eda7
...
15
16
17
18
19
 
 
20
21
22
23
24
25
...
24
25
26
27
 
28
29
 
30
31
 
32
33
 
34
35
36
...
15
16
17
 
 
18
19
20
21
22
23
24
25
...
24
25
26
 
27
28
 
29
30
 
31
32
 
33
34
35
36
0
@@ -15,8 +15,8 @@
0
 
0
 <ul class="pagelist commentlist" id="comment-list">
0
   <% if @comments.any? %>
0
- <% @comments.reverse.each_with_index do |comment, i| -%>
0
- <li class="event-comment<%= " shade" if (i % 2 > 0) %>" id="comment-<%= comment.id %>">
0
+ <% @comments.reverse.each do |comment| -%>
0
+ <li class="event-comment<%= cycle("", " shade") %>" id="comment-<%= comment.id %>">
0
     <a name="comment-<%= comment.id %>"></a>
0
     <% unless comment.body.blank? -%>
0
     <blockquote><p>"<%= strip_tags(comment.body) %>"</p></blockquote>
0
0
0
0
@@ -24,13 +24,13 @@
0
     <span class="meta">
0
       <cite>&mdash; <%= author_link_for comment %><%= %( (#{comment.author_email})) unless comment.author_email.blank? %> said <%= time_ago_in_words comment.created_at %> ago</cite>
0
     
0
- <%= link_to_remote 'Edit', :url => edit_article_comment_path(@article, comment), :method => :get %> |
0
+ <%= link_to_remote 'Edit', :url => edit_article_comment_path(comment.article, comment), :method => :get %> |
0
     <% if comment.approved? -%>
0
- <%= link_to_remote 'Unapprove', :url => unapprove_article_comment_path(@article, comment) %> |
0
+ <%= link_to_remote 'Unapprove', :url => unapprove_article_comment_path(comment.article, comment) %> |
0
     <% else -%>
0
- <%= link_to_remote 'Approve', :url => approve_article_comment_path(@article, comment) %> |
0
+ <%= link_to_remote 'Approve', :url => approve_article_comment_path(comment.article, comment) %> |
0
     <% end -%>
0
- <%= link_to_remote 'Delete', :url => article_comment_path(@article, comment), :method => :delete %>
0
+ <%= link_to_remote 'Delete', :url => article_comment_path(comment.article, comment), :method => :delete %>
0
     </span>
0
   </li>
0
   <% end -%>
...
3
4
5
 
6
7
8
...
3
4
5
6
7
8
9
0
@@ -3,6 +3,7 @@
0
 <div id="page-nav">
0
   <ul id="act-nav" class="clear">
0
     <li><%= link_to "General", '#general' %></li>
0
+ <li><%= link_to "Spam Prevention", '#spam' %></li>
0
     <li><%= link_to "Comments", '#spam' %></li>
0
     <li><%= link_to "Publishing", '#publish' %></li>
0
     <% if ActionController::Base.perform_caching -%>
...
1
 
2
3
4
...
 
1
2
3
4
0
@@ -1,4 +1,4 @@
0
-# this is for standard library loading and configurationg. All the hardcore monkey patching is in the mephisto plugin.
0
+# this is for standard library loading and configuration. All the hardcore monkey patching is in the mephisto plugin.
0
 require 'tzinfo'
0
 require 'zip/zipfilesystem'
0
 require 'action_controller/dispatcher'
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
...
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
0
@@ -1,34 +1 @@
0
-# =============================================================================
0
-# A set of rake tasks for invoking the SwitchTower automation utility.
0
-# =============================================================================
0
-
0
-desc "Push the latest revision into production using the release manager"
0
-task :deploy do
0
- system "switchtower -vvvv -r config/deploy -a deploy"
0
-end
0
-
0
-desc "Rollback to the release before the current release in production"
0
-task :rollback do
0
- system "switchtower -vvvv -r config/deploy -a rollback"
0
-end
0
-
0
-desc "Describe the differences between HEAD and the last production release"
0
-task :diff_from_last_deploy do
0
- system "switchtower -vvvv -r config/deploy -a diff_from_last_deploy"
0
-end
0
-
0
-desc "Enumerate all available deployment tasks"
0
-task :show_deploy_tasks do
0
- system "switchtower -r config/deploy -a show_tasks"
0
-end
0
-
0
-desc "Execute a specific action using the release manager"
0
-task :remote_exec do
0
- unless ENV['ACTION']
0
- raise "Please specify an action (or comma separated list of actions) via the ACTION environment variable"
0
- end
0
-
0
- actions = ENV['ACTION'].split(",").map { |a| "-a #{a}" }.join(" ")
0
- system "switchtower -vvvv -r config/deploy #{actions}"
0
-end

Comments

    No one has commented yet.