Переглянути джерело

Merge pull request #485 from Samffy/pager

Update pagination
Thomas 13 роки тому
батько
коміт
2fe36ecd00

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

@@ -107,7 +107,8 @@ body.sonata-bc {
 
 .sonata-bc td.pager ul li a {
     border: 1px solid #cccccc;
-    padding: 4px;
+    line-height: 25px;
+    padding: 1px 8px 1px 8px;
     margin: 2px;
 }
 

+ 8 - 0
Resources/translations/SonataAdminBundle.ca.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Anterior</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Administració</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.de.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Vorherige</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.en.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Previous</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>First</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>Last</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.es.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Anterior</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.fr.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Précédent</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>Première</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>Dernière</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.hr.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Prethodna</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Administracija</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.it.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Pagina precedente</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.ja.xliff

@@ -86,6 +86,14 @@
                 <source>link_previous_pager</source>
                 <target>前へ</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.lb.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Zréck</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.nl.xliff

@@ -78,6 +78,14 @@
                 <source>link_previous_pager</source>
                 <target>Vorige</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.pl.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Poprzednia</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Panel administracyjny</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.pt_BR.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Anterior</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.pt_PT.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Anterior</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.ru.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Предыдущая</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Администрирование</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.sl.xliff

@@ -90,6 +90,14 @@
                 <source>link_previous_pager</source>
                 <target>Prejšnja</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>link_first_pager</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>link_last_pager</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Admin</target>

+ 8 - 0
Resources/translations/SonataAdminBundle.uk.xliff

@@ -78,6 +78,14 @@
                 <source>link_previous_pager</source>
                 <target>Попередні</target>
             </trans-unit>
+            <trans-unit id="link_first_pager">
+                <source>link_first_pager</source>
+                <target>First</target>
+            </trans-unit>
+            <trans-unit id="link_last_pager">
+                <source>link_last_pager</source>
+                <target>Last</target>
+            </trans-unit>
             <trans-unit id="Admin">
                 <source>Admin</source>
                 <target>Адмін</target>

+ 13 - 3
Resources/views/CRUD/base_list.html.twig

@@ -79,24 +79,34 @@ file that was distributed with this source code.
                                 <div class="pagination">
                                   <ul>
 
+                                      {% if admin.datagrid.pager.page != 1  %}
+                                          <li><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, 1)) }}" title="{% trans from 'SonataAdminBundle' %}link_first_pager{% endtrans %}">&laquo;</a></li>
+                                      {% endif %}
+
                                       {% if admin.datagrid.pager.page != admin.datagrid.pager.previouspage %}
-                                          <li class="prev"><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, admin.datagrid.pager.previouspage)) }}">{% trans from 'SonataAdminBundle' %}link_previous_pager{% endtrans %}</a></li>
+                                          <li><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, admin.datagrid.pager.previouspage)) }}" title="{% trans from 'SonataAdminBundle' %}link_previous_pager{% endtrans %}">&lsaquo;</a></li>
                                       {% endif %}
 
                                       {# Set the number of pages to display in the pager #}
                                       {% for page in admin.datagrid.pager.getLinks(5) %}
                                           {% if page == admin.datagrid.pager.page %}
-                                                <li class="active"><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, page)) }}">{{ page }}</a></li>
+                                              <li class="active"><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, page)) }}">{{ page }}</a></li>
                                           {% else %}
                                               <li><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, page)) }}">{{ page }}</a></li>
                                           {% endif %}
                                       {% endfor %}
 
                                       {% if admin.datagrid.pager.page != admin.datagrid.pager.nextpage %}
-                                          <li class="next"><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, admin.datagrid.pager.nextpage)) }}">{% trans from 'SonataAdminBundle' %}link_next_pager{% endtrans %}</a></li>
+                                          <li><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, admin.datagrid.pager.nextpage)) }}" title="{% trans from 'SonataAdminBundle' %}link_next_pager{% endtrans %}">&rsaquo;</a></li>
+                                      {% endif %}
+
+                                      {% if admin.datagrid.pager.page != admin.datagrid.pager.lastpage  %}
+                                          <li><a href="{{ admin.generateUrl('list', admin.modelmanager.paginationparameters(admin.datagrid, admin.datagrid.pager.lastpage)) }}" title="{% trans from 'SonataAdminBundle' %}link_last_pager{% endtrans %}">&raquo;</a></li>
                                       {% endif %}
+
                                   </ul>
                                 </div>
+
                             </td>
                         </tr>
                     {% endif %}