Add angular directives for date/time and authoring

pull/1166/head
Hagen Schink 11 years ago
parent c7e2cdad47
commit 83037cfba2
  1. 3
      app/assets/javascripts/angular/controllers/messages-controllers.js
  2. 52
      app/assets/javascripts/angular/directives/components/authoring-directive.js
  3. 46
      app/assets/javascripts/angular/directives/components/date-time-directive.js
  4. 8
      app/assets/javascripts/angular/helpers/components/path-helper.js
  5. 2
      app/assets/javascripts/angular/openproject-app.js
  6. 4
      app/assets/javascripts/application.js.erb
  7. 1
      public/templates/components/authoring.html

@ -28,6 +28,7 @@
angular.module('openproject.messages.controllers')
.controller('MessagesController', ['$scope', function ($scope) {
.controller('MessagesController', ['$scope', 'PathHelper', function ($scope, PathHelper) {
$scope.PathHelper = PathHelper;
$scope.messages = gon.messages;
}]);

@ -0,0 +1,52 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// See doc/COPYRIGHT.rdoc for more details.
//++
// TODO move to UI components
angular.module('openproject.uiComponents')
.directive('authoring', ['I18n', 'PathHelper', function(I18n, PathHelper) {
return {
restrict: 'E',
replace: true,
scope: { createdOn: '=', author: '=' },
templateUrl: '/templates/components/authoring.html',
link: function(scope, element, attrs) {
moment.lang(I18n.locale);
// TODO: The timezone of scope.time is UTC. Thus, we need to adapt the
// time to the local timezone or user setting.
var createdOn = moment.utc(scope.createdOn);
var timeago = createdOn.fromNow();
var time = createdOn.format('LLL');
scope.I18n = I18n;
scope.authorLink = '<a href="'+ PathHelper.userPath(scope.author.id) + '">' + scope.author.name + '</a>';
scope.timestamp = '<span class="timestamp" title="' + time + '">' + timeago + '</span>';
}
};
}]);

@ -0,0 +1,46 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// See doc/COPYRIGHT.rdoc for more details.
//++
// TODO move to UI components
angular.module('openproject.uiComponents')
.directive('dateTime', ['I18n', function(I18n) {
return {
restrict: 'EA',
replace: false,
scope: { dateTime: '=' },
template: '<span>{{time}}</span>',
link: function(scope, element, attrs) {
moment.lang(I18n.locale);
// TODO: The timezone of scope.time is UTC. Thus, we need to adapt the
// time to the local timezone or user setting.
scope.time = moment(scope.dateTime, "MM/DD/YYYY/ HH:mm A").utc().format('LLL');
}
};
}]);

@ -34,7 +34,13 @@ angular.module('openproject.helpers')
apiPrefixV2: '/api/v2',
apiPrefixV3: '/api/v3',
projectsPath: function(){
messagesPath: function(boardIdentifier) {
return '/boards/' + boardIdentifier + '/topics';
},
messagePath: function(messageIdentifier) {
return '/topics/' + messageIdentifier;
},
projectsPath: function() {
return '/projects';
},
projectPath: function(projectIdentifier) {

@ -52,7 +52,7 @@ angular.module('openproject.messages', ['openproject.messages.controllers']);
angular.module('openproject.messages.controllers', []);
// main app
var openprojectApp = angular.module('openproject', ['ui.select2', 'ui.date', 'openproject.uiComponents', 'openproject.timelines', 'openproject.workPackages', 'openproject.messages', 'ngAnimate']);
var openprojectApp = angular.module('openproject', ['ui.select2', 'ui.date', 'openproject.uiComponents', 'openproject.timelines', 'openproject.workPackages', 'openproject.messages', 'ngAnimate', 'ngSanitize']);
window.appBasePath = jQuery('meta[name=app_base_path]').attr('content') || '';

@ -14,6 +14,9 @@
//= require jquery-ujs
//= require jquery-ui
//= require jquery-ui/ui/i18n/jquery-ui-i18n
//= require momentjs
//= require momentjs/lang/en-gb.js
//= require momentjs/lang/de.js
//= require jquery.atwho/dist/js/jquery.atwho.js
//= require Caret.js/src/jquery.caret
@ -54,6 +57,7 @@
//= require angular-animate
//= require angular-ui-select2
//= require angular-ui-date/src/date
//= require angular-sanitize
//= require openproject-ui_components/app/assets/javascripts/angular/ui-components-app
//= require ./angular/openproject-app

@ -0,0 +1 @@
<span ng-bind-html="I18n.t('js.label_added_time_by', { author: authorLink, age: timestamp })"></span>
Loading…
Cancel
Save