diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 46957217e0..1521516ced 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -276,7 +276,7 @@ i:active,
opacity: 0;
}
-#configure-tower-dialog, #configure-schedules-form-container {
+#configure-dialog, #configure-schedules-form-container {
display: none;
overflow-x: hidden;
overflow-y: auto;
diff --git a/awx/ui/client/src/about/main.js b/awx/ui/client/src/about/main.js
index 87b9237140..8ef9d54b63 100644
--- a/awx/ui/client/src/about/main.js
+++ b/awx/ui/client/src/about/main.js
@@ -8,8 +8,8 @@
import route from './about.route';
export default
- angular.module('aboutTower', [])
- .controller('aboutTower', controller)
+ angular.module('about', [])
+ .controller('about', controller)
.run(['$stateExtender', function($stateExtender){
$stateExtender.addState(route);
- }]);
\ No newline at end of file
+ }]);
diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index dcc9500834..4bec42100b 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -77,7 +77,7 @@ import '../lib/models';
import '../lib/services';
import '../features';
-var tower = angular.module('Tower', [
+var app = angular.module('app', [
// how to add CommonJS / AMD third-party dependencies:
// 1. npm install --save package-name
// 2. add package name to ./grunt-tasks/webpack.vendorFiles
@@ -460,4 +460,4 @@ var tower = angular.module('Tower', [
}
]);
-export default tower;
+export default app;
diff --git a/awx/ui/client/src/credentials/factories/credential-form-save.factory.js b/awx/ui/client/src/credentials/factories/credential-form-save.factory.js
index bdd4fe8c30..ec47648497 100644
--- a/awx/ui/client/src/credentials/factories/credential-form-save.factory.js
+++ b/awx/ui/client/src/credentials/factories/credential-form-save.factory.js
@@ -65,7 +65,7 @@ export default
})
.error(function (data, status) {
Wait('stop');
- // TODO: hopefully this conditional error handling will to away in a future version of tower. The reason why we cannot
+ // TODO: hopefully this conditional error handling will to away in a future versions. The reason why we cannot
// simply pass this error to ProcessErrors is because it will actually match the form element 'ssh_key_unlock' and show
// the error there. The ssh_key_unlock field is not shown when the kind of credential is gce/azure and as a result the
// error is never shown. In the future, the API will hopefully either behave or respond differently.
diff --git a/awx/ui/client/src/footer/main.js b/awx/ui/client/src/footer/main.js
index 1bbd6a10c0..1bb909cf34 100644
--- a/awx/ui/client/src/footer/main.js
+++ b/awx/ui/client/src/footer/main.js
@@ -8,4 +8,4 @@ import footerDirective from './footer.directive';
export default
angular.module('footer', [])
- .directive('towerFooter', footerDirective);
+ .directive('customFooter', footerDirective);
diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js
index 037a823a4e..8bc8c86413 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.controller.js
+++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js
@@ -32,7 +32,7 @@
* that with the login form. Doing this each time the controller is instantiated insures the form is clean and not pre-populated with a prior user's username and password.
*
* Just before the release of 2.0 a bug was discovered where clicking logout and then immediately clicking login without providing a username and password would successfully log
- * the user back into Tower. Implementing the above approach fixed this, forcing a new username/password to be entered each time the login dialog appears.
+ * the user back into the app. Implementing the above approach fixed this, forcing a new username/password to be entered each time the login dialog appears.
*
* #Login Workflow
*
@@ -44,7 +44,7 @@
* - Get user informaton by calling Authorization.getUser() - sends a GET request to /api/v2/me
* - Store user information in the session cookie by calling Authorization.setUser().
* - Get the license by calling ConfigService.getConfig() - sends a GET request to /api/vi/config
- * - Stores the license object in memory by calling CheckLicense.test(). This adds the version and a tested flag to the license object. The tested flag is initially set to false. Additionally, the pendoService and FeaturesService are called to initiate the other startup services of Tower
+ * - Stores the license object in memory by calling CheckLicense.test(). This adds the version and a tested flag to the license object. The tested flag is initially set to false. Additionally, the pendoService and FeaturesService are called to initiate the other startup services
*
* Note that there is a session timer kept on the server side as well as the client side. Each time an API request is made, app.js calls
* Timer.isExpired(). This verifies the UI does not think the session is expired, and if not, moves the expiration time into the future. The number of
diff --git a/awx/ui/client/src/management-jobs/card/card.controller.js b/awx/ui/client/src/management-jobs/card/card.controller.js
index 9d8347b452..ce94245d9a 100644
--- a/awx/ui/client/src/management-jobs/card/card.controller.js
+++ b/awx/ui/client/src/management-jobs/card/card.controller.js
@@ -42,7 +42,7 @@ export default
// Cancel
scope.cancelConfigure = function () {
try {
- $('#configure-tower-dialog').dialog('close');
+ $('#configure-dialog').dialog('close');
$("#configure-save-button").remove();
}
catch(e) {
@@ -131,7 +131,7 @@ export default
.success(function(data) {
Wait('stop');
$("#prompt-for-days-facts").dialog("close");
- $("#configure-tower-dialog").dialog('close');
+ $("#configure-dialog").dialog('close');
$state.go('managementJobStdout', {id: data.system_job}, {reload:true});
})
.error(function(data, status) {
@@ -151,7 +151,7 @@ export default
scope.removePromptForDays();
}
scope.removePromptForDays = scope.$on('PromptForDaysFacts', function() {
- // $('#configure-tower-dialog').dialog('close');
+ // $('#configure-dialog').dialog('close');
$('#prompt-for-days-facts').show();
$('#prompt-for-days-facts').dialog('open');
CreateSelect2({
@@ -221,7 +221,7 @@ export default
.success(function(data) {
Wait('stop');
$("#prompt-for-days").dialog("close");
- // $("#configure-tower-dialog").dialog('close');
+ // $("#configure-dialog").dialog('close');
$state.go('managementJobStdout', {id: data.system_job}, {reload:true});
})
.error(function(data, status) {
@@ -241,7 +241,7 @@ export default
scope.removePromptForDays();
}
scope.removePromptForDays = scope.$on('PromptForDays', function() {
- // $('#configure-tower-dialog').dialog('close');
+ // $('#configure-dialog').dialog('close');
$('#prompt-for-days').show();
$('#prompt-for-days').dialog('open');
Wait('stop');
diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js
index bd166291b8..d7fe283391 100644
--- a/awx/ui/client/src/shared/socket/socket.service.js
+++ b/awx/ui/client/src/shared/socket/socket.service.js
@@ -98,7 +98,7 @@ export default
str = `ws-${data.group_name}-${data.ad_hoc_command}`;
}
else if(data.group_name==="control"){
- // As of Tower v. 3.1.0, there is only 1 "control"
+ // As of v. 3.1.0, there is only 1 "control"
// message, which is for expiring the session if the
// session limit is breached.
$log.debug(data.reason);
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 64255fd1a2..7afc8043df 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -1,6 +1,6 @@
{% load i18n %}
-
+
@@ -173,7 +173,7 @@
{% trans 'working...' %}
-
+