# HG changeset patch
# User Chris Cannam
# Date 1374146384 -3600
# Node ID bef3c810b1e47c839182be204d44ed8b9471d16f
# Parent  a6a25685e5a6aaade0c52b7063560abe22dfb30c# Parent  99e0ed523b177fa4a139a4f2f3513330dedc0ed6
Merge from branch luisf

diff -r a6a25685e5a6 -r bef3c810b1e4 app/views/issues/_form.html.erb
--- a/app/views/issues/_form.html.erb	Thu Jul 18 12:19:27 2013 +0100
+++ b/app/views/issues/_form.html.erb	Thu Jul 18 12:19:44 2013 +0100
@@ -43,15 +43,3 @@
 
 <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
 <% end %>
-
-<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
-<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
-<% @issue.project.users.sort.each do |user| -%>
-<label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, !!(@issue.watched_by?(user) or user == User.current) %> <%=h user %></label>
-<% end -%>
-</p>
-<% end %>
-
-<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
-
-<%= wikitoolbar_for 'issue_description' %>
diff -r a6a25685e5a6 -r bef3c810b1e4 plugins/redmine_bibliography/app/views/projects/_bibliography_box.html.erb
--- a/plugins/redmine_bibliography/app/views/projects/_bibliography_box.html.erb	Thu Jul 18 12:19:27 2013 +0100
+++ b/plugins/redmine_bibliography/app/views/projects/_bibliography_box.html.erb	Thu Jul 18 12:19:44 2013 +0100
@@ -18,6 +18,12 @@
          <%= link_to(l("more_details_link"), {:controller => :publications, :action => :show, :id => publication.id, :project_id => @project.id}) -%>
 
          <%= link_to l(:bibtex_link).html_safe, "javascript:void(0)", :class => "bibtex-link"-%>
+
+        <%- unless publication.external_url.blank? -%>
+            <%= link_to l(:external_url_link), publication.external_url, {:target => "_blank"} -%>
+        <%- end -%>
+
+
        </dd>
        <dd class="bibtex-textarea collapsed" style="display: none;">
          <textarea readonly> <%= print_bibtex_format(publication) -%> </textarea>
diff -r a6a25685e5a6 -r bef3c810b1e4 plugins/redmine_bibliography/config/locales/en.yml
--- a/plugins/redmine_bibliography/config/locales/en.yml	Thu Jul 18 12:19:27 2013 +0100
+++ b/plugins/redmine_bibliography/config/locales/en.yml	Thu Jul 18 12:19:44 2013 +0100
@@ -150,4 +150,5 @@
 
   bibtex_link: "[B<small>IB</small>T<sub>E</sub>X]"
   more_details_link: "[More Details]"
+  external_url_link: "[URL (ext.)]"
 
diff -r a6a25685e5a6 -r bef3c810b1e4 plugins/redmine_tags/lib/redmine_tags/hooks/views_issues_hook.rb
--- a/plugins/redmine_tags/lib/redmine_tags/hooks/views_issues_hook.rb	Thu Jul 18 12:19:27 2013 +0100
+++ b/plugins/redmine_tags/lib/redmine_tags/hooks/views_issues_hook.rb	Thu Jul 18 12:19:44 2013 +0100
@@ -19,10 +19,18 @@
 module RedmineTags
   module Hooks
     class ViewsIssuesHook < Redmine::Hook::ViewListener
-      render_on :view_issues_show_details_bottom, :partial => 'issues/tags'
-      render_on :view_issues_form_details_bottom, :partial => 'issues/tags_form'
-      render_on :view_issues_sidebar_planning_bottom, :partial => 'issues/tags_sidebar'
-      render_on :view_issues_bulk_edit_details_bottom, :partial => 'issues/tags_form'
+
+        # TODO: temporary hack to disable tags on issues
+        ## BEGIN     ~lf 20130712
+
+        # render_on :view_issues_show_details_bottom, :partial => '# issues/tags'
+        # render_on :view_issues_form_details_bottom, :partial => '# issues/tags_form'
+        # render_on :view_issues_sidebar_planning_bottom, :partial => '# issues/tags_sidebar'
+        # render_on :view_issues_bulk_edit_details_bottom, :partial => 'issues/tags_form'
+
+        ## END     ~lf 20130712
+
+
     end
   end
 end