Commit 44dc9aa6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix typo in js method and some repeating css

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 4443a5f3
...@@ -24,19 +24,19 @@ class @CommitsList ...@@ -24,19 +24,19 @@ class @CommitsList
form = $(".commits-search-form") form = $(".commits-search-form")
search = @searchField.val() search = @searchField.val()
commitsUrl = form.attr("action") + '?' + form.serialize() commitsUrl = form.attr("action") + '?' + form.serialize()
@setOpacitiy(0.5) @setOpacity(0.5)
$.ajax $.ajax
type: "GET" type: "GET"
url: form.attr("action") url: form.attr("action")
data: form.serialize() data: form.serialize()
complete: => complete: =>
@setOpacitiy(1.0) @setOpacity(1.0)
success: (data) => success: (data) =>
@content.html(data.html) @content.html(data.html)
# Change url so if user reload a page - search results are saved # Change url so if user reload a page - search results are saved
history.replaceState {page: commitsUrl}, document.title, commitsUrl history.replaceState {page: commitsUrl}, document.title, commitsUrl
dataType: "json" dataType: "json"
@setOpacitiy: (opacity) -> @setOpacity: (opacity) ->
@content.css("opacity", opacity) @content.css("opacity", opacity)
...@@ -72,6 +72,15 @@ ...@@ -72,6 +72,15 @@
> p:last-child { > p:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.block-controls {
float: right;
.control {
float: left;
margin-left: 10px;
}
}
} }
.cover-block { .cover-block {
......
...@@ -10,19 +10,19 @@ ...@@ -10,19 +10,19 @@
.tree-ref-holder .tree-ref-holder
= render 'shared/ref_switcher', destination: 'commits' = render 'shared/ref_switcher', destination: 'commits'
.pull-right.hidden-xs.hidden-sm .block-controls.hidden-xs.hidden-sm
- if create_mr_button?(@repository.root_ref, @ref) - if create_mr_button?(@repository.root_ref, @ref)
.pull-left.prepend-left-10 .control
= link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do = link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do
= icon('plus') = icon('plus')
Create Merge Request Create Merge Request
.pull-left.prepend-left-10 .control
= form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'pull-left commits-search-form') do = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'pull-left commits-search-form') do
= search_field_tag :search, params[:search], { placeholder: 'Filter by commit message', id: 'commits-search', class: 'form-control search-text-input', spellcheck: false } = search_field_tag :search, params[:search], { placeholder: 'Filter by commit message', id: 'commits-search', class: 'form-control search-text-input', spellcheck: false }
- if current_user && current_user.private_token - if current_user && current_user.private_token
.pull-left.prepend-left-10 .control
= link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Commits Feed", class: 'btn' do = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Commits Feed", class: 'btn' do
= icon("rss") = icon("rss")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment