translation, layout, and menu

DependencyInjection/ChillDocStoreExtension.php

@@ -28,6 +28,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $loader->load('services.yml');
         $loader->load('services/media.yml');
         $loader->load('services/controller.yml');
+        $loader->load('services/menu.yml');
         
     }
 

Menu/MenuBuilder.php

@@ -0,0 +1,87 @@
+<?php
+/*
+ */
+namespace Chill\DocStoreBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Knp\Menu\MenuItem;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Translation\TranslatorInterface;
+
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class MenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     *
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
+    
+    /**
+     *
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+    
+    /**
+     *
+     * @var TranslatorInterface
+     */
+    protected $translator;
+    
+    public function __construct(
+        TokenStorageInterface $tokenStorage, 
+        AuthorizationHelper $authorizationHelper, 
+        TranslatorInterface $translator
+    ){
+        $this->tokenStorage = $tokenStorage;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->translator = $translator;
+    }
+
+    
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        switch($menuId) {
+            case 'person':
+                $this->buildMenuPerson($menu, $parameters);
+                break;
+            default:
+                throw new \LogicException("this menuid $menuId is not implemented");
+        }
+    }
+    
+    protected function buildMenuPerson(MenuItem $menu, array $parameters)
+    {
+        /* @var $person \Chill\PersonBundle\Entity\Person */
+        $person = $parameters['person'];
+        $user = $this->tokenStorage->getToken()->getUser();
+        
+        if ($this->authorizationHelper->userHasAccess($user, 
+            $person->getCenter(), PersonDocumentVoter::SEE)) {
+            
+            $menu->addChild($this->translator->trans('Documents'),  [
+                    'route' => 'person_document_index',
+                    'routeParameters' => [
+                        'person' => $person->getId()
+                    ]
+                ])
+                ->setExtras([
+                    'order'=> 350
+                ]);
+        }
+        
+    }
+
+    public static function getMenuIds(): array
+    {
+        return [ 'person' ];
+    }
+}

Resources/config/services/menu.yml

@@ -0,0 +1,8 @@
+services:
+    Chill\DocStoreBundle\Menu\MenuBuilder:
+        arguments:
+            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
+            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+        tags:
+            - { name: 'chill.menu_builder' }

Resources/translation/messages.yml

@@ -1,2 +0,0 @@
-## YAML Template.
----

Resources/translations/messages.fr.yml

@@ -0,0 +1,13 @@
+Document: Document
+Documents for %name%: Documents de %name%
+Preparing: En préparation
+Ready to show: Prêt à être visualisé
+Download: Télécharger
+Create new document: Créer un nouveau document
+New document for %name%: Nouveau document pour %name%
+Editing document for %name%: Modification d'un document pour %name%
+Edit Document: Modification d'un document
+Existing document: Document existant
+The document is successfully updated: Le document est mis à jour
+
+

Resources/views/Macro/macro.html.twig

@@ -1,3 +1,3 @@
 {% macro download_button(storedObject, filename = null) %}
-    <a class="sc-button bt-download" data-label-preparing="{{ ('Preparing'|trans ~ '...')|escape('html_attr') }}" data-label-ready="{{ 'Prêt'|trans|escape('html_attr') }}" data-download-button data-key="{{ storedObject.keyInfos|json_encode|escape('html_attr') }}" data-iv="{{ storedObject.iv|json_encode|escape('html_attr') }}" data-temp-url-get-generator="{{ storedObject|generate_url|escape('html_attr') }}" data-mime-type="{{ storedObject.type|escape('html_attr') }}" {% if filename is not null %}data-filename="{{ filename|escape('html_attr') }}"{% endif %}>{{ 'Download'|trans }}</a>
+    <a class="sc-button bt-download" data-label-preparing="{{ ('Preparing'|trans ~ '...')|escape('html_attr') }}" data-label-ready="{{ 'Ready to show'|trans|escape('html_attr') }}" data-download-button data-key="{{ storedObject.keyInfos|json_encode|escape('html_attr') }}" data-iv="{{ storedObject.iv|json_encode|escape('html_attr') }}" data-temp-url-get-generator="{{ storedObject|generate_url|escape('html_attr') }}" data-mime-type="{{ storedObject.type|escape('html_attr') }}" {% if filename is not null %}data-filename="{{ filename|escape('html_attr') }}"{% endif %}>{{ 'Download'|trans }}</a>
 {% endmacro %}

Resources/views/PersonDocument/index.html.twig

@@ -28,7 +28,7 @@
 {% endblock %}
 
 {% block personcontent %}
-    <h1>{{ 'Document for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}</h1>
+    <h1>{{ 'Documents for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}</h1>
 
     <table class="table">
         <thead>
@@ -52,16 +52,12 @@
                             {{ m.download_button(document.object, document.title) }}
                         </li>
                         <li>
-                            <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="sc-button">
-                                {{ 'See'|trans }}
-                            </a>
+                            <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="sc-button bt-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
                         <li>
-                            <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="sc-button bt-edit">
-                                {{ 'Edit'|trans }}
-                            </a>
+                            <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="sc-button bt-update"></a>
                         </li>
                     {% endif %}
                     </ul>

Resources/views/PersonDocument/new.html.twig

@@ -21,12 +21,18 @@
 {% block title %}{{ 'New document for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
 
 {% block personcontent %}
-    <h1>{{ 'Create new Document' | trans }}</h1>
+    <h1>{{ 'New document for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}</h1>
     
     {{ form_errors(form) }}
 
     {{ form_start(form) }}
-    {{ form_widget(form) }}
+    
+    {{ form_row(form.title) }}
+    {{ form_row(form.date) }}
+    {{ form_row(form.category) }}
+    {{ form_row(form.scope) }}
+    {{ form_row(form.description) }}
+    {{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
     <ul class="record_actions">
         <li class="cancel">

Resources/views/PersonDocument/show.html.twig

@@ -18,51 +18,58 @@
 
 {% set activeRouteKey = '' %}
 
+{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+
 {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
 
+{% block js %}
+    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+{% endblock %}
+
 {% block personcontent %}
-    <h1>{{ 'Document' | trans }}</h1>
+    <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
     
-    <table class="table">
-        <tbody>
-            <tr>
-                <th>{{ 'Title' | trans }}</th>
-                <td>{{ document.title }}</td>
-            </tr>
-            <tr>
-                <th>{{ 'Description' | trans }}</th>
-                <td>{{ document.description }}</td>
-            </tr>
-            <tr>
-                <th>{{ 'Content' | trans }}</th>
-                <td>{{ document.content }}</td>
-            </tr>
-            <tr>
-                <th>{{ 'Center' | trans}}</th>
-                <td>{{ document.center }}</td>
-            </tr>
-            <tr>
-                <th>{{ 'Scope' | trans }}</th>
-                <td>{{ document.scope.name | localize_translatable_string }}</td>
-            </tr>
-            <tr>
-                <th>{{ 'Last modificiation by' | trans }}</th>
-                <td>{{ document.user }}</td>
-            </tr>
-            <tr>
-                <th>{{ 'Last update' | trans }}</th>
-                <td>{{ document.date ? document.date|date('Y-m-d H:i:s') : '' }}</td>
-            </tr>
-        </tbody>
-    </table>
+    <dl class="chill_view_data">
+        <dt>{{ 'Title'|trans }}</dt>
+        <dd>{{ document.title }}</dd>
         
-    <a href="{{ path('person_document_index', {'person': person.id}) }}" class="sc-button">
-        {{ 'Back to list' | trans }}
+        <dt>{{ 'Scope' | trans }}</dt>
+        <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        
+        <dt>{{ 'Category'|trans }}</dt>
+        <dd>{{ document.category.name|localize_translatable_string }}</dd>
+
+        <dt>{{ 'Description' | trans }}</dt>
+        <dd>
+            {% if document.description is empty %}
+            <span class="chill-no-data-statement">{{ 'Any description' }}</span>
+            {% else %}
+            <blockquote class="chill-user-quote">
+                {{ document.description }}
+            </blockquote>
+            {% endif %}
+        </dd>
+
+    </dl>
+
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="sc-button bt-cancel">
+                {{ 'Back to the list' | trans }}
             </a>
+        </li>
         
+        <li>
+            {{ m.download_button(document.object, document.title) }}
+        </li>
+
+        {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+            <li>
                 <a href="{{ path('person_document_edit', {'id': document.id, 'person': person.id}) }}" class="sc-button bt-edit">
                     {{ 'Edit' | trans }}
                 </a>
+            </li>
+        {% endif %}
 
-    {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }}
+    {# {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }} #}
 {% endblock %}