diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/category.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/category.html.twig index ccf826a..c43807f 100644 --- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/category.html.twig +++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/category.html.twig @@ -34,3 +34,12 @@ {% endif %} {% endblock %} + +{% block main_menu_bind %} + {% if page.pager.hasPreviousPage %} +
    • + {% endif %} + {% if page.pager.hasNextPage %} +
    • + {% endif %} +{% endblock %} diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/home.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/home.html.twig index 085b8f1..d812ab4 100644 --- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/home.html.twig +++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/home.html.twig @@ -36,4 +36,4 @@ {% if page.pager.hasNextPage %}
    • {% endif %} -{% endblock %} +{% endblock %} diff --git a/vendor/trinity/src/Trinity/.svn/wc.db b/vendor/trinity/src/Trinity/.svn/wc.db index ddab3f6..6cd32bb 100644 Binary files a/vendor/trinity/src/Trinity/.svn/wc.db and b/vendor/trinity/src/Trinity/.svn/wc.db differ diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Controller/BaseAdminController.php b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Controller/BaseAdminController.php index e92620c..735757a 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Controller/BaseAdminController.php +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Controller/BaseAdminController.php @@ -327,7 +327,7 @@ class BaseAdminController extends Controller protected function processForm(&$form, &$object, Request $request) { - $form->bind($request); + $form->submit($request); if ($form->isValid()) { if ($object instanceof \FOS\UserBundle\Propel\User) { diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/style.css b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/style.css index bcfda90..5115017 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/style.css +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/style.css @@ -1228,6 +1228,11 @@ li.item p { background: url('/bundles/trinityadmin/img/flags/de.png') center center no-repeat; } +.nav-tab-zh a, +.nav-tab-zh_CN a { + background: url('/bundles/trinityadmin/img/flags/ch.png') center center no-repeat; +} + .file-preview-img { max-width: 100px; display: block; diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/js/admin.js b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/js/admin.js index 16f2b78..97a9031 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/js/admin.js +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/js/admin.js @@ -1144,6 +1144,44 @@ $(document).ready(function() { $('.form-icon-helper').css('margin-left', '3px').tooltip(); $('#crud form > ul.error_list').addClass('alert').addClass('alert-danger'); + + if ($('#page_dataModel').length && $('#page_dataModelId').length) { + var $pageDataModel = $('#page_dataModel'); + var $pageDataModelId = $('#page_dataModelId'); + + var checkDatModelSelect = function() { + if (!$pageDataModel.val()) { + $pageDataModelId.find('option:selected').removeAttr('selected'); + $pageDataModelId.attr('disabled', 'disabled'); + + return; + } + + $pageDataModelId.removeAttr('disabled'); + + var dataModelName = $.trim($pageDataModel.children('option:selected').html()); + var $selected = []; + + $pageDataModelId.children('optgroup').each(function() { + if ($.trim($(this).attr('label')) !== dataModelName) { + $(this).find('option:selected').removeAttr('selected'); + $(this).hide(); + } else { + $selected = $(this).find('option[selected]'); + $(this).show(); + } + }); + + if ($selected.length) { + $selected.removeAttr('selected').attr('selected', 'selected'); + } + + $pageDataModelId.trigger("chosen:updated"); + } + + $pageDataModel.change(checkDatModelSelect); + checkDatModelSelect(); + } }); $('#media-categories-tree a').live( diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/TrinityAdminBundle.fr.yml b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/TrinityAdminBundle.fr.yml index 98e7e14..26be1bb 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/TrinityAdminBundle.fr.yml +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/TrinityAdminBundle.fr.yml @@ -56,7 +56,7 @@ crud: fail: update: 'Mise à jour échouée.' new: 'Création échouée' - remove: 'Il y a eu un problème pendant la suppresion.' + remove: 'Il y a eu un problème pendant la suppression.' unknown: 'Élément inexistant.' user: @@ -67,8 +67,8 @@ crud: prevText: '"<"' nextText: '">"' currentText: '"Maintenant"' - monthNames: "['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre','Décembre']" - monthNamesShort: "['Jan', 'Fév', 'Mar', 'Avr', 'Mai', 'Jui', 'Juil', 'Août', 'Sept', 'Oct', 'Nov','Déc']" + monthNames: "['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre']" + monthNamesShort: "['Jan', 'Fév', 'Mar', 'Avr', 'Mai', 'Jui', 'Juil', 'Août', 'Sept', 'Oct', 'Nov', 'Déc']" dayNames: "['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi']" dayNamesShort: "['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam']" dayNamesMin: "['Di', 'Lu', 'Ma', 'Me', 'Je', 'Ve', 'Sa']" diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/messages.fr.xliff b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/messages.fr.xliff index 444af71..4ef7370 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/messages.fr.xliff +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/messages.fr.xliff @@ -1,155 +1,155 @@ - - - - Title - Titre - - - Url - Chemin d'accès - - - Nodealias - Alias - - - Page - Page - - - Routename - Nom de la route - - - Controller - Contrôleur - - - Default params - Paramètres par défaut - - - Requirements - Contraintes - - - Http method - Méthode HTTP - - - Format - Format - - - Seo title - Titre - - - Meta description - Meta description - - - Meta keywords - Mots-clés - - - Block title - Titre - - - Block subtitle - Sous-titre - - - Block content - Contenu - - - Name - Nom - - - Template - Modèle de page - - - Data model - Modèle d'objet - - - Page model - Modèle de page - - - role_user - Utilisateur - - - role_admin - Administrateur - - - GET and POST - GET et POST - + + + + Title + Titre + + + Url + Chemin d'accès + + + Nodealias + Alias + + + Page + Page + + + Routename + Nom de la route + + + Controller + Contrôleur + + + Default params + Paramètres par défaut + + + Requirements + Contraintes + + + Http method + Méthode HTTP + + + Format + Format + + + Seo title + Titre + + + Meta description + Meta description + + + Meta keywords + Mots-clés + + + Block title + Titre + + + Block subtitle + Sous-titre + + + Block content + Contenu + + + Name + Nom + + + Template + Modèle de page + + + Data model + Modèle d'objet + + + Page model + Modèle de page + + + role_user + Utilisateur + + + role_admin + Administrateur + + + GET and POST + GET et POST + - GET - GET - + GET + GET + - POST - POST - - - nodeTitle - Titre dans le menu - - - Anyway - Peu importe - - - False - Non - - - True - Oui - - - No - Non - - - Yes - Oui - - - Data model id - Objet - - - Copy - Copier - - - Remove - Supprimer - - - Class key - Modèle de données - - - Updated at - Mis(e) à jour le - - - Created at - Créé(e) le - - - - + POST + POST + + + nodeTitle + Titre dans le menu + + + Anyway + Peu importe + + + False + Non + + + True + Oui + + + No + Non + + + Yes + Oui + + + Data model id + Objet + + + Copy + Copier + + + Remove + Supprimer + + + Class key + Modèle de données + + + Updated at + Mis(e) à jour le + + + Created at + Créé(e) le + + + + \ No newline at end of file diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/filters.html.twig b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/filters.html.twig index 9508635..b2098f9 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/filters.html.twig +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/filters.html.twig @@ -43,3 +43,4 @@ {% endblock %} + diff --git a/vendor/trinity/src/Trinity/Bundle/AdminMenuBundle/Controller/DefaultController.php b/vendor/trinity/src/Trinity/Bundle/AdminMenuBundle/Controller/DefaultController.php index 2d11154..d93f20b 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminMenuBundle/Controller/DefaultController.php +++ b/vendor/trinity/src/Trinity/Bundle/AdminMenuBundle/Controller/DefaultController.php @@ -31,7 +31,7 @@ class DefaultController extends Controller $navs = NavQuery::create()->orderByName()->find(); $item = array( - 'title' => "Gestion de l'arborescence", + 'title' => "Tree management", 'route_name' => 'TrinityContentManagerBundleNodeAdmin_index', 'route_params' => array(), 'test_is_granted' => true, diff --git a/vendor/trinity/src/Trinity/Bundle/AssetsBundle/Resources/config/services.xml b/vendor/trinity/src/Trinity/Bundle/AssetsBundle/Resources/config/services.xml index 676c856..3a6e3a9 100644 --- a/vendor/trinity/src/Trinity/Bundle/AssetsBundle/Resources/config/services.xml +++ b/vendor/trinity/src/Trinity/Bundle/AssetsBundle/Resources/config/services.xml @@ -1,24 +1,21 @@ - - - - Trinity\Bundle\AssetsBundle\Compressor\LessCssCompressor - - - - + + + - /usr/local/lesscss/bin/lessc + /usr/local/lesscss/bin/lessc - {output}]]> + {output}]]> - + diff --git a/vendor/trinity/src/Trinity/Bundle/ContactBundle/Form/Type/ContactFilterType.php b/vendor/trinity/src/Trinity/Bundle/ContactBundle/Form/Type/ContactFilterType.php index 24345c9..b879a34 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContactBundle/Form/Type/ContactFilterType.php +++ b/vendor/trinity/src/Trinity/Bundle/ContactBundle/Form/Type/ContactFilterType.php @@ -23,10 +23,7 @@ class ContactFilterType extends BaseAbstractType 'name', 'text', array( - 'required' => true, - 'attr' => array( - 'placeholder' => 'Nom', - ), + 'required' => false, ) ); @@ -34,10 +31,7 @@ class ContactFilterType extends BaseAbstractType 'firm', 'text', array( - 'required' => true, - 'attr' => array( - 'placeholder' => 'Société', - ), + 'required' => false, ) ); @@ -45,10 +39,7 @@ class ContactFilterType extends BaseAbstractType 'phone', 'text', array( - 'required' => true, - 'attr' => array( - 'placeholder' => 'Téléphone', - ), + 'required' => false, ) ); @@ -56,10 +47,7 @@ class ContactFilterType extends BaseAbstractType 'email', 'email', array( - 'required' => true, - 'attr' => array( - 'placeholder' => 'E-mail', - ), + 'required' => false, ) ); } diff --git a/vendor/trinity/src/Trinity/Bundle/ContactBundle/Resources/config/schema.xml b/vendor/trinity/src/Trinity/Bundle/ContactBundle/Resources/config/schema.xml index e7b7bed..8bb372e 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContactBundle/Resources/config/schema.xml +++ b/vendor/trinity/src/Trinity/Bundle/ContactBundle/Resources/config/schema.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - -
    + + + + + + + + + + + + + + +
     diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Block/FileBlock.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Block/FileBlock.php index 36bf336..54fe414 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Block/FileBlock.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Block/FileBlock.php @@ -4,6 +4,7 @@ namespace Trinity\Bundle\ContentManagerBundle\Block; use Propel; use PropelPDO; +use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\HttpFoundation\File\UploadedFile; use Trinity\Bundle\ContentManagerBundle\Model\BlockPeer; use Trinity\Bundle\ContentManagerBundle\Model\Block; @@ -145,4 +146,15 @@ class FileBlock extends Block return parent::postDelete($con); } + + public function getValueAsFile() + { + $file = $this->getUploadDir('value') . DIRECTORY_SEPARATOR . $this->value; + + if (file_exists($file) && is_file($file)) { + return new File($file); + } + + return null; + } } diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NavType.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NavType.php index f324876..aec4149 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NavType.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NavType.php @@ -53,7 +53,7 @@ class NavType extends AbstractType array( 'required' => true, 'attr' => array( - 'data-help' => "Utilisation possible d'une regex, exemple : regex:/.*\\.exemple.fr/s", + 'data-help' => "Regex available, eg: regex:/.*\\.example.com/s", ), 'constraints' => array( new NotBlank(), diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeAddType.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeAddType.php index 5cd79b3..8b0b1ab 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeAddType.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeAddType.php @@ -13,18 +13,15 @@ class NodeAddType extends NodeType { $builder->add( 'title', - 'text', - array( - 'label' => 'nodeTitle', - ) + 'text' ); $builder->add( 'position', 'hidden', array( - 'mapped' => false, - 'data' => 'after', + 'mapped' => false, + 'data' => 'after', ) ); @@ -32,9 +29,9 @@ class NodeAddType extends NodeType 'pageContentType', 'choice', array( - 'mapped' => false, - 'choices' => self::getPageContentTypes(), - 'required' => false, + 'mapped' => false, + 'choices' => self::getPageContentTypes(), + 'required' => false, ) ); @@ -42,9 +39,9 @@ class NodeAddType extends NodeType 'pageModel', 'choice', array( - 'mapped' => false, - 'choices' => $this->getPagesModels(), - 'required' => true, + 'mapped' => false, + 'choices' => $this->getPagesModels(), + 'required' => true, ) ); @@ -52,8 +49,8 @@ class NodeAddType extends NodeType 'page', 'model', array( - 'class' => 'Trinity\Bundle\ContentManagerBundle\Model\Page', - 'query' => \Trinity\Bundle\ContentManagerBundle\Model\PageQuery::getOrphansQuery(), + 'class' => 'Trinity\Bundle\ContentManagerBundle\Model\Page', + 'query' => \Trinity\Bundle\ContentManagerBundle\Model\PageQuery::getOrphansQuery(), 'required' => false, ) ); @@ -62,7 +59,7 @@ class NodeAddType extends NodeType 'nodeAliasId', 'choice', array( - 'choices' => \Trinity\Bundle\ContentManagerBundle\Model\MenuPeer::getMenuWithNodesForType(), + 'choices' => \Trinity\Bundle\ContentManagerBundle\Model\MenuPeer::getMenuWithNodesForType(), 'required' => true, ) ); @@ -73,7 +70,7 @@ class NodeAddType extends NodeType array( 'required' => false, 'attr' => array( - 'placeholder' => 'http://', + 'placeholder' => 'https://', ), ) ); @@ -92,10 +89,10 @@ class NodeAddType extends NodeType { return array( 'newpage' => 'New page', - 'page' => 'Page', - 'alias' => 'Alias', - 'url' => 'URL', - 'nopage' => 'No page', + 'page' => 'Page', + 'alias' => 'Alias', + 'url' => 'URL', + 'nopage' => 'No page', ); } diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeMoveType.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeMoveType.php index c8f8f66..249e8b0 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeMoveType.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeMoveType.php @@ -15,9 +15,8 @@ class NodeMoveType extends NodeType 'position', 'hidden', array( -// 'property_path' => false, - 'mapped' => false, - 'data' => 'after', + 'mapped' => false, + 'data'=> 'after', ) ); @@ -25,12 +24,11 @@ class NodeMoveType extends NodeType 'reference', 'model', array( - 'class' => 'Trinity\Bundle\ContentManagerBundle\Model\Node', - 'query' => \Trinity\Bundle\ContentManagerBundle\Model\NodeQuery::getReferences($builder->getData()), - 'property' => 'levelRender', -// 'property_path' => false, - 'mapped' => false, - 'required' => true, + 'class' => 'Trinity\Bundle\ContentManagerBundle\Model\Node', + 'query' => \Trinity\Bundle\ContentManagerBundle\Model\NodeQuery::getReferences($builder->getData()), + 'property' => 'levelRender', + 'mapped' => false, + 'required' => true, ) ); } diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeType.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeType.php index f678364..2ff3289 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeType.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/NodeType.php @@ -49,10 +49,7 @@ class NodeType extends AbstractType { $builder->add( 'title', - 'text', - array( - 'label' => 'nodeTitle', - ) + 'text' ); $builder->add( @@ -67,9 +64,9 @@ class NodeType extends AbstractType 'pageContentType', 'choice', array( - 'mapped' => false, - 'choices' => $this->getPageContentTypes(), - 'required' => true, + 'mapped' => false, + 'choices' => $this->getPageContentTypes(), + 'required' => true, ) ); @@ -79,7 +76,7 @@ class NodeType extends AbstractType array( 'required' => false, 'attr' => array( - 'placeholder' => 'http://', + 'placeholder' => 'https://', ), ) ); @@ -136,8 +133,8 @@ class NodeType extends AbstractType 'page', 'model', array( - 'class' => 'Trinity\Bundle\ContentManagerBundle\Model\Page', - 'query' => \Trinity\Bundle\ContentManagerBundle\Model\PageQuery::getOrphansQuery(), + 'class' => 'Trinity\Bundle\ContentManagerBundle\Model\Page', + 'query' => \Trinity\Bundle\ContentManagerBundle\Model\PageQuery::getOrphansQuery(), 'required' => false, ) ); @@ -183,9 +180,9 @@ class NodeType extends AbstractType 'choice', array( // 'property_path' => false, - 'mapped' => false, - 'choices' => $this->getPagesModels(), - 'required' => true, + 'mapped' => false, + 'choices' => $this->getPagesModels(), + 'required' => true, ) ); } diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PageMetasType.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PageMetasType.php index 1884849..21ddede 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PageMetasType.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PageMetasType.php @@ -18,7 +18,7 @@ class PageMetasType extends PageType 'required' => false, 'attr' => array( 'data-countable' => 1, - 'data-help' => 'seoTitleHelper' + 'data-help' => 'Recommended maximum length: 70 characters.' ), ) ); @@ -30,7 +30,7 @@ class PageMetasType extends PageType 'required' => false, 'attr' => array( 'data-countable' => 1, - 'data-help' => 'metaDescriptionHelper' + 'data-help' => 'Recommended maximum length: 160 characters.' ), ) ); diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PagePermissionsType.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PagePermissionsType.php index ce61823..53fe9e0 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PagePermissionsType.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PagePermissionsType.php @@ -3,6 +3,7 @@ namespace Trinity\Bundle\ContentManagerBundle\Form\Type; use Symfony\Component\Form\FormBuilderInterface; +use Trinity\Bundle\ContentManagerBundle\Model\PageQuery; class PagePermissionsType extends PageType { @@ -44,8 +45,11 @@ class PagePermissionsType extends PageType 'dataModelId', 'choice', array( - 'choices' => \Trinity\Bundle\ContentManagerBundle\Model\PageQuery::getModelForDataModels($dataModels), + 'choices' => PageQuery::getModelForDataModels($dataModels), 'required' => false, + // 'attr' => array( + // 'class' => 'chosen-select', + // ), ) ); } diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PageSitemapType.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PageSitemapType.php index 575f771..a55459f 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PageSitemapType.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Form/Type/PageSitemapType.php @@ -54,13 +54,13 @@ class PageSitemapType extends PageType public function getPagesFrequency() { $frequencys = array( - 'always' => 'always', - 'hourly' => 'hourly', - 'daily' => 'daily', - 'weekly' => 'weekly', - 'monthly' => 'monthly', - 'yearly' => 'yearly', - 'never' => 'never' + 'always' => 'Always', + 'hourly' => 'Hourly', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'never' => 'Never' ); diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Resources/translations/TrinityContentManagerBundle.fr.yml b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Resources/translations/TrinityContentManagerBundle.fr.yml index c2bb594..ba45f11 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Resources/translations/TrinityContentManagerBundle.fr.yml +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Resources/translations/TrinityContentManagerBundle.fr.yml @@ -51,9 +51,6 @@ cms: saved: 'Données sauvegardées.' node: - #nav: - # list: - # title: "Sélection d'une navigations" error: unselected: 'Vous devez sélectionner une navigation pour continuer.' diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Resources/translations/messages.fr.xliff b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Resources/translations/messages.fr.xliff index 19226a9..c32301b 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Resources/translations/messages.fr.xliff +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Resources/translations/messages.fr.xliff @@ -1,267 +1,271 @@ - - - - Nav - Navigation - - - name - Nom - - - title - Titre - - - Menus - Menus - - - Medias - Médias - - - Categories - Catégories - - - Editorial blocks - Blocs éditoriaux - - - Navs - Navigations - - - Pages - Pages - - - Culture - Langue - - - Domain - Nom de domaine - - - The couple domain/culture must be defined and unique. - Le couple nom de domaine/culture doit être renseigné et unique. - - - New editorial block - Nouveau bloc éditorial - - - action - Action - - - New nav - Nouvelle navigation - - - New page - Nouvelle page - - - Edition of "%toString%" - Édition de « %toString% » - - - seoTitleHelper - Longueur max conseillée : 70 caractères. - - - metaDescriptionHelper - Longueur max conseillée : 160 caractères. - - - metaKeywordsHelper - Édition de « %toString% » - - - Sitemap status - Publication - - - Sitemap priority - Priorité - - - Sitemap frequency - Fréquence de mise à jour - - - always - Toujours - - - hourly - Toutes les heures - - - daily - Tous les jours - - - weekly - Toutes les semaines - - - monthly - Tous les mois - - - yearly - Tous les ans - - - never - Jamais - - - Block content1 - Contenu 1 - - - Block content2 - Contenu 2 - - - Block content3 - Contenu 3 - - - Block content4 - Contenu 4 - - - Block content5 - Contenu 5 - - - Block content6 - Contenu 6 - - - Block content7 - Contenu 7 - - - Block content8 - Contenu 8 - - - Block mailto - Destinataire - - - Block message - Message - - - New menu - Nouveau menu - - - Node_id - Noeud actif - - - Updated_at - Mise à jour le - - - Created_at - Créé le - - - Block content1 - Contenu 1 - - - Block content2 - Contenu 2 - - - Block content3 - Contenu 3 - - - Block content4 - Contenu 4 - - - Block content5 - Contenu 5 - - - Block content6 - Contenu 6 - - - Block content7 - Contenu 7 - - - Block content8 - Contenu 8 - - - Block mailto - Destinataire - - - Block message - Message - - - Block editorial blocks - Blocs éditoriaux - - - Block slider - Visionneuse - - - Block image - Illustration - - - Block emag posts - Publication à la une - - - Block select emag post test - Article : On a testé pour vous - - - Block select emag post meet - Article : rencontre - - - Block select emag post dom - Article : la minute domotique - - - tinymce.add.media - Ajouter un média - - - Is orphan - Orphelin(e) - - - admin.metas.dictionary.title - Dictionnaire - - - Edition of "%title%" - Édition de « %title% » - - - + + + + Nav + Navigation + + + Name + Nom + + + Title + Titre + + + Menus + Menus + + + Medias + Médias + + + Categories + Catégories + + + Editorial blocks + Blocs éditoriaux + + + Navs + Navigations + + + Pages + Pages + + + Culture + Langue + + + Domain + Nom de domaine + + + The couple domain/culture must be defined and unique. + Le couple nom de domaine/culture doit être renseigné et unique. + + + New editorial block + Nouveau bloc éditorial + + + Action + Action + + + New nav + Nouvelle navigation + + + New page + Nouvelle page + + + Edition of "%toString%" + Édition de « %toString% » + + + Recommended maximum length: 70 characters. + Longueur maximum conseillée : 70 caractères. + + + Recommended maximum length: 160 characters. + Longueur max conseillée : 160 caractères. + + + Sitemap status + Publication + + + Sitemap priority + Priorité + + + Sitemap frequency + Fréquence de mise à jour + + + Always + Toujours + + + Hourly + Toutes les heures + + + Daily + Tous les jours + + + Weekly + Toutes les semaines + + + Monthly + Tous les mois + + + Yearly + Tous les ans + + + Never + Jamais + + + Block content1 + Contenu 1 + + + Block content2 + Contenu 2 + + + Block content3 + Contenu 3 + + + Block content4 + Contenu 4 + + + Block content5 + Contenu 5 + + + Block content6 + Contenu 6 + + + Block content7 + Contenu 7 + + + Block content8 + Contenu 8 + + + Block mailto + Destinataire + + + Block message + Message + + + New menu + Nouveau menu + + + Node_id + Noeud actif + + + Updated_at + Mise à jour le + + + Created_at + Créé le + + + Block content1 + Contenu 1 + + + Block content2 + Contenu 2 + + + Block content3 + Contenu 3 + + + Block content4 + Contenu 4 + + + Block content5 + Contenu 5 + + + Block content6 + Contenu 6 + + + Block content7 + Contenu 7 + + + Block content8 + Contenu 8 + + + Block mailto + Destinataire + + + Block message + Message + + + Block editorial blocks + Blocs éditoriaux + + + Block slider + Visionneuse + + + Block image + Illustration + + + Block emag posts + Publication à la une + + + Block select emag post test + Article : On a testé pour vous + + + Block select emag post meet + Article : rencontre + + + Block select emag post dom + Article : la minute domotique + + + tinymce.add.media + Ajouter un média + + + Is orphan + Orphelin(e) + + + admin.metas.dictionary.title + Dictionnaire + + + Edition of "%title%" + Édition de « %title% » + + + Tree management + Gestion de l'arborescence + + + Regex available, eg: regex:/.*\.example.com/s + Utilisation possible d'une regex, exemple : regex:/.*\.example.com/s + + + diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Routing/NodeLoader.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Routing/NodeLoader.php index c108798..45ed7a0 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Routing/NodeLoader.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Routing/NodeLoader.php @@ -45,8 +45,7 @@ class NodeLoader extends Loader $url = $node->getUrl(); $page = $node->getPage(); - $controller = $node->getController() ? $node->getController( - ) : 'TrinityContentManagerBundle:Page:catchAll'; + $controller = $node->getController() ? $node->getController() : 'TrinityContentManagerBundle:Page:catchAll'; if ($node->getNodeAlias() && !$node->getNodeAlias()->getPage()) { continue; diff --git a/vendor/trinity/src/Trinity/Bundle/EditorialBlockBundle/Resources/translations/TrinityEditorialBlockBlundle.fr.yml b/vendor/trinity/src/Trinity/Bundle/EditorialBlockBundle/Resources/translations/TrinityEditorialBlockBlundle.fr.yml deleted file mode 100644 index e69de29..0000000 diff --git a/vendor/trinity/src/Trinity/Bundle/EditorialBlockBundle/Resources/translations/messages.fr.xliff b/vendor/trinity/src/Trinity/Bundle/EditorialBlockBundle/Resources/translations/messages.fr.xliff deleted file mode 100644 index d9078b7..0000000 --- a/vendor/trinity/src/Trinity/Bundle/EditorialBlockBundle/Resources/translations/messages.fr.xliff +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - nav - Navigation - - - name - Nom - - - title - Titre - - - Menus - Menus - - - Medias - Médias - - - Categories - Catégories - - - Editorial blocks - Blocs éditoriaux - - - Navs - Navigations - - - Pages - Pages - - - culture - Langue - - - domain - Nom de domaine - - - The couple domain/culture must be defined and unique. - Le couple nom de domaine/culture doit être renseigné et unique. - - - New editorial block - Nouveau bloc éditorial - - - action - Action - - - New nav - Nouvelle navigation - - - New page - Nouvelle page - - - Edition of "%toString%" - Édition de « %toString% » - - - seoTitleHelper - Longueur max conseillée : 70 caractères. - - - metaDescriptionHelper - Longueur max conseillée : 160 caractères. - - - metaKeywordsHelper - Édition de « %toString% » - - - Sitemap status - Publication - - - Sitemap priority - Priorité - - - Sitemap frequency - Fréquence de mise à jour - - - always - Toujours - - - hourly - Toutes les heures - - - daily - Tous les jours - - - weekly - Toutes les semaines - - - monthly - Tous les mois - - - yearly - Tous les ans - - - never - Jamais - - - - diff --git a/vendor/trinity/src/Trinity/Bundle/MediaBundle/Resources/translations/messages.fr.xliff b/vendor/trinity/src/Trinity/Bundle/MediaBundle/Resources/translations/messages.fr.xliff index 00af013..fe0b620 100644 --- a/vendor/trinity/src/Trinity/Bundle/MediaBundle/Resources/translations/messages.fr.xliff +++ b/vendor/trinity/src/Trinity/Bundle/MediaBundle/Resources/translations/messages.fr.xliff @@ -1,19 +1,19 @@ - - - - Icon - Icône - - - Label - Libellé - - - thumbnail - Miniature - + + + + Icon + Icône + + + Label + Libellé + + + thumbnail + Miniature + mimes Types de mime @@ -82,14 +82,14 @@ New type Nouveau type - - label - Libellé - - - icon - Icone - + + label + Libellé + + + icon + Icone + category Catégorie @@ -103,29 +103,29 @@ Format - Add a media - Ajouter un média - - - List of medias - Liste des médias - - - Thumbnail - Miniature - - - select - Choisir - - - Webpathforicon - Icône - - - Webpathforthumbnail - Miniature - - - - + Add a media + Ajouter un média + + + List of medias + Liste des médias + + + Thumbnail + Miniature + + + select + Choisir + + + Webpathforicon + Icône + + + Webpathforthumbnail + Miniature + + + + \ No newline at end of file diff --git a/vendor/trinity/src/Trinity/Bundle/NewsletterBundle/Form/Type/NewsletterFilterType.php b/vendor/trinity/src/Trinity/Bundle/NewsletterBundle/Form/Type/NewsletterFilterType.php index 6e8e894..889c9a6 100644 --- a/vendor/trinity/src/Trinity/Bundle/NewsletterBundle/Form/Type/NewsletterFilterType.php +++ b/vendor/trinity/src/Trinity/Bundle/NewsletterBundle/Form/Type/NewsletterFilterType.php @@ -21,23 +21,28 @@ class NewsletterFilterType extends BaseAbstractType $builder->add('name'); $builder->add('senderName'); $builder->add('senderEmail'); + $builder->add('modelId', - 'model', - array( - 'empty_value' => 'Tous', - 'required' => false, - 'class' => 'Trinity\Bundle\NewsletterBundle\Model\Model' - ) + 'model', + array( + 'empty_value' => 'All', + 'required' => false, + 'class' => 'Trinity\Bundle\NewsletterBundle\Model\Model', + ) ); - $builder->add('sentAt','datetime', - array( - 'widget' => 'single_text', - 'input' => 'string', - 'format' => 'yyyy-MM-dd hh:mm:ss', - 'with_seconds' => true, - 'attr' => array('class' => 'datetimepicker') - ) + $builder->add( + 'sentAt', + 'datetime', + array( + 'widget' => 'single_text', + 'input' => 'string', + 'format' => 'yyyy-MM-dd hh:mm:ss', + 'with_seconds' => true, + 'attr' => array( + 'class' => 'datetimepicker', + ), + ) ); } } diff --git a/vendor/trinity/src/Trinity/Bundle/NewsletterBundle/Form/Type/NewsletterType.php b/vendor/trinity/src/Trinity/Bundle/NewsletterBundle/Form/Type/NewsletterType.php index 703365a..e7bdb95 100644 --- a/vendor/trinity/src/Trinity/Bundle/NewsletterBundle/Form/Type/NewsletterType.php +++ b/vendor/trinity/src/Trinity/Bundle/NewsletterBundle/Form/Type/NewsletterType.php @@ -36,9 +36,9 @@ class NewsletterType extends BaseAbstractType 'groups', 'model', array( - 'class' => 'FOS\UserBundle\Propel\Group', - 'multiple' => true, - 'expanded' => true + 'class' => 'FOS\UserBundle\Propel\Group', + 'multiple' => true, + 'expanded' => true ) ); } diff --git a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Resources/config/propel/schema.xml b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Resources/config/propel/schema.xml index 83ea24c..1618ff0 100644 --- a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Resources/config/propel/schema.xml +++ b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Resources/config/propel/schema.xml @@ -8,14 +8,12 @@ - - @@ -28,4 +26,4 @@
    - + \ No newline at end of file diff --git a/vendor/trinity/src/Trinity/Bundle/SlideshowBundle/Resources/translations/messages.fr.xliff b/vendor/trinity/src/Trinity/Bundle/SlideshowBundle/Resources/translations/messages.fr.xliff index 17539ef..35d7853 100644 --- a/vendor/trinity/src/Trinity/Bundle/SlideshowBundle/Resources/translations/messages.fr.xliff +++ b/vendor/trinity/src/Trinity/Bundle/SlideshowBundle/Resources/translations/messages.fr.xliff @@ -1,15 +1,15 @@ - - - - - - Link - Lien - - - Picture - Image - - - + + + + + + Link + Lien + + + Picture + Image + + + \ No newline at end of file diff --git a/vendor/trinity/src/Trinity/Bundle/UserBundle/Controller/UserAdminController.php b/vendor/trinity/src/Trinity/Bundle/UserBundle/Controller/UserAdminController.php index 49fc75c..083759b 100644 --- a/vendor/trinity/src/Trinity/Bundle/UserBundle/Controller/UserAdminController.php +++ b/vendor/trinity/src/Trinity/Bundle/UserBundle/Controller/UserAdminController.php @@ -2,6 +2,7 @@ namespace Trinity\Bundle\UserBundle\Controller; +use FOS\UserBundle\Propel\User; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; @@ -95,6 +96,7 @@ class UserAdminController extends BaseAdminController */ public function generatePasswordAction($object, $token, Request $request) { + /** @var User $object */ $redirect = $this->redirect($this->generateUrl('FOSUserBundleUserAdmin_index')); if ($this->getRemoveToken() !== $token) { @@ -109,7 +111,13 @@ class UserAdminController extends BaseAdminController $new_password = substr(sha1(uniqid() + mt_rand() + time()), 0, 15); - $this->get('fos_user.user_manager')->updateUser($object->setPlainPassword($new_password)); + $object->setPlainPassword($new_password); + + if($this->container->getParameter('trinity_user.active_when_generate') === true){ + $object->setEnabled(true); + } + + $this->get('fos_user.user_manager')->updateUser($object); $this->sendGeneratedPassword($object, $new_password); @@ -135,9 +143,13 @@ class UserAdminController extends BaseAdminController $message = \Swift_Message::newInstance() - ->setSubject($this->get('translator')->trans('New password')) - ->setTo(array($user->getEmail())) - ->setBody($body, 'text/html') + ->setSubject($this->get('translator')->trans('New password')) + ->setFrom( + $this->container->getParameter('trinity_user.sender_mail'), + $this->container->getParameter('trinity_user.sender_name') + ) + ->setTo(array($user->getEmail())) + ->setBody($body, 'text/html') ; return $this->get('mailer')->send($message); diff --git a/vendor/trinity/src/Trinity/Bundle/UserBundle/DependencyInjection/Configuration.php b/vendor/trinity/src/Trinity/Bundle/UserBundle/DependencyInjection/Configuration.php index 04ac15c..69c06bf 100644 --- a/vendor/trinity/src/Trinity/Bundle/UserBundle/DependencyInjection/Configuration.php +++ b/vendor/trinity/src/Trinity/Bundle/UserBundle/DependencyInjection/Configuration.php @@ -24,6 +24,18 @@ class Configuration implements ConfigurationInterface ->scalarNode('bo_auth_role') ->defaultValue('ROLE_WEBMASTER') ->end() + + ->booleanNode('active_when_generate') + ->defaultValue(false) + ->end() + + ->scalarNode('sender_mail') + ->defaultValue('noreply@webetdesign.com') + ->end() + ->scalarNode('sender_name') + ->defaultValue('Web&Design') + ->end() + ->arrayNode('roles') ->prototype('scalar') ->end() diff --git a/vendor/trinity/src/Trinity/Bundle/UserBundle/DependencyInjection/TrinityUserExtension.php b/vendor/trinity/src/Trinity/Bundle/UserBundle/DependencyInjection/TrinityUserExtension.php index b2b9db5..aad3d3d 100644 --- a/vendor/trinity/src/Trinity/Bundle/UserBundle/DependencyInjection/TrinityUserExtension.php +++ b/vendor/trinity/src/Trinity/Bundle/UserBundle/DependencyInjection/TrinityUserExtension.php @@ -27,5 +27,9 @@ class TrinityUserExtension extends Extension $container->setParameter('trinity_user.roles', isset($config['roles']) ? $config['roles'] : array()); $container->setParameter('trinity_user.bo_auth_role', $config['bo_auth_role']); + + $container->setParameter('trinity_user.active_when_generate', $config['active_when_generate']); + $container->setParameter('trinity_user.sender_mail', $config['sender_mail']); + $container->setParameter('trinity_user.sender_name', $config['sender_name']); } } diff --git a/vendor/trinity/src/Trinity/Bundle/UserBundle/Resources/translations/messages.fr.xliff b/vendor/trinity/src/Trinity/Bundle/UserBundle/Resources/translations/messages.fr.xliff index 344c1d7..f6f8052 100644 --- a/vendor/trinity/src/Trinity/Bundle/UserBundle/Resources/translations/messages.fr.xliff +++ b/vendor/trinity/src/Trinity/Bundle/UserBundle/Resources/translations/messages.fr.xliff @@ -1,131 +1,131 @@ - - - - id - ID - - - username - Identifiant - - - email - Email - - - enabled - Activé - - - Last_login - Dernière connexion - - - locked - Verrouillé - - - roles - Rôle - - - created_at - Créé(e) le - - - updated_at - Mis(e) à jour le - - - groups - Groupes - - - code - Code - - - First - Mot de passe - - - Second - Répéter le mot de passe - - - Groups - Groupes - - - Users - Utilisateurs - - - Username - Identifiant - - - Enabled - Activé - - - Locked - Verrouillé - - - Group - Groupe - - - Edition of "%username%" - Édition de « %username% » - - - New group - Nouveau groupe - - - User id - ID Utilisateur - - - user - Identifiant - - - Users's logs - Logs des utilisateurs - - - Createdat to string - Créé(e) le - - - user_id - ID Utilisateur - - - New user - Nouvel utilisateur - - - User - Utilisateur - - - Administrator - Administrateur - - - Super administrator - Super administrateur - - - Edition of "%name%" - Édition de « %name% » - - - - + + + + id + ID + + + username + Identifiant + + + email + Email + + + enabled + Activé + + + Last_login + Dernière connexion + + + locked + Verrouillé + + + roles + Rôle + + + created_at + Créé(e) le + + + updated_at + Mis(e) à jour le + + + groups + Groupes + + + code + Code + + + First + Mot de passe + + + Second + Répéter le mot de passe + + + Groups + Groupes + + + Users + Utilisateurs + + + Username + Identifiant + + + Enabled + Activé + + + Locked + Verrouillé + + + Group + Groupe + + + Edition of "%username%" + Édition de « %username% » + + + New group + Nouveau groupe + + + User id + ID Utilisateur + + + user + Identifiant + + + Users's logs + Logs des utilisateurs + + + Createdat to string + Créé(e) le + + + user_id + ID Utilisateur + + + New user + Nouvel utilisateur + + + User + Utilisateur + + + Administrator + Administrateur + + + Super administrator + Super administrateur + + + Edition of "%name%" + Édition de « %name% » + + + + \ No newline at end of file diff --git a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/translations/VarsEditorBundle.fr.yml b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/translations/VarsEditorBundle.fr.yml index 8ceb6da..d134e00 100644 --- a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/translations/VarsEditorBundle.fr.yml +++ b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/translations/VarsEditorBundle.fr.yml @@ -1,3 +1,3 @@ error: - configuration: 'File not configured.' - notFound: 'File not found.' + configuration: 'Fichier non configuré.' + notFound: 'Fichier non trouvé.' diff --git a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/translations/messages.fr.xliff b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/translations/messages.fr.xliff index 2a85d4d..b2a4917 100644 --- a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/translations/messages.fr.xliff +++ b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/translations/messages.fr.xliff @@ -1,11 +1,11 @@ - - - - Global vars editor - Éditeur de variables globales - - - - + + + + Global vars editor + Éditeur de variables globales + + + + \ No newline at end of file diff --git a/vendor/trinity/src/Trinity/Bundle/WidgetBundle/Resources/views/Form/fields.html.twig b/vendor/trinity/src/Trinity/Bundle/WidgetBundle/Resources/views/Form/fields.html.twig index a5ceedb..4046c82 100644 --- a/vendor/trinity/src/Trinity/Bundle/WidgetBundle/Resources/views/Form/fields.html.twig +++ b/vendor/trinity/src/Trinity/Bundle/WidgetBundle/Resources/views/Form/fields.html.twig @@ -7,7 +7,15 @@ {% block file_widget %} {# {% set dir = attr.upload_dir is defined ? attr.upload_dir ~ '/' : '/' %} #} - {% set filename = form.vars.data %} + + {% if form.vars.data is not null %} + {% set filename = form.vars.data %} + {% elseif form.parent is defined and form.parent.vars.data is not null %} + {% set method = 'get' ~ name|capitalize ~ 'AsFile' %} + {% set filename = attribute(form.parent.vars.data, method, []) %} + {% else %} + {% set filename = null %} + {% endif %} {% if filename %} {% set is_image = filename.__toString()|replace({'.png': '', '.jpg': '', '.jpeg': '', '.gif': ''})|length < filename.__toString()|length %}