Merge branch 'origin-SPRINT3_DEV_#13296_formation_widget'
Conflicts: library/startup.php
Branches
Tags
Showing
- application/modules/admin/controllers/AccueilController.php 12 additions, 11 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/FormationController.php 33 additions, 1 deletion...ication/modules/admin/controllers/FormationController.php
- application/modules/admin/views/scripts/accueil/formations-widget.phtml 3 additions, 0 deletions...dules/admin/views/scripts/accueil/formations-widget.phtml
- application/modules/opac/controllers/AbonneController.php 3 additions, 3 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/views/scripts/abonne/_formation.phtml 3 additions, 24 deletions...cation/modules/opac/views/scripts/abonne/_formation.phtml
- application/modules/opac/views/scripts/abonne/_session.phtml 0 additions, 14 deletionsapplication/modules/opac/views/scripts/abonne/_session.phtml
- application/modules/opac/views/scripts/abonne/detail-session.phtml 10 additions, 60 deletions...on/modules/opac/views/scripts/abonne/detail-session.phtml
- application/modules/opac/views/scripts/abonne/formations.phtml 2 additions, 2 deletions...cation/modules/opac/views/scripts/abonne/formations.phtml
- library/Class/Formation.php 34 additions, 17 deletionslibrary/Class/Formation.php
- library/Class/SessionFormation.php 60 additions, 32 deletionslibrary/Class/SessionFormation.php
- library/Class/Systeme/ModulesAccueil.php 4 additions, 1 deletionlibrary/Class/Systeme/ModulesAccueil.php
- library/Class/Systeme/ModulesAccueil/Formations.php 37 additions, 0 deletionslibrary/Class/Systeme/ModulesAccueil/Formations.php
- library/Class/TimeSource.php 5 additions, 0 deletionslibrary/Class/TimeSource.php
- library/Class/Users.php 0 additions, 1 deletionlibrary/Class/Users.php
- library/ZendAfi/Form/Configuration/FormationsWidget.php 74 additions, 0 deletionslibrary/ZendAfi/Form/Configuration/FormationsWidget.php
- library/ZendAfi/Form/Decorator/FormationSelector.php 43 additions, 0 deletionslibrary/ZendAfi/Form/Decorator/FormationSelector.php
- library/ZendAfi/Form/Element/FormationsSelector.php 60 additions, 0 deletionslibrary/ZendAfi/Form/Element/FormationsSelector.php
- library/ZendAfi/View/Helper/Abonne/Formations.php 1 addition, 1 deletionlibrary/ZendAfi/View/Helper/Abonne/Formations.php
- library/ZendAfi/View/Helper/Accueil/FormationsWidget.php 38 additions, 0 deletionslibrary/ZendAfi/View/Helper/Accueil/FormationsWidget.php
- library/ZendAfi/View/Helper/RenderFormation.php 66 additions, 0 deletionslibrary/ZendAfi/View/Helper/RenderFormation.php
Please register or sign in to comment