# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1353951708 0
# Node ID d6e59c6f10bdf633146085c7daf601766aa7c6dc
# Parent  3d387b121e85521a1f7b943325a282db5df60586
design changes in the new publication forms

diff -r 3d387b121e85 -r d6e59c6f10bd vendor/plugins/redmine_bibliography/app/views/publications/_form.html.erb
--- a/vendor/plugins/redmine_bibliography/app/views/publications/_form.html.erb	Mon Nov 26 17:39:51 2012 +0000
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/_form.html.erb	Mon Nov 26 17:41:48 2012 +0000
@@ -1,15 +1,13 @@
-<%= f.error_messages %> 
+<%= f.error_messages %>
 <%= stylesheet_link_tag 'bibliography', :plugin => 'redmine_bibliography' %>
 
-<h3><%= f.text_field :title, :required => true, :size => 70 %></h3>
 
-<h3><%= l(:label_publication_other_details) %></h3>
+<div class="splitcontentleft">
+  <h4><%= l(:label_publication_other_details) %></h4>
   <div class="box tabular">
-    <% f.fields_for :bibtex_entry do |builder| -%>
-      <%= render :partial => 'bibtex_fields', :locals => { :f => builder}  %>
-    <%- end -%>
+    <p><%= f.text_field :title, :required => true, :size => 70 -%></p>
+    <p>
 
-    <p>
       <%= f.text_field :external_url, :size => 70 %>
       <br />
       <em><%= l(:text_external_url) %></em>
@@ -19,15 +17,22 @@
       <br />
       <em><%= l(:text_doi) %></em>
     </p>
+    <% f.fields_for :bibtex_entry do |builder| -%>
+      <%= render :partial => 'bibtex_fields', :locals => { :f => builder}  %>
+    <%- end -%>
   </div>
 
-<h3><%= l(:authors) %></h3>    
+
+</div>
+
+<div class="splitcontentright">
+  <h4><%= l(:authors) %></h4>
   <div class="box tabular">
-    <div id="authors" class="fields">      
+    <div id="authors" class="fields">
       <% f.fields_for :authorships do |builder| -%>
         <%= render "authorship_fields", :f => builder %>
       <%- end -%>
     </div>
-    <%= link_to_add_author_fields l(:label_add_an_author), f, :authorships, params[:action] %>
+    <%= link_to_add_author_fields l(:label_add_an_author), f, :authorships, params[:action] -%>
   </div>
 </div>
\ No newline at end of file
diff -r 3d387b121e85 -r d6e59c6f10bd vendor/plugins/redmine_bibliography/app/views/publications/new.html.erb
--- a/vendor/plugins/redmine_bibliography/app/views/publications/new.html.erb	Mon Nov 26 17:39:51 2012 +0000
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/new.html.erb	Mon Nov 26 17:41:48 2012 +0000
@@ -7,17 +7,4 @@
 
 <h2><%=l(:label_publication_new)%></h2>
 
-<div class="splitcontentleft">
-  <p>To create a publication you can either parse a BibTeX entry or enter the publication details manually.<p>
-
-    <%= render :partial => 'publications/new/bibtex' %>
-
- <!-- <%= render_tabs create_publication_tabs %> -->
-</div>
-
-<div class="splitcontentright">
-
-    <%= render :partial => 'publications/new/default' %>
-
-
-</div>
\ No newline at end of file
+<%= render_tabs create_publication_tabs %>
diff -r 3d387b121e85 -r d6e59c6f10bd vendor/plugins/redmine_bibliography/app/views/publications/new/_bibtex.html.erb
--- a/vendor/plugins/redmine_bibliography/app/views/publications/new/_bibtex.html.erb	Mon Nov 26 17:39:51 2012 +0000
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/new/_bibtex.html.erb	Mon Nov 26 17:41:48 2012 +0000
@@ -1,11 +1,17 @@
-<div class="box">
-  <%= text_area_tag :bibtex_paste, "Please paste your bibtex entry here" , :class => "wiki", :style => 'width:90%' -%>
-
-  <br />
-
-  <%= link_to_remote "Parse BiBTeX", :url =>  { :project_id  => @project, :action => :parse_bibtex}, :with => "'bibtex_paste=' + $('bibtex_paste').value" -%>
+<div class="splitcontentleft">
+  <div>
+    <h3>Paste your bibtex entry</h3>
+    <div class="box">
+      <%= text_area_tag :bibtex_paste, "Please paste your bibtex entry here" , :class => "wiki", :style => 'width:90%; height:100px;' -%>
+      <br />
+      <%= link_to_remote "Parse BiBTeX", :url =>  { :project_id  => @project, :action => :parse_bibtex}, :with => "'bibtex_paste=' + $('bibtex_paste').value" -%>
+    </div>
+  </div>
 </div>
 
-<div class="box" id="ieee_prev"><h3>Preview</h3></div>
+<div class="splitcontentright">
+  <h3>Preview and correct</h3>
 
-<div class="box" id="suggest_bibtex_authors"><h3>Authors</h3></div>
\ No newline at end of file
+  <div class="box" id="ieee_prev"><h3>Preview</h3></div>
+  <div class="box" id="suggest_bibtex_authors"><h3>Authors</h3></div>
+</div>
\ No newline at end of file
diff -r 3d387b121e85 -r d6e59c6f10bd vendor/plugins/redmine_bibliography/app/views/publications/new/_default.html.erb
--- a/vendor/plugins/redmine_bibliography/app/views/publications/new/_default.html.erb	Mon Nov 26 17:39:51 2012 +0000
+++ b/vendor/plugins/redmine_bibliography/app/views/publications/new/_default.html.erb	Mon Nov 26 17:41:48 2012 +0000
@@ -1,5 +1,5 @@
 <% form_for @publication, :url => { :project_id  => @project, :action => :create }, :builder => TabularFormBuilder do |f| -%>
-  <div class="box tabular settings">
+  <div class="settings">
     <fieldset>
       <%= render :partial => 'form', :locals => { :f => f }  %>