diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee index cf3f75b2..8972bfea 100644 --- a/app/coffee/modules/common/components.coffee +++ b/app/coffee/modules/common/components.coffee @@ -272,52 +272,6 @@ AssignedToDirective = ($rootscope, $confirm) -> module.directive("tgAssignedTo", ["$rootScope", "$tgConfirm", AssignedToDirective]) - -############################################################################# -## Created by directive -############################################################################# - -CreatedByDirective = -> - # TODO: i18n - template = _.template(""" -
- <%- owner.full_name_display %> -
- -
- Created by - - <%- owner.full_name_display %> - - <%- date %> -
- """) - - link = ($scope, $el, $attrs, $model) -> - renderAssignedTo = (instance) -> - owner = {} - date = null - - if instance? - ownerId = instance.owner - date = moment(instance.created_date).format("DD MMM YYYY HH:mm") - owner = $scope.usersById?[ownerId] - - html = template({owner: owner, date: date}) - $el.html(html) - - $scope.$watch $attrs.ngModel, (instance) -> - renderAssignedTo(instance) - - return { - link:link, - require:"ngModel" - } - - -module.directive("tgCreatedBy", CreatedByDirective) - - ############################################################################# ## Common list directives ############################################################################# diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee index 0cd438e6..bccca5b3 100644 --- a/app/coffee/modules/issues/detail.coffee +++ b/app/coffee/modules/issues/detail.coffee @@ -226,6 +226,16 @@ IssueStatusDirective = () -> <%= status.name %> +
+
+ <%- owner.full_name_display %> +
+ +
+ Created by <%- owner.full_name_display %> + <%- date %> +
+
@@ -298,11 +308,15 @@ IssueStatusDirective = () -> editable = $attrs.editable? renderIssuestatus = (issue) -> + owner = $scope.usersById?[issue.owner] + date = moment(issue.created_date).format("DD MMM YYYY HH:mm") type = $scope.typeById[issue.type] status = $scope.statusById[issue.status] severity = $scope.severityById[issue.severity] priority = $scope.priorityById[issue.priority] html = template({ + owner: owner + date: date editable: editable status: status severity: severity diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee index 9b5ce20e..122b4918 100644 --- a/app/coffee/modules/tasks/detail.coffee +++ b/app/coffee/modules/tasks/detail.coffee @@ -219,6 +219,17 @@ TaskStatusDirective = () -> <% } %> <%= status.name %> +
+
+ <%- owner.full_name_display %> +
+ +
+ Created by + <%- owner.full_name_display %> + <%- date %> +
+
@@ -243,8 +254,12 @@ TaskStatusDirective = () -> editable = $attrs.editable? renderTaskstatus = (task) -> + owner = $scope.usersById?[task.owner] + date = moment(task.created_date).format("DD MMM YYYY HH:mm") status = $scope.statusById[task.status] html = template({ + owner: owner + date: date editable: editable status: status }) diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee index 3f4bc33f..fc8e300c 100644 --- a/app/coffee/modules/userstories/detail.coffee +++ b/app/coffee/modules/userstories/detail.coffee @@ -239,6 +239,18 @@ UsStatusDetailDirective = () ->
+
+
+ <%- owner.full_name_display %> +
+ +
+ Created by + <%- owner.full_name_display %> + <%- date %> +
+
+
  • <%- totalPoints %> @@ -301,6 +313,8 @@ UsStatusDetailDirective = () -> return _.reduce(values, (acc, num) -> acc + num) renderUsstatus = (us) -> + owner = $scope.usersById?[us.owner] + date = moment(us.created_date).format("DD MMM YYYY HH:mm") status = $scope.statusById[us.status] rolePoints = _.clone(_.filter($scope.project.roles, "computable"), true) _.map rolePoints, (v, k) -> @@ -313,6 +327,8 @@ UsStatusDetailDirective = () -> usProgress = 0 usProgress = 100 * totalClosedTasks / totalTasks if totalTasks > 0 html = template({ + owner: owner + date: date editable: editable status: status totalPoints: us.total_points diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade index 52b25ef3..936934ef 100644 --- a/app/partials/issues-detail-edit.jade +++ b/app/partials/issues-detail-edit.jade @@ -51,7 +51,6 @@ block content sidebar.menu-secondary.sidebar section.us-status(tg-issue-status, ng-model="issue", editable="true") section.us-assigned-to(tg-assigned-to, ng-model="issue", editable="true") - section.us-created-by(tg-created-by, ng-model="issue") section.watchers(tg-watchers, ng-model="issue", editable="true") section.us-detail-settings diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index c5408b16..c7e9dbe3 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -51,5 +51,4 @@ block content sidebar.menu-secondary.sidebar section.us-status(tg-issue-status, ng-model="issue") section.us-assigned-to(tg-assigned-to, ng-model="issue") - section.us-created-by(tg-created-by, ng-model="issue") section.watchers(tg-watchers, ng-model="issue") diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index f2ed85e2..3c129051 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -51,7 +51,6 @@ block content sidebar.menu-secondary.sidebar section.us-status(tg-task-status, ng-model="task") section.us-assigned-to(tg-assigned-to, ng-model="task") - section.us-created-by(tg-created-by, ng-model="task") section.watchers(tg-watchers, ng-model="task") section.us-detail-settings diff --git a/app/partials/us-detail-edit.jade b/app/partials/us-detail-edit.jade index 111813a4..ad87c433 100644 --- a/app/partials/us-detail-edit.jade +++ b/app/partials/us-detail-edit.jade @@ -51,7 +51,6 @@ block content sidebar.menu-secondary.sidebar section.us-status(tg-us-status-detail, ng-model="us", editable="true") section.us-assigned-to(tg-assigned-to, ng-model="us", editable="true") - section.us-created-by(tg-created-by, ng-model="us") section.watchers(tg-watchers, ng-model="us", editable="true") section.us-detail-settings diff --git a/app/styles/components/created-by.scss b/app/styles/components/created-by.scss index fe4bf777..31728025 100644 --- a/app/styles/components/created-by.scss +++ b/app/styles/components/created-by.scss @@ -1,24 +1,25 @@ .us-created-by { @include table-flex(); margin-top: .5rem; + margin-bottom: 1rem; position: relative; .user-avatar { - @include table-flex-child(1, 0); + @include table-flex-child(0, 40px, 0); img { border-radius: 8%; width: 100%; } } .created-by { - @include table-flex-child(3, 0); - margin-left: 1rem; - margin-top: 5px; - .assigned-title { + @include table-flex-child(3, 70px, 0); + margin-left: .5rem; + .created-title, + .created-date { @extend %small; color: $gray-light; display: block; } - .user-assigned { + .created-user { @extend %large; color: $green-taiga; cursor: default; @@ -26,15 +27,5 @@ cursor: pointer; } } - .icon-delete { - color: $gray-light; - opacity: 1; - position: absolute; - right: 1rem; - top: 1rem; - &:hover { - color: $red; - } - } } }