Merge remote-tracking branch 'refs/remotes/afi/dev#23802_add_sito_arborescence' into afi-master
# Conflicts: # library/Class/CmsUrlTransformer.php
Showing
- VERSIONS_WIP/23802 1 addition, 0 deletionsVERSIONS_WIP/23802
- application/modules/admin/controllers/AccueilController.php 10 additions, 0 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/views/scripts/accueil/sitotheque.phtml 111 additions, 102 deletions...tion/modules/admin/views/scripts/accueil/sitotheque.phtml
- application/modules/opac/controllers/DomainsController.php 1 addition, 2 deletionsapplication/modules/opac/controllers/DomainsController.php
- application/modules/opac/controllers/SitoController.php 11 additions, 0 deletionsapplication/modules/opac/controllers/SitoController.php
- application/modules/opac/views/scripts/pagination.phtml 27 additions, 0 deletionsapplication/modules/opac/views/scripts/pagination.phtml
- application/modules/opac/views/scripts/sito/viewcategory.phtml 3 additions, 0 deletions...cation/modules/opac/views/scripts/sito/viewcategory.phtml
- library/Class/CmsUrlTransformer.php 1 addition, 0 deletionslibrary/Class/CmsUrlTransformer.php
- library/Class/Sitotheque.php 4 additions, 1 deletionlibrary/Class/Sitotheque.php
- library/Class/SitothequeCategorie.php 2 additions, 0 deletionslibrary/Class/SitothequeCategorie.php
- library/Trait/TimeSource.php 4 additions, 0 deletionslibrary/Trait/TimeSource.php
- library/ZendAfi/Controller/Action/Helper/ListViewMode.php 1 addition, 1 deletionlibrary/ZendAfi/Controller/Action/Helper/ListViewMode.php
- library/ZendAfi/Controller/Action/Helper/ListViewMode/List.php 12 additions, 0 deletions...ry/ZendAfi/Controller/Action/Helper/ListViewMode/List.php
- library/ZendAfi/Controller/Action/Helper/ListViewMode/Strategy.php 31 additions, 4 deletions...endAfi/Controller/Action/Helper/ListViewMode/Strategy.php
- library/ZendAfi/Controller/Action/Helper/ListViewMode/Strategy/Sitotheque.php 162 additions, 0 deletions...roller/Action/Helper/ListViewMode/Strategy/Sitotheque.php
- library/ZendAfi/View/Helper/Accueil/Base.php 7 additions, 17 deletionslibrary/ZendAfi/View/Helper/Accueil/Base.php
- library/ZendAfi/View/Helper/Accueil/Sito.php 95 additions, 61 deletionslibrary/ZendAfi/View/Helper/Accueil/Sito.php
- library/ZendAfi/View/Helper/Admin/ListViewMode.php 1 addition, 0 deletionslibrary/ZendAfi/View/Helper/Admin/ListViewMode.php
- library/ZendAfi/View/Helper/Menu/Profil.php 5 additions, 4 deletionslibrary/ZendAfi/View/Helper/Menu/Profil.php
- library/ZendAfi/View/Helper/ModuleAbstract.php 18 additions, 1 deletionlibrary/ZendAfi/View/Helper/ModuleAbstract.php
Please register or sign in to comment