Skip to content

Commit

Permalink
Add 'Return To Application' Link to Menu Bar
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Simkins committed Aug 21, 2016
1 parent f3ca5b3 commit 27c8b51
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ GIT
PATH
remote: .
specs:
resque-web (0.0.8)
resque-web (0.0.9)
coffee-rails
jquery-rails
resque
Expand Down Expand Up @@ -105,7 +105,7 @@ GEM
domain_name (~> 0.5)
i18n (0.7.0)
jdbc-sqlite3 (3.8.11.2)
jquery-rails (4.1.1)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand Down Expand Up @@ -393,7 +393,7 @@ GEM
rubysl-yaml (2.1.0)
rubysl-zlib (2.0.1)
sass (3.4.22)
sass-rails (5.0.5)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
Expand Down
3 changes: 3 additions & 0 deletions app/views/layouts/resque_web/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
<% tabs.each do |tab_name,path| %>
<%= tab tab_name,path %>
<% end %>
<% if respond_to?(:main_app) %>
<li><%= link_to "Return to Application", main_app.root_path, :class => "nav navbar-nav" %></li>
<% end %>
</ul>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions test/dummy/app/controllers/portal_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class PortalController < ApplicationController

def index
end
end
2 changes: 2 additions & 0 deletions test/dummy/app/views/portal/index.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h1> This is the root page </h1>

2 changes: 1 addition & 1 deletion test/dummy/config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Rails.application.routes.draw do

root :to => "portal#index"
mount ResqueWeb::Engine => "/resque_web"
end

0 comments on commit 27c8b51

Please sign in to comment.