mirror of
https://github.com/TracksApp/tracks.git
synced 2025-09-22 05:50:47 +02:00
Much prettier defer buttons and sane CSS that doesn't have issues with note divs.
This commit is contained in:
parent
1324652726
commit
ab28b22cbf
7 changed files with 4 additions and 4 deletions
|
@ -281,7 +281,7 @@ module TodosHelper
|
|||
end
|
||||
|
||||
def defer_link(days)
|
||||
link_to_remote "+#{days}", :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => days, :_source_view => @source_view.underscore.gsub(/\s+/,'_')}
|
||||
link_to_remote image_tag("defer_#{days}.png"), :url => {:controller => 'todos', :action => 'defer', :id => @todo.id, :days => days, :_source_view => (@source_view.underscore.gsub(/\s+/,'_') rescue "")}
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
<%= remote_star_icon %>
|
||||
<%= remote_toggle_checkbox unless source_view_is :deferred %>
|
||||
<div class="description<%= staleness_class( todo ) %>">
|
||||
<span class="defer-container"><%= defer_link(1) %> <%= defer_link(7) %></span>
|
||||
<%= date_span -%>
|
||||
<span class="todo.descr"><%= h sanitize(todo.description) %></span>
|
||||
<%= link_to(image_tag("recurring16x16.png"), {:controller => "recurring_todos", :action => "index"}, :class => "recurring_icon") if @todo.from_recurring_todo? %>
|
||||
|
@ -18,7 +19,6 @@
|
|||
<%= deferred_due_date %>
|
||||
<%= project_and_context_links( parent_container_type, :suppress_context => suppress_context, :suppress_project => suppress_project ) %>
|
||||
<%= render(:partial => "todos/toggle_notes", :locals => { :item => todo }) if todo.notes? %>
|
||||
<span class="defer-container"><%= defer_link(1) %> <%= defer_link(7) %></span>
|
||||
</div>
|
||||
</div>
|
||||
<div id="<%= dom_id(todo, 'edit') %>" class="edit-form" style="display:none">
|
||||
|
|
BIN
public/images/defer_1.png
Normal file
BIN
public/images/defer_1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3 KiB |
BIN
public/images/defer_7.png
Normal file
BIN
public/images/defer_7.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.1 KiB |
|
@ -1202,6 +1202,5 @@ body.integrations textarea {
|
|||
background-color:#ddd;
|
||||
}
|
||||
.defer-container {
|
||||
position: absolute;
|
||||
right: 2px;
|
||||
float:right;
|
||||
}
|
||||
|
|
|
@ -220,6 +220,7 @@ body.integrations h2 {margin-top:40px; padding-top:20px; margin-bottom:10px; bor
|
|||
body.integrations p, body.integrations li {font-size:1.0em}
|
||||
body.integrations li {list-style-type: disc; list-style-position: inside; margin-left:30px}
|
||||
body.integrations textarea {margin:10px; padding:3px; width:80%; background-color:#ddd}
|
||||
.defer-container {float:right}
|
||||
div.calendar {position: relative}
|
||||
.calendar, .calendar table {border: 1px solid #556; font-size: 11px; color: #000; cursor: default; background: #eef; z-index: 110; font-family: tahoma,verdana,sans-serif}
|
||||
.calendar .button {text-align: center; padding: 2px}
|
Loading…
Add table
Add a link
Reference in a new issue