18692-2.diff

Go MAEDA, 2014-12-23 07:22

Download (7.45 KB)

View differences:

app/helpers/application_helper.rb (working copy)
111 111
    link_to(
112 112
        h(text),
113 113
        {:controller => 'repositories', :action => 'revision', :id => repository.project, :repository_id => repository.identifier_param, :rev => rev},
114
        :title => l(:label_revision_id, format_revision(revision))
114
        :title => l(:label_revision_id, format_revision(revision)),
115
        :accesskey => options[:accesskey]
115 116
      )
116 117
  end
117 118

  
app/helpers/calendars_helper.rb (working copy)
53 53
  end
54 54

  
55 55
  def link_to_month(link_name, year, month, options={})
56
    link_to_content_update(h(link_name), params.merge(:year => year, :month => month))
56
    link_to_content_update(h(link_name), params.merge(:year => year, :month => month), options)
57 57
  end
58 58
end
app/views/activities/index.html.erb (working copy)
24 24
<div style="float:left;">
25 25
<%= link_to_content_update("\xc2\xab " + l(:label_previous),
26 26
                   params.merge(:from => @date_to - @days - 1),
27
                   :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1))) %>
27
                   :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)),
28
                   :accesskey => accesskey(:previous)) %>
28 29
</div>
29 30
<div style="float:right;">
30 31
<%= link_to_content_update(l(:label_next) + " \xc2\xbb",
31 32
                   params.merge(:from => @date_to + @days - 1),
32
                   :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %>
33
                   :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)),
34
                   :accesskey => accesskey(:next)) unless @date_to >= Date.today %>
33 35
</div>
34 36
&nbsp;
35 37
<% other_formats_links do |f| %>
app/views/calendars/show.html.erb (working copy)
11 11
</fieldset>
12 12

  
13 13
<p style="float:right;">
14
  <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
14
  <%= link_to_previous_month(@year, @month, :accesskey => accesskey(:previous)) %> | <%= link_to_next_month(@year, @month, :accesskey => accesskey(:next)) %>
15 15
</p>
16 16

  
17 17
<p class="buttons">
app/views/gantts/show.html.erb (working copy)
295 295
<tr>
296 296
  <td style="text-align:left;">
297 297
    <%= link_to_content_update("\xc2\xab " + l(:label_previous),
298
                               params.merge(@gantt.params_previous)) %>
298
                               params.merge(@gantt.params_previous),
299
                               :accesskey => accesskey(:previous)) %>
299 300
  </td>
300 301
  <td style="text-align:right;">
301 302
    <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
302
                               params.merge(@gantt.params_next)) %>
303
                               params.merge(@gantt.params_next),
304
                               :accesskey => accesskey(:next)) %>
303 305
  </td>
304 306
</tr>
305 307
</table>
app/views/issues/show.html.erb (working copy)
8 8
      <%= link_to_if @prev_issue_id,
9 9
                     "\xc2\xab #{l(:label_previous)}",
10 10
                     (@prev_issue_id ? issue_path(@prev_issue_id) : nil),
11
                     :title => "##{@prev_issue_id}" %> |
11
                     :title => "##{@prev_issue_id}",
12
                     :accesskey => accesskey(:previous) %> |
12 13
      <% if @issue_position && @issue_count %>
13 14
        <span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
14 15
      <% end %>
15 16
      <%= link_to_if @next_issue_id,
16 17
                     "#{l(:label_next)} \xc2\xbb",
17 18
                     (@next_issue_id ? issue_path(@next_issue_id) : nil),
18
                     :title => "##{@next_issue_id}" %>
19
                     :title => "##{@next_issue_id}",
20
                     :accesskey => accesskey(:next) %>
19 21
    </div>
20 22
  <% end %>
21 23

  
app/views/repositories/revision.html.erb (working copy)
1 1
<div class="contextual">
2 2
  &#171;
3 3
  <% unless @changeset.previous.nil? -%>
4
    <%= link_to_revision(@changeset.previous, @repository, :text => l(:label_previous)) %>
4
    <%= link_to_revision(@changeset.previous, @repository,
5
      :text => l(:label_previous), :accesskey => accesskey(:previous)) %>
5 6
  <% else -%>
6 7
    <%= l(:label_previous) %>
7 8
  <% end -%>
8 9
|
9 10
  <% unless @changeset.next.nil? -%>
10
    <%= link_to_revision(@changeset.next, @repository, :text => l(:label_next)) %>
11
    <%= link_to_revision(@changeset.next, @repository,
12
      :text => l(:label_next), :accesskey => accesskey(:next)) %>
11 13
  <% else -%>
12 14
    <%= l(:label_next) %>
13 15
  <% end -%>
lib/redmine/access_keys.rb (working copy)
21 21
                  :preview => 'r',
22 22
                  :quick_search => 'f',
23 23
                  :search => '4',
24
                  :new_issue => '7'
24
                  :new_issue => '7',
25
                  :previous => 'p',
26
                  :next => 'n'
25 27
                 }.freeze unless const_defined?(:ACCESSKEYS)
26 28

  
27 29
    def self.key_for(action)
lib/redmine/pagination.rb (working copy)
176 176
        if paginator.previous_page
177 177
          # \xc2\xab(utf-8) = &#171;
178 178
          text = "\xc2\xab " + l(:label_previous)
179
          html << yield(text, {page_param => paginator.previous_page}, :class => 'previous') + ' '
179
          html << yield(text, {page_param => paginator.previous_page},
180
            :class => 'previous', :accesskey => accesskey(:previous)) + ' '
180 181
        end
181 182

  
182 183
        previous = nil
......
196 197
        if paginator.next_page
197 198
          # \xc2\xbb(utf-8) = &#187;
198 199
          text = l(:label_next) + " \xc2\xbb"
199
          html << yield(text, {page_param => paginator.next_page}, :class => 'next') + ' '
200
          html << yield(text, {page_param => paginator.next_page},
201
            :class => 'next', :accesskey => accesskey(:next)) + ' '
200 202
        end
201 203

  
202 204
        html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '