changeset 627:91143e21be2c feature_36

Merge from 625:e1eb4996257f
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Wed, 24 Aug 2011 17:18:39 +0100
parents e2663e0bd5a6 (current diff) e1eb4996257f (diff)
children b080f902af3e
files
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/vendor/plugins/redmine_bibliography/app/helpers/publications_helper.rb	Wed Aug 24 17:18:11 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/helpers/publications_helper.rb	Wed Aug 24 17:18:39 2011 +0100
@@ -81,7 +81,7 @@
         confirm_msg = false
       end 
       
-      s << link_to_project(proj) + link_to_remote(l(:button_delete), { :url => { :controller => 'publications', :action => 'remove_project', :id => publication, :remove_project_id => proj,  :project_id => @project }, :method => :post, :confirm => confirm_msg }, :class => 'icon icon-del') + "<br />"
+      s << link_to_project(proj, {}, :class => 'publication_project') + link_to_remote(l(:button_delete), { :url => { :controller => 'publications', :action => 'remove_project', :id => publication, :remove_project_id => proj,  :project_id => @project }, :method => :post, :confirm => confirm_msg }, :class => 'icon icon-del') + "<br />"
     end
     
     s  
--- a/vendor/plugins/redmine_bibliography/assets/javascripts/authors.js	Wed Aug 24 17:18:11 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/assets/javascripts/authors.js	Wed Aug 24 17:18:39 2011 +0100
@@ -50,7 +50,7 @@
     $('publication_authorships_attributes_' + form_object_id + '_edit_author_info').select('input').each(function(s) {
 	toggle_input_field(s, $this);
     });
-    $$('p.description').each(function(s) {
+    $('publication_authorships_attributes_' + form_object_id + '_edit_author_info').select('p.description').each(function(s) {
 	s.toggle();
     });
     toggle_edit_save_button(form_object_id);
--- a/vendor/plugins/redmine_bibliography/assets/stylesheets/bibliography.css	Wed Aug 24 17:18:11 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/assets/stylesheets/bibliography.css	Wed Aug 24 17:18:39 2011 +0100
@@ -24,3 +24,6 @@
     font-style: italic;
 }
 
+.publication_project {
+    margin-right: 18px;
+}