summaryrefslogtreecommitdiff
path: root/app/views/search/results
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-06 09:58:43 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-06 09:58:43 +0200
commitd618a5fec361b85fafffd5cf4a53d044e82bdb5a (patch)
treeb3dc111c1335a676bd927cc56846356c3a1908e0 /app/views/search/results
parent593b05ea945f63fde39689eb62cf890d417b39bc (diff)
downloadgitlab-ce-d618a5fec361b85fafffd5cf4a53d044e82bdb5a.tar.gz
Refactor search views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/search/results')
-rw-r--r--app/views/search/results/_blob.html.haml10
-rw-r--r--app/views/search/results/_issue.html.haml9
-rw-r--r--app/views/search/results/_merge_request.html.haml12
-rw-r--r--app/views/search/results/_project.html.haml7
4 files changed, 38 insertions, 0 deletions
diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml
new file mode 100644
index 00000000000..a2e4a00b718
--- /dev/null
+++ b/app/views/search/results/_blob.html.haml
@@ -0,0 +1,10 @@
+.blob-result
+ .file-holder
+ .file-title
+ = link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do
+ %i.icon-file
+ %strong
+ = blob.filename
+ .file-content.code.term
+ %div{class: user_color_scheme_class}
+ = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml
new file mode 100644
index 00000000000..7a24b76bced
--- /dev/null
+++ b/app/views/search/results/_issue.html.haml
@@ -0,0 +1,9 @@
+%li
+ issue:
+ = link_to [issue.project, issue] do
+ %span ##{issue.iid}
+ %strong.term
+ = truncate issue.title, length: 50
+ %span.light (#{issue.project.name_with_namespace})
+ - if issue.closed?
+ %span.label Closed
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml
new file mode 100644
index 00000000000..22d7587f6c1
--- /dev/null
+++ b/app/views/search/results/_merge_request.html.haml
@@ -0,0 +1,12 @@
+%li
+ merge request:
+ = link_to [merge_request.target_project, merge_request] do
+ %span ##{merge_request.iid}
+ %strong.term
+ = truncate merge_request.title, length: 50
+ - if merge_request.for_fork?
+ %span.light (#{merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} &rarr; #{merge_request.target_project.name_with_namespace}:#{merge_request.target_branch})
+ - else
+ %span.light (#{merge_request.source_branch} &rarr; #{merge_request.target_branch})
+ - if merge_request.closed?
+ %span.label Closed
diff --git a/app/views/search/results/_project.html.haml b/app/views/search/results/_project.html.haml
new file mode 100644
index 00000000000..abc86c72bef
--- /dev/null
+++ b/app/views/search/results/_project.html.haml
@@ -0,0 +1,7 @@
+%li
+ project:
+ = link_to project do
+ %strong.term= project.name_with_namespace
+ - if project.description.present?
+ &ndash;
+ %span.light.term= project.description