diff --git a/Gruntfile.coffee b/Gruntfile.coffee index e42022e..d75ff87 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -30,6 +30,22 @@ module.exports = (grunt) -> ].join('&&') + # rename JQM css files to my liking + renamecss: + command:['cd assets/css/', + 'ren jquery.mobile.min.css jquery-mobile-min.css ' + 'echo css JQM files renamed' + ].join('&&') + + + # rename JQM JS files to my liking + renamejs: + command:['cd assets/js', + 'ren jquery.mobile.min.js jquery-mobile-min.js ' + 'echo js JQM files renamed' + ].join('&&') + + # copy over our end distribution resources copy: jqmcss: @@ -85,7 +101,8 @@ module.exports = (grunt) -> connect: server: options: - port:9001 + protocol:'http' + port:8000 base:'' @@ -134,7 +151,12 @@ module.exports = (grunt) -> grunt.registerTask('build-jqm-js', ['copy:jqmjs']); + grunt.registerTask('rename-jqm-css', ['shell:renamecss']); + + grunt.registerTask('rename-jqm-js', ['shell:renamejs']); + + # Tak setups and runs the install grunt command for JQM package, setups all the assets, and then fires the watch command start coding. - grunt.registerTask('setup-jqm', ['get-jqm', 'setup-jquery', 'setup-jqm-node', 'build-jqm', 'build-jqm-css', 'build-jqm-js', 'default']); + grunt.registerTask('setup-jqm', ['get-jqm', 'setup-jquery', 'setup-jqm-node', 'build-jqm', 'build-jqm-css', 'build-jqm-js', 'rename-jqm-css', 'rename-jqm-js', 'default']); grunt.registerTask('default', ['connect', 'watch']); diff --git a/package.json b/package.json index cbc9476..4068da3 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "grunt-shell": "~0.3.1", "grunt-contrib-connect": "~0.5.0", "grunt-bake": "~0.2.1", + "connect-livereload": "~0.3.0", "grunt-contrib-less": "~0.7.0" }, "engine": "node >= 0.4.1" diff --git a/resources/custom/components/base.html b/resources/custom/components/base.html index 4772580..5d7bc1d 100644 --- a/resources/custom/components/base.html +++ b/resources/custom/components/base.html @@ -14,6 +14,7 @@ + diff --git a/resources/custom/components/page1.html b/resources/custom/components/page1.html index 507dd7e..7eab4ce 100644 --- a/resources/custom/components/page1.html +++ b/resources/custom/components/page1.html @@ -4,14 +4,14 @@
-

Foo

+

THE FIRST PAGE MY FRIEND

-

Demo output Changed

+

Changed Output - NEW

Roll content into me I rock

I'm first in the source order so I'm shown as the page.

-

View internal page called bar

+

View internal page called page3

diff --git a/resources/custom/components/page2.html b/resources/custom/components/page2.html index 8a18446..9a910a3 100644 --- a/resources/custom/components/page2.html +++ b/resources/custom/components/page2.html @@ -9,7 +9,7 @@

Foo

I'm first in the source order so I'm shown as the page.

-

View internal page called bar

+

View internal page called Page 1

diff --git a/resources/custom/components/page3.html b/resources/custom/components/page3.html index a6e0d4c..a9f175c 100644 --- a/resources/custom/components/page3.html +++ b/resources/custom/components/page3.html @@ -11,7 +11,7 @@

Foo

brandon

Roll content into me I rock

I'm first in the source order so I'm shown as the page.

-

View internal page called bar

+

View internal page called page2