taskwarrior-web 1.1.7 → 1.1.8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.1.8 (1/15/13)
+
+* Support for adding and removing annotations on tasks.
+* Tasks are now sorted by the `urgency` property by default.
+* Miscellanous fixes and improvements.
+
 ## v1.1.7 (12/24/12)
 
 * Small hotfix for JS load order.

data/README.md

@@ -5,6 +5,9 @@ wonderful [Taskwarrior](http://taskwarrior.org/) todo application.
 
 ![TaskwarriorWeb screenshot](https://dl.dropbox.com/u/107599300/screenshot.png)
 
+[![Gem Version](https://badge.fury.io/rb/taskwarrior-web.png)](http://badge.fury.io/rb/taskwarrior-web)
+[![Build Status](https://secure.travis-ci.org/theunraveler/taskwarrior-web.png)](http://travis-ci.org/theunraveler/taskwarrior-web)
+
 ## Requirements
 
 * `ruby` >= 1.9 (support for `ruby` < 1.9 is very unlikely, but pull requests
@@ -37,24 +40,23 @@ The current featureset includes:
   "due".
 * If you are on a Mac and use Fluid.app, you get a dock badge showing the
   number of pending tasks.
-* Optional Basic HTTP Auth protection. To enable, set `task-web.user` and
-  `task-web.passwd` in your `.taskrc` file.
+* [Optional HTTP Basic authentication][1].
+
+[1]: https://github.com/theunraveler/taskwarrior-web/wiki/Additional-.taskrc-options
 
 ## Reporting Bugs
 
-To report a bug, use the [Github issue tracker][1]. Since `taskwarrior-web`
+To report a bug, use the [Github issue tracker][2]. Since `taskwarrior-web`
 works with several different versions of `task`, using many different
 configurations, please include the output from `task _version` and either the
 output of `task show` or a copy of your `.taskrc` file when filing a bug. This helps me reproduce bugs easier.
 
-Here is an example of a [good bug report][2].
+Here is an example of a [good bug report][3].
 
-[1]: http://github.com/theunraveler/taskwarrior-web/issues
-[2]: http://github.com/theunraveler/taskwarrior-web/issues/26
+[2]: http://github.com/theunraveler/taskwarrior-web/issues
+[3]: http://github.com/theunraveler/taskwarrior-web/issues/26
 
 ## Marginalia
 
-This project is not developed by the Taskwarrior team. Obviously,
-taskwarrior-web extends Taskwarrior, but the projects are separate.
-
-[![Build Status](https://secure.travis-ci.org/theunraveler/taskwarrior-web.png)](http://travis-ci.org/theunraveler/taskwarrior-web)
+* This project is not developed by the Taskwarrior team. Obviously, taskwarrior-web extends Taskwarrior, but the projects are separate.
+* `task-web` is mostly designed to run locally. As such, security is not of the highest priority. You may find that things such as CSRF protection are lacking. If things like this are important to you, please file an issue or a pull request.

data/lib/taskwarrior-web.rb

@@ -11,6 +11,7 @@ module TaskwarriorWeb
   autoload :App,            'taskwarrior-web/app'
   autoload :Helpers,        'taskwarrior-web/helpers'
   autoload :Task,           'taskwarrior-web/model/task'
+  autoload :Annotation,     'taskwarrior-web/model/annotation'
   autoload :Config,         'taskwarrior-web/model/config'
   autoload :Command,        'taskwarrior-web/model/command'
   autoload :CommandBuilder, 'taskwarrior-web/services/builder'

data/lib/taskwarrior-web/app.rb

@@ -40,14 +40,21 @@ class TaskwarriorWeb::App < Sinatra::Base
     else
       @tasks = TaskwarriorWeb::Task.find_by_status(params[:status])
     end
-    @tasks.sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s, x.project.to_s] }
-    erb :listing
+
+    case params[:status]
+    when ('pending' or 'waiting')
+      @tasks.sort_by! { |t| [-t.urgency.to_f, t.priority.nil?.to_s, t.priority.to_s, t.due.nil?.to_s, t.due.to_s, t.project.to_s] }
+    when ('completed' or 'deleted')
+      @tasks.sort_by! { |t| [Time.parse(t.end)] }.reverse!
+    end
+
+    erb :'tasks/index'
   end
 
   get '/tasks/new/?' do
     @title = 'New Task'
     @date_format = TaskwarriorWeb::Config.dateformat(:js) || 'm/d/yyyy'
-    erb :new_task
+    erb :'tasks/new'
   end
 
   post '/tasks/?' do
@@ -60,7 +67,7 @@ class TaskwarriorWeb::App < Sinatra::Base
     end
 
     flash.now[:error] = @task._errors.join(', ')
-    erb :new_task
+    erb :'tasks/new'
   end
 
   get '/tasks/:uuid/?' do
@@ -68,7 +75,7 @@ class TaskwarriorWeb::App < Sinatra::Base
     @task = TaskwarriorWeb::Task.find(params[:uuid]) || not_found
     @title = %(Editing "#{@task}")
     @date_format = TaskwarriorWeb::Config.dateformat(:js) || 'm/d/yyyy'
-    erb :edit_task
+    erb :'tasks/edit'
   end
 
   patch '/tasks/:uuid/?' do
@@ -82,14 +89,7 @@ class TaskwarriorWeb::App < Sinatra::Base
     end
 
     flash.now[:error] = @task._errors.join(', ')
-    erb :edit_task
-  end
-
-  get '/tasks/:uuid/delete/?' do
-    not_found unless TaskwarriorWeb::Config.supports?(:editing)
-    @task = TaskwarriorWeb::Task.find(params[:uuid]) || not_found
-    @title = %(Are you sure you want to delete the task "#{@task}"?)
-    erb :delete_confirm
+    erb :'tasks/edit'
   end
 
   delete '/tasks/:uuid' do
@@ -100,21 +100,49 @@ class TaskwarriorWeb::App < Sinatra::Base
     redirect to('/tasks')
   end
 
+  # Annotations
+  get '/tasks/:uuid/annotations/new.?:format?' do
+    @task = TaskwarriorWeb::Task.find(params[:uuid]) || not_found
+    @json = params[:format] == 'json'
+    erb :'tasks/_annotation_form', :layout => !@json
+  end
+
+  post '/tasks/:uuid/annotations' do
+    @task = TaskwarriorWeb::Task.find(params[:uuid]) || not_found
+
+    annotation = TaskwarriorWeb::Annotation.new(params[:annotation])
+    if annotation.is_valid?
+      message = annotation.save!
+      flash[:success] = message.blank? ? %(Annotation was added to "#{@task}") : message
+    else
+      flash[:error] = annotation._errors.join(', ')
+    end
+
+    redirect back
+  end
+
+  delete '/tasks/:uuid/annotations/:description' do
+    @task = TaskwarriorWeb::Task.find(params[:uuid]) || not_found
+    TaskwarriorWeb::Annotation.new({ :task_id => @task.uuid, :description => params[:description] }).delete!
+    flash[:success] = %(Annotation was deleted from "#{@task}")
+    redirect back
+  end
+
   # Projects
   get '/projects/overview/?' do
     @title = 'Projects'
     @tasks = TaskwarriorWeb::Task.query('status.not' => :deleted, 'project.not' => '')
-      .sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s] }
-      .group_by { |x| x.project.to_s }
+      .sort_by! { |t| [-t.urgency.to_f, t.priority.nil?.to_s, t.priority.to_s, t.due.nil?.to_s, t.due.to_s] }
+      .group_by { |t| t.project.to_s }
       .reject { |project, tasks| tasks.select { |task| task.status == 'pending' }.empty? }
-    erb :projects
+    erb :'projects/index'
   end
 
   get '/projects/:name/?' do
     @title = unlinkify(params[:name])
-    @tasks = TaskwarriorWeb::Task.query('status.not' => 'deleted', :project => @title)
-      .sort_by! { |x| [x.priority.nil?.to_s, x.priority.to_s, x.due.nil?.to_s, x.due.to_s] }
-    erb :project
+    @tasks = TaskwarriorWeb::Task.query('status.not' => :deleted, :project => @title)
+      .sort_by! { |t| [-t.urgency.to_f, t.priority.nil?.to_s, t.priority.to_s, t.due.nil?.to_s, t.due.to_s] }
+    erb :'projects/show'
   end
 
   # Redirects

data/lib/taskwarrior-web/helpers.rb

@@ -63,9 +63,11 @@ module TaskwarriorWeb::App::Helpers
 
   def crud_links(task)
     string = %(<span class="crud-links">)
+    string << %(<a class="annotation-add" href="/tasks/#{task.uuid}/annotations/new"><i class="icon-comment"></i></a>)
+    string << %(&nbsp;|&nbsp;)
     string << %(<a href="/tasks/#{task.uuid}"><i class="icon-pencil"></i></a>)
     string << %(&nbsp;|&nbsp;)
-    string << %(<a href="/tasks/#{task.uuid}/delete"><i class="icon-trash"></i></a>)
+    string << %(<a href="/tasks/#{task.uuid}" data-method="DELETE" data-confirm="Are you sure you want to delete this task?"><i class="icon-trash"></i></a>)
     string << %(</span>)
     string
   end

data/lib/taskwarrior-web/model/annotation.rb

@@ -0,0 +1,26 @@
+module TaskwarriorWeb
+  class Annotation
+    attr_accessor :task_id, :entry, :description, :_errors
+
+    def initialize(attributes = {})
+      attributes.each do |attr, value|
+        send("#{attr}=", value) if respond_to?(attr.to_sym)
+      end
+
+      @_errors = []
+    end
+
+    def save!
+      Command.new(:annotate, self.task_id, { :description => self.description }).run
+    end
+
+    def delete!
+      Command.new(:denotate, self.task_id, { :description => self.description }).run
+    end
+
+    def is_valid?
+      @_errors << 'You must provide a description' if self.description.blank?
+      @_errors.empty?
+    end
+  end
+end

data/lib/taskwarrior-web/model/task.rb

@@ -7,8 +7,7 @@ module TaskwarriorWeb
 
     attr_accessor :entry, :project, :priority, :uuid, :description, :status,
                   :due, :start, :end, :tags, :depends, :wait, :annotations,
-                  :_errors, :remove_tags
-    alias :annotate= :annotations=
+                  :urgency, :_errors, :remove_tags
 
     ####################################
     # MODEL METHODS FOR INDIVIDUAL TASKS
@@ -21,6 +20,7 @@ module TaskwarriorWeb
 
       @_errors = []
       @tags = [] if @tags.nil?
+      @annotations = [] if @annotations.nil?
     end
 
     def save!
@@ -44,6 +44,15 @@ module TaskwarriorWeb
       end
     end
 
+    # Create annotation instances.
+    def annotations=(annotations)
+      @annotations = []
+      annotations.each do |annotation|
+        annotation.merge({ :task_id => self.uuid })
+        @annotations << Annotation.new(annotation)
+      end
+    end
+
     def is_valid?
       @_errors << 'You must provide a description' if self.description.blank?
       @_errors.empty?

data/lib/taskwarrior-web/public/css/styles.css

@@ -82,4 +82,6 @@ table.table thead .sorting_asc { background: url('../img/sort_asc.png') no-repea
 table.table thead .sorting_desc { background: url('../img/sort_desc.png') no-repeat center right; }
 
 table.table thead .sorting_asc_disabled { background: url('../img/sort_asc_disabled.png') no-repeat center right; }
-table.table thead .sorting_desc_disabled { background: url('../img/sort_desc_disabled.png') no-repeat center right; }V
+table.table thead .sorting_desc_disabled { background: url('../img/sort_desc_disabled.png') no-repeat center right; }
+
+#annotations-modal textarea { width: 100%; }

data/lib/taskwarrior-web/public/js/application.js

@@ -1,10 +1,12 @@
 $(document).ready(function() {
-	initDatePicker();
-	initAutocomplete();
-	initTaskCompletion();
+  initDatePicker();
+  initAutocomplete();
+  initTaskCompletion();
   initHotkeys();
   initTablesort();
-	refreshDockBadge();
+  initAnnotationsModal();
+  initUjs();
+  refreshDockBadge();
 
   // Hack to account for navbar when clicking anchor links.
   $('#sidebar .nav li a').click(function(event) {
@@ -119,6 +121,30 @@ var initTablesort = function() {
   });
 };
 
+var initAnnotationsModal = function() {
+  $(document).on('click', 'a.annotation-add', function(event) {
+    event.preventDefault();
+    $.get($(this).attr('href') + '.json', function(data) {
+      $('#annotations-modal')
+        .html(data)
+        .modal('show');
+    });
+  });
+};
+
+var initUjs = function() {
+  $('[data-method]').click(function(e) {
+    e.preventDefault();
+    var link = $(this);
+    if (confirm(link.data('confirm') || 'Are you sure?')) {
+      $('<form action="' + link.attr('href') + '" method="POST" style="display: none;">')
+        .append('<input type="hidden" name="_method" value="' + link.data('method') + '" />')
+        .insertAfter(link)
+        .submit();
+    }
+  });
+};
+
 // Count updating.
 
 var refreshDockBadge = function() {
@@ -143,7 +169,10 @@ var refreshSubnavCount = function() {
  * @param string [severity] The severity of the message.
  */
 function set_message(msg, severity) {
-	$('<div style="display: none;" class="alert alert-' + (severity || 'success') + '">' + msg + '</div>')
+	$('<div style="display: none;" class="alert">')
+    .addClass('alert-' + (severity || 'success'))
+    .append('<button type="button" class="close" data-dismiss="alert">&times;</button>')
+    .append(msg)
     .appendTo('#flash-messages')
     .fadeIn();
 }

data/lib/taskwarrior-web/services/builder/base.rb

@@ -8,6 +8,8 @@ module TaskwarriorWeb::CommandBuilder::Base
     :delete => 'rc.confirmation=no :id delete',
     :query => TaskwarriorWeb::Config.version > Versionomy.parse('1.9.2') ? '_query' : 'export',
     :complete => ':id done',
+    :annotate => ':id annotate',
+    :denotate => ':id denotate',
     :projects => '_projects',
     :tags => '_tags'
   }    

data/lib/taskwarrior-web/version.rb

@@ -1,3 +1,3 @@
 module TaskwarriorWeb
-  VERSION = '1.1.7'
+  VERSION = '1.1.8'
 end

data/lib/taskwarrior-web/views/layout.erb

@@ -16,10 +16,10 @@
   <body data-spy="scroll" data-offset="60" data-target="#sidebar">
     <div id="wrap">
       <div id="page" class="container">
-        <%= erb :_topbar %>
-        <%= erb :_subnav %>
+        <%= erb :'partials/_topbar' %>
+        <%= erb :'partials/_subnav' %>
         <section class="content">
-          <%= erb :_flash %>
+          <%= erb :'partials/_flash' %>
           <%= yield %>
         </section>
       </div>
@@ -27,9 +27,9 @@
     </div>
     <div id="footer">
       <div class="container muted">
-        <%= erb :_footer %>
+        <%= erb :'partials/_footer' %>
       </div>
     </div>
-    <%= erb :_hotkeys %>
+    <%= erb :'partials/_hotkeys' %>
   </body>
 </html>

data/lib/taskwarrior-web/views/{_flash.erb → partials/_flash.erb}

@@ -1,6 +1,7 @@
 <div id="flash-messages">
   <% flash_types.select{ |severity| flash.has?(severity) }.each do |severity| %>
     <div class="alert alert-<%= severity %>">
+      <button type="button" class="close" data-dismiss="alert">&times;</button>
       <%= flash[severity] %>
     </div>
   <% end %>

data/lib/taskwarrior-web/views/{_hotkeys.erb → partials/_hotkeys.erb}

@@ -1,7 +1,7 @@
-<div id="hotkeys" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div id="hotkeys" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="hotkeys-modal-label" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="myModalLabel">Hotkeys</h3>
+    <h3 id="hotkeys-modal-label">Hotkeys</h3>
   </div>
   <div class="modal-body">
     <p>TaskwarriorWeb includes hotkeys for quick navigation to commonly-used parts of the application.</p>

data/lib/taskwarrior-web/views/{projects.erb → projects/index.erb}

@@ -48,3 +48,8 @@
     </div>
   </div>
 </div>
+
+<% if @can_edit %>
+  <div id="annotations-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="annotations-modal-label" aria-hidden="true">
+  </div>
+<% end %>

data/lib/taskwarrior-web/views/tasks/_annotation_form.erb

@@ -0,0 +1,18 @@
+<form action="/tasks/<%= @task.uuid %>/annotations" method="POST" class="modal-form">
+  <div class="modal-header">
+    <% if @json %>
+      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <% end %>
+    <h3 id="annotations-modal-label">Add annotation to "<%= @task %>"</h3>
+  </div>
+  <div class="modal-body">
+    <textarea name="annotation[description]" placeholder="New annotation..." required="required"></textarea>
+    <input type="hidden" name="annotation[task_id]" value="<%= @task.uuid %>" />
+  </div>
+  <div class="modal-footer">
+    <% if @json %>
+      <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+    <% end %>
+    <input type="submit" id="annotations-modal-save" class="btn btn-primary" value="Save annotation" />
+  </div>
+</form>

data/lib/taskwarrior-web/views/{_task_form.erb → tasks/_form.erb}

@@ -1,7 +1,7 @@
 <div class="control-group">
   <label for="task-description" class="control-label">Description</label>
   <div class="controls">
-    <input type="textfield" id="task-description" name="task[description]" value="<%= @task.description unless @task.nil? %>" />
+    <input type="textfield" required="required" id="task-description" name="task[description]" value="<%= @task.description unless @task.nil? %>" />
   </div>
 </div>
 

data/lib/taskwarrior-web/views/{edit_task.erb → tasks/edit.erb}

@@ -1,7 +1,7 @@
 <form id="new-task-form" class="form-horizontal" action="/tasks/<%= @task.uuid %>" method="post">
   <input type="hidden" name="task[uuid]" value="<%= @task.uuid %>" />
 
-  <%= erb :_task_form %>
+  <%= erb :'tasks/_form' %>
 
   <div class="control-group">
     <div class="controls">

data/lib/taskwarrior-web/views/{listing.erb → tasks/index.erb}

@@ -22,16 +22,20 @@
       </thead>
       <tbody>
         <% @tasks.each do |task| %>
-          <tr class="<%= task.status == 'pending' ? colorize_date(task.due) : task.status %>">
+          <tr<%= %{ class="#{colorize_date(task.due)}"} if params[:status] == 'pending' %>>
             <% if params[:status] == 'pending' %>
               <td><input type="checkbox" class="complete" data-task-id="<%= task.uuid %>" /></td>
             <% end %>
             <td>
               <%= task.description %>
-              <% unless task.annotations.nil? || task.annotations.empty? %>
+              <% unless task.annotations.empty? %>
                 <ul>
                   <% task.annotations.each do |annotation| %>
-                    <li><%= format_date(annotation['entry']) %>: <%= auto_link(annotation['description']) %></li>
+                    <li>
+                      <%= format_date(annotation.entry) %>: <%= auto_link(annotation.description) %>
+                      &nbsp;
+                      <a href="/tasks/<%= task.uuid %>/annotations/<%= ERB::Util.u(annotation.description) %>" data-method="DELETE" data-confirm="Are you sure you want to delete this annotation?"><i class="icon-trash"></i></a>
+                    </li>
                   <% end %>
                 </ul>
               <% end %>
@@ -47,3 +51,8 @@
     </table>
   <% end %>
 </div>
+
+<% if can_edit %>
+  <div id="annotations-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="annotations-modal-label" aria-hidden="true">
+  </div>
+<% end %>

data/lib/taskwarrior-web/views/{new_task.erb → tasks/new.erb}

@@ -6,7 +6,7 @@
 
 <form id="new-task-form" class="form-horizontal" action="/tasks" method="post">
 
-  <%= erb :_task_form %>
+  <%= erb :'tasks/_form' %>
 
   <div class="control-group">
     <div class="controls">

data/spec/app/app_spec.rb

@@ -157,35 +157,6 @@ describe TaskwarriorWeb::App do
     end
   end
 
-  describe 'GET /tasks/:uuid/delete' do
-    context 'given a non-existant task' do
-      it 'should return a 404' do
-        TaskwarriorWeb::Task.should_receive(:find).and_return(nil)
-        get '/tasks/429897527/delete'
-        last_response.should be_not_found
-      end
-    end
-
-    context 'given an existing task' do
-      before do
-        TaskwarriorWeb::Task.should_receive(:find).and_return(
-          TaskwarriorWeb::Task.new({:uuid => 246, :description => 'Test task with a longer description'})
-        )
-        get '/tasks/246/delete'
-      end
-
-      it 'should show a delete form' do
-        last_response.body.should have_tag('form', :with => { :action => '/tasks/246', :method => 'post' }) do
-          with_tag('input', :with => { :name => '_method', :value => 'delete' })
-        end
-      end
-
-      it 'should display a delete button' do
-        last_response.body.should have_tag('input', :with => { :type => 'submit', :value => 'Delete' })
-      end
-    end
-  end
-
   describe 'DELETE /tasks/:uuid' do
     context 'given a non-existant task' do
       it 'should return a 404' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taskwarrior-web
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70241652704400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241652704400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70241652703520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241652703520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70241652702700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241652702700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rinku
-  requirement: &70241652702020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241652702020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70241652701260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241652701260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70241652699640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241652699640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-simple-navigation
-  requirement: &70241652698200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241652698200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-flash3
-  requirement: &70241652697520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241652697520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70241652696680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241652696680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70241652695180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241652695180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70241652692800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241652692800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70241652690820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241652690820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides a graphical frontend for the Taskwarrior task manager.
   It is based on Sinatra.
 email:
@@ -166,6 +226,7 @@ files:
 - lib/taskwarrior-web/app.rb
 - lib/taskwarrior-web/config/navigation.rb
 - lib/taskwarrior-web/helpers.rb
+- lib/taskwarrior-web/model/annotation.rb
 - lib/taskwarrior-web/model/command.rb
 - lib/taskwarrior-web/model/config.rb
 - lib/taskwarrior-web/model/task.rb
@@ -200,19 +261,19 @@ files:
 - lib/taskwarrior-web/services/runner.rb
 - lib/taskwarrior-web/version.rb
 - lib/taskwarrior-web/views/404.erb
-- lib/taskwarrior-web/views/_flash.erb
-- lib/taskwarrior-web/views/_footer.erb
-- lib/taskwarrior-web/views/_hotkeys.erb
-- lib/taskwarrior-web/views/_subnav.erb
-- lib/taskwarrior-web/views/_task_form.erb
-- lib/taskwarrior-web/views/_topbar.erb
-- lib/taskwarrior-web/views/delete_confirm.erb
-- lib/taskwarrior-web/views/edit_task.erb
 - lib/taskwarrior-web/views/layout.erb
-- lib/taskwarrior-web/views/listing.erb
-- lib/taskwarrior-web/views/new_task.erb
-- lib/taskwarrior-web/views/project.erb
-- lib/taskwarrior-web/views/projects.erb
+- lib/taskwarrior-web/views/partials/_flash.erb
+- lib/taskwarrior-web/views/partials/_footer.erb
+- lib/taskwarrior-web/views/partials/_hotkeys.erb
+- lib/taskwarrior-web/views/partials/_subnav.erb
+- lib/taskwarrior-web/views/partials/_topbar.erb
+- lib/taskwarrior-web/views/projects/index.erb
+- lib/taskwarrior-web/views/projects/show.erb
+- lib/taskwarrior-web/views/tasks/_annotation_form.erb
+- lib/taskwarrior-web/views/tasks/_form.erb
+- lib/taskwarrior-web/views/tasks/edit.erb
+- lib/taskwarrior-web/views/tasks/index.erb
+- lib/taskwarrior-web/views/tasks/new.erb
 - spec/app/app_spec.rb
 - spec/app/helpers_spec.rb
 - spec/files/taskrc
@@ -246,10 +307,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1525121623086071772
+      hash: -4275568887696200084
 requirements: []
 rubyforge_project: taskwarrior-web
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Web frontend for taskwarrior command line task manager.

data/lib/taskwarrior-web/views/delete_confirm.erb

@@ -1,4 +0,0 @@
-<form action="/tasks/<%= @task.uuid %>" method="post">
-  <input type="hidden" name="_method" value="delete" />
-  <input type="submit" class="btn btn-danger" value="Delete" /> or <a href="<%= request.referrer %>">cancel</a>
-</form>