Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
bmarkons committed Jul 10, 2017
1 parent acdffdc commit 469c16f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
11 changes: 4 additions & 7 deletions app/views/admin/repo.html.haml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
- content_for(:page_header) do
= "#{@repo.name.capitalize} repo"



= @repo.name.capitalize

.row
.col-lg-6
Expand All @@ -11,12 +8,12 @@
= notice

#wait_alert.alert.alert-warning.hidden
= 'Wait while selected runs are queued...'
= t('admin.wait_manual_run')

.panel.panel-warning
.panel-body
= form_tag(admin_repo_run_path(@repo.name), id: 'manual_run_form') do
.form-group
= label_tag('Run last:')
= label_tag(t('admin.manual_run_label'))
= select_tag(:count, options_for_select(ManualRunner::OPTIONS, ManualRunner::OPTIONS.last), class: 'form-control')
= button_tag('Run', class: 'btn btn-default')
= button_tag(t('admin.manual_run_button'), class: 'btn btn-default')
6 changes: 3 additions & 3 deletions app/views/layouts/admin/_navbar.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@

%ul.nav.navbar-top-links.navbar-right.pull-right
%li.dropdown
%a{:href => "#{root_path}"}
= link_to root_path do
%i.fa.fa-sign-out

.navbar-default.sidebar{:role => "navigation"}
.sidebar-nav.navbar-collapse
%ul#side-menu.nav.in
%li
%a{:href => "#{admin_path}"}
= link_to admin_path do
%i.fa.fa-dashboard.fa-fw
Dashboard
= t('admin.dashboard')
- @repos.each do |repo|
%li
= link_to admin_repo_path(repo.name) do
Expand Down
6 changes: 6 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,9 @@ en:
desktop: 'Click and drag in the plot area to zoom in'
mobile: 'Pinch the chart to zoom in'
commit_url: Click on a point to view and compare commits on GitHub

admin:
wait_manual_run: 'Wait while selected runs are being queued...'
manual_run_label: 'Run last:'
manual_run_button: 'Run'
dashboard: 'Dashboard'
3 changes: 2 additions & 1 deletion test/acceptance/admin_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class AdminTest < AcceptanceTest
repo = create(:repo)

visit admin_repo_path(repo.name)
page.must_have_content 'Run last'
page.has_css?('label', text: I18n.t('admin.manual_run_label'))
page.has_css?('button', text: I18n.t('admin.manual_run_button'))
end
end

0 comments on commit 469c16f

Please sign in to comment.