Project

General

Profile

Download (5.02 KB)

Feature #3143 » add_notes_v3.diff

By carloskar - C-O L, 2016-10-11 14:00

View differences:

app/views/issues/_action_menu.html.erb
1 1 
<div class="contextual">
2 
<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
2 
<%= link_to l(:button_add_notes), issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class =>'icon icon-comment' if User.current.allowed_to?(:add_issue_notes, @project) %>
3 
<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("edit_issue", "issue_notes"); $("#cancel_edit_issue").show(); $("#edit_issue_header").show(); $("#add_notes_header").hide(); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
3 4 
<%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
4 5 
<%= watcher_link(@issue, User.current) %>
5 6 
<%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
app/views/issues/_edit.html.erb
2 2 
    <%= error_messages_for 'issue', 'time_entry' %>
3 3 
    <%= render :partial => 'conflict' if @conflict %>
4 4 
    <div class="box">
5 
    <div id="edit_issue" style="display:none;">
5 6 
    <% if @issue.attributes_editable? %>
6 7 
        <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
7 8 
        <div id="all_attributes">
......
27 28 
        <% end %>
28 29 
    </fieldset>
29 30 
    <% end %>
31 
    </div>
30 32 
    <% if @issue.notes_addable? %>
31 33 
      <fieldset><legend><%= l(:field_notes) %></legend>
32 34 
      <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
......
49 51 
    <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
50 52 
    <%= submit_tag l(:button_submit) %>
51 53 
    <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
52 
    | <%= link_to l(:button_cancel), {}, :onclick => "$('#update').hide(); return false;" %>
54 
    <span id="cancel_edit_issue" style="display:none;">| <%= link_to l(:button_cancel), issue_path(@issue) %></span>
53 55 

  		




  54
  56
  
    
    <%= hidden_field_tag 'prev_issue_id', @prev_issue_id if @prev_issue_id %>

  		




  55
  57
  
    
    <%= hidden_field_tag 'next_issue_id', @next_issue_id if @next_issue_id %>

  		












  

    
      app/views/issues/edit.html.erb
    
  





  3
  3
  
    
<%= render :partial => 'edit' %>

  		




  4
  4
  
    
<% content_for :header_tags do %>

  		




  5
  5
  
    
    <%= robot_exclusion_tag %>

  		




  
  6
  
    
    <script>

  		




  
  7
  
    
    //<![CDATA[

  		




  
  8
  
    
    $(window).load(function(){ $("#edit_issue").show(); $("#cancel_edit_issue").show(); return false; });

  		




  
  9
  
    
    //]]>

  		




  
  10
  
    
    </script>

  		




  6
  11
  
    
<% end %>

  		












  

    
      app/views/issues/show.html.erb
    
  





  110
  110
  
    
<% end %>

  		




  111
  111
  
    

  		




  112
  112
  
    
</div>

  		




  
  113
  
    
<%= render :partial => 'action_menu' %>

  		




  113
  114
  
    

  		




  114
  115
  
    
<% if @changesets.present? %>

  		




  115
  116
  
    
<div id="issue-changesets">

  		




  ......




  125
  126
  
    
</div>

  		




  126
  127
  
    
<% end %>

  		




  127
  128
  
    

  		




  128
  
  
    

  		




  129
  
  
    
<div style="clear: both;"></div>

  		




  130
  
  
    
<%= render :partial => 'action_menu' %>

  		




  131
  
  
    

  		




  132
  129
  
    
<div style="clear: both;"></div>

  		




  133
  130
  
    
<% if @issue.editable? %>

  		




  134
  
  
    
  <div id="update" style="display:none;">

  		




  135
  
  
    
  <h3><%= l(:button_edit) %></h3>

  		




  
  131
  
    
  <div id="update">

  		




  
  132
  
    
  <h3 id="edit_issue_header" style="display:none;"><%= l(:button_edit) %></h3>

  		




  
  133
  
    
  <h4 id="add_notes_header"><%= l(:button_add_notes) %></h4>

  		




  136
  134
  
    
  <%= render :partial => 'edit' %>

  		




  137
  135
  
    
  </div>

  		




  138
  136
  
    
<% end %>

  		












  

    
      app/views/journals/new.js.erb
    
  





  6
  6
  
    
$('#issue_private_notes').prop('checked', true);

  		




  7
  7
  
    
<% end %>

  		




  8
  8
  
    

  		




  9
  
  
    
showAndScrollTo("update", "notes");

  		




  10
  
  
    
$('#notes').scrollTop = $('#notes').scrollHeight - $('#notes').clientHeight;

  		




  
  9
  
    
showAndScrollTo("update", "issue_notes");

  		




  
  10
  
    
$('#issue_notes').scrollTop = $('#issue_notes').scrollHeight - $('#issue_notes').clientHeight;

  		












  

    
      config/locales/en.yml
    
  





  1013
  1013
  
    
  button_edit: Edit

  		




  1014
  1014
  
    
  button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"

  		




  1015
  1015
  
    
  button_add: Add

  		




  
  1016
  
    
  button_add_notes: Add notes

  		




  1016
  1017
  
    
  button_change: Change

  		




  1017
  1018
  
    
  button_apply: Apply

  		




  1018
  1019
  
    
  button_clear: Clear

  		















  (7-7/13)