Skip to content

GitLab

Txuleton
Txuleton
Commit c0b69dc9 authored by Patrick Etcheverry's avatar Patrick Etcheverry
Browse files
Options

Ergonomie

parent 9da1c86c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 807 additions and 550 deletions
app/AppKernel.php
View file @ c0b69dc9
......@@ -16,6 +16,7 @@ class AppKernel extends Kernel
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
new WhiteOctober\BreadcrumbsBundle\WhiteOctoberBreadcrumbsBundle(),
new ScenarioBundle\ScenarioBundle(),
new UserBundle\UserBundle(),
new ScenarisationProcessBundle\ScenarisationProcessBundle(),
......
app/Resources/translations/messages.en.yml
View file @ c0b69dc9
save: "Save"
information: "Information"
help: "Help"
about: "About"
scenarisation: "Storyboarding"
sequenceQuestion: "Sequence Question"
sessionQuestion: "Session Question"
generalQuestion: "General Question"
scenarisationStage: "Scenarisation stage"
scenarisationProcess: "Scenarisation process"
scenarisationStage: "Scenarisation stages"
scenarisationProcess: "Scenarisation processes"
question : "Question"
enWording: "English wording"
......@@ -18,10 +24,10 @@ position: "Position"
referentLecturer: "Referent Teacher"
project: "Project"
formation: "Formation"
trainingCourses: "Training courses"
user: "User"
pedagogicalScenario: "Pedagogical Scenario"
user: "Users"
pedagogicalScenario: "Pedagogical scenarios"
add: "Add"
create: "Create"
......@@ -29,7 +35,7 @@ delete: "Delete"
backToList: "Back to the list"
show: "Show"
edit: "Edit"
deconnexion: "Log out"
signout: "Sign out"
shortname: "Shortname"
fullname: "Fullname"
......@@ -42,28 +48,29 @@ es: "Spanish"
lastname: "Lastname"
firstname: "Firstname"
plateformLanguage: "Platform Language"
plateformLanguage: "Default language"
email: "Email"
role: "Role"
actions: "Actions"
parameters: "Settings"
scenarios: "Scenarios"
menu:
scenariopedagogique: "Pedagogical Scenarios"
projets: "Projects"
formations: "Formations"
utilisateurs: "Users"
parametres: "Settings"
scenarisation: "Scenarisation"
scenarisationProcess: "Scenarisation Process"
scenarisationStages: "Scenarisation Stages"
questions: "Questions"
scenariosAndUsers: "Scenarios & Users"
scenarisationProcess: "Scenarisation Process"
pageLogin:
connectezVous: "Log in"
connectezVous: "Sign in"
placeholder:
email: "Email"
mdp: "Password"
seSouvenirDeMoi: "Remember me"
connexion: "Log in"
connexion: "Sign in"
appDescription: 'Design and export of pedagogical scenarios'
footer: "Txuleton platform is hosted by "
app/Resources/translations/messages.es.yml
View file @ c0b69dc9
sequenceQuestion: ""
sessionQuestion: ""
generalQuestion: ""
save: "ENREGISTRER"
information: "Informaciones"
help: "Ayuda"
about: "Acerca de"
scenarisationStage: ""
scenarisationProcess: ""
scenarisation: "Escenarización"
sequenceQuestion: "Pregunta secuencia"
sessionQuestion: "Pregunta sesión"
generalQuestion: "Pregunta general"
scenarisationStage: "Etapas de escenarización"
scenarisationProcess: "Procesos de escenarización"
question: "Pregunta"
enWording: ""
esWording: ""
frWording: ""
enWording: "Formulación en inglés"
esWording: "Formulación en español"
frWording: "Formulación en francés"
(none): ""
goals: ""
title: ""
description: ""
position: "Position"
(none): "(Vacío)"
goals: "Objectivos"
title: "Título"
description: "Descripción"
position: "Posición"
referentTeacher: ""
project: ""
formation: ""
referentTeacher: "Profesor referente"
project: "Proyecto"
trainingCourses: "Formaciones"
user: ""
pedagogicalScenario: ""
user: "Usuarios"
pedagogicalScenario: "Escenarios pedagógicos"
add: ""
create: ""
delete: ""
backToList: ""
show: "Show"
edit: "Edit"
deconnexion: "Cerrar sesión"
shortname: "Shortname"
fullname: "Fullname"
add: "Añadir"
create: "Crear"
delete: "Suprimir"
backToList: "Vuelta a la lista"
show: "Ver"
edit: "Editar"
signout: "Desconectarse"
shortname: "Nombre breve"
fullname: "Nombre completo"
ROLE_PEDAGOGICAL_ENGINEER: "Ingenior pedagogico"
ROLE_PEDAGOGICAL_ENGINEER: "Ingeniero pedagógico"
ROLE_TEACHER: "Profesor"
fr: "Frances"
en: "Ingles"
fr: "Francés"
en: "Inglés"
es: "Español"
lastname: "Lastname"
firstname: "Firstname"
plateformLanguage: "Platform Language"
lastname: "Apellido"
firstname: "Nombre"
plateformLanguage: "Idioma predeterminado"
email: "Email"
role: "Role"
actions: "Actions"
actions: "Acciones"
parameters: "Parámetros"
scenarios: "Escenarios"
menu:
scenariopedagogique: "escenario pedagogicos"
projets: "Proyectos"
formations: ""
utilisateurs: "Utilizadores"
parametres: "Configuraciones"
scenarisation: ""
scenarisationProcess: "Scenarisation Processus"
scenarisationStages: "Etapes de scenarisation"
questions: "Preguntas"
scenariosAndUsers: ""
scenarisationProcess: ""
pageLogin:
connectezVous: "Connectez vous"
connectezVous: "Conectarse"
placeholder:
email: "Adresse de courriel"
mdp: "Mot de passe"
seSouvenirDeMoi: "Se souvenir de moi"
connexion: "Connexion"
email: "Email"
mdp: "Contraseña"
seSouvenirDeMoi: "Acordarse de mi"
connexion: "Conección"
appDescription: 'Diseño y exportación de escenarios pedagógicos'
footer: "La plataforma Txuleton está albergada por la "
app/Resources/translations/messages.fr.yml
View file @ c0b69dc9
save: "Enregistrer"
information: "Informations"
help: "Aide"
about: "À propos"
scenarisation: "Scénarisation"
sequenceQuestion: "Question Séquence"
sessionQuestion: "Question Séance"
generalQuestion: "Question Générale"
scenarisationStage: "Etape de scénarisation"
scenarisationProcess: "Démarche de scénarisation"
scenarisationStage: "Etapes de scénarisation"
scenarisationProcess: "Démarches de scénarisation"
question: "Question"
enWording: "Libellé anglais"
......@@ -18,18 +24,18 @@ position: "Position"
referentTeacher: "Enseignant Référent"
project: "Projet"
formation: "Formation"
trainingCourses: "Formations"
user: "Utilisateur"
pedagogicalScenario: "Scénario Pédagogique"
user: "Utilisateurs"
pedagogicalScenario: "Scénarios pédagogiques"
add: "Ajouter"
create: "Créer"
delete: "Supprimer"
backToList: "Retour à la liste"
show: "Consulter"
show: "Voir"
edit: "Editer"
deconnexion: "Se déconnecter"
signout: "Se déconnecter"
shortname: "Nom court"
fullname: "Nom complet"
......@@ -42,28 +48,29 @@ es: "Espagnol"
lastname: "Nom"
firstname: "Prénom"
plateformLanguage: "Langue Plateforme"
plateformLanguage: "Langue par défaut"
email: "Adresse de courriel"
role: "Rôle"
actions: "Actions"
parameters: "Paramètres"
scenarios: "Scénarios"
menu:
scenariopedagogique: "Scénarios Pédagogiques"
projets: "Projets"
formations: "Formations"
utilisateurs: "Utilisateurs"
parametres: "Paramètres"
scenarisation: "Scénarisation"
scenarisationProcess: "Démarches de scénarisation"
scenarisationStages: "Etapes de scénarisation"
questions: "Questions"
scenariosAndUsers: "Scénarios & Utilisateurs"
scenarisationProcess: "Démarche de scénarisation"
pageLogin:
connectezVous: "Connectez vous"
connectezVous: "S'identifier"
placeholder:
email: "Adresse de courriel"
mdp: "Mot de passe"
seSouvenirDeMoi: "Se souvenir de moi"
connexion: "Connexion"
appDescription: 'Conception et exportation de scénarios pédagogiques'
footer: "La plateforme Txuleton est hébergée par l'"
app/Resources/views/base.html.twig
View file @ c0b69dc9
{# app/Resources/views/base.html.twig #}
{% set appName = "Txuleton" %}
{# On regarde le rôle de l'utilisateur courant et on l'enregistre dans une variable qui sera globale aux autres vues #}
{% if is_granted('ROLE_PEDAGOGICAL_ENGINEER') %}
{% set currentRole = "pedagogical-engineer" %}
......@@ -10,8 +11,8 @@
{% set currentRole = null %}
{% endif %}
{% set currentLanguage = app.request.locale %}
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
......@@ -22,9 +23,11 @@
{% block stylesheets %}
<link rel="stylesheet" href="{{ asset('css/font-awesome.min.css')}}" type="text/css">
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css')}}" type="text/css">
<link rel="stylesheet" href="{{ asset('css/general.css')}}" type="text/css">
{% endblock %}
{% block others_stylesheets %}{% endblock %}
{% block others_stylesheets %}
{% endblock %}
{% block javascripts %}
<script type="text/javascript" src="{{ asset('js/jquery-3.2.1.min.js') }}"></script>
......@@ -40,11 +43,26 @@
{# Zone haute #}
<div class="col-md-12" style="background: #eeeeee;">
<div class="page-header">
<h1 class="text-center">Plateforme de conception d'enseignement</h1>
<h1 class="text-center">{{appName}}<br/>
<small>{{'appDescription'|trans}}</small>
</h1>
<p style="text-align : right;">
{# Gestion de la locale #}
{% if (currentLanguage == 'fr') %}
<u>Français</u>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'es'})) }}">Español</a>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'en'})) }}">English</a>
{% elseif currentLanguage == 'en' %}
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'fr'})) }}">Français</a>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'es'})) }}">Español</a>
<u>English</u>
{% else %}
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'fr'})) }}">Français</a>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'es'})) }}">Español</a>
<u>Español</u>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'en'})) }}">English</a>
{% endif %}
</p>
</div>
</div>
......@@ -52,50 +70,37 @@
<div class="row" style="padding-top : 15px;">
{# Zone gauche #}
<div class="col-md-3">
<div class="col-md-2">
{% block menu %}
{{ include("::menu.html.twig") }}
{% endblock %}
</div>
{# Zone centrale #}
{# Navbar #}
<div class="col-md-9">
<div class="col-md-10">
<nav class="navbar navbar-default">
<div class="container-fluid">
<ul class="nav navbar-nav">
<li class="active">
<a href="#">Home</a>
</li>
<li>
<a href="#">Page 1</a>
</li>
<li>
<p> > </p>
</li>
<li>
<a href="#">Page 2</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
{# Le fil d'ariane #}
{# knp_menu_render('breadcrumb',{'currentAsLink':true}) #}
{{ wo_render_breadcrumbs({listClass: 'breadcrumb navbar-left'}) }}
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{{ path('user_show', {'id': app.user.id}) }}">
<span class="glyphicon glyphicon-user"></span>
{{app.user.firstname}}
{{app.user.lastname}}</a>
</li>
<li>
<a href="{{ path('logout')}}">
<span class="glyphicon glyphicon-log-out"></span>
{{ 'deconnexion'|trans }}
{{ 'signout'|trans }}
</a>
</li>
</ul>
</div>
</nav>
......@@ -111,9 +116,9 @@
<footer>
<hr>
<p class="text-center">
L'application
{{ appName }}
est hébergée par l'<a href="http://www.univ-pau.fr">Université de Pau et des Pays de l'Adour</a><br/>
{{'footer'|trans}}
<a href="http://www.univ-pau.fr">Université de Pau et des Pays de l'Adour</a>
<br/>
<a href="http://liuppa.univ-pau.fr">LIUPPA</a>
-
<a href="#">T2I</a>
......
app/Resources/views/baseLogin.html.twig
View file @ c0b69dc9
......@@ -9,10 +9,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% block title %}{{ appName }}{% endblock %}</title>
{% block stylesheets %}
<link rel="stylesheet" href="{{ asset('css/general.css')}}" type="text/css">
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css')}}" type="text/css">
<link rel="stylesheet" href="{{ asset('css/style_vue_mere.css')}}" type="text/css">
<link rel="stylesheet" href="{{ asset('css/pageLogin.css')}}" type="text/css">
{% endblock %}
{% block others_stylesheets %}
......@@ -23,40 +20,57 @@
<script type="text/javascript" src="{{ asset('js/bootstrap.min.js') }}"></script>
{% endblock %}
{% block others_javascripts %}
{% endblock %}
{% block others_javascripts %}{% endblock %}
</head>
<body>
<div class="container-fluid">
<div class="row">
<div class="row" >
{# Le bandeau #}
<div class="col-md-12" style="background: #eeeeee;">
<div class="page-header">
<p class="grandTitre">
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'fr'})) }}">Français</a>
<h1 class="text-center">{{appName}}<br/>
<small>{{'appDescription'|trans}}</small>
</h1>
{# We put the current language written in black and underline #}
<p style="text-align : right;">
{% if (currentLanguage == 'fr') %}
<u>Français</u>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'es'})) }}">Español</a>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'en'})) }}">English</a>
{% elseif currentLanguage == 'en' %}
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'fr'})) }}">Français</a>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'es'})) }}">Español</a>
<u>English</u>
{% else %}
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'fr'})) }}">Français</a>
<u>Español</u>
<a href="{{ path(app.request.get('_route'),app.request.get('_route_params')|merge({'_locale':'en'})) }}">English</a>
{% endif %}
</p>
<h1 class="grandTitre">Plateforme de conception d'enseignement</h1>
</div>
</div>
</div>
<div class="row">
<div class="row" style="padding-top : 15px;">
<div class="col-md-12">
{% block body %}
{% endblock %}
</div>
</div>
</div>
<div class="row" id="piedDePage">
<div class="col-md-12">
<footer>
<hr>
<p class="text-center">
L'application {{ appName }} est hébergée par l'<a href="http://www.univ-pau.fr" >Université de Pau et des Pays de l'Adour</a><br/>
<a href="http://liuppa.univ-pau.fr">LIUPPA</a> - <a href="#">T2I</a> - <a href="#">CDA</a>
{{'footer'|trans}}
<a href="http://www.univ-pau.fr">Université de Pau et des Pays de l'Adour</a><br/>
<a href="http://liuppa.univ-pau.fr">LIUPPA</a>
-
<a href="#">T2I</a>
-
<a href="#">CDA</a>
</p>
</footer>
</div>
......
app/Resources/views/menu.html.twig
View file @ c0b69dc9
<!-- Sidebar -->
<div class="panel panel-default">
<div class="panel-heading"><strong>{{'menu.scenariosAndUsers'|trans}}</strong></div>
<div class="panel-body">
<div class="panel-heading"><strong>{{'scenarios'|trans}}</strong></div>
<div>
<ul class="list-group">
<ul class="list-group" style='margin-bottom: 0;'>
<li class="list-group-item {{app.session.get('menu').pedagogical_scenario}}">
<a href="{{ path('pedagogicalscenario_index', { 'userRole': currentRole })}}">
<span class="glyphicon glyphicon-book" style="color : black;" aria-hidden="true"></span>
{{'menu.scenariopedagogique'|trans}}
<i class="fa fa-book" aria-hidden="true"></i>
{{'pedagogicalScenario'|trans}}
</a>
</li>
......@@ -16,29 +16,29 @@
<li class="list-group-item {{app.session.get('menu').projects}}" style="text-decoration: none;">
<a href="{{ path('project_index', { 'userRole': currentRole })}}">
<i class="fa fa-briefcase" style="color : black;" aria-hidden="true"></i>
<i class="fa fa-briefcase" aria-hidden="true"></i>
{{'menu.projets'|trans}}
</a>
</li>
<li class="list-group-item {{app.session.get('menu').formation}}">
<a href="{{ path('formation_index', { 'userRole': currentRole })}}">
<i class="fa fa-graduation-cap" style="color : black;" aria-hidden="true"></i>
{{'menu.formations'|trans}}
<i class="fa fa-graduation-cap" aria-hidden="true"></i>
{{'trainingCourses'|trans}}
</a>
</li>
<li class="list-group-item {{app.session.get('menu').user}}">
<a href="{{ path('user_index')}}">
<span class="glyphicon glyphicon-user" style="color : black;" aria-hidden="true"></span>
{{'menu.utilisateurs'|trans}}
<i class="fa fa-user" aria-hidden="true"></i>
{{'user'|trans}}
</a>
</li>
<li class="list-group-item {{app.session.get('menu').parameters}}">
<a href="#">
<img src="https://maxcdn.icons8.com/iOS7/PNG/25/Very_Basic/support_filled-25.png" title="Support Filled" width="16" height="16">
{{'menu.parametres'|trans}}
<i class="fa fa-wrench" aria-hidden="true"></i>
{{'parameters'|trans}}
</a>
</li>
</ul>
......@@ -46,27 +46,27 @@
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>{{'menu.scenarisation'|trans}}</strong></div>
<div class="panel-body">
<div class="panel-heading"><strong>{{'scenarisation'|trans}}</strong></div>
<div>
<ul class="list-group">
<ul class="list-group" style='margin-bottom: 0;'>
<li class="list-group-item {{app.session.get('menu').scenarisation_process}}">
<a href="{{ path('scenarisation_process_index')}}">
<i class="fa fa-cogs" style="color : black;" aria-hidden="true"></i>
{{'menu.scenarisationProcess'|trans}}
<i class="fa fa-cogs" aria-hidden="true"></i>
{{'scenarisationProcess'|trans}}
</a>
</li>
<li class="list-group-item {{app.session.get('menu').scenarisation_stage}}">
<a href="{{ path('scenarisation_stage_index')}}">
<i class="fa fa-cog" style="color : black;" aria-hidden="true"></i>
{{'menu.scenarisationStages'|trans}}
<i class="fa fa-cog" aria-hidden="true"></i>
{{'scenarisationStage'|trans}}
</a>
</li>
<li class="list-group-item {{app.session.get('menu').question}}">
<a href="{{ path('question_index')}}">
<i class="fa fa-question" style="color : black;" aria-hidden="true"></i>
<i class="fa fa-question" aria-hidden="true"></i>
{{'menu.questions'|trans}}
</a>
</li>
......@@ -75,3 +75,26 @@
{% endif %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>{{'information'|trans}}</strong></div>
<div>
<ul class="list-group" style='margin-bottom: 0;'>
<li class="list-group-item">
<a href="#">
<i class="fa fa-info-circle" aria-hidden="true"></i>
{{'help'|trans}}
</a>
</li>
<li class="list-group-item">
<a href="#">
{{'about'|trans}}
</a>
</li>
</ul>
</div>
</div>