Ver código fonte

Made some adjustments to get the new Help Desk and People Search "hooked in" to the JSP pages.

jalbr74 7 anos atrás
pai
commit
69ad034e8b

+ 6 - 239
client/package-lock.json

@@ -221,6 +221,12 @@
       "integrity": "sha512-6igWH2GIsxV+J38wNWCh8oyjaZsrIPIDO35twloIUyjlF2Yit6UyLAWujHP05ma/LFxTsx4NtYibRoMNBXPR1A==",
       "dev": true
     },
+    "angular-aria": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.6.9.tgz",
+      "integrity": "sha512-I2SR17Ux0o0R9KD3DRzjR5NNX3pUSKvtWYLFCLg22qvR5+736olCQSyptNIvKsvjALwfXBw1Irdlq0jyohDn+Q==",
+      "dev": true
+    },
     "angular-mocks": {
       "version": "1.6.9",
       "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.6.9.tgz",
@@ -444,13 +450,6 @@
         }
       }
     },
-    "async": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-      "dev": true,
-      "optional": true
-    },
     "async-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
@@ -2354,12 +2353,6 @@
         "source-map": "0.5.7"
       }
     },
-    "cubic2quad": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz",
-      "integrity": "sha1-abGcYaP1tB7PLx1fro+wNBWqixU=",
-      "dev": true
-    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -3466,17 +3459,6 @@
         "debug": "2.6.7"
       }
     },
-    "fontgen-loader": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fontgen-loader/-/fontgen-loader-0.2.1.tgz",
-      "integrity": "sha1-uO1tmnmNWwVbgPHiHbSwQXC28FE=",
-      "dev": true,
-      "requires": {
-        "glob": "6.0.4",
-        "loader-utils": "0.2.17",
-        "webfonts-generator": "0.3.5"
-      }
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -4725,16 +4707,6 @@
       "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
       "dev": true
     },
-    "handlebars": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz",
-      "integrity": "sha1-bp1/hRSjRn+l6fgswVjs/B1ax28=",
-      "dev": true,
-      "requires": {
-        "optimist": "0.3.7",
-        "uglify-js": "2.3.6"
-      }
-    },
     "har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
@@ -7066,12 +7038,6 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
       "dev": true
     },
-    "microbuffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz",
-      "integrity": "sha1-izgy7UDIfVH0e7I0kTppinVtGdI=",
-      "dev": true
-    },
     "micromatch": {
       "version": "2.3.11",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
@@ -7342,15 +7308,6 @@
         "xml-char-classes": "1.0.0"
       }
     },
-    "neatequal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/neatequal/-/neatequal-1.0.0.tgz",
-      "integrity": "sha1-LuEhG8n6bkxVcV/SELsFYC6xrjs=",
-      "dev": true,
-      "requires": {
-        "varstream": "0.3.2"
-      }
-    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -7907,15 +7864,6 @@
         "is-wsl": "1.1.0"
       }
     },
-    "optimist": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-      "dev": true,
-      "requires": {
-        "wordwrap": "0.0.3"
-      }
-    },
     "optionator": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -10897,18 +10845,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "string.fromcodepoint": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz",
-      "integrity": "sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM=",
-      "dev": true
-    },
-    "string.prototype.codepointat": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz",
-      "integrity": "sha1-aybpvTr8qnvjtCabUm3huCAArHg=",
-      "dev": true
-    },
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
@@ -11031,66 +10967,6 @@
         "has-flag": "1.0.0"
       }
     },
-    "svg-pathdata": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-1.0.4.tgz",
-      "integrity": "sha1-emgTQqrH7/2NUq+6eZmRDJ2juVk=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "2.0.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "0.10.31",
-            "util-deprecate": "1.0.2"
-          }
-        }
-      }
-    },
-    "svg2ttf": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/svg2ttf/-/svg2ttf-4.1.0.tgz",
-      "integrity": "sha1-ggIuVovQPBq7Zo/djRXwCJVqDhA=",
-      "dev": true,
-      "requires": {
-        "argparse": "1.0.9",
-        "cubic2quad": "1.1.1",
-        "lodash": "4.17.4",
-        "microbuffer": "1.0.0",
-        "svgpath": "2.2.1",
-        "xmldom": "0.1.27"
-      }
-    },
-    "svgicons2svgfont": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/svgicons2svgfont/-/svgicons2svgfont-5.0.2.tgz",
-      "integrity": "sha1-BRGCPGSRvhp9VDKS4pqK5ietBAY=",
-      "dev": true,
-      "requires": {
-        "commander": "2.11.0",
-        "neatequal": "1.0.0",
-        "readable-stream": "2.3.3",
-        "sax": "1.2.4",
-        "string.fromcodepoint": "0.2.1",
-        "string.prototype.codepointat": "0.2.0",
-        "svg-pathdata": "1.0.4"
-      }
-    },
     "svgo": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
@@ -11106,12 +10982,6 @@
         "whet.extend": "0.9.9"
       }
     },
-    "svgpath": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/svgpath/-/svgpath-2.2.1.tgz",
-      "integrity": "sha1-CDS7Z8iadkcrK9BswQH6e1F7Iiw=",
-      "dev": true
-    },
     "syntax-error": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz",
@@ -11791,27 +11661,6 @@
         "tslib": "1.9.0"
       }
     },
-    "ttf2eot": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ttf2eot/-/ttf2eot-2.0.0.tgz",
-      "integrity": "sha1-jmM3pYWr0WCKDISVirSDzmn2ZUs=",
-      "dev": true,
-      "requires": {
-        "argparse": "1.0.9",
-        "microbuffer": "1.0.0"
-      }
-    },
-    "ttf2woff": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz",
-      "integrity": "sha1-hxgyJAAksJ25VwkEx8GSi4BXyWk=",
-      "dev": true,
-      "requires": {
-        "argparse": "1.0.9",
-        "microbuffer": "1.0.0",
-        "pako": "1.0.5"
-      }
-    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -11865,30 +11714,6 @@
       "integrity": "sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw==",
       "dev": true
     },
-    "uglify-js": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz",
-      "integrity": "sha1-+gmEdwtCi3qbKoBY9GNV0U/vIRo=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "async": "0.2.10",
-        "optimist": "0.3.7",
-        "source-map": "0.1.43"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        }
-      }
-    },
     "uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
@@ -11926,12 +11751,6 @@
       "integrity": "sha1-iuVW4RAR9jwllnCKiDclnwGz1g4=",
       "dev": true
     },
-    "underscore": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-      "dev": true
-    },
     "union-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
@@ -12091,12 +11910,6 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url-join": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz",
-      "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=",
-      "dev": true
-    },
     "url-loader": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
@@ -12307,29 +12120,6 @@
         "spdx-expression-parse": "1.0.4"
       }
     },
-    "varstream": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/varstream/-/varstream-0.3.2.tgz",
-      "integrity": "sha1-GKxklHZfP/GjWtmkvgU77BiKXeE=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "1.1.14"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        }
-      }
-    },
     "vary": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
@@ -12385,23 +12175,6 @@
         "minimalistic-assert": "1.0.0"
       }
     },
-    "webfonts-generator": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/webfonts-generator/-/webfonts-generator-0.3.5.tgz",
-      "integrity": "sha1-4t7/t4ZEhOn1qTpYYHp2dSxp2ig=",
-      "dev": true,
-      "requires": {
-        "handlebars": "2.0.0",
-        "mkdirp": "0.5.1",
-        "q": "1.5.0",
-        "svg2ttf": "4.1.0",
-        "svgicons2svgfont": "5.0.2",
-        "ttf2eot": "2.0.0",
-        "ttf2woff": "2.0.1",
-        "underscore": "1.8.3",
-        "url-join": "1.1.0"
-      }
-    },
     "webpack": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz",
@@ -13644,12 +13417,6 @@
       "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=",
       "dev": true
     },
-    "xmldom": {
-      "version": "0.1.27",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
-      "dev": true
-    },
     "xregexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",

+ 72 - 72
client/package.json

@@ -1,74 +1,74 @@
 {
-  "name": "ng1-webpack",
-  "version": "0.0.1",
-  "description": "",
-  "main": "index.js",
-  "engines": {
-    "node": ">=6.2",
-    "npm": ">=3.9"
-  },
-  "scripts": {
-    "build": "webpack --config=webpack.build.js --NODE_ENV=production",
-    "clean": "rimraf dist/",
-    "test": "karma start --NODE_ENV=test",
-    "test-single-run": "karma start --NODE_ENV=test --singleRun --no-auto-watch",
-    "start": "webpack-dev-server --config=webpack.dev.js --NODE_ENV=dev --colors",
-    "sync": "webpack --config=webpack.build.js --NODE_ENV=production --output-path=../server/src/main/webapp/public/resources/webjars/pwm-client --watch --colors"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {},
-  "devDependencies": {
-    "@types/angular": "1.6.42",
-    "@types/angular-mocks": "1.5.11",
-    "@types/angular-translate": "2.15.1",
-    "@types/angular-ui-router": "1.1.40",
-    "@types/jasmine": "2.8.6",
-    "@types/node": "9.4.2",
-    "@uirouter/angularjs": "1.0.14",
-    "angular": "1.6.9",
-    "angular-aria": "1.6.9",
-    "angular-mocks": "1.6.9",
-    "angular-translate": "2.17.0",
-    "autoprefixer": "7.2.5",
-    "copy-webpack-plugin": "4.4.1",
-    "css-loader": "0.28.9",
-    "file-loader": "1.1.6",
-    "html-loader": "0.5.5",
-    "html-webpack-plugin": "2.30.1",
-    "ignore-loader": "0.1.2",
-    "jasmine": "3.0.0",
-    "jasmine-core": "^2.99.1",
-    "jshint": "2.9.5",
-    "jshint-loader": "0.8.4",
-    "json-loader": "0.5.7",
-    "karma": "2.0.0",
-    "karma-chrome-launcher": "2.2.0",
-    "karma-jasmine": "1.1.1",
-    "karma-jasmine-html-reporter": "0.2.2",
-    "karma-phantomjs-launcher": "1.0.4",
-    "karma-sourcemap-loader": "0.3.7",
-    "karma-spec-reporter": "0.0.32",
-    "karma-webpack": "2.0.9",
-    "ngtemplate-loader": "2.0.1",
-    "node-sass": "4.7.2",
-    "phantomjs": "2.1.7",
-    "phantomjs-prebuilt": "2.1.16",
-    "postcss-loader": "2.1.0",
-    "raw-loader": "0.5.1",
-    "rimraf": "2.6.2",
-    "sass-loader": "6.0.6",
-    "string-replace-loader": "1.3.0",
-    "style-loader": "0.20.1",
-    "ts-loader": "3.5.0",
-    "ts-mockito": "2.2.9",
-    "tslint": "^5.9.1",
-    "tslint-loader": "3.5.3",
-    "typescript": "2.7.1",
-    "url-loader": "0.6.2",
-    "webpack": "3.10.0",
-    "webpack-dev-server": "2.11.1",
-    "webpack-merge": "4.1.1",
-    "write-file-webpack-plugin": "4.2.0"
-  }
+    "name": "ng1-webpack",
+    "version": "0.0.1",
+    "description": "",
+    "main": "index.js",
+    "engines": {
+        "node": ">=6.2",
+        "npm": ">=3.9"
+    },
+    "scripts": {
+        "build": "webpack --config=webpack.build.js --env.NODE_ENV=production",
+        "clean": "rimraf dist/",
+        "test": "karma start --env.NODE_ENV=test",
+        "test-single-run": "karma start --env.NODE_ENV=test --singleRun --no-auto-watch",
+        "start": "webpack-dev-server --config=webpack.dev.js --env.NODE_ENV=dev --colors",
+        "sync": "webpack --config=webpack.build.js --env.NODE_ENV=production --output-path=../server/target/pwm-1.8.0-SNAPSHOT/public/resources/webjars/pwm-client --watch --colors"
+    },
+    "author": "",
+    "license": "ISC",
+    "dependencies": {},
+    "devDependencies": {
+        "@types/angular": "1.6.42",
+        "@types/angular-mocks": "1.5.11",
+        "@types/angular-translate": "2.15.1",
+        "@types/angular-ui-router": "1.1.40",
+        "@types/jasmine": "2.8.6",
+        "@types/node": "9.4.2",
+        "@uirouter/angularjs": "1.0.14",
+        "angular": "1.6.9",
+        "angular-aria": "1.6.9",
+        "angular-mocks": "1.6.9",
+        "angular-translate": "2.17.0",
+        "autoprefixer": "7.2.5",
+        "copy-webpack-plugin": "4.4.1",
+        "css-loader": "0.28.9",
+        "file-loader": "1.1.6",
+        "html-loader": "0.5.5",
+        "html-webpack-plugin": "2.30.1",
+        "ignore-loader": "0.1.2",
+        "jasmine": "3.0.0",
+        "jasmine-core": "2.99.1",
+        "jshint": "2.9.5",
+        "jshint-loader": "0.8.4",
+        "json-loader": "0.5.7",
+        "karma": "2.0.0",
+        "karma-chrome-launcher": "2.2.0",
+        "karma-jasmine": "1.1.1",
+        "karma-jasmine-html-reporter": "0.2.2",
+        "karma-phantomjs-launcher": "1.0.4",
+        "karma-sourcemap-loader": "0.3.7",
+        "karma-spec-reporter": "0.0.32",
+        "karma-webpack": "2.0.9",
+        "ngtemplate-loader": "2.0.1",
+        "node-sass": "4.7.2",
+        "phantomjs": "2.1.7",
+        "phantomjs-prebuilt": "2.1.16",
+        "postcss-loader": "2.1.0",
+        "raw-loader": "0.5.1",
+        "rimraf": "2.6.2",
+        "sass-loader": "6.0.6",
+        "string-replace-loader": "1.3.0",
+        "style-loader": "0.20.1",
+        "ts-loader": "3.5.0",
+        "ts-mockito": "2.2.9",
+        "tslint": "5.9.1",
+        "tslint-loader": "3.5.3",
+        "typescript": "2.7.1",
+        "url-loader": "0.6.2",
+        "webpack": "3.10.0",
+        "webpack-dev-server": "2.11.1",
+        "webpack-merge": "4.1.1",
+        "write-file-webpack-plugin": "4.2.0"
+    }
 }

+ 2 - 1
client/src/helpdesk/main.ts

@@ -34,7 +34,8 @@ import HelpDeskService from '../services/helpdesk.service';
 module('app', [
     uiRouter,
     helpDeskModule,
-    'pascalprecht.translate'
+    'pascalprecht.translate',
+    'ng-ias'
 ])
     .config(routes)
     .config([

+ 1 - 1
client/src/helpdesk/routes.ts

@@ -30,7 +30,7 @@ export default [
     ) => {
         $urlRouterProvider.otherwise(
             ($injector: angular.auto.IInjectorService, $location: angular.ILocationService) => {
-                $location.url('search');
+                $location.url('search/cards');
             });
 
         $stateProvider.state('search', {

+ 2 - 1
client/src/main.ts

@@ -34,7 +34,8 @@ import uiRouter from '@uirouter/angularjs';
 module('app', [
     uiRouter,
     peopleSearchModule,
-    'pascalprecht.translate'
+    'pascalprecht.translate',
+    'ng-ias'
 ])
 
     .config(routes)

+ 7 - 0
client/webpack.build.js

@@ -22,6 +22,7 @@
 
 
 var commonConfig = require('./webpack.common.js');
+var CopyWebpackPlugin = require('copy-webpack-plugin');
 var webpack = require('webpack');
 var webpackMerge = require('webpack-merge');
 
@@ -34,6 +35,12 @@ module.exports = webpackMerge(commonConfig, {
         'helpdesk.ng': './src/helpdesk/main'
     },
     plugins: [
+        new CopyWebpackPlugin([
+            { from: 'node_modules/@microfocus/ux-ias/dist/ux-ias.css', to: 'vendor/' },
+            { from: 'node_modules/@microfocus/ng-ias/dist/ng-ias.js', to: 'vendor/' },
+            { from: 'node_modules/@microfocus/ias-icons/dist/ias-icons.css', to: 'vendor/' },
+            { from: 'node_modules/@microfocus/ias-icons/dist/fonts', to: 'vendor/fonts' }
+        ]),
         new webpack.optimize.UglifyJsPlugin({
             compress: { warnings: false },
             comments: false,

+ 5 - 0
server/pom.xml

@@ -836,6 +836,11 @@
             <artifactId>angular</artifactId>
             <version>1.6.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.webjars.bower</groupId>
+            <artifactId>angular-aria</artifactId>
+            <version>1.6.9</version>
+        </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>angular-ui-router</artifactId>

+ 5 - 1
server/src/main/webapp/WEB-INF/jsp/helpdesk.jsp

@@ -45,12 +45,16 @@
 </div>
 
 <pwm:script-ref url="/public/resources/webjars/angular/angular.min.js" />
+<pwm:script-ref url="/public/resources/webjars/angular-aria/angular-aria.min.js" />
 <pwm:script-ref url="/public/resources/webjars/angular-ui-router/release/angular-ui-router.min.js" />
 <pwm:script-ref url="/public/resources/webjars/angular-translate/dist/angular-translate.min.js" />
 
 <jsp:include page="/WEB-INF/jsp/fragment/footer.jsp"/>
 <pwm:script-ref url="/public/resources/js/helpdesk.js"/>
-<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/fonts.css' addContext="true"/>"/>
+
+<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ias-icons.css' addContext="true"/>"/>
+<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias.css' addContext="true"/>"/>
+<pwm:script-ref url="/public/resources/webjars/pwm-client/vendor/ng-ias.js" />
 <pwm:script-ref url="/public/resources/webjars/pwm-client/helpdesk.ng.js" />
 <pwm:script-ref url="/public/resources/js/changepassword.js"/>
 

+ 5 - 1
server/src/main/webapp/WEB-INF/jsp/peoplesearch.jsp

@@ -39,11 +39,15 @@
 </div>
 
 <pwm:script-ref url="/public/resources/webjars/angular/angular.min.js" />
+<pwm:script-ref url="/public/resources/webjars/angular-aria/angular-aria.min.js" />
 <pwm:script-ref url="/public/resources/webjars/angular-ui-router/release/angular-ui-router.min.js" />
 <pwm:script-ref url="/public/resources/webjars/angular-translate/dist/angular-translate.min.js" />
 
 <%@ include file="fragment/footer.jsp" %>
-<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/fonts.css' addContext="true"/>"/>
+
+<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ias-icons.css' addContext="true"/>"/>
+<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias.css' addContext="true"/>"/>
+<pwm:script-ref url="/public/resources/webjars/pwm-client/vendor/ng-ias.js" />
 <pwm:script-ref url="/public/resources/webjars/pwm-client/peoplesearch.ng.js" />
 
 </body>