Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-14 20:35:45 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-14 20:35:45 +0400
commit3637d244be046c145598777fce2488598d7ca6e8 (patch)
tree9ddfaa9a20d84d5359630c2245d1a8fc95e8527c /app/views/projects/network
parent951279b1a312db5d943c970d435bba5b29901375 (diff)
Improve network UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/network')
-rw-r--r--app/views/projects/network/_head.html.haml18
-rw-r--r--app/views/projects/network/show.html.haml13
2 files changed, 14 insertions, 17 deletions
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index d61ff789b65..415c98ec6a6 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,15 +1,3 @@
-.row.append-bottom-20
- .col-md-2.append-bottom-10
- = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
- .col-md-10
- = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f|
- = label_tag :extended_sha1 , "Looking for", class: 'light inline-label'
- = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input form-control input-mx-250"
- = button_tag type: 'submit', class: 'btn btn-success' do
- %i.icon-search
-
- .inline.prepend-left-20
- .checkbox.light
- = label_tag :filter_ref do
- = check_box_tag :filter_ref, 1, @options[:filter_ref]
- %span Begin with the selected commit
+.append-bottom-20
+ = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
+ .pull-right.visible-lg.light You can move around the graph by using the arrow keys.
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index 37bc0a4c6b8..5310822823d 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,7 +1,16 @@
= render "head"
.project-network
- .tip
- You can move around the graph by using the arrow keys.
+ .controls
+ = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f|
+ = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input form-control input-mx-250"
+ = button_tag type: 'submit', class: 'btn btn-success' do
+ %i.icon-search
+ .inline.prepend-left-20
+ .checkbox.light
+ = label_tag :filter_ref do
+ = check_box_tag :filter_ref, 1, @options[:filter_ref]
+ %span Begin with the selected commit
+
.network-graph
= spinner nil, true