Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-11 07:02:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merging tracks master

Browse source
This commit is contained in:
sfischme 2011-09-27 06:35:48 -04:00
commit 5b95092c08
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/todos/_text_todo.rhtml
View file

@ -1,4 +1,7 @@
<% <%
require 'htmlentities'
htmlentities = HTMLEntities.new
todo = text_todo todo = text_todo
if (todo.starred?) if (todo.starred?)
@ -8,11 +11,11 @@ else
end end
if (todo.completed?) && todo.completed_at if (todo.completed?) && todo.completed_at
result_string << "["+ t('todos.completed') +": " + format_date(todo.completed_at) + "] " result_string << "["+ htmlentities.decode(t('todos.completed')) +": " + format_date(todo.completed_at) + "] "
end end
if todo.due if todo.due
result_string << "[" + t('todos.due') + ": " + format_date(todo.due) + "] " result_string << "[" + htmlentities.decode(t('todos.due')) + ": " + format_date(todo.due) + "] "
result_string << todo.description + " " result_string << todo.description + " "
else else
result_string << todo.description + " " result_string << todo.description + " "

17
public/stylesheets/standard.css
View file

@ -4,6 +4,23 @@
.widgets a.reviewed, button.reviewed{ .widgets a.reviewed, button.reviewed{
float:right; float:right;
div.depends_on label {
float: left;
}
div#input_box div#todo_new_action_container div#todo_multi_add form#todo-form-multi-new-action.inline-form label {
float: center;
}
div#input_box div#todo_new_action_container div#todo_multi_add form#todo-form-multi-new-action.inline-form input#todos_sequential {
float:left;
width:30px;
}
input#project_name.project-name, input#project_default_context_name.ui-autocomplete-input, textarea#project_description.project-description, input#project_default_tags.ui-autocomplete-input {
width:100%;
} }
div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td {