From 468a50de9e28ccd04d2e78af3c24bc159e47f722 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 26 Mar 2015 12:01:50 -0700 Subject: [PATCH] GUAC-1138: Generalize "pager" module into "list" module. --- guacamole/src/main/webapp/app/groupList/groupListModule.js | 2 +- .../src/main/webapp/app/{pager => list}/directives/guacPager.js | 2 +- .../webapp/app/{pager/pagerModule.js => list/listModule.js} | 2 +- guacamole/src/main/webapp/app/{pager => list}/styles/pager.css | 0 .../main/webapp/app/{pager => list}/templates/guacPager.html | 0 guacamole/src/main/webapp/app/manage/manageModule.js | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename guacamole/src/main/webapp/app/{pager => list}/directives/guacPager.js (99%) rename guacamole/src/main/webapp/app/{pager/pagerModule.js => list/listModule.js} (97%) rename guacamole/src/main/webapp/app/{pager => list}/styles/pager.css (100%) rename guacamole/src/main/webapp/app/{pager => list}/templates/guacPager.html (100%) diff --git a/guacamole/src/main/webapp/app/groupList/groupListModule.js b/guacamole/src/main/webapp/app/groupList/groupListModule.js index 084f3b931..57447fdb5 100644 --- a/guacamole/src/main/webapp/app/groupList/groupListModule.js +++ b/guacamole/src/main/webapp/app/groupList/groupListModule.js @@ -24,4 +24,4 @@ * Module for displaying the contents of a connection group, allowing the user * to select individual connections or groups. */ -angular.module('groupList', ['pager', 'rest']); +angular.module('groupList', ['list', 'rest']); diff --git a/guacamole/src/main/webapp/app/pager/directives/guacPager.js b/guacamole/src/main/webapp/app/list/directives/guacPager.js similarity index 99% rename from guacamole/src/main/webapp/app/pager/directives/guacPager.js rename to guacamole/src/main/webapp/app/list/directives/guacPager.js index 8074f1362..2f6be52a1 100644 --- a/guacamole/src/main/webapp/app/pager/directives/guacPager.js +++ b/guacamole/src/main/webapp/app/list/directives/guacPager.js @@ -24,7 +24,7 @@ * A directive which provides pagination controls, along with a paginated * subset of the elements of some given array. */ -angular.module('pager').directive('guacPager', [function guacPager() { +angular.module('list').directive('guacPager', [function guacPager() { return { restrict: 'E', diff --git a/guacamole/src/main/webapp/app/pager/pagerModule.js b/guacamole/src/main/webapp/app/list/listModule.js similarity index 97% rename from guacamole/src/main/webapp/app/pager/pagerModule.js rename to guacamole/src/main/webapp/app/list/listModule.js index 026a64286..0bcd6bbec 100644 --- a/guacamole/src/main/webapp/app/pager/pagerModule.js +++ b/guacamole/src/main/webapp/app/list/listModule.js @@ -23,4 +23,4 @@ /** * Module for displaying the contents of a list, split into multiple pages. */ -angular.module('pager', []); +angular.module('list', []); diff --git a/guacamole/src/main/webapp/app/pager/styles/pager.css b/guacamole/src/main/webapp/app/list/styles/pager.css similarity index 100% rename from guacamole/src/main/webapp/app/pager/styles/pager.css rename to guacamole/src/main/webapp/app/list/styles/pager.css diff --git a/guacamole/src/main/webapp/app/pager/templates/guacPager.html b/guacamole/src/main/webapp/app/list/templates/guacPager.html similarity index 100% rename from guacamole/src/main/webapp/app/pager/templates/guacPager.html rename to guacamole/src/main/webapp/app/list/templates/guacPager.html diff --git a/guacamole/src/main/webapp/app/manage/manageModule.js b/guacamole/src/main/webapp/app/manage/manageModule.js index e6fffae7b..69a7a1198 100644 --- a/guacamole/src/main/webapp/app/manage/manageModule.js +++ b/guacamole/src/main/webapp/app/manage/manageModule.js @@ -25,9 +25,9 @@ */ angular.module('manage', [ 'groupList', + 'list', 'locale', 'notification', - 'pager', 'rest', 'userMenu' ]);