Merge branch 'hotfix/2.0.11'

sasezaki · Feb 23, 2011 · 4c3d313 · 4c3d313
2 parents 409615f + 76b4e79
commit 4c3d313
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/resources/templates/index.html b/resources/templates/index.html
@@ -219,7 +219,7 @@ <h3>Quick Start</h3>
         <p><a href="{$t.url()}">Terms of Service</a> | <a href="{$t.url('policy')}">Privacy Policy</a></p>
           -->
         <p>powered by <a href="http://nequal.jp/" target="_blank">nequal</a></p>
-        <p>hosted by <a href="http://www.dino.co.jp/" target="_blank">Dino Co.,Ltd.</a></p>
+        <p>hosted by <a href="http://www.unit-hosting.com/" target="_blank">unit hosting Inc.</a></p>
       </div>
     </div>
     <!-- /footer -->

diff --git a/resources/templates/maintainer/models.html b/resources/templates/maintainer/models.html
@@ -74,22 +74,21 @@ <h4>
                     </tr>
                 </tbody>
             </table>
-            
-            <rt:if param="{$paginator}">
+
+            <rt:if param="{$paginator.has_range()}">
             <div class="pager">
               <ul>
-                <rt:if param="{$paginator.is_first()}"><li> <a href="?{$paginator.query($paginator.first())}">&laquo; First</a> </li></rt:if>
+                <rt:if param="{$paginator.is_first(10)}"><li> <a href="?{$paginator.query($paginator.first())}">&laquo; First</a> </li></rt:if>
                 <?php
-                  $counter = 50;
-                  for($counter=$paginator->wh_first($counter);$counter<=$paginator->wh_last($counter);$counter++):
+                  for($counter=$paginator->which_first(10);$counter<=$paginator->which_last(10);$counter++):
                 ?>
-                <rt:if param="{$paginator.current()}" value="{$counter}">
+                <?php if ($paginator->current() == $counter): ?>
                 <li class="current"> {$counter} </li>
-                <rt:else />
+                <?php else: ?>
                 <li> <a href="?{$paginator.query($counter)}">{$counter}</a> </li>
-                </rt:if>
+                <?php endif; ?>
                 <?php endfor; ?>
-                <rt:if param="{$paginator.is_last()}"><li> <a href="?{$paginator.query($paginator.last())}">Last &raquo;</a> </li></rt:if>
+                <rt:if param="{$paginator.is_last(10)}"><li> <a href="?{$paginator.query($paginator.last())}">Last &raquo;</a> </li></rt:if>
               </ul>
             </div>
             </rt:if>

diff --git a/resources/templates/package/models.html b/resources/templates/package/models.html
@@ -57,7 +57,7 @@ <h3><rt:block name="subtitle">{$t.trans('Recent Released Packages')}</rt:block><
         <rt:if param="{$paginator.has_range()}">
         <div class="pager">
           <ul>
-            <rt:if param="{$paginator.is_first()}"><li> <a href="?{$paginator.query($paginator.first())}">&laquo; First</a> </li></rt:if>
+            <rt:if param="{$paginator.is_first(10)}"><li> <a href="?{$paginator.query($paginator.first())}">&laquo; First</a> </li></rt:if>
             <?php
               for($counter=$paginator->which_first(10);$counter<=$paginator->which_last(10);$counter++):
             ?>
@@ -67,7 +67,7 @@ <h3><rt:block name="subtitle">{$t.trans('Recent Released Packages')}</rt:block><
             <li> <a href="?{$paginator.query($counter)}">{$counter}</a> </li>
             <?php endif; ?>
             <?php endfor; ?>
-            <rt:if param="{$paginator.is_last()}"><li> <a href="?{$paginator.query($paginator.last())}">Last &raquo;</a> </li></rt:if>
+            <rt:if param="{$paginator.is_last(10)}"><li> <a href="?{$paginator.query($paginator.last())}">Last &raquo;</a> </li></rt:if>
           </ul>
         </div>
         </rt:if>