Changeset 1134 for trunk


Ignore:
Timestamp:
04/24/10 22:07:41 (2 years ago)
Author:
wefgef
Message:

Added sortable tables.

Location:
trunk/www
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/www/macros/macro_rankings.php

    r1117 r1134  
    4242    $options = pager_init_options($args); 
    4343    $options['show_count'] = true; 
     44    $options['css_class'] = 'sortable'; 
    4445 
    4546    // Rounds parameters 

  • trunk/www/macros/macro_stars.php

    r934 r1134  
    4343        $html .= "<img src=\"".html_escape($url)."\" alt=\"{$type}\"/>"; 
    4444    } 
     45 
     46    // add hidden text to allow js sorting 
     47    $html .= "<div class='hidden'>" . $rating . "/" . $scale . "</div>"; 
     48 
    4549    $html .= "</span>"; 
    4650 

  • trunk/www/macros/macro_tasks.php

    r1132 r1134  
    167167    $options['css_row_parity'] = true; 
    168168 
    169     $options['css_class'] = 'tasks'; 
     169    $options['css_class'] = 'tasks sortable'; 
    170170    if (getattr($args, 'drag_and_drop', false)) 
    171171      $options['css_class'] .= ' dragndrop'; 

  • trunk/www/static/css/screen.css

    r1132 r1134  
    10401040} 
    10411041 
     1042/* Tasks table */ 
     1043table.tasks { 
     1044    line-height: 2em; 
     1045    width: 99%; 
     1046} 
    10421047 
    10431048/* Basic table css */ 
    10441049table { 
    10451050    border-collapse: collapse; 
    1046     line-height: 2em; 
    1047     margin: 0.5em; 
    1048     width: 99%; 
    10491051} 
    10501052 
    … …  
    15731575    vertical-align: super; 
    15741576} 
     1577 
     1578/* Sort tables */ 
     1579.hidden { 
     1580    display: none; 
     1581} 

  • trunk/www/static/js/tablednd.js

    r1132 r1134  
    3838            currenttable.oldY = y; 
    3939            // update the style to show we're dragging 
    40             currenttable.dragObject.style.backgroundColor = "#eee"; 
     40            // currenttable.dragObject.style.backgroundColor = "#eee"; 
    4141            // If we're over a row then move the dragged row to there so that the user sees the 
    4242            // effect dynamically 
    … …  
    4444            if (currentRow) { 
    4545                if (movingDown && currenttable.dragObject != currentRow) { 
    46                     currenttable.dragObject.parentNode.insertBefore(currenttable.dragObject, currentRow.nextSibling) 
     46                    currenttable.dragObject.parentNode.insertBefore(currenttable.dragObject, currentRow.nextSibling); 
     47                    recolorTable(currenttable.dragObject.parentNode.parentNode); 
    4748                } else if (! movingDown && currenttable.dragObject != currentRow) { 
    4849                    currenttable.dragObject.parentNode.insertBefore(currenttable.dragObject, currentRow); 
     50                    recolorTable(currenttable.dragObject.parentNode.parentNode); 
    4951                } 
    5052            } 

  • trunk/www/views/header.php

    r1132 r1134  
    6969    <script type="text/javascript" src="<?= html_escape(url_static('js/tags.js')) ?>"></script> 
    7070    <script type="text/javascript" src="<?= html_escape(url_static('js/roundtimer.js')) ?>"></script> 
     71    <script type="text/javascript" src="<?= html_escape(url_static('js/restoreparity.js')) ?>"></script> 
    7172    <script type="text/javascript" src="<?= html_escape(url_static('js/foreach.js')) ?>"></script> 
     73    <script type="text/javascript" src="<?= html_escape(url_static('js/sorttable.js')) ?>"></script> 
    7274    <script type="text/javascript" src="<?= html_escape(url_static('js/tablednd.js')) ?>"></script> 
    7375 
Note: See TracChangeset for help on using the changeset viewer.