Merge pull request #391 from pgiraud/unlock_link

Move unlock button to more appropriate location

Author: Pierre GIRAUD

osmtm/templates/task.locked.mako

@@ -10,6 +10,8 @@ time_left = (task.cur_lock.date - (datetime.datetime.utcnow() - EXPIRATION_DELTA
   <span class="glyphicon glyphicon-lock"></span>
   ${locked_text|n}.&nbsp;
   % if user and task.cur_lock.user== user:
+  <a id="unlock" href="${request.route_path('task_unlock', task=task.id, project=task.project_id)}">
+    ${_('Unlock')}</a>
   <span id="task_countdown_text" rel="tooltip"
       data-original-title="${_('If you do not complete or release this task in time, it will be automatically unlocked')}"
       data-container="body"

osmtm/templates/task.state.ready.mako

@@ -2,11 +2,6 @@
 % if user and task.cur_lock and task.cur_lock.lock and task.cur_lock.user == user:
   <form action="${request.route_path('task_done', task=task.id, project=task.project_id)}" method="POST">
     <%include file="task.comment.mako" />
-    <a id="unlock"
-       class="btn btn-default"
-       href="${request.route_path('task_unlock', task=task.id, project=task.project_id)}">
-        ${_('Unlock')}
-    </a>
     <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-ok icon-white"></i> ${_('Mark task as done')}</button>
   </form>
 % endif