ID#171: switched to template usage instead of manipulation of the loc…

…al copy of the current DOM node within the controller.
AdventurePHP · Mar 28, 2014 · 07ed4ae · 07ed4ae
1 parent 064c3cd
commit 07ed4ae
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/modules/pager/pres/documentcontroller/AdvancedPagerController.php b/modules/pager/pres/documentcontroller/AdvancedPagerController.php
@@ -66,10 +66,11 @@ public function transformContent() {
 
       // do not display the pager in case we have no pages
       if (count($pages) == 0) {
-         $this->content = '';
          return;
       }
 
+      $content = $this->getTemplate('content');
+
       $pageCount = (int) 0;
       $currentPage = (int) 0;
 
@@ -95,7 +96,7 @@ public function transformContent() {
 
          $pageCount = $pages[$i]->getPageCount();
       }
-      $this->setPlaceHolder('Content', $buffer);
+      $content->setPlaceHolder('Content', $buffer);
 
       // display previous page link
       if ($currentPage > 1) {
@@ -108,10 +109,10 @@ public function transformContent() {
          } else {
             $prevActive->setPlaceHolder('Link', $link);
          }
-         $this->setPlaceHolder('PreviousPage', $prevActive->transformTemplate());
+         $content->setPlaceHolder('PreviousPage', $prevActive->transformTemplate());
       } else {
          $prevInactive = & $this->getTemplate('PreviousPage_Inactive');
-         $this->setPlaceHolder('PreviousPage', $prevInactive->transformTemplate());
+         $content->setPlaceHolder('PreviousPage', $prevInactive->transformTemplate());
       }
 
       // display next page link
@@ -127,10 +128,10 @@ public function transformContent() {
             $nextActive->setPlaceHolder('Link', $link);
          }
 
-         $this->setPlaceHolder('NextPage', $nextActive->transformTemplate());
+         $content->setPlaceHolder('NextPage', $nextActive->transformTemplate());
       } else {
          $nextInactive = & $this->getTemplate('NextPage_Inactive');
-         $this->setPlaceHolder('NextPage', $nextInactive->transformTemplate());
+         $content->setPlaceHolder('NextPage', $nextInactive->transformTemplate());
       }
 
       // display the dynamic page size bar
@@ -167,9 +168,11 @@ public function transformContent() {
          $entriesPerPageTmpl = & $this->getTemplate('EntriesPerPage_' . $this->getLanguage());
          $dynPageSize->setPlaceHolder('EntriesPerPage_Display', $entriesPerPageTmpl->transformTemplate());
 
-         $dynPageSize->transformOnPlace();
+         $content->setPlaceHolder('DynamicPageSize', $dynPageSize->transformTemplate());
       }
 
+      $content->transformOnPlace();
+
    }
 
 }
diff --git a/modules/pager/pres/templates/pager_2.html b/modules/pager/pres/templates/pager_2.html
@@ -1,14 +1,18 @@
 <@controller class="APF\modules\pager\pres\documentcontroller\AdvancedPagerController" @>
-<div class="apf-pager">
-   <div class="apf-pages">
-      <html:placeholder name="PreviousPage" /><html:placeholder name="Content" /><html:placeholder name="NextPage" />
-   </div>
-   <html:template name="DynamicPageSize">
-      <div class="apf-page-size">
-         <span><template:placeholder name="EntriesPerPage_Display" /></span>&nbsp;|<template:placeholder name="EntriesPerPage" />
+<html:template name="content">
+   <div class="apf-pager">
+      <div class="apf-pages">
+         <template:placeholder name="PreviousPage" /><template:placeholder name="Content" /><template:placeholder name="NextPage" />
       </div>
-   </html:template>
-</div>
+      <template:placeholder name="DynamicPageSize" />
+   </div>
+</html:template>
+
+<html:template name="DynamicPageSize">
+   <div class="apf-page-size">
+      <span><template:placeholder name="EntriesPerPage_Display" /></span>&nbsp;|<template:placeholder name="EntriesPerPage" />
+   </div>
+</html:template>
 
 <html:template name="Page_Selected_de">
    <a class="active" href="<template:placeholder name="Link" />" title="Seite <template:placeholder name="Page" /> anzeigen"><template:placeholder name="Page" /></a>&nbsp;&nbsp;
@@ -18,7 +22,6 @@
    <a class="active" href="<template:placeholder name="Link" />" title="Display page <template:placeholder name="Page" />"><template:placeholder name="Page" /></a>&nbsp;&nbsp;
 </html:template>
 
-
 <html:template name="Page_de">
    <a href="<template:placeholder name="Link" />" title="Seite <template:placeholder name="Page" /> anzeigen"><template:placeholder name="Page" /></a>&nbsp;&nbsp;
 </html:template>
@@ -27,7 +30,6 @@
    <a href="<template:placeholder name="Link" />" title="Display page <template:placeholder name="Page" />"><template:placeholder name="Page" /></a>&nbsp;&nbsp;
 </html:template>
 
-
 <html:template name="PreviousPage_Active_de">
    <a href="<template:placeholder name="Link" />" title="Vorherige Seite anzeigen!">&laquo;</a>&nbsp;&nbsp;
 </html:template>
@@ -40,7 +42,6 @@
    <span class="first">&laquo;</span>
 </html:template>
 
-
 <html:template name="NextPage_Active_de">
    <a href="<template:placeholder name="Link" />" title="N&auml;chste Seite anzeigen!"><span>&raquo;</span></a>
 </html:template>
@@ -53,7 +54,6 @@
    <span>&raquo;</span>
 </html:template>
 
-
 <html:template name="EntriesPerPage_Active_de">
    <a href="<template:placeholder name="Link" />" title="<template:placeholder name="Count" /> Eintr&auml;ge pro Seite anzeigen"><strong><template:placeholder name="Count" /></strong></a> |
 </html:template>
@@ -62,7 +62,6 @@
    <a href="<template:placeholder name="Link" />" title="Display <template:placeholder name="Count" /> entries per page"><strong><template:placeholder name="Count" /></strong></a> |
 </html:template>
 
-
 <html:template name="EntriesPerPage_Inactive_de">
    <a href="<template:placeholder name="Link" />" title="<template:placeholder name="Count" /> Eintr&auml;ge pro Seite anzeigen"><template:placeholder name="Count" /></a> |
 </html:template>