# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1312221924 -3600
# Node ID 61e0de6cc1bb3464b6f426849e908be62e987412
# Parent  a1e091bee818ffe5699ac43839798c76035bc705# Parent  2df99e8d191eebed54e2cdf6822bf17a0832c73c
Merge from branch "feature_36"

diff -r a1e091bee818 -r 61e0de6cc1bb vendor/plugins/redmine_bibliography/app/views/projects/show.rhtml
--- a/vendor/plugins/redmine_bibliography/app/views/projects/show.rhtml	Fri Jul 29 21:40:48 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/views/projects/show.rhtml	Mon Aug 01 19:05:24 2011 +0100
@@ -3,8 +3,9 @@
 		<%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
 	<% end %>
 	
-	<%= link_to l(:label_add_publication_to_project), {:controller => 'publications', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>
-	
+	<% if @project.module_enabled? :redmine_bibliography %>
+		<%= link_to l(:label_add_publication_to_project), {:controller => 'publications', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>		
+	<% end %>
 </div>
 
 <h2><%=l(:label_overview)%></h2> 
diff -r a1e091bee818 -r 61e0de6cc1bb vendor/plugins/redmine_bibliography/config/locales/en.yml
--- a/vendor/plugins/redmine_bibliography/config/locales/en.yml	Fri Jul 29 21:40:48 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/config/locales/en.yml	Mon Aug 01 19:05:24 2011 +0100
@@ -24,6 +24,7 @@
   
   label_publications_plural: "Publications"
   label_publication_new: "Create New Publication"
+  label_publication_index: "List of Publication"
   label_add_publication_to_project: "Add Publication to this project"
   label_publication_edit: "Edit Publication"
   label_publication_show: "Publication Details"
diff -r a1e091bee818 -r 61e0de6cc1bb vendor/plugins/redmine_bibliography/init.rb
--- a/vendor/plugins/redmine_bibliography/init.rb	Fri Jul 29 21:40:48 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/init.rb	Mon Aug 01 19:05:24 2011 +0100
@@ -32,8 +32,8 @@
 
   project_module :redmine_bibliography do
     permission :publications, { :publications => :index }, :public => true
-    permission :edit_redmine_bibliography, {:redmine_bibliography => [:edit, :update]}, :public => true
-    permission :add_publication, {:redmine_bibliography => [:new, :create]}, :public => true
+    permission :edit_redmine_bibliography, {:redmine_bibliography => [:edit, :update]}
+    permission :add_publication, {:redmine_bibliography => [:new, :create]}
   end
 
   # extending the Project Menu