cvs diff: Diffing modules/project_issue Index: modules/project_issue/comment.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/comment.inc,v retrieving revision 1.73 diff -u -p -r1.73 comment.inc --- modules/project_issue/comment.inc 22 Dec 2006 23:54:14 -0000 1.73 +++ modules/project_issue/comment.inc 4 Jan 2007 11:08:21 -0000 @@ -97,7 +97,7 @@ function project_comment_view($node, $ma $rows = array(); $result = db_query('SELECT p.*, u.name FROM {project_comments} p INNER JOIN {users} u USING (uid) WHERE p.nid = %d ORDER BY p.created ASC', $node->nid); if (db_num_rows($result)) { - $output = '
'; + $output = '
'; $i = 0; while ($comment = db_fetch_object($result)) { $comment->body = db_decode_blob($comment->body); Index: modules/project_issue/issue.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/issue.inc,v retrieving revision 1.211 diff -u -p -r1.211 issue.inc --- modules/project_issue/issue.inc 3 Jan 2007 15:10:56 -0000 1.211 +++ modules/project_issue/issue.inc 4 Jan 2007 11:08:22 -0000 @@ -303,13 +303,13 @@ function project_issue_statistics($proje $result = db_query(db_rewrite_sql('SELECT COUNT(p.nid) AS total, p.sid FROM {project_issues} p INNER JOIN {node} n ON n.nid = p.nid WHERE n.status = 1%s GROUP BY p.sid', 'p'), $filter); while ($stat = db_fetch_object($result)) { $rows[$stat->sid][0] = project_issue_state($stat->sid);; - $rows[$stat->sid][1] = array('data' => $stat->total, 'class' => 'project-numeric'); - $rows[$stat->sid][2] = array('data' => number_format($stat->total / $total * 100) .'%', 'class' => 'project-numeric2'); + $rows[$stat->sid][1] = array('data' => $stat->total, 'class' => 'project-issue-numeric'); + $rows[$stat->sid][2] = array('data' => number_format($stat->total / $total * 100) .'%', 'class' => 'project-issue-numeric-light'); } // Activity this week $result = db_query(db_rewrite_sql('SELECT COUNT(p.nid) AS total, p.sid FROM {project_issues} p INNER JOIN {node} n ON n.nid = p.nid WHERE n.status = 1%s AND n.changed > %d GROUP BY p.sid', 'p'), $filter, $duration); while ($stat = db_fetch_object($result)) { - $rows[$stat->sid][3] = array('data' => $stat->total, 'class' => 'project-numeric'); + $rows[$stat->sid][3] = array('data' => $stat->total, 'class' => 'project-issue-numeric'); } $output .= '

'. t('Issue activity') .'

'; $output .= theme('table', $header, $rows); @@ -322,9 +322,9 @@ function project_issue_statistics($proje $orig = array('project' => array('data' => 0)); foreach (project_issue_state() as $key => $value) { - $orig[$key] = array('data' => '', 'class' => 'project-numeric'); + $orig[$key] = array('data' => '', 'class' => 'project-issue-numeric'); } - $orig['total'] = array('data' => '', 'class' => 'project-numeric'); + $orig['total'] = array('data' => '', 'class' => 'project-issue-numeric'); while ($stat = db_fetch_object($result)) { if (!$rows[$stat->nid]['project']) { @@ -877,7 +877,7 @@ function project_issue_view($node, $teas '#weight' => -5, ); $node->content['project_issue_header'] = array( - '#value' => '

'. t('Description') .'

', + '#value' => '
'. t('Description') .'
', '#weight' => -3, ); $node->content['project_issue_comments'] = array( @@ -1474,8 +1474,7 @@ function project_issue_query_result($que while ($node = db_fetch_object($result)) { $node = node_load($node->nid); $row = array(); - $number++; - $class = 'state_'. ($number % 2 ? 'light' : 'dark') ."_$node->sid"; + $class = "state-$node->sid"; if (!$project->nid) { $row[] = l($projects[$node->pid], "project/issues/$node->pid"); } Index: modules/project_issue/project_issue.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.css,v retrieving revision 1.9 diff -u -p -r1.9 project_issue.css --- modules/project_issue/project_issue.css 4 Jan 2007 11:05:46 -0000 1.9 +++ modules/project_issue/project_issue.css 4 Jan 2007 11:08:22 -0000 @@ -1,17 +1,35 @@ /* $Id: project_issue.css,v 1.9 2007/01/04 11:05:46 dww Exp $ */ /* $Name: $ */ -.project .header { +/* Viewing issue nodes */ +.project-issue .header { font-weight: bold; padding-top: 0.5em; } +.project-issue .summary table { + border-collapse: collapse; + width: auto; +} +.project-issue .summary table td { + color: #333; + background-color: transparent; + font-size: 90%; + padding: 0em 0.2em; + border: 0; +} +.project-issue tbody { + border: 0; +} +.project-issue .summary table tr { + border: 0; +} +/* Issue node and comment followup form UI */ .project-issue .node-form .inline-options fieldset .form-item { float: left; padding-right: 0.8em; margin: 0.05em 0.1em; } - .project-issue .node-form fieldset:after { content: "."; display: block; @@ -20,32 +38,94 @@ visibility: hidden; } +/* "My Projects" table UI */ table.projects { width: 100%; } - table.projects .project-name { width: 25%; } - table.projects .project-issue-updated { width: 14%; } - table.projects .project-issues { width: 8%; text-align: right; } - table.projects .project-issue-links { width: 20%; padding-left: 0.8em; } - table.projects .project-project-updated { width: 15%; } - table.projects .project-project-links { width: 18%; } + +/* Issue query bar UI */ +.project-issue .quick-search #edit-projects, +.project-issue .quick-search #edit-states { + width: 150px; +} +.project-issue .quick-search tr td .form-item, +.project-issue .quick-search tr td input { + margin: 0; + padding: 0; +} +.project-issue .quick-search tr td { + vertical-align: bottom; +} + +/* Issue query results (row coloring based on issue status) */ +.project-issue tr.state-1 { + background-color: #fff; +} +.project-issue tr.state-1 td.active { + background-color: #e1e7eb; +} +.project-issue tr.state-2 { + background-color: #c0ffc0; +} +.project-issue tr.state-2 td.active { + background-color: #cec; +} +.project-issue tr.state-3, .project-issue tr.state-4, .project-issue tr.state-5, .project-issue tr.state-6 { + background-color: #ddf; +} +.project-issue tr.state-3 td.active, .project-issue tr.state-4 td.active, .project-issue tr.state-5 td.active, .project-issue tr.state-6 td.active { + background-color: #cce; +} +.project-issue tr.state-7 { + background-color: #ffc9c9; +} +.project-issue tr.state-7 td.active { + background-color: #eeb9b9; +} +.project-issue tr.state-8 { + background-color: #ffd; +} +.project-issue tr.state-8 td.active { + background-color: #eed; +} +.project-issue tr.state-13 { + background-color: #ffe7dd; +} +.project-issue tr.state-13 td.active { + background-color: #eed7cc; +} +.project-issue tr.state-14 { + background-color: #e7ffdd; +} +.project-issue tr.state-14 td.active { + background-color: #d7eecc; +} + +/* Issue statistics page */ +.project-issue-numeric { + text-align: right; +} +.project-issue-numeric-light { + text-align: right; + color: #999; +} cvs diff: Diffing modules/project Index: modules/project/project.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/project.css,v retrieving revision 1.34 diff -u -p -r1.34 project.css --- modules/project/project.css 26 Dec 2006 01:11:30 -0000 1.34 +++ modules/project/project.css 4 Jan 2007 11:08:22 -0000 @@ -1,12 +1,22 @@ /* $Id$ */ /* $Name$ */ +.project table { + width: auto; +} +.project tbody { + border: 0; +} +.project tr { + border: 0; +} .project td { padding: 0.4em 0.1em; } .project td { vertical-align: top; } + .project .links { font-size: 0.8em; } @@ -15,55 +25,6 @@ font-size: 0.8em; } -.project table { - width: auto; -} - -.project table tr { - border: 0; -} - -.project tr.state_light_1 { - background-color: #fff; -} -.project tr.state_dark_1 { - background-color: #f6f6f6; -} - -.project tr.state_light_2, -.project tr.state_dark_2 { - background-color: #c0ffc0; -} - -.project tr.state_light_3, .project tr.state_light_4, .project tr.state_light_5, .project tr.state_light_6, -.project tr.state_dark_3, .project tr.state_dark_4, .project tr.state_dark_5, .project tr.state_dark_6 { - background-color: #c0c0ff; -} - -.project tr.state_light_7, -.project tr.state_dark_7 { - background-color: #ffc0c0; -} - -.project tr.state_light_8, -.project tr.state_dark_8 { - background-color: #ffff99; -} - -.project .summary table { - border-collapse: collapse; - width: auto; -} -.project .summary table td { - color: #333; - font-size: 90%; - padding: 0em 0.2em; -} - -.content .project table td { - border: 0; -} - .project .downloads td { border-bottom: 1px solid #ccc; padding-bottom: 1em; @@ -75,52 +36,18 @@ list-style-type: none; margin: 0px; } -.project .project-name { - width: 125px; -} -.project .project-teaser { -} -.project-recent { -} -.project-old { - font-size: smaller; -} -.project-numeric { - text-align: right; -} -.project-numeric2 { - text-align: right; - color: #999; -} - -.project .quick-search tr td .form-item, .project .quick-search tr td input { - margin: 0; - padding: 0; -} - -.project .quick-search tr td { - vertical-align: bottom; -} - -.project .quick-search #edit-projects, #edit-states, #edit-project_goto { +#edit-project-goto { width: 150px; } .project .node-form fieldset { display: block; } - .project .node-form .project-taxonomy-element { float: left; padding-right: 2em; } - ul.project-terms { padding-left: 1.5em; } - -#version-filter-form tr.odd { - background: none; - border: none; -} cvs diff: Diffing modules/project/po cvs diff: Diffing modules/project/po/ar cvs diff: Diffing modules/project/release