Add bootstrap and some features to the agenda

gnkam · Dec 31, 2013 · 8eb3de3 · 8eb3de3
1 parent 45b5865
commit 8eb3de3
Show file tree

Hide file tree

Showing 24 changed files with 1,470 additions and 183 deletions.
diff --git a/COPYING.txt b/COPYING.txt
diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# Emploi du temps Université de savoie
+# Agenda de l'Université de savoie
 
-Ce projet a pour but de proposer des webservices pour récupérer l'emploi du temps de l'Université de Savoie.
+Ce projet a pour but de proposer des webservices pour récupérer l'emploi du temps de l'Université de Savoie et s'orienter vers d'autres universités.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -19,6 +19,7 @@ public function registerBundles()
             new Univ\Savoie\EdtBundle\UnivSavoieEdtBundle(),
             new Crous\Grenoble\MenuBundle\CrousGrenobleMenuBundle(),
             new Etudiant\AgendaBundle\EtudiantAgendaBundle(),
+            new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -2,12 +2,34 @@
 <html>
     <head>
         <meta charset="UTF-8" />
-        <title>{% block title %}Welcome!{% endblock %}</title>
-        {% block stylesheets %}{% endblock %}
+        <title>{% block title %}Agenda Étudiant{% endblock %}</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        {% block stylesheets %}
+        <!-- Latest compiled and minified CSS -->
+		<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
+
+		<!-- Optional theme -->
+		<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css">
+		<!-- Base theme -->
+		<link rel="stylesheet" href="{{ asset('stylesheets/base.css') }}">
+        {% endblock %}
         <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
     </head>
     <body>
+		<div id="waiting"></div>
         {% block body %}{% endblock %}
-        {% block javascripts %}{% endblock %}
+        <div class="container">
+			<footer>
+				Ce site est sous licence libre AGPL V3.0, <a title="à propos" href="{{ path('agenda_about') }}" role="button">en savoir plus</a>. <span class="label label-primary">Version bêta</span>
+			</footer>
+        </div>
+        {% block javascripts %}
+        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+        <!-- Latest compiled and minified JavaScript -->
+		<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
+		<script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
+		<script src="{{ path('fos_js_routing_js', {"callback": "fos.Router.setData"}) }}"></script>
+        <script src="{{ asset('javascripts/base.js') }}"></script>
+        {% endblock %}
     </body>
 </html>
diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -13,3 +13,5 @@ univ_savoie_edt:
     type:     annotation
     prefix:   /
 
+fos_js_routing:
+    resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "symfony/framework-standard-edition",
-    "license": "MIT",
+    "name": "gnkam/agenda-etudiant",
+    "license": "AGPL-3.0",
     "type": "project",
-    "description": "The \"Symfony Standard Edition\" distribution",
+    "description": "Agenda pour les étudiants",
     "autoload": {
         "psr-0": { "": "src/" }
     },
@@ -23,7 +23,8 @@
         "gnkam/univ-savoie-menu": "*@dev",
         "gnkam/base": "*@dev",
         "gnkw/symfony": "2.*",
-        "sabre/vobject": "3.*"
+        "sabre/vobject": "3.*",
+        "friendsofsymfony/jsrouting-bundle": "@stable"
     },
     "scripts": {
         "post-install-cmd": [

diff --git a/src/Crous/Grenoble/MenuBundle/Controller/ApiController.php b/src/Crous/Grenoble/MenuBundle/Controller/ApiController.php
@@ -1,4 +1,22 @@
 <?php
+/*
+* Copyright (c) 2013 GNKW & Kamsoft.fr
+*
+* This file is part of GNKam Agenda Etudiant.
+*
+* GNKam Agenda Etudiant is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* GNKam Agenda Etudiant is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with GNKam Agenda Etudiant.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 namespace Crous\Grenoble\MenuBundle\Controller;
 

diff --git a/src/Crous/Grenoble/MenuBundle/Controller/IcsController.php b/src/Crous/Grenoble/MenuBundle/Controller/IcsController.php
@@ -1,4 +1,22 @@
 <?php
+/*
+* Copyright (c) 2013 GNKW & Kamsoft.fr
+*
+* This file is part of GNKam Agenda Etudiant.
+*
+* GNKam Agenda Etudiant is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* GNKam Agenda Etudiant is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with GNKam Agenda Etudiant.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 namespace Crous\Grenoble\MenuBundle\Controller;
 

diff --git a/src/Crous/Grenoble/MenuBundle/CrousGrenobleMenuBundle.php b/src/Crous/Grenoble/MenuBundle/CrousGrenobleMenuBundle.php
@@ -1,4 +1,22 @@
 <?php
+/*
+* Copyright (c) 2013 GNKW & Kamsoft.fr
+*
+* This file is part of GNKam Agenda Etudiant.
+*
+* GNKam Agenda Etudiant is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* GNKam Agenda Etudiant is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with GNKam Agenda Etudiant.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 namespace Crous\Grenoble\MenuBundle;
 

diff --git a/src/Etudiant/AgendaBundle/Controller/DefaultController.php b/src/Etudiant/AgendaBundle/Controller/DefaultController.php
@@ -1,4 +1,22 @@
 <?php
+/*
+* Copyright (c) 2013 GNKW & Kamsoft.fr
+*
+* This file is part of GNKam Agenda Etudiant.
+*
+* GNKam Agenda Etudiant is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* GNKam Agenda Etudiant is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with GNKam Agenda Etudiant.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 namespace Etudiant\AgendaBundle\Controller;
 
@@ -18,6 +36,22 @@ public function indexAction()
 		return array();
     }
 
+    /**
+     * @Template()
+     * @param string $active active entry in menu (optional)
+     */
+    public function menuAction($active = null, $button = '')
+    {
+		$menus = array(
+			'agenda_index' => 'Accueil',
+			'agenda_edt' => 'Emploi du temps',
+			'agenda_support' => 'Support',
+			'agenda_about' => 'À propos',
+			'agenda_api' => 'Api'
+		);
+		return array('active' => $active, 'menus' => $menus, 'button' => $button);
+    }
+
     /**
      * @Route("/edt", name="agenda_edt")
      * @Template()
@@ -26,4 +60,31 @@ public function edtAction()
     {
         return array();
     }
+
+    /**
+     * @Route("/support", name="agenda_support")
+     * @Template()
+     */
+    public function supportAction()
+    {
+        return array();
+    }
+
+    /**
+     * @Route("/about", name="agenda_about")
+     * @Template()
+     */
+    public function aboutAction()
+    {
+        return array();
+    }
+
+    /**
+     * @Route("/api", name="agenda_api")
+     * @Template()
+     */
+    public function apiAction()
+    {
+        return array();
+    }
 }
diff --git a/src/Etudiant/AgendaBundle/EtudiantAgendaBundle.php b/src/Etudiant/AgendaBundle/EtudiantAgendaBundle.php
@@ -1,4 +1,22 @@
 <?php
+/*
+* Copyright (c) 2013 GNKW & Kamsoft.fr
+*
+* This file is part of GNKam Agenda Etudiant.
+*
+* GNKam Agenda Etudiant is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* GNKam Agenda Etudiant is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with GNKam Agenda Etudiant.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 namespace Etudiant\AgendaBundle;