Merge commit '1c4bc52b97dd546c4820313d780f238eb7a0e890' into HEAD

alphagov · May 10, 2012 · 56b030b · 56b030b
2 parents 7205e17 + 1c4bc52
commit 56b030b
Show file tree

Hide file tree

Showing 47 changed files with 2,621 additions and 174 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ db/*.sqlite3
 log/*.log
 tmp/
 .sass-cache/
+.DS_Store
diff --git a/Gemfile b/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

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,20 @@
+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
@@ -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
diff --git a/app/assets/images/asc.gif b/app/assets/images/asc.gif
diff --git a/app/assets/images/bg.gif b/app/assets/images/bg.gif
diff --git a/app/assets/images/chosen-sprite.png b/app/assets/images/chosen-sprite.png
diff --git a/app/assets/images/desc.gif b/app/assets/images/desc.gif
diff --git a/app/assets/images/glyphicons-halflings-white.png b/app/assets/images/glyphicons-halflings-white.png
diff --git a/app/assets/images/glyphicons-halflings.png b/app/assets/images/glyphicons-halflings.png
diff --git a/app/assets/images/header-crown.png b/app/assets/images/header-crown.png
diff --git a/app/assets/images/icon-answer.png b/app/assets/images/icon-answer.png
diff --git a/app/assets/images/icon-custom-application.png b/app/assets/images/icon-custom-application.png
diff --git a/app/assets/images/icon-guide.png b/app/assets/images/icon-guide.png
diff --git a/app/assets/images/icon-local_transaction.png b/app/assets/images/icon-local_transaction.png
diff --git a/app/assets/images/icon-place.png b/app/assets/images/icon-place.png
diff --git a/app/assets/images/icon-programme.png b/app/assets/images/icon-programme.png
diff --git a/app/assets/images/icon-service.png b/app/assets/images/icon-service.png
diff --git a/app/assets/images/icon-transaction.png b/app/assets/images/icon-transaction.png
diff --git a/app/assets/javascripts/artefacts.js b/app/assets/javascripts/artefacts.js
@@ -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); });
+});