diff --git a/Gruntfile.js b/Gruntfile.js index 358fcf9..a8aa855 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,37 +18,19 @@ module.exports = function(grunt) { } }, - concat: { - options: { - stripBanners: true - }, - dist: { - src: ['src/html/header.html', 'src/html/*.html', '!src/html/footer.html', 'src/html/footer.html'], - dest: 'index.html' - } - }, - - //uglify: { - //options: {}, - //dist: { - //src: '<%= concat.dist.dest %>', - //dest: 'dist/<%= pkg.name %>.min.js' - //} - //}, - watch: { - files: ['src/**/*'], - tasks: ['concat', 'sass'], + files: ['src/scss/**/*.scss'], + tasks: ['sass'], } }); // These plugins provide necessary tasks. - grunt.loadNpmTasks('grunt-contrib-concat'); + //grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-sass'); //grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-watch'); // Default task. - grunt.registerTask('default', ['concat', 'sass']); + grunt.registerTask('default', ['sass']); }; diff --git a/src/html/header.html b/index.php similarity index 52% rename from src/html/header.html rename to index.php index c98523b..c046cf8 100644 --- a/src/html/header.html +++ b/index.php @@ -24,3 +24,24 @@ +
+
+ + +
+ + + + + + +
+
+
+ + + + + diff --git a/src/html/calendar.html b/src/html/calendar.html new file mode 100644 index 0000000..a5cfd4d --- /dev/null +++ b/src/html/calendar.html @@ -0,0 +1,4 @@ + diff --git a/src/html/drive.html b/src/html/drive.html new file mode 100644 index 0000000..efcbb4b --- /dev/null +++ b/src/html/drive.html @@ -0,0 +1,3 @@ + diff --git a/src/html/footer.html b/src/html/footer.html deleted file mode 100644 index b605728..0000000 --- a/src/html/footer.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/html/groups.html b/src/html/groups.html new file mode 100644 index 0000000..d5c2741 --- /dev/null +++ b/src/html/groups.html @@ -0,0 +1,6 @@ + diff --git a/src/html/home.html b/src/html/home.html new file mode 100644 index 0000000..14c027a --- /dev/null +++ b/src/html/home.html @@ -0,0 +1,5 @@ + diff --git a/src/html/index.html b/src/html/index.html deleted file mode 100644 index 39176c9..0000000 --- a/src/html/index.html +++ /dev/null @@ -1,146 +0,0 @@ -
-
- - -
- - - Membres - Projets - Groupes - Agenda - Drive - - -
- -
- - - - - - - - - - - - - - - - - -
-
-
- - - diff --git a/src/html/members.html b/src/html/members.html new file mode 100644 index 0000000..b9364d7 --- /dev/null +++ b/src/html/members.html @@ -0,0 +1,29 @@ + diff --git a/src/html/menu.html b/src/html/menu.html new file mode 100644 index 0000000..2a7f4ea --- /dev/null +++ b/src/html/menu.html @@ -0,0 +1,11 @@ +
+ + + Membres + Projets + Groupes + Agenda + Drive + + +
diff --git a/src/html/projects.html b/src/html/projects.html new file mode 100644 index 0000000..9f302e9 --- /dev/null +++ b/src/html/projects.html @@ -0,0 +1,64 @@ + +