From 3b58c6ca5d2c2171b9b5452d6bc9796ea76672ba Mon Sep 17 00:00:00 2001
From: Alexander Machehin <alexander.machehin@gmail.com>
Date: Tue, 3 Feb 2015 02:15:31 +0500
Subject: [PATCH] [#369] move assets angular-new -> angularjs

---
 .../product_build_list_controller.js.erb      | 40 -----------
 .../controllers/rosa_abf_controller.js        |  8 ---
 .../directives/ng_confirm_click.js.coffee     | 15 ----
 .../a_config.js.erb                           |  0
 .../build_list_controller.js.coffee           |  0
 .../build_lists/build_lists_controller.js.erb |  0
 .../build_log_controller.js.coffee            |  0
 .../new_build_list_controller.js.coffee       |  0
 .../comments/comment.js.coffee                |  0
 .../comments/comments_controller.js.coffee    |  0
 .../javascripts/angularjs/config.js.erb       | 48 -------------
 .../controllers/activity_controller.js        |  0
 .../controllers/advisories_controller.js      |  0
 ...omatic_metadata_regeneration_controller.js | 17 -----
 .../controllers/contents_controller.js.coffee | 71 -------------------
 .../controllers/git_tree_controller.js        |  0
 .../controllers/platforms_controller.js       |  0
 .../controllers/profile_controller.js.coffee  |  0
 .../project_branches_controller.js            |  0
 .../project_repo_block_controller.js          |  0
 .../controllers/project_tags_controller.js    |  0
 .../controllers/projects_controller.js        |  0
 .../controllers/rosa_abf_controller.js        |  8 +--
 .../statistics_controller.js.coffee           |  0
 .../directives/ng_confirm_click.js.coffee     | 10 ++-
 .../issues/issue.js.coffee                    |  0
 .../issues/issue_controller.js.coffee         |  0
 .../issues/issues_controller.js.coffee        |  0
 .../labels/label.js.coffee                    |  0
 .../labels/labels_controller.js.coffee        |  0
 .../mass_builds/mass_build_service.js.coffee  |  0
 .../new_mass_build_controller.js.coffee       |  0
 .../models/build_list.js.erb                  |  0
 .../models/project.js                         |  0
 .../models/project_ref.js                     |  0
 ...metadata_regeneration_controller.js.coffee |  0
 .../platforms/contents_controller.js.coffee   |  0
 .../platform_sys_repos_controller.js.coffee   |  0
 .../repository_projects_controller.js.coffee  |  0
 .../collaborators_controller.js.coffee        |  0
 .../projects/project_schedule_controller.js   |  0
 .../pull_requests/pull_request.js.coffee      |  0
 .../pull_request_controller.js.coffee         |  0
 .../services/collaborator.js.coffee           |  0
 .../services/compile_html.js.coffee           |  0
 .../services/confirm_message.js.coffee.erb    |  0
 .../services/datetime_formatter.js.coffee     |  0
 .../services/preview.js.coffee                |  0
 .../services/project.js                       |  0
 .../build_list_notification.html.haml         |  0
 .../git_delete_branch_notification.html.haml  |  0
 .../git_new_push_notification.html.haml       |  0
 .../issue_assign_notification.html.haml       |  0
 .../new_comment_commit_notification.html.haml |  0
 .../new_comment_notification.html.haml        |  0
 .../new_issue_notification.html.haml          |  0
 .../templates/new_user_notification.html.haml |  0
 .../templates/search_collaborators.html.slim  |  0
 .../wiki_new_commit_notification.html.haml    |  0
 app/assets/javascripts/new_application.js     |  4 +-
 60 files changed, 12 insertions(+), 209 deletions(-)
 delete mode 100644 app/assets/javascripts/angular-new/controllers/product_build_list_controller.js.erb
 delete mode 100644 app/assets/javascripts/angular-new/controllers/rosa_abf_controller.js
 delete mode 100644 app/assets/javascripts/angular-new/directives/ng_confirm_click.js.coffee
 rename app/assets/javascripts/{angular-new => angularjs}/a_config.js.erb (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/build_lists/build_list_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/build_lists/build_lists_controller.js.erb (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/build_lists/build_log_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/build_lists/new_build_list_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/comments/comment.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/comments/comments_controller.js.coffee (100%)
 delete mode 100644 app/assets/javascripts/angularjs/config.js.erb
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/activity_controller.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/advisories_controller.js (100%)
 delete mode 100644 app/assets/javascripts/angularjs/controllers/automatic_metadata_regeneration_controller.js
 delete mode 100644 app/assets/javascripts/angularjs/controllers/contents_controller.js.coffee
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/git_tree_controller.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/platforms_controller.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/profile_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/project_branches_controller.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/project_repo_block_controller.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/project_tags_controller.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/projects_controller.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/controllers/statistics_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/issues/issue.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/issues/issue_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/issues/issues_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/labels/label.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/labels/labels_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/mass_builds/mass_build_service.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/mass_builds/new_mass_build_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/models/build_list.js.erb (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/models/project.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/models/project_ref.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/platforms/automatic_metadata_regeneration_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/platforms/contents_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/platforms/platform_sys_repos_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/platforms/repository_projects_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/projects/collaborators_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/projects/project_schedule_controller.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/pull_requests/pull_request.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/pull_requests/pull_request_controller.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/services/collaborator.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/services/compile_html.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/services/confirm_message.js.coffee.erb (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/services/datetime_formatter.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/services/preview.js.coffee (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/services/project.js (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/build_list_notification.html.haml (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/git_delete_branch_notification.html.haml (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/git_new_push_notification.html.haml (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/issue_assign_notification.html.haml (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/new_comment_commit_notification.html.haml (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/new_comment_notification.html.haml (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/new_issue_notification.html.haml (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/new_user_notification.html.haml (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/search_collaborators.html.slim (100%)
 rename app/assets/javascripts/{angular-new => angularjs}/templates/wiki_new_commit_notification.html.haml (100%)

diff --git a/app/assets/javascripts/angular-new/controllers/product_build_list_controller.js.erb b/app/assets/javascripts/angular-new/controllers/product_build_list_controller.js.erb
deleted file mode 100644
index 07d6eb181..000000000
--- a/app/assets/javascripts/angular-new/controllers/product_build_list_controller.js.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-RosaABF.controller('ProductBuildListController', ['$scope', '$http', '$timeout', 'SoundNotificationsHelper', function($scope, $http, $timeout, SoundNotificationsHelper) {
-
-  $scope.id       = $('#product_build_list_id').val();
-  $scope.pbl      = null;
-  $scope.subject  = {}; // See: shared/build_results
-
-  $scope.getProductBuildList = function() {
-    $http.get(Routes.product_build_list_path($scope.id, {format: 'json'})).success(function(results) {
-      var product_build_list = results.product_build_list;
-      if ($scope.pbl && $scope.pbl.status != product_build_list.status)
-        SoundNotificationsHelper.buildStatusChanged();
-      $scope.pbl = $scope.subject = product_build_list;
-    });
-  }
-
-  $scope.cancelRefresh = null;
-  $scope.refresh = function() {
-    if (!$scope.pbl || 
-        !(
-          $scope.pbl.status == <%=ProductBuildList::BUILD_COMPLETED%> ||
-          $scope.pbl.status == <%=ProductBuildList::BUILD_FAILED%> ||
-          $scope.pbl.status == <%=ProductBuildList::BUILD_CANCELED%>
-        )
-      ) {
-      $scope.getProductBuildList();
-    }
-    $scope.cancelRefresh = $timeout($scope.refresh, 10000);
-  }
-  $scope.refresh();
-
-  $scope.updateStatus = function() {
-    $http.put(
-      Routes.product_build_list_path($scope.id),
-      {product_build_list: {not_delete: $scope.pbl.not_delete}, format: 'json'}
-    ).success(function(results) {
-      $scope.pbl = $scope.subject = results.product_build_list;
-    });
-  }
-
-}]);
\ No newline at end of file
diff --git a/app/assets/javascripts/angular-new/controllers/rosa_abf_controller.js b/app/assets/javascripts/angular-new/controllers/rosa_abf_controller.js
deleted file mode 100644
index dd02af5ed..000000000
--- a/app/assets/javascripts/angular-new/controllers/rosa_abf_controller.js
+++ /dev/null
@@ -1,8 +0,0 @@
-RosaABF.controller('RosaABFController', ['$scope', 'LocalesHelper', 'SoundNotificationsHelper',
-                   function($scope, LocalesHelper, SoundNotificationsHelper) {
-  $scope.init = function(locale, sound_notifications) {
-  	LocalesHelper.setLocale(locale);
-    moment.locale(locale);
-    SoundNotificationsHelper.enabled(sound_notifications);
-  }
-}]);
diff --git a/app/assets/javascripts/angular-new/directives/ng_confirm_click.js.coffee b/app/assets/javascripts/angular-new/directives/ng_confirm_click.js.coffee
deleted file mode 100644
index 86e70ff2a..000000000
--- a/app/assets/javascripts/angular-new/directives/ng_confirm_click.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-RosaABF = angular.module 'RosaABF'
-
-RosaABF.directive "ngConfirmClick", ->
-  priority: 100
-  restrict: "A"
-  link: (scope, element, attr) ->
-    msg = attr.ngConfirmClick || "Are you sure?"
-    clickAction = attr.confirmedClick
-    element.bind 'click', (event) ->
-      if clickAction
-        scope.$apply clickAction if window.confirm(msg)
-      else
-        unless confirm(msg)
-          event.stopImmediatePropagation()
-          event.preventDefault
diff --git a/app/assets/javascripts/angular-new/a_config.js.erb b/app/assets/javascripts/angularjs/a_config.js.erb
similarity index 100%
rename from app/assets/javascripts/angular-new/a_config.js.erb
rename to app/assets/javascripts/angularjs/a_config.js.erb
diff --git a/app/assets/javascripts/angular-new/build_lists/build_list_controller.js.coffee b/app/assets/javascripts/angularjs/build_lists/build_list_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/build_lists/build_list_controller.js.coffee
rename to app/assets/javascripts/angularjs/build_lists/build_list_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/build_lists/build_lists_controller.js.erb b/app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb
similarity index 100%
rename from app/assets/javascripts/angular-new/build_lists/build_lists_controller.js.erb
rename to app/assets/javascripts/angularjs/build_lists/build_lists_controller.js.erb
diff --git a/app/assets/javascripts/angular-new/build_lists/build_log_controller.js.coffee b/app/assets/javascripts/angularjs/build_lists/build_log_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/build_lists/build_log_controller.js.coffee
rename to app/assets/javascripts/angularjs/build_lists/build_log_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/build_lists/new_build_list_controller.js.coffee b/app/assets/javascripts/angularjs/build_lists/new_build_list_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/build_lists/new_build_list_controller.js.coffee
rename to app/assets/javascripts/angularjs/build_lists/new_build_list_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/comments/comment.js.coffee b/app/assets/javascripts/angularjs/comments/comment.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/comments/comment.js.coffee
rename to app/assets/javascripts/angularjs/comments/comment.js.coffee
diff --git a/app/assets/javascripts/angular-new/comments/comments_controller.js.coffee b/app/assets/javascripts/angularjs/comments/comments_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/comments/comments_controller.js.coffee
rename to app/assets/javascripts/angularjs/comments/comments_controller.js.coffee
diff --git a/app/assets/javascripts/angularjs/config.js.erb b/app/assets/javascripts/angularjs/config.js.erb
deleted file mode 100644
index 877d7ac56..000000000
--- a/app/assets/javascripts/angularjs/config.js.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-var RosaABF = angular.module('RosaABF', ['ngResource', 'ng-rails-csrf', 'angular-i18n', 'angularMoment']);
-
-var DateTimeFormatter = function() {
-
-  var UtcFormatter = function(api_time) {
-    return moment.utc(api_time * 1000).format('YYYY-MM-DD HH:mm:ss UTC');
-  }
-
-  return {
-    utc : UtcFormatter
-  }
-}
-RosaABF.factory("DateTimeFormatter", DateTimeFormatter);
-
-var LocalesHelper = function($locale) {
-  var locales = {
-    'ru' : 'ru-ru',
-    'en' : 'en-us'
-  }
-  return {
-    setLocale: function(locale) {
-      $locale.id = locales[locale];
-    }
-  }
-}
-RosaABF.factory("LocalesHelper", ['$locale', LocalesHelper]);
-
-var SoundNotificationsHelper = function() {
-  var isOn = true;
-  var statusChangedSound = null;
-  soundManager.setup({
-    // url: '/assets/swf/',
-    preferFlash: false,
-    onready: function() {
-      statusChangedSound = soundManager.createSound({url: "<%=asset_path('garbage_shattering.wav')%>"});
-    }
-  });
-  return {
-    buildStatusChanged: function() {
-      if (isOn && statusChangedSound)
-        statusChangedSound.play();
-    },
-    enabled: function(status) {
-      isOn = status;
-    }
-  }
-}
-RosaABF.factory('SoundNotificationsHelper', SoundNotificationsHelper);
diff --git a/app/assets/javascripts/angular-new/controllers/activity_controller.js b/app/assets/javascripts/angularjs/controllers/activity_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/activity_controller.js
rename to app/assets/javascripts/angularjs/controllers/activity_controller.js
diff --git a/app/assets/javascripts/angular-new/controllers/advisories_controller.js b/app/assets/javascripts/angularjs/controllers/advisories_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/advisories_controller.js
rename to app/assets/javascripts/angularjs/controllers/advisories_controller.js
diff --git a/app/assets/javascripts/angularjs/controllers/automatic_metadata_regeneration_controller.js b/app/assets/javascripts/angularjs/controllers/automatic_metadata_regeneration_controller.js
deleted file mode 100644
index a05b86078..000000000
--- a/app/assets/javascripts/angularjs/controllers/automatic_metadata_regeneration_controller.js
+++ /dev/null
@@ -1,17 +0,0 @@
-RosaABF.controller('AutomaticMetadataRegenerationController', ['$scope', '$http', function($scope, $http) {
-
-  // See: Platfrom::AUTOMATIC_METADATA_REGENERATIONS
-  $scope.items = {
-    'day': 'platform.automatic_metadata_regeneration.day',
-    'week': 'platform.automatic_metadata_regeneration.week'
-  };
-  $scope.platform_id = null;
-
-  $scope.update = function() {
-    $http.put(
-      Routes.platform_path($scope.platform_id),
-      {platform: {automatic_metadata_regeneration: $scope.amr}, format: 'json'}
-    );
-  }  
-
-}]);
\ No newline at end of file
diff --git a/app/assets/javascripts/angularjs/controllers/contents_controller.js.coffee b/app/assets/javascripts/angularjs/controllers/contents_controller.js.coffee
deleted file mode 100644
index 760301245..000000000
--- a/app/assets/javascripts/angularjs/controllers/contents_controller.js.coffee
+++ /dev/null
@@ -1,71 +0,0 @@
-RosaABF.controller 'ContentsController', ['$scope', '$http', '$location', ($scope, $http, $location) ->
-
-  $scope.platform   = $('#platform_name').val()
-  $scope.processing = true
-  $scope.contents   = []
-  $scope.folders    = []
-  $scope.pages      = []
-
-  # Fixes: redirect to page after form submit
-  $("#search_contents_form").on 'submit', ->
-    false
-
-  $scope.refresh = ->
-    $scope.processing = true
-
-    params  =
-      platform_id:  $scope.platform
-      path:         $('#path').val()
-      term:         $('#term').val()
-      page:         $('#page').val()
-      format:       'json'
-
-    $http.get(Routes.platform_contents_path(params)).success( (data) ->
-      $scope.folders    = data.folders
-      $scope.contents   = data.contents
-      $scope.pages      = data.pages
-      $scope.back       = data.back
-      $scope.processing = false
-    ).error( ->
-      $scope.contents   = []
-      $scope.processing = false
-    )
-    true
-
-  $scope.open = (content) ->
-    return if $scope.processing
-    if $.type(content) == 'string'
-      $location.search('path', content)
-    else if content.is_folder
-      $location.search('path', content.subpath)
-
-  $scope.destroy  = (content) ->
-    params  =
-      path:   content.subpath
-      format: 'json'
-
-    content.processing = true
-    $http.delete(Routes.remove_file_platform_contents_path($scope.platform, params)).success( ->
-      $scope.refresh()
-    ).error( ->
-      $scope.refresh()
-    )
-    true
-
-  $scope.search = ->
-    $location.search('term', $('#term').val())
-
-  $scope.$on '$locationChangeSuccess', (event) ->
-    $scope.updateParams()
-    $scope.refresh()
-
-  $scope.updateParams = ->
-    params = $location.search()
-    $('#path').val(params['path'])
-    $('#term').val(params['term'])
-    $('#page').val(params['page'])
-
-  $scope.goToPage = (number) ->
-    $location.search('page', number)
-
-]
\ No newline at end of file
diff --git a/app/assets/javascripts/angular-new/controllers/git_tree_controller.js b/app/assets/javascripts/angularjs/controllers/git_tree_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/git_tree_controller.js
rename to app/assets/javascripts/angularjs/controllers/git_tree_controller.js
diff --git a/app/assets/javascripts/angular-new/controllers/platforms_controller.js b/app/assets/javascripts/angularjs/controllers/platforms_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/platforms_controller.js
rename to app/assets/javascripts/angularjs/controllers/platforms_controller.js
diff --git a/app/assets/javascripts/angular-new/controllers/profile_controller.js.coffee b/app/assets/javascripts/angularjs/controllers/profile_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/profile_controller.js.coffee
rename to app/assets/javascripts/angularjs/controllers/profile_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/controllers/project_branches_controller.js b/app/assets/javascripts/angularjs/controllers/project_branches_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/project_branches_controller.js
rename to app/assets/javascripts/angularjs/controllers/project_branches_controller.js
diff --git a/app/assets/javascripts/angular-new/controllers/project_repo_block_controller.js b/app/assets/javascripts/angularjs/controllers/project_repo_block_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/project_repo_block_controller.js
rename to app/assets/javascripts/angularjs/controllers/project_repo_block_controller.js
diff --git a/app/assets/javascripts/angular-new/controllers/project_tags_controller.js b/app/assets/javascripts/angularjs/controllers/project_tags_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/project_tags_controller.js
rename to app/assets/javascripts/angularjs/controllers/project_tags_controller.js
diff --git a/app/assets/javascripts/angular-new/controllers/projects_controller.js b/app/assets/javascripts/angularjs/controllers/projects_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/projects_controller.js
rename to app/assets/javascripts/angularjs/controllers/projects_controller.js
diff --git a/app/assets/javascripts/angularjs/controllers/rosa_abf_controller.js b/app/assets/javascripts/angularjs/controllers/rosa_abf_controller.js
index b0d884682..dd02af5ed 100644
--- a/app/assets/javascripts/angularjs/controllers/rosa_abf_controller.js
+++ b/app/assets/javascripts/angularjs/controllers/rosa_abf_controller.js
@@ -1,8 +1,8 @@
-RosaABF.controller('RosaABFController', ['$scope', 'LocalesHelper', 'SoundNotificationsHelper', function($scope, LocalesHelper, SoundNotificationsHelper) {
-
+RosaABF.controller('RosaABFController', ['$scope', 'LocalesHelper', 'SoundNotificationsHelper',
+                   function($scope, LocalesHelper, SoundNotificationsHelper) {
   $scope.init = function(locale, sound_notifications) {
   	LocalesHelper.setLocale(locale);
+    moment.locale(locale);
     SoundNotificationsHelper.enabled(sound_notifications);
   }
-
-}]);
\ No newline at end of file
+}]);
diff --git a/app/assets/javascripts/angular-new/controllers/statistics_controller.js.coffee b/app/assets/javascripts/angularjs/controllers/statistics_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/controllers/statistics_controller.js.coffee
rename to app/assets/javascripts/angularjs/controllers/statistics_controller.js.coffee
diff --git a/app/assets/javascripts/angularjs/directives/ng_confirm_click.js.coffee b/app/assets/javascripts/angularjs/directives/ng_confirm_click.js.coffee
index 179c827d5..86e70ff2a 100644
--- a/app/assets/javascripts/angularjs/directives/ng_confirm_click.js.coffee
+++ b/app/assets/javascripts/angularjs/directives/ng_confirm_click.js.coffee
@@ -5,7 +5,11 @@ RosaABF.directive "ngConfirmClick", ->
   restrict: "A"
   link: (scope, element, attr) ->
     msg = attr.ngConfirmClick || "Are you sure?"
+    clickAction = attr.confirmedClick
     element.bind 'click', (event) ->
-      unless confirm(msg)
-        event.stopImmediatePropagation()
-        event.preventDefault
+      if clickAction
+        scope.$apply clickAction if window.confirm(msg)
+      else
+        unless confirm(msg)
+          event.stopImmediatePropagation()
+          event.preventDefault
diff --git a/app/assets/javascripts/angular-new/issues/issue.js.coffee b/app/assets/javascripts/angularjs/issues/issue.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/issues/issue.js.coffee
rename to app/assets/javascripts/angularjs/issues/issue.js.coffee
diff --git a/app/assets/javascripts/angular-new/issues/issue_controller.js.coffee b/app/assets/javascripts/angularjs/issues/issue_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/issues/issue_controller.js.coffee
rename to app/assets/javascripts/angularjs/issues/issue_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/issues/issues_controller.js.coffee b/app/assets/javascripts/angularjs/issues/issues_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/issues/issues_controller.js.coffee
rename to app/assets/javascripts/angularjs/issues/issues_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/labels/label.js.coffee b/app/assets/javascripts/angularjs/labels/label.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/labels/label.js.coffee
rename to app/assets/javascripts/angularjs/labels/label.js.coffee
diff --git a/app/assets/javascripts/angular-new/labels/labels_controller.js.coffee b/app/assets/javascripts/angularjs/labels/labels_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/labels/labels_controller.js.coffee
rename to app/assets/javascripts/angularjs/labels/labels_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/mass_builds/mass_build_service.js.coffee b/app/assets/javascripts/angularjs/mass_builds/mass_build_service.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/mass_builds/mass_build_service.js.coffee
rename to app/assets/javascripts/angularjs/mass_builds/mass_build_service.js.coffee
diff --git a/app/assets/javascripts/angular-new/mass_builds/new_mass_build_controller.js.coffee b/app/assets/javascripts/angularjs/mass_builds/new_mass_build_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/mass_builds/new_mass_build_controller.js.coffee
rename to app/assets/javascripts/angularjs/mass_builds/new_mass_build_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/models/build_list.js.erb b/app/assets/javascripts/angularjs/models/build_list.js.erb
similarity index 100%
rename from app/assets/javascripts/angular-new/models/build_list.js.erb
rename to app/assets/javascripts/angularjs/models/build_list.js.erb
diff --git a/app/assets/javascripts/angular-new/models/project.js b/app/assets/javascripts/angularjs/models/project.js
similarity index 100%
rename from app/assets/javascripts/angular-new/models/project.js
rename to app/assets/javascripts/angularjs/models/project.js
diff --git a/app/assets/javascripts/angular-new/models/project_ref.js b/app/assets/javascripts/angularjs/models/project_ref.js
similarity index 100%
rename from app/assets/javascripts/angular-new/models/project_ref.js
rename to app/assets/javascripts/angularjs/models/project_ref.js
diff --git a/app/assets/javascripts/angular-new/platforms/automatic_metadata_regeneration_controller.js.coffee b/app/assets/javascripts/angularjs/platforms/automatic_metadata_regeneration_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/platforms/automatic_metadata_regeneration_controller.js.coffee
rename to app/assets/javascripts/angularjs/platforms/automatic_metadata_regeneration_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/platforms/contents_controller.js.coffee b/app/assets/javascripts/angularjs/platforms/contents_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/platforms/contents_controller.js.coffee
rename to app/assets/javascripts/angularjs/platforms/contents_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/platforms/platform_sys_repos_controller.js.coffee b/app/assets/javascripts/angularjs/platforms/platform_sys_repos_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/platforms/platform_sys_repos_controller.js.coffee
rename to app/assets/javascripts/angularjs/platforms/platform_sys_repos_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/platforms/repository_projects_controller.js.coffee b/app/assets/javascripts/angularjs/platforms/repository_projects_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/platforms/repository_projects_controller.js.coffee
rename to app/assets/javascripts/angularjs/platforms/repository_projects_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/projects/collaborators_controller.js.coffee b/app/assets/javascripts/angularjs/projects/collaborators_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/projects/collaborators_controller.js.coffee
rename to app/assets/javascripts/angularjs/projects/collaborators_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/projects/project_schedule_controller.js b/app/assets/javascripts/angularjs/projects/project_schedule_controller.js
similarity index 100%
rename from app/assets/javascripts/angular-new/projects/project_schedule_controller.js
rename to app/assets/javascripts/angularjs/projects/project_schedule_controller.js
diff --git a/app/assets/javascripts/angular-new/pull_requests/pull_request.js.coffee b/app/assets/javascripts/angularjs/pull_requests/pull_request.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/pull_requests/pull_request.js.coffee
rename to app/assets/javascripts/angularjs/pull_requests/pull_request.js.coffee
diff --git a/app/assets/javascripts/angular-new/pull_requests/pull_request_controller.js.coffee b/app/assets/javascripts/angularjs/pull_requests/pull_request_controller.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/pull_requests/pull_request_controller.js.coffee
rename to app/assets/javascripts/angularjs/pull_requests/pull_request_controller.js.coffee
diff --git a/app/assets/javascripts/angular-new/services/collaborator.js.coffee b/app/assets/javascripts/angularjs/services/collaborator.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/services/collaborator.js.coffee
rename to app/assets/javascripts/angularjs/services/collaborator.js.coffee
diff --git a/app/assets/javascripts/angular-new/services/compile_html.js.coffee b/app/assets/javascripts/angularjs/services/compile_html.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/services/compile_html.js.coffee
rename to app/assets/javascripts/angularjs/services/compile_html.js.coffee
diff --git a/app/assets/javascripts/angular-new/services/confirm_message.js.coffee.erb b/app/assets/javascripts/angularjs/services/confirm_message.js.coffee.erb
similarity index 100%
rename from app/assets/javascripts/angular-new/services/confirm_message.js.coffee.erb
rename to app/assets/javascripts/angularjs/services/confirm_message.js.coffee.erb
diff --git a/app/assets/javascripts/angular-new/services/datetime_formatter.js.coffee b/app/assets/javascripts/angularjs/services/datetime_formatter.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/services/datetime_formatter.js.coffee
rename to app/assets/javascripts/angularjs/services/datetime_formatter.js.coffee
diff --git a/app/assets/javascripts/angular-new/services/preview.js.coffee b/app/assets/javascripts/angularjs/services/preview.js.coffee
similarity index 100%
rename from app/assets/javascripts/angular-new/services/preview.js.coffee
rename to app/assets/javascripts/angularjs/services/preview.js.coffee
diff --git a/app/assets/javascripts/angular-new/services/project.js b/app/assets/javascripts/angularjs/services/project.js
similarity index 100%
rename from app/assets/javascripts/angular-new/services/project.js
rename to app/assets/javascripts/angularjs/services/project.js
diff --git a/app/assets/javascripts/angular-new/templates/build_list_notification.html.haml b/app/assets/javascripts/angularjs/templates/build_list_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/build_list_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/build_list_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/git_delete_branch_notification.html.haml b/app/assets/javascripts/angularjs/templates/git_delete_branch_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/git_delete_branch_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/git_delete_branch_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/git_new_push_notification.html.haml b/app/assets/javascripts/angularjs/templates/git_new_push_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/git_new_push_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/git_new_push_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/issue_assign_notification.html.haml b/app/assets/javascripts/angularjs/templates/issue_assign_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/issue_assign_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/issue_assign_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/new_comment_commit_notification.html.haml b/app/assets/javascripts/angularjs/templates/new_comment_commit_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/new_comment_commit_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/new_comment_commit_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/new_comment_notification.html.haml b/app/assets/javascripts/angularjs/templates/new_comment_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/new_comment_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/new_comment_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/new_issue_notification.html.haml b/app/assets/javascripts/angularjs/templates/new_issue_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/new_issue_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/new_issue_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/new_user_notification.html.haml b/app/assets/javascripts/angularjs/templates/new_user_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/new_user_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/new_user_notification.html.haml
diff --git a/app/assets/javascripts/angular-new/templates/search_collaborators.html.slim b/app/assets/javascripts/angularjs/templates/search_collaborators.html.slim
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/search_collaborators.html.slim
rename to app/assets/javascripts/angularjs/templates/search_collaborators.html.slim
diff --git a/app/assets/javascripts/angular-new/templates/wiki_new_commit_notification.html.haml b/app/assets/javascripts/angularjs/templates/wiki_new_commit_notification.html.haml
similarity index 100%
rename from app/assets/javascripts/angular-new/templates/wiki_new_commit_notification.html.haml
rename to app/assets/javascripts/angularjs/templates/wiki_new_commit_notification.html.haml
diff --git a/app/assets/javascripts/new_application.js b/app/assets/javascripts/new_application.js
index a81dfeba4..0cea25b71 100644
--- a/app/assets/javascripts/new_application.js
+++ b/app/assets/javascripts/new_application.js
@@ -16,7 +16,6 @@
 //= require angular-ui-bootstrap-tpls
 //= require ui-codemirror
 //= require angular-i18n
-//= require angularjs/locales
 
 //= require angular-resource
 //= require ng-rails-csrf
@@ -26,9 +25,8 @@
 //= require angular-rails-templates
 
 //= require moment
-//= require angularjs/angular-moment
 
-//= require_tree ./angular-new
+//= require_tree ./angularjs
 //= require loading-bar
 
 //= require underscore