Updated pagemanager UI

Opifer · Jan 29, 2016 · 6dc6542 · 6dc6542
1 parent 086b9d9
commit 6dc6542
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Block/Service/ListBlockService.php b/Block/Service/ListBlockService.php
@@ -55,7 +55,7 @@ public function buildManageForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             $builder->create('default', 'form', ['virtual' => true])
                 ->add('value', 'content_list_picker', [
-                    'label'    => 'collection',
+                    'label'    => 'label.content',
                     'multiple' => true,
                     'property' => 'title',
                     'class'    => 'Opifer\CmsBundle\Entity\Content',

diff --git a/Resources/translations/messages.en.yml b/Resources/translations/messages.en.yml
@@ -5,6 +5,10 @@ title:
 
 label:
     block: Block
+    content: Content
+
+warning:
+    block_shared_edit: 'This is a shared block. <br /><span class="small">Shared blocks need publishing individually.</span>'
 
 # Content
 content:
@@ -36,8 +40,6 @@ content:
 block:
     shared:
         label: Shared
-        edit:
-            warning: This is a shared block
     shared_name:
         label: Name
         placeholder: 'Only use [a-zA-Z] characters'
@@ -86,3 +88,5 @@ button:
     cancel: Cancel
     delete: Delete
     edit: Edit
+    publish: Publish
+    block_share: Share block
diff --git a/Resources/views/Editor/edit_block.html.twig b/Resources/views/Editor/edit_block.html.twig
@@ -13,25 +13,25 @@
         {% if block.isShared %}
         <div class="row row-space-2">
             <div class="col-xs-12">
-                <p><i class="material-icons md-18">all_inclusive</i>&nbsp; &nbsp; {{ 'block.shared.edit.warning'|trans }}</p>
+                <p><i class="material-icons md-18">all_inclusive</i>&nbsp; &nbsp; {{ 'warning.block_shared_edit'|trans|raw }}</p>
             </div>
         </div>
         {% endif %}
         <div class="row row-space-2">
             <ul class="nav nav-tabs nav-tabs-spill">
                 {% if form.default|default %}<li role="presentation" class="active"><a href="#block-general" data-toggle="tab">General</a></li>{% endif %}
-                {% if form.properties is defined %}<li role="presentation"><a {% if not form.default|default %}class="active"{% endif %} href="#block-properties" data-toggle="tab">Properties</a></li>{% endif %}
+                {% if form.properties is defined %}<li role="presentation" {% if not form.default|default %}class="active"{% endif %}><a href="#block-properties" data-toggle="tab">Properties</a></li>{% endif %}
                 {% if block.isShared %}<li role="presentation"><a href="#block-shared" data-toggle="tab">Shared</a></li>{% endif %}
                 <li class="dropdown pull-right">
                     <a class="dropdown-toggle" type="button" id="blockEditContextMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                         <i class="material-icons md-18">menu</i>
                     </a>
                     <ul class="dropdown-menu" aria-labelledby="blockEditContextMenu">
                         {% if not block.isShared %}
-                            <li><a href="#" class="pm-btn-make-shared"><i class="material-icons md-18">all_inclusive</i> Make shared</a></li>
+                            <li><a href="#" class="pm-btn-make-shared"><i class="material-icons md-18">all_inclusive</i> {{ "button.block_share"|trans }}</a></li>
                         {% endif %}
                         {% if block.isShared %}
-                            <li><a href="#" class="pm-btn-publish-shared"><i class="material-icons md-18">publish</i> Publish</a></li>
+                            <li><a href="#" class="pm-btn-publish-shared"><i class="material-icons md-18">publish</i> {{ "button.publish"|trans }}</a></li>
                         {% endif %}
                     </ul>