jro_apps/redmine Commit - r273:77938cc11e20

1

<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>

1

<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>

2

3

3

4

4

5

<tbody>

5

<tbody>

6

<% parsing = false

6

<% parsing = false

7

line_num_l = 0

7

line_num_l = 0

8

line_num_r = 0 %>

8

line_num_r = 0 %>

9

<% @diff.each do |line| %>

9

<% @diff.each do |line| %>

10

<%

10

<%

11

if line =~ /^@@ (\+|\-)(\d+),\d+ (\+|\-)(\d+),\d+ @@/

11

if line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/

12

line_num_l = $2.to_i

12

line_num_l = $2.to_i

13

line_num_r = $4.to_i

13

line_num_r = $5.to_i

14

if parsing %>

14

if parsing %>

15

15

16

<% end

16

<% end

17

parsing = true

17

parsing = true

18

end

19

end

20

next unless parsing

20

next unless parsing

21

%>

21

%>

22

23

<tr>

23

<tr>

24

25

<% case line[0, 1]

25

<% case line[0, 1]

26

when " " %>

26

when " " %>

27

27

28

28

29

29

30

<% line_num_l = line_num_l + 1

30

<% line_num_l = line_num_l + 1

31

line_num_r = line_num_r + 1

31

line_num_r = line_num_r + 1

32

33

when "-" %>

33

when "-" %>

34

34

35

35

36

36

37

<% line_num_r = line_num_r + 1

37

<% line_num_r = line_num_r + 1

38

39

when "+" %>

39

when "+" %>

40

40

41

41

42

42

43

<% line_num_l = line_num_l + 1

43

<% line_num_l = line_num_l + 1

44

45

else

45

else

46

end %>

47

end %>

48

49

<%= h(line[1..-1]).gsub(/\s/, " ") %></td></tr>

49

<%= h(line[1..-1]).gsub(/\s/, " ") %></td></tr>

50

51

<% end %>

51

<% end %>

52

</tbody>

52

</tbody>

53

</table>

53

</table>

54

55

<% content_for :header_tags do %>

55

<% content_for :header_tags do %>

56

<%= stylesheet_link_tag "scm" %>

56

<%= stylesheet_link_tag "scm" %>

57

<% end %> No newline at end of file

57

<% end %>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
             <table class="list">
             <thead><tr><th>@<%= @rev %></th><th>@<%= @rev_to  %></th><th></th></tr></thead>
             <tbody>
             <% parsing = false
             line_num_l = 0
             line_num_r = 0 %>
             <% @diff.each do |line| %>
             <%
-               if line =~ /^@@ (\+|\-)(\d+),\d+ (\+|\-)(\d+),\d+ @@/
+               if line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
                  line_num_l = $2.to_i
-                 line_num_r = $4.to_i
+                 line_num_r = $5.to_i
                  if parsing %>
                  <tr class="spacing"><td colspan="3">&nbsp;</td></tr>
               <% end
                  parsing = true
                  next
                end
                next unless parsing
             %>
             <tr>
             <% case line[0, 1]
                when " " %>
             <th class="line-num"><%= line_num_l %></th>
             <th class="line-num"><%= line_num_r %></th>
             <td class="line-code">
             <% line_num_l = line_num_l + 1
                line_num_r = line_num_r + 1
                when "-" %>
             <th class="line-num"></th>
             <th class="line-num"><%= line_num_r %></th>
             <td class="line-code" style="background: #fdd;">
             <% line_num_r = line_num_r + 1
                when "+" %>
             <th class="line-num"><%= line_num_l %></th>
             <th class="line-num"></th>
             <td class="line-code" style="background: #dfd;">
             <% line_num_l = line_num_l + 1
                else
                  next
                end %>
             <%= h(line[1..-1]).gsub(/\s/, "&nbsp;") %></td></tr>
             <% end %>
             </tbody>
             </table>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>