Procházet zdrojové kódy

Update preview mode

Emmanuel Vella před 12 roky
rodič
revize
6e2167d470

+ 2 - 0
Controller/CRUDController.php

@@ -318,6 +318,7 @@ class CRUDController extends Controller
             } elseif ($this->isPreviewRequested()) {
                 // enable the preview template if the form was valid and preview was requested
                 $templateKey = 'preview';
+                $this->admin->getShow();
             }
         }
 
@@ -507,6 +508,7 @@ class CRUDController extends Controller
             } elseif ($this->isPreviewRequested()) {
                 // pick the preview template if the form was valid and preview was requested
                 $templateKey = 'preview';
+                $this->admin->getShow();
             }
         }
 

+ 1 - 1
Resources/public/css/layout.css

@@ -356,7 +356,7 @@ legend.sonata-ba-fieldset-collapsed-description + .sonata-ba-collapsed-fields {
     padding-left: 5px;
 }
 
-.sonata-preview-form-container fieldset {
+.sonata-preview-form-container fieldset, .sonata-preview-form-container .tabbable {
     display: none;
 }
 

+ 3 - 3
Resources/translations/SonataAdminBundle.fr.xliff

@@ -328,15 +328,15 @@
             </trans-unit>
             <trans-unit id="btn_preview">
                 <source>btn_preview</source>
-                <target>btn_preview</target>
+                <target>Prévisualiser</target>
             </trans-unit>
             <trans-unit id="btn_preview_approve">
                 <source>btn_preview_approve</source>
-                <target>btn_preview_approve</target>
+                <target>Accepter</target>
             </trans-unit>
             <trans-unit id="btn_preview_decline">
                 <source>btn_preview_decline</source>
-                <target>btn_preview_decline</target>
+                <target>Refuser</target>
             </trans-unit>
             <trans-unit id="label_per_page">
               <source>label_per_page</source>

+ 4 - 1
Resources/views/CRUD/base_edit_form.html.twig

@@ -63,7 +63,10 @@
                         {% endif %}
                     {% else %}
                         {% if admin.supportsPreviewMode %}
-                            <input class="btn btn-info persist-preview" name="btn_preview" type="submit" value="{{ 'btn_preview'|trans({}, 'SonataAdminBundle') }}"/>
+                            <button class="btn btn-info persist-preview" name="btn_preview" type="submit">
+                                <i class="icon-eye-open"></i>
+                                {{ 'btn_preview'|trans({}, 'SonataAdminBundle') }}
+                            </button>
                         {% endif %}
                         {% if admin.id(object) %}
                             <input type="submit" class="btn btn-primary" name="btn_update_and_edit" value="{{ 'btn_update_and_edit_again'|trans({}, 'SonataAdminBundle') }}"/>

+ 8 - 2
Resources/views/CRUD/preview.html.twig

@@ -18,8 +18,14 @@ file that was distributed with this source code.
 {% endblock %}
 
 {% block formactions %}
-    <input class="btn btn-success" type="submit" name="btn_preview_approve" value="{{ 'btn_preview_approve'|trans({}, 'SonataAdminBundle') }}"/>
-    <input class="btn btn-danger" type="submit" name="btn_preview_decline" value="{{ 'btn_preview_decline'|trans({}, 'SonataAdminBundle') }}"/>
+    <button class="btn btn-success" type="submit" name="btn_preview_approve">
+        <i class="icon-ok"></i>
+        {{ 'btn_preview_approve'|trans({}, 'SonataAdminBundle') }}
+    </button>
+    <button class="btn btn-danger" type="submit" name="btn_preview_decline">
+        <i class="icon-remove"></i>
+        {{ 'btn_preview_decline'|trans({}, 'SonataAdminBundle') }}
+    </button>
 {% endblock %}
 
 {% block preview %}