Permalink
Browse files

Merge commit '1c4bc52b97dd546c4820313d780f238eb7a0e890' into HEAD

  • Loading branch information...
2 parents 7205e17 + 1c4bc52 commit 56b030bc03b07855992ab638ae1d7950de62e77b Jenkins committed May 10, 2012
Showing with 2,621 additions and 174 deletions.
  1. +1 −0 .gitignore
  2. +5 −5 Gemfile
  3. +29 −10 Gemfile.lock
  4. BIN app/assets/images/asc.gif
  5. BIN app/assets/images/bg.gif
  6. BIN app/assets/images/chosen-sprite.png
  7. BIN app/assets/images/desc.gif
  8. BIN app/assets/images/glyphicons-halflings-white.png
  9. BIN app/assets/images/glyphicons-halflings.png
  10. BIN app/assets/images/header-crown.png
  11. BIN app/assets/images/icon-answer.png
  12. BIN app/assets/images/icon-custom-application.png
  13. BIN app/assets/images/icon-guide.png
  14. BIN app/assets/images/icon-local_transaction.png
  15. BIN app/assets/images/icon-place.png
  16. BIN app/assets/images/icon-programme.png
  17. BIN app/assets/images/icon-service.png
  18. BIN app/assets/images/icon-transaction.png
  19. +29 −0 app/assets/javascripts/artefacts.js
  20. +1,824 −0 app/assets/javascripts/bootstrap.js
  21. +6 −0 app/assets/javascripts/bootstrap.min.js
  22. +9 −0 app/assets/javascripts/chosen.jquery.min.js
  23. +4 −0 app/assets/javascripts/jquery.min.js
  24. +1 −0 app/assets/javascripts/libs/jquery/plugins/jquery.tablesorter.min.js
  25. +41 −6 app/assets/stylesheets/application.css
  26. +9 −0 app/assets/stylesheets/bootstrap-responsive.min.css
  27. +9 −0 app/assets/stylesheets/bootstrap.min.css
  28. +372 −0 app/assets/stylesheets/chosen.css
  29. +0 −2 app/controllers/application_controller.rb
  30. +13 −0 app/helpers/application_helper.rb
  31. +49 −34 app/views/artefacts/_form.html.erb
  32. +4 −0 app/views/artefacts/edit.html.erb
  33. +44 −45 app/views/artefacts/index.html.erb
  34. +4 −0 app/views/artefacts/new.html.erb
  35. +45 −18 app/views/layouts/application.html.erb
  36. +14 −6 config/application.rb
  37. +0 −1 config/environments/development.rb
  38. +0 −3 config/environments/production.rb
  39. +92 −0 config/initializers/formtastic.rb
  40. +15 −15 features/editing.feature
  41. +2 −2 features/support/artefacts.rb
  42. +0 −5 features/support/skip_slimmer.rb
  43. BIN public/panopticon-assets/images/icon-insights-close.png
  44. BIN public/panopticon-assets/images/icon-insights.gif
  45. BIN public/panopticon-assets/images/rails.png
  46. +0 −9 public/panopticon-assets/javascripts/application.js
  47. +0 −13 public/panopticon-assets/javascripts/google_insights.js
View
@@ -4,3 +4,4 @@ db/*.sqlite3
log/*.log
tmp/
.sass-cache/
+.DS_Store
View
10 Gemfile
@@ -8,7 +8,8 @@ end
gem 'gds-warmup-controller'
gem 'plek', '~> 0'
-gem 'formtastic'
+gem 'formtastic', git: 'git://github.com/justinfrench/formtastic.git', branch: '2.1-stable'
+gem 'formtastic-bootstrap', git: 'git://github.com/cgunther/formtastic-bootstrap.git', branch: 'bootstrap-2'
gem 'stomp'
gem 'marples', '~> 1.0'
gem 'daemonette', :git => 'git@github.com:alphagov/daemonette.git'
@@ -37,10 +38,9 @@ else
gem 'gds-sso', '~> 0.5'
end
-if ENV['SLIMMER_DEV']
- gem 'slimmer', :path => '../slimmer'
-else
- gem 'slimmer', '~> 1.1', ">= 1.1.16"
+group :assets do
+ gem "therubyracer", "~> 0.9.4"
+ gem 'uglifier'
end
group :test do
View
@@ -1,4 +1,21 @@
GIT
+ remote: git://github.com/cgunther/formtastic-bootstrap.git
+ revision: 3428fef4f7870b01241d65893b882ad32cfc18d8
+ branch: bootstrap-2
+ specs:
+ formtastic-bootstrap (1.2.0)
+ formtastic
+ rails (>= 3.1.0)
+
+GIT
+ remote: git://github.com/justinfrench/formtastic.git
+ revision: 7b7428fa4a6a44aea1e8278523f4f45f2570a33d
+ branch: 2.1-stable
+ specs:
+ formtastic (2.1.1)
+ actionpack (~> 3.0)
+
+GIT
remote: git@github.com:alphagov/daemonette.git
revision: 8179408a2db8f2e882965a2b95ddfc4cdf5230f3
specs:
@@ -79,6 +96,8 @@ GEM
erubis (2.7.0)
exception_notification (2.5.2)
actionmailer (>= 3.0.4)
+ execjs (1.2.13)
+ multi_json (~> 1.0)
factory_girl (2.4.0)
activesupport
factory_girl_rails (1.5.0)
@@ -90,8 +109,6 @@ GEM
multipart-post (~> 1.1)
rack (~> 1.1)
ffi (1.0.11)
- formtastic (2.2.0)
- actionpack (>= 3.0)
gds-api-adapters (0.0.40)
lrucache (~> 0.1.1)
null_logger
@@ -115,6 +132,7 @@ GEM
json (1.6.6)
launchy (2.0.5)
addressable (~> 2.2.6)
+ libv8 (3.3.10.4)
lrucache (0.1.1)
PriorityQueue (~> 0.1.2)
mail (2.3.3)
@@ -204,12 +222,6 @@ GEM
simplecov-html (0.4.5)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- slimmer (1.1.27)
- json
- nokogiri (~> 1.5.0)
- null_logger
- plek (>= 0.1.8)
- rack (~> 1.3.5)
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
@@ -220,6 +232,8 @@ GEM
stomp (1.2.0)
term-ansicolor (1.0.7)
test-unit (2.4.5)
+ therubyracer (0.9.10)
+ libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -228,6 +242,9 @@ GEM
turn (0.8.3)
ansi
tzinfo (0.3.33)
+ uglifier (1.2.2)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
warden (1.0.6)
rack (>= 1.0)
webrobots (0.0.12)
@@ -257,7 +274,8 @@ DEPENDENCIES
factory_girl
factory_girl_rails
fakeweb
- formtastic
+ formtastic!
+ formtastic-bootstrap!
gds-api-adapters (~> 0.0.15)
gds-sso (~> 0.5)
gds-warmup-controller
@@ -277,9 +295,10 @@ DEPENDENCIES
shoulda (~> 2.11.3)
simplecov (= 0.4.2)
simplecov-rcov
- slimmer (~> 1.1, >= 1.1.16)
sqlite3-ruby
stomp
test-unit
+ therubyracer (~> 0.9.4)
turn
+ uglifier
whenever
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,29 @@
+$(function() {
+ var blankByDefault = ($("#artefact_slug").attr('value') != '');
+ var generateSlug = function generateSlug() {
+ if(blankByDefault) { return }
+ var title = $("#artefact_name").val();
+ var slug = title.toLowerCase()
+ .replace(/[^\w ]+/g, '')
+ .replace(/ +/g, '-')
+ .replace(/^-+|-+$/, '')
+ $("#artefact_slug").val(slug);
+ }
+ $("#artefact_name").change(generateSlug)
+ $("#artefact_name").bind('keyup', generateSlug)
+
+ $('a[rel=external]').attr('target','_blank');
+
+ // $('.related select').chosen({
+ // allow_single_deselect: true,
+ // no_results_text: "No results matched"
+ // });
+
+ $('select#artefact_section').chosen({
+ allow_single_deselect: true,
+ no_results_text: "Section not found"
+ });
+
+ $('.flash-notice').delay(4000).slideUp(300).
+ one('click', function () { $(this).slideUp(300); });
+});
Oops, something went wrong.

0 comments on commit 56b030b

Please sign in to comment.