Changeset 4355

Show
Ignore:
Timestamp:
09/27/08 17:21:00 (2 months ago)
Author:
Blackhex
Message:

ScreenshotsPlugin:

  • Links to first page, last page and go to page form added to matrix view (#3780).
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • screenshotsplugin/0.11/tracscreenshots/htdocs/css/matrix-view.css

    r4305 r4355  
    4141  margin: 0em 0.5em; 
    4242} 
     43 
     44div.screenshots div.controls div.position 
     45{ 
     46  font-weight: bold; 
     47  margin: 1em; 
     48} 
     49 
     50/* Go to form style. */ 
     51div.screenshots form.goto 
     52{ 
     53  display: inline; 
     54  margin: 0em; 
     55} 
     56 
     57div.screenshots form.goto input[type="input"] 
     58{ 
     59  width: 2em; 
     60  margin: 0em; 
     61} 
     62 
     63div.screenshots form.goto input[type="submit"] 
     64{ 
     65  margin: 0em; 
     66} 

  • screenshotsplugin/0.11/tracscreenshots/matrix_view.py

    r3141 r4355  
    3939 
    4040        # Get custom request arguments. 
    41         index = int(req.args.get('index') or 0) 
     41        index = int(req.args.get('index') or -1) 
     42        page = int(req.args.get('page') or -1) 
    4243 
    43         # Compute current page, page count, next and previous page id. 
     44        # Count index or page depending on user input. 
    4445        count = len(data['screenshots']) 
    4546        count_on_page = self.rows * self.columns 
    46         page = (index / count_on_page) + 1 
     47        if index != -1: 
     48            page = (index / count_on_page) + 1 
     49        else: 
     50            index = (page - 1) * count_on_page 
     51 
     52        self.log.debug('index: %s' % (index)) 
     53        self.log.debug('page: %s' % (page)) 
     54 
     55        # Compute page count, next and previous page id. 
    4756        page_cout = (count + (count_on_page - 1)) / count_on_page 
    4857        prev_index = (index - count_on_page) 
    …… 
    6574        data['prev_index'] = prev_index 
    6675        data['next_index'] = next_index 
     76        data['screenshot_count'] = len(data['screenshots']) 
    6777 
    6878        return ('screenshots-matrix-view.html', None) 

  • screenshotsplugin/0.11/tracscreenshots/templates/screenshots-matrix-view.html

    r4305 r4355  
    4040 
    4141  <div class="controls"> 
     42    <div class="position">Page ${screenshots.page}/${screenshots.page_count}</div> 
     43    &larr; 
    4244    <py:choose> 
    4345      <py:when test="screenshots.prev_index != -1"> 
    44         <a href="${href.screenshots()}?index=${screenshots.prev_index}">&larr; Previous Page</a> 
     46        <a href="${href.screenshots()}?index=0">First Page</a> 
    4547      </py:when> 
    4648      <py:otherwise> 
    47         &larr; Previous Page 
     49        First Page 
    4850      </py:otherwise> 
    4951    </py:choose> 
    50     &nbsp;${screenshots.page}/${screenshots.page_count}&nbsp; 
     52    | 
     53    <py:choose> 
     54      <py:when test="screenshots.prev_index != -1"> 
     55        <a href="${href.screenshots()}?index=${screenshots.prev_index}">Previous Page</a> 
     56      </py:when> 
     57      <py:otherwise> 
     58        Previous Page 
     59      </py:otherwise> 
     60    </py:choose> 
     61    | 
     62    <span> 
     63      <form class="goto" method="get" action="${href.screenshots()}"> 
     64        <input type="input" name="page" value="${screenshots.page or '1'}" onkeypress="return checkNumber(event)"/> 
     65        <input type="submit" value="Go"></input> 
     66      </form> 
     67    </span> 
     68    | 
    5169    <py:choose> 
    5270      <py:when test="screenshots.next_index != -1"> 
    53         <a href="${href.screenshots()}?index=${screenshots.next_index}">Next Page &rarr;</a> 
     71        <a href="${href.screenshots()}?index=${screenshots.next_index}">Next Page</a> 
    5472      </py:when> 
    5573      <py:otherwise> 
    56         Next Page &rarr; 
     74        Next Page 
    5775      </py:otherwise> 
    5876    </py:choose> 
     77    | 
     78    <py:choose> 
     79      <py:when test="screenshots.next_index != -1"> 
     80        <a href="${href.screenshots()}?index=${screenshots.screenshot_count - 1}">Last Page</a> 
     81      </py:when> 
     82      <py:otherwise> 
     83        Last Page 
     84      </py:otherwise> 
     85    </py:choose> 
     86    &rarr; 
     87 
    5988  </div> 
    6089</html>