Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2020-09-21 11:00:22 +02:00
parent 2e5a8d39a5 9947b7db23
commit a2ebec25f8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/list.html.twig
View File

@ -30,7 +30,7 @@
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#mymodal" onClick="ModalLoad('mymodal','Téléchargez vos Fichiers','{{ path('cadoles_core_'~access~'_file_upload',{'id': directory,'type':'all','subdirectory':subdirectory}) }}');" title="Ajouter des fichiers"> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#mymodal" onClick="ModalLoad('mymodal','Téléchargez vos Fichiers','{{ path('cadoles_core_'~access~'_file_upload',{'id': directory,'type':'all','subdirectory':subdirectory}) }}');" title="Ajouter des fichiers">
<i class="fa fa-upload"></i> <i class="fa fa-upload"></i>
</button> </button>
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#mymodal" onClick="ModalLoad('mymodal','Création Répertoire','{{ path('cadoles_core_'~access~'_file_subdirectory',{'id': directory,'type':'all','subdirectory':subdirectory}) }}');" title="Ajouter des fichiers"> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#mymodal" onClick="ModalLoad('mymodal','Création Répertoire','{{ path('cadoles_core_'~access~'_file_subdirectory',{'id': directory,'type':'all','subdirectory':subdirectory}) }}');" title="Ajouter un Répertoire">
<i class="fa fa-folder-plus"></i> <i class="fa fa-folder-plus"></i>
</button> </button>

4
tmpl/ninegate-template.yml
View File

@ -184,7 +184,11 @@ parameters:
ldap_firstname: givenname ldap_firstname: givenname
ldap_lastname: sn ldap_lastname: sn
ldap_email: mail ldap_email: mail
%if %%getVar("activer_addadmin", 'non') == "oui"
ldap_usersadmin: [admin,%%uid_addadmin]
%else
ldap_usersadmin: [admin] ldap_usersadmin: [admin]
%end if
# Template scribe # Template scribe
%if %%getVar("ninegate_scribegroup", 'non') == "oui" %if %%getVar("ninegate_scribegroup", 'non') == "oui"