From d019ebeb1f0d6c1826f1a25c5bef1683cf19b8ca Mon Sep 17 00:00:00 2001
From: paschdan <daniel.paschke@wirkaufens.de>
Date: Sat, 15 Feb 2014 17:43:54 +0100
Subject: [PATCH 01/12] fixing jquery path in common js

---
 assets/js/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/common.js b/assets/js/common.js
index 1219451..7d849a3 100644
--- a/assets/js/common.js
+++ b/assets/js/common.js
@@ -18,7 +18,7 @@ requirejs.config({
          * AMD, you will likely need a paths entry and also an entry in
          * shim (beyond what you see for the bootstrap shim).
          */
-        jquery: '../vendor/jquery/jquery.min',
+        jquery: '../vendor/jquery/dist/jquery.min',
         bootstrap: '../vendor/bootstrap/dist/js/bootstrap.min'
     },
     shim: {

From e3545ce11d5a401b0c216cef5514750e1fef7cf2 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Tue, 25 Feb 2014 10:35:00 -0600
Subject: [PATCH 02/12] Fixing a bug where "grunt default" sass didn't work

The issue was that default ran copy:assets, which ran clean:sass. So later, when default ran compass:dev,
the web/assets/sass files had already been removed
---
 Gruntfile.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index e6791a9..a5727e8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -186,11 +186,11 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-clean');
 
     // sub-task that copies assets to web/assets, and also cleans some things
-    grunt.registerTask('copy:assets', ['clean:build', 'copy', 'clean:sass']);
+    grunt.registerTask('copy:assets', ['clean:build', 'copy']);
 
     // the "default" task (e.g. simply "Grunt") runs tasks for development
-    grunt.registerTask('default', ['copy:assets', 'jshint', 'compass:dev']);
+    grunt.registerTask('default', ['copy:assets', 'jshint', 'compass:dev', 'clean:sass']);
 
     // register a "production" task that sets everything up before deployment
-    grunt.registerTask('production', ['copy:assets', 'jshint', 'requirejs', 'uglify', 'compass:dist']);
+    grunt.registerTask('production', ['copy:assets', 'jshint', 'requirejs', 'uglify', 'compass:dist', 'clean:sass']);
 };
\ No newline at end of file

From afad62a1b53b93968716bde68a2f1c4f4459893b Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Tue, 25 Feb 2014 10:36:32 -0600
Subject: [PATCH 03/12] Using the asset function

See https://github.com/knpuniversity/symfonycon-frontend/commit/fe37dc1e8e198f73869052a817b9cab9a998d3d5#commitcomment-5364899
---
 src/Yoda/EventBundle/Resources/views/_requirejs.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Yoda/EventBundle/Resources/views/_requirejs.html.twig b/src/Yoda/EventBundle/Resources/views/_requirejs.html.twig
index 3988392..ff81fbe 100644
--- a/src/Yoda/EventBundle/Resources/views/_requirejs.html.twig
+++ b/src/Yoda/EventBundle/Resources/views/_requirejs.html.twig
@@ -1,7 +1,7 @@
 <script src="{{ asset('assets/vendor/requirejs/require.js') }}"></script>
 <script>
     requirejs.config({
-        baseUrl: '{{ app.request.basePath }}/assets/js'
+        baseUrl: '{{ asset('assets/js') }}'
     });
 
     /**

From 5b78d856e9119206c22809586718ed19be0f8cce Mon Sep 17 00:00:00 2001
From: Peter Siska <pesche@gridonic.ch>
Date: Sat, 29 Mar 2014 15:44:32 +0100
Subject: [PATCH 04/12] Simplified grunt config by using the glob method from
 http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically to
 include all javascript files in the destination directory during the jshint
 task.

---
 Gruntfile.js | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index a5727e8..3a1f2e2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,12 +1,5 @@
 module.exports = function (grunt) {
 
-    // globs where our JS files are found - used below in uglify and watch
-    var jsFilePaths = [
-        'js/*.js',
-        'js/app/*.js',
-        'js/app/modules/*.js'
-    ];
-
     // Project configuration
     grunt.initConfig({
         // you can read in JSON files, which are then set as objects. We use this below with banner
@@ -95,30 +88,14 @@ module.exports = function (grunt) {
                 banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
             },
             build: {
-                /*
-                 * I'm not sure if finding files recursively is possible. This is
-                 * a bit ugly, but it accomplishes the task of finding all files
-                 * in the built directory (that we want, not vendor) and uglifying them.
-                 *
-                 * Additionally, I created a little self-executing function
-                 * here so that I could re-use the jsFilePaths from above
-                 *
-                 * https://github.com/gruntjs/grunt-contrib-uglify/issues/23
-                 */
-                files: (function() {
-
-                    var files = [];
-                    jsFilePaths.forEach(function(val) {
-                        files.push({
-                            expand: true,
-                            cwd: '<%= targetDir %>',
-                            src: val,
-                            dest: '<%= targetDir %>'
-                        });
-                    });
-
-                    return files;
-                })()
+                files: [
+                    {
+                        expand: true,
+                        cwd: '<%= targetDir %>/js/',
+                        src: ['**/*.js'],
+                        dest: '<%= targetDir %>/js/'
+                    }
+                ]
             }
         },
 
@@ -193,4 +170,4 @@ module.exports = function (grunt) {
 
     // register a "production" task that sets everything up before deployment
     grunt.registerTask('production', ['copy:assets', 'jshint', 'requirejs', 'uglify', 'compass:dist', 'clean:sass']);
-};
\ No newline at end of file
+};

From 30608e9edae439bc711f4a273263128173b00959 Mon Sep 17 00:00:00 2001
From: paschdan <daniel.paschke@wirkaufens.de>
Date: Sat, 15 Feb 2014 17:15:41 +0100
Subject: [PATCH 05/12] using external compass config

---
 Gruntfile.js |  6 ++----
 config.rb    | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 config.rb

diff --git a/Gruntfile.js b/Gruntfile.js
index 3a1f2e2..60e77a7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -115,8 +115,7 @@ module.exports = function (grunt) {
             // the "production" build subtask (grunt compass:dist)
             dist: {
                 options: {
-                    sassDir: '<%= targetDir %>/sass',
-                    cssDir: '<%= targetDir %>/css',
+                    config: '<%= srcDir %>/../config.rb',
                     environment: 'production',
                     outputStyle: 'compressed'
                 }
@@ -124,8 +123,7 @@ module.exports = function (grunt) {
             // the "development" build subtask (grunt compass:dev)
             dev: {
                 options: {
-                    sassDir: '<%= targetDir %>/sass',
-                    cssDir: '<%= targetDir %>/css',
+                    config: '<%= srcDir %>/../config.rb',
                     outputStyle: 'expanded'
                 }
             }
diff --git a/config.rb b/config.rb
new file mode 100644
index 0000000..bfdaa6f
--- /dev/null
+++ b/config.rb
@@ -0,0 +1,25 @@
+# Require any additional compass plugins here.
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "web/assets/css"
+# note i am using the source directory here, not the web directory
+sass_dir = "assets/sass"
+images_dir = "web/assets/img"
+javascripts_dir = "assets/js"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+#relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

From 8ca5d98236b18ea577ea6d157bfd445a8729bf3b Mon Sep 17 00:00:00 2001
From: paschdan <daniel.paschke@wirkaufens.de>
Date: Sat, 15 Feb 2014 17:21:37 +0100
Subject: [PATCH 06/12] removing sass folder from copy, as copying the sass
 files to the right css folder is handled by the config.rb now

removing web/sass folder from clean, as this one is not copied anymore.
---
 Gruntfile.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 60e77a7..841c4ee 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,7 +13,7 @@ module.exports = function (grunt) {
         copy: {
             main: {
                 files: [
-                    {expand: true, src: ['<%= srcDir %>/**'], dest: '<%= webDir %>'}
+                    {expand: true, src: ['<%= srcDir %>/**', '!<%= srcDir %>/sass/**'], dest: '<%= webDir %>'}
                 ]
             }
         },
@@ -21,9 +21,6 @@ module.exports = function (grunt) {
         clean: {
             build: {
                 src: ['<%= targetDir %>/**']
-            },
-            sass: {
-                src: ['<%= targetDir %>/sass']
             }
         },
 

From 714acf4f1d61435bca1b9536f06c236bfb431ead Mon Sep 17 00:00:00 2001
From: paschdan <daniel.paschke@wirkaufens.de>
Date: Sat, 15 Feb 2014 17:41:11 +0100
Subject: [PATCH 07/12] moving bootstrap lib path to config.rb using import
 "bootstrap" in layout.scss

---
 assets/sass/layout.scss | 2 +-
 config.rb               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/sass/layout.scss b/assets/sass/layout.scss
index f155efe..c132c70 100644
--- a/assets/sass/layout.scss
+++ b/assets/sass/layout.scss
@@ -3,7 +3,7 @@
  */
 
 @import "base";
-@import "../vendor/sass-bootstrap/lib/bootstrap";
+@import "bootstrap";
 @import "event";
 @import "events";
 
diff --git a/config.rb b/config.rb
index bfdaa6f..d7d7f29 100644
--- a/config.rb
+++ b/config.rb
@@ -1,4 +1,5 @@
 # Require any additional compass plugins here.
+add_import_path "assets/vendor/sass-bootstrap/lib/"
 
 # Set this to the root of your project when deployed:
 http_path = "/"

From b91d4acbae5b531a1e7c1936add869bf37d18141 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Sun, 9 Mar 2014 17:59:55 -0500
Subject: [PATCH 08/12] Renaming variables in Gruntfile to be more expressive

---
 Gruntfile.js | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 841c4ee..21c5c18 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,21 +6,29 @@ module.exports = function (grunt) {
         pkg: grunt.file.readJSON('package.json'),
 
         // setup some variables that we'll use below
-        srcDir: 'assets',
+        rootAssetsDir: 'assets',
         webDir: 'web',
-        targetDir: '<%= webDir %>/<%= srcDir %>',
+        targetAssetsDir: '<%= webDir %>/assets',
 
         copy: {
             main: {
                 files: [
-                    {expand: true, src: ['<%= srcDir %>/**', '!<%= srcDir %>/sass/**'], dest: '<%= webDir %>'}
+                    // copy /assets to /web/assets (but don't copy the SASS source files, not needed!)
+                    {
+                        expand: true,
+                        src: [
+                            '<%= rootAssetsDir %>/**',
+                            '!<%= rootAssetsDir %>/sass/**'
+                        ],
+                        dest: '<%= webDir %>'
+                    }
                 ]
             }
         },
 
         clean: {
             build: {
-                src: ['<%= targetDir %>/**']
+                src: ['<%= targetAssetsDir %>/**']
             }
         },
 
@@ -30,10 +38,10 @@ module.exports = function (grunt) {
             // files or configuration
             main: {
                 options: {
-                    mainConfigFile: '<%= targetDir %>/js/common.js',
-                    appDir: '<%= srcDir %>',
+                    mainConfigFile: '<%= targetAssetsDir %>/js/common.js',
+                    appDir: '<%= rootAssetsDir %>',
                     baseUrl: './js',
-                    dir: '<%= targetDir %>',
+                    dir: '<%= targetAssetsDir %>',
                     // will be taken care of with compass
                     optimizeCss: "none",
                     // will be taken care of with an uglify task directly
@@ -88,9 +96,9 @@ module.exports = function (grunt) {
                 files: [
                     {
                         expand: true,
-                        cwd: '<%= targetDir %>/js/',
+                        cwd: '<%= targetAssetsDir %>/js/',
                         src: ['**/*.js'],
-                        dest: '<%= targetDir %>/js/'
+                        dest: '<%= targetAssetsDir %>/js/'
                     }
                 ]
             }
@@ -103,7 +111,7 @@ module.exports = function (grunt) {
             },
             all: [
                 'Gruntfile.js',
-                '<%= targetDir %>/js/{,*/}*.js'
+                '<%= targetAssetsDir %>/js/{,*/}*.js'
             ]
         },
 
@@ -112,7 +120,8 @@ module.exports = function (grunt) {
             // the "production" build subtask (grunt compass:dist)
             dist: {
                 options: {
-                    config: '<%= srcDir %>/../config.rb',
+                    // SASS and CSS paths are defined in the config
+                    config: '<%= rootAssetsDir %>/../config.rb',
                     environment: 'production',
                     outputStyle: 'compressed'
                 }
@@ -120,7 +129,8 @@ module.exports = function (grunt) {
             // the "development" build subtask (grunt compass:dev)
             dev: {
                 options: {
-                    config: '<%= srcDir %>/../config.rb',
+                    // SASS and CSS paths are defined in the config
+                    config: '<%= rootAssetsDir %>/../config.rb',
                     outputStyle: 'expanded'
                 }
             }
@@ -130,7 +140,7 @@ module.exports = function (grunt) {
         watch: {
             // watch all JS files and run jshint
             scripts: {
-                files: ['<%= srcDir %>/js/**'],
+                files: ['<%= rootAssetsDir %>/js/**'],
                 tasks: ['copy', 'jshint'],
                 options: {
                     spawn: false
@@ -138,7 +148,7 @@ module.exports = function (grunt) {
             },
             // watch all .scss files and run compass
             compass: {
-                files: '<%= srcDir %>/sass/*.scss',
+                files: '<%= rootAssetsDir %>/sass/*.scss',
                 tasks: ['copy', 'compass:dev'],
                 options: {
                     spawn: false

From 82c6cbabe1905ec2f6635eee1e4803dbfca55b01 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Sun, 9 Mar 2014 18:00:13 -0500
Subject: [PATCH 09/12] Removing a few left-over clean:sass

---
 Gruntfile.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 21c5c18..6fdbcbc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -171,8 +171,8 @@ module.exports = function (grunt) {
     grunt.registerTask('copy:assets', ['clean:build', 'copy']);
 
     // the "default" task (e.g. simply "Grunt") runs tasks for development
-    grunt.registerTask('default', ['copy:assets', 'jshint', 'compass:dev', 'clean:sass']);
+    grunt.registerTask('default', ['copy:assets', 'jshint', 'compass:dev']);
 
     // register a "production" task that sets everything up before deployment
-    grunt.registerTask('production', ['copy:assets', 'jshint', 'requirejs', 'uglify', 'compass:dist', 'clean:sass']);
-};
+    grunt.registerTask('production', ['copy:assets', 'jshint', 'requirejs', 'uglify', 'compass:dist']);
+};
\ No newline at end of file

From 0ba06ca95d4251aad4ca6f1b31620adbe5308240 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Sun, 9 Mar 2014 18:00:45 -0500
Subject: [PATCH 10/12] Removing the added import for simplicity

This makes the layout.scss file easier to understand in my opinion. And the added import path
didn't really make our life much easier
---
 assets/sass/layout.scss | 2 +-
 config.rb               | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/assets/sass/layout.scss b/assets/sass/layout.scss
index c132c70..f155efe 100644
--- a/assets/sass/layout.scss
+++ b/assets/sass/layout.scss
@@ -3,7 +3,7 @@
  */
 
 @import "base";
-@import "bootstrap";
+@import "../vendor/sass-bootstrap/lib/bootstrap";
 @import "event";
 @import "events";
 
diff --git a/config.rb b/config.rb
index d7d7f29..e57620a 100644
--- a/config.rb
+++ b/config.rb
@@ -1,5 +1,4 @@
-# Require any additional compass plugins here.
-add_import_path "assets/vendor/sass-bootstrap/lib/"
+# Compass configuration file! See: http://compass-style.org/help/tutorials/configuration-reference/
 
 # Set this to the root of your project when deployed:
 http_path = "/"

From dc8d85de764b81d6a064e1d98941cca1bac0169b Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Sun, 9 Mar 2014 18:01:16 -0500
Subject: [PATCH 11/12] Simplifying, updating and adding documentation to the
 config.rb file

---
 config.rb | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/config.rb b/config.rb
index e57620a..92f65a5 100644
--- a/config.rb
+++ b/config.rb
@@ -1,12 +1,20 @@
 # Compass configuration file! See: http://compass-style.org/help/tutorials/configuration-reference/
 
-# Set this to the root of your project when deployed:
-http_path = "/"
+# Target directory where the CSS files will be built
 css_dir = "web/assets/css"
-# note i am using the source directory here, not the web directory
+
+# Source directory of the sass files
+# Notice this is *not* in web - we're not copying these files to web, because
+# we don't need to (we can just tell Compass to look here)
 sass_dir = "assets/sass"
-images_dir = "web/assets/img"
-javascripts_dir = "assets/js"
+
+
+# The following things we don't care about as much, but here you go :)
+
+# Used with the image-url helper
+images_dir = "web/assets/images"
+# For its purpose, see https://groups.google.com/forum/#!topic/compass-users/rjAntZ8RZgs
+javascripts_dir = "web/assets/js"
 
 # You can select your preferred output style here (can be overridden via the command line):
 # output_style = :expanded or :nested or :compact or :compressed

From 1473746cf4dd23648548a7ed5d471a829baf1152 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Sun, 9 Mar 2014 18:03:19 -0500
Subject: [PATCH 12/12] Moving the Compass configuration file

---
 Gruntfile.js                          | 11 +++++++----
 config.rb => assets/config/compass.rb |  0
 2 files changed, 7 insertions(+), 4 deletions(-)
 rename config.rb => assets/config/compass.rb (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index 6fdbcbc..018008e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,12 +13,15 @@ module.exports = function (grunt) {
         copy: {
             main: {
                 files: [
-                    // copy /assets to /web/assets (but don't copy the SASS source files, not needed!)
                     {
                         expand: true,
                         src: [
+                            // copy /assets to /web/assets
                             '<%= rootAssetsDir %>/**',
-                            '!<%= rootAssetsDir %>/sass/**'
+                            // but don't copy the SASS source files, not needed!
+                            '!<%= rootAssetsDir %>/sass/**',
+                            // and don't copy the config directory
+                            '!<%= rootAssetsDir %>/config/**'
                         ],
                         dest: '<%= webDir %>'
                     }
@@ -121,7 +124,7 @@ module.exports = function (grunt) {
             dist: {
                 options: {
                     // SASS and CSS paths are defined in the config
-                    config: '<%= rootAssetsDir %>/../config.rb',
+                    config: '<%= rootAssetsDir %>/config/compass.rb',
                     environment: 'production',
                     outputStyle: 'compressed'
                 }
@@ -130,7 +133,7 @@ module.exports = function (grunt) {
             dev: {
                 options: {
                     // SASS and CSS paths are defined in the config
-                    config: '<%= rootAssetsDir %>/../config.rb',
+                    config: '<%= rootAssetsDir %>/config/compass.rb',
                     outputStyle: 'expanded'
                 }
             }
diff --git a/config.rb b/assets/config/compass.rb
similarity index 100%
rename from config.rb
rename to assets/config/compass.rb