changeset 621:95a7d6187454 feature_36

Merge from 620:4ede44d53f76

--- a/public/themes/soundsoftware/stylesheets/application.css	Wed Aug 24 13:56:47 2011 +0100
+++ b/public/themes/soundsoftware/stylesheets/application.css	Wed Aug 24 13:59:10 2011 +0100
@@ -102,14 +102,6 @@
 table.files .file .active { font-weight: bold; }
 table.files .file .description { font-weight: normal; color: #3e442c; }
 
-.tabular .identify_author label {
-    font-weight: normal;
-    float: inherit;
-    text-align: inherit;
-    margin-left: 0;
-    width: computed;
-}
-
 #top-menu { position: absolute; top: 0; z-index: 1; left: 0px; width: 100%; font-size: 90%; /* height: 2em; */ margin: 0; padding: 0; padding-top: 0.5em; background-color: #3e442c; }
 #top-menu ul { margin-left: 10px; }
 #top-menu a { font-weight: bold; }

--- a/vendor/plugins/redmine_bibliography/app/views/publications/_authorship_fields.rhtml	Wed Aug 24 13:56:47 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/_authorship_fields.rhtml	Wed Aug 24 13:59:10 2011 +0100
@@ -17,13 +17,12 @@
         value" )} %>
 	</p>  
 
-      <h5>Is it this author?</h5>
-      <p class='identify_author'>
+      <p style="margin-bottom: -2.5em; padding-bottom; 0"><label><%= l(:identify_author_question) %></label></p>
+      <p class="identify_author">
         <label><%= radio_button_tag(:identify_author, "yes", false, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_yes ), :onclick => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_yes) %> </label><br />
-        
+       
         <label><%= radio_button_tag(:identify_author, "corrections", false, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_corrections ), :onclick => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_corrections) %> </label><br />
         
-        
         <label><%= radio_button_tag(:identify_author, "no", true, :name => form_tag_name(f.object_name,:identify_author ), :id => form_tag_id( f.object_name, :identify_author_no ), :onclick => "identify_author_status($(this).value, #{form_object_id(f.object_name) });") %> <%= l(:identify_author_no) %> </label><br />
       </p>
     </div>	
@@ -48,3 +47,4 @@
 
   <%= link_to_remove_fields l("remove_author"), f %>
 </div>
+<br/>

--- a/vendor/plugins/redmine_bibliography/app/views/publications/edit.html.erb	Wed Aug 24 13:56:47 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/edit.html.erb	Wed Aug 24 13:59:10 2011 +0100
@@ -1,5 +1,6 @@
 <% content_for :header_tags do %>
     <%= javascript_include_tag 'authors', :plugin => 'redmine_bibliography' %>
+    <%= stylesheet_link_tag 'bibliography', :plugin => 'redmine_bibliography' %>
 <% end %>
 
 <h2><%=l(:label_publication_show)%></h2>

--- a/vendor/plugins/redmine_bibliography/app/views/publications/new.html.erb	Wed Aug 24 13:56:47 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/new.html.erb	Wed Aug 24 13:59:10 2011 +0100
@@ -1,5 +1,6 @@
 <% content_for :header_tags do %>
     <%= javascript_include_tag 'authors', :plugin => 'redmine_bibliography' %>
+    <%= stylesheet_link_tag 'bibliography', :plugin => 'redmine_bibliography' %>
 <% end %>
 
 <h2><%=l(:label_publication_new)%></h2>

--- a/vendor/plugins/redmine_bibliography/assets/javascripts/authors.js	Wed Aug 24 13:56:47 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/assets/javascripts/authors.js	Wed Aug 24 13:59:10 2011 +0100
@@ -27,16 +27,13 @@
 	Effect.toggle(div_id, "appear", {duration:0.3});
 }
 
-
-
-
 function toggle_input_field(field){	
 	if(field.classNames().inspect().include("readonly") == false){
 		field.readOnly = true;	
 		field.addClassName('readonly').next('em').hide();
 	} else {
 		field.readOnly = false;
-		field.removeClassName('readonly').next('em').show();		
+		field.removeClassName('readonly').next('em').show();
 	};	
 }
 

--- a/vendor/plugins/redmine_bibliography/assets/stylesheets/bibliography.css	Wed Aug 24 13:56:47 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/assets/stylesheets/bibliography.css	Wed Aug 24 13:59:10 2011 +0100
@@ -1,11 +1,18 @@
 li .handle {
-  font-size: 12px;
-  cursor: move;
-  color: #777;
+    font-size: 12px;
+    cursor: move;
+    color: #777;
 }
 
 input.readonly {
-	border: none;
-	background-color: transparent;
-	
-}
\ No newline at end of file
+    border: none;
+    background-color: transparent;
+}
+
+.tabular .identify_author label {
+    font-weight: normal;
+    float: inherit;
+    text-align: inherit;
+    margin-left: 0;
+    width: computed;
+}

--- a/vendor/plugins/redmine_bibliography/config/locales/en.yml	Wed Aug 24 13:56:47 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/config/locales/en.yml	Wed Aug 24 13:59:10 2011 +0100
@@ -8,9 +8,10 @@
   publications_box: "My Publications"
   label_my_publications_box: "My Publications"
   
+  identify_author_question: Is the right person selected above?
   identify_author_yes: "Yes"
+  identify_author_corrections: "Yes, but I need to correct some details"
   identify_author_no: "No"
-  identify_author_corrections: "Corrections"
 
   label_all_publications: All Publications
   label_all_publications_for_project: Publications associated with %{project}
@@ -57,9 +58,9 @@
   label_publication_index: "View all publications"
   label_publication_other_details: "Details"
   
+  text_author_name_on_paper: "Author's name as it appears on the paper."
+  text_author_institution: "Author's institution as on the paper."
   text_author_email: "Author's email address as on the paper."
-  text_author_institution: "Author's institution name as on paper."
-  text_author_name_on_paper: "Name of the author as it appears on paper."
   
   text_author_search: "Search existing authors"