diff --git a/frontend/Gruntfile.js b/frontend/Gruntfile.js index b8244a2..2cebbca 100644 --- a/frontend/Gruntfile.js +++ b/frontend/Gruntfile.js @@ -70,9 +70,9 @@ module.exports = function (grunt) { // The actual grunt server settings connect: { options: { - port: 9000, + port: 8081, // Change this to '0.0.0.0' to access the server from outside. - hostname: 'localhost', + hostname: '0.0.0.0', livereload: 35729 }, livereload: { diff --git a/frontend/app/index.html b/frontend/app/index.html index 509f26b..f2a7302 100644 --- a/frontend/app/index.html +++ b/frontend/app/index.html @@ -53,6 +53,7 @@ + diff --git a/frontend/app/scripts/app.js b/frontend/app/scripts/app.js index a62f5f9..70ad11e 100755 --- a/frontend/app/scripts/app.js +++ b/frontend/app/scripts/app.js @@ -36,5 +36,11 @@ app.config(function ($stateProvider, $urlRouterProvider) { url: '/espace-etudiant', templateUrl: 'views/studentSpace.html', controller: 'StudentSpaceCtrl' + }) + + .state('responsableFormationSpace', { + url: '/espace-formation', + templateUrl: 'views/responsableFormationSpace.html', + controller: 'ResponsableFormationSpaceCtrl' }); }); \ No newline at end of file diff --git a/frontend/app/styles/main.css b/frontend/app/styles/main.css index dfbcc8f..b4e0e9b 100644 --- a/frontend/app/styles/main.css +++ b/frontend/app/styles/main.css @@ -34,4 +34,44 @@ body > ui-view > div > div.bg-booklet.layout-align-center-center.layout-row.flex .p-home { font-size: 0.6em; +} + +/* ajout sitan */ + +md-tab-data{ + opacity: 1; + display: table; + right: 0; + left: initial; + z-index: 20; +} + +.demo-tab div.principaux_formation { + padding: 5px; + margin: 7px; + border-bottom: 3px solid grey; +} + +.div_periodes { + background-color: teal; padding: 5px; border: 2px solid green;margin:7px;min-height: 50px; +} + +.principaux_formation > div { + background-color: snow; + +} + +.principaux_formation form { + background-color: snow; + /* margin-top: 8px; */ + margin: 8px; + padding: 10px; + min-height: 50px; + border: 1px solid black; +} + +.div_studentsList { + padding: 8px; + /* border: 1px solid; */ + background-color: yellowgreen; } \ No newline at end of file diff --git a/frontend/app/views/studentSpace.html b/frontend/app/views/studentSpace.html index 099911a..b3c3933 100755 --- a/frontend/app/views/studentSpace.html +++ b/frontend/app/views/studentSpace.html @@ -13,73 +13,37 @@
- -
- Exporter le livret -
- - - - -

Période {{period.number}}

-
-
- - - -
-
-

- Université - - - -

- - -

Lorem ipsum dolor sit amet, ne quod novum mei. Sea omnium invenire mediocrem at, in lobortis conclusionemque - nam. Ne deleniti appetere reprimique pro, inani labitur disputationi te sed. At vix sale omnesque, id pro - labitur reformidans accommodare, cum labores honestatis eu. Nec quem lucilius in, eam praesent reformidans - no. Sed laudem aliquam ne.


- - - - - - -
- Enregistrer -
-
-
- -
-

- Entreprise - - - -

- - -

Lorem ipsum dolor sit amet, ne quod novum mei. Sea omnium invenire mediocrem at, in lobortis conclusionemque - nam. Ne deleniti appetere reprimique pro, inani labitur disputationi te sed. At vix sale omnesque, id pro - labitur reformidans accommodare, cum labores honestatis eu. Nec quem lucilius in, eam praesent reformidans - no. Sed laudem aliquam ne.

- - - - - - -
- Enregistrer -
-
-
+
+ + + +
+
+
+ Remove Tab
- - - +
+
+ +
+
+
+

Add a new Tab:

+
+ + + + + + + + + Add Tab +
+
+ +
\ No newline at end of file