@@ -38,11 +38,11 @@ </h1> </div> {% endfor %} + {% if groups.paginated and groups.pages > 1 %} <div class="pagination"> $groups.next_link $groups.prev_link - {% if groups.paginated and groups.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(groups.page, groups.pages) }</span> - {% endif %} </div> + {% endif %} {% endblock %} admin/layout/pages/manage_groups.twig @@ -53,14 +53,14 @@ {% endfor %} </tbody> </table> + {% if pages.paginated and pages.pages > 1 %} <br /> <div class="pagination"> $pages.next_link $pages.prev_link - {% if pages.paginated and pages.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(pages.page, pages.pages) }</span> - {% endif %} </div> + {% endif %} {% if pages.total %} <br /> <h2>${ "Reorder Pages" | translate }</h2> admin/layout/pages/manage_pages.twig @@ -64,12 +64,12 @@ {% endfor %} </tbody> </table> + {% if posts.paginated and posts.pages > 1 %} <br /> <div class="pagination"> $posts.next_link $posts.prev_link - {% if posts.paginated and posts.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(posts.page, posts.pages) }</span> - {% endif %} </div> + {% endif %} {% endblock %} admin/layout/pages/manage_posts.twig @@ -64,12 +64,12 @@ {% endfor %} </tbody> </table> + {% if users.paginated and users.pages > 1 %} <br /> <div class="pagination"> $users.next_link $users.prev_link - {% if users.paginated and users.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(users.page, users.pages) }</span> - {% endif %} </div> + {% endif %} {% endblock %} admin/layout/pages/manage_users.twig @@ -22,12 +22,12 @@ </thead> <tbody> {% for aggregate in aggregates.paginated %} - <tr id="comment_$comment.id" class="comment $comment.status{% if loop.last %} last{% endif %}"> + <tr class="aggregate {% if loop.last %} last{% endif %}"> <td class="main">$aggregate.name <span class="sub">(<a href="$aggregate.url">${ "source" | translate("aggregator") }</a>)</a></td> <td>${ aggregate.feather | capitalize }</td> <td>${ aggregate.user.full_name | fallback(aggregate.user.login) }</td> <td>{% if aggregate.last_updated %}${ aggregate.last_updated | strftime }{% else %}<span class="sub">${ "never" | translate }</span>{% endif %}</td> - ${ trigger.call("manage_aggregates_column", comment) } + ${ trigger.call("manage_aggregates_column", aggregate) } {% if visitor.group.can("edit_aggregate", "delete_aggregate", true) %} <td class="controls"><a href="{% admin "edit_aggregate&id=" ~ (aggregate.name | urlencode) %}" class="edit_link"><img src="images/icons/edit.png" alt="edit" /> ${ "edit" | translate }</a></td> <td class="controls"><a href="{% admin "delete_aggregate&id=" ~ (aggregate.name | urlencode) %}" class="delete_link"><img src="images/icons/delete.png" alt="delete" /> ${ "delete" | translate }</a></td> @@ -47,12 +47,12 @@ {% endfor %} </tbody> </table> + {% if aggregates.paginated and aggregates.pages > 1 %} <br /> <div class="pagination"> $aggregates.next_link $aggregates.prev_link - {% if aggregates.paginated and aggregates.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(aggregates.page, aggregates.pages) }</span> - {% endif %} </div> + {% endif %} {% endblock %} modules/aggregator/pages/admin/manage_aggregates.twig @@ -103,12 +103,12 @@ </div> {% endif %} </form> + {% if comments.paginated and comments.pages > 1 %} <br /> <div class="pagination"> $comments.next_link $comments.prev_link - {% if comments.paginated and comments.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(comments.page, comments.pages) }</span> - {% endif %} </div> + {% endif %} {% endblock %} modules/comments/pages/admin/manage_comments.twig @@ -88,12 +88,12 @@ </button> </div> </form> + {% if comments.paginated and comments.pages > 1 %} <br /> <div class="pagination"> $comments.next_link $comments.prev_link - {% if comments.paginated and comments.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(comments.page, comments.pages) }</span> - {% endif %} </div> + {% endif %} {% endblock %} modules/comments/pages/admin/manage_spam.twig @@ -64,12 +64,12 @@ </div> </fieldset> </form> + {% if posts.paginated and posts.pages > 1 %} <div class="clear"></div> <div class="pagination"> $posts.next_link $posts.prev_link - {% if posts.paginated and posts.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(posts.page, posts.pages) }</span> - {% endif %} </div> + {% endif %} {% endblock %} modules/tags/pages/admin/manage_tags.twig 458b57ca0fe5c0194d73cd0373a8e5799019621a Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/9d32ab36792af4ca58dadb965409839efe6adac5 9d32ab36792af4ca58dadb965409839efe6adac5 2008-10-29T19:07:28-07:00 2008-10-29T19:07:28-07:00 * Pagination display tweaks. * Renamed a few things on the Manage Aggregates page that were left over from copy/pasting the Manage Comments page. 6b6390a02fe82a32e838b4a04a16435c81359b0d Alex Suraci i.am@toogeneric.com