From fdae3479be5709b0532fe2b1ce564bd4e5b765b3 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.be>
Date: Tue, 17 Jun 2014 20:46:42 +0200
Subject: [PATCH] Minor reorganization on templates related to backlog row and
 confirm lightbox.

---
 app/index.jade                                          | 2 ++
 app/partials/backlog.jade                               | 7 ++-----
 app/partials/views/components/backlog-row.jade          | 4 ++--
 app/partials/views/modules/backlog-table.jade           | 5 ++---
 app/partials/views/modules/lightbox_confirm-delete.jade | 4 ++--
 app/styles/modules/lightbox.scss                        | 6 +++---
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/index.jade b/app/index.jade
index 32e01762..5b80b5fa 100644
--- a/app/index.jade
+++ b/app/index.jade
@@ -11,5 +11,7 @@ html(lang="en", ng-app="taiga")
     body
         include partials/views/modules/nav
         div.master(ng-view="")
+        div.lightbox.lightbox_confirm-delete
+            include partials/views/modules/lightbox_confirm-delete
         script(src="/js/libs.js?v=#{v}")
         script(src="/js/app.js?v=#{v}")
diff --git a/app/partials/backlog.jade b/app/partials/backlog.jade
index bd4e5c3b..8c433111 100644
--- a/app/partials/backlog.jade
+++ b/app/partials/backlog.jade
@@ -4,10 +4,10 @@ block head
     title Taiga  Project management web application with scrum in mind!
 
 block content
-    div.wrapper
+    div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl")
         sidebar.menu-secondary.extrabar.filters-bar
             include views/modules/filters
-        section.main.backlog(tg-backlog)
+        section.main.backlog
             include views/components/mainTitle
             include views/components/summary
             include views/modules/burndown
@@ -31,6 +31,3 @@ block content
             include views/modules/lightbox_add-bulk
         div.lightbox.lightbox_add-sprint
             include views/modules/lightbox_add-sprint
-        div.lightbox.lightbox_confirm-delete
-            include views/modules/lightbox_confirm-delete
-
diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade
index 56cd6bcc..0bf700f6 100644
--- a/app/partials/views/components/backlog-row.jade
+++ b/app/partials/views/components/backlog-row.jade
@@ -4,8 +4,8 @@ div.row(ng-repeat="us in userstories")
             input(type="checkbox", name="")
             a(href="") {{ us.subject }}
             span.us-settings
-                a.icon.icon-edit(href="", title="Edit")
-                a.icon.icon-delete(href="", title="Delete")
+                a.icon.icon-edit(href="", ng-click="ctrl.deleteUserStory(us)", title="Edit")
+                a.icon.icon-delete(href="", ng-click="ctrl.deleteUserStory(us)", title="Delete")
         div.user-story-tags
             span.tag Tag name
             span.tag Tag name
diff --git a/app/partials/views/modules/backlog-table.jade b/app/partials/views/modules/backlog-table.jade
index 00a1740e..b0dde643 100644
--- a/app/partials/views/modules/backlog-table.jade
+++ b/app/partials/views/modules/backlog-table.jade
@@ -10,6 +10,8 @@ section.backlog-table-header
         div.points.width-1 Front
         div.points.width-1 Total
 section.backlog-table-body
+    include ../components/backlog-row
+
     // - for (var x = 0; x < 40; x++)
     //     div.row
     //         div.user-stories
@@ -44,6 +46,3 @@ section.backlog-table-body
     //                     a(href="", title="Status 3") Status 3
     //         a.icon.icon-drag-v(href="", title="Drag")
     // hr.doom-line
-
-    script(type="text/ng-template" id="backlog-row.html")
-        include ../components/backlog-row
diff --git a/app/partials/views/modules/lightbox_confirm-delete.jade b/app/partials/views/modules/lightbox_confirm-delete.jade
index 0194bbaa..388a7160 100644
--- a/app/partials/views/modules/lightbox_confirm-delete.jade
+++ b/app/partials/views/modules/lightbox_confirm-delete.jade
@@ -3,8 +3,8 @@ a.close(href="", title="close")
 form
     h2.title Delete User Story
     p
-        span.us-delete-question Are you sure you want to delete?
-        span.us-to-delete #125 Crear el perfil de usuario senior en el admin
+        span.delete-question Are you sure you want to delete?
+        span.subtitle #125 Crear el perfil de usuario senior en el admin
     div.delete-options
         a.button.button-green(href="", title="Accept")
             span Accept
diff --git a/app/styles/modules/lightbox.scss b/app/styles/modules/lightbox.scss
index aad4735c..c3dbafac 100644
--- a/app/styles/modules/lightbox.scss
+++ b/app/styles/modules/lightbox.scss
@@ -223,13 +223,13 @@
         min-width: 420px;
         width: 420px;
     }
-    .us-delete-question,
-    .us-to-delete {
+    .delete-question,
+    .subtitle {
         display: block;
         line-height: 2rem;
         text-align: center;
     }
-    .us-to-delete {
+    .subtitle {
         @extend %large;
         font-family: 'ostrichSans';
     }