changeset 139:ddcedb549d4e cannam-pre-20110113-merge

Merge from live branch

--- a/app/controllers/issues_controller.rb	Wed Jan 19 13:27:01 2011 +0000
+++ b/app/controllers/issues_controller.rb	Thu Jan 20 10:00:51 2011 +0000
@@ -136,14 +136,14 @@
       call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
 
       # Adds user to watcher's list
-      @issue.add_watcher(User.current)
+      # @issue.add_watcher(User.current)
 
       # Also adds the assignee to the watcher's list
-       if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
-        unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]):
-          @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
-        end
-       end
+      # if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
+      #  unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]):
+      #    @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
+      #  end
+      # end
 
       respond_to do |format|
         format.html {
@@ -291,11 +291,11 @@
     # is in this issues watcher's list
     # if not, adds it.
 
-    if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
-      unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]):
-        @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
-      end
-    end
+    # if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
+    #  unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]):
+    #    @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
+    #  end
+    # end
 
 
   end

--- a/app/models/issue.rb	Wed Jan 19 13:27:01 2011 +0000
+++ b/app/models/issue.rb	Thu Jan 20 10:00:51 2011 +0000
@@ -527,7 +527,8 @@
   
   # Returns a string of css classes that apply to the issue
   def css_classes
-    s = "issue status-#{status.position} priority-#{priority.position}"
+    s = "issue status-#{status.position} "
+    s << "priority-#{priority.position}"
     s << ' closed' if closed?
     s << ' overdue' if overdue?
     s << ' created-by-me' if User.current.logged? && author_id == User.current.id

--- a/app/views/welcome/index.rhtml	Wed Jan 19 13:27:01 2011 +0000
+++ b/app/views/welcome/index.rhtml	Thu Jan 20 10:00:51 2011 +0000
@@ -9,14 +9,6 @@
 <div class="splitcontentleft">
   <%= textilizable Setting.welcome_text %>
   
-  <% if not @tipsoftheday.empty? %>
-    <div class="newsoftheday box">
-	  <h3><%=l(:label_tipoftheday)%></h3>
-	  <%= textilizable @tipsoftheday %>
-    </div>
-  <% end %>
-
-
   <% if @news.any? %>
   <div class="news box">
 	<h3><%=l(:label_news_latest)%></h3>
@@ -28,6 +20,13 @@
 </div>
 
 <div class="splitcontentright">
+  <% if not @tipsoftheday.empty? %>
+    <div class="newsoftheday box">
+          <h3><%=l(:label_tipoftheday)%></h3>
+          <%= textilizable @tipsoftheday %>
+    </div>
+  <% end %>
+
     <% if @projects.any? %>
 	<div class="projects box">
 	<h3><%=l(:label_project_latest)%></h3>

--- a/public/themes/soundsoftware/stylesheets/application.css	Wed Jan 19 13:27:01 2011 +0000
+++ b/public/themes/soundsoftware/stylesheets/application.css	Thu Jan 20 10:00:51 2011 +0000
@@ -69,6 +69,8 @@
 
 table.projects th { text-align: left; }
 table.projects th.managers { color: #3e442c; }
+table.projects .root .name { font-size: 1.2em; }
+table.projects .root .description { padding-bottom: 0.5em; }
 table.projects .hosted_here { font-weight: bold; }
 table.projects .child .name { font-weight: normal; }
 table.projects .child .description { font-size: 0.95em; }
@@ -85,9 +87,9 @@
 #header a { color: #be5700; }
 #header h1 { color: #525a38; margin-top: 25px; font-size: 3em; font-weight: normal; margin-left: 10px; }
 .header-general h1 {
-  background: url('soundsoftware-logo-title-only-transparent.png') no-repeat 0 0;
+  background: url('soundsoftware-logo-title-only-transparent-beta.png') no-repeat 0 0;
   text-indent: -9999px;
-  width: 446px;
+  width: 500px;
   height: 34px;
  }
 #quick-search { margin-right: 6px; margin-top: 1em; color: #000; }

Binary file public/themes/soundsoftware/stylesheets/soundsoftware-logo-title-only-transparent-beta.png has changed

--- a/vendor/plugins/redmine_checkout/config/locales/en-GB.yml	Wed Jan 19 13:27:01 2011 +0000
+++ b/vendor/plugins/redmine_checkout/config/locales/en-GB.yml	Thu Jan 20 10:00:51 2011 +0000
@@ -1,4 +1,4 @@
-en:
+en-GB:
   label_checkout: "Checkout"
 
   setting_checkout_display_checkout_info: "Display checkout information"