[Xfce4-commits] <moka:master> Move the development note to the textfielt.

[Nick Schermer]

Updating branch refs/heads/master
         to 211d8d92224d538d2e423b5f425cdc50c194a73c (commit)
       from 42b49a8cd2daf9857f705f4b3babc32cf385f238 (commit)

commit 211d8d92224d538d2e423b5f425cdc50c194a73c
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Dec 4 13:33:31 2011 +0100

    Move the development note to the textfielt.
    
    This way the releaser is can descide is this needs to
    be included in the notes.

 examples/xfce/templates/project_feed_entry.erb     |    2 --
 examples/xfce/templates/project_release_mail.erb   |    2 --
 .../project_branch_new_release_announcement.haml   |    2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/xfce/templates/project_feed_entry.erb b/examples/xfce/templates/project_feed_entry.erb
index 46f3121..cae786a 100644
--- a/examples/xfce/templates/project_feed_entry.erb
+++ b/examples/xfce/templates/project_feed_entry.erb
@@ -19,7 +19,5 @@ Website:
 
 Release notes for <%= release.version %>
 ==================<%= Array.new(release.version.size, '=').join %>
-<% if (release.version.split('.')[1].to_i % 2) > 0 %>[Please note that this is a development release.]
-<% end %>
 <%= wrap_text(message).strip %>
 
diff --git a/examples/xfce/templates/project_release_mail.erb b/examples/xfce/templates/project_release_mail.erb
index 255a5b6..cf357e1 100644
--- a/examples/xfce/templates/project_release_mail.erb
+++ b/examples/xfce/templates/project_release_mail.erb
@@ -19,6 +19,4 @@ Website:
 
 Release notes for <%= release.version %>
 ==================<%= Array.new(release.version.size, '=').join %>
-<% if (release.version.split('.')[1].to_i % 2) > 0 %>[Please note that this is a development release.]
-<% end %>
 <%= wrap_text(message).strip %>
diff --git a/lib/views/project_branch_new_release_announcement.haml b/lib/views/project_branch_new_release_announcement.haml
index 0503638..c94f0e0 100755
--- a/lib/views/project_branch_new_release_announcement.haml
+++ b/lib/views/project_branch_new_release_announcement.haml
@@ -7,6 +7,8 @@
     %p
       %label{:for => "message"} Release notes:
       %textarea{:name => "message", :class => "message"}
+        - if (@release.version.split('.')[1].to_i % 2) > 0
+          [Please note that this is a development release.]
       - if env['feeds']
         %p.quote
           %input{:type => "checkbox", :name => "feeds", :value => "announce", :checked => true}  Update news feed