Changeset 726
- Timestamp:
- 11/15/07 18:21:23 (1 year ago)
- Files:
-
- trunk/app/helpers/task_helper.rb (modified) (1 diff)
- trunk/app/views/task/_form.rhtml (modified) (2 diffs)
- trunk/public/stylesheets/tasks.css (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/app/helpers/task_helper.rb
r533 r726 33 33 disabled = disabled_items.include?(item) ? 'disabled' : nil 34 34 # Switch to this when using Effect.appear/fade 35 # row_style = visible_items.include?(item) ? '' : ' style="display:none"'36 row_style = visible_items.include?(item) ? '' : ' class="hidden"'35 # row_style = visible_items.include?(item) ? '' : 'style="display:none"' 36 row_style = visible_items.include?(item) ? '' : 'class="hidden"' 37 37 row_id = (assigned ? 'assigned' : 'available') + '_' + item.id.to_s 38 38 39 result += "<tr #{ row_style} id=\"#{row_id}\">"39 result += "<tr #{row_style} id=\"#{row_id}\">" 40 40 41 41 if show_buttons trunk/app/views/task/_form.rhtml
r599 r726 14 14 else 15 15 worker_input.value = '' 16 16 17 17 /* FIXME: This will fail if the user is fast enough. The Appear effect must be 18 18 completed before user clicks the move button or the row will become invisible on … … 138 138 <table> 139 139 <tr> 140 <th ><%= _('Available users') %></th>141 <th ><%= _('Assigned users') %></th>140 <th class="worker_list"><%= _('Available users') %></th> 141 <th class="worker_list"><%= _('Assigned users') %></th> 142 142 </tr> 143 143 <tr> trunk/public/stylesheets/tasks.css
r694 r726 3 3 4 4 div#task { 5 background: #ffd url(../images/bg_task.png) top right no-repeat;6 padding: 1em;7 margin-top: 1em;8 position: relative;5 background: #ffd url(../images/bg_task.png) top right no-repeat; 6 padding: 1em; 7 margin-top: 1em; 8 position: relative; 9 9 } 10 10 … … 23 23 24 24 div#task h4 { 25 color: #C00;25 color: #C00; 26 26 } 27 27 28 28 div#task table.buttons { 29 border: 0;30 background: none;31 width: auto;29 border: 0; 30 background: none; 31 width: auto; 32 32 } 33 33 34 34 div#task table.buttons td { 35 padding-left: 0;35 padding-left: 0; 36 36 } 37 37 … … 62 62 } 63 63 .passed_deadline { 64 font-weight: bold;65 color: red;64 font-weight: bold; 65 color: red; 66 66 } 67 67 68 68 /* FIXME: Added by jarmo to keep the worker list somewhat stable when moving 69 * users around 69 * users around. Modified by markku to work on IE (and FF) and to be more stable. 70 70 */ 71 th.worker_list, td.worker_list { 72 width: 50%; 73 } 71 74 div.worker_list { 72 overflow: auto;73 height: 200px;75 overflow: auto; 76 height: 200px; 74 77 } 75 78 div.worker_list tr.hidden { 76 display: none; 77 } 78 td.worker_list { 79 width: 3em; 80 } 81 div.worker_list td.name { 82 width 2.8em; 79 display: none; 83 80 } 84 81 85 82 td.task_can_start { 86 color: green;83 color: green; 87 84 } 88 85 89 86 td.task_late { 90 color: red;87 color: red; 91 88 } 92 89