changeset 826:cb27dd527bd3 cannam

Merge from branch "live"

--- a/public/themes/soundsoftware/stylesheets/application.css	Tue Jan 31 12:48:30 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/application.css	Tue Jan 31 12:49:46 2012 +0000
@@ -110,9 +110,9 @@
 #header h1 { color: #525a38; margin-top: 25px; font-size: 3em; font-weight: normal; margin-left: 10px; }
 #header #project-title a, #header #project-title a:hover { color: #525a38; text-decoration: none; }
 .header-general h1 {
-  background: url('soundsoftware-logo-title-only-transparent-beta.png') no-repeat 0 0;
+  background: url('soundsoftware-logo-code-title-only-transparent.png') no-repeat 0 0;
   text-indent: -9999px;
-  width: 500px;
+  width: 537px;
   height: 34px;
  }
 

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

Binary file public/themes/soundsoftware/stylesheets/soundsoftware-logo-code-title-only-transparent.xcf has changed

--- a/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js	Tue Jan 31 12:48:30 2012 +0000
+++ b/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js	Tue Jan 31 12:49:46 2012 +0000
@@ -86,7 +86,7 @@
   addTagsList: function(tags_list) {
     var tags = tags_list.split(',');
     for (var i = 0; i < tags.length; i++) {
-      this.addTag(tags[i].strip());
+      this.addTag(tags[i].strip().stripTags().toLowerCase());
     }
   },
 

--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/project_patch.rb	Tue Jan 31 12:48:30 2012 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/project_patch.rb	Tue Jan 31 12:49:46 2012 +0000
@@ -65,7 +65,7 @@
           options = {}
           visible   = ARCondition.new
                   
-          visible << ["#{Project.table_name}.is_public = \"1\""]
+          visible << ["#{Project.table_name}.is_public = '1'"]
 
           if name_like
             visible << ["#{ActsAsTaggableOn::Tag.table_name}.name LIKE ?", "%#{name_like.downcase}%"]

--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Tue Jan 31 12:48:30 2012 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Tue Jan 31 12:49:46 2012 +0000
@@ -10,24 +10,21 @@
           skip_before_filter :authorize, :only => [:set_fieldset_status]
           skip_before_filter :find_project, :only => [:set_fieldset_status]
           before_filter :add_tags_to_project, :only => [:save, :update]
-#          before_filter :filter_projects, :only => :index
 
           alias :index filtered_index
         end
       end
 
       module InstanceMethods
-        
-        
-        
+                
         def add_tags_to_project
 
           if params && params[:project] && !params[:project][:tag_list].nil?
-            old_tags = @project.tag_list.to_s
-            new_tags = params[:project][:tag_list].to_s
+            old_tags = @project.tag_list.to_s.downcase
+            new_tags = params[:project][:tag_list].to_s.downcase
 
             unless (old_tags == new_tags)
-              @project.tag_list = new_tags
+              @project.tag_list = ActionController::Base.helpers.strip_tags(new_tags)
             end
           end
         end