Messing with voters

templates/data_entry.html.twig

@@ -33,7 +33,7 @@
                         </span>
                         <span class="pl-2">Profile</span>
                     </a>
-                  {% if 'ROLE_ADMIN' in app.user.roles %}
+                  {% if  is_granted('ROLE_ADMIN') %}
                     <a href="/admin" class="dropdown-item">
                         <span class="icon is-small">
                             <i class="fa fa-cogs"></i>
@@ -57,6 +57,7 @@
 <div class="columns mb-0">
     <div class="column is-one-fifth arcoa-menu mb-0">
        <aside class="menu pl-4">
+       {% if 'ROLE_READER' not in app.user.roles %}
             <p class="menu-label has-text-white mt-3 pt-5 pl-5 is-size-6">
                 Vocabularies
                 <span class="icon is-clickable pl-4" id="for-vocabs">
@@ -201,6 +202,7 @@
                     </a>
                 </li>
             </ul>
+            {% endif %}
             <p class="menu-label has-text-white mt-3 pt-5 pl-5 is-size-6">
                 Records
                 <span class="icon is-clickable pl-4" id="for-records">

templates/home/index.html.twig

@@ -3,6 +3,16 @@
 {% block title %}Home | ArCOA{% endblock %}
 
 {% block rightpanel %}
+    {% for message in app.flashes('warning') %}
+        <article class="message is-warning mb-6 mt-3 ml-auto mr-auto" style="max-width: 35vw">
+            <div class="message-header">
+                <p>Warning</p>
+                <button class="delete" aria-label="delete"></button>
+            </div>
+            <div class="message-body">{{ message }}</div>
+        </article>
+    {% endfor %}
+
     <div class="has-text-centered">
         <img width="200px" src="{{ asset('img/Logo-ArCOA-def.png') }}" />
     </div>
@@ -11,15 +21,6 @@
     <h2 class="is-size-3 mb-3 has-text-centered">Archivi e Collezioni dell'Oriente Antico</h2>
     <h2 class="is-size-3 mb-6 has-text-centered">Archives and Collections of the Ancient Near East</h2>
 
-    {% for message in app.flashes('warning') %}
-        <article class="message is-warning" style="max-width: 35vw; margin: 0 auto;">
-            <div class="message-header">
-                <p>Warning</p>
-                <button class="delete" aria-label="delete"></button>
-            </div>
-            <div class="message-body">{{ message }}</div>
-        </article>
-    {% endfor %}
 
     <div class="columns" style="max-width: 35vw; margin: 0 auto;">
         <div class="column mt-6 mb-5">

templates/vocab_func_context/index.html.twig

@@ -4,7 +4,7 @@
 
 {% block rightpanel %}
 <div class="container" style="max-width: 50vw">
-    <h1 class="is-size-1 mt-0 has-text-centered">Edit vocabulary</h1>
+    <h1 class="is-size-1 mt-0 has-text-centered">Vocabulary</h1>
     <h2 class="is-size-3 mt-4 has-text-centered">Functional context</h2>
 
     <div class="container mt-6">
@@ -18,6 +18,7 @@
                 {{ message }}
             </div>
         {% endfor %}
+        {% if is_granted('ROLE_ADMIN') or is_granted('ROLE_REVISOR') %}
         <form method="post" action="{{ path('app_vocab_func_context_add') }}">
             <label class="label">Add new term</label>
             <div class="field has-addons">
@@ -34,15 +35,17 @@
                 </div>
             </div>
         </form>
+        {% endif %}
 
         <h3 class="mt-6 mb-5 is-size-5"><strong>Terms in vocabulary</strong></h3>
         <table class="table is-fullwidth" id="terms">
-            <tr><th>Term</th><th>Actions</th></tr>
+            <tr><th>Term</th>{% if is_granted('ROLE_ADMIN') or is_granted('ROLE_REVISOR') %}<th>Actions</th>{% endif %}</tr>
         {% for term in terms %}
             <tr data-row-id="{{ term.id }}">
                 <td>
                     <input class="input" type="text" value="{{ term.term }}" disabled data-term-id="{{ term.id }}" />
                 </td>
+                {% if is_granted('ROLE_ADMIN') or is_granted('ROLE_REVISOR') %}
                 <td>
                     <div class="buttons">
                         <button class="button is-link" data-id-edit="{{ term.id }}">
@@ -59,6 +62,7 @@
                         </button>
                     </div>
                 </td>
+                {% endif %}
             </tr>
         {% endfor %}
         </table>