merging tracks master

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

View file

@ -1,4 +1,7 @@
<%
require 'htmlentities'
htmlentities = HTMLEntities.new
todo = text_todo
if (todo.starred?)
@ -8,11 +11,11 @@ else
end
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
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 + " "
else
result_string << todo.description + " "

View file

@ -4,6 +4,23 @@
.widgets a.reviewed, button.reviewed{
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 {