Permalink
Browse files

Add sign out link and bump gds-sso to provide a handler for it

  • Loading branch information...
1 parent cba8b65 commit f4266b2b5f5d96fa2d50855d1bf43a7c85fdeb60 @jystewart jystewart committed Jan 17, 2012
Showing with 33 additions and 27 deletions.
  1. +1 −1 Gemfile
  2. +22 −26 Gemfile.lock
  3. +10 −0 app/views/layouts/application.html.erb
View
@@ -30,7 +30,7 @@ gem 'colorize', '~> 0.5.8'
if ENV['BUNDLE_DEV']
gem 'gds-sso', :path => '../gds-sso'
else
- gem 'gds-sso', :git => 'git@github.com:alphagov/gds-sso.git'
+ gem 'gds-sso', '~> 0.4.1'
end
if ENV['SLIMMER_DEV']
View
@@ -4,18 +4,6 @@ GIT
specs:
daemonette (0.1.0)
-GIT
- remote: git@github.com:alphagov/gds-sso.git
- revision: df6cb953a1cbe75bef47d0061f7927966ad3d3f6
- specs:
- gds-sso (0.3.0)
- oa-core (= 0.2.6)
- oa-oauth (= 0.2.6)
- oauth2 (= 0.4.1)
- rack-accept (~> 0.4.4)
- rails (>= 3.0.0)
- warden (= 1.0.6)
-
GEM
remote: http://rubygems.org/
specs:
@@ -66,7 +54,7 @@ GEM
capybara-mechanize (0.3.0.rc3)
capybara (~> 1.1.0)
mechanize (~> 2.0.0)
- childprocess (0.2.4)
+ childprocess (0.3.0)
ffi (~> 1.0.6)
chronic (0.6.6)
ci_reporter (1.6.9)
@@ -82,15 +70,15 @@ GEM
capybara (>= 1.1.2)
cucumber (>= 1.1.3)
nokogiri (>= 1.5.0)
- database_cleaner (0.7.0)
+ database_cleaner (0.7.1)
diff-lcs (1.1.3)
erubis (2.7.0)
exception_notification (2.5.2)
actionmailer (>= 3.0.4)
- factory_girl (2.3.2)
+ factory_girl (2.4.0)
activesupport
- factory_girl_rails (1.4.0)
- factory_girl (~> 2.3.0)
+ factory_girl_rails (1.5.0)
+ factory_girl (~> 2.4.0)
railties (>= 3.0.0)
fakeweb (1.3.0)
faraday (0.6.1)
@@ -100,18 +88,26 @@ GEM
ffi (1.0.11)
formtastic (2.0.0.rc5)
rails (~> 3.0)
- gds-api-adapters (0.0.20)
+ gds-api-adapters (0.0.37)
null_logger
plek
+ gds-sso (0.4.1)
+ oa-core (= 0.2.6)
+ oa-oauth (= 0.2.6)
+ oauth2 (= 0.4.1)
+ plek
+ rack-accept (~> 0.4.4)
+ rails (>= 3.0.0)
+ warden (= 1.0.6)
gds-warmup-controller (0.0.2)
rails (>= 3.0.0)
gelf (1.3.2)
json
- gherkin (2.7.1)
+ gherkin (2.7.3)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
- json (1.6.4)
+ json (1.6.5)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -128,7 +124,7 @@ GEM
metaclass (0.0.1)
mime-types (1.17.2)
minitest (2.10.0)
- mocha (0.10.0)
+ mocha (0.10.1)
metaclass (~> 0.0.1)
multi_json (1.0.4)
multi_xml (0.2.2)
@@ -184,8 +180,8 @@ GEM
rdoc (3.12)
json (~> 1.4)
rubyzip (0.9.5)
- selenium-webdriver (2.15.0)
- childprocess (>= 0.2.1)
+ selenium-webdriver (2.17.0)
+ childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
@@ -195,7 +191,7 @@ GEM
simplecov-html (0.4.5)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- slimmer (1.1.16)
+ slimmer (1.1.21)
json
nokogiri (~> 1.5.0)
null_logger
@@ -210,7 +206,7 @@ GEM
sqlite3 (>= 1.3.3)
stomp (1.2.0)
term-ansicolor (1.0.7)
- test-unit (2.4.3)
+ test-unit (2.4.5)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -248,7 +244,7 @@ DEPENDENCIES
fakeweb
formtastic (= 2.0.0.rc5)
gds-api-adapters (~> 0.0.15)
- gds-sso!
+ gds-sso (~> 0.4.1)
gds-warmup-controller
gelf
marples (~> 1.0)
@@ -11,6 +11,16 @@
<body>
<div id="wrapper" class="wrapper">
<h1 id="site-title">Panopticon</h1>
+ <nav class="admin-nav group" role="navigation">
+ <ul>
+ <li class="publications-nav">
+ <ul>
+ <li><%= link_to 'Sign out', gds_sign_out_path %></li>
+ </ul>
+ </li>
+ </ul>
+ </nav>
+
<div class="content" role="main">
<%= yield %>
<%= yield :extra_javascript %>

0 comments on commit f4266b2

Please sign in to comment.