Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to using govuk_admin_template #93

Merged
merged 23 commits into from Aug 29, 2014
Merged

Switch to using govuk_admin_template #93

merged 23 commits into from Aug 29, 2014

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented Aug 29, 2014

Recommend reviewing code using?w=1, and doing like-for-like comparisons with preview.

  • Start using admin gem which bundles jQuery, Bootstrap, environment indicator and default application layout
  • Switch from LESS to SASS
  • Upgrade from Bootstrap 2 to Bootstrap 3
  • Upgrade formtastic, formtastic-bootstrap
    • Update deprecated formtastic actions
  • Update markup to conform with newest bootstrap patterns
    • Replace grid classes on form elements with appropriate grid wrappers
    • Formtastic picks up most of the form changes
    • Add missing -default classes to default buttons and alerts
    • Use Bootstrap 3 kaminari themes for pagination
  • Update flash messages for new Bootstrap 3 alerts
  • Make services table more useful
  • Bring guidance on file uploads inline with content style guide

Before:
screen shot 2014-08-28 at 18 18 29
screen shot 2014-08-29 at 11 01 10

After:
screen shot 2014-08-28 at 18 18 10
screen shot 2014-08-29 at 11 00 47
screen shot 2014-08-29 at 11 00 16
screen shot 2014-08-29 at 11 00 29

fofr added 23 commits Aug 27, 2014
* Add govuk_admin_template
* Remove jquery-rails, jQuery is provided via gem
* Upgrade formtastic, formtastic-bootstrap, kaminari themes
  * Stop using old branch builds of formtastic
* Remove references to old LESS bootstrap
* Remove styles now provided by gem
* 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
* Keep a reference to admin design patterns
* Show how local styles may have affected those patterns
* Use actions instead of buttons, and specify a bootstrap button class
on the submit
button, use the same text as before
* Update commit_button (also deprecated) to submit
* Remove grid wrappers
* Add spacing between table and create service button
* Make table of services match other admin app table styles
* Update grid classes
* Add missing -default classes to labels and buttons
* Restrict width of name and slug fields
* Remove old Bootstrap 2 grid class
* Bootstrap overrides were blanket copied from another app in 2012,
none of these styles are being used
* Bootstrap 3 needs a btn-default or label-default class for correct
rendering
* Allow success, info, warning and danger types of flash message
* Coerce alert and notice to warnings
* Be explicit in the type of messages that are being set
* Remove span dividers which Bootstrap 3 doesn’t need
* Add a missing ‘active’ class to the final option, service name
* Move breadcrumb above the title
* Simplify the title
* Add some spacing so tab content isn’t too close to the tabs
* Remove javascript to starts the tabs, this is done automatically with
the data attributes
* Switch from wells to Bootstrap 3 panels
* Correctly clear list of versions every 3 panels
* Move warnings to top of panel
* Hide empty information, ie when there’s no change note or places
* Markup current version as a panel to match version history view
* Add headings within panel for status and exporting
* Style data pagination using Bootstrap 3 kaminari theme
* Update data table to match tables elsewhere in app
* Use panels rather than wells
* Limit width of change note field
* Change “changes” to “change note”, to match how the content is
referred to elsewhere
* Separate requirements of data file into scannable list
* Make copy assertive and inline with style guide
* Put form in well to give form fields contrast and to match the edit
view
* Remove script which was meant to be updating the slug based on the
title, this hasn’t been working for a long time
* The table of services wasn’t a useful table, the review link matched
the title link and the upload link isn’t switching to the correct tab
when used
* Instead, pull out the data sets and places information which was
hidden in a paragraph beneath the service title
* Make page title, page heading and main nav link the same text
* Add a filter to quickly find services in the list
* This is the main page heading
* Limit width of fields for legibility
* Update classes on submit buttons
* Give ‘add new place’ some extra vertical space
* Be explicit about editing a place in links and in breadcrumbs
danielroseman added a commit that referenced this pull request Aug 29, 2014
Switch to using govuk_admin_template
@danielroseman danielroseman merged commit 2c877c6 into master Aug 29, 2014
1 check passed
1 check passed
continuous-integration/travis-ci The Travis CI build passed
Details
@danielroseman danielroseman deleted the govuk_admin_template branch Aug 29, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.