-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch to using govuk_admin_template layout
* Use nested layouts * Import gem’s SASS styles * Remove now unnecessary javascript and SASS includes, * Delete application.js altogether, it’s not being used * Remove HTML5 shim, now provided by gem
- Loading branch information
Showing
7 changed files
with
29 additions
and
91 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| @import 'govuk_admin_template'; | ||
| @import 'formtastic-bootstrap'; | ||
| @import 'bootstrap_and_overrides'; | ||
| @import 'data_sets'; |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,30 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title> | ||
| <%= yield :page_title %> | GOV.UK Imminence | ||
| </title> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> | ||
| <!--[if lt IE 9]> | ||
| <%= javascript_include_tag "html5" %> | ||
| <![endif]--> | ||
| <%= stylesheet_link_tag "application", :media => "all" %> | ||
| <%= csrf_meta_tag %> | ||
| <% content_for :app_title, 'GOV.UK Imminence' %> | ||
| <% content_for :page_title, ' | GOV.UK Imminence' %> | ||
| <% content_for :head do %> | ||
| <%= csrf_meta_tags %> | ||
| <%= stylesheet_link_tag 'application' %> | ||
| <%= yield :extra_headers %> | ||
| </head> | ||
| <body> | ||
| <% end %> | ||
| <header class="navbar navbar-inverse navbar-fixed-top" role="banner"> | ||
| <div class="navbar-inner"> | ||
| <div class="container-fluid"> | ||
| <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </a> | ||
| <%= link_to 'GOV.UK Imminence', admin_root_path, :class => "brand" %> | ||
| <nav role="navigation" class="nav-collapse"> | ||
| <ul class="nav"> | ||
| <%= nav_link 'All data sets', admin_root_path %> | ||
| <li class="divider-vertical"></li> | ||
| </ul> | ||
| <ul class="nav pull-right"> | ||
| <li class="dropdown"> | ||
| <a href="#" | ||
| class="dropdown-toggle" | ||
| data-toggle="dropdown"> | ||
| Services | ||
| <b class="caret"></b> | ||
| </a> | ||
| <ul class="dropdown-menu"> | ||
| <li><a href="http://digital.cabinetoffice.gov.uk/">GDS blog</a></li> | ||
| <li><a href="http://wiki.digital.cabinet-office.gov.uk/">GDS wiki</a></li> | ||
| <li class="divider"></li> | ||
| <li><%= link_to 'Analytics', 'https://www.google.com/analytics/web/#dashboard/default/a26179049w50705554p51337955/'%></li> | ||
| <li class="divider"></li> | ||
| <li><%= link_to 'Sign out', gds_sign_out_path %></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| <p class="navbar-text pull-right">Signed in as <a href="<%= Plek.current.find('signon') %>"><%= current_user %></a></p> | ||
| </nav><!--/.nav-collapse --> | ||
| </div> | ||
| </div> | ||
| </header> | ||
|
|
||
| <section class="container-fluid" role="main"> | ||
| <% [:notice, :alert].select { |k| flash[k].present? }.each do |k| %> | ||
| <div class="alert <%= k %>"> | ||
| <%= flash[k] %> | ||
| </div> | ||
| <% end %> | ||
| <% content_for :navbar_items do %> | ||
| <%= nav_link 'All data sets', admin_root_path %> | ||
| <% end %> | ||
| <%= yield %> | ||
| <% content_for :navbar_right do %> | ||
| <%= link_to current_user.name, Plek.current.find('signon') %> | ||
| • <%= link_to 'Sign out', gds_sign_out_path %> | ||
| <% end %> | ||
| <hr> | ||
| <% content_for :content do %> | ||
| <% [:notice, :alert].select { |k| flash[k].present? }.each do |k| %> | ||
| <div class="alert <%= k %>"> | ||
| <%= flash[k] %> | ||
| </div> | ||
| <% end %> | ||
| <%= yield %> | ||
| <% end %> | ||
| <footer> | ||
| <p>© GDS. <span class="pull-right">Imminence release: <%= CURRENT_RELEASE_SHA %></span></p> | ||
| </footer> | ||
| <% content_for :footer_version, CURRENT_RELEASE_SHA %> | ||
| </section><!--/.container-fluid --> | ||
| <%= javascript_include_tag "application" %> | ||
| </body> | ||
| </html> | ||
| <%# use the govuk_admin_template layout %> | ||
| <%= render :template => 'layouts/govuk_admin_template' %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.