Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased

Break up links with nested formating (rebased)

Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased
Break up links with nested formating (rebased)
Dmitriy Zaporozhets
2 parents 34e33273 f6a67ef2
Showing 10 changed files with 33 additions and 41 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/sections/issues.scss
app/views/commits/_commit.html.haml
app/views/events/_commit.html.haml
app/views/issues/_show.html.haml
app/views/issues/show.html.haml
app/views/merge_requests/_merge_request.html.haml
app/views/milestones/_milestone.html.haml
app/views/milestones/show.html.haml
app/views/refs/blame.html.haml
@@ -377,7 +377,6 @@ form {
   min-height: 20px;
   border-bottom: 1px solid #eee;
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-  cursor:pointer;
   &.smoke { 
     background-color:#f5f5f5;
   }
@@ -512,7 +511,8 @@ form {
   .row_title { 
     font-weight:bold;
     color:#444;
-    &:hover { 
+    &:hover {
+      color:#444;
       text-decoration:underline;
     }
   }
@@ -34,7 +34,7 @@
       width:32px;
       margin-top:4px;
     }
-    p.row_title { 
+    .row_title {
       padding:0px;
       padding-bottom:2px;
     }
@@ -2,16 +2,15 @@
   .browse_code_link_holder
     %p
       %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right"
-  = link_to project_commit_path(@project, :id => commit.id) do
-    %p
-      %code.left= commit.short_id
-      %strong.cgray= commit.author_name
-      &ndash;
-      = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
-      %span.row_title= truncate(commit.title, :length => 50)
+  %p
+    %code.left= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
+    %strong.cgray= commit.author_name
+    &ndash;
+    = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
+    = link_to truncate(commit.title, :length => 50), project_commit_path(@project, :id => commit.id), :class => "row_title"
  
-      %span.committed_ago
-        = time_ago_in_words(commit.committed_date)
-        ago
-        &nbsp;
+    %span.committed_ago
+      = time_ago_in_words(commit.committed_date)
+      ago
+      &nbsp;
  
 - commit = CommitDecorator.decorate(commit)
 %li.wll.commit
-  = link_to project_commit_path(project, :id => commit.id) do
-    %p
-      %code.left= commit.short_id
-      %strong.cgray= commit.author_name
-      &ndash;
-      = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
-      %span.row_title= truncate(commit.title, :length => 50) rescue "--broken encoding"
+  %p
+    %code.left= link_to commit.short_id, project_commit_path(project, :id => commit.id)
+    %strong.cgray= commit.author_name
+    &ndash;
+    = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
+    = link_to truncate(commit.title, :length => 50), project_commit_path(project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
  
@@ -24,8 +24,7 @@
   - else
     = image_tag "no_avatar.png", :class => "avatar"
  
-  = link_to project_issue_path(issue.project, issue) do
-    %p.row_title= truncate(issue.title, :length => 100)
+  %p= link_to truncate(issue.title, :length => 100), project_issue_path(issue.project, issue), :class => "row_title"
  
   %span.update-author
     %small.cdark= "##{issue.id}"
@@ -46,9 +46,7 @@
     - if @issue.milestone
       - milestone = @issue.milestone
       %cite.cgray and attached to milestone
-      = link_to project_milestone_path(milestone.project, milestone) do
-        %strong
-          = truncate(milestone.title, :length => 20)
+      %strong= link_to truncate(milestone.title, :length => 20), project_milestone_path(milestone.project, milestone)
  
     .right
       - @issue.labels.each do |label|
@@ -16,8 +16,7 @@
         = merge_request.target_branch
   = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
  
-  = link_to project_merge_request_path(merge_request.project, merge_request) do
-    %p.row_title= truncate(merge_request.title, :length => 80)
+  %p= link_to truncate(merge_request.title, :length => 80), project_merge_request_path(merge_request.project, merge_request), :class => "row_title"
  
   %span.update-author
     %small.cdark= "##{merge_request.id}"
@@ -6,14 +6,13 @@
       = link_to 'Browse Issues', project_issues_path(milestone.project, :milestone_id => milestone.id), :class => "btn small grouped"
     - if can? current_user, :admin_milestone, milestone.project
       = link_to 'Edit', edit_project_milestone_path(milestone.project, milestone), :class => "btn small edit-milestone-link grouped"
-  = link_to project_milestone_path(milestone.project, milestone) do
-    %h4.row_title
-      = truncate(milestone.title, :length => 100)
-      %small
-        = milestone.expires_at
-      %br
-      .progress.progress-success.span3
-        .bar{:style => "width: #{milestone.percent_complete}%;"}
+  %h4
+    = link_to truncate(milestone.title, :length => 100), project_milestone_path(milestone.project, milestone), :class => "row_title"
+    %small
+      = milestone.expires_at
+    %br
+    .progress.progress-success.span3
+      .bar{:style => "width: #{milestone.percent_complete}%;"}
  
  
   &nbsp;
@@ -50,8 +50,8 @@
           %td
             = link_to [@project, issue] do
               %span.badge.badge-info ##{issue.id}
-              &ndash;
-              = truncate issue.title, :length => 60
+            &ndash;
+            = link_to truncate(issue.title, :length => 60), [@project, issue]
     %br
     = paginate @issues, :theme => "gitlab"
  
@@ -32,9 +32,8 @@
               = commit.author_name
             %td.blame_commit
               &nbsp;
-              = link_to project_commit_path(@project, :id => commit.id) do
-                %code= commit.short_id
-                %span.row_title= truncate(commit.title, :length => 30) rescue "--broken encoding"
+              %code= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
+              = link_to truncate(commit.title, :length => 30), project_commit_path(@project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
             %td.lines
               = preserve do
                 %pre
...	...	@@ -377,7 +377,6 @@ form {
377	377	min-height: 20px;
378	378	border-bottom: 1px solid #eee;
379	379	border-bottom: 1px solid rgba(0, 0, 0, 0.05);
380		- cursor:pointer;
381	380	&.smoke {
382	381	background-color:#f5f5f5;
383	382	}
...	...	@@ -512,7 +511,8 @@ form {
512	511	.row_title {
513	512	font-weight:bold;
514	513	color:#444;
515		- &:hover {
	514	+ &:hover {
	515	+ color:#444;
516	516	text-decoration:underline;
517	517	}
518	518	}
...	...
...	...	@@ -34,7 +34,7 @@
34	34	width:32px;
35	35	margin-top:4px;
36	36	}
37		- p.row_title {
	37	+ .row_title {
38	38	padding:0px;
39	39	padding-bottom:2px;
40	40	}
...	...
...	...	@@ -2,16 +2,15 @@
2	2	.browse_code_link_holder
3	3	%p
4	4	%strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right"
5		- = link_to project_commit_path(@project, :id => commit.id) do
6		- %p
7		- %code.left= commit.short_id
8		- %strong.cgray= commit.author_name
9		- –
10		- = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
11		- %span.row_title= truncate(commit.title, :length => 50)
	5	+ %p
	6	+ %code.left= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
	7	+ %strong.cgray= commit.author_name
	8	+ –
	9	+ = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
	10	+ = link_to truncate(commit.title, :length => 50), project_commit_path(@project, :id => commit.id), :class => "row_title"
12	11
13		- %span.committed_ago
14		- = time_ago_in_words(commit.committed_date)
15		- ago
16		-
	12	+ %span.committed_ago
	13	+ = time_ago_in_words(commit.committed_date)
	14	+ ago
	15	+
17	16
...	...
1	1	- commit = CommitDecorator.decorate(commit)
2	2	%li.wll.commit
3		- = link_to project_commit_path(project, :id => commit.id) do
4		- %p
5		- %code.left= commit.short_id
6		- %strong.cgray= commit.author_name
7		- –
8		- = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
9		- %span.row_title= truncate(commit.title, :length => 50) rescue "--broken encoding"
	3	+ %p
	4	+ %code.left= link_to commit.short_id, project_commit_path(project, :id => commit.id)
	5	+ %strong.cgray= commit.author_name
	6	+ –
	7	+ = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
	8	+ = link_to truncate(commit.title, :length => 50), project_commit_path(project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
10	9
...	...
...	...	@@ -24,8 +24,7 @@
24	24	- else
25	25	= image_tag "no_avatar.png", :class => "avatar"
26	26
27		- = link_to project_issue_path(issue.project, issue) do
28		- %p.row_title= truncate(issue.title, :length => 100)
	27	+ %p= link_to truncate(issue.title, :length => 100), project_issue_path(issue.project, issue), :class => "row_title"
29	28
30	29	%span.update-author
31	30	%small.cdark= "##{issue.id}"
...	...
...	...	@@ -46,9 +46,7 @@
46	46	- if @issue.milestone
47	47	- milestone = @issue.milestone
48	48	%cite.cgray and attached to milestone
49		- = link_to project_milestone_path(milestone.project, milestone) do
50		- %strong
51		- = truncate(milestone.title, :length => 20)
	49	+ %strong= link_to truncate(milestone.title, :length => 20), project_milestone_path(milestone.project, milestone)
52	50
53	51	.right
54	52	- @issue.labels.each do \|label\|
...	...
...	...	@@ -16,8 +16,7 @@
16	16	= merge_request.target_branch
17	17	= image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
18	18
19		- = link_to project_merge_request_path(merge_request.project, merge_request) do
20		- %p.row_title= truncate(merge_request.title, :length => 80)
	19	+ %p= link_to truncate(merge_request.title, :length => 80), project_merge_request_path(merge_request.project, merge_request), :class => "row_title"
21	20
22	21	%span.update-author
23	22	%small.cdark= "##{merge_request.id}"
...	...
...	...	@@ -6,14 +6,13 @@
6	6	= link_to 'Browse Issues', project_issues_path(milestone.project, :milestone_id => milestone.id), :class => "btn small grouped"
7	7	- if can? current_user, :admin_milestone, milestone.project
8	8	= link_to 'Edit', edit_project_milestone_path(milestone.project, milestone), :class => "btn small edit-milestone-link grouped"
9		- = link_to project_milestone_path(milestone.project, milestone) do
10		- %h4.row_title
11		- = truncate(milestone.title, :length => 100)
12		- %small
13		- = milestone.expires_at
14		- %br
15		- .progress.progress-success.span3
16		- .bar{:style => "width: #{milestone.percent_complete}%;"}
	9	+ %h4
	10	+ = link_to truncate(milestone.title, :length => 100), project_milestone_path(milestone.project, milestone), :class => "row_title"
	11	+ %small
	12	+ = milestone.expires_at
	13	+ %br
	14	+ .progress.progress-success.span3
	15	+ .bar{:style => "width: #{milestone.percent_complete}%;"}
17	16
18	17
19	18
...	...
...	...	@@ -50,8 +50,8 @@
50	50	%td
51	51	= link_to [@project, issue] do
52	52	%span.badge.badge-info ##{issue.id}
53		- –
54		- = truncate issue.title, :length => 60
	53	+ –
	54	+ = link_to truncate(issue.title, :length => 60), [@project, issue]
55	55	%br
56	56	= paginate @issues, :theme => "gitlab"
57	57
...	...
...	...	@@ -32,9 +32,8 @@
32	32	= commit.author_name
33	33	%td.blame_commit
34	34
35		- = link_to project_commit_path(@project, :id => commit.id) do
36		- %code= commit.short_id
37		- %span.row_title= truncate(commit.title, :length => 30) rescue "--broken encoding"
	35	+ %code= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
	36	+ = link_to truncate(commit.title, :length => 30), project_commit_path(@project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
38	37	%td.lines
39	38	= preserve do
40	39	%pre
...	...