From 9fa6184b0adaf18906e425899dab11cd3c522e37 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 19 Jul 2016 15:23:22 -0700 Subject: [PATCH 001/150] [Frontend] Markup / Angular mods to Search Fixes #1093 WIP: markup changes. Needs CSS mods effected in #1047 as well. --- platform/search/res/templates/search.html | 87 +++++++++++++---------- 1 file changed, 51 insertions(+), 36 deletions(-) diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html index abad85e38a..c7d5e101e0 100644 --- a/platform/search/res/templates/search.html +++ b/platform/search/res/templates/search.html @@ -19,41 +19,56 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
-
- - - - - -
-
- Filtered by: {{ ngModel.filtersString }} -
-
- - - More Results -
+
+
+
+
+ + + + + +
+ + + Cancel +
+ +
+ Filtered by: {{ ngModel.filtersString }} +
+ +
+ No results found
+ +
+ + + More Results +
+ +
From 41156cec7cfcc39d80bd366bec0c480dd9b80f11 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 21 Jul 2016 12:07:28 -0700 Subject: [PATCH 002/150] [Build] Normalize reporting for QA tasks https://developer.nasa.gov/ResourceProspector/warp/issues/191 --- gulpfile.js | 5 +++++ karma.conf.js | 6 +++--- package.json | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index fab0f056e0..ff994c6a2c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -42,6 +42,7 @@ var gulp = require('gulp'), main: 'main.js', dist: 'dist', assets: 'dist/assets', + reports: 'dist/reports', scss: ['./platform/**/*.scss', './example/**/*.scss'], scripts: [ 'main.js', 'platform/**/*.js', 'src/**/*.js' ], specs: [ 'platform/**/*Spec.js', 'src/**/*Spec.js' ], @@ -112,6 +113,10 @@ gulp.task('lint', function () { .pipe(jshint({ jasmine: true })); return merge(scriptLint, specLint) + .pipe(jshint.reporter('gulp-jshint-html-reporter', { + filename: paths.reports + '/lint/jshint-report.html', + createMissingFolders : true + })) .pipe(jshint.reporter('default')) .pipe(jshint.reporter('fail')); }); diff --git a/karma.conf.js b/karma.conf.js index 17889dfe43..e682ec6d86 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -81,7 +81,7 @@ module.exports = function(config) { coverageReporter: { dir: process.env.CIRCLE_ARTIFACTS ? process.env.CIRCLE_ARTIFACTS + '/coverage' : - "dist/coverage", + "dist/reports/coverage", check: { global: { lines: 80 @@ -91,13 +91,13 @@ module.exports = function(config) { // HTML test reporting. htmlReporter: { - outputDir: "target/tests", + outputDir: "dist/reports/tests", preserveDescribeNesting: true, foldAll: false }, junitReporter: { - outputDir: process.env.CIRCLE_TEST_REPORTS || 'target/junit' + outputDir: process.env.CIRCLE_TEST_REPORTS || 'dist/reports/junit' }, // Continuous Integration mode. diff --git a/package.json b/package.json index dadce1d35c..028d7310e1 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "gulp": "^3.9.0", "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0", + "gulp-jshint-html-reporter": "^0.1.3", "gulp-rename": "^1.2.2", "gulp-replace-task": "^0.11.0", "gulp-requirejs-optimize": "^0.3.1", From d1e1ba1c66fbb17474023e938e18f498118baf67 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 1 Aug 2016 14:33:25 -0700 Subject: [PATCH 003/150] [Frontend] Refactor glyphs to classes Squashes #1103, fixes #1047. Squashed commit of the following: commit 0e060f174dd8bc453e7a53ea6bf5517869efaaae Author: Charles Hacskaylo Date: Fri Jul 29 14:55:34 2016 -0700 [Frontend] Added button to .s-button Fixes #1047 commit 9f74395a797546d6b4c4e501829db105e862ecdb Author: Charles Hacskaylo Date: Fri Jul 29 14:43:36 2016 -0700 [Frontend] Fixing problems from circleci Fixes #1047 commit 7278c9534c4a6dd7a3d402ecb0eb12d59f102c83 Author: Charles Hacskaylo Date: Fri Jul 29 14:37:21 2016 -0700 [Frontend] CSS fixes for s-status classes Fixes #1047 Fixed .s-status-editing and s-status-pending; commit 4606d617d14024e6c573c6bfa5434bf761301c3f Merge: d5bff55 59436f7 Author: Charles Hacskaylo Date: Fri Jul 29 13:58:51 2016 -0700 Merge remote-tracking branch 'origin/master' into frontend-1047 commit d5bff555e0119e84e261c355695b504d64bc369a Author: Charles Hacskaylo Date: Thu Jul 28 19:09:33 2016 -0700 [Frontend] Updated glyphs used by plot view switcher Fixes #1047 commit b72d82baefa3d47a59dceb97691d66a9b67162c3 Author: Charles Hacskaylo Date: Thu Jul 28 19:09:00 2016 -0700 [Frontend] Tree styles in left pane and selector-list Fixes #1047 commit af36b9996dcd769d2a0a7d7f1f8a0f9838fd1464 Author: Charles Hacskaylo Date: Thu Jul 28 18:32:34 2016 -0700 [Frontend] Form validation styling Fixes #1047 must now include class 'validates' to display validation glyph icons; removed 'no-validate' from markup; cleaned up validation scss; commit 69dc893b4b9de29e3d505f7da4d38854db68b770 Author: Charles Hacskaylo Date: Thu Jul 28 17:11:52 2016 -0700 [Frontend] Glyphs to classes, mobile Fixes #1047 Fixes and enhancements for mobile, particularly in tree; Removed `display: inline-block` from containerSubtle mixin; commit 7bca18b18613273d579af7874936d43fa45bd790 Author: Charles Hacskaylo Date: Thu Jul 28 11:36:19 2016 -0700 [Frontend] Rename .s-menu-btn, remove unused Fixes #1047 .s-menu-btn > .s-menu-button; .create-btn > .create-button; removed unused l-btn, t-btn, t-btns-zoom from markup commit 5d229198b7343f3de44a052621e76d1f2e263f04 Author: Charles Hacskaylo Date: Thu Jul 28 11:25:36 2016 -0700 [Frontend] Rename .s-clickable-icon to .s-icon-button Fixes #1047 commit 36479e2e8b9c6e2a28ce03c0b49efbb633193fc5 Author: Charles Hacskaylo Date: Thu Jul 28 11:20:30 2016 -0700 [Frontend] Rename .s-btn to .s-button Fixes #1047 commit 89e4f06de9f3b8587318c3962390037f4e97ebe2 Author: Charles Hacskaylo Date: Thu Jul 28 11:12:07 2016 -0700 [Frontend] Apply clickable-icon class Fixes #1047 commit e65ca1cb8b3982124bae433ab973dd531df3b014 Author: Charles Hacskaylo Date: Thu Jul 28 10:52:35 2016 -0700 [Frontend] Updated icons Fixes #1047 - Clock, timer, plots updated commit 3e7eb98ac2bb4327853ee5307bc1365bd0f26399 Author: Charles Hacskaylo Date: Wed Jul 27 18:05:06 2016 -0700 [Frontend] Standardizing styles Fixes #1047 - Finessing mini-tab and making able to control per theme; s-clickable and s-toggle-icon classes cleaned up commit 18e08074a8e8c076ac927d3948af2865d88acb2d Author: Charles Hacskaylo Date: Wed Jul 27 16:33:25 2016 -0700 [Frontend] Tweaks to sass code Fixes #1047 - Splitter and mini-tab-icon elements commit 44fda8d68f682c9ae1e0e0fcdae029246eab0af9 Author: Charles Hacskaylo Date: Wed Jul 27 09:24:53 2016 -0700 [Frontend] Multiple UI fixes and tweaks Fixes #1047 mini-tabs, splitters and bg-splash updated; moved position of Inspector collapse mini-tab to allow position transition; splitter-sm class added for Timelines; commit 2aee8bc0d864a679df421d9c44ad092577464c75 Author: Charles Hacskaylo Date: Tue Jul 26 15:53:32 2016 -0700 [Frontend] Updated splash image Fixes #1047 commit 624f09777f8aa39f0965a46806769cd56596bcea Merge: ce7591f 4d2f159 Author: Charles Hacskaylo Date: Tue Jul 26 15:02:55 2016 -0700 Merge remote-tracking branch 'origin/master' into frontend-1047 commit ce7591f64299f163635808d22181f4c42d782a82 Author: Charles Hacskaylo Date: Tue Jul 26 11:22:23 2016 -0700 [Frontend] Fixed clock indicator Fixes #1047 Restored no-collapse and float-right properties; commit 5324c8edbabb225a19b1ba8ccb90401a50bcff9f Author: Charles Hacskaylo Date: Mon Jul 25 18:14:38 2016 -0700 [Frontend] New font and project file Fixes #1047 New font files that were missed in last commit; updated icomoon proj file; fixed missing char codes in glyphs.scss; commit a3b26288837b1ac80003ef1d819939312c8516bf Author: Charles Hacskaylo Date: Mon Jul 25 17:54:00 2016 -0700 [Frontend] Revised and new icon art Fixes #1047 New icons for overlay and stacked plots; revised art and new description for Fixed Position object; commit 8a41c6dbc724f19a240d08bce1520335dd50a33f Author: Charles Hacskaylo Date: Mon Jul 25 17:52:41 2016 -0700 [Frontend] Removing glyph definitions Fixes #1047 Updated comment commit eb293b21ebc2604dc0fea97453cfb929743157cf Author: Charles Hacskaylo Date: Mon Jul 25 11:56:18 2016 -0700 [Frontend] Removing glyph definitions Fixes #1047 Removed commented code commit d8b1fb7781e0b9244a35ca49d382da5cd48f98b9 Author: Charles Hacskaylo Date: Mon Jul 25 11:17:45 2016 -0700 [Frontend] Removing glyph definitions; updating tests Fixes #1047 Search and removal of "glyph" definitions in bundle and other JS files; updating tests accordingly; commit 650fbcc921d2995b6c0d82087f3e35fa600392e4 Author: Charles Hacskaylo Date: Mon Jul 25 10:20:33 2016 -0700 [Frontend] Removing glyph definitions; updating tests Fixes #1047 Search and removal of "glyph" definitions in bundle and other JS files; updating tests accordingly; commit 574b8bd5c12ac7e8bb900de34c40d3228acbf9bf Author: Charles Hacskaylo Date: Fri Jul 22 19:11:56 2016 -0700 [Frontend] Updated tests for glyph refactoring Fixes #1047 Fixing test cases commit dd84177441e449f1534b3f528101be221059b11e Author: Charles Hacskaylo Date: Fri Jul 22 18:47:45 2016 -0700 [Frontend] Updated tests and examples for glyph refactoring Fixes #1047 WIP: Fixing test cases: fixed test in Timers that was expecting glyph return; commit 2231f8e12452c9a4cadc9d51e38dafc3231f812d Author: Charles Hacskaylo Date: Thu Jul 21 17:45:20 2016 -0700 [Frontend] Updated tests for glyph refactoring Fixes #1047 Fixing test cases: fixed test in Timers that was expecting glyph return; commit ae59ecfa97615f321900aee3873f1f003b68ed61 Author: Charles Hacskaylo Date: Thu Jul 21 17:38:45 2016 -0700 [Frontend] Fixed style Fixes #1047 WIP: fixed line-height issue for t-item-icon class commit d43bff1445ca0b171bc27e02b54974afca8a736a Author: Charles Hacskaylo Date: Thu Jul 21 17:07:49 2016 -0700 [Frontend] Fixed colors Fixes #1047 WIP: fixed colors and style defs related to clickable icons commit c2db6f880557f1f2f9057d3c9da5ea2105fc9666 Author: Charles Hacskaylo Date: Thu Jul 21 16:32:17 2016 -0700 [Frontend] Fixed colors Fixes #1047 WIP: fixed colors related to changes to btnSubtle mixin; new constants for clickable icons commit a4753c44d17cadc6345f153a3c03b6d0f04f1de5 Author: Charles Hacskaylo Date: Thu Jul 21 15:23:58 2016 -0700 [Frontend] Added new icon-brackets to symbols font Fixes #1047 WIP commit 2704640b940ecfb9ac4d56c11f0b7ff99a3e4fd8 Author: Charles Hacskaylo Date: Thu Jul 21 15:11:28 2016 -0700 [Frontend] Normalize color constants Fixes #1047 Normalize color constant values for themes; consolidated and cleaned up btn-related mixins; fixed hover color issues commit 421286c7e4b926a1b2375d5d8635b1d291b3036d Author: Charles Hacskaylo Date: Thu Jul 21 14:10:13 2016 -0700 [Frontend] Convert new Fixed Position Display from glyphs Fixes #1047 WIP commit a4111f38552926f6043de62f4e3f291d735d7005 Author: Charles Hacskaylo Date: Thu Jul 21 14:07:38 2016 -0700 [Frontend] Refactoring Timeline glyphs, s-btn fixes Fixes #1047 WIP: Timeline-related glyph refactoring; s-btn styles and hover color fixes commit 883f99921591d7efb1fbac784427cfcd6ec9df60 Merge: 9d9cabb 14f1a1f Author: Charles Hacskaylo Date: Thu Jul 21 08:53:23 2016 -0700 Merge remote-tracking branch 'origin/master' into frontend-1047 commit 9d9cabb7607cfc5fa84353e88befa8d2752728c0 Author: Charles Hacskaylo Date: Tue Jul 19 16:20:20 2016 -0700 [Frontend] Glyph refactoring Fixes #1047 WIP: search, toolbar buttons; mods to flex archetypes commit 28b663ce4119a5d7fd175b1846c5b704c4ea03ad Author: Charles Hacskaylo Date: Mon Jul 18 14:58:40 2016 -0700 [Frontend] Glyph-related style changes to toolbars and buttons Fixes #1047 Glyph refactoring WIP for toolbar buttons; Timeline glyph refactoring continued commit a9326f572f87319f773e19ce8cff51f6da26d32b Author: Charles Hacskaylo Date: Mon Jul 18 13:36:45 2016 -0700 [Frontend] Glyph-related style changes to Timelines Fixes #1047 Timeline glyph refactoring; Resource Graph icons in swimlanes now display grayed-out version when not added to the Resource Graph; minor color tweaks commit d6e1737803e1b9ed78aaf8bea89b560d0b953010 Merge: 88054e5 6176ca2 Author: Charles Hacskaylo Date: Mon Jul 18 10:29:32 2016 -0700 [Frontend] Merge master into frontend-1047 Fixes #1047 Resolved conflict in icomoon.json file commit 88054e5e8e8b374c028d6735f7baf8b654a76d63 Author: Charles Hacskaylo Date: Thu Jun 30 16:55:40 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In progress: significant mods to pane collapse/expand buttons and symbols, minor tweaks to splitter look, limits glyph definitions commit 7c47343f5c634dc1f5244a7db20995f3954ab928 Author: Charles Hacskaylo Date: Thu Jun 30 16:52:21 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In progress: updated font files glyphs, mostly for pane collapse icons commit fd00bdce54e58c91e1dcbb098c7923ef98830239 Author: Charles Hacskaylo Date: Thu Jun 30 12:20:55 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In progress: search menu commit 272b4b649e1e23f089c814b66c9a7601109f244c Author: Charles Hacskaylo Date: Thu Jun 30 12:11:25 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In progress: moved limits classes out of _contants and into _glyphs; timers, entanglement context menu items, form validation, date picker. commit 95d26e6fe76a7ef875b580f72f63a6601031c939 Author: Charles Hacskaylo Date: Wed Jun 29 14:18:12 2016 -0700 [Frontend] Refactoring glyphs to classes Fixes #1047 In-progress; limits commit 26b30d96db5ea52cefdad83766dbb8681559ca0f Author: Charles Hacskaylo Date: Tue Jun 28 17:16:18 2016 -0700 [Frontend] Refactoring glyphs to classes Fixes #1047 In-progress; overlay close, search inputs, messages and message banners, ui-symbol removal in-progress. commit 4e2a01ad85dc2c7643e5d9936ef61bfcfc41f998 Author: Charles Hacskaylo Date: Tue Jun 28 16:21:05 2016 -0700 [Frontend] Refactoring glyphs to classes Fixes #1047 In-progress; .labeled added to .s-btn, removed .s-icon-btn commit 521db3c3fe6e91f8711c051691697d367ea5eb40 Author: Charles Hacskaylo Date: Tue Jun 28 16:10:54 2016 -0700 [Frontend] Refactoring glyphs to classes Fixes #1047 In-progress; plot options, imagery buttons, cleanups in buttons.scss, edit-action buttons, .s-btn .no-label class added. commit 8bb8db69e6a22645b418cb5e33b1822de9f30e49 Author: Charles Hacskaylo Date: Tue Jun 28 14:47:52 2016 -0700 [Frontend] Refactoring glyphs to classes Fixes #1047 In-progress; indicators, notifications, actions, tests commit 53ed0bfb22fbc02d3bad4eff5579b5ae1538638a Author: Charles Hacskaylo Date: Mon Jun 27 17:01:45 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In progress, really: view icons, timer/clock commit 47dc7f2f6b1678be68a58461d8dcc900a9c242fa Author: Charles Hacskaylo Date: Mon Jun 27 16:13:31 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In progress: grid items commit 2bd34f71be7e429edbfc2124f49ff87045a6ffdd Author: Charles Hacskaylo Date: Mon Jun 27 15:00:46 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 Context menus and associated actions, custom checkboxes, tree item being edited commit b561d4f60e28577e8e6975df5dbaec88544acbba Author: Charles Hacskaylo Date: Mon Jun 27 14:27:56 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In-progess: glyphs.scss now uses $vars to allow other scss to use a var instead of string literals; commit 0cf4089620258bd2c4f572e8973ac0b1b716c447 Author: Charles Hacskaylo Date: Mon Jun 27 14:13:59 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In-progess: tree-labels, unknown objects, object header commit 46cae1090587e1fb35fc581f2ee171d784f1826a Author: Charles Hacskaylo Date: Mon Jun 27 11:41:06 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In-progess, menus and Create menu fixes commit fe3097707fad9e6cbbddde88f9118deba82185c8 Merge: 7d69ae4 652a50c Author: Charles Hacskaylo Date: Mon Jun 27 11:20:55 2016 -0700 Merge remote-tracking branch 'origin/master' into frontend-1047 commit 7d69ae401b21fece0c959fa99a12dcc7edbc2188 Author: Charles Hacskaylo Date: Thu Jun 23 15:59:56 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In-progress, converting types, mods to Create Menu template commit 18d9f3d6b2060cf837311187b0355ca45ee934a9 Author: Charles Hacskaylo Date: Thu Jun 23 15:14:22 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 Very much In-progess: convert some controls; commit e93a90a782138b3382270cd984ea2842486eb0cd Author: Charles Hacskaylo Date: Thu Jun 23 11:28:07 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 Very much In-progess, classes for all symbols added to glyphs.scss; .menu cleaned up; commit dc670b22a6a58e9dab019be5f8f33d66c224d113 Author: Charles Hacskaylo Date: Thu Jun 23 08:55:27 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 Very much In-progess, "icon-" selector, browse bar buttons commit 8b29ccf3afe70e73efe90b7558758e4cf9124d9a Author: Charles Hacskaylo Date: Wed Jun 22 23:15:24 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 Very much In-progess, s-btn and s-btn-menu refactoring commit f574ffed1691517ee8dd811fef4ab25898180827 Author: Charles Hacskaylo Date: Wed Jun 22 14:37:34 2016 -0700 [Frontend] Refactoring glyphs to classes fixes #1047 In-progess, e900 > e904 commit bc62ee4565897b86a68bd33fd68a6817e782f790 Author: Charles Hacskaylo Date: Wed Jun 22 13:28:15 2016 -0700 [Frontend] Complete revamp of unicodes fixes #1047 New font files; no re-mapping yet in the app. commit 614f0c6e9f8ce904f67638ecede9ac1e6ed1cbc3 Author: Charles Hacskaylo Date: Wed Jun 22 13:23:18 2016 -0700 [Frontend] Complete revamp of unicodes fixes #1047 Moved all glyphs into PUA area of font, and re-organized by category. commit 47bd4031d56af1e1203315ce9a146de9dfcdf3ad Author: Charles Hacskaylo Date: Tue Jun 21 18:39:48 2016 -0700 [Frontend] Renaming symbols font files Fixes #1047 - Modified sass to point to renamed font files; - Added new 12px symbols font files to sass; commit 22a51d6bbbedb6f5389e5ede37d8ab131460c205 Author: Charles Hacskaylo Date: Tue Jun 21 18:22:33 2016 -0700 [Frontend] Updating Icomoon project files Fixes #1047 - Renamed main project file; - Added new 12px symbols project file; commit 13ded2fd8482ff1eb3fe95bbe225147adf29024c Author: Charles Hacskaylo Date: Tue Jun 21 18:19:27 2016 -0700 [Frontend] Added new 12px symbols font files Fixes #1047 commit aef5660dfd9303178014b7c77442f7541c0f26f8 Author: Charles Hacskaylo Date: Tue Jun 21 18:16:56 2016 -0700 [Frontend] Renaming symbols font files Fixes #1047 --- example/eventGenerator/bundle.js | 2 +- example/export/bundle.js | 2 +- example/forms/res/templates/exampleForm.html | 21 +- example/forms/src/ExampleFormController.js | 13 +- example/generator/bundle.js | 2 +- example/imagery/bundle.js | 2 +- example/mobile/res/sass/mobile-example.scss | 2 +- example/msl/bundle.js | 6 +- example/notifications/res/dialog-launch.html | 6 +- .../res/notification-launch.html | 6 +- .../src/DialogLaunchIndicator.js | 6 +- .../src/NotificationLaunchIndicator.js | 12 +- example/plotOptions/bundle.js | 2 +- example/profiling/src/DigestIndicator.js | 13 +- example/profiling/src/WatchIndicator.js | 19 +- example/worker/src/FibonacciIndicator.js | 7 +- platform/commonUI/browse/bundle.js | 5 +- .../browse/res/templates/back-arrow.html | 5 +- .../commonUI/browse/res/templates/browse.html | 10 +- .../res/templates/browse/object-header.html | 2 +- .../browse/res/templates/items/grid-item.html | 6 +- .../browse/res/templates/menu-arrow.html | 4 +- .../browse/src/windowing/FullscreenAction.js | 4 +- .../test/windowing/FullscreenActionSpec.js | 2 +- .../commonUI/dialog/res/templates/dialog.html | 7 +- .../dialog/res/templates/message.html | 4 +- .../res/templates/overlay-message-list.html | 5 +- .../dialog/res/templates/overlay-options.html | 2 +- .../dialog/res/templates/overlay.html | 2 +- platform/commonUI/edit/bundle.js | 11 +- .../res/templates/create/create-button.html | 2 +- .../res/templates/create/create-menu.html | 15 +- .../res/templates/edit-action-buttons.html | 2 +- .../commonUI/edit/src/creation/AddAction.js | 2 +- .../edit/src/creation/CreateAction.js | 2 +- .../test/creation/AddActionProviderSpec.js | 1 + .../test/creation/CreateActionProviderSpec.js | 1 + .../edit/test/creation/CreateActionSpec.js | 5 +- .../edit/test/creation/CreateWizardSpec.js | 3 +- .../icomoon-project-openmct-symbols-12px.json | 207 ++ .../icomoon-project-openmct-symbols-16px.json | 3002 +++++++++++++++++ .../icomoon.io-WTD-symbols-project.json | 2758 --------------- .../fonts/symbols/openmct-symbols-12px.eot | Bin 0 -> 1916 bytes .../fonts/symbols/openmct-symbols-12px.svg | 14 + .../fonts/symbols/openmct-symbols-12px.ttf | Bin 0 -> 1700 bytes .../fonts/symbols/openmct-symbols-12px.woff | Bin 0 -> 1776 bytes .../fonts/symbols/openmct-symbols-16px.eot | Bin 0 -> 14104 bytes .../fonts/symbols/openmct-symbols-16px.svg | 106 + .../fonts/symbols/openmct-symbols-16px.ttf | Bin 0 -> 13888 bytes .../fonts/symbols/openmct-symbols-16px.woff | Bin 0 -> 13964 bytes .../general/res/fonts/symbols/wtdsymbols.eot | Bin 13660 -> 0 bytes .../general/res/fonts/symbols/wtdsymbols.svg | 105 - .../general/res/fonts/symbols/wtdsymbols.ttf | Bin 13484 -> 0 bytes .../general/res/fonts/symbols/wtdsymbols.woff | Bin 13560 -> 0 bytes .../commonUI/general/res/images/bg-splash.jpg | Bin 223103 -> 121466 bytes .../commonUI/general/res/sass/_about.scss | 2 +- .../general/res/sass/_archetypes.scss | 7 +- .../commonUI/general/res/sass/_autoflow.scss | 4 +- .../commonUI/general/res/sass/_constants.scss | 16 +- .../commonUI/general/res/sass/_global.scss | 28 +- .../commonUI/general/res/sass/_glyphs.scss | 212 ++ .../commonUI/general/res/sass/_icons.scss | 50 +- .../commonUI/general/res/sass/_inspector.scss | 12 +- .../commonUI/general/res/sass/_limits.scss | 10 +- platform/commonUI/general/res/sass/_main.scss | 1 + .../commonUI/general/res/sass/_mixins.scss | 29 +- .../general/res/sass/_object-label.scss | 35 +- .../general/res/sass/controls/_buttons.scss | 218 +- .../res/sass/controls/_color-palette.scss | 8 +- .../general/res/sass/controls/_controls.scss | 49 +- .../general/res/sass/controls/_menus.scss | 69 +- .../general/res/sass/controls/_messages.scss | 18 +- .../res/sass/features/_time-display.scss | 12 +- .../res/sass/forms/_channel-selector.scss | 2 +- .../general/res/sass/forms/_elems.scss | 13 +- .../general/res/sass/forms/_filter.scss | 9 +- .../general/res/sass/forms/_validation.scss | 73 +- .../general/res/sass/helpers/_splitter.scss | 28 +- .../general/res/sass/items/_item.scss | 6 +- .../general/res/sass/lists/_tabular.scss | 18 +- .../general/res/sass/mobile/_layout.scss | 7 +- .../general/res/sass/mobile/_tree.scss | 27 +- .../general/res/sass/overlay/_overlay.scss | 4 +- .../general/res/sass/search/_search.scss | 40 +- .../commonUI/general/res/sass/tree/_tree.scss | 119 +- .../general/res/sass/user-environ/_frame.scss | 6 +- .../res/sass/user-environ/_layout.scss | 68 +- .../res/templates/controls/action-button.html | 5 +- .../res/templates/controls/input-filter.html | 2 +- .../res/templates/controls/selector.html | 4 +- .../res/templates/controls/switcher.html | 18 +- .../templates/controls/time-controller.html | 2 +- .../general/res/templates/indicator.html | 6 +- .../commonUI/general/res/templates/label.html | 4 +- .../res/templates/menu/context-menu.html | 7 +- .../general/res/templates/message-banner.html | 3 +- .../res/templates/tree/tree-label.html | 4 +- .../commonUI/general/src/ui/TreeLabelView.js | 13 +- .../controllers/BottomBarControllerSpec.js | 2 +- .../commonUI/general/test/ui/TreeViewSpec.js | 2 +- .../inspect/res/templates/info-button.html | 2 +- .../res/notification-indicator.html | 2 +- .../themes/espresso/res/sass/_constants.scss | 48 +- .../themes/espresso/res/sass/_mixins.scss | 10 +- .../themes/snow/res/sass/_constants.scss | 45 +- .../themes/snow/res/sass/_controls.scss | 2 +- .../themes/snow/res/sass/_mixins.scss | 8 +- platform/core/bundle.js | 8 +- platform/core/src/actions/ActionAggregator.js | 2 +- platform/core/src/types/TypeImpl.js | 12 +- platform/core/src/views/ViewProvider.js | 2 +- platform/core/test/types/TypeImplSpec.js | 6 +- platform/core/test/types/TypeProviderSpec.js | 12 +- platform/entanglement/bundle.js | 10 +- platform/features/clock/bundle.js | 8 +- .../features/clock/res/templates/timer.html | 19 +- .../clock/src/controllers/TimerController.js | 23 +- .../clock/src/indicators/ClockIndicator.js | 8 +- .../test/controllers/TimerControllerSpec.js | 10 +- .../test/indicators/ClockIndicatorSpec.js | 3 +- platform/features/fixed/bundle.js | 62 +- platform/features/imagery/bundle.js | 2 +- .../imagery/res/templates/imagery.html | 20 +- platform/features/layout/bundle.js | 64 +- platform/features/pages/bundle.js | 2 +- platform/features/plot/bundle.js | 2 +- .../res/templates/plot-options-browse.html | 6 +- .../features/plot/res/templates/plot.html | 18 +- platform/features/plot/src/PlotController.js | 2 +- .../plot/src/modes/PlotModeOptions.js | 6 +- platform/features/static-markup/bundle.js | 2 +- platform/features/table/bundle.js | 8 +- .../table/res/templates/mct-table.html | 2 +- .../res/templates/table-options-edit.html | 2 +- platform/features/timeline/bundle.js | 25 +- .../timeline/res/sass/_timeline-thematic.scss | 8 +- .../timeline/res/sass/_timelines.scss | 7 +- .../res/templates/activity-gantt.html | 4 +- .../templates/tabular-swimlane-cols-tree.html | 9 +- .../timeline/res/templates/timeline.html | 19 +- .../forms/res/templates/controls/button.html | 5 +- .../forms/res/templates/controls/color.html | 45 +- .../res/templates/controls/menu-button.html | 13 +- .../src/controllers/DialogButtonController.js | 2 +- .../controllers/DialogButtonControllerSpec.js | 4 +- platform/identity/src/IdentityIndicator.js | 7 +- .../identity/test/IdentityIndicatorSpec.js | 10 +- .../persistence/couch/src/CouchIndicator.js | 4 +- .../couch/test/CouchIndicatorSpec.js | 2 +- .../elastic/src/ElasticIndicator.js | 4 +- .../elastic/test/ElasticIndicatorSpec.js | 2 +- .../local/src/LocalStorageIndicator.js | 4 +- .../local/test/LocalStorageIndicatorSpec.js | 2 +- .../search/res/templates/search-menu.html | 13 +- platform/search/res/templates/search.html | 8 +- .../test/controllers/SearchControllerSpec.js | 2 +- .../controllers/SearchMenuControllerSpec.js | 4 +- 157 files changed, 4436 insertions(+), 3892 deletions(-) create mode 100644 platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json create mode 100644 platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json delete mode 100644 platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json create mode 100755 platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot create mode 100755 platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg create mode 100755 platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf create mode 100755 platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff create mode 100755 platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot create mode 100755 platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg create mode 100755 platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf create mode 100755 platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff delete mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot delete mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg delete mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf delete mode 100755 platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff create mode 100644 platform/commonUI/general/res/sass/_glyphs.scss diff --git a/example/eventGenerator/bundle.js b/example/eventGenerator/bundle.js index 60b91bbb9c..157fa62542 100644 --- a/example/eventGenerator/bundle.js +++ b/example/eventGenerator/bundle.js @@ -49,7 +49,7 @@ define([ { "key": "eventGenerator", "name": "Event Message Generator", - "glyph": "\u0066", + "cssclass": "icon-folder-new", "description": "For development use. Creates sample event message data that mimics a live data stream.", "priority": 10, "features": "creation", diff --git a/example/export/bundle.js b/example/export/bundle.js index fca07b789d..5322d53a83 100644 --- a/example/export/bundle.js +++ b/example/export/bundle.js @@ -36,7 +36,7 @@ define([ "name": "Export Telemetry as CSV", "implementation": ExportTelemetryAsCSVAction, "category": "contextual", - "glyph": "\u0033", + "cssclass": "icon-download", "depends": [ "exportService" ] } ] diff --git a/example/forms/res/templates/exampleForm.html b/example/forms/res/templates/exampleForm.html index 7d6e34b7dc..a315d7c9c9 100644 --- a/example/forms/res/templates/exampleForm.html +++ b/example/forms/res/templates/exampleForm.html @@ -20,12 +20,14 @@ at runtime from the About dialog for additional information. -->
- - - - - + +
  • Dirty: {{aForm.$dirty}}
    • @@ -33,11 +35,8 @@ 
-
-
-    
-
+
\ No newline at end of file diff --git a/example/forms/src/ExampleFormController.js b/example/forms/src/ExampleFormController.js index dea579f075..f3f8c95a4e 100644 --- a/example/forms/src/ExampleFormController.js +++ b/example/forms/src/ExampleFormController.js @@ -78,27 +78,26 @@ define( items: [ { control: "button", - glyph: "1", - description: "Button A", + csslass: "icon-save", click: function () { - window.alert("A"); + window.alert("Save"); } }, { control: "button", - glyph: "2", + csslass: "icon-x", description: "Button B", click: function () { - window.alert("B"); + window.alert("Cancel"); } }, { control: "button", - glyph: "3", + csslass: "icon-trash", description: "Button C", disabled: true, click: function () { - window.alert("C"); + window.alert("Delete"); } } ] diff --git a/example/generator/bundle.js b/example/generator/bundle.js index e4e719149a..0eadfad5e9 100644 --- a/example/generator/bundle.js +++ b/example/generator/bundle.js @@ -86,7 +86,7 @@ define([ { "key": "generator", "name": "Sine Wave Generator", - "glyph": "\u0054", + "cssclass": "icon-telemetry", "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.", "priority": 10, "features": "creation", diff --git a/example/imagery/bundle.js b/example/imagery/bundle.js index d0304f3f98..6232229e40 100644 --- a/example/imagery/bundle.js +++ b/example/imagery/bundle.js @@ -49,7 +49,7 @@ define([ { "key": "imagery", "name": "Example Imagery", - "glyph": "\u00e3", + "cssclass": "icon-image", "features": "creation", "description": "For development use. Creates example imagery data that mimics a live imagery stream.", "priority": 10, diff --git a/example/mobile/res/sass/mobile-example.scss b/example/mobile/res/sass/mobile-example.scss index f9f004baa4..99c14d305b 100644 --- a/example/mobile/res/sass/mobile-example.scss +++ b/example/mobile/res/sass/mobile-example.scss @@ -25,7 +25,7 @@ @include phoneandtablet { // Show the Create button - .create-btn-holder { + .create-button-holder { display: block !important; } } diff --git a/example/msl/bundle.js b/example/msl/bundle.js index 15c8191574..aefc3ffc16 100644 --- a/example/msl/bundle.js +++ b/example/msl/bundle.js @@ -43,18 +43,18 @@ define([ { "name":"Mars Science Laboratory", "key": "msl.curiosity", - "glyph": "o" + "cssclass": "icon-object" }, { "name": "Instrument", "key": "msl.instrument", - "glyph": "o", + "cssclass": "icon-object", "model": {"composition": []} }, { "name": "Measurement", "key": "msl.measurement", - "glyph": "\u0054", + "cssclass": "icon-telemetry", "model": {"telemetry": {}}, "telemetry": { "source": "rems.source", diff --git a/example/notifications/res/dialog-launch.html b/example/notifications/res/dialog-launch.html index 9eebd2e3e5..c810f7f605 100644 --- a/example/notifications/res/dialog-launch.html +++ b/example/notifications/res/dialog-launch.html @@ -1,9 +1,9 @@ - + - + Known | Unknown | Error | Info - Dialogs + \ No newline at end of file diff --git a/example/notifications/res/notification-launch.html b/example/notifications/res/notification-launch.html index e5f5cbac6b..41aee23e63 100644 --- a/example/notifications/res/notification-launch.html +++ b/example/notifications/res/notification-launch.html @@ -1,9 +1,9 @@ - + - + Success | Error | Alert | Progress - Notifications + \ No newline at end of file diff --git a/example/notifications/src/DialogLaunchIndicator.js b/example/notifications/src/DialogLaunchIndicator.js index 4a9a67689e..3d30e84be5 100644 --- a/example/notifications/src/DialogLaunchIndicator.js +++ b/example/notifications/src/DialogLaunchIndicator.js @@ -32,17 +32,15 @@ define( * launched for demonstration and testing purposes. * @constructor */ + function DialogLaunchIndicator() { } DialogLaunchIndicator.template = 'dialogLaunchTemplate'; - DialogLaunchIndicator.prototype.getGlyph = function () { - return "i"; - }; DialogLaunchIndicator.prototype.getGlyphClass = function () { - return 'caution'; + return 'ok'; }; DialogLaunchIndicator.prototype.getText = function () { return "Launch test dialog"; diff --git a/example/notifications/src/NotificationLaunchIndicator.js b/example/notifications/src/NotificationLaunchIndicator.js index 8c48d05bee..b839fa81d6 100644 --- a/example/notifications/src/NotificationLaunchIndicator.js +++ b/example/notifications/src/NotificationLaunchIndicator.js @@ -26,17 +26,21 @@ define( function () { "use strict"; + /** + * A tool for manually invoking notifications. When included this + * indicator will allow for notifications of different types to be + * launched for demonstration and testing purposes. + * @constructor + */ + function NotificationLaunchIndicator() { } NotificationLaunchIndicator.template = 'notificationLaunchTemplate'; - NotificationLaunchIndicator.prototype.getGlyph = function () { - return "i"; - }; NotificationLaunchIndicator.prototype.getGlyphClass = function () { - return 'caution'; + return 'ok'; }; NotificationLaunchIndicator.prototype.getText = function () { return "Launch notification"; diff --git a/example/plotOptions/bundle.js b/example/plotOptions/bundle.js index 25a78584b1..66a2e81937 100644 --- a/example/plotOptions/bundle.js +++ b/example/plotOptions/bundle.js @@ -81,7 +81,7 @@ define([ { "key": "plot", "name": "Example Telemetry Plot", - "glyph": "\u0074", + "cssclass": "icon-telemetry-panel", "description": "For development use. A plot for displaying telemetry.", "priority": 10, "delegates": [ diff --git a/example/profiling/src/DigestIndicator.js b/example/profiling/src/DigestIndicator.js index 1de2d0e973..826dd2f23f 100644 --- a/example/profiling/src/DigestIndicator.js +++ b/example/profiling/src/DigestIndicator.js @@ -59,11 +59,14 @@ define( update(); return { - getGlyph: function () { - return "."; - }, - getGlyphClass: function () { - return undefined; + /** + * Get the CSS class that defines the icon + * to display in this indicator. This will appear + * as a dataflow icon. + * @returns {string} the cssclass of the dataflow icon + */ + getCssClass: function () { + return "icon-connectivity"; }, getText: function () { return displayed + " digests/sec"; diff --git a/example/profiling/src/WatchIndicator.js b/example/profiling/src/WatchIndicator.js index f999de7e01..1e9ef5e386 100644 --- a/example/profiling/src/WatchIndicator.js +++ b/example/profiling/src/WatchIndicator.js @@ -55,24 +55,13 @@ define( return { /** - * Get the glyph (single character used as an icon) + * Get the CSS class (single character used as an icon) * to display in this indicator. This will return ".", - * which should appear as a dataflow icon. + * which should appear as a database icon. * @returns {string} the character of the database icon */ - getGlyph: function () { - return "E"; - }, - /** - * Get the name of the CSS class to apply to the glyph. - * This is used to color the glyph to match its - * state (one of ok, caution or err) - * @returns {string} the CSS class to apply to this glyph - */ - getGlyphClass: function () { - return (watches > 2000) ? "caution" : - (watches < 1000) ? "ok" : - undefined; + getCssClass: function () { + return "icon-database"; }, /** * Get the text that should appear in the indicator. diff --git a/example/worker/src/FibonacciIndicator.js b/example/worker/src/FibonacciIndicator.js index d2f25c8aed..777fb3d2f5 100644 --- a/example/worker/src/FibonacciIndicator.js +++ b/example/worker/src/FibonacciIndicator.js @@ -50,15 +50,12 @@ define( requestNext(); return { - getGlyph: function () { - return "?"; + getCssClass: function () { + return "icon-object-unknown"; }, getText: function () { return latest; }, - getGlyphClass: function () { - return ""; - }, getDescription: function () { return ""; } diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js index e0a5758fff..5ff13d789e 100644 --- a/platform/commonUI/browse/bundle.js +++ b/platform/commonUI/browse/bundle.js @@ -231,7 +231,7 @@ define([ "$window" ], "group": "windowing", - "glyph": "y", + "cssclass": "icon-new-window", "priority": "preferred" }, { @@ -239,7 +239,6 @@ define([ "implementation": FullscreenAction, "category": "view-control", "group": "windowing", - "glyph": "z", "priority": "default" } ], @@ -247,7 +246,7 @@ define([ { "key": "items", "name": "Items", - "glyph": "9", + "cssclass": "icon-thumbs-strip", "description": "Grid of available items", "template": itemsTemplate, "uses": [ diff --git a/platform/commonUI/browse/res/templates/back-arrow.html b/platform/commonUI/browse/res/templates/back-arrow.html index 4a77e62d0b..44ac390f39 100644 --- a/platform/commonUI/browse/res/templates/back-arrow.html +++ b/platform/commonUI/browse/res/templates/back-arrow.html @@ -20,11 +20,8 @@ at runtime from the About dialog for additional information. --> - - - { diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 63197ba84f..aa1415ca81 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -31,7 +31,7 @@
+ class="holder flex-elem create-button-holder"> +
@@ -75,10 +79,6 @@ mct-object="navigatedObject" ng-model="treeModel"> -
diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index 7b80323fab..48a64796da 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -{{type.getGlyph()}} + {{parameters.mode}} {{model.name}} diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html index 069ecf4a4a..153175eb00 100644 --- a/platform/commonUI/browse/res/templates/items/grid-item.html +++ b/platform/commonUI/browse/res/templates/items/grid-item.html @@ -23,14 +23,14 @@
-
O
+
- {{type.getGlyph()}} + -
}
+
{{model.name}}
diff --git a/platform/commonUI/browse/res/templates/menu-arrow.html b/platform/commonUI/browse/res/templates/menu-arrow.html index e3c1b935e7..83327760b0 100644 --- a/platform/commonUI/browse/res/templates/menu-arrow.html +++ b/platform/commonUI/browse/res/templates/menu-arrow.html @@ -21,6 +21,6 @@ --> - v + \ No newline at end of file diff --git a/platform/commonUI/browse/src/windowing/FullscreenAction.js b/platform/commonUI/browse/src/windowing/FullscreenAction.js index 2882f17079..975562af0c 100644 --- a/platform/commonUI/browse/src/windowing/FullscreenAction.js +++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js @@ -46,12 +46,12 @@ define( }; FullscreenAction.prototype.getMetadata = function () { - // We override getMetadata, because the glyph and + // We override getMetadata, because the icon cssclass and // description need to be determined at run-time // based on whether or not we are currently // full screen. var metadata = Object.create(FullscreenAction); - metadata.glyph = screenfull.isFullscreen ? "_" : "z"; + metadata.cssclass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse"; metadata.description = screenfull.isFullscreen ? EXIT_FULLSCREEN : ENTER_FULLSCREEN; metadata.group = "windowing"; diff --git a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js index bf2d520b3a..913535fa59 100644 --- a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js +++ b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js @@ -51,7 +51,7 @@ define( }); it("provides displayable metadata", function () { - expect(action.getMetadata().glyph).toBeDefined(); + expect(action.getMetadata().cssclass).toBeDefined(); }); }); diff --git a/platform/commonUI/dialog/res/templates/dialog.html b/platform/commonUI/dialog/res/templates/dialog.html index 9df10e0cd0..85a496ce57 100644 --- a/platform/commonUI/dialog/res/templates/dialog.html +++ b/platform/commonUI/dialog/res/templates/dialog.html @@ -21,21 +21,22 @@ -->
{{ngModel.title}}
-
All fields marked * are required.
+
All fields marked are required.
- OK - Cancel diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index 8568fe5fb1..6a2be98d99 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -16,11 +16,11 @@
{{dialogOption.label}} - {{ngModel.primaryOption.label}} diff --git a/platform/commonUI/dialog/res/templates/overlay-message-list.html b/platform/commonUI/dialog/res/templates/overlay-message-list.html index 5a7a48192f..299d19639c 100644 --- a/platform/commonUI/dialog/res/templates/overlay-message-list.html +++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html @@ -2,7 +2,8 @@
{{ngModel.dialog.title}}
-
Displaying {{ngModel.dialog.messages.length}} messages +
Displaying {{ngModel.dialog.messages.length}} messages
@@ -12,7 +13,7 @@
{{dialogAction.label}} diff --git a/platform/commonUI/dialog/res/templates/overlay-options.html b/platform/commonUI/dialog/res/templates/overlay-options.html index 4d73c59613..89b8be8242 100644 --- a/platform/commonUI/dialog/res/templates/overlay-options.html +++ b/platform/commonUI/dialog/res/templates/overlay-options.html @@ -33,7 +33,7 @@
diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html index 3908952db9..825d8fe4f4 100644 --- a/platform/commonUI/dialog/res/templates/overlay.html +++ b/platform/commonUI/dialog/res/templates/overlay.html @@ -24,7 +24,7 @@
x + class="close icon-x">
\ No newline at end of file diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 2141110409..2c5a79bda3 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -174,7 +174,7 @@ define([ ], "description": "Edit", "category": "view-control", - "glyph": "p" + "cssclass": "major icon-pencil" }, { "key": "properties", @@ -183,7 +183,7 @@ define([ "view-control" ], "implementation": PropertiesAction, - "glyph": "p", + "cssclass": "major icon-pencil", "name": "Edit Properties...", "description": "Edit properties of this object.", "depends": [ @@ -194,7 +194,7 @@ define([ "key": "remove", "category": "contextual", "implementation": RemoveAction, - "glyph": "Z", + "cssclass": "icon-trash", "name": "Remove", "description": "Remove this object from its containing object.", "depends": [ @@ -207,6 +207,7 @@ define([ "category": "conclude-editing", "implementation": SaveAction, "name": "Save", + "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", "depends": [ "dialogService" @@ -217,7 +218,8 @@ define([ "key": "save", "category": "conclude-editing", "implementation": SaveAsAction, - "name": "Save", + "name": "Save As...", + "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", "depends": [ "$injector", @@ -233,6 +235,7 @@ define([ "category": "conclude-editing", "implementation": CancelAction, "name": "Cancel", + "cssclass": "icon-x no-label", "description": "Discard changes made to these objects.", "depends": [] } diff --git a/platform/commonUI/edit/res/templates/create/create-button.html b/platform/commonUI/edit/res/templates/create/create-button.html index 77c6198cae..8a1e799783 100644 --- a/platform/commonUI/edit/res/templates/create/create-button.html +++ b/platform/commonUI/edit/res/templates/create/create-button.html @@ -20,7 +20,7 @@ at runtime from the About dialog for additional information. --> -
+
Create
diff --git a/platform/commonUI/edit/res/templates/create/create-menu.html b/platform/commonUI/edit/res/templates/create/create-menu.html index 12abfe7954..64c05e9d38 100644 --- a/platform/commonUI/edit/res/templates/create/create-menu.html +++ b/platform/commonUI/edit/res/templates/create/create-menu.html @@ -22,24 +22,17 @@
-
- {{representation.activeMetadata.glyph}} -
+
{{representation.activeMetadata.name}}
diff --git a/platform/commonUI/edit/res/templates/edit-action-buttons.html b/platform/commonUI/edit/res/templates/edit-action-buttons.html index 56bb1f1d92..fc46b31f57 100644 --- a/platform/commonUI/edit/res/templates/edit-action-buttons.html +++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html @@ -21,7 +21,7 @@ --> - diff --git a/platform/commonUI/edit/src/creation/AddAction.js b/platform/commonUI/edit/src/creation/AddAction.js index e57c5f4c7e..6e99ea51a0 100644 --- a/platform/commonUI/edit/src/creation/AddAction.js +++ b/platform/commonUI/edit/src/creation/AddAction.js @@ -51,7 +51,7 @@ define( function AddAction(type, parent, context, $q, dialogService, policyService) { this.metadata = { key: 'add', - glyph: type.getGlyph(), + cssclass: type.getCssClass(), name: type.getName(), type: type.getKey(), description: type.getDescription(), diff --git a/platform/commonUI/edit/src/creation/CreateAction.js b/platform/commonUI/edit/src/creation/CreateAction.js index d7b5e22f01..14b8443462 100644 --- a/platform/commonUI/edit/src/creation/CreateAction.js +++ b/platform/commonUI/edit/src/creation/CreateAction.js @@ -47,7 +47,7 @@ define( function CreateAction(type, parent, context) { this.metadata = { key: 'create', - glyph: type.getGlyph(), + cssclass: type.getCssClass(), name: type.getName(), type: type.getKey(), description: type.getDescription(), diff --git a/platform/commonUI/edit/test/creation/AddActionProviderSpec.js b/platform/commonUI/edit/test/creation/AddActionProviderSpec.js index 05ee834401..560b2bd0f7 100644 --- a/platform/commonUI/edit/test/creation/AddActionProviderSpec.js +++ b/platform/commonUI/edit/test/creation/AddActionProviderSpec.js @@ -45,6 +45,7 @@ define( [ "getKey", "getGlyph", + "getCssClass", "getName", "getDescription", "getProperties", diff --git a/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js b/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js index a8bf3d2d90..211b735e92 100644 --- a/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js +++ b/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js @@ -41,6 +41,7 @@ define( [ "getKey", "getGlyph", + "getCssClass", "getName", "getDescription", "getProperties", diff --git a/platform/commonUI/edit/test/creation/CreateActionSpec.js b/platform/commonUI/edit/test/creation/CreateActionSpec.js index 23355b10c1..d65621f9a8 100644 --- a/platform/commonUI/edit/test/creation/CreateActionSpec.js +++ b/platform/commonUI/edit/test/creation/CreateActionSpec.js @@ -51,6 +51,7 @@ define( [ "getKey", "getGlyph", + "getCssClass", "getName", "getDescription", "getProperties", @@ -119,7 +120,7 @@ define( mockParent.useCapability.andReturn(mockDomainObject); mockType.getKey.andReturn("test"); - mockType.getGlyph.andReturn("T"); + mockType.getCssClass.andReturn("icon-telemetry"); mockType.getDescription.andReturn("a test type"); mockType.getName.andReturn("Test"); mockType.getProperties.andReturn([]); @@ -137,7 +138,7 @@ define( expect(metadata.name).toEqual("Test"); expect(metadata.description).toEqual("a test type"); - expect(metadata.glyph).toEqual("T"); + expect(metadata.cssclass).toEqual("icon-telemetry"); }); describe("the perform function", function () { diff --git a/platform/commonUI/edit/test/creation/CreateWizardSpec.js b/platform/commonUI/edit/test/creation/CreateWizardSpec.js index a36a50d6d9..a2c96db063 100644 --- a/platform/commonUI/edit/test/creation/CreateWizardSpec.js +++ b/platform/commonUI/edit/test/creation/CreateWizardSpec.js @@ -54,6 +54,7 @@ define( [ "getKey", "getGlyph", + "getCssClass", "getName", "getDescription", "getProperties", @@ -74,7 +75,7 @@ define( testModel = { someKey: "some value" }; mockType.getKey.andReturn("test"); - mockType.getGlyph.andReturn("T"); + mockType.getCssClass.andReturn("icon-telemetry"); mockType.getDescription.andReturn("a test type"); mockType.getName.andReturn("Test"); mockType.getInitialModel.andReturn(testModel); diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json new file mode 100644 index 0000000000..28c510fcee --- /dev/null +++ b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json @@ -0,0 +1,207 @@ +{ + "metadata": { + "name": "openmct-symbols-12px", + "lastOpened": 1467322505818, + "created": 1467322503679 + }, + "iconSets": [ + { + "selection": [ + { + "order": 4, + "id": 2, + "prevSize": 12, + "code": 59671, + "name": "icon12-eye-open", + "tempChar": "" + }, + { + "order": 7, + "id": 5, + "prevSize": 12, + "code": 921607, + "name": "icon12-pane-collapse-left", + "tempChar": "" + }, + { + "order": 8, + "id": 4, + "prevSize": 12, + "code": 921608, + "name": "icon12-pane-collapse-right", + "tempChar": "" + }, + { + "order": 6, + "id": 3, + "prevSize": 12, + "code": 921865, + "name": "icon12-folder", + "tempChar": "" + } + ], + "id": 0, + "metadata": { + "name": "openmct-symbols-12px", + "importSize": { + "width": 320, + "height": 384 + }, + "designer": "Charles Hacskaylo" + }, + "height": 1024, + "prevSize": 12, + "icons": [ + { + "id": 2, + "paths": [ + "M512 86c-257.92 0-471.28 185.147-506.667 426 35.493 240.853 248.853 426 506.667 426s471.28-185.147 506.667-426c-35.387-240.853-248.747-426-506.667-426zM738.373 685.2c-131.048 109.517-321.699 109.517-452.747 0-53.328-44.749-90.832-105.477-106.96-173.2 16.101-67.707 53.565-128.435 106.853-173.2 131.048-109.517 321.699-109.517 452.747 0 53.368 44.733 90.909 105.464 107.067 173.2-16.128 67.723-53.632 128.451-106.96 173.2z", + "M682.667 512c0 94.257-76.41 170.667-170.667 170.667s-170.667-76.41-170.667-170.667c0-94.257 76.41-170.667 170.667-170.667s170.667 76.41 170.667 170.667z" + ], + "attrs": [], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon12-eye-open" + ], + "colorPermutations": { + "1161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ] + } + }, + { + "id": 5, + "paths": [ + "M0 0h170.667v1024h-170.667v-1024z", + "M853.333 256h-256v-256l-341.333 426.667 341.333 426.667v-256h256v-341.333z" + ], + "attrs": [ + { + "opacity": 1 + }, + { + "opacity": 1 + } + ], + "isMulticolor": false, + "width": 853, + "grid": 0, + "tags": [ + "icon12-pane-collapse-left" + ], + "colorPermutations": { + "1161751": [ + {}, + {} + ] + } + }, + { + "id": 4, + "paths": [ + "M682.667 0h170.667v1024h-170.667v-1024z", + "M0 256h256v-256l341.333 426.667-341.333 426.667v-256h-256v-341.333z" + ], + "attrs": [ + { + "opacity": 1 + }, + { + "opacity": 1 + } + ], + "isMulticolor": false, + "width": 853, + "grid": 0, + "tags": [ + "icon12-pane-collapse-right" + ], + "colorPermutations": { + "1161751": [ + {}, + {} + ] + } + }, + { + "id": 3, + "paths": [ + "M938.667 170.667h-341.333l-110.32-110.32c-33.2-33.2-98.667-60.347-145.68-60.347h-256c-47.073 0.136-85.197 38.26-85.333 85.32l-0 341.346c0.136-47.073 38.26-85.197 85.32-85.333l853.346-0c47.073 0.136 85.197 38.26 85.333 85.32l0-170.654c-0.136-47.073-38.26-85.197-85.32-85.333z", + "M85.333 426.667h853.333c47.128 0 85.333 38.205 85.333 85.333v426.667c0 47.128-38.205 85.333-85.333 85.333h-853.333c-47.128 0-85.333-38.205-85.333-85.333v-426.667c0-47.128 38.205-85.333 85.333-85.333z" + ], + "attrs": [], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon12-folder" + ], + "colorPermutations": { + "1161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ] + } + } + ], + "invisible": false, + "colorThemes": [ + [ + [ + 0, + 0, + 0, + 1 + ], + [ + 0, + 161, + 75, + 1 + ] + ] + ], + "colorThemeIdx": 0 + } + ], + "preferences": { + "showGlyphs": true, + "showCodes": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "icon-", + "metadata": { + "fontFamily": "openmct-symbols-12px", + "majorVersion": 1, + "minorVersion": 0 + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "embed": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 0, + "bgColor": 16777215 + }, + "historySize": 100, + "gridSize": 16 + }, + "uid": -1 +} \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json new file mode 100644 index 0000000000..3351eb3318 --- /dev/null +++ b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json @@ -0,0 +1,3002 @@ +{ + "metadata": { + "name": "openmct-symbols-16px", + "lastOpened": 1469724858940, + "created": 1469724856623 + }, + "iconSets": [ + { + "selection": [ + { + "order": 38, + "prevSize": 24, + "name": "icon-alert-rect", + "id": 33, + "code": 59648, + "tempChar": "" + }, + { + "order": 39, + "prevSize": 24, + "name": "icon-alert-triangle", + "id": 34, + "code": 59649, + "tempChar": "" + }, + { + "order": 42, + "prevSize": 24, + "name": "icon-arrow-down", + "id": 37, + "code": 59650, + "tempChar": "" + }, + { + "order": 43, + "prevSize": 24, + "name": "icon-arrow-left", + "id": 38, + "code": 59651, + "tempChar": "" + }, + { + "order": 44, + "prevSize": 24, + "name": "icon-arrow-right", + "id": 39, + "code": 59652, + "tempChar": "" + }, + { + "order": 41, + "prevSize": 24, + "name": "icon-arrow-double-up", + "id": 36, + "code": 59653, + "tempChar": "" + }, + { + "order": 46, + "prevSize": 24, + "name": "icon-arrow-tall-up", + "id": 41, + "code": 59654, + "tempChar": "" + }, + { + "order": 45, + "prevSize": 24, + "name": "icon-arrow-tall-down", + "id": 40, + "code": 59655, + "tempChar": "" + }, + { + "order": 40, + "prevSize": 24, + "name": "icon-arrow-double-down", + "id": 35, + "code": 59656, + "tempChar": "" + }, + { + "order": 47, + "prevSize": 24, + "name": "icon-arrow-up", + "id": 42, + "code": 59657, + "tempChar": "" + }, + { + "order": 51, + "prevSize": 24, + "name": "icon-asterisk", + "id": 46, + "code": 59664, + "tempChar": "" + }, + { + "order": 18, + "prevSize": 24, + "name": "icon-bell", + "id": 13, + "code": 59665, + "tempChar": "" + }, + { + "order": 101, + "prevSize": 24, + "name": "icon-box", + "id": 48, + "code": 59666, + "tempChar": "" + }, + { + "order": 35, + "prevSize": 24, + "name": "icon-box-with-arrow-cursor", + "id": 30, + "code": 59667, + "tempChar": "" + }, + { + "order": 54, + "prevSize": 24, + "name": "icon-check", + "id": 49, + "code": 59668, + "tempChar": "" + }, + { + "order": 56, + "prevSize": 24, + "name": "icon-connectivity", + "id": 51, + "code": 59669, + "tempChar": "" + }, + { + "order": 31, + "prevSize": 24, + "name": "icon-database-in-brackets", + "id": 26, + "code": 59670, + "tempChar": "" + }, + { + "order": 100, + "prevSize": 24, + "name": "icon-eye-open", + "id": 8, + "code": 59671, + "tempChar": "" + }, + { + "order": 65, + "prevSize": 24, + "name": "icon-gear", + "id": 60, + "code": 59672, + "tempChar": "" + }, + { + "order": 19, + "prevSize": 24, + "name": "icon-hourglass", + "id": 14, + "code": 59673, + "tempChar": "" + }, + { + "order": 20, + "prevSize": 24, + "codes": [ + 58888, + 58889, + 58890 + ], + "name": "icon-info", + "id": 15, + "code": 59680, + "tempChar": "" + }, + { + "order": 70, + "prevSize": 24, + "name": "icon-link", + "id": 65, + "code": 59681, + "tempChar": "" + }, + { + "order": 33, + "prevSize": 24, + "name": "icon-lock", + "id": 28, + "code": 59682, + "tempChar": "" + }, + { + "order": 87, + "prevSize": 24, + "name": "icon-minus", + "id": 82, + "code": 59683, + "tempChar": "" + }, + { + "order": 83, + "prevSize": 24, + "name": "icon-people", + "id": 78, + "code": 59684, + "tempChar": "" + }, + { + "order": 29, + "prevSize": 24, + "name": "icon-person", + "id": 24, + "code": 59685, + "tempChar": "" + }, + { + "order": 86, + "prevSize": 24, + "name": "icon-plus", + "id": 81, + "code": 59686, + "tempChar": "" + }, + { + "order": 95, + "prevSize": 24, + "name": "icon-trash", + "id": 90, + "code": 59687, + "tempChar": "" + }, + { + "order": 98, + "prevSize": 24, + "name": "icon-x", + "id": 93, + "code": 59688, + "tempChar": "" + }, + { + "order": 111, + "id": 98, + "name": "icon-brackets", + "prevSize": 24, + "code": 59689, + "tempChar": "" + }, + { + "order": 48, + "prevSize": 24, + "name": "icon-arrows-out", + "id": 43, + "code": 921600, + "tempChar": "" + }, + { + "order": 49, + "prevSize": 24, + "name": "icon-arrows-right-left", + "id": 44, + "code": 921601, + "tempChar": "" + }, + { + "order": 50, + "prevSize": 24, + "name": "icon-arrows-up-down", + "id": 45, + "code": 921602, + "tempChar": "" + }, + { + "order": 9, + "prevSize": 24, + "name": "icon-bullet", + "id": 4, + "code": 921604, + "tempChar": "" + }, + { + "order": 25, + "prevSize": 24, + "name": "icon-calendar", + "id": 20, + "code": 921605, + "tempChar": "" + }, + { + "order": 30, + "prevSize": 24, + "name": "icon-chain-links", + "id": 25, + "code": 921606, + "tempChar": "" + }, + { + "order": 109, + "id": 97, + "prevSize": 24, + "code": 921607, + "name": "icon-pane-collapse-left", + "tempChar": "" + }, + { + "order": 110, + "id": 96, + "prevSize": 24, + "code": 921608, + "name": "icon-pane-collapse-right", + "tempChar": "" + }, + { + "order": 5, + "id": 95, + "prevSize": 24, + "code": 921609, + "name": "icon-download", + "tempChar": "" + }, + { + "order": 60, + "prevSize": 24, + "name": "icon-duplicate", + "id": 55, + "code": 921616, + "tempChar": "" + }, + { + "order": 61, + "prevSize": 24, + "name": "icon-folder-new", + "id": 56, + "code": 921617, + "tempChar": "" + }, + { + "order": 64, + "prevSize": 24, + "name": "icon-fullscreen-expand", + "id": 59, + "code": 921618, + "tempChar": "" + }, + { + "order": 63, + "prevSize": 24, + "name": "icon-fullscreen-collapse", + "id": 58, + "code": 921619, + "tempChar": "" + }, + { + "order": 67, + "prevSize": 24, + "name": "icon-layers", + "id": 62, + "code": 921620, + "tempChar": "" + }, + { + "order": 69, + "prevSize": 24, + "name": "icon-line-horz", + "id": 64, + "code": 921621, + "tempChar": "" + }, + { + "order": 73, + "prevSize": 24, + "name": "icon-magnify", + "id": 68, + "code": 921622, + "tempChar": "" + }, + { + "order": 71, + "prevSize": 24, + "name": "icon-magnify-in", + "id": 66, + "code": 921623, + "tempChar": "" + }, + { + "order": 72, + "prevSize": 24, + "name": "icon-magnify-out", + "id": 67, + "code": 921624, + "tempChar": "" + }, + { + "order": 74, + "prevSize": 24, + "name": "icon-menu", + "id": 69, + "code": 921625, + "tempChar": "" + }, + { + "order": 75, + "prevSize": 24, + "name": "icon-move", + "id": 70, + "code": 921632, + "tempChar": "" + }, + { + "order": 76, + "prevSize": 24, + "name": "icon-new-window", + "id": 71, + "code": 921633, + "tempChar": "" + }, + { + "order": 26, + "prevSize": 24, + "name": "icon-paint-bucket", + "id": 21, + "code": 921634, + "tempChar": "" + }, + { + "order": 81, + "prevSize": 24, + "name": "icon-pause", + "id": 76, + "code": 921635, + "tempChar": "" + }, + { + "order": 82, + "prevSize": 24, + "name": "icon-pencil", + "id": 77, + "code": 921636, + "tempChar": "" + }, + { + "order": 84, + "prevSize": 24, + "name": "icon-play", + "id": 79, + "code": 921637, + "tempChar": "" + }, + { + "order": 85, + "prevSize": 24, + "name": "icon-plot-resource", + "id": 80, + "code": 921638, + "tempChar": "" + }, + { + "order": 27, + "prevSize": 24, + "name": "icon-pointer-left", + "id": 22, + "code": 921639, + "tempChar": "" + }, + { + "order": 28, + "prevSize": 24, + "name": "icon-pointer-right", + "id": 23, + "code": 921640, + "tempChar": "" + }, + { + "order": 32, + "prevSize": 24, + "name": "icon-refresh", + "id": 27, + "code": 921641, + "tempChar": "" + }, + { + "order": 16, + "prevSize": 24, + "name": "icon-save", + "id": 11, + "code": 921648, + "tempChar": "" + }, + { + "order": 88, + "prevSize": 24, + "name": "icon-sine", + "id": 83, + "code": 921649, + "tempChar": "" + }, + { + "order": 102, + "prevSize": 24, + "name": "icon-T", + "id": 84, + "code": 921650, + "tempChar": "" + }, + { + "order": 92, + "prevSize": 24, + "name": "icon-thumbs-strip", + "id": 87, + "code": 921651, + "tempChar": "" + }, + { + "order": 96, + "prevSize": 24, + "name": "icon-two-parts-both", + "id": 91, + "code": 921652, + "tempChar": "" + }, + { + "order": 97, + "prevSize": 24, + "name": "icon-two-parts-one-only", + "id": 92, + "code": 921653, + "tempChar": "" + }, + { + "order": 21, + "prevSize": 24, + "name": "icon-x-in-circle", + "id": 16, + "code": 921654, + "tempChar": "" + }, + { + "order": 37, + "prevSize": 24, + "name": "icon-activity", + "id": 32, + "code": 921856, + "tempChar": "" + }, + { + "order": 36, + "prevSize": 24, + "name": "icon-activity-mode", + "id": 31, + "code": 921857, + "tempChar": "" + }, + { + "order": 52, + "prevSize": 24, + "name": "icon-autoflow-tabular", + "id": 47, + "code": 921858, + "tempChar": "" + }, + { + "order": 55, + "prevSize": 24, + "name": "icon-clock", + "id": 50, + "code": 921859, + "tempChar": "" + }, + { + "order": 58, + "prevSize": 24, + "name": "icon-database", + "id": 53, + "code": 921860, + "tempChar": "" + }, + { + "order": 57, + "prevSize": 24, + "name": "icon-database-query", + "id": 52, + "code": 921861, + "tempChar": "" + }, + { + "order": 17, + "prevSize": 24, + "name": "icon-dataset", + "id": 12, + "code": 921862, + "tempChar": "" + }, + { + "order": 22, + "prevSize": 24, + "name": "icon-datatable", + "id": 17, + "code": 921863, + "tempChar": "" + }, + { + "order": 59, + "prevSize": 24, + "name": "icon-dictionary", + "id": 54, + "code": 921864, + "tempChar": "" + }, + { + "order": 62, + "prevSize": 24, + "name": "icon-folder", + "id": 57, + "code": 921865, + "tempChar": "" + }, + { + "order": 66, + "prevSize": 24, + "name": "icon-image", + "id": 61, + "code": 921872, + "tempChar": "" + }, + { + "order": 68, + "prevSize": 24, + "name": "icon-layout", + "id": 63, + "code": 921873, + "tempChar": "" + }, + { + "order": 77, + "prevSize": 24, + "name": "icon-object", + "id": 72, + "code": 921874, + "tempChar": "" + }, + { + "order": 78, + "prevSize": 24, + "name": "icon-object-unknown", + "id": 73, + "code": 921875, + "tempChar": "" + }, + { + "order": 79, + "prevSize": 24, + "name": "icon-packet", + "id": 74, + "code": 921876, + "tempChar": "" + }, + { + "order": 80, + "prevSize": 24, + "name": "icon-page", + "id": 75, + "code": 921877, + "tempChar": "" + }, + { + "order": 114, + "id": 99, + "name": "icon-plot-overlay", + "prevSize": 24, + "code": 921878, + "tempChar": "" + }, + { + "order": 113, + "id": 100, + "name": "icon-plot-stacked", + "prevSize": 24, + "code": 921879, + "tempChar": "" + }, + { + "order": 10, + "prevSize": 24, + "name": "icon-session", + "id": 5, + "code": 921880, + "tempChar": "" + }, + { + "order": 24, + "prevSize": 24, + "name": "icon-tabular", + "id": 19, + "code": 921881, + "tempChar": "" + }, + { + "order": 7, + "prevSize": 24, + "name": "icon-tabular-lad", + "id": 2, + "code": 921888, + "tempChar": "" + }, + { + "order": 6, + "prevSize": 24, + "name": "icon-tabular-lad-set", + "id": 1, + "code": 921889, + "tempChar": "" + }, + { + "order": 8, + "prevSize": 24, + "name": "icon-tabular-realtime", + "id": 3, + "code": 921890, + "tempChar": "" + }, + { + "order": 23, + "prevSize": 24, + "name": "icon-tabular-scrolling", + "id": 18, + "code": 921891, + "tempChar": "" + }, + { + "order": 112, + "prevSize": 24, + "name": "icon-telemetry", + "id": 86, + "code": 921892, + "tempChar": "" + }, + { + "order": 90, + "prevSize": 24, + "name": "icon-telemetry-panel", + "id": 85, + "code": 921893, + "tempChar": "" + }, + { + "order": 93, + "prevSize": 24, + "name": "icon-timeline", + "id": 88, + "code": 921894, + "tempChar": "" + }, + { + "order": 116, + "id": 101, + "name": "icon-timer-v1.5", + "prevSize": 24, + "code": 921895, + "tempChar": "" + }, + { + "order": 11, + "prevSize": 24, + "name": "icon-topic", + "id": 6, + "code": 921896, + "tempChar": "" + }, + { + "order": 115, + "prevSize": 24, + "name": "icon-box-with-dashed-lines", + "id": 29, + "code": 921897, + "tempChar": "" + } + ], + "metadata": { + "name": "openmct-symbols-16px", + "importSize": { + "width": 448, + "height": 512 + }, + "designer": "Charles Hacskaylo", + "iconsHash": 1484196519 + }, + "height": 1024, + "prevSize": 24, + "icons": [ + { + "paths": [ + "M896 0h-768c-70.6 0.2-127.8 57.4-128 128v768c0.2 70.6 57.4 127.8 128 128h768c70.6-0.2 127.8-57.4 128-128v-768c-0.2-70.6-57.4-127.8-128-128zM576 896h-128v-128h128v128zM597.8 512l-37.8 192h-96l-37.8-192v-384h171.8v384z" + ], + "grid": 16, + "tags": [ + "icon-alert-rect" + ], + "defaultCode": 33, + "id": 33, + "attrs": [ + { + "fill": "rgb(207, 45, 75)" + } + ], + "isMulticolor": false, + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 3 + } + ] + } + }, + { + "paths": [ + "M998.2 848.8l-422.6-739.6c-35-61.2-92-61.2-127 0l-422.8 739.6c-35 61.2-6 111.2 64.4 111.2h843.4c70.6 0 99.6-50 64.6-111.2zM576 896h-128v-128h128v128zM597.8 512l-37.8 192h-96l-37.8-192v-256h171.8v256z" + ], + "grid": 16, + "tags": [ + "icon-alert-triangle" + ], + "defaultCode": 58883, + "id": 34, + "attrs": [ + { + "fill": "rgb(207, 45, 75)" + } + ], + "isMulticolor": false, + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 3 + } + ] + } + }, + { + "paths": [ + "M512 768l512-512h-1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-down" + ], + "defaultCode": 118, + "id": 37, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M256 512l512 512v-1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-left" + ], + "defaultCode": 60, + "id": 38, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M768 512l-512-512v1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-right" + ], + "defaultCode": 62, + "id": 39, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M510 510l512 512h-1024z", + "M510-2l512 512h-1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-double-up" + ], + "defaultCode": 235, + "id": 36, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0l512 1024h-1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-tall-up" + ], + "defaultCode": 237, + "id": 41, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 1024l-512-1024h1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-tall-down" + ], + "defaultCode": 236, + "id": 40, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M510 510l-512-512h1024z", + "M510 1022l-512-512h1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-double-down" + ], + "defaultCode": 238, + "id": 35, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 256l-512 512h1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-up" + ], + "defaultCode": 94, + "id": 42, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1004.166 340.458l-97.522-168.916-330.534 229.414 33.414-400.956h-195.048l33.414 400.956-330.534-229.414-97.522 168.916 363.944 171.542-363.944 171.542 97.522 168.916 330.534-229.414-33.414 400.956h195.048l-33.414-400.956 330.534 229.414 97.522-168.916-363.944-171.542z" + ], + "grid": 16, + "tags": [ + "icon-asterisk" + ], + "defaultCode": 42, + "id": 46, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 1024c106 0 192-86 192-192h-384c0 106 86 192 192 192z", + "M896 448v-64c0-212-172-384-384-384s-384 172-384 384v64c0 70.6-57.4 128-128 128v128h1024v-128c-70.6 0-128-57.4-128-128z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-bell" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58896, + "id": 13 + }, + { + "paths": [ + "M0 0h1024v1024h-1024v-1024z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "grid": 16, + "tags": [ + "icon-box-round-corners" + ], + "colorPermutations": { + "16161751": [ + { + "f": 0 + } + ], + "125525525516161751": [ + { + "f": 0 + } + ], + "1161751207457516161751": [ + { + "f": 0 + } + ] + }, + "defaultCode": 224, + "id": 48 + }, + { + "paths": [ + "M894-2h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h400c-2.2-3.8-4-7.6-5.8-11.4l-255.2-576.8c-21.4-48.4-10.8-105 26.6-142.4 24.4-24.4 57.2-37.4 90.4-37.4 17.4 0 35.2 3.6 51.8 11l576.6 255.4c4 1.8 7.8 3.8 11.4 5.8v-400.2c0.2-70.4-57.4-128-127.8-128z", + "M958.6 637.4l-576.6-255.4 255.4 576.6 64.6-128.6 192 192 128-128-192-192z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + }, + { + "fill": "rgb(0, 0, 0)" + } + ], + "grid": 16, + "tags": [ + "icon-box-with-arrow-cursor" + ], + "colorPermutations": { + "16161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ], + "125525525516161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ], + "1161751207457516161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ] + }, + "defaultCode": 58880, + "id": 30 + }, + { + "paths": [ + "M1024 0l-640 640-384-384v384l384 384 640-640z" + ], + "grid": 16, + "tags": [ + "icon-check" + ], + "defaultCode": 50, + "id": 49, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M704 576c0 70.4-57.6 128-128 128h-128c-70.4 0-128-57.6-128-128v-128c0-70.4 57.6-128 128-128h128c70.4 0 128 57.6 128 128v128z", + "M1024 512l-192-320v640z", + "M0 512l192-320v640z" + ], + "grid": 16, + "tags": [ + "icon-connectivity" + ], + "defaultCode": 46, + "id": 51, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M768 352c0 53.019-114.615 96-256 96s-256-42.981-256-96c0-53.019 114.615-96 256-96s256 42.981 256 96z", + "M768 672v-256c0 53-114.6 96-256 96s-256-43-256-96v256c0 53 114.6 96 256 96s256-43 256-96z", + "M832 0h-128v192h127.6c0.2 0 0.2 0.2 0.4 0.4v639.4c0 0.2-0.2 0.2-0.4 0.4h-127.6v192h128c105.6 0 192-86.4 192-192v-640.2c0-105.6-86.4-192-192-192z", + "M192 831.6v-639.4c0-0.2 0.2-0.2 0.4-0.4h127.6v-191.8h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192h-127.6c-0.2 0-0.4-0.2-0.4-0.4z" + ], + "grid": 16, + "tags": [ + "icon-database-in-brackets" + ], + "defaultCode": 115, + "id": 26, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 116.4c-245.8 0-452.2 168-510.8 395.6 58.6 227.4 265 395.6 510.8 395.6s452.2-168 510.8-395.6c-58.6-227.4-265-395.6-510.8-395.6zM829.2 588.4c-22.6 34.4-50.6 64.8-83 90.4-32.8 25.8-69 45.6-108 59.4-40.4 14.2-82.8 21.4-126 21.4s-85.8-7.2-126-21.4c-39-13.8-75.4-33.8-108-59.4-32.4-25.6-60.4-55.8-83-90.4-15.8-24-28.8-49.6-38.6-76.4 10-26.8 23-52.4 38.6-76.4 22.6-34.4 50.6-64.8 83-90.4 32.8-25.8 69-45.6 108-59.4 40.4-14.2 82.8-21.4 126-21.4s85.8 7.2 126 21.4c39 13.8 75.4 33.8 108 59.4 32.4 25.6 60.4 55.8 83 90.4 15.8 24 28.8 49.6 38.6 76.4-9.8 26.8-22.8 52.4-38.6 76.4z", + "M704 512c0 106.039-85.961 192-192 192s-192-85.961-192-192c0-106.039 85.961-192 192-192s192 85.961 192 192z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-crosshair" + ], + "defaultCode": 58901, + "id": 8, + "isMulticolor": false, + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ] + } + }, + { + "paths": [ + "M1024 576v-128l-140.976-35.244c-8.784-32.922-21.818-64.106-38.504-92.918l74.774-124.622-90.51-90.51-124.622 74.774c-28.812-16.686-59.996-29.72-92.918-38.504l-35.244-140.976h-128l-35.244 140.976c-32.922 8.784-64.106 21.818-92.918 38.504l-124.622-74.774-90.51 90.51 74.774 124.622c-16.686 28.812-29.72 59.996-38.504 92.918l-140.976 35.244v128l140.976 35.244c8.784 32.922 21.818 64.106 38.504 92.918l-74.774 124.622 90.51 90.51 124.622-74.774c28.812 16.686 59.996 29.72 92.918 38.504l35.244 140.976h128l35.244-140.976c32.922-8.784 64.106-21.818 92.918-38.504l124.622 74.774 90.51-90.51-74.774-124.622c16.686-28.812 29.72-59.996 38.504-92.918l140.976-35.244zM704 512c0 106.038-85.962 192-192 192s-192-85.962-192-192 85.962-192 192-192 192 85.962 192 192z" + ], + "grid": 16, + "tags": [ + "icon-gear" + ], + "defaultCode": 71, + "id": 60, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 0h-1024c0 282.8 229.2 512 512 512s512-229.2 512-512zM512 384c-102.6 0-199-40-271.6-112.4-41.2-41.2-72-90.2-90.8-143.6h724.6c-18.8 53.4-49.6 102.4-90.8 143.6-72.4 72.4-168.8 112.4-271.4 112.4z", + "M512 512c-282.8 0-512 229.2-512 512h1024c0-282.8-229.2-512-512-512z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-hourglass" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58889, + "id": 14 + }, + { + "paths": [ + "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM512 128c70.6 0 128 57.4 128 128s-57.4 128-128 128c-70.6 0-128-57.4-128-128s57.4-128 128-128zM704 832h-384v-128h64v-256h256v256h64v128z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "grid": 16, + "tags": [ + "icon-info-v1.5" + ], + "colorPermutations": { + "16161751": [ + { + "f": 0 + } + ], + "125525525516161751": [ + { + "f": 0 + } + ], + "1161751207457516161751": [ + { + "f": 0 + } + ] + }, + "defaultCode": 58888, + "id": 15 + }, + { + "paths": [ + "M1024 512l-512-512v307.2l-512 204.8v256h512v256z" + ], + "grid": 16, + "tags": [ + "icon-link" + ], + "defaultCode": 244, + "id": 65, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M832 384h-32v-96c0-158.8-129.2-288-288-288s-288 129.2-288 288v96h-32c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h640c70.4 0 128-57.6 128-128v-384c0-70.4-57.6-128-128-128zM416 288c0-53 43-96 96-96s96 43 96 96v96h-192v-96z" + ], + "grid": 16, + "tags": [ + "icon-lock" + ], + "defaultCode": 108, + "id": 28, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M960 640c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64h-896c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h896z" + ], + "grid": 16, + "tags": [ + "icon-minus" + ], + "defaultCode": 45, + "id": 82, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M704 320h64c70.4 0 128-57.6 128-128v-64c0-70.4-57.6-128-128-128h-64c-70.4 0-128 57.6-128 128v64c0 70.4 57.6 128 128 128z", + "M256 320h64c70.4 0 128-57.6 128-128v-64c0-70.4-57.6-128-128-128h-64c-70.4 0-128 57.6-128 128v64c0 70.4 57.6 128 128 128z", + "M832 384h-192c-34.908 0-67.716 9.448-96 25.904 57.278 33.324 96 95.404 96 166.096v448h384v-448c0-105.6-86.4-192-192-192z", + "M384 384h-192c-105.6 0-192 86.4-192 192v448h576v-448c0-105.6-86.4-192-192-192z" + ], + "grid": 16, + "tags": [ + "icon-people" + ], + "defaultCode": 79, + "id": 78, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M768 256c0 105.6-86.4 192-192 192h-128c-105.6 0-192-86.4-192-192v-64c0-105.6 86.4-192 192-192h128c105.6 0 192 86.4 192 192v64z", + "M64 1024v-192c0-140.8 115.2-256 256-256h384c140.8 0 256 115.2 256 256v192z" + ], + "grid": 16, + "tags": [ + "icon-person" + ], + "defaultCode": 80, + "id": 24, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M960 384h-330v-320c0-35.2-28.8-64-64-64h-108c-35.2 0-64 28.8-64 64v320h-330c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h330v320c0 35.2 28.8 64 64 64h108c35.2 0 64-28.8 64-64v-320h330c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64z" + ], + "grid": 16, + "tags": [ + "icon-plus" + ], + "defaultCode": 43, + "id": 81, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M832 128h-192.36v-64c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v64h-191.64c-105.6 0-192 72-192 160s0 160 0 160h64v384c0 105.6 86.4 192 192 192h512c105.6 0 192-86.4 192-192v-384h64c0 0 0-72 0-160s-86.4-160-192-160zM320 832h-128v-384h128v384zM576 832h-128v-384h128v384zM832 832h-128v-384h128v384z" + ], + "grid": 16, + "tags": [ + "icon-trash" + ], + "defaultCode": 90, + "id": 90, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M384 512l-365.332 365.332c-24.89 24.89-24.89 65.62 0 90.51l37.49 37.49c24.89 24.89 65.62 24.89 90.51 0 0 0 365.332-365.332 365.332-365.332l365.332 365.332c24.89 24.89 65.62 24.89 90.51 0l37.49-37.49c24.89-24.89 24.89-65.62 0-90.51l-365.332-365.332c0 0 365.332-365.332 365.332-365.332 24.89-24.89 24.89-65.62 0-90.51l-37.49-37.49c-24.89-24.89-65.62-24.89-90.51 0 0 0-365.332 365.332-365.332 365.332l-365.332-365.332c-24.89-24.89-65.62-24.89-90.51 0l-37.49 37.49c-24.89 24.89-24.89 65.62 0 90.51 0 0 365.332 365.332 365.332 365.332z" + ], + "grid": 16, + "tags": [ + "icon-x-heavy" + ], + "defaultCode": 120, + "id": 93, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "id": 98, + "paths": [ + "M832 0h-192v192h191.66l0.34 0.34v639.32l-0.34 0.34h-191.66v192h192c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z", + "M384 832h-191.66l-0.34-0.34v-639.32l0.34-0.34h191.66v-192h-192c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h192v-192z" + ], + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-brackets" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "paths": [ + "M0 512l256 256v-512z", + "M512 0l-256 256h512z", + "M512 1024l256-256h-512z", + "M768 256v512l256-256z" + ], + "grid": 16, + "tags": [ + "icon-arrows-out" + ], + "defaultCode": 73, + "id": 43, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 512l-448 512v-1024z", + "M448 0l-448 512 448 512z" + ], + "grid": 16, + "tags": [ + "icon-arrows-right-left" + ], + "defaultCode": 58893, + "id": 44, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0l512 448h-1024z", + "M0 576l512 448 512-448z" + ], + "grid": 16, + "tags": [ + "icon-arrows-up-down" + ], + "defaultCode": 53, + "id": 45, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M832 752c0 44-36 80-80 80h-480c-44 0-80-36-80-80v-480c0-44 36-80 80-80h480c44 0 80 36 80 80v480z" + ], + "grid": 16, + "tags": [ + "icon-bullet" + ], + "defaultCode": 58905, + "id": 4, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "grid": 16, + "tags": [ + "icon-calendar" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + } + ] + }, + "defaultCode": 58885, + "id": 20 + }, + { + "paths": [ + "M958.4 65.6c-43.8-43.8-101-65.6-158.4-65.6s-114.6 21.8-158.4 65.6l-128 128c-74 74-85.4 187-34 273l-12.8 12.8c-35.4-20.8-75-31.4-114.8-31.4-57.4 0-114.6 21.8-158.4 65.6l-128 128c-87.4 87.4-87.4 229.4 0 316.8 43.8 43.8 101 65.6 158.4 65.6s114.6-21.8 158.4-65.6l128-128c74-74 85.4-187 34-273l12.8-12.8c35.2 21 75 31.6 114.6 31.6 57.4 0 114.6-21.8 158.4-65.6l128-128c87.6-87.6 87.6-229.6 0.2-317zM419.8 739.8l-128 128c-18 18.2-42.2 28.2-67.8 28.2s-49.8-10-67.8-28.2c-37.4-37.4-37.4-98.4 0-135.8l128-128c18.2-18.2 42.2-28.2 67.8-28.2 5.6 0 11.2 0.6 16.8 1.4l-55.6 55.6c-10.4 10.4-16.2 24.2-16.2 38.8s5.8 28.6 16.2 38.8c10.4 10.4 24.2 16.2 38.8 16.2s28.6-5.8 38.8-16.2l55.6-55.6c5.4 30.4-3.6 62.2-26.6 85zM867.8 291.8l-128 128c-18 18.2-42.2 28.2-67.8 28.2-5.6 0-11.2-0.6-16.8-1.4l55.6-55.6c10.4-10.4 16.2-24.2 16.2-38.8s-5.8-28.6-16.2-38.8c-10.4-10.4-24.2-16.2-38.8-16.2s-28.6 5.8-38.8 16.2l-55.6 55.6c-5.2-29.8 3.6-61.6 26.6-84.6l128-128c18-18.4 42.2-28.4 67.8-28.4s49.8 10 67.8 28.2c37.6 37.4 37.6 98.2 0 135.6z" + ], + "grid": 16, + "tags": [ + "icon-chain-links" + ], + "defaultCode": 232, + "id": 25, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "id": 97, + "paths": [ + "M0 0h192v1024h-192v-1024z", + "M832 256h-256v-256l-320 416 320 416v-256h256v-320z" + ], + "attrs": [ + { + "opacity": 1 + }, + { + "opacity": 1 + } + ], + "isMulticolor": false, + "width": 832, + "grid": 16, + "tags": [ + "icon-pane-collapse-left" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "id": 96, + "paths": [ + "M640 0h192v1024h-192v-1024z", + "M0 256h256v-256l320 416-320 416v-256h-256v-320z" + ], + "attrs": [ + { + "opacity": 1 + }, + { + "opacity": 1 + } + ], + "isMulticolor": false, + "width": 832, + "grid": 16, + "tags": [ + "icon-pane-collapse-right" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "id": 95, + "paths": [ + "M832 576v255.66l-0.34 0.34-639.66-0.34v-255.66h-192v256c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-256h-192z", + "M512 640l448-448h-256v-192h-384v192h-256l448 448z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "grid": 16, + "tags": [ + "icon-download" + ], + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ] + } + }, + { + "paths": [ + "M640 256v-128c0-70.4-57.6-128-128-128h-384c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h128v-139.6c0-134.8 109.6-244.4 244.4-244.4h139.6z", + "M896 384h-384c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h384c70.4 0 128-57.6 128-128v-384c0-70.4-57.6-128-128-128z" + ], + "grid": 16, + "tags": [ + "icon-duplicate" + ], + "defaultCode": 242, + "id": 55, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM704 800h-128v128h-128v-128h-128v-128h128v-128h128v128h128v128z" + ], + "grid": 16, + "tags": [ + "icon-folder-new" + ], + "defaultCode": 102, + "id": 56, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M192.344 832c-0.118-0.1-0.244-0.224-0.344-0.344v-191.656h-192v192c0 105.6 86.4 192 192 192h192v-192h-191.656z", + "M192 192.344c0.1-0.118 0.224-0.244 0.344-0.344h191.656v-192h-192c-105.6 0-192 86.4-192 192v192h192v-191.656z", + "M832 0h-192v192h191.656c0.118 0.1 0.244 0.226 0.344 0.344v191.656h192v-192c0-105.6-86.4-192-192-192z", + "M832 831.656c-0.1 0.118-0.224 0.244-0.344 0.344h-191.656v192h192c105.6 0 192-86.4 192-192v-192h-192v191.656z" + ], + "grid": 16, + "tags": [ + "icon-fullscreen-expand" + ], + "defaultCode": 122, + "id": 59, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M191.656 832c0.118 0.1 0.244 0.224 0.344 0.344v191.656h192v-192c0-105.6-86.4-192-192-192h-192v192h191.656z", + "M192 191.656c-0.1 0.118-0.224 0.244-0.344 0.344h-191.656v192h192c105.6 0 192-86.4 192-192v-192h-192v191.656z", + "M832 384h192v-192h-191.656c-0.118-0.1-0.244-0.226-0.344-0.344v-191.656h-192v192c0 105.6 86.4 192 192 192z", + "M832 832.344c0.1-0.118 0.224-0.244 0.344-0.344h191.656v-192h-192c-105.6 0-192 86.4-192 192v192h192v-191.656z" + ], + "grid": 16, + "tags": [ + "icon-fullscreen-collapse" + ], + "defaultCode": 95, + "id": 58, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 384l-512-384-512 384 512 384z", + "M512 896l-426.666-320-85.334 64 512 384 512-384-85.334-64z" + ], + "grid": 16, + "tags": [ + "icon-layers" + ], + "defaultCode": 225, + "id": 62, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M64 576c-35.346 0-64-28.654-64-64s28.654-64 64-64h896c35.346 0 64 28.654 64 64s-28.654 64-64 64h-896z" + ], + "grid": 16, + "tags": [ + "icon-line-horz" + ], + "defaultCode": 226, + "id": 64, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216-232.168 46.6-316.784 131.216-131.216 197.118-131.216 316.784 46.6 232.168 131.216 316.784 197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + ], + "grid": 16, + "tags": [ + "icon-magnify" + ], + "defaultCode": 77, + "id": 68, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M640 384h-128v-128h-128v128h-128v128h128v128h128v-128h128z", + "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + ], + "grid": 16, + "tags": [ + "icon-magnify-in" + ], + "defaultCode": 88, + "id": 66, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M256 384h384v128h-384v-128z", + "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + ], + "grid": 16, + "tags": [ + "icon-magnify-out" + ], + "defaultCode": 89, + "id": 67, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M0 0h1024v256h-1024v-256z", + "M0 384h1024v256h-1024v-256z", + "M0 768h1024v256h-1024v-256z" + ], + "grid": 16, + "tags": [ + "icon-menu" + ], + "defaultCode": 109, + "id": 69, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M293.4 512l218.6-218.6 256 256v-421.4c0-70.4-57.6-128-128-128h-512c-70.4 0-128 57.6-128 128v512c0 70.4 57.6 128 128 128h421.4l-256-256z", + "M1024 448h-128v320l-384-384-128 128 384 384h-320v128h576z" + ], + "grid": 16, + "tags": [ + "icon-move" + ], + "defaultCode": 243, + "id": 70, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M448 0v128h320l-384 384 128 128 384-384v320h128v-576z", + "M576 674.274v157.382c-0.1 0.118-0.226 0.244-0.344 0.344h-383.312c-0.118-0.1-0.244-0.226-0.344-0.344v-383.312c0.1-0.118 0.226-0.244 0.344-0.344h157.382l192-192h-349.726c-105.6 0-192 86.4-192 192v384c0 105.6 86.4 192 192 192h384c105.6 0 192-86.4 192-192v-349.726l-192 192z" + ], + "grid": 16, + "tags": [ + "icon-new-window" + ], + "defaultCode": 121, + "id": 71, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M544 224v224c0 88.4-71.6 160-160 160s-160-71.6-160-160v-97.2l-197.4 196.4c-50 50-12.4 215.2 112.4 340s290 162.4 340 112.4l417-423.6-352-352z", + "M896 1024c70.6 0 128-57.4 128-128 0-108.6-128-192-128-192s-128 83.4-128 192c0 70.6 57.4 128 128 128z", + "M384 512c-35.4 0-64-28.6-64-64v-384c0-35.4 28.6-64 64-64s64 28.6 64 64v384c0 35.4-28.6 64-64 64z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-paint-bucket" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58886, + "id": 21 + }, + { + "paths": [ + "M126-2h256v1024h-256v-1024z", + "M638-2h256v1024h-256v-1024z" + ], + "grid": 16, + "tags": [ + "icon-pause" + ], + "defaultCode": 241, + "id": 76, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M922.344 101.68c-38.612-38.596-81.306-69.232-120.304-86.324-68.848-30.25-104.77-9.078-120.194 6.344l-516.228 516.216-3.136 9.152-162.482 476.932 485.998-165.612 6.73-6.806 509.502-509.506c9.882-9.866 21.768-27.77 21.768-56.578 0.002-50.71-38.996-121.148-101.654-183.818zM237.982 855.66l-69.73-69.728 69.25-203.228 18.498-6.704h64v128h128v64l-6.846 18.506-203.172 69.154z" + ], + "grid": 16, + "tags": [ + "icon-pencil" + ], + "defaultCode": 112, + "id": 77, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 512l-1024 512v-1024z" + ], + "grid": 16, + "tags": [ + "icon-play" + ], + "defaultCode": 239, + "id": 79, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M255.884 704c0.040-0.034 0.082-0.074 0.116-0.116v-127.884c0-70.58 57.42-128 128-128h255.884c0.040-0.034 0.082-0.074 0.116-0.116v-127.884c0-70.58 57.42-128 128-128h143.658c-93.832-117.038-237.98-192-399.658-192-282.77 0-512 229.23-512 512 0 67.904 13.25 132.704 37.256 192h218.628z", + "M768.116 320c-0.040 0.034-0.082 0.074-0.116 0.116v127.884c0 70.58-57.42 128-128 128h-255.884c-0.040 0.034-0.082 0.074-0.116 0.116v127.884c0 70.58-57.42 128-128 128h-143.658c93.832 117.038 237.98 192 399.658 192 282.77 0 512-229.23 512-512 0-67.904-13.25-132.704-37.256-192h-218.628z" + ], + "grid": 16, + "tags": [ + "icon-plot-resource" + ], + "defaultCode": 233, + "id": 80, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M510 1024l-256-512 256-512h-256l-256 512 256 512z" + ], + "width": 512, + "grid": 16, + "tags": [ + "icon-pointer-left" + ], + "defaultCode": 123, + "id": 22, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M-2 0l256 512-256 512h256l256-512-256-512z" + ], + "width": 512, + "grid": 16, + "tags": [ + "icon-pointer-right" + ], + "defaultCode": 125, + "id": 23, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1012.8 414.2v-391.6l-127.6 127.4c-96.6-96.8-225.2-150-362-150s-265.2 53.2-362 150c-96.8 96.8-150 225.2-150 362s53.2 265.4 150 362c96.8 96.8 225.2 150 362 150s265.4-53.2 362-150l-136.6-136.6c-124.2 124.2-326.4 124.2-450.8 0-124.2-124.2-124.2-326.4 0-450.8 124.2-124.2 326.4-124.2 450.8 0l-127.4 127.4h391.6z" + ], + "grid": 16, + "tags": [ + "icon-refresh" + ], + "defaultCode": 114, + "id": 27, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M192.2 576c-0.2 0-0.2 0 0 0l-0.2 448h640v-447.8c0 0 0 0-0.2-0.2h-639.6z", + "M978.8 210.8l-165.4-165.4c-25-25-74.2-45.4-109.4-45.4h-576c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128v-448c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v448c70.4 0 128-57.6 128-128v-576c0-35.2-20.4-84.4-45.2-109.2zM704 256c0 35.2-28.8 64-64 64h-448c-35.2 0-64-28.8-64-64v-192h320v192h128v-192h128v192z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + }, + { + "fill": "rgb(0, 0, 0)" + } + ], + "grid": 16, + "tags": [ + "icon-save-v2" + ], + "colorPermutations": { + "16161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ], + "125525525516161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ], + "1161751207457516161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ] + }, + "defaultCode": 58898, + "id": 11 + }, + { + "paths": [ + "M1022.294 512c-1.746-7.196-3.476-14.452-5.186-21.786-20.036-85.992-53.302-208.976-98-306.538-22.42-48.938-45.298-86.556-69.946-115.006-48.454-55.93-98.176-67.67-131.356-67.67s-82.902 11.74-131.356 67.672c-24.648 28.45-47.528 66.068-69.948 115.006-44.696 97.558-77.962 220.544-98 306.538-21.646 92.898-46.444 175.138-71.71 237.836-16.308 40.46-30.222 66.358-40.6 82.604-10.378-16.246-24.292-42.142-40.6-82.604-23.272-57.75-46.144-132.088-66.524-216.052h-197.362c1.746 7.196 3.476 14.452 5.186 21.786 20.036 85.992 53.302 208.976 98 306.538 22.42 48.938 45.298 86.556 69.946 115.006 48.454 55.932 98.176 67.672 131.356 67.672s82.902-11.74 131.356-67.672c24.648-28.45 47.528-66.068 69.948-115.006 44.696-97.558 77.962-220.544 98-306.538 21.646-92.898 46.444-175.138 71.71-237.836 16.308-40.46 30.222-66.358 40.6-82.604 10.378 16.246 24.292 42.142 40.6 82.604 23.274 57.748 46.146 132.086 66.526 216.050h197.36z" + ], + "grid": 16, + "tags": [ + "icon-sine" + ], + "defaultCode": 54, + "id": 83, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M0 0v256h128v-64h256v704h-192v128h640v-128h-192v-704h256v64h128v-256z" + ], + "grid": 16, + "tags": [ + "icon-T" + ], + "defaultCode": 228, + "id": 84, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M448 382c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", + "M1024 382c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", + "M448 958c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", + "M1024 958c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z" + ], + "grid": 16, + "tags": [ + "icon-thumbs-strip" + ], + "defaultCode": 246, + "id": 87, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM128 128h320v768h-320v-768zM896 896h-320v-768h320v768z" + ], + "grid": 16, + "tags": [ + "icon-two-parts-both" + ], + "defaultCode": 229, + "id": 91, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM896 896h-320v-768h320v768z" + ], + "grid": 16, + "tags": [ + "icon-two-parts-one-only" + ], + "defaultCode": 231, + "id": 92, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM832 704l-128 128-192-192-192 192-128-128 192-192-192-192 128-128 192 192 192-192 128 128-192 192 192 192z" + ], + "grid": 16, + "tags": [ + "icon-x-in-circle" + ], + "defaultCode": 58887, + "id": 16, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M576 64h-256l320 320h-290.256c-44.264-76.516-126.99-128-221.744-128h-128v512h128c94.754 0 177.48-51.484 221.744-128h290.256l-320 320h256l448-448-448-448z" + ], + "grid": 16, + "tags": [ + "icon-activity" + ], + "defaultCode": 97, + "id": 32, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0c-214.866 0-398.786 132.372-474.744 320h90.744c56.86 0 107.938 24.724 143.094 64h240.906l-192-192h256l320 320-320 320h-256l192-192h-240.906c-35.156 39.276-86.234 64-143.094 64h-90.744c75.958 187.628 259.878 320 474.744 320 282.77 0 512-229.23 512-512s-229.23-512-512-512z" + ], + "grid": 16, + "tags": [ + "icon-activity-mode" + ], + "defaultCode": 65, + "id": 31, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M192 0c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h64v-1024h-64z", + "M384 0h256v1024h-256v-1024z", + "M832 0h-64v704h256v-512c0-105.6-86.4-192-192-192z" + ], + "grid": 16, + "tags": [ + "icon-autoflow-tabular" + ], + "defaultCode": 72, + "id": 47, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0c-282.76 0-512 229.24-512 512s229.24 512 512 512 512-229.24 512-512-229.24-512-512-512zM782 690c-12.681 21.673-35.844 36-62.354 36-0.023 0-0.047-0-0.070-0-0.016 0-0.040 0-0.064 0-13.234 0-25.63-3.587-36.269-9.843l-221.644-127.977q-1.2-0.7-2.38-1.46l-0.86-0.56-1.86-1.28-1.26-0.9-1.26-0.96-1.7-1.34-0.64-0.54c-0.72-0.6-1.44-1.22-2.14-1.84v0c-5.012-4.562-9.331-9.758-12.863-15.491-0.457-0.769-0.717-1.249-0.997-1.709s-0.58-0.98-0.86-1.48c-3.092-5.53-5.561-11.936-7.071-18.704l-0.089-0.596c-0.2-0.92-0.38-1.84-0.54-2.76 0-0.28-0.1-0.56-0.16-0.84-0.12-0.7-0.22-1.42-0.3-2.14s-0.14-1.040-0.2-1.58-0.1-1.020-0.14-1.54-0.12-1.5-0.18-2.24c0-0.34 0-0.68 0-1.040q0-1.4 0-2.78c0-0.1 0-0.22 0-0.32v-364.080c0-39.765 32.235-72 72-72s72 32.235 72 72v322.44l185.7 107.22c21.605 12.697 35.879 35.823 35.879 62.284 0 13.278-3.594 25.716-9.862 36.395z" + ], + "grid": 16, + "tags": [ + "icon-clock" + ], + "defaultCode": 67, + "id": 50, + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + } + ] + } + }, + { + "paths": [ + "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", + "M512 512c-282.77 0-512-85.962-512-192v512c0 106.038 229.23 192 512 192s512-85.962 512-192v-512c0 106.038-229.23 192-512 192z" + ], + "grid": 16, + "tags": [ + "icon-database" + ], + "defaultCode": 68, + "id": 53, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M683.52 819.286c-50.782 28.456-109.284 44.714-171.52 44.714-194.094 0-352-157.906-352-352s157.906-352 352-352 352 157.906 352 352c0 62.236-16.258 120.738-44.714 171.52l191.692 191.692c8.516-13.89 13.022-28.354 13.022-43.212v-640c0-106.038-229.23-192-512-192s-512 85.962-512 192v640c0 106.038 229.23 192 512 192 126.11 0 241.548-17.108 330.776-45.46l-159.256-159.254z", + "M352 512c0 88.224 71.776 160 160 160s160-71.776 160-160-71.776-160-160-160-160 71.776-160 160z" + ], + "grid": 16, + "tags": [ + "icon-database-query" + ], + "defaultCode": 100, + "id": 52, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM320 896h-128v-320h128v320zM576 896h-128v-320h128v320zM832 896h-128v-320h128v320z" + ], + "grid": 16, + "tags": [ + "icon-dataset" + ], + "defaultCode": 58897, + "id": 12, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", + "M512 512c-282.8 0-512-86-512-192v512c0 106 229.2 192 512 192s512-86 512-192v-512c0 106-229.2 192-512 192zM896 575v256c-36.6 15.6-79.8 28.8-128 39.4v-256c48.2-10.6 91.4-23.8 128-39.4zM256 614.4v256c-48.2-10.4-91.4-23.8-128-39.4v-256c36.6 15.6 79.8 28.8 128 39.4zM384 890v-256c41 4 83.8 6 128 6s87-2.2 128-6v256c-41 4-83.8 6-128 6s-87-2.2-128-6z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "grid": 16, + "tags": [ + "icon-datatable" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58881, + "id": 17 + }, + { + "paths": [ + "M832 640c105.6 0 192-86.4 192-192v-256c0-105.6-86.4-192-192-192v320l-128-64-128 64v-320h-384c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-192c0 105.6-86.4 192-192 192h-640v-192h640z" + ], + "grid": 16, + "tags": [ + "icon-dictionary" + ], + "defaultCode": 81, + "id": 54, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128z" + ], + "grid": 16, + "tags": [ + "icon-folder" + ], + "defaultCode": 70, + "id": 57, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM896 896h-768v-768h768v768z", + "M320 256l-128 128v448h640v-320l-128-128-128 128z" + ], + "grid": 16, + "tags": [ + "icon-image" + ], + "defaultCode": 227, + "id": 61, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M448 0h-256c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h256v-1024z", + "M832 0h-256v577.664h448v-385.664c0-105.6-86.4-192-192-192z", + "M576 1024h256c105.6 0 192-86.4 192-192v-129.664h-448v321.664z" + ], + "grid": 16, + "tags": [ + "icon-layout" + ], + "defaultCode": 76, + "id": 63, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 1024l512-320v-384l-512.020-320-511.98 320v384l512 320zM512 192l358.4 224-358.4 224-358.4-224 358.4-224z" + ], + "grid": 16, + "tags": [ + "icon-object" + ], + "defaultCode": 111, + "id": 72, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M510-2l-512 320v384l512 320 512-320v-384l-512-320zM585.4 859.2c-21.2 20.8-46 30.8-76 30.8-31.2 0-56.2-9.8-76.2-29.6-20-20-29.6-44.8-29.6-76.2 0-30.4 10.2-55.2 31-76.2s45.2-31.2 74.8-31.2c29.6 0 54.2 10.4 75.6 32s31.8 46.4 31.8 76c-0.2 29-10.8 54-31.4 74.4zM638.2 546.6c-23.6 11.8-37.4 22-43.4 32.4-3.6 6.2-6 14.8-7.4 26.8v41h-161.4v-44.2c0-40.2 4.4-69.8 13-88 8-17.2 22.6-30.2 44.8-40l34.8-15.4c32-14.2 48.2-35.2 48.2-62.8 0-16-6-30.4-17.2-41.8-11.2-11.2-25.6-17.2-41.6-17.2-24 0-54.4 10-62.8 57.4l-2.2 12.2h-147l1.4-16.2c4-44.6 17-82.4 38.8-112.2 19.6-27 45.6-48.6 77-64.6s64.6-24 98.2-24c60.6 0 110.2 19.4 151.4 59.6 41.2 40 61.2 88 61.2 147.2 0 70.8-28.8 121.4-85.8 149.8z" + ], + "grid": 16, + "tags": [ + "icon-object-unknown" + ], + "defaultCode": 63, + "id": 73, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M511.98 0l-511.98 320v512c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-512l-512.020-320zM512 192l358.4 224-358.4 224-358.4-224 358.4-224z" + ], + "grid": 16, + "tags": [ + "icon-packet" + ], + "defaultCode": 86, + "id": 74, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M702 508c-105.6 0-192-86.4-192-192v-320h-320c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-320h-320z", + "M766 380h256l-384-384v256c0 70.4 57.6 128 128 128z" + ], + "grid": 16, + "tags": [ + "icon-page" + ], + "defaultCode": 234, + "id": 75, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "id": 99, + "paths": [ + "M830 0h-636c-106.7 0-194 87.3-194 194v406.82c14.18 18.64 25.66 28.34 32 30.84 14.28-5.62 54.44-47.54 92.96-146 42.46-108.38 116.32-237.66 227.040-237.66 52.4 0 101.42 29.16 145.7 86.68 37.34 48.5 64.84 108.92 81.34 151.080 38.52 98.38 78.68 140.3 92.96 146 14.28-5.62 54.44-47.54 92.96-146 42.46-108.48 116.32-237.76 227.040-237.76 11.354 0.003 22.389 1.366 32.952 3.936l-0.952-57.936c0-106.7-87.3-194-194-194z", + "M992 392.34c-14.28 5.62-54.44 47.52-92.96 146-42.46 108.38-116.32 237.66-227.040 237.66-52.4 0-101.42-29.16-145.7-86.68-37.34-48.5-64.84-108.92-81.34-151.080-38.52-98.38-78.68-140.3-92.96-146-14.28 5.62-54.44 47.52-92.96 146-42.46 108.48-116.32 237.76-227.040 237.76-11.355-0.003-22.389-1.367-32.952-3.936l0.952 57.936c0 106.7 87.3 194 194 194h636c106.7 0 194-87.3 194-194v-406.82c-14.18-18.64-25.66-28.34-32-30.84z" + ], + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-plot-overlay" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "id": 100, + "paths": [ + "M89.6 312c24.98 0 48.96-26.52 85.52-70.18 45.42-54.28 102-121.82 196-121.82 44.64 0 86.62 15.46 124.8 46 28.68 22.9 51.16 50.42 72.92 77.060 38.42 46.94 59.16 68.94 83.96 68.94h371.2v-118c0-106.7-87.3-194-194-194h-636c-106.7 0-194 87.3-194 194v118h89.6z", + "M529.5 410.4c-28.24-22.64-50.52-50-72-76.28-35.5-43.48-58.76-70.12-86.3-70.12-25.060 0-49.080 26.54-85.66 70.24-45.4 54.24-102 121.76-196 121.76h-89.54v112h371.2c44 0 85.54 15.34 123.3 45.6 28.24 22.64 50.52 50 72 76.28 35.5 43.48 58.76 70.12 86.3 70.12 25.060 0 49.080-26.54 85.66-70.24 45.4-54.24 102-121.76 196-121.76h89.54v-112h-371.2c-44.060 0-85.54-15.34-123.3-45.6z", + "M934.4 712c-24.98 0-48.96 26.52-85.52 70.18-45.42 54.28-102 121.82-196 121.82-44.64 0-86.62-15.46-124.8-46-28.68-22.9-51.16-50.42-72.92-77.060-38.42-46.94-59.16-68.94-83.96-68.94h-371.2v118c0 106.7 87.3 194 194 194h636c106.7 0 194-87.3 194-194v-118h-89.6z" + ], + "attrs": [ + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-plot-stacked" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {}, + {} + ] + } + }, + { + "paths": [ + "M635.6 524.4c6.6 4.2 13.2 8.6 19.2 13.6l120.4 96.4c29.6 23.8 83.8 23.8 113.4 0l135.2-108c0.2-4.8 0.2-9.4 0.2-14.2 0-52.2-7.8-102.4-22.2-149.8l-154.8 123.6c-58.2 46.6-140.2 59.2-211.4 38.4z", + "M248.6 634.2l120.4-96.4c58-46.4 140-59.2 211.2-38.4-6.6-4.2-13.2-8.6-19.2-13.6l-120.4-96.4c-29.6-23.8-83.8-23.8-113.4 0l-120.2 96.6c-40 32-91.4 48-143 48-21.6 0-43-2.8-63.8-8.4 0 0.6 0 1.2 0 1.6 5 3.4 10 6.8 14.6 10.6l120.4 96.4c29.8 23.8 83.8 23.8 113.4 0z", + "M120.6 378.2l120.4-96.4c80.2-64.2 205.6-64.2 285.8 0l120.4 96.4c29.6 23.8 83.8 23.8 113.4 0l181-144.8c-91.2-140.4-249.6-233.4-429.6-233.4-238.6 0-439.2 163.2-496 384.2 30.8 17.6 77.8 15.6 104.6-6z", + "M689 742l-120.4-96.4c-29.6-23.8-83.8-23.8-113.4 0l-120.2 96.4c-40 32-91.4 48-143 48-47.8 0-95.4-13.8-134.2-41.4 85.6 163.6 256.8 275.4 454.2 275.4s368.6-111.8 454.2-275.4c-80.4 57.4-199.8 55.2-277.2-6.6z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-session" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58904, + "id": 5 + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-tabular" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + } + ] + }, + "defaultCode": 58884, + "id": 19 + }, + { + "paths": [ + "M896 0h-768c-70.606 0.215-127.785 57.394-128 127.979l-0 768.021c0.215 70.606 57.394 127.785 127.979 128l768.021 0c70.606-0.215 127.785-57.394 128-127.979l0-768.021c-0.215-70.606-57.394-127.785-127.979-128zM64 256h256v192h-256v-192zM64 512h256v192h-256v-192zM128 960c-35.26-0.214-63.786-28.74-64-63.98l-0-128.020h256v192h-192zM384 960v-192h256v192h-256zM960 896c-0.214 35.26-28.74 63.786-63.98 64l-192.020 0v-192h256v128zM960 512v192h-576v-192h64v-64h-64v-192h576v192h-64v64h64z", + "M782.32 547.38l-110.32-55.16v-172.22c0-17.673-14.327-32-32-32s-32 14.327-32 32v211.78l145.68 72.84c4.172 2.133 9.1 3.383 14.32 3.383 17.675 0 32.003-14.328 32.003-32.003 0-12.454-7.114-23.247-17.501-28.536z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-tabular-lad" + ], + "colorPermutations": { + "16161751": [], + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ] + }, + "defaultCode": 58913, + "id": 2 + }, + { + "paths": [ + "M128 768v-576c-70.606 0.215-127.785 57.394-128 127.979l-0 576.021c0.215 70.606 57.394 127.785 127.979 128l576.021 0c70.606-0.215 127.785-57.394 128-127.979l-576-0.021c-70.606-0.215-127.785-57.394-128-127.979z", + "M896 0h-576c-70.606 0.215-127.785 57.394-128 127.979l-0 576.021c0.215 70.606 57.394 127.785 127.979 128l576.021 0c70.606-0.215 127.785-57.394 128-127.979l0-576.021c-0.215-70.606-57.394-127.785-127.979-128zM256 192h192v128h-192v-128zM256 384h192v192h-192v-192zM320 768c-35.26-0.214-63.786-28.74-64-63.98l-0-64.020h192v128h-128zM512 768v-128h192v128h-192zM960 704c-0.214 35.26-28.74 63.786-63.98 64l-128.020 0v-128h192v64zM960 576h-448v-384h448v384z", + "M832 480c0.002 0 0.005 0 0.007 0 17.673 0 32-14.327 32-32 0-14.055-9.062-25.994-21.662-30.293l-74.345-24.767v-104.94c0-17.673-14.327-32-32-32s-32 14.327-32 32v151.060l117.88 39.3c3.018 1.040 6.495 1.64 10.113 1.64 0.003 0 0.005-0 0.008-0z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-tabular-lad-set" + ], + "colorPermutations": { + "16161751": [], + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ] + }, + "defaultCode": 58914, + "id": 1 + }, + { + "paths": [ + "M896 0h-768c-70.606 0.215-127.785 57.394-128 127.979l-0 768.021c0.215 70.606 57.394 127.785 127.979 128l768.021 0c70.606-0.215 127.785-57.394 128-127.979l0-768.021c-0.215-70.606-57.394-127.785-127.979-128zM448 292l25.060 25.32c7.916 7.922 18.856 12.822 30.94 12.822s23.024-4.9 30.94-12.822l75.5-76.3c29.97-30.338 71.571-49.128 117.56-49.128s87.59 18.79 117.544 49.112l50.456 50.997v152.2c-24.111-8.83-44.678-22.255-61.542-39.342l-75.518-76.318c-7.916-7.922-18.856-12.822-30.94-12.822s-23.024 4.9-30.94 12.822l-75.5 76.3c-29.971 30.343-71.575 49.137-117.568 49.137-20.084 0-39.331-3.584-57.137-10.146l1.145-151.831zM320 960h-192c-35.26-0.214-63.786-28.74-64-63.98l-0-128.020h256v192zM320 704h-256v-192h256v192zM320 448h-256v-192h256v192zM640 960h-256v-192h256v192zM448 636.62v-174.5c1.88 1.74 3.74 3.5 5.56 5.34l75.5 76.3c7.916 7.922 18.856 12.822 30.94 12.822s23.024-4.9 30.94-12.822l75.5-76.3c29.966-30.333 71.56-49.119 117.542-49.119 43.28 0 82.673 16.644 112.128 43.879l-0.11 174.399c-1.88-1.74-3.74-3.5-5.56-5.34l-75.5-76.3c-7.916-7.922-18.856-12.822-30.94-12.822s-23.024 4.9-30.94 12.822l-75.5 76.3c-29.966 30.333-71.56 49.119-117.542 49.119-43.28 0-82.673-16.644-112.128-43.879zM960 896c-0.214 35.26-28.74 63.786-63.98 64l-192.020 0v-192h256v128z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-tabular-realtime-v2" + ], + "colorPermutations": { + "16161751": [], + "1161751207457516161751": [ + { + "f": 1 + } + ] + }, + "defaultCode": 58912, + "id": 3 + }, + { + "paths": [ + "M64 0c-35.2 0-64 28.8-64 64v192h448v-256h-384z", + "M1024 256v-192c0-35.2-28.8-64-64-64h-384v256h448z", + "M0 384v192c0 35.2 28.8 64 64 64h384v-256h-448z", + "M960 640c35.2 0 64-28.8 64-64v-192h-448v256h384z", + "M512 1024l-256-256h512z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "grid": 16, + "tags": [ + "icon-tabular-scrolling" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58882, + "id": 18 + }, + { + "paths": [ + "M32 631.66c14.28-5.62 54.44-47.54 92.96-146 42.46-108.38 116.32-237.66 227.040-237.66 52.4 0 101.42 29.16 145.7 86.68 37.34 48.5 64.84 108.92 81.34 151.080 38.52 98.38 78.68 140.3 92.96 146 14.28-5.62 54.44-47.54 92.96-146 37.4-95.5 99.14-207.14 188.94-232.46-90.462-152.598-254.314-253.3-441.686-253.3-0.075 0-0.15 0-0.226 0-282.748-0-511.988 229.24-511.988 512-0 0.032-0 0.070-0 0.108 0 35.719 3.641 70.587 10.572 104.255 8.968 7.457 16.648 13.417 21.428 15.297z", + "M992 392.34c-14.28 5.62-54.44 47.52-92.96 146-42.46 108.38-116.32 237.66-227.040 237.66-52.4 0-101.42-29.16-145.7-86.68-37.34-48.5-64.84-108.92-81.34-151.080-38.52-98.38-78.68-140.3-92.96-146-14.28 5.62-54.44 47.52-92.96 146-37.4 95.5-99.14 207.14-188.94 232.46 90.462 152.598 254.314 253.3 441.686 253.3 0.075 0 0.15-0 0.226-0 282.748 0 511.988-229.24 511.988-512 0-0.032 0-0.070 0-0.108 0-35.719-3.641-70.587-10.572-104.255-8.968-7.457-16.648-13.417-21.428-15.297z" + ], + "grid": 16, + "tags": [ + "icon-telemetry" + ], + "defaultCode": 84, + "id": 86, + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "paths": [ + "M169.2 448c14-56.4 33-122 56.6-176.8 15.4-35.8 31.2-63.2 48.2-84 18.4-22.4 49-49.2 91-49.2s72.6 26.8 91 49.2c17 20.6 32.6 48.2 48.2 84 23.6 54.8 42.8 120.4 56.6 176.8h461.2v-256c0-105.6-86.4-192-192-192h-640c-105.6 0-192 86.4-192 192v256h171.2z", + "M718.6 576h-127.2c25 93.4 48.4 144.4 63.6 168.6 15.2-24.2 38.6-75.2 63.6-168.6z", + "M301.4 448h127.2c-25-93.4-48.4-144.4-63.6-168.6-15.2 24.2-38.6 75.2-63.6 168.6z", + "M850.8 576c-14 56.4-33 122-56.6 176.8-15.4 35.8-31.2 63.2-48.2 84-18.4 22.4-49 49.2-91 49.2s-72.6-26.8-91-49.2c-17-20.6-32.6-48.2-48.2-84-23.6-54.8-42.8-120.4-56.6-176.8h-461.2v256c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-256h-171.2z" + ], + "grid": 16, + "tags": [ + "icon-telemetry-panel" + ], + "defaultCode": 116, + "id": 85, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M256 256h384v128h-384v-128z", + "M384 448h384v128h-384v-128z", + "M320 640h384v128h-384v-128z", + "M832 0h-128v192h127.6c0.2 0 0.2 0.2 0.4 0.4v639.4c0 0.2-0.2 0.2-0.4 0.4h-127.6v192h128c105.6 0 192-86.4 192-192v-640.2c0-105.6-86.4-192-192-192z", + "M192 831.6v-639.2c0-0.2 0.2-0.2 0.4-0.4h127.6v-192h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192h-127.6c-0.2 0-0.4-0.2-0.4-0.4z" + ], + "grid": 16, + "tags": [ + "icon-timeline" + ], + "defaultCode": 83, + "id": 88, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "id": 101, + "paths": [ + "M576 146.6v-82.58c0-35.346-28.654-64-64-64h-128c-35.346 0-64 28.654-64 64v82.58c-185.040 55.080-320 226.48-320 429.42 0 247.42 200.58 448 448 448s448-200.58 448-448c0-202.96-135-374.4-320-429.42zM468 596.020l-263.76 211c-57.105-59.935-92.24-141.251-92.24-230.772 0-0.080 0-0.16 0-0.24-0-185.268 150.72-335.988 336-335.988 6.72 0 13.38 0.22 20 0.62v355.38z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "width": 896, + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-timer-v1.5" + ], + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + } + ] + } + }, + { + "paths": [ + "M454.36 476.64l86.3-86.3c9.088-8.965 21.577-14.502 35.36-14.502s26.272 5.537 35.366 14.507l86.294 86.294c19.328 19.358 42.832 34.541 69.047 44.082l1.313-171.722-57.64-57.64c-34.407-34.33-81.9-55.558-134.35-55.558s-99.943 21.228-134.354 55.562l-86.296 86.297c-9.088 8.965-21.577 14.502-35.36 14.502s-26.272-5.537-35.366-14.507l-28.674-28.654v172.14c19.045 7.022 41.040 11.084 63.984 11.084 52.463 0 99.966-21.239 134.379-55.587z", + "M505.64 547.36l-86.3 86.3c-9.088 8.965-21.577 14.502-35.36 14.502s-26.272-5.537-35.366-14.507l-86.294-86.294c-2-2-4.2-4-6.36-6v197.36c33.664 30.72 78.65 49.537 128.031 49.537 52.44 0 99.923-21.22 134.333-55.541l86.296-86.296c9.088-8.965 21.577-14.502 35.36-14.502s26.272 5.537 35.366 14.507l86.294 86.294c2 2 4.2 4 6.36 6v-197.36c-33.664-30.72-78.65-49.537-128.031-49.537-52.44 0-99.923 21.22-134.333 55.541z", + "M832 0h-128v192h127.66l0.34 0.34v639.32l-0.34 0.34h-127.66v192h128c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z", + "M320 832h-127.66l-0.34-0.34v-639.32l0.34-0.34h127.66v-192h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192z" + ], + "grid": 16, + "tags": [ + "icon-topic" + ], + "defaultCode": 58903, + "id": 6, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M0 384h128v256h-128v-256z", + "M128 128.22l0.22-0.22h191.78v-128h-192c-70.606 0.215-127.785 57.394-128 127.979l-0 192.021h128v-191.78z", + "M128 895.78v-191.78h-128v192c0.215 70.606 57.394 127.785 127.979 128l192.021 0v-128h-191.78z", + "M384 0h256v128h-256v-128z", + "M896 895.78l-0.22 0.22h-191.78v128h192c70.606-0.215 127.785-57.394 128-127.979l0-192.021h-128v191.78z", + "M896 0h-192v128h191.78l0.22 0.22v191.78h128v-192c-0.215-70.606-57.394-127.785-127.979-128z", + "M896 384h128v256h-128v-256z", + "M384 896h256v128h-256v-128z", + "M256 256h512v512h-512v-512z" + ], + "grid": 16, + "tags": [ + "icon-box-with-dashed-lines" + ], + "defaultCode": 51, + "id": 29, + "attrs": [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "colorPermutations": { + "1161751207457516161751": [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + } + } + ], + "colorThemes": [ + [ + [ + 0, + 0, + 0, + 1 + ], + [ + 0, + 161, + 75, + 1 + ], + [ + 6, + 161, + 75, + 1 + ], + [ + 207, + 45, + 75, + 1 + ] + ] + ], + "colorThemeIdx": 0, + "preferences": { + "showGlyphs": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "", + "metadata": { + "fontFamily": "wtdsymbols", + "majorVersion": 2, + "minorVersion": 0 + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "resetPoint": 58880, + "showVersion": true, + "showSelector": true, + "selector": "class", + "classSelector": ".ui-symbol", + "showMetrics": true, + "showMetadata": true, + "embed": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 4473924, + "bgColor": 16777215, + "classSelector": ".icon" + }, + "historySize": 100, + "showCodes": true, + "gridSize": 16, + "showLiga": false + }, + "id": 1, + "invisible": false + } + ], + "preferences": { + "showGlyphs": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "", + "metadata": { + "fontFamily": "openmct-symbols-16px", + "majorVersion": 2, + "minorVersion": 0 + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "resetPoint": 58880, + "showVersion": true, + "showSelector": true, + "selector": "class", + "classSelector": ".ui-symbol", + "showMetrics": true, + "showMetadata": true, + "embed": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 4473924, + "bgColor": 16777215, + "classSelector": ".icon" + }, + "historySize": 100, + "showCodes": true, + "gridSize": 16, + "showLiga": false, + "showGrid": true + }, + "uid": -1 +} \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json deleted file mode 100644 index df4c4cedc1..0000000000 --- a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json +++ /dev/null @@ -1,2758 +0,0 @@ -{ - "metadata": { - "name": "Untitled Project", - "lastOpened": 1464711493714, - "created": 1464711419511 - }, - "iconSets": [ - { - "selection": [ - { - "order": 5, - "id": 95, - "prevSize": 32, - "code": 58915, - "name": "icon-download", - "tempChar": "" - }, - { - "order": 6, - "prevSize": 32, - "name": "icon-tabular-lad-set", - "id": 1, - "code": 58914, - "tempChar": "" - }, - { - "order": 7, - "prevSize": 32, - "name": "icon-tabular-lad", - "id": 2, - "code": 58913, - "tempChar": "" - }, - { - "order": 8, - "prevSize": 32, - "name": "icon-tabular-realtime", - "id": 3, - "code": 58912, - "tempChar": "" - }, - { - "order": 9, - "prevSize": 32, - "name": "icon-bullet", - "id": 4, - "code": 58905, - "tempChar": "" - }, - { - "order": 10, - "prevSize": 32, - "name": "icon-session", - "id": 5, - "code": 58904, - "tempChar": "" - }, - { - "order": 11, - "prevSize": 32, - "name": "icon-topic", - "id": 6, - "code": 58903, - "tempChar": "" - }, - { - "order": 12, - "prevSize": 32, - "name": "icon-eye-open-no-gleam", - "id": 7, - "code": 58902, - "tempChar": "" - }, - { - "order": 13, - "prevSize": 32, - "name": "icon-eye-open", - "id": 8, - "code": 58901, - "tempChar": "" - }, - { - "order": 14, - "prevSize": 32, - "name": "icon-collapse-pane-left", - "id": 9, - "code": 58899, - "tempChar": "" - }, - { - "order": 15, - "prevSize": 32, - "name": "icon-collapse-pane-right", - "id": 10, - "code": 58900, - "tempChar": "" - }, - { - "order": 16, - "prevSize": 32, - "name": "icon-save", - "id": 11, - "code": 58898, - "tempChar": "" - }, - { - "order": 17, - "prevSize": 32, - "name": "icon-dataset", - "id": 12, - "code": 58897, - "tempChar": "" - }, - { - "order": 18, - "prevSize": 32, - "name": "icon-bell", - "id": 13, - "code": 58896, - "tempChar": "" - }, - { - "order": 19, - "prevSize": 32, - "name": "icon-hourglass", - "id": 14, - "code": 58889, - "tempChar": "" - }, - { - "order": 20, - "prevSize": 32, - "codes": [ - 58888, - 58889, - 58890 - ], - "name": "icon-info-v15", - "id": 15, - "code": 58888, - "tempChar": "" - }, - { - "order": 21, - "prevSize": 32, - "name": "icon-x-in-circle", - "id": 16, - "code": 58887, - "tempChar": "" - }, - { - "order": 22, - "prevSize": 32, - "name": "icon-datatable", - "id": 17, - "code": 58881, - "tempChar": "" - }, - { - "order": 23, - "prevSize": 32, - "name": "icon-tabular-scrolling", - "id": 18, - "code": 58882, - "tempChar": "" - }, - { - "order": 24, - "prevSize": 32, - "name": "icon-tabular", - "id": 19, - "code": 58884, - "tempChar": "" - }, - { - "order": 25, - "prevSize": 32, - "name": "icon-calendar", - "id": 20, - "code": 58885, - "tempChar": "" - }, - { - "order": 26, - "prevSize": 32, - "name": "icon-paint-bucket", - "id": 21, - "code": 58886, - "tempChar": "" - }, - { - "order": 27, - "prevSize": 32, - "name": "icon-pointer-left", - "id": 22, - "code": 123, - "tempChar": "" - }, - { - "order": 28, - "prevSize": 32, - "name": "icon-pointer-right", - "id": 23, - "code": 125, - "tempChar": "" - }, - { - "order": 29, - "prevSize": 32, - "name": "icon-person", - "id": 24, - "code": 80, - "tempChar": "" - }, - { - "order": 30, - "prevSize": 32, - "name": "icon-chain-links", - "id": 25, - "code": 232, - "tempChar": "" - }, - { - "order": 31, - "prevSize": 32, - "name": "icon-database-in-brackets", - "id": 26, - "code": 115, - "tempChar": "" - }, - { - "order": 32, - "prevSize": 32, - "name": "icon-refresh", - "id": 27, - "code": 114, - "tempChar": "" - }, - { - "order": 33, - "prevSize": 32, - "name": "icon-lock", - "id": 28, - "code": 108, - "tempChar": "" - }, - { - "order": 34, - "prevSize": 32, - "name": "icon-box-with-dashed-lines", - "id": 29, - "code": 51, - "tempChar": "" - }, - { - "order": 35, - "prevSize": 32, - "name": "icon-box-with-arrow-cursor", - "id": 30, - "code": 58880, - "tempChar": "" - }, - { - "order": 36, - "prevSize": 32, - "name": "icon-activity-mode", - "id": 31, - "code": 65, - "tempChar": "" - }, - { - "order": 37, - "prevSize": 32, - "name": "icon-activity", - "id": 32, - "code": 97, - "tempChar": "" - }, - { - "order": 38, - "prevSize": 32, - "name": "icon-alert-rect", - "id": 33, - "code": 33, - "tempChar": "" - }, - { - "order": 39, - "prevSize": 32, - "name": "icon-alert-triangle", - "id": 34, - "code": 58883, - "tempChar": "" - }, - { - "order": 40, - "prevSize": 32, - "name": "icon-arrow-double-down", - "id": 35, - "code": 238, - "tempChar": "" - }, - { - "order": 41, - "prevSize": 32, - "name": "icon-arrow-double-up", - "id": 36, - "code": 235, - "tempChar": "" - }, - { - "order": 42, - "prevSize": 32, - "name": "icon-arrow-down", - "id": 37, - "code": 118, - "tempChar": "" - }, - { - "order": 43, - "prevSize": 32, - "name": "icon-arrow-left", - "id": 38, - "code": 60, - "tempChar": "" - }, - { - "order": 44, - "prevSize": 32, - "name": "icon-arrow-right", - "id": 39, - "code": 62, - "tempChar": "" - }, - { - "order": 45, - "prevSize": 32, - "name": "icon-arrow-tall-down", - "id": 40, - "code": 236, - "tempChar": "" - }, - { - "order": 46, - "prevSize": 32, - "name": "icon-arrow-tall-up", - "id": 41, - "code": 237, - "tempChar": "" - }, - { - "order": 47, - "prevSize": 32, - "name": "icon-arrow-up", - "id": 42, - "code": 94, - "tempChar": "" - }, - { - "order": 48, - "prevSize": 32, - "name": "icon-arrows-out", - "id": 43, - "code": 73, - "tempChar": "" - }, - { - "order": 49, - "prevSize": 32, - "name": "icon-arrows-right-left", - "id": 44, - "code": 58893, - "tempChar": "" - }, - { - "order": 50, - "prevSize": 32, - "name": "icon-arrows-up-down", - "id": 45, - "code": 53, - "tempChar": "" - }, - { - "order": 51, - "prevSize": 32, - "name": "icon-asterisk", - "id": 46, - "code": 42, - "tempChar": "" - }, - { - "order": 52, - "prevSize": 32, - "name": "icon-autoflow-tabular", - "id": 47, - "code": 72, - "tempChar": "" - }, - { - "order": 53, - "prevSize": 32, - "name": "icon-box", - "id": 48, - "code": 224, - "tempChar": "" - }, - { - "order": 54, - "prevSize": 32, - "name": "icon-check", - "id": 49, - "code": 50, - "tempChar": "" - }, - { - "order": 55, - "prevSize": 32, - "name": "icon-clock", - "id": 50, - "code": 67, - "tempChar": "" - }, - { - "order": 56, - "prevSize": 32, - "name": "icon-connectivity", - "id": 51, - "code": 46, - "tempChar": "" - }, - { - "order": 57, - "prevSize": 32, - "name": "icon-database-query", - "id": 52, - "code": 100, - "tempChar": "" - }, - { - "order": 58, - "prevSize": 32, - "name": "icon-database", - "id": 53, - "code": 68, - "tempChar": "" - }, - { - "order": 59, - "prevSize": 32, - "name": "icon-dictionary", - "id": 54, - "code": 81, - "tempChar": "" - }, - { - "order": 60, - "prevSize": 32, - "name": "icon-duplicate", - "id": 55, - "code": 242, - "tempChar": "" - }, - { - "order": 61, - "prevSize": 32, - "name": "icon-folder-new", - "id": 56, - "code": 102, - "tempChar": "" - }, - { - "order": 62, - "prevSize": 32, - "name": "icon-folder", - "id": 57, - "code": 70, - "tempChar": "" - }, - { - "order": 63, - "prevSize": 32, - "name": "icon-fullscreen-collapse", - "id": 58, - "code": 95, - "tempChar": "" - }, - { - "order": 64, - "prevSize": 32, - "name": "icon-fullscreen-expand", - "id": 59, - "code": 122, - "tempChar": "" - }, - { - "order": 65, - "prevSize": 32, - "name": "icon-gear", - "id": 60, - "code": 71, - "tempChar": "" - }, - { - "order": 66, - "prevSize": 32, - "name": "icon-image", - "id": 61, - "code": 227, - "tempChar": "" - }, - { - "order": 67, - "prevSize": 32, - "name": "icon-layers", - "id": 62, - "code": 225, - "tempChar": "" - }, - { - "order": 68, - "prevSize": 32, - "name": "icon-layout", - "id": 63, - "code": 76, - "tempChar": "" - }, - { - "order": 69, - "prevSize": 32, - "name": "icon-line-horz", - "id": 64, - "code": 226, - "tempChar": "" - }, - { - "order": 70, - "prevSize": 32, - "name": "icon-link", - "id": 65, - "code": 244, - "tempChar": "" - }, - { - "order": 71, - "prevSize": 32, - "name": "icon-magnify-in", - "id": 66, - "code": 88, - "tempChar": "" - }, - { - "order": 72, - "prevSize": 32, - "name": "icon-magnify-out", - "id": 67, - "code": 89, - "tempChar": "" - }, - { - "order": 73, - "prevSize": 32, - "name": "icon-magnify", - "id": 68, - "code": 77, - "tempChar": "" - }, - { - "order": 74, - "prevSize": 32, - "name": "icon-menu", - "id": 69, - "code": 109, - "tempChar": "" - }, - { - "order": 75, - "prevSize": 32, - "name": "icon-move", - "id": 70, - "code": 243, - "tempChar": "" - }, - { - "order": 76, - "prevSize": 32, - "name": "icon-new-window", - "id": 71, - "code": 121, - "tempChar": "" - }, - { - "order": 77, - "prevSize": 32, - "name": "icon-object", - "id": 72, - "code": 111, - "tempChar": "" - }, - { - "order": 78, - "prevSize": 32, - "name": "icon-object-unknown", - "id": 73, - "code": 63, - "tempChar": "" - }, - { - "order": 79, - "prevSize": 32, - "name": "icon-packet", - "id": 74, - "code": 86, - "tempChar": "" - }, - { - "order": 80, - "prevSize": 32, - "name": "icon-page", - "id": 75, - "code": 234, - "tempChar": "" - }, - { - "order": 81, - "prevSize": 32, - "name": "icon-pause", - "id": 76, - "code": 241, - "tempChar": "" - }, - { - "order": 82, - "prevSize": 32, - "name": "icon-pencil", - "id": 77, - "code": 112, - "tempChar": "" - }, - { - "order": 83, - "prevSize": 32, - "name": "icon-people", - "id": 78, - "code": 79, - "tempChar": "" - }, - { - "order": 84, - "prevSize": 32, - "name": "icon-play", - "id": 79, - "code": 239, - "tempChar": "" - }, - { - "order": 85, - "prevSize": 32, - "name": "icon-plot-resource", - "id": 80, - "code": 233, - "tempChar": "" - }, - { - "order": 86, - "prevSize": 32, - "name": "icon-plus", - "id": 81, - "code": 43, - "tempChar": "" - }, - { - "order": 87, - "prevSize": 32, - "name": "icon-minus", - "id": 82, - "code": 45, - "tempChar": "" - }, - { - "order": 88, - "prevSize": 32, - "name": "icon-sine", - "id": 83, - "code": 54, - "tempChar": "" - }, - { - "order": 89, - "prevSize": 32, - "name": "icon-T", - "id": 84, - "code": 228, - "tempChar": "" - }, - { - "order": 90, - "prevSize": 32, - "name": "icon-telemetry-panel", - "id": 85, - "code": 116, - "tempChar": "" - }, - { - "order": 91, - "prevSize": 32, - "name": "icon-telemetry", - "id": 86, - "code": 84, - "tempChar": "" - }, - { - "order": 92, - "prevSize": 32, - "name": "icon-thumbs-strip", - "id": 87, - "code": 246, - "tempChar": "" - }, - { - "order": 93, - "prevSize": 32, - "name": "icon-timeline", - "id": 88, - "code": 83, - "tempChar": "" - }, - { - "order": 94, - "prevSize": 32, - "name": "icon-timer", - "id": 89, - "code": 245, - "tempChar": "" - }, - { - "order": 95, - "prevSize": 32, - "name": "icon-trash", - "id": 90, - "code": 90, - "tempChar": "" - }, - { - "order": 96, - "prevSize": 32, - "name": "icon-two-parts-both", - "id": 91, - "code": 229, - "tempChar": "" - }, - { - "order": 97, - "prevSize": 32, - "name": "icon-two-parts-one-only", - "id": 92, - "code": 231, - "tempChar": "" - }, - { - "order": 98, - "prevSize": 32, - "name": "icon-x-heavy", - "id": 93, - "code": 120, - "tempChar": "" - }, - { - "order": 99, - "prevSize": 32, - "name": "icon-x", - "id": 94, - "code": 58946, - "tempChar": "" - } - ], - "metadata": { - "name": "Open MCT UI Symbols", - "importSize": { - "width": 512, - "height": 512 - }, - "designer": "Charles Hacskaylo", - "iconsHash": 1484196519 - }, - "height": 1024, - "prevSize": 32, - "icons": [ - { - "id": 95, - "paths": [ - "M832 576v255.66l-0.34 0.34-639.66-0.34v-255.66h-192v256c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-256h-192z", - "M512 640l448-448h-256v-192h-384v192h-256l448 448z" - ], - "attrs": [ - { - "fill": "rgb(0, 161, 75)" - }, - { - "fill": "rgb(0, 161, 75)" - } - ], - "isMulticolor": false, - "grid": 0, - "tags": [ - "icon-download" - ], - "colorPermutations": { - "11617516161751": [ - 1, - 1 - ] - } - }, - { - "paths": [ - "M128 768v-576c-70.606 0.215-127.785 57.394-128 127.979l-0 576.021c0.215 70.606 57.394 127.785 127.979 128l576.021 0c70.606-0.215 127.785-57.394 128-127.979l-576-0.021c-70.606-0.215-127.785-57.394-128-127.979z", - "M896 0h-576c-70.606 0.215-127.785 57.394-128 127.979l-0 576.021c0.215 70.606 57.394 127.785 127.979 128l576.021 0c70.606-0.215 127.785-57.394 128-127.979l0-576.021c-0.215-70.606-57.394-127.785-127.979-128zM256 192h192v128h-192v-128zM256 384h192v192h-192v-192zM320 768c-35.26-0.214-63.786-28.74-64-63.98l-0-64.020h192v128h-128zM512 768v-128h192v128h-192zM960 704c-0.214 35.26-28.74 63.786-63.98 64l-128.020 0v-128h192v64zM960 576h-448v-384h448v384z", - "M832 480c0.002 0 0.005 0 0.007 0 17.673 0 32-14.327 32-32 0-14.055-9.062-25.994-21.662-30.293l-74.345-24.767v-104.94c0-17.673-14.327-32-32-32s-32 14.327-32 32v151.060l117.88 39.3c3.018 1.040 6.495 1.64 10.113 1.64 0.003 0 0.005-0 0.008-0z" - ], - "attrs": [ - { - "fill": "rgb(0, 161, 75)" - }, - { - "fill": "rgb(0, 161, 75)" - }, - { - "fill": "rgb(0, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-tabular-lad-set" - ], - "colorPermutations": { - "16161751": [], - "11617516161751": [ - 1, - 1, - 1 - ] - }, - "defaultCode": 58914, - "id": 1 - }, - { - "paths": [ - "M896 0h-768c-70.606 0.215-127.785 57.394-128 127.979l-0 768.021c0.215 70.606 57.394 127.785 127.979 128l768.021 0c70.606-0.215 127.785-57.394 128-127.979l0-768.021c-0.215-70.606-57.394-127.785-127.979-128zM64 256h256v192h-256v-192zM64 512h256v192h-256v-192zM128 960c-35.26-0.214-63.786-28.74-64-63.98l-0-128.020h256v192h-192zM384 960v-192h256v192h-256zM960 896c-0.214 35.26-28.74 63.786-63.98 64l-192.020 0v-192h256v128zM960 512v192h-576v-192h64v-64h-64v-192h576v192h-64v64h64z", - "M782.32 547.38l-110.32-55.16v-172.22c0-17.673-14.327-32-32-32s-32 14.327-32 32v211.78l145.68 72.84c4.172 2.133 9.1 3.383 14.32 3.383 17.675 0 32.003-14.328 32.003-32.003 0-12.454-7.114-23.247-17.501-28.536z" - ], - "attrs": [ - { - "fill": "rgb(0, 161, 75)" - }, - { - "fill": "rgb(0, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-tabular-lad" - ], - "colorPermutations": { - "16161751": [], - "11617516161751": [ - 1, - 1 - ] - }, - "defaultCode": 58913, - "id": 2 - }, - { - "paths": [ - "M896 0h-768c-70.606 0.215-127.785 57.394-128 127.979l-0 768.021c0.215 70.606 57.394 127.785 127.979 128l768.021 0c70.606-0.215 127.785-57.394 128-127.979l0-768.021c-0.215-70.606-57.394-127.785-127.979-128zM448 292l25.060 25.32c7.916 7.922 18.856 12.822 30.94 12.822s23.024-4.9 30.94-12.822l75.5-76.3c29.97-30.338 71.571-49.128 117.56-49.128s87.59 18.79 117.544 49.112l50.456 50.997v152.2c-24.111-8.83-44.678-22.255-61.542-39.342l-75.518-76.318c-7.916-7.922-18.856-12.822-30.94-12.822s-23.024 4.9-30.94 12.822l-75.5 76.3c-29.971 30.343-71.575 49.137-117.568 49.137-20.084 0-39.331-3.584-57.137-10.146l1.145-151.831zM320 960h-192c-35.26-0.214-63.786-28.74-64-63.98l-0-128.020h256v192zM320 704h-256v-192h256v192zM320 448h-256v-192h256v192zM640 960h-256v-192h256v192zM448 636.62v-174.5c1.88 1.74 3.74 3.5 5.56 5.34l75.5 76.3c7.916 7.922 18.856 12.822 30.94 12.822s23.024-4.9 30.94-12.822l75.5-76.3c29.966-30.333 71.56-49.119 117.542-49.119 43.28 0 82.673 16.644 112.128 43.879l-0.11 174.399c-1.88-1.74-3.74-3.5-5.56-5.34l-75.5-76.3c-7.916-7.922-18.856-12.822-30.94-12.822s-23.024 4.9-30.94 12.822l-75.5 76.3c-29.966 30.333-71.56 49.119-117.542 49.119-43.28 0-82.673-16.644-112.128-43.879zM960 896c-0.214 35.26-28.74 63.786-63.98 64l-192.020 0v-192h256v128z" - ], - "attrs": [ - { - "fill": "rgb(0, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-tabular-realtime-v2" - ], - "colorPermutations": { - "16161751": [], - "11617516161751": [ - 1 - ] - }, - "defaultCode": 58912, - "id": 3 - }, - { - "paths": [ - "M832 752c0 44-36 80-80 80h-480c-44 0-80-36-80-80v-480c0-44 36-80 80-80h480c44 0 80 36 80 80v480z" - ], - "grid": 0, - "tags": [ - "icon-bullet" - ], - "defaultCode": 58905, - "id": 4, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M635.6 524.4c6.6 4.2 13.2 8.6 19.2 13.6l120.4 96.4c29.6 23.8 83.8 23.8 113.4 0l135.2-108c0.2-4.8 0.2-9.4 0.2-14.2 0-52.2-7.8-102.4-22.2-149.8l-154.8 123.6c-58.2 46.6-140.2 59.2-211.4 38.4z", - "M248.6 634.2l120.4-96.4c58-46.4 140-59.2 211.2-38.4-6.6-4.2-13.2-8.6-19.2-13.6l-120.4-96.4c-29.6-23.8-83.8-23.8-113.4 0l-120.2 96.6c-40 32-91.4 48-143 48-21.6 0-43-2.8-63.8-8.4 0 0.6 0 1.2 0 1.6 5 3.4 10 6.8 14.6 10.6l120.4 96.4c29.8 23.8 83.8 23.8 113.4 0z", - "M120.6 378.2l120.4-96.4c80.2-64.2 205.6-64.2 285.8 0l120.4 96.4c29.6 23.8 83.8 23.8 113.4 0l181-144.8c-91.2-140.4-249.6-233.4-429.6-233.4-238.6 0-439.2 163.2-496 384.2 30.8 17.6 77.8 15.6 104.6-6z", - "M689 742l-120.4-96.4c-29.6-23.8-83.8-23.8-113.4 0l-120.2 96.4c-40 32-91.4 48-143 48-47.8 0-95.4-13.8-134.2-41.4 85.6 163.6 256.8 275.4 454.2 275.4s368.6-111.8 454.2-275.4c-80.4 57.4-199.8 55.2-277.2-6.6z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-session" - ], - "colorPermutations": { - "16161751": [ - 1, - 1, - 1, - 1 - ], - "11617516161751": [ - 2, - 2, - 2, - 2 - ] - }, - "defaultCode": 58904, - "id": 5 - }, - { - "paths": [ - "M454.36 476.64l86.3-86.3c9.088-8.965 21.577-14.502 35.36-14.502s26.272 5.537 35.366 14.507l86.294 86.294c19.328 19.358 42.832 34.541 69.047 44.082l1.313-171.722-57.64-57.64c-34.407-34.33-81.9-55.558-134.35-55.558s-99.943 21.228-134.354 55.562l-86.296 86.297c-9.088 8.965-21.577 14.502-35.36 14.502s-26.272-5.537-35.366-14.507l-28.674-28.654v172.14c19.045 7.022 41.040 11.084 63.984 11.084 52.463 0 99.966-21.239 134.379-55.587z", - "M505.64 547.36l-86.3 86.3c-9.088 8.965-21.577 14.502-35.36 14.502s-26.272-5.537-35.366-14.507l-86.294-86.294c-2-2-4.2-4-6.36-6v197.36c33.664 30.72 78.65 49.537 128.031 49.537 52.44 0 99.923-21.22 134.333-55.541l86.296-86.296c9.088-8.965 21.577-14.502 35.36-14.502s26.272 5.537 35.366 14.507l86.294 86.294c2 2 4.2 4 6.36 6v-197.36c-33.664-30.72-78.65-49.537-128.031-49.537-52.44 0-99.923 21.22-134.333 55.541z", - "M832 0h-128v192h127.66l0.34 0.34v639.32l-0.34 0.34h-127.66v192h128c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z", - "M320 832h-127.66l-0.34-0.34v-639.32l0.34-0.34h127.66v-192h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192z" - ], - "grid": 0, - "tags": [ - "icon-topic" - ], - "defaultCode": 58903, - "id": 6, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 64c-261 0-480.6 195.4-512 448 31.4 252.6 251 448 512 448s480.6-195.4 512-448c-31.4-252.6-251-448-512-448zM768.2 734.6c-71.4 62.8-162.8 97.4-257.6 97.4s-186.2-34.6-257.6-97.4c-66.6-58.6-110.6-137.2-125-222.6 0 0 0-0.2 0-0.2 76.8-154 220.8-257.6 384-257.6s307.2 103.8 384 257.6c0 0 0 0.2 0 0.2-14.4 85.4-61.2 164-127.8 222.6z", - "M512 288c-123.8 0-224 100.2-224 224s100.2 224 224 224 224-100.2 224-224-100.2-224-224-224zM576 544c-53 0-96-43-96-96s43-96 96-96 96 43 96 96c0 53-43 96-96 96z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-eye-open-no-gleam" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58902, - "id": 7 - }, - { - "paths": [ - "M512 64c-261 0-480.6 195.4-512 448 31.4 252.6 251 448 512 448s480.6-195.4 512-448c-31.4-252.6-251-448-512-448zM768.2 734.6c-71.4 62.8-162.8 97.4-257.6 97.4s-186.2-34.6-257.6-97.4c-66.6-58.6-110.6-137.2-125-222.6 0 0 0-0.2 0-0.2 76.8-154 220.8-257.6 384-257.6s307.2 103.8 384 257.6c0 0 0 0.2 0 0.2-14.4 85.4-61.2 164-127.8 222.6z", - "M512 288c-123.8 0-224 100.2-224 224s100.2 224 224 224 224-100.2 224-224-100.2-224-224-224z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-crosshair" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58901, - "id": 8 - }, - { - "paths": [ - "M256 0h-256v1024h256c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z", - "M512 320l512 320v-640z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - }, - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-collapse-pane-left" - ], - "colorPermutations": { - "16161751": [ - 0, - 0 - ], - "125525525516161751": [ - 0, - 0 - ], - "11617516161751": [ - 0, - 0 - ] - }, - "defaultCode": 58899, - "id": 9 - }, - { - "paths": [ - "M768 0h256v1024h-256c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192z", - "M512 320l-512 320v-640z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - }, - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-collapse-pane-right" - ], - "colorPermutations": { - "16161751": [ - 0, - 0 - ], - "125525525516161751": [ - 0, - 0 - ], - "11617516161751": [ - 0, - 0 - ] - }, - "defaultCode": 58900, - "id": 10 - }, - { - "paths": [ - "M192.2 576c-0.2 0-0.2 0 0 0l-0.2 448h640v-447.8c0 0 0 0-0.2-0.2h-639.6z", - "M978.8 210.8l-165.4-165.4c-25-25-74.2-45.4-109.4-45.4h-576c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128v-448c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v448c70.4 0 128-57.6 128-128v-576c0-35.2-20.4-84.4-45.2-109.2zM704 256c0 35.2-28.8 64-64 64h-448c-35.2 0-64-28.8-64-64v-192h320v192h128v-192h128v192z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - }, - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-save-v2" - ], - "colorPermutations": { - "16161751": [ - 0, - 0 - ], - "125525525516161751": [ - 0, - 0 - ], - "11617516161751": [ - 0, - 0 - ] - }, - "defaultCode": 58898, - "id": 11 - }, - { - "paths": [ - "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", - "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM320 896h-128v-320h128v320zM576 896h-128v-320h128v320zM832 896h-128v-320h128v320z" - ], - "grid": 0, - "tags": [ - "icon-dataset" - ], - "defaultCode": 58897, - "id": 12, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 1024c106 0 192-86 192-192h-384c0 106 86 192 192 192z", - "M896 448v-64c0-212-172-384-384-384s-384 172-384 384v64c0 70.6-57.4 128-128 128v128h1024v-128c-70.6 0-128-57.4-128-128z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-bell" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58896, - "id": 13 - }, - { - "paths": [ - "M1024 0h-1024c0 282.8 229.2 512 512 512s512-229.2 512-512zM512 384c-102.6 0-199-40-271.6-112.4-41.2-41.2-72-90.2-90.8-143.6h724.6c-18.8 53.4-49.6 102.4-90.8 143.6-72.4 72.4-168.8 112.4-271.4 112.4z", - "M512 512c-282.8 0-512 229.2-512 512h1024c0-282.8-229.2-512-512-512z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-hourglass" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58889, - "id": 14 - }, - { - "paths": [ - "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM512 128c70.6 0 128 57.4 128 128s-57.4 128-128 128c-70.6 0-128-57.4-128-128s57.4-128 128-128zM704 832h-384v-128h64v-256h256v256h64v128z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-info-v1.5" - ], - "colorPermutations": { - "16161751": [ - 0 - ], - "125525525516161751": [ - 0 - ], - "11617516161751": [ - 0 - ] - }, - "defaultCode": 58888, - "id": 15 - }, - { - "paths": [ - "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM832 704l-128 128-192-192-192 192-128-128 192-192-192-192 128-128 192 192 192-192 128 128-192 192 192 192z" - ], - "grid": 0, - "tags": [ - "icon-x-in-circle" - ], - "defaultCode": 58887, - "id": 16, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", - "M512 512c-282.8 0-512-86-512-192v512c0 106 229.2 192 512 192s512-86 512-192v-512c0 106-229.2 192-512 192zM896 575v256c-36.6 15.6-79.8 28.8-128 39.4v-256c48.2-10.6 91.4-23.8 128-39.4zM256 614.4v256c-48.2-10.4-91.4-23.8-128-39.4v-256c36.6 15.6 79.8 28.8 128 39.4zM384 890v-256c41 4 83.8 6 128 6s87-2.2 128-6v256c-41 4-83.8 6-128 6s-87-2.2-128-6z" - ], - "attrs": [ - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - } - ], - "grid": 0, - "tags": [ - "icon-datatable" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58881, - "id": 17 - }, - { - "paths": [ - "M64 0c-35.2 0-64 28.8-64 64v192h448v-256h-384z", - "M1024 256v-192c0-35.2-28.8-64-64-64h-384v256h448z", - "M0 384v192c0 35.2 28.8 64 64 64h384v-256h-448z", - "M960 640c35.2 0 64-28.8 64-64v-192h-448v256h384z", - "M512 1024l-256-256h512z" - ], - "attrs": [ - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - } - ], - "grid": 0, - "tags": [ - "icon-tabular-scrolling" - ], - "colorPermutations": { - "16161751": [ - 1, - 1, - 1, - 1, - 1 - ], - "125525525516161751": [ - 1, - 1, - 1, - 1, - 1 - ], - "11617516161751": [ - 2, - 2, - 2, - 2, - 2 - ] - }, - "defaultCode": 58882, - "id": 18 - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-tabular" - ], - "colorPermutations": { - "16161751": [ - 1 - ], - "11617516161751": [ - 2 - ] - }, - "defaultCode": 58884, - "id": 19 - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" - ], - "attrs": [ - { - "fill": "rgb(6,161,75)", - "opacity": 1 - } - ], - "grid": 0, - "tags": [ - "icon-calendar" - ], - "colorPermutations": { - "16161751": [ - 1 - ], - "125525525516161751": [ - 1 - ], - "11617516161751": [ - 2 - ] - }, - "defaultCode": 58885, - "id": 20 - }, - { - "paths": [ - "M544 224v224c0 88.4-71.6 160-160 160s-160-71.6-160-160v-97.2l-197.4 196.4c-50 50-12.4 215.2 112.4 340s290 162.4 340 112.4l417-423.6-352-352z", - "M896 1024c70.6 0 128-57.4 128-128 0-108.6-128-192-128-192s-128 83.4-128 192c0 70.6 57.4 128 128 128z", - "M384 512c-35.4 0-64-28.6-64-64v-384c0-35.4 28.6-64 64-64s64 28.6 64 64v384c0 35.4-28.6 64-64 64z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-paint-bucket" - ], - "colorPermutations": { - "16161751": [ - 1, - 1, - 1 - ], - "125525525516161751": [ - 1, - 1, - 1 - ], - "11617516161751": [ - 2, - 2, - 2 - ] - }, - "defaultCode": 58886, - "id": 21 - }, - { - "paths": [ - "M510 1024l-256-512 256-512h-256l-256 512 256 512z" - ], - "width": 512, - "grid": 0, - "tags": [ - "icon-pointer-left" - ], - "defaultCode": 123, - "id": 22, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M-2 0l256 512-256 512h256l256-512-256-512z" - ], - "width": 512, - "grid": 0, - "tags": [ - "icon-pointer-right" - ], - "defaultCode": 125, - "id": 23, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M768 256c0 105.6-86.4 192-192 192h-128c-105.6 0-192-86.4-192-192v-64c0-105.6 86.4-192 192-192h128c105.6 0 192 86.4 192 192v64z", - "M64 1024v-192c0-140.8 115.2-256 256-256h384c140.8 0 256 115.2 256 256v192z" - ], - "grid": 0, - "tags": [ - "icon-person" - ], - "defaultCode": 80, - "id": 24, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M958.4 65.6c-43.8-43.8-101-65.6-158.4-65.6s-114.6 21.8-158.4 65.6l-128 128c-74 74-85.4 187-34 273l-12.8 12.8c-35.4-20.8-75-31.4-114.8-31.4-57.4 0-114.6 21.8-158.4 65.6l-128 128c-87.4 87.4-87.4 229.4 0 316.8 43.8 43.8 101 65.6 158.4 65.6s114.6-21.8 158.4-65.6l128-128c74-74 85.4-187 34-273l12.8-12.8c35.2 21 75 31.6 114.6 31.6 57.4 0 114.6-21.8 158.4-65.6l128-128c87.6-87.6 87.6-229.6 0.2-317zM419.8 739.8l-128 128c-18 18.2-42.2 28.2-67.8 28.2s-49.8-10-67.8-28.2c-37.4-37.4-37.4-98.4 0-135.8l128-128c18.2-18.2 42.2-28.2 67.8-28.2 5.6 0 11.2 0.6 16.8 1.4l-55.6 55.6c-10.4 10.4-16.2 24.2-16.2 38.8s5.8 28.6 16.2 38.8c10.4 10.4 24.2 16.2 38.8 16.2s28.6-5.8 38.8-16.2l55.6-55.6c5.4 30.4-3.6 62.2-26.6 85zM867.8 291.8l-128 128c-18 18.2-42.2 28.2-67.8 28.2-5.6 0-11.2-0.6-16.8-1.4l55.6-55.6c10.4-10.4 16.2-24.2 16.2-38.8s-5.8-28.6-16.2-38.8c-10.4-10.4-24.2-16.2-38.8-16.2s-28.6 5.8-38.8 16.2l-55.6 55.6c-5.2-29.8 3.6-61.6 26.6-84.6l128-128c18-18.4 42.2-28.4 67.8-28.4s49.8 10 67.8 28.2c37.6 37.4 37.6 98.2 0 135.6z" - ], - "grid": 0, - "tags": [ - "icon-chain-links" - ], - "defaultCode": 232, - "id": 25, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M768 352c0 53.019-114.615 96-256 96s-256-42.981-256-96c0-53.019 114.615-96 256-96s256 42.981 256 96z", - "M768 672v-256c0 53-114.6 96-256 96s-256-43-256-96v256c0 53 114.6 96 256 96s256-43 256-96z", - "M832 0h-128v192h127.6c0.2 0 0.2 0.2 0.4 0.4v639.4c0 0.2-0.2 0.2-0.4 0.4h-127.6v192h128c105.6 0 192-86.4 192-192v-640.2c0-105.6-86.4-192-192-192z", - "M192 831.6v-639.4c0-0.2 0.2-0.2 0.4-0.4h127.6v-191.8h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192h-127.6c-0.2 0-0.4-0.2-0.4-0.4z" - ], - "grid": 0, - "tags": [ - "icon-database-in-brackets" - ], - "defaultCode": 115, - "id": 26, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1012.8 414.2v-391.6l-127.6 127.4c-96.6-96.8-225.2-150-362-150s-265.2 53.2-362 150c-96.8 96.8-150 225.2-150 362s53.2 265.4 150 362c96.8 96.8 225.2 150 362 150s265.4-53.2 362-150l-136.6-136.6c-124.2 124.2-326.4 124.2-450.8 0-124.2-124.2-124.2-326.4 0-450.8 124.2-124.2 326.4-124.2 450.8 0l-127.4 127.4h391.6z" - ], - "grid": 0, - "tags": [ - "icon-refresh" - ], - "defaultCode": 114, - "id": 27, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M832 384h-32v-96c0-158.8-129.2-288-288-288s-288 129.2-288 288v96h-32c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h640c70.4 0 128-57.6 128-128v-384c0-70.4-57.6-128-128-128zM416 288c0-53 43-96 96-96s96 43 96 96v96h-192v-96z" - ], - "grid": 0, - "tags": [ - "icon-lock" - ], - "defaultCode": 108, - "id": 28, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M640 256h-256c-70.4 0-128 57.6-128 128v256c0 70.4 57.6 128 128 128h256c70.4 0 128-57.6 128-128v-256c0-70.4-57.6-128-128-128z", - "M0 0h192v192h-192v-192z", - "M256 0h192v128h-192v-128z", - "M576 0h192v128h-192v-128z", - "M256 896h192v128h-192v-128z", - "M576 896h192v128h-192v-128z", - "M0 576h128v192h-128v-192z", - "M0 256h128v192h-128v-192z", - "M896 576h128v192h-128v-192z", - "M896 256h128v192h-128v-192z", - "M832 0h192v192h-192v-192z", - "M0 832h192v192h-192v-192z", - "M832 832h192v192h-192v-192z" - ], - "grid": 0, - "tags": [ - "icon-box-with-dashed-lines" - ], - "defaultCode": 51, - "id": 29, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M894-2h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h400c-2.2-3.8-4-7.6-5.8-11.4l-255.2-576.8c-21.4-48.4-10.8-105 26.6-142.4 24.4-24.4 57.2-37.4 90.4-37.4 17.4 0 35.2 3.6 51.8 11l576.6 255.4c4 1.8 7.8 3.8 11.4 5.8v-400.2c0.2-70.4-57.4-128-127.8-128z", - "M958.6 637.4l-576.6-255.4 255.4 576.6 64.6-128.6 192 192 128-128-192-192z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - }, - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-box-with-arrow-cursor" - ], - "colorPermutations": { - "16161751": [ - 0, - 0 - ], - "125525525516161751": [ - 0, - 0 - ], - "11617516161751": [ - 0, - 0 - ] - }, - "defaultCode": 58880, - "id": 30 - }, - { - "paths": [ - "M512 0c-214.866 0-398.786 132.372-474.744 320h90.744c56.86 0 107.938 24.724 143.094 64h240.906l-192-192h256l320 320-320 320h-256l192-192h-240.906c-35.156 39.276-86.234 64-143.094 64h-90.744c75.958 187.628 259.878 320 474.744 320 282.77 0 512-229.23 512-512s-229.23-512-512-512z" - ], - "grid": 0, - "tags": [ - "icon-activity-mode" - ], - "defaultCode": 65, - "id": 31, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M576 64h-256l320 320h-290.256c-44.264-76.516-126.99-128-221.744-128h-128v512h128c94.754 0 177.48-51.484 221.744-128h290.256l-320 320h256l448-448-448-448z" - ], - "grid": 0, - "tags": [ - "icon-activity" - ], - "defaultCode": 97, - "id": 32, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M832 0h-640c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192zM640 832c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-64c0-35.2 28.8-64 64-64h128c35.2 0 64 28.8 64 64v64zM696.062 191.506l-48.124 384.988c-4.366 34.928-36.738 63.506-71.938 63.506h-128c-35.2 0-67.572-28.578-71.938-63.506l-48.124-384.988c-4.366-34.928 20.862-63.506 56.062-63.506h256c35.2 0 60.428 28.578 56.062 63.506z" - ], - "grid": 0, - "tags": [ - "icon-alert-rect" - ], - "defaultCode": 33, - "id": 33, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M998.208 848.864l-422.702-739.728c-34.928-61.124-92.084-61.124-127.012 0l-422.702 739.728c-34.928 61.126-5.906 111.136 64.494 111.136h843.428c70.4 0 99.422-50.010 64.494-111.136zM512 832c-35.2 0-64-28.8-64-64s28.8-64 64-64 64 28.8 64 64c0 35.2-28.8 64-64 64zM627.448 382.758l-38.898 194.486c-6.902 34.516-41.35 62.756-76.55 62.756s-69.648-28.24-76.552-62.758l-38.898-194.486c-6.902-34.516 16.25-62.756 51.45-62.756h128c35.2 0 58.352 28.24 51.448 62.758z" - ], - "grid": 0, - "tags": [ - "icon-alert-triangle" - ], - "defaultCode": 58883, - "id": 34, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M510 510l-512-512h1024z", - "M510 1022l-512-512h1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-double-down" - ], - "defaultCode": 238, - "id": 35, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M510 510l512 512h-1024z", - "M510-2l512 512h-1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-double-up" - ], - "defaultCode": 235, - "id": 36, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 768l512-512h-1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-down" - ], - "defaultCode": 118, - "id": 37, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M256 512l512 512v-1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-left" - ], - "defaultCode": 60, - "id": 38, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M768 512l-512-512v1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-right" - ], - "defaultCode": 62, - "id": 39, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 1024l-512-1024h1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-tall-down" - ], - "defaultCode": 236, - "id": 40, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 0l512 1024h-1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-tall-up" - ], - "defaultCode": 237, - "id": 41, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 256l-512 512h1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-up" - ], - "defaultCode": 94, - "id": 42, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M0 512l256 256v-512z", - "M512 0l-256 256h512z", - "M512 1024l256-256h-512z", - "M768 256v512l256-256z" - ], - "grid": 0, - "tags": [ - "icon-arrows-out" - ], - "defaultCode": 73, - "id": 43, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 512l-448 512v-1024z", - "M448 0l-448 512 448 512z" - ], - "grid": 0, - "tags": [ - "icon-arrows-right-left" - ], - "defaultCode": 58893, - "id": 44, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 0l512 448h-1024z", - "M0 576l512 448 512-448z" - ], - "grid": 0, - "tags": [ - "icon-arrows-up-down" - ], - "defaultCode": 53, - "id": 45, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1004.166 340.458l-97.522-168.916-330.534 229.414 33.414-400.956h-195.048l33.414 400.956-330.534-229.414-97.522 168.916 363.944 171.542-363.944 171.542 97.522 168.916 330.534-229.414-33.414 400.956h195.048l-33.414-400.956 330.534 229.414 97.522-168.916-363.944-171.542z" - ], - "grid": 0, - "tags": [ - "icon-asterisk" - ], - "defaultCode": 42, - "id": 46, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M192 0c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h64v-1024h-64z", - "M384 0h256v1024h-256v-1024z", - "M832 0h-64v704h256v-512c0-105.6-86.4-192-192-192z" - ], - "grid": 0, - "tags": [ - "icon-autoflow-tabular" - ], - "defaultCode": 72, - "id": 47, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M0 0h1024v1024h-1024v-1024z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-box-round-corners" - ], - "colorPermutations": { - "16161751": [ - 0 - ], - "125525525516161751": [ - 0 - ], - "11617516161751": [ - 0 - ] - }, - "defaultCode": 224, - "id": 48 - }, - { - "paths": [ - "M1024 0l-640 640-384-384v384l384 384 640-640z" - ], - "grid": 0, - "tags": [ - "icon-check" - ], - "defaultCode": 50, - "id": 49, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM768 576h-256c-35.2 0-64-28.8-64-64v-384c0-35.2 28.8-64 64-64s64 28.8 64 64v320h192c35.2 0 64 28.8 64 64s-28.8 64-64 64z" - ], - "grid": 0, - "tags": [ - "icon-clock" - ], - "defaultCode": 67, - "id": 50, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M704 576c0 70.4-57.6 128-128 128h-128c-70.4 0-128-57.6-128-128v-128c0-70.4 57.6-128 128-128h128c70.4 0 128 57.6 128 128v128z", - "M1024 512l-192-320v640z", - "M0 512l192-320v640z" - ], - "grid": 0, - "tags": [ - "icon-connectivity" - ], - "defaultCode": 46, - "id": 51, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M683.52 819.286c-50.782 28.456-109.284 44.714-171.52 44.714-194.094 0-352-157.906-352-352s157.906-352 352-352 352 157.906 352 352c0 62.236-16.258 120.738-44.714 171.52l191.692 191.692c8.516-13.89 13.022-28.354 13.022-43.212v-640c0-106.038-229.23-192-512-192s-512 85.962-512 192v640c0 106.038 229.23 192 512 192 126.11 0 241.548-17.108 330.776-45.46l-159.256-159.254z", - "M352 512c0 88.224 71.776 160 160 160s160-71.776 160-160-71.776-160-160-160-160 71.776-160 160z" - ], - "grid": 0, - "tags": [ - "icon-database-query" - ], - "defaultCode": 100, - "id": 52, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", - "M512 512c-282.77 0-512-85.962-512-192v512c0 106.038 229.23 192 512 192s512-85.962 512-192v-512c0 106.038-229.23 192-512 192z" - ], - "grid": 0, - "tags": [ - "icon-database" - ], - "defaultCode": 68, - "id": 53, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M832 640c105.6 0 192-86.4 192-192v-256c0-105.6-86.4-192-192-192v320l-128-64-128 64v-320h-384c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-192c0 105.6-86.4 192-192 192h-640v-192h640z" - ], - "grid": 0, - "tags": [ - "icon-dictionary" - ], - "defaultCode": 81, - "id": 54, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M640 256v-128c0-70.4-57.6-128-128-128h-384c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h128v-139.6c0-134.8 109.6-244.4 244.4-244.4h139.6z", - "M896 384h-384c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h384c70.4 0 128-57.6 128-128v-384c0-70.4-57.6-128-128-128z" - ], - "grid": 0, - "tags": [ - "icon-duplicate" - ], - "defaultCode": 242, - "id": 55, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", - "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM704 800h-128v128h-128v-128h-128v-128h128v-128h128v128h128v128z" - ], - "grid": 0, - "tags": [ - "icon-folder-new" - ], - "defaultCode": 102, - "id": 56, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", - "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128z" - ], - "grid": 0, - "tags": [ - "icon-folder" - ], - "defaultCode": 70, - "id": 57, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M191.656 832c0.118 0.1 0.244 0.224 0.344 0.344v191.656h192v-192c0-105.6-86.4-192-192-192h-192v192h191.656z", - "M192 191.656c-0.1 0.118-0.224 0.244-0.344 0.344h-191.656v192h192c105.6 0 192-86.4 192-192v-192h-192v191.656z", - "M832 384h192v-192h-191.656c-0.118-0.1-0.244-0.226-0.344-0.344v-191.656h-192v192c0 105.6 86.4 192 192 192z", - "M832 832.344c0.1-0.118 0.224-0.244 0.344-0.344h191.656v-192h-192c-105.6 0-192 86.4-192 192v192h192v-191.656z" - ], - "grid": 0, - "tags": [ - "icon-fullscreen-collapse" - ], - "defaultCode": 95, - "id": 58, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M192.344 832c-0.118-0.1-0.244-0.224-0.344-0.344v-191.656h-192v192c0 105.6 86.4 192 192 192h192v-192h-191.656z", - "M192 192.344c0.1-0.118 0.224-0.244 0.344-0.344h191.656v-192h-192c-105.6 0-192 86.4-192 192v192h192v-191.656z", - "M832 0h-192v192h191.656c0.118 0.1 0.244 0.226 0.344 0.344v191.656h192v-192c0-105.6-86.4-192-192-192z", - "M832 831.656c-0.1 0.118-0.224 0.244-0.344 0.344h-191.656v192h192c105.6 0 192-86.4 192-192v-192h-192v191.656z" - ], - "grid": 0, - "tags": [ - "icon-fullscreen-expand" - ], - "defaultCode": 122, - "id": 59, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 576v-128l-140.976-35.244c-8.784-32.922-21.818-64.106-38.504-92.918l74.774-124.622-90.51-90.51-124.622 74.774c-28.812-16.686-59.996-29.72-92.918-38.504l-35.244-140.976h-128l-35.244 140.976c-32.922 8.784-64.106 21.818-92.918 38.504l-124.622-74.774-90.51 90.51 74.774 124.622c-16.686 28.812-29.72 59.996-38.504 92.918l-140.976 35.244v128l140.976 35.244c8.784 32.922 21.818 64.106 38.504 92.918l-74.774 124.622 90.51 90.51 124.622-74.774c28.812 16.686 59.996 29.72 92.918 38.504l35.244 140.976h128l35.244-140.976c32.922-8.784 64.106-21.818 92.918-38.504l124.622 74.774 90.51-90.51-74.774-124.622c16.686-28.812 29.72-59.996 38.504-92.918l140.976-35.244zM704 512c0 106.038-85.962 192-192 192s-192-85.962-192-192 85.962-192 192-192 192 85.962 192 192z" - ], - "grid": 0, - "tags": [ - "icon-gear" - ], - "defaultCode": 71, - "id": 60, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM896 896h-768v-768h768v768z", - "M320 256l-128 128v448h640v-320l-128-128-128 128z" - ], - "grid": 0, - "tags": [ - "icon-image" - ], - "defaultCode": 227, - "id": 61, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 384l-512-384-512 384 512 384z", - "M512 896l-426.666-320-85.334 64 512 384 512-384-85.334-64z" - ], - "grid": 0, - "tags": [ - "icon-layers" - ], - "defaultCode": 225, - "id": 62, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M448 0h-256c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h256v-1024z", - "M832 0h-256v577.664h448v-385.664c0-105.6-86.4-192-192-192z", - "M576 1024h256c105.6 0 192-86.4 192-192v-129.664h-448v321.664z" - ], - "grid": 0, - "tags": [ - "icon-layout" - ], - "defaultCode": 76, - "id": 63, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M64 576c-35.346 0-64-28.654-64-64s28.654-64 64-64h896c35.346 0 64 28.654 64 64s-28.654 64-64 64h-896z" - ], - "grid": 0, - "tags": [ - "icon-line-horz" - ], - "defaultCode": 226, - "id": 64, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 512l-512-512v307.2l-512 204.8v256h512v256z" - ], - "grid": 0, - "tags": [ - "icon-link" - ], - "defaultCode": 244, - "id": 65, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M640 384h-128v-128h-128v128h-128v128h128v128h128v-128h128z", - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" - ], - "grid": 0, - "tags": [ - "icon-magnify-in" - ], - "defaultCode": 88, - "id": 66, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M256 384h384v128h-384v-128z", - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" - ], - "grid": 0, - "tags": [ - "icon-magnify-out" - ], - "defaultCode": 89, - "id": 67, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216-232.168 46.6-316.784 131.216-131.216 197.118-131.216 316.784 46.6 232.168 131.216 316.784 197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" - ], - "grid": 0, - "tags": [ - "icon-magnify" - ], - "defaultCode": 77, - "id": 68, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M0 0h1024v256h-1024v-256z", - "M0 384h1024v256h-1024v-256z", - "M0 768h1024v256h-1024v-256z" - ], - "grid": 0, - "tags": [ - "icon-menu" - ], - "defaultCode": 109, - "id": 69, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M293.4 512l218.6-218.6 256 256v-421.4c0-70.4-57.6-128-128-128h-512c-70.4 0-128 57.6-128 128v512c0 70.4 57.6 128 128 128h421.4l-256-256z", - "M1024 448h-128v320l-384-384-128 128 384 384h-320v128h576z" - ], - "grid": 0, - "tags": [ - "icon-move" - ], - "defaultCode": 243, - "id": 70, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M448 0v128h320l-384 384 128 128 384-384v320h128v-576z", - "M576 674.274v157.382c-0.1 0.118-0.226 0.244-0.344 0.344h-383.312c-0.118-0.1-0.244-0.226-0.344-0.344v-383.312c0.1-0.118 0.226-0.244 0.344-0.344h157.382l192-192h-349.726c-105.6 0-192 86.4-192 192v384c0 105.6 86.4 192 192 192h384c105.6 0 192-86.4 192-192v-349.726l-192 192z" - ], - "grid": 0, - "tags": [ - "icon-new-window" - ], - "defaultCode": 121, - "id": 71, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 1024l512-320v-384l-512.020-320-511.98 320v384l512 320zM512 192l358.4 224-358.4 224-358.4-224 358.4-224z" - ], - "grid": 0, - "tags": [ - "icon-object" - ], - "defaultCode": 111, - "id": 72, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M510-2l-512 320v384l512 320 512-320v-384l-512-320zM585.4 859.2c-21.2 20.8-46 30.8-76 30.8-31.2 0-56.2-9.8-76.2-29.6-20-20-29.6-44.8-29.6-76.2 0-30.4 10.2-55.2 31-76.2s45.2-31.2 74.8-31.2c29.6 0 54.2 10.4 75.6 32s31.8 46.4 31.8 76c-0.2 29-10.8 54-31.4 74.4zM638.2 546.6c-23.6 11.8-37.4 22-43.4 32.4-3.6 6.2-6 14.8-7.4 26.8v41h-161.4v-44.2c0-40.2 4.4-69.8 13-88 8-17.2 22.6-30.2 44.8-40l34.8-15.4c32-14.2 48.2-35.2 48.2-62.8 0-16-6-30.4-17.2-41.8-11.2-11.2-25.6-17.2-41.6-17.2-24 0-54.4 10-62.8 57.4l-2.2 12.2h-147l1.4-16.2c4-44.6 17-82.4 38.8-112.2 19.6-27 45.6-48.6 77-64.6s64.6-24 98.2-24c60.6 0 110.2 19.4 151.4 59.6 41.2 40 61.2 88 61.2 147.2 0 70.8-28.8 121.4-85.8 149.8z" - ], - "grid": 0, - "tags": [ - "icon-object-unknown" - ], - "defaultCode": 63, - "id": 73, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M511.98 0l-511.98 320v512c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-512l-512.020-320zM512 192l358.4 224-358.4 224-358.4-224 358.4-224z" - ], - "grid": 0, - "tags": [ - "icon-packet" - ], - "defaultCode": 86, - "id": 74, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M702 508c-105.6 0-192-86.4-192-192v-320h-320c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-320h-320z", - "M766 380h256l-384-384v256c0 70.4 57.6 128 128 128z" - ], - "grid": 0, - "tags": [ - "icon-page" - ], - "defaultCode": 234, - "id": 75, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M126-2h256v1024h-256v-1024z", - "M638-2h256v1024h-256v-1024z" - ], - "grid": 0, - "tags": [ - "icon-pause" - ], - "defaultCode": 241, - "id": 76, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M922.344 101.68c-38.612-38.596-81.306-69.232-120.304-86.324-68.848-30.25-104.77-9.078-120.194 6.344l-516.228 516.216-3.136 9.152-162.482 476.932 485.998-165.612 6.73-6.806 509.502-509.506c9.882-9.866 21.768-27.77 21.768-56.578 0.002-50.71-38.996-121.148-101.654-183.818zM237.982 855.66l-69.73-69.728 69.25-203.228 18.498-6.704h64v128h128v64l-6.846 18.506-203.172 69.154z" - ], - "grid": 0, - "tags": [ - "icon-pencil" - ], - "defaultCode": 112, - "id": 77, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M704 320h64c70.4 0 128-57.6 128-128v-64c0-70.4-57.6-128-128-128h-64c-70.4 0-128 57.6-128 128v64c0 70.4 57.6 128 128 128z", - "M256 320h64c70.4 0 128-57.6 128-128v-64c0-70.4-57.6-128-128-128h-64c-70.4 0-128 57.6-128 128v64c0 70.4 57.6 128 128 128z", - "M832 384h-192c-34.908 0-67.716 9.448-96 25.904 57.278 33.324 96 95.404 96 166.096v448h384v-448c0-105.6-86.4-192-192-192z", - "M384 384h-192c-105.6 0-192 86.4-192 192v448h576v-448c0-105.6-86.4-192-192-192z" - ], - "grid": 0, - "tags": [ - "icon-people" - ], - "defaultCode": 79, - "id": 78, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 512l-1024 512v-1024z" - ], - "grid": 0, - "tags": [ - "icon-play" - ], - "defaultCode": 239, - "id": 79, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M255.884 704c0.040-0.034 0.082-0.074 0.116-0.116v-127.884c0-70.58 57.42-128 128-128h255.884c0.040-0.034 0.082-0.074 0.116-0.116v-127.884c0-70.58 57.42-128 128-128h143.658c-93.832-117.038-237.98-192-399.658-192-282.77 0-512 229.23-512 512 0 67.904 13.25 132.704 37.256 192h218.628z", - "M768.116 320c-0.040 0.034-0.082 0.074-0.116 0.116v127.884c0 70.58-57.42 128-128 128h-255.884c-0.040 0.034-0.082 0.074-0.116 0.116v127.884c0 70.58-57.42 128-128 128h-143.658c93.832 117.038 237.98 192 399.658 192 282.77 0 512-229.23 512-512 0-67.904-13.25-132.704-37.256-192h-218.628z" - ], - "grid": 0, - "tags": [ - "icon-plot-resource" - ], - "defaultCode": 233, - "id": 80, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M960 384h-330v-320c0-35.2-28.8-64-64-64h-108c-35.2 0-64 28.8-64 64v320h-330c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h330v320c0 35.2 28.8 64 64 64h108c35.2 0 64-28.8 64-64v-320h330c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64z" - ], - "grid": 0, - "tags": [ - "icon-plus" - ], - "defaultCode": 43, - "id": 81, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M960 640c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64h-896c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h896z" - ], - "grid": 0, - "tags": [ - "icon-minus" - ], - "defaultCode": 45, - "id": 82, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1022.294 512c-1.746-7.196-3.476-14.452-5.186-21.786-20.036-85.992-53.302-208.976-98-306.538-22.42-48.938-45.298-86.556-69.946-115.006-48.454-55.93-98.176-67.67-131.356-67.67s-82.902 11.74-131.356 67.672c-24.648 28.45-47.528 66.068-69.948 115.006-44.696 97.558-77.962 220.544-98 306.538-21.646 92.898-46.444 175.138-71.71 237.836-16.308 40.46-30.222 66.358-40.6 82.604-10.378-16.246-24.292-42.142-40.6-82.604-23.272-57.75-46.144-132.088-66.524-216.052h-197.362c1.746 7.196 3.476 14.452 5.186 21.786 20.036 85.992 53.302 208.976 98 306.538 22.42 48.938 45.298 86.556 69.946 115.006 48.454 55.932 98.176 67.672 131.356 67.672s82.902-11.74 131.356-67.672c24.648-28.45 47.528-66.068 69.948-115.006 44.696-97.558 77.962-220.544 98-306.538 21.646-92.898 46.444-175.138 71.71-237.836 16.308-40.46 30.222-66.358 40.6-82.604 10.378 16.246 24.292 42.142 40.6 82.604 23.274 57.748 46.146 132.086 66.526 216.050h197.36z" - ], - "grid": 0, - "tags": [ - "icon-sine" - ], - "defaultCode": 54, - "id": 83, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M0 0v256h128v-64h256v704h-192v128h640v-128h-192v-704h256v64h128v-256z" - ], - "grid": 0, - "tags": [ - "icon-T" - ], - "defaultCode": 228, - "id": 84, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M169.2 448c14-56.4 33-122 56.6-176.8 15.4-35.8 31.2-63.2 48.2-84 18.4-22.4 49-49.2 91-49.2s72.6 26.8 91 49.2c17 20.6 32.6 48.2 48.2 84 23.6 54.8 42.8 120.4 56.6 176.8h461.2v-256c0-105.6-86.4-192-192-192h-640c-105.6 0-192 86.4-192 192v256h171.2z", - "M718.6 576h-127.2c25 93.4 48.4 144.4 63.6 168.6 15.2-24.2 38.6-75.2 63.6-168.6z", - "M301.4 448h127.2c-25-93.4-48.4-144.4-63.6-168.6-15.2 24.2-38.6 75.2-63.6 168.6z", - "M850.8 576c-14 56.4-33 122-56.6 176.8-15.4 35.8-31.2 63.2-48.2 84-18.4 22.4-49 49.2-91 49.2s-72.6-26.8-91-49.2c-17-20.6-32.6-48.2-48.2-84-23.6-54.8-42.8-120.4-56.6-176.8h-461.2v256c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-256h-171.2z" - ], - "grid": 0, - "tags": [ - "icon-telemetry-panel" - ], - "defaultCode": 116, - "id": 85, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M718.6 576h-127.2c25 93.4 48.4 144.4 63.6 168.6 15.2-24.2 38.6-75.2 63.6-168.6z", - "M794.2 752.8c-15.4 35.8-31.2 63.2-48.2 84-18.4 22.4-49 49.2-91 49.2s-72.6-26.8-91-49.2c-17-20.6-32.6-48.2-48.2-84-23.6-54.8-42.8-120.4-56.6-176.8h-457.2c31.4 252.6 247 448 508 448s476.6-195.4 508-448h-167.2c-14 56.4-33 122-56.6 176.8z", - "M301.4 448h127.2c-25-93.4-48.4-144.4-63.6-168.6-15.2 24.2-38.6 75.2-63.6 168.6z", - "M274 187.2c18.4-22.4 49-49.2 91-49.2s72.6 26.8 91 49.2c17 20.6 32.6 48.2 48.2 84 23.6 54.8 42.8 120.4 56.6 176.8h457.2c-31.4-252.6-246.8-448-508-448s-476.6 195.4-508 448h167.2c14-56.4 33-122 56.6-176.8 15.6-35.8 31.4-63.2 48.2-84z" - ], - "grid": 0, - "tags": [ - "icon-telemetry" - ], - "defaultCode": 84, - "id": 86, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M448 382c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", - "M1024 382c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", - "M448 958c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", - "M1024 958c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z" - ], - "grid": 0, - "tags": [ - "icon-thumbs-strip" - ], - "defaultCode": 246, - "id": 87, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M256 256h384v128h-384v-128z", - "M384 448h384v128h-384v-128z", - "M320 640h384v128h-384v-128z", - "M832 0h-128v192h127.6c0.2 0 0.2 0.2 0.4 0.4v639.4c0 0.2-0.2 0.2-0.4 0.4h-127.6v192h128c105.6 0 192-86.4 192-192v-640.2c0-105.6-86.4-192-192-192z", - "M192 831.6v-639.2c0-0.2 0.2-0.2 0.4-0.4h127.6v-192h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192h-127.6c-0.2 0-0.4-0.2-0.4-0.4z" - ], - "grid": 0, - "tags": [ - "icon-timeline" - ], - "defaultCode": 83, - "id": 88, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M638 62c0-35.4-28.6-64-64-64h-128c-35.4 0-64 28.6-64 64s28.6 64 64 64h128c35.4 0 64-28.6 64-64z", - "M510 126c-247.4 0-448 200.6-448 448s200.6 448 448 448 448-200.6 448-448-200.6-448-448-448zM510 574h-336c0-185.2 150.8-336 336-336v336z" - ], - "grid": 0, - "tags": [ - "icon-timer" - ], - "defaultCode": 245, - "id": 89, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M832 128h-192.36v-64c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v64h-191.64c-105.6 0-192 72-192 160s0 160 0 160h64v384c0 105.6 86.4 192 192 192h512c105.6 0 192-86.4 192-192v-384h64c0 0 0-72 0-160s-86.4-160-192-160zM320 832h-128v-384h128v384zM576 832h-128v-384h128v384zM832 832h-128v-384h128v384z" - ], - "grid": 0, - "tags": [ - "icon-trash" - ], - "defaultCode": 90, - "id": 90, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM128 128h320v768h-320v-768zM896 896h-320v-768h320v768z" - ], - "grid": 0, - "tags": [ - "icon-two-parts-both" - ], - "defaultCode": 229, - "id": 91, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM896 896h-320v-768h320v768z" - ], - "grid": 0, - "tags": [ - "icon-two-parts-one-only" - ], - "defaultCode": 231, - "id": 92, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M384 512l-365.332 365.332c-24.89 24.89-24.89 65.62 0 90.51l37.49 37.49c24.89 24.89 65.62 24.89 90.51 0 0 0 365.332-365.332 365.332-365.332l365.332 365.332c24.89 24.89 65.62 24.89 90.51 0l37.49-37.49c24.89-24.89 24.89-65.62 0-90.51l-365.332-365.332c0 0 365.332-365.332 365.332-365.332 24.89-24.89 24.89-65.62 0-90.51l-37.49-37.49c-24.89-24.89-65.62-24.89-90.51 0 0 0-365.332 365.332-365.332 365.332l-365.332-365.332c-24.89-24.89-65.62-24.89-90.51 0l-37.49 37.49c-24.89 24.89-24.89 65.62 0 90.51 0 0 365.332 365.332 365.332 365.332z" - ], - "grid": 0, - "tags": [ - "icon-x-heavy" - ], - "defaultCode": 120, - "id": 93, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M384 512l-365.332 365.332c-24.89 24.89-24.89 65.62 0 90.51l37.49 37.49c24.89 24.89 65.62 24.89 90.51 0 0 0 365.332-365.332 365.332-365.332l365.332 365.332c24.89 24.89 65.62 24.89 90.51 0l37.49-37.49c24.89-24.89 24.89-65.62 0-90.51l-365.332-365.332c0 0 365.332-365.332 365.332-365.332 24.89-24.89 24.89-65.62 0-90.51l-37.49-37.49c-24.89-24.89-65.62-24.89-90.51 0 0 0-365.332 365.332-365.332 365.332l-365.332-365.332c-24.89-24.89-65.62-24.89-90.51 0l-37.49 37.49c-24.89 24.89-24.89 65.62 0 90.51 0 0 365.332 365.332 365.332 365.332z" - ], - "grid": 0, - "tags": [ - "icon-x" - ], - "defaultCode": 58946, - "id": 94, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - } - ], - "colorThemes": [ - [ - [ - 0, - 0, - 0, - 1 - ], - [ - 0, - 161, - 75, - 1 - ], - [ - 6, - 161, - 75, - 1 - ] - ] - ], - "colorThemeIdx": 0, - "preferences": { - "showGlyphs": true, - "showQuickUse": true, - "showQuickUse2": true, - "showSVGs": true, - "fontPref": { - "prefix": "", - "metadata": { - "fontFamily": "wtdsymbols", - "majorVersion": 2, - "minorVersion": 0 - }, - "metrics": { - "emSize": 1024, - "baseline": 6.25, - "whitespace": 50 - }, - "resetPoint": 58880, - "showVersion": true, - "showSelector": true, - "selector": "class", - "classSelector": ".ui-symbol", - "showMetrics": true, - "showMetadata": true, - "embed": false - }, - "imagePref": { - "prefix": "icon-", - "png": true, - "useClassSelector": true, - "color": 4473924, - "bgColor": 16777215, - "classSelector": ".icon" - }, - "historySize": 100, - "showCodes": true, - "gridSize": 16, - "showLiga": false - }, - "id": 1, - "invisible": false - } - ], - "preferences": { - "showGlyphs": true, - "showQuickUse": true, - "showQuickUse2": true, - "showSVGs": true, - "fontPref": { - "prefix": "", - "metadata": { - "fontFamily": "wtdsymbols", - "majorVersion": 2, - "minorVersion": 0 - }, - "metrics": { - "emSize": 1024, - "baseline": 6.25, - "whitespace": 50 - }, - "resetPoint": 58880, - "showVersion": true, - "showSelector": true, - "selector": "class", - "classSelector": ".ui-symbol", - "showMetrics": true, - "showMetadata": true, - "embed": false - }, - "imagePref": { - "prefix": "icon-", - "png": true, - "useClassSelector": true, - "color": 4473924, - "bgColor": 16777215, - "classSelector": ".icon" - }, - "historySize": 100, - "showCodes": true, - "gridSize": 16, - "showLiga": false - }, - "uid": -1 -} \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot new file mode 100755 index 0000000000000000000000000000000000000000..399c1c56b8a3296cc07ef2f636c081b3d92afe64 GIT binary patch literal 1916 zcmbtVO=ufO6#ho5Kg&jr5?dn0n3ZHCr__qIQmh7ov2(Bqt!YV-!3k}$mbP+0(yEdS zGL+IoAruPrC5PagN)JIwOOHMD5PB(v-qPH1NqebNdPt#%(pcMXcGs~~LTT~9oB7`N z-kX_y^LFO_0PwjV5b$8Q3G52Vy#D4eFMXYszV-O&KW)G)Of+Dijv7j6V-79s5O0#N z63-zEjUF9_hH;sm6>QU@qe&);buvx*-JpLRD!nt9r{(|5OLw`+QG5sm^KZO$RvSM# z^#Pf0DA!9hy%GC(|1~;IQUAK4w;CKzQ2&u*uu|Q5H+^R9F7-!}+cNZWsQBHVfbtdX z3tJ=t-zwiz|AqR@R;}Hc=)wnh$Ed4Sv!sj9M4tL9)KAv*P6J~&Pkl++>w3*N`}@>8 z)UN}cM8j;gxlcC#N74>ODT-Y=pXavc2Qr^Jqxcm$F(Um2n&7sF+Y(?|%6;oTmJ|w& zhX*G8RM~+iZm-Ba!b_>rNA4ic(a{w(C^*c2!}Ur-qVlJPucCxc6PQfHddHDg4fEct7R!l@nZANm8*NL<>l7i z)hl>9zl-=3;mub z^3;0I?2Pw|eQILe&A?!+7>M=sy4?fmSnT(#7X>qWR?kZdCXr%x;><-dp72jb`0;Tq zI(aUi;!X%6%t@R{kp`vL@77NjXDlQ&Evc-_{#o~Mv^msI&uBCKo>bUb(31V4R0K7r z8hD0JAKyw}8^7=eMr9cS5B8QH9F6YI_>am{wi{#YTDQyAF6N_3a6E#}OpYSMsQY;S zkn-FXVm(ar;@QQQctR&ROArO-R<^^{Y{l)u^mNt|jCCTUX8;dfULpUsi@n58TT&$3P&&6KizKealI#*rnC;x?uL&%FIvtiV0 zrS@EFr?zQUTXR{h(fO~}^t#b(-7xEFHZ%X?yZJbiA1C&*QQ5BQ&EY5HI1{dz^|o3u z>PAy<8)bEKN4-=s*G#jX!HWGDwW0E{l24m_qI5oP2Fm0%`M{~T#OKb$8bv-_8CHZ- KJA*Ydg#QK-w>ky@ literal 0 HcmV?d00001 diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg new file mode 100755 index 0000000000..8ebcd6c264 --- /dev/null +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg @@ -0,0 +1,14 @@ + + + +Generated by IcoMoon + + + + + + + + + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf new file mode 100755 index 0000000000000000000000000000000000000000..dabd0d7eacc2ec6856f957f2ee8da9091e8df9be GIT binary patch literal 1700 zcmbtTO=ufO7=5GFk1ZQHN^FS~V^)%poKh>+O0gOU#?HYew5E`<1|_t~TH4A1NvldS z$d}SXAruPDrHA00dJ5XK^w>iWp_fwVE$uCrrk6S;hZK4!jkSHVyN(qoy?Deo^WOI} zGyCQf1b_*A3Su8R+~mU`RT!1fS4u!wr+IWTu+hz%yq2Z*!v)N zZu36*W9i#5japRy;cr0shVkVcIwIdIKa&4WKEKoK^`{320l`UfwP95a@uet{zd?Sw zY4qEe#6|K|8E+X)^ZcK)?~~sI0_nEZ?eU%*;ZI~7ilU1x5P76jGiYI0p50J$Zv9o%#fz~#Pvp|o7o5&;+wZdYQl%IycnF?v$i?e7*A%9E4jg=2W5wy{x@ zrs$VD_pV*v@2;(N_pe{O*SUOn{~SlUQq(GG4{629XEJ-eR&&3?u@zmhspkZ6rWntN zRD4{-Q*qb~I2hVO=d0N-T*Zg_kW6g(3XIl@k=lSg7#zw(eP}!XRZR69JIDxTkfk~) zYLQ8$!!vPyd`e5qTqtFE6M{H3Nl_FTQ0(ELbylBukkPb^vL)vigQL~;p>=j%n;+Ve zaB`q!hPotz%v*B%|O{>}Iwm9Oj$*0{aywyoRD$DQD1 zjCnhGM3#|<`2LXgG8Sb&%%Ouj_!>`{BzGA@ncB*6bec>2DaK6iEWui@LS{zri|<$H zf6vE3;-@|i@kKBBI86UtA4l<;$ja9Yj?=Tih=&7+;jxbu`akq>ka+0h5E9t%ahU$E zd>lndtXgfe)vWdwyL-)TtI=I7Xze~Mv|*x!CaUOR5nb#NZ`0o(UPJ*JGx}R*r+dq4 zsfGL!wph?%@D`I=P??g)(n&TyN$pj$zS}T5xXMe_vCCT<=$vH3b*t4=>t@UB7(KJ5 zZttmAs@A4uwenbZKe)$FuDhB^84RjsqDJ2~l~ZwrI$GGINpbS*2(NcWd*&7VFW6Nc A_5c6? literal 0 HcmV?d00001 diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff new file mode 100755 index 0000000000000000000000000000000000000000..714e467924915de9a9ee6b9817fcd2724b6c56fb GIT binary patch literal 1776 zcmbtTO=ufO6n>-8kF6NlN^FUgU{;cmoPw2Tr9=$`W9J|fS`$c-sS?_BEp6q1w5v)o zl`p-9LZG?y5S&x#A!yy6dknplLJx(sw_e(woKk2DJ(Swoes6YdD^Pmzh;Qb5-@G?( z=grdxw<;A9gc1Io&ZzY>&u0Gexb@~Gok&bTeU~wP_QHqtw$XvM1^Y`z@}vFNn??^> zK!eS`jG1O@=RIhP@co{VySV;z%QPB9@&Nl+8PV$3e{Vq~3YK6mFd|>cZ?@X~0kpSZ zYmC_;g<5u<{h-rXhWJ#J+QtBRgAdt9VT!I#kBh5fO&ieITHCSi{cF*9y4Um#XEe0VR~KB$=z2zO z@O&^lT9roD`2~GpF^kAnBCre+tLd8%d~-jE;jGO$s!FddAfX>!%q`?+iY&Pj4s{AM>T01 zUu{tLGzV5}tFJXp%j_C`v!QM7XgBNjx@}u|s;CS1apk6}8JEF8)l6zY+eGCwx`{g4 Sv<`4_^5_V!cgB0>CH^lnkt1UO literal 0 HcmV?d00001 diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot new file mode 100755 index 0000000000000000000000000000000000000000..a6b919620bacd68febf7dfcab865cff4fb5eab28 GIT binary patch literal 14104 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 + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf new file mode 100755 index 0000000000000000000000000000000000000000..a920e86179c58130992ec16b0ed79bbd3a7ffa0e GIT binary patch literal 13888 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 literal 0 HcmV?d00001 diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff new file mode 100755 index 0000000000000000000000000000000000000000..1e9f1acecd34988548963442d5982c4d65041eef GIT binary patch literal 13964 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 - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf deleted file mode 100755 index 9e1521d16b0b4aae8cb9059e3fce054d5838008c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13484 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 b7|#iO*RwsywFxf`p&u(Fb(Q+1oA3W$nxawF diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff deleted file mode 100755 index 296048ff3888d165c7fb9bb89c55c1bcef425632..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13560 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�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

_u2>)p_m!Boi2qbVunF!EdqLZrQ!<-4d)wW05MT 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 literal 223103 zcmbSyWmKC@w`g#uXmJP-oB#=~#R*zm1BF0vOK>U03qeYPYjJnizPLk+6{mQiEwoUh zetF;Xec!oft+VcryVtYknLV>@WIxHwp82!!=K#R073$#%0O;xp14se?4S(JNXf=bJ zy}|%^0K(g1V*udK0YRjDV4%N(xVUeCn3Ibi0x9O~=OZ5K zi$SENp0-*WyperXM9Eo}`6b$Ly7Z3sk5N*$sJm6MlKmzR^4 zl#!Q{{Wq_!Z$O}vuQT%Bx;<`n|BF}c|H-SMfkrw7`k~GJ{Jj4?3yj_U0{sHq{rrI% z8bCoqCua}ezj2|z$LPPBtcgT>1S4Iv(SAO_e>z#g<9{;%;^OQqi*x}?$jG^XrKE2Y zd0AH|SYARNDJ?IJkdk$lnckcW{^sg7?e_{WV??2d|VE`>D-XS4? z0FM@cPm4!Di}z<7FbcS}i~tW0??2xYLLvfUJbV%WDH$H%pPK)!xb#O9Wo;v-j7w4<4iKO#w1)KE zSWOvHT=}S(b3kBw+!!AjEdY<;Z#lPJfky}+zSRJr#pfn~sL>IcIH5koV0q|?Ze>81 z4zAQ0OnD`V5$IScMqGLO=%L0nNK=~R&lZ64mID*SM2c7JD-|lZri+rA?#E)Rj=oLZ(3HbDr!MFJA9MN7{`uv!PW)fs4gL zNm6939~oQmW#~)?+Iczf`;TqwcF?k}_tXj4<#_!W0mg4(o&>ukM3HEwa0G=x;1jclqiqdyyldFBEJuqObyXSvpFW3_N zwFRxxX$Lghr(pFn$!uP&huNuiFhGZ9qh`l` z^<_uWj3Q^DG5c4lJ7ZH!-MJ^ewrG(mZ<_NVU#^Vefdrm@zaKcL8h>R>2DAKZR9#Ef z(a2hZF{NB{oQK;KDHzll+*=Un?pG?Zy(!H4Qbu~$Sm$bTsMgL;@HpbxUs5;fZVY2s zFPM+_ar*NfS2vnDB#(%+X3)cSE=xCsz=?-zXWOZ8DzS0d84sWC<4oIbVMdy3NU-C! zmvnhP*a`cWHI*~rF>~r9o$usNO(%5;_ArsynQjLQ5>9=T?8^4WoD{u{!`;mX=KRsI zoKV60`6RS&lSUQB^zkKL@1iu;|&**kRp$Hxb93H1-}=;oC9hb({Oxoe9?teVJ&2*ij-i z2$nf}g`57&qbFZSNd7cwtioU0;7%blfDfLyF}nF&_GqenFe3fsRTwYP+BgmTT4FNx zGITi63g~N|x@vwwb-#ni6(!*`S=^!9ikA|j+M9hW?uSBAz;fBrU+2)Mijvh|oOd2U zze!+|#Xi>@%=m71Q>u;CJNfzN1dDHV+wNRgm1H}WU=$)zRXuqt)E83olC?Tp_^bdg#3USgGj=#qhYP!>0?dUZ)hk z4m{uPAvvSK7%R^ai6efWr)j=^U%ms%Nt_wCx$#R%maN^Ov8)K2>S)f34`>1`n46AM{n3H8N{gF*#A%j>;Y()S}ei;T(=Be9Wv zC(1R`QG2?V4n(2ubRJB3Il-6oK2qa-^=l)7(q#k&_C08(ih$*u8dvWmhMUIoZ6?B0 z{g(WPyW>|foF^yy2k%#~hlDQIStB&C3!r3=Aj{B= zNn?P~GY$x$oMVQTu{&iTRf}14%7kdVw;9bFedElZ{x^E{?A2u5g zM&xm*kwy6cq(V~uE4L7Os{~;omKJaN#!Q8`+$1qycw8b5s2UtwiFulPF%hatx06Z5SWdw&gSMdb#^$G{ z3bIN&a>RflySUihC-EhmH71Dp?%cg$cuo;Khffex0}tv+T4jI}5OVAptGnCv&O4Zu zsW7Mf0XUv!(wgRc**&&iBg5&CVq;9L3jid^{CO4J=KJo=501IpzAQ}j7?2NU6_plz z`^7ilUKpWO*Gr^AoISC`LBdoaYi9NdHen&gvENr90Q;&vK|ZMgoC7zKksQH!LRht9 zBuL2lf{@Pri6vNd&q$FKyjq$h;|9P<*q-ffsGJ|jS1CsRFh0gfoJMr{!V|F7HvYIz zv=~drYhhpFQf7fTj3zk~Y9fJa9!pFRoW|^$sRw7SlbY%!waxae@W!Cc?^4)uwSFFf zl9&mba|lz(6i3bbV`T4F4IV#8JnXGIMjl?A^!9c3l#;vRlCD`BwTw;3&ahT#Eu(cJXY7ko*yvq7^eU1a6HUCtc6IKn?b@^6QA7gf%o>vCi?`#MH zx#|4@G|OjsS{mI;_sZ%W2w<1#ULx_R%+hAno}qEEZc_%_tlYiWARKIcTfiOEYUOLS zGx-OQc6g&N71q>yb9B*}RDX!5RN$G^d-3V*Q3+QqK5YDGJJ~S0B70Lgf#$x;tC<<} zOPOceIF`yUuUWzw#hv>ISt@&68iZe#KIU|0_)00RX`5P-z9FOj07s^~U`0K2D6WXz z`K1&~DpnrLEGw9GX?hh+_9Dji(`4EP*)&tIJzFYyZpv{Vr_6_n5l8SzFXgp8kI_;h z!^V@mGOqZb;jS@(+^w)19#&YjNW>oJ`Rl%%N|9YwfOwA2!{$Nr_sk7Oz*`D9XM{t=b4cQ@my5p%ZLRRQ5{@M7Jatmj8x4x%!(R^QYw8#dtt zHLG1ty-s3sfi?9@R$dpoJE;=Xv!0cd*K$DSZf?=6$)z=2Wc|gCQ6R~fsO|Pl>uIiv zyEe{-UwKMUShsHVfY>yv-lP?et6#7|U_tSYMr&=^>dMsJJxI%?UR^beEweiw;<)+R zaEj6Iu0bqWO?HyOXiVAj_oGxZto#7{4BE~C)~EN*Bs56WzX{IRzy*rEUhGrpW%L-& zHubD3DM^@AlY>f;8JL@51xFa4KM*X|15#DSqsU;+$7g1MA}E9(dZ~J-VMOCBSe#ov z-YyJ&GoMg6x_bs(GoO}o3-^Ea^b9{_O-V-It}KSq;X|iXktlK-w;ShNqC-KCbhw6i zSm>dZXnz)>GR~;Nz#vZ0_QegtMsIq#^H$g&KrCb~E4f7T(NrQxOfW45lPyn$0`X9q zQ9RtM66vMQyV>6_*N1LqrS{`n7p=hCpxq;*d2<-kv+Yj)XL5Rnazfo*MA{Z*&2s!S zsy1o*jDS-^)hWOmYO{83L!xv0w6GG-9TN^d~rT~6>A)0c>aL1l-;h&Is+S@uR~cb z3y}jK3jO>5;o-wvXja2AWHI!(OIG@oi?QJtdkd-ie1j>u=sp@Pwd-nfI+>~oUDjAZ zJL>&Ba?xz%%o3KfG~0H0p;enKGiyU%^L~2ULGQlUp@8eR(Is1!SL{m^PhwR@$v`05 zbBmug_y%z zr&r(yU}ATxy9V0S%hfgONxu#M1b!M(Ck{SwcYfjk$9BMA`*D~(O*0CipOav{<-$k3 zLDv&7ZIkPwm3g&#FRBh<-^^t*o*H%P_|U_5;JaZiIqvQ$S?W27YHTFQqaCKv4Fok) z)V)05H=c1Hgn7Q_`_a4`qnb8uTV>8FnqKPoEf+1Nd0+Hd9kvb`;*~C&)zOx!_vMwg z1MQA#+w@l5C0@gw%O8-c;EUpkR`x_ucH^&C!jpUS@yQcwnOiSsLT0wFKF(*P%wW3S zTI2xgVe;n1LJ1c&l^GgOGyQG9+lr4JHYt7O2(C%%K5jZlRAW!vdpEJ2a|+cU@5iyZ zOR+rc1uwMuKL-AWD_T6*q8Xq11iL&<7cozGXTeD(GZB8LF6&8lf(Is|aEoVB?kQ`ouQ{PZRU%dZFvg7#&vBVORIIyE-Vw{72D#Bbaj*)?5}WmUf%g;ASR+vTGOw*%vZzQ#`PQu)C^8{pf)qiQGnRfk%DBaAz78d=m@RcChWho% zygni2G6DSJIfY*!ZQ;60YS%Ae+)R+N?=I;gVHWB!bb{oSf`FUV*O=|X>ljzZ%eTC$ z)TswUA1}H5wC>&by1q`y%rMS1wVR&atzA%Mn6~JU`Yo6+Nvzt; zM=NysOc1Ywu1E+)$6e?CrjJ~feJchcA-#}j%JVNQ=URcS$A0&_8LpNq^gZOh4?M^o z2$3gnD81ND$vHJ_b;Qdgl6o2BXcD!P9VS~CdvfAlI`{{GRE!>#)hlk?WfFa2VAwYw zS9@>2|A$r;I*E{nFX`gr0q#H7iU-FBH!FijZQofc z<|k+ceVBx$wvzvC9jjZAr|Jokt13 zX1_=$ObzuVZM|9a{eG?7+CsM3cI2?3XfZ+Nd^Khp0iL3vBO_R-Oi@E+|0&Q^w?7bDHw1ue9)Cwz~rv9kdi!^U4++8sH0b}SS-^Ke3)PJ6KQbz_XfJ?9Xg5m1z$8Pa|?Snx~7Z<}D*NyD^gj?h$Afn|A5-*D6@O zf|E3=<{Ooa>zkEN6S{d)6eoTGws4JUJwMu)0o+hBCJ*`V?TcA*%R6lzlqyNitPB`A zAq8fT2cGb=u#($|w_j*ouns9f*XrHdgjZGxwG z1!CU3M2Ti96(U?JbXYm+=c%;du7c>{`AHS`L;tg06(T(8&N>gj$V#?|K9@uukm-+d z0)H&tPX8*MptgvC1Zulp0^UyhVnWDtcEXTCsQzgpv9qolk!q9PdhhT_O(Nc`tfpN( zTn{^VWm^Z7>Y(omU%epw1EAz+{nnnWt0t$3(@L9fi;Y0j8jejCiyS0n;*Sx^E6{2G z0l*0{jL{+`kLZ)#)ZbOT>fvKxdHC#+FL0*SAgO#)gb|6tVYOE1X`D|*l8G_FLzi(D zTahF=4XY8}GdGp2CGcK?XRUmY~3zR+9oU9}XHUZN68 zFN(=ABW_aEOfWllTJEDa(9eYJr=o;+C;gcQA9MXSd(xY@@+4L#@dvIzkIhnZ&py`_ z_Dy|#j5kGQn9|W}yGM)vREzD>FA)B5aBe42Vj?`la*@yd=x1*ZEl?v5DtrmN*-sep zp4=f*4$Hlmp+s2Ya_!;DC*$jq93w;^+&z7mf~1+5K||tvp8)p=gTISl*7x6egQ#sw zI}ak(xR%1p)rFfmXTQ5U-ZEb;lvi2b$Mi1weFC{0pNRK8aUnne1HH~_N=}bGw z8DF4WtbA}40I(&a=ZEwkU#)AePcgo?$r>E{%%v4PUL-YWs(8t|#VMOMV3WFnM%ETm zal3Cch+VK&7dSbj2Bw4JWyzqtz`Au(+Uf-A<#&uRpO&&-tgbN5AP|z@>T`KjEuu67 z1bp1b*MZ@bRuZ6d^0FL{z-5`!+3Kts+aPB1Wc{oxe^BAb4kO#Cr0yH!<<*=~KJ9?TEMja{dPDIaXvC06G7}TyavxQOBArUs;>;@CL$m_SnFipy%%D7zF$I*SqciGT)IH<-QrDj!k z`w|4rkMUNWn3VBYmsOE5A~C(;!r5=O=dleA5~>w0s5&I4RvK~tVfVheqte+X38x%S zGA|%k-`x@QDjS?`ac`n}c zK5sjGln22RnndWT^%51)7Sm@T+V#jXqvfgclcV^pXPmu=M}(#cwCo9nLml<+l0(2` zE6r|HyOy*(F@b^y0)0Hv={oi!Q@@GxYC_KeMXQr_@Y-bO_oCX!y1O2BR$eI}4GU6=r6IZ!APsA;+4*1bz0_avMc>PkWT4DPcWc<{)=6=h($4Z^nK$Zb?O~x=u%veei%XpxF*sM?i;v z(q6j$TO?huf{8rviD(RO>68LDWzJTC&up=TiJFpoax{!Q+w{&AGw^Nu{iB>1OP5cK zJB@*JHLp@)tqEfBF!~C!%QS7_J#Jd1r5`5bHE~ZHi3nrbDFrnwt9uUAEcdTc~*+2rje^2j(`zCxpU45+WRa7 zp4+}orvWjFrNqFMB1TB76N^b=nmK$%?!=M-)cIH?SV$EopPU@}F9AIYI7HhK$e*X$ z=4Ki^r!~(nhG#c95keE}E>!q#v_xc|mfTmpKTYIKL(`-+-$#8queb2IwfVOJ1>P3^M^KhaS8Rnsiar932$`N);akb^kWM~K`Bm-IBp$gQmwSj|)N z%qK`w-7^nh?lOV*utoUc-?! z=J(K;Kq9csOZU*6xBIBmGI_AQ@27g7^@`~OTj3EU8OB=&S%%3~JaX+> z!hS|g*Fo=?K^a9ktW2TjY5Ilt9q^qmpO>4vm9~wL;DdbFbEEqu8r95~YCY7A7+pv+ ze9hVA%k%g?H9q%J9+y-?$nzSn?cAvVYf04@aLm#7;cL)3yk7yeNsy9BcYu<**BNOs z*^WU1rdp_MGJGk0qF`PrP3=&emurzO9(R2u7W?TW9;OG8;2V9>0fdQ81l@CA2%;MO z1x|&heV$itU@pSR>SDRo7(LAaf$MB++=8nlV7-R$BT;>l`pZc0P_E*Xf630*JN%q> zFxQf?jFiCjNL#Os{3t8+?=ADCI3oENV@2$mlG=1C7k&}H6R#ZgyQ**Xm3zyD zINagl@}0UNwZ4hIOW|TI(r*b02Z{^D16XOdBdx!>c1a;Q>@O^Tvaiz*+HWZ4*erhD zrn(!OItA37W8m$Q%%o%YAMs(CqzRTD!+3D=FZq!6Lmi8|X*r zVTZ*M7%@oM*cC!J-I}#Dravkj@>tt^^t;E|n&gx&0bcKE^-I^XA9!*g8sIJb$&FR5 z;mF8yC?)u*dHK}jppK`=o%W&5XRoQ3+w}F-c1x^RB8%HzP!VTwN{@a{+M?rrMR>9I z@#Y3$M*SeBzbp3gn9S)YbjCr1TE=tsO0>(fy$QcMtO(vEhy#qLpP1U!7Pz8#?=7Ik zv`^oh?%9#eK(=3RlnK{MOL0Vg=$j4UapHbFEu7mqX`ATTn=9#{CwEhkIy%{wj3#d| z9nXAOBA23=Y_F0*a9^qS>(3m^(~YE6l*QX5m)QGiwZ!$rj%A}r0s^BEbF6=Cn0>0Z z_I}^Hm&GdY_|beA<{SgwDZTd@@jMr;$_Ri)nn#Ff+VrxoG<#g;bvvup`wUQY)7(|lINGFY^#vXm zW7H^a7_;X7Hn(Q_e1$BTEh+Cl{pR;8xOTERhSx@7~#=&g}X_ z#sRAlJKpHC(Kz2BZJ}Alpc>yl0O?OX7wZFe#l$n9`30m{&QM;WQU3i#e9Ssj={#*_ z?3+aV1U1K7*&rI17IyK$&_}^rAERdb+G0iYd%{HJDVs{9N^STZ*BI?R>X%U;lSpJ4KA$lc2~;<$iKk&q=ifx5FU|$Z=bi>Q&CSY^o!Zc#clP%~=zF zcxV)_6m15yUUvIYzbxnFVC$Em@yJK?Q*brz8hykJT{lL^cn+^p{K)$vgsxw1kfexS)0FtxNEHcu>g1 zTXWjpx%dxv?+7SP*#Tf4tJBd`Q%<{Dobrf?UN*EcIdYlO9`coej^b@$pL34fr9j4} zzDgsW6v6bJ4ko@zP4jze7I+^l_bf}A#`c+K9${WYiy0A| zW6ozX{|dZ%obb$n`h8lIc=17YQ{PST+EOzfaa$J1v?SE~gk=(%LZcBk4jPNC^ zi6%wZzQo-hE4vzbJXe2n!@Xs_pewB3Z56q0;OrK6N{F=}A{~zq#bXm=@iqAZrZ1%Gr7J zkuCsql!Ps1c7EQnA1`GXV4~D&BM{|kw`cTSp+R00oXaPDcDr@|lb5nrt3|2-TD`fh z7Htw@>%vc?2_(&)uHBKW;7SZ72wcRDQGZ5A5HPyLVPeqQo?4Rv2d&5-T8xfN8C4?=6FehW?IouZLWfzeZdZf#IyN}VR zUdKR)xk0e4r6=7zH=XX%mm1q~_|bK8>45BiDz;ge4&=E@oJJ=BGJfRGY+pM%4DmlY zY_v+7yTH z0?M7=wL29>W55!H0Zy%Lv#AB+C-wym?_s+*P;;WO*y_MX3jsREETG;2;l}w&2GoGe zYBcI8)l6y?`f0t^jU25-va1L4^fVwmBiifrhY3I9=|1LqGs;|uF-s5C^jmqhB$HF4re<=I03Xy12{fT(Sj9bT(lfSrlAy4^u@GEsCu)TIs>Tm# z5VL5mP-1X&7MLN+j7JV?zq$V-Uo$wP*;`WT48Za_MW*RH?qg1pepV+2(TN>L-&+}7 zAV{lXr)+rfX~f9ZC6J(oyej&zx>l|S7;;B7LDg9JzMfm&M5r;{4Ntb-jtE@rt-?4S zf9M>I$jQ|hq2chC^Kk|Iz=9Sniez4_GqHtFGovTlWCbmS3yel&Nk0~1@XdPn-4UCW zw>y6Q3p(ojAo9elt(3H=Y-hmbcEcgO+)< z-%&6MYZvS2Au7ueR;;yR%9>mg_f3?&qWdgpO{DBB)EGb(S*g^CaJ@abwc0{hvw_#q zx{?fpIN3)YTPYK}MIIN6JZ5?0H2UaUI~cw2lQRO35JMh-Pg)H7ls ze~j{HGOI~1mJl;!f=cs>KC7DkbTyGQj5TlfjPDh!@jR^|?bTS4AZ%7uYndm0cxF#F9>u6ShBJo@B9WfwAQi4taNo6AAXT0&-TGr4WTmiqMB=qYHfL({$6 zb4VMOeL+)_bwoL5WOYA8lJV4m8rgx>q5KqiO=HkAs62v0f~egrINUS*sJtKcI4g~c zO1M`NL|J9mm+5=ZOI!9fmWkB9%0S#D=t4z5kMmv>#Y+%0O}?zyCWZfcJGy}`Q2t`{ z_^g~GbkakedZpkd(jRXniG*A*!kg?fAc(*|5<*>}BlY!3PmZO?wkx8fq^zz)+^2~p z2kG!`Q?p|lgko|0yycPeSkDQe32PUiGB?|iZ2p%1lGl-;w)AaIp8QVujDb3xj%ODQ z{w5dwLHu;CHooxU;UQr*ohvP@GiNW`swGLzr*I`2NH;}`wU@)sx789!C=x%3rCm4p z{fb>-6%@H(z%XE9{jQ0yT>_^?IkvoTzNG{AxOnH4N&m@(K9lefLf>o?%)X9D?R4r} z{j__kfLN~)(J`d#KUDZd_nC}j7*u@;d+lDGWa#VAK-*F?nf(S*B#!0J2z^G@p1{sp zgD!{bvX9cT!7$}n+~?PEUxOyIr&Ho}^QWE=IY^a102c-~>uxj0`(3P<8VV}4X`kSh z`O_>s!Kztf4Ds)U%o!fAvYSMMp6ONtO(5Ibg{y*Nr&Pa-A)eT5ltyJn{uC`vc^FJ% zjBQd{1dn^B#8XcAkWVMrg6E`stdGqM`p=J&dW3W?#vM(V2{3b4nX_-DWSS&9Vx3d1 z)@)x0UJb*yW*wZE&I-w5bPRAz-L8H8>2H<;m6w32qb7@bygS6jCO5=4!u@h=vLNgi`_3G8^{+Ew=k8=2r>@)Kr=jx9bT6%;9O+7?+EBUsz^g;-v zmF)vKBsd!zi!GK>a2^4J^%n3^ueIO1U&h~~>a)s=WvQUb{)&Z=UZU+#x4EZ>>8qcX zt&gkvJH9)!32stN-(fQkuWM2wX6oPiZlFb2-+1x<%^SwKEqd>sew^#O5*65`kL%~V zI+QXHieeJ8mAgZ2X?4l_q`V(bCLAO`5-+AyPR#4$^+!<5fR}&!yw0elGr0XU9tRN? z+#IPNmussnkS}jP_EFn#%tw{HJ(iQ4qj1TVXS< zQoTb&?dj{O<`$v6WBJ_4FCfraU&c%)&Q}8(+>Tvg8c$`_{CwK#8&*-73v^yE3p3L4 zo@n3J#FC{bHn>8is>2I{MtgFHXlZE(>c1cxacHZ1oht9Nod}_gw90JT)b9meX$ynnJ49*vH7Y_X-S=-;66T+w&jl;h^&e~avSIDS!epj>H_+!ECE!sx;%|& zmSSS22)~n$4|n7UpO`F2==mJ>riqCG$mpnWZTEJwgc00NxUj7w%BpY~^QaD8+_hV_fp>-3{wluI zI*=FK3UkpHs?7znEVw@e8!}TjtU49i9g?UGe+hgWy_1q^W%%r2j!e{1tiF}?H?iqn zEBkfQSsS})#AIbA_($(h$K`$B?dzS<6tPFiN56A3x-$}X zJwoGcW&w)o3nuD@T9V8&F$1pW@gihQ96CFS&xEV<$s~rqh#YP&LL)?y8!r!qlm`>| zO@-8zM857<`57dgHt(d@_Nuc9l$DjA-A4NE&WV0gZxC|-HJVOJu53QWOGm+uTjmwtRkgGe}gzB&D2Kr{8uu^Maq6N%l`8?hyR>#th4 zS7?*XtDgIhrT`aHi({64<`v_tuQgT-TBpZnIsK>Zl_w=qmmi9T_QW1i9DN$h9%%H3 zLn^&FOMTCc(a))%SuFLE`o%qJuYR~aIX*hwj(=A075C*QYVg-ZjDWGS2PvcItk-?o zc>A1g5M(r;^P#ErWWHDs1;7%v+8F&lT@%EL&0ts=XD2G3jIH%myVAT)g-^)$7F->t zv3|L>6l2}Tv?qGMA;OzK$W3-c-+;y~c)j1~`~ehSO&~=;(E1^ObZyg}49m} zyY79E=r*hK(#F$W8q#?FoVF@Uu~DK{`fb_N?K-;RqFSSwKu^NP3*^{@Hw-hO=k|P~ z6=3`NAR(71P)~-%;1Rdk)9QwrR|m;Vsltp&TWgxLJ39{d$x4DVkj$#sg{nI$+o5aulHTpr3eNL(pywL1Cty;-xUhHT--~0UZerpmRcF#@^i~Lm zuViPYsTDNIg0DdlDvrgY0O#&Ls^KEp7kMR_8-m0N_VA(e8CkX(7T(H5ni)dXGI~#@?b4hX@E`%|^yE3+QWB-e0BueP%KWd~<99xn zZch^VH$nFb8uoR*e!HQPn)2;2?xyr9I30U~nI{tm;pAP+ZvQx1zf`4+A`DGMKK`{D z6bUCFZ+OJ9XuGwo?|L14@t#%c*zJidq`~Ss=1t#IWk|T}#U%JC*9a7f6>BcJ_(}oa zK<#L3Z|~mzR3r*M`X(BYx-xNpPN$A{nd%OlWBNNnQzajn@ymQGGdJpF+Rri}*N1^l z?{?XjdX zwpUMnekhk_5Stn5@aYT-+|Eck)2D0;UjS!*c#|y~*t(O$4Nxf-%AI1QS{KbD5XfPo zg_1r?z7#_eD~9Zr|Tie|!V{5lst zc(})O5}~R?XomMK>BmqIxC(N6=Z=q?LGP0L%>|NvQc~d&>6Z zklJ*Sv+i-wxWu%GwQ;UPEbOR1;Z?Z$CDH7ZYUG!=LzGN4FB;TKa`!v1NH_Vgk;^jY z8urEa@Er!i%3q`H)r!#sbmu9F;41+Bs${8HN=}!*ZVbCR)yl-m$d@(^eYFc zUh9?GIJSZ=W`I5MHIoR(L_~7#>Z9errl3(i*~%-H^5r#(IdZrnk6>dK>7}5CRgEe& zzXTHnuTW4HAOTsX;_RvB)+zZ$m6NrAB-pUvimarQJD8JTW8#k|`>aRD-Vm(1-VSG@Tl+bM)IJ8%iTh%V(T&*`#?J#6+v_STdwX zh-r-Kb{%#&HA>m08Pp1i}P;!aP!L1nv?Ohr==U_eQPhzgawfWdPoR7%>Q2Bc(rKVsb*yW^}2Gx1pB?+a8Qq?Zo`UlXmt0 zmWSGxIguHdDqK03=Me0Bv0Hx>*xE%vY#)qOYYqiZJhy39JxW?E zVp3OdH}~M~)sRp`-fLj<>irBSbZhi{t}>X_VPe;t&j03(bYKVeDAh7d6;T`iqCrlfMq1;$aB(zQBa2(BFFVf&zMj&A*OdZ8$BytIs^^5Ir$3+{-9C-;zrA?Z|sCz6w zldG1w_SFG>R=8T$e~VOZg<|_(c$AR(R0$W!mHP`8+1X6sT^O#d!Esl@UH7*Y0iGeW`j3(O}V2k8$sL zd3R-S$G+%S?TGa$c5EIxv%!b|`e22_FM!mN7A-lo-@An!uahVGdas|3ZQxw21xy=N zK+#9`PG=~AhfbO?;LM0#(Mpym4Uh2pG*$2J2Me}2mk!->I*}O`XJMf_A~Yy;g;Ct* zE<#nzIQgwu{j$^#+s19(=CPk`X<%=Q#}w|DwuGVBO-nUxld3yOAK%6%903s2BB^Ti zA>cRqP9DBl)X|mEtw?S|4eI(wc@qNzSVc(mxLLO3aTLa9I2l)c)XbkYn`{#iU51pZ zRXAT^1kaj?-ZbfJGOmWIXtOjGrezy=XSpLeEBeq?3PM+ti|Z(ssbwkeyYW0a#eoze zngyKOt?8$`lsWA>^l}5P;XDu)KFN6u2gEZt+0m|kb^8H=jk;H?Dd=K==*tw74`Fxr z&*gmnK|9y`4VKwxS!{A2Y&O*;#lbf?TDKP*^(;2bm(9Td(>-r{Vw zCj{=ha^j;@m4#l}K`gchbvK=?FwM59zAd z8|&9h<71x@S2Pm~sQG(co2AkF8XfrVvHVD~4ZH)bGMbW?Q*q6nSlAs2OqQ!{;Vqyr zfs}JD+2oa$q4JtLuP5A9ahnasg(B-c7p8Wl&9Ts{j1DttpcQL`U|3#icC3R)`45Gi ztKZj$r6=)Tt{+L?AN2nsNwoOX(d4d0Djd#g#u2DnIX-aLS8ri1{9Puy#ne~*O`O(z zkD#gbJMJV~`%(G#H!ig_$X4ui1BbZJXKP!_w`MA6>WF=0L`IGPDL>;#W+j>DA5lu?z2g0kyg6<_9L) zZNELc)EY%YyBg7;tNKBm&e`Z(UbJur09L)CmSPf*n15AZf;sMC%ir-8H`P8W%!S>sz0QfRlWe2$-iyAGb~B@n(;on2Ka8l&Vqz3MuB9&;SsE%IpRo};}# zY7R9%#rK}xzQ>Az6U)44xU2nsfMWCguh8>MGGH=1WxEIUA@Xzf+N|EoQKVhop;U0% zbRCB<)G3jac`!gO%Ds8a+MZ!R~O#>r)SB7=!Bbz%M@Y{*E_ zAl}6~142O8DV>4}M)yAl|Dd{Lv$MXGYpDFobBx=Jskwnz6cHc>|yBy-$Zr zFw;1y=)*w40T+M<}>)!Lb z@9mSF@ToOVUp-y|Cga7v{xX#vk+8sPYkKFHvgU6{viVxt=sfq`e zJ3pY_Ty1W*ebR2;E_CMv=PRRl&P6}FXaji$;HlVA5c=+Mt3}=lXtm%>Vn+Q_G~waR zmvT8hPI5A*&?px{XDQFm0uZBkMAx<}b0X4}#B}X-j^RKWpjtJ|%qWj+FRM+58Ia!D zr{1plP@2)IIwG-@Gf&Y&}s3NMcb z(M^>pM@lrbQRYyY`gb)MdcAx)#;~b}NR#zQQIxh0f0D#?o}zBLtQQT?kaB?tGzTgB z7mIo(^=XZXUS*g}I|?#~n*D+xnD|&@b1T_Rbo~M%zWLV)mr5NNDg)p6k9daEan_W- zrk%hGwf^$5%JPnZ*8|fgG}jGc=$w_B8LiEGrB*dRBa|U?jV@#P1DNp7+beQ;Ly1S3 z?4gElnwm-SYIn!0#pKxkNcN*7Q;0^5Xm(-dK^Rwq?+5Ex+p2NYydE9{hAZ56F_lV7 zdb0b-4ShUAD8aGw17+c}lf?065X?u*lrS(Ly!zAm-E&db6uRZBhS1-bk-YFGu`;o9 z25)ED7~@Tg^L*yQ?wurz>;gc^7+t+FZwh9ou~pSF46LRXlyJrz35<}+4!3*%JVV;I z^oDx|w&V?ybYB=pgqEs!n@+~lTbg?52{ysx8Xa$%!|R-2DN%*rC3$%b7=UEM%}}JA zE|(9l{}AchxD_E6^B26Aa)ontFu&JrIU*i2c45WVI=ocDZPP1v-8%Yw@sG=g_p{$< z;_!4?PtLb&!G`)l&!00a9DPYpkhIO)Ngy9cIwKAxAjr@rb)Z!MTncJC(&q5X%zK*a z8MO`gZ*}cVRz*hb1lN?R&&TJbjui-20e;tzo6ixuQo|EzViD8G)P~b1Qa>=Rn^hjDGO{0i8f%zX~mh^}Tw5 z;4yaI)K1Kq2PN#1P69pi}|{Yn}y@gqM_3pimQz3#bJVkr!fPG_Kt1hDNkN zXrXxal>{<){k|U@af>L|!9*wtrfXcAQ}Do*F(}AnLlef(2YCqDB}gevNCP8XGr`6| zh$5#x3y7MX*yxHq#mke8Y%6@^q3sT z186-cf36PLa8we?YdeXfSuNZwmeSBXY&;Ee^R5of=|C8o#N@hA5-*x$mg1q~H4l|M zP980XaEdFse%pTOa$dvYeZ$0CS=w??dye1e=7RMLEMS5dremR{4_}5gt(#Y40dSCE zCyP?NI($-RWRghDC*$~8c_?lk8+jYZn2Wf4hn}Ej1-Fmil#61W+V_J7C>D$vbC!(XdhH0Z9iUm8t%Q5`% zndF>;GT2m(FhZpC6GtoxG|^YmTH~GyF%u3 zG_EMd9;DcQiQuqBcB5wkITSBIay}W16rmTPOo1m9{wp}GS~*~l$s5LGVB(uuO(-?4 zEK6@2Y+_sx^~qVYGn#wHPa_qZHF5^lrd0Fs(+IaYKBd29h-KS-r+pMt$u0fF*6=|E zH=ry7FvvI>sc#H#!r_!lN)?NX)>~)tMADBjJpj zHw-Sx$t1sSi_%>4TL3V_qUd%OlKZB@;(NtEQ_8~Pd+5|6t;7qHxcO-G>7!##69&+H z$7blf=JI01+BggcCCh}oh0%)2c&Z2t~Sw-s85xf zTr9IxV3#={ZryuopzT$w_eQN=pJpQKFdr3J(D2?ET0POTZO_&CsgAXKLsRohon1|H z$jxvF-ROD}De@390Q4AT{lxBPL-0{(0Ha1Mip=|%4_A#mKFlaN6)Aw$i11OZ`*Elb zUDfJA^TS+dVTv{`>KG8sHM}gqcV$&(Y?KBxsrX@bhN(nxDrZ1SFWf%flZE7km)BYH zv9v93wF#>i@&X(pj z$OcYay(+b~(-zojd|iD7%5gT=Tphj8U}J&{WG%bUUfn%NPNyo@7&fmM+#{LztRV5Y zVsUfeSIf7YZ?$6Nd8_!jn;SyKrLyARd5rG$1XDmYsPf0Ch1-HL1}B+TE?S!aK~-L7 znc?oZNF%i3SaXs{&B@-gGMLyN5mTVZ+pkCEg-{cI;JgXo*zOSwC-m*CnWy z&ybZSjS&})wwb~Pkyx7d8$(aO2;A+>*ogqgHsR4DaRBsG-*Nk%^?k|6%WKLt)tqy< zv_guB+a|kJ0LTN7rXOqwL`00LgG@2q3Ol4OZmBQJ^k49x0~95`Id; zJ9sT_pp-w>i4SK-O@s=zW}B;)8Fm9xgqNcf8|;OIR<{P?8mR9TDN{g63fYPpkFy*k zKmZ^S8LKsyAO2Fp^6J*xy+0Eed$oiCDTuW0IBpxZY=m=sj)&N#e9X%dnc6Q?k;Vow76LyRgxJ3knEM9A!(t? zl*g#Ga@Eiz4{iyPxSsMp@aMU1FOrPCw;d0+te3vXT+MdwMZVH&T#4OGM0VEgN!iSg zaLrSlR~6(?F^b@@EpnxdLZz2&1zNw|(+<7?uN72KvPQ!^zW)I9#ZyHE%FSz9b<^y@ zi3GhR9mh`{mGzb6mT+=0+RT$ZjmRwo>l+3!N~%FB)T01FrWqfY#9}#)VFNn%A#n}$ z{r&3O!No^+EVmHx_Nv0(9ptjZ3X)2wtrn!vYk=hEsl@X<%AG8f5&pPJH4$I|%7A|y z0V+a_U1><>i#I#5l{NrFy_ru2Jr*+sl!|+FrzM&jZH6XKe|T%8dxCEYWJAUv+Ax zhaI`J0H;$`7Vj54)j-_D@b-nc?}jh+dyPsED4R6M=TV+1i3Vn`6mpq4pyaqM5mOyy z+&0fz5WW<^%HzeFyigHWLZd$I=DPs_m~d?=|qjT5UlQs8+jlx!!r3n1?CG@v|+o-RTL9%T%gXp^ZgI#qeZg zW=nxeoO&n#0jB~}3+tGme z<75+D6q2y0S9FQDwi{@v&jJAz7$X7G2(9FTAvq--#!9A{9*4~0#33jRSQ5B^XtQs{ z{ZmQYNr?ddm<)HHkPuJe@xfZz`lPr$+;Z_jIqAWX(D4>FlR<09QUh_D%^=&__^_@+ zt}a^G+OkA$=kV`UZe5hC9FSLuWd*@oCP~Cqtmh>($j~-qVOQg7-2VW#R?Tz_q&&;g z-%WU4>h9u8o4(kAC7FwzwAz4IO`uROu9aK9b%h z5=$Zh>t+?A0CLYd^u^0NQDAG4ZkeRc=DGlr-tu<$DA7HHF-EEu2SR(nRGit*%+1u{ zS9dVE5)1=n{Y}*dlLJHeD#XbXHsviEFxraj55lJz7b6l}I2_7&BnqI!Y@vjanB%2M z$kWdW5Fy+!Qe^lkqHB9<1e59+$L0f-JODVc2}0cgcf}%3RE1J-tJw$`)pGfdjtI2q z%(w!Mw~`1B)@C3LfKsF%EIQ2L40@8MC}NCWs--l12=Q zcPz_FkL%!Ytx^>ksURTQX`B$uNdD8~gi7R&B^Zc6%R7<*ZL|~=^2K>vB@l}!3zBmo z!i<6bxCc_Q9-!28%9>(bN`b&-YBe(cI1!48eWg}uLr)A=N+F8&Sd|EfGtfw=wj_7 z#`Gdm#-r^1xDp~8NIcU+=A6fQ5P-l^t3y^a^?7+>^fwXFrK$5tFfQm9F-^IuC^D@p zPq+HwtjuRr;PF^7%aDv${{Sw3ca9@WvQp^8wvkZC=~J((r7+J*KsgFxLXy=4ga%Su zT)K{!>rn@)GU?ybtTy#27%a6#Co|#?!xxMMA(DvHtxN#IuF5;=6^_$QsiijIW)BxQ z{D(xrjTH8UqajL(Hxsb~kX3;Bu{LC5OndXW&>PJ6L#)u~+| zL{#>5(jpZ&E`tD^SfW_pL{b-XeQwgyMO739mZK%jvimXU;Nl`MkfXbv-Blwn?nWzn z4|m;rKIGhcQt>VZVtz(ja;jOWk|TPkJW0lV>(CI>5b=7G#XJpPbqW^q-<;Pgbb@4hEz>@)$0Ra`lz&pDMaVR78c2;b zy(%InFs;xLo+(3eVn89|!>VzM)MA^62!s5cmEUl|K|BD`SjZVV^(*I#-k+D%wV+rpBC#+jw#8_d9E~A zxV0N%n^$`83!?dAZrPwYpoFTINaH&CSZF+a@kZo=vk+9!&#;OuWRjIVD~=Z%3`%4I zv)cEJO7a&-q9n5pgz7#RxD3P`xB*$U5hAUSNR!;DiCw=Yt`?Le4MO0jbX>UL96M2M z?X4Kcy>+i9p$5f`{qbpiZ7ZL1{Z*eqnPZufO zxkdyzhqf4m4MimGp$*XV*B33?5SV-famy9w_gB43t~f3+aPz#qxFU(|?+cq&mWqp? zMyUg6%7ox$t=IrWuqW~SRawktYB5Vv>_qI6Ra3S~#ajBjemGoj>61$a!7fn*Q4w)> z1xK+3TqhK)R^Hy;dGmFQfSrYse66A;dqNd>LM6Hd}Cv4PKNTBN?621}N;#2Z%U z6D%02vbi8xB)Pr}n-u{Yh%9wA@#~70cMcc~)Ckqm^EFg4%nFaY6y;*P7wuj6?|AG8Lgv%t_h}NXQD~LfoF+ zLetx@l~-byo4q`!dD+8R#}&L*Tgvu!3P__Y+PRb08K%@kSY}_U_I}f|jO~`q%lwzo zLfKNn(bMy+WR5q6B@`eK2@Jj>y5rC4^BybANb9*EX(ukeRrhBVb8CCa{Yh(XDp{mx zFJh0liovV;d7YxYG{>m1bWYd<7VlQB7_e+x1x4f%YfABVQCU_3v#&K0uon={D+{ED zBO81w4!E~w=BktUEKAJpAEyN!jg0)fJe-_l+wM5k5~Zr6Gf5iPxXM&h(gtS@H-#9{ z+46N-XHF?3ylIz>PETvZvpHC1W&Ejj?D|>no^Q10JWw znBnFuF$zI!RkPZbp546Wxaj@MdfaCgvNzYxKQp0Fq3)MB;$ktbENdr;d1RqD;ZhE{X{lr56%3u%mn_nRmIchRD)$?>Vo;um+TIq_Gtbqo%CzQSeHDXh9<_rRz ztrjbExx8kDZmSi#f*G4&^-yZGJ~(i)A~j62(Ys)mD~?zyedMYGt1jZCgzy8;88;>> z2t^^7N}_s54{veEs3M~-wCjZ1Ei4kGTrH)GaCY>kP@oZCJQVG_oD>Nqz=V*UHa0|N zF;pET9xB^!40m>LnQu%^?4cmq6fmy4t6$-byHqp7wCn&UKEvjS88v8=EzP&o$R0k-Mx|0b_SYaiT``^N!&z{{mR>n0 zh>$s}4TIZXK^#}N%LH+fu!ddiplelJ>EVqXyrFsxazHi%wn!%N`$E7~+V^9am6F1zlRTqN1*Yt|-CADCCc`yGwZ^Ntt#z+TiB2H5v5>&lfh=#km123Ps3j z6ivB#t!`k2ZJt1pBCAN?Em&(ooE3s(@8NqLwBxA#0rj5abY8j=3KkKGD-3KjxJ@Xoiw7 zCT5O6R1MLw19c8y5zve((UQ7mCxDb0HL{g{Zv zIvElc4#LE%Q4h=xxG6+rgiQ?K0BCTgsxn?BR=oORx>C+La`riL-Bz_DGvR?Lk&CT# z^1&d%WBw_QP`!>^vyNP`j$F25o_}T}V2W6;Ql!$f$1ZLPRRrd8G@zit1rjPp6jfr` z;EE8muIgo996?gWY!@uGtvqoKj78LgI*h71ViPb~9w*_BP;gSAqiI^}g9uR)M$Vzr zFBKVJ$R!Ga17$&wIc0zW6VZ`-il}B)T_+U(Gq!k!DVvqttG1_v}pBweAuB7VMKXY zA(Sdkk*ls!fs&Jl5eP|yfak#!T#OcDf@YYjgCc-N@tsGA^1{WrnO3RJGES_m+q8DZ z7?YzMikyu);@yZA!4V1Sdv1ATSZsF7J0|HP6x@qV#7PP zjDW7bctMe1JP}dRHg^UlQ6mEyovKLj!z|p=Yl4!kRx&{pp(2R9(hti(D98>*o@8TV zZ79Y~5aj$7dASa7L(O3frRKJm=^YsDMq(H+@EH+>&ubZzC>(Ou1_QsNlo~pi|N#VH_w4b0+y*sOTsF>+!=tkD?+m zdZ90=%Jtk%@ra=&SaM-S0IddKW3R->X^lt8bOvQ4Hd~qAM%q+oT}PHPPTk2RJWZCc zg+`-93;qyv9)4MP;US}ls(b+|*=ZluI>iBLRaII+N+@HMMS6747Gwp|(JmUi7LL>y z;uYJ4vM^jUY>bocDCz}R5NK2Z=avs?Z%xL{dJAy|50dOw_S4#=5ZO&1*V-SdnNh)) zXrS7_e54Pz9)XA2=v-n&4HQ1>zly__dnJW!zKLLxSZ&1_7_R98FwUoSXiYG<-T+p= zf~pCWUy51p5ozuoCyTt}c{pw-PV}6l67Gg%X$pXfgU~<#SI@2n<%wU5L{l!A_w`xO zx#>uW4vU(~ve=VtBvQJ_fV2)CEsR$pI@Yv4cu6M6(^3fL81h3PC+5un5;GZlgkvQR zhJ?3`FcFMMd5Wb;!J-wUlzJmy%OZ?a?cN3;NLGva*nNf+#DH zK05qyrwx>*LnWKSBC5-M?7mBh<7_#bx3^wDlc=(qIaS(yzcWUIIw{DLp~GXeh>-$S zkKIJS^CxgeaKQ#XtW^Hs_mf0cIHsF7-AQ!*?WX`@L+OXzn$cv;QhZR zDgH%_=&?Z&YSirjDRKenTw+eqlpkrOajRn7V<7UN%P#br_9P3w884o$XPbJ(^)gKrsVQyiW>rvXHUpxa zX^CDt3K>vMN0L* zAv92OR=irgMhHm0fT|g`VpeO9d zOafjxA-5tZR$51@$_)z-QR!bCE=0brDdJfvB9I-zUZB^eA85WRz0$V2wVD91%^f6? zAtk*{K_uo0(xV1N8^I;gwm(TG<{{*%s?wA?R+z0X?Mcl_Fm(n_IQ#gKWrF4bEOILt zNE?ablHLjqF(w_`e zy%@uE7*;^P2I8PelAqhIZ`-zxNW=Ez~E47e4YE4LLQz{dPzixLW zZ$$u=d2{+8oUvSCCH0gmxniheQbh-!fx|?ecu+dxXr0}+B`uYm)x;n6GRkANm?EfW z3rYh@k_IeFWVRowNQg)-AXsN;)X%KW-v7gOz4{Q>3lf?M8>Fd;+_ zBC#!SvTs5S3hfl>*Az|2$I2>ryN=vdsDf&&Tu&$=M7C>4=0N4iP(*~&#B>KbQx|r- z-2g{R{L?)XBJQoT!F|kd_V;4VVz(15n{s897D+VYwj<15H6u;q50atfgM1h1=5AhbtK>}PF8@2%AJasz)Q{ZNI5=2Td3`z?$lfE z?JnAFEP>5-&O??YRwwrf21p2B+kHZPSZ$}EHYIL$Sl_eBsh^Z8j zbzHL372qT#LPs?cAceKbX*Q!dB&|RPrv;N^5B56u_j~p&{4wi2+oi%)wc3IdfDJF!`&*A{C#T6>p5B>*bWZj8bx&tr&=9xYi~0FrTjynn0lbv;g)uodZX?T zK~OgiqMb6rP3D%YpT$6iNX8=SREj8;HKwO3De7?V^2kOZl#`@7%(m?rREVhxc9U8Y zTpa8emWo)o_@DtMMvdyEA5gFIt}6oaX;B%Vq7B+NEOIJx0FI*xkprf$B8eF&=tuw>Q?H&ONe-k3Fl$N-gej9KzsTL9vzn zRVz-v&k8P_A_Z2c^{SFKkZGMp2o$D7TQeh-E1y&TxR{nG;+}k{h^tlubLW|^pJpy# z00=pvPzgOwH2^86@WVq&rAI{zKtmK=%B0eyWuBEdNw&p;U?&x$ENZl0Q6z$C)O8pM z2!TX#b%1E$g6^hd^e4i&Su9;TA;NWQ6Wn?>qXC-A`H(y@YSc~2Q>ju|D^-+z#MslQ zKme3hgzfM+)vz^1iKb{x3$kMkx}?k6$~7zrbLu}}%MFc?C*{MMaFfTHxSlpTM{xIL z?%pM9lu}T|{i?>E6w@0~+X8hGbufIoD&|czlC(Po$cQw8ks^?+plRi&+lm|c z$i=laa2fXauD1~QDnDo-mf|Mukbg|%Xm!gNg5H;$Xo^yL6wW)X_UXrw^%1cKDHPU$ zvI3feUYNTJ+Mq2OjE`*63|Q(yyfZwF8!#_Y0yac#9X{+TP?0)LDnnwu8SbvrM42LP7!C3>QPUzp>(DALAg~d>N5kkii8C<&}3+sLCA z6GaV&vae_V04qPZLsyk^XJO5E)zj--)f!C6F}(;Zau`%?MmnnG<4@b0bL6P*H{g&V zfXN}_I4)<~+?&C3d1q;G16#`*%##FX6;&&zt1q)WKWk?|cX+C|w-LA%``(|obKG#V z`=Tq2w_J6&o0YL?H^(BV8KKomkFbm*`4PDx0{p)RER)M6lqoVi+uhU%R4AZgYIl8@M5Sr~f?S*u&Z2Nh?_v6Q z;<}3E9KAOrWQK{l2CwrNt$qgB6O6nvK^bZ+LeguC+r5)sN|Tvt(#p@h+L~_bi8Hw{ z49F>dSkNYSJUYd~alFF{S>H=MFgma#O%BrN*;E=3Ks_;LRxKM~=lK4Lx2r8gB(Sx- z-NM&PY^VcKg?Ik|(zNS}_QWRdCIjQqG|o}LI(%>LA+YVkGRp!;HWR8b{9bkQ#ra*8 zyM9vP{1W0srCe54?(%Cs?2{Q`j;RW>X0+O2P{TxXaE(^VQ}6yBELlvhHi?7o28@L$7K(8Q&qYmveJ|*Ukv&TScd7v z1yZLTDQxSu4&Ko0Jw($@-gpb4pxCI5Wa~EMY>glC=xabeW77%%X#l6fRid`>Gc*p9 zpr+=bj-NF=@cUt_#c5iTuDk3Xbn;dWb;Cs}n?6$R8Lt)C?@*^}_WbD8^Ti#`+BY6& z5bU)~qaY-40*d?ln{zF%9cphLcx<@~2}x z99PX8%qG(0N8Y!%h^g$)Zu^zg8V7Emp970?v!$uqnu+f9s@u_tAk=wbdKEccbn}De z6Nb9ByB0BB%M7Z)q|9xo+zJ}2R8(d<;?21T$4g_LeS%HFtvKa)_~5y}yMn@Iw1QNc z@+pwUu>DngF$1r_j}Hu6EIRzvaatud7P8&WsL`ybRitW=fUJKo2mLU1kVJZ!4b7Oes`bFbNjZ}*357+nFzpe56fP^%Ejl5$oP+TPq- zT*EXMR?@UrP+TtAW06S=ti3UA|FQwETok7Hyn6V=j8i8B!^UrFx_b8#_xQN-bt_P>NN^SoDs0GJbBoiev z87{r--WJ(?zsTNmNb>RbcM(Sl$+RN3{{XZF{!$16tDbbkZYLFr#qGn=J!?LGn5gfgp@?U5XKi zsRyW_!X%6p=qM&cYHfc@RL}s~R|5~Zju;~;h_URvD=ooPB=-tuL0TNVaQ^_~Xdp^d z&6f*~>=PqtXBlN#3+)@)q$#J4-k7`mYjL12pAUjbx^qDb&dGR-27+3X8yvDZRAB=C zhmY+!BGUEEBD*n{ER;}5)33uBmxv|8coah`va0}cYE=IK&k7SDQE`i{cM-aWJu<+O znH93g%_iohSo*0zKEZ^@mvv&Z`~Y;(};hWIdx;*?>nQQZxe!B0^Nb zMv&D+#x0?prj=G=+Qu><=yN_8vjYfARH~6EnFbUStpm(c zu_ZxCNr;fd4EENTx%^u@Vh`ML>D-m-&fwsqZbrs;l50sW?&4N0Fu5v-TcA)X0UDg} z;kks#luV>EdI#mv4w3^F3g2yW>{~7!ZZ2)pm*u$@X20XWJ*YR;YYd}l1x8?Jo_Hp= zQ{@2F#Y^z$gvw@>qN85j@!iS4#KYU}q>-d2=ZzaC&Yr4`D}>JNu;S3G5y80lu4#Vc z8+)Sq+9^2OsUAow9T=Zd$^|zX>S!s2f9+>zm`r5Pm{I&;DugkSr?EFYg9w&D1(DhT zkb^?Shlida%4cJr3hV*Tt`=0d3K<-1Dl@3esOyg!aPa@=L6roZt_O64Z(fEi~) z=Yi7cf^9&jiM=ccsp*1=Q!XfS?^+XI0gfqROr$5RC^V&TDa$MOpFDDeL{3}N_;abl zLRP0)2neouXbw1q5mUwq3INDuUbv8@6q9z1DO|Gh7%?R+q^!T@04YK90)Lh{ml-_} z!UED1Rj%zD!_44BYN68zwxD98cELhvtv~07LAuiLNQJ z0Wj{ERRN`S0OSer!?oxEb2(ZY>xmO*b8?)*g`lYGfR^G?4C#UZBCQ%J7zraW6#}GY z8w|2zBT&nv2*EW@IJ2U_Loul*N{w-2_{KyCsf>UXMQpi=B36@RVAWQXs|=2PaAr3m z0Cpc#z+y_0*hsZtz!23G&1-XEOJa4 zcalQWIaGn1ERFB(o zdwT$&K6UAXvIeS>*)oZ{Ey)I8qH_-FhjEc0>tBu}pEElt7+|H1+T&w1jWR&QZFA`W z{{Uzm4_aX1BXOL#9B}Q$LGr1UB#mTF_ii~w9s!tYn$s;QOfn)-1Umzg5<#miXM4Lv zORHO!j!J_Zks3OYl}Ay5ylz_pahHOaF`)=cN#?7UV#i$dHSxkMT$NoM#{_doPELyN zJqkZnrX6-|hz@=Ttp`)V5PAquow~UipAd0S$5-05EQZB)A8YV8Nykaa$7p#7Oo0*$ zcUG0$Dau3#dZl{x#_rAn%xj5b+wfC6pq9aJXYHSHbFXAxR76VVH#rrh zbgmV4$r9Bzjecs$-bMkPFtYadAqNe2%T08aP&}_?1-i`0&QyM7%%uUWQJkoCZ82um ztr9Tg{JB3o!mD?9BxtI(ch>w;Ut6@Wa?3m{CA7LSDu&Tzhhq%JqNCz5&=Ir@b-BcY zpG1qdWiksgS#!$X%N@E;dhacORI^&uQC6i(G1Y}~u6RuD$P9eI(Xj94x+Fg$gO{J= zTu8I>cUJ;t-*Fqt?5y1j0%(5hSN>F^nmsWn5Au=*a!C~gBB1f{`*6SJNzc(vfXQid zE4-|CoL z*^$|WwzuTJ%Pr#{%TQS$`*Wm%mggh94YT;xzxZLg0{yAHenWq)i+xcfLU=I!PvXNo#I zh|L(HYf9yrre_td4tp{ZM$K6nBwVG7f7(a?ho3=)r;mGEkRJ5<=+4 ztZF409o5uRPaFl)pr{o=-P})kH1`t?&ntH&pe1T`YILt$RGf+EnGnjw?CUFA{%Y0^ zL5Q=2w9OxnLPx_RiHVeANW@{)bd}5BoWxhhjpBII+Th?_w)3GKw{u03T)G3$fl5~m z+FFzWl)mGSA&^R(#tO5~^V42O$nnuZ1-Bn1AXJ4UsU??tGuLTjP?gAhG1nyJ(Z>ZDG5{81w{~pbF{e!N z6#=D07^tKw)C~1h84xqi3Y>w(GBIM8$yyo`LK;`&rYcD_km?%0$Q%Odt&K)w?XF+L z5K)D^ezpn?Hyuf!7*pyjp8(3sX>~h8YXUcEAS9uWCoWFybst1UUS;M-R3!OqP*ofXj(g!wq{q9z(ir@gejzrPgx$3uUu{H!(i;d@~;j_ zQGkrhMgdm2Uuj9rLhZ$Hf8uUqQpb;am6|@2TgY-@ktAhKxSNrTqoz&Q@odwD-6o~N z<5xU&z-Ns?l0>Lz!kx|V7|x#7br_JDImIe|I^r>N6I4wD0LXG6o}Xp_ZKn|-m{n&W zNGY|PHkS666W!e*leFt^W|_#+0h3hZx#i|Dqhc_(11U&5P-gsjDpwqk0Pj_|Ss4R; zHpEQo)Eledah^noeJlcH9~B?d8B|CZDv`L;AP@H7eIp?6MGn+hTXc)LBc1KEHMC_- z9=S2_qT{1zLF8+~nEpX=lhG2_4Kz_sSz_&h5~`>G)5jK#(>RG>)KzpbWLy{5FFmXl zt+m~iA&-8EKwrE411~JLSDmd-I*hP`bK{$a!qMmiSj;pUgF#}5DS5UQ3)2{gt)4zM=ioj zYYDEvePB~Mbk_;G-~lNE5#qWnh!t43TN{KkKNE3r1WLbAax#uB$7(c;E3^}kEv}fG zM#PxP*&~i!P)N*SBn{ofC0SG~Ax&afs7Bp2@xrg&fdmS0Wzh!}S^9w+{#2)U$bcwn zb*Vbn86xhJ_K@s&D`dd-~@W5QZMp7X4Tge<2 zs&-sQG_C~-nroTMr-lwtjj>4rP&tvoLayMJ2}tKkPZVH+pez|x zk&fa%&xRID;H8j`>_@BS{6|l}3M8We1u69p0oMWw8y&gENUL7SWScHKFT) z7^V{8VU@8>j%j6 z!);n7N_8@}Slh{v-k_2ywa?0!*4x^b6cQmmzqS`WxFdiw!ap&Ufen^>d{4s~8@pbs zKnjd&@j(+hQm7m2Q(mg}1&e>>Np z^Tn$%j0iJ6URab8k#8<5GxALFG-(p{Sk<8e)WW${z^+(q_eN1M0-Q5F={i`u)oTYJ zu-g=knn@k0^zx5L0BXmsdSIUjv7FRG?&BrjfTXd21hj`N-Z{5~Wc?49MyB zbj8@6&FBqNIMX59;F3kSngo{S=1ZRRmlr$CP1{9tT4h|1MJB&)DP6j5Ih?SkZeLVF zA~XRio=Elpn}7t8Sd9fJ1v>cRjoHUd9XcSo+S1|K!j{-bAi2;3sW|Hwi7bk73sS;a z31>1C8%eDz;A@W5Bx_V9!e?VWyirUpi*5iLZHhBB^#ffp#l5}ALMLByd{9lv42yS; zLKRh^iGbM0HYctfDG5+eC;)}M@HXZ+;b10+4eSUaw91_^JD=^ajv;lr)SzGj-I`0L zAwc~wJzJYFNz$095ABzqXZj}rs|5Fru{@33aVZ5D`lM{aj~rXu*#1Po$sVsvI%^zF z8(c!DRih)0Wl?6jA1xcW;dE<;2rIPC+9ipXoP>NR%jk+q*l~k!zQozvR&a@$D&l@`$s zriPwb;$jrJ!8)~)Rts+%Y>mhYs3}wDO!0QynT(#0;IaSFf?#M&(8%JO5{wMkMltZVz|3IGZ@{C0HTA_5gL{$ zQ<5Et8JvgwYl286WhFHL)PdKgBorb{imgGWc#;!@%5}o>mpo0(R~DNipKHh8+6#r1 zN|nzlXNTDX?IMYH2|1~+c{`h{em9Cm5yQuV7%2TmcKPM;U^1>9H`c=(&;v(Hc{|?f z!EP<>;T(E)JFtSLbGWy1N}SjOO88+n=TjVk?cAmzs)2=-Tn8qNUYXG1Y_K&-xLq>> zF36c3cY{L-%!+ldhA)8@aI2C@sDJV{(F6iy^25Ps{<#4KX?e z*qX88C{Rf0Di3r|XMXm4j8F?(`9_1EvGgF$5CeVbh0p zMMkAhE>Nzf?=30U3k*MV2WYfFl`D*`F5Ix@au=%I#^wiv zn7oUWBr?HQMo>d5jcbvp@xc&7C>2_75yar2DES7b%6>k0jZGd(S;|{5XG6BMuD%$j zFi4_kq79?kpq$D69}$H5Y#nx|P&)0Pr2)`katx#upCJNTKxH%z zs``M#A^^`n9CU5!%sQ846sUt~Qdp0ioj%MiU}UDF6eHH5d@{mhrEDPEwU~gvh!J11 zo_LXIn3cv(u=^gRNvOyu$bFdUfK&od@*^5iXjkX|09+zabkQUPyO1%iMxSmgOfoQN zpHy}nEzmEaxa*7SOKUzqzK|`HX3hy_h@@aoMxbv=+<^Lyc=eF87{$9$Ru=&;#dHfE zf7K$N68zP-w~4nt;ga-PBv$*iQiY4JLrmCWlS8{y}I__FEp(Hk!&sFQ}s^c^djv)s3|6!fjJJCb+dH0sSqVcAmB5v(E*&9isRQ- z_ZDX0T|~~8W7Ba^NuzqR&pPEyCgf#g$VfPrX|$U$!Bg*^K;cj}<6VNCKi3&IWn(0t`VTC{}I-a8z8g}9#aE?7cK1mdjc&+1Gc-1@cG|{wyr!hDL z#xmNV0s%ULaB+-dA24wBW0wv|a*-y9@b@1T7Y%2}Nyf=_8r(~Bb2ZM=#hH6*AfWUp z6y04;EyI0kF%AhF)p^*HmMp4~+*_sE%RCD_3gLyWYa96*5I{Jq8<5uW4mf0nK(h=} zPFJ4#(Ex(d-qH(L7T(_47{El0KfIjWl5=C3#hbgqrJyO>;FSwia;wdAG^N8#Op@1o z4GnRhE7FlJYE_8DH4q}sUFy|;c@d}Z^d!VKf#e{$)Y?cC^5*L`Z(mZC#^7t)g~By6yO$xl@RUDHe*nA1Y#Tk$wgfRz&o;nt+ehdpr=v@!iaK=7Fx#^ z>eh-^@SnwAqa7H!5>%7O{{W`$O5|%nT4_K>OcdmBDk3vPpirSrY7eB1Mi~GQ$fl_o zmfv(pUuVx;iuj*_#q9=gc!gX^jZ%4%T5mrsXQ#Golx{2V0;k#?HWxeV)oDUkyu zAp>oEMj&FCN0rnRIr(dbD&!EnK^Yvez^)*SRxvA=yz$GIu`8BO$4qkNobs<+a9qr{ zpda;D?8L5F3db-hLy^>Dol6y(9ox=X~Aky^SBfH~k(L3J=w zO4I-}0|Wx%RGVr5(!Mw(D|S|{lr*h6VoHTPYQ;b*S8?=`EB0W3P*L{iv8ZNaTABf! zNBpqJmQo_&(+Z#&l2W*`2x_HBF;c?{dYM!*k5TgT!y#xIgg&7ZQ!_}e10XsUG^KF_ z$Qp#o5Sgsb6Sfq3w(J^;`QqoOKxDBOD5GT?#q|=xE29BQG4ZEd9JcY4bx0$Ow9qXr zpa8V0s;`jD6Hl|I7i!r1hAEOQiYt$cYd?Eupw#Xf=a|9mqQvTCQWR6kGzbfK_J9t+ z1q(HF1IS`7&H}IblYgcMb&U$rWbWt^yFzr(Sp*)sZK5R=#JDXQcQRRP%YH(?lrSCc6y0RWtd#&iDw zBI6t%71QzrSmPkNo?A(7?d={XDkq(`2;5exSwW~Y%Pd+uXh@jIfJcZwP^+29R0K4< zeYJ~HOPH=hf>!1h-VgSVA^dQu?O|&Y3+53<;W!3NxZ4RX5=(9JE8GzrcH|9=PJp*f za?2JryJING5=ShQ+_=oiFCk+5b^YHRaaFjol*ck0in8jzW-_l^7Up6LvbAjMi=c}7 z#c0~suD*C%RZFa?D#`|0)SZ4K94J>igjA92-nlmAs2*6cC^LkoLM?WRnsle0ItGao z6;s3sGEi>-Q9z|g0;gXLTC^S2S(aH^f>@|(^ub4pg0s9DFchXjpYfg#8lcq5LmRec ztZSJ*CkLdVC2Uv3W-&4fVCke#+}l2TqM1scNd$txGSGr`2M)IxM7YHj4HbsiSe2aI zL>lFgm6EIhK1f^xZKS9fnt5xAJB`?gFoE+9)mAmFeg6Q>KOM*qZ(CB^jN{SJ zGOp!eAPOWxDUuB-ookNSz!-XxH9roh<1E#Id3)J7D?Sl8o-6kj#jHesUSy13!!(LW zX* zrB0=B7=)5ot&%AFea4h5iu-<@fz4@M+qBC{V50!fp9CgF)Qc=t+fV>G8epC{DFmXS zDZCOl07l|GE7J|M1Fn>dD^IxWc=$tdHk_1`-fykdw8^xv%eN$K3EUWYWlS>UNO=&< zf(ERpQn`@sYLiUC)A(aHeq!ZW5^5=ash_ZYAVU(wHmx@*oQrszIyX%@21zl+Y$j?@ z)DfZa!HJYCtlrr&$;sJ8Zm4B0ND@ng?ThKwDc0iIour0E z$Wik-9Vl?ij=&TV#UXYo!y#JKpN=X@OjAHd*m8IF6D7r!)V6mK0AViH*+s8v=ZZPQ$- ziZk+(6GcOz*~<`6ZDr|C4!Bv9;D`y8o_u40H2K{_l_4ZX0%XQdja`}{x}VS?-@9Wu*5$BOL|cL*u1%_;`; zBv7t-c??szY~zSlB1Q-`1_ElPpDSfjE9HvuIuVe!U<`l|C{zurl>i-ot~x==As`it zfR~B19Hr+WERkQ@+J^T1xiC~+*%gQNyoeMOoS%_;RG#s%bq&+ z@7p|;!^EW_PA8HGw-*O%NbM6L+xcKn14`o6twIk9xII2KbkAAH6HFrI_{+XCiI(PL z{zk$HqwU(jw(~~JeKMIr9l{4+yi*5i zEPI*ca0LdWQ_oCjShErKj7DWvoQcI^=ZlMMZkN!@Jc@VO=DoH2MVQcOod@&8&uJV) zgYfyFH%|pwmNDuzBrEN$D6BdWT=AVKkB@OvRXm(^+Sw)SkhFF(Hpp%q6jvZu(n!vp zBMg?_S~Y&(1hH^CW`HXa_IBJ2tlpwWsXR>vxIv6Vd8zVD1lE;O&u++Eq>FO`ty*OT zw9wG?7(13sNn@yS#Xy^i(GJf@%E(OdjKKf^a?+hJqbf0|Q-%v+!ros+Ec|&B_RvXl zZ=*yTASl_jPC$$p_WPG(s?mNUG2@C+z9L#mzHO(5XBSbuw$OKizN*te4m15J!1=+7 zEkNN_6iU)CkT2#b+U0UPe6bedWM4HBEk&)tWoBA@s(oib4~Xh<7hD!y6tEOzW& ze<6i}O;H*n6b-BE-fKd>Sa9lqhf*!%*34t>8hF;Z9V>@NaX3-ZWo#T&rbF{ms@kr( z`QVJn=!8TB70zrLo)z0nSGohIMsmR_En2RG=msi~of!hKM&%%DhzRE7Fi^HY;GI{H zqFb(Cb`+MRN`gn~TxI9nP3X;YRV8j7_!_16ZJ?rO7Iik(IwnNA_f)Zl^@nqpTh zjH(E)OmgMmKl9V0vpgVO3$Y9;j;H5>V zV!(~M8q+@vNC-+}9L$JFCHB&QQ0LPRjMyP$eY{CY6%2_4z;EZ z+yr9lrb#LzZN4)`B0zGbFl!kzC>a+n?aFl1fOlI#Bf^{Y2+Y$TRhqS^=NWT(}gYDG20iGg}rVsNSI zfO!L))PDEju2xPjpUENj1Pe1jS$C_7BM^YsW3W3<#2RBaePo$9=v3Lb8&3qP%E2wI z5@{Yj{OrSP(y5hKEX@y&n7Osvi%3M{98;U=@yZ z8a~}Sf{eA-3E$hCqzgSebwg%x0EJt$`b%d6knRPJMQJT#U(9s})Tvy7r&Egd1TDC@ z^vSVNaFh0@sqbkx_r3oBe@xzRnl1^xwWsXMy*Ltzey3^r{TX7j0)mOUV z8zsHGPbX@x{jFUFFUrgyOI1_WWS|jlZ%C;klmklPLerWl)XN4D6$1hRK9!~1@+aK3&RG!!RwLJTV9;fqa==IuSzNSPeHZQ9_2B)7^%wBB zA^!l!YbDPfPU#}<{DB#22B+cI89R%5@31YXW5uykBUQ`!OH}v0b;#oRh_x1wVEDftDQ4>`hq%3=$$MrSX?d6$+IyA&AYJhstGBuh z3#iPkFm|U22ZXRy=Wvp$QWRi4HK_Z3Bjb*k1Rw;u1%Oun0FJn?r5TegN$E`bR}+E) zU1j5iRu0R^&QiBZ-~g{vl95`9Q!{{^Kmoha+cm1Q`&epD<;_e zLV#COK}=b)CSr8`%|sUnQ~S2=eoK*;m}nLoYxa^mWJ&<32?`e~P|$;kyKh89aiWOH zR1R5<4~{CBGHAI~rqw2cD(WygLhVXG98r*pkL#8Q0xB0Np?4E11|*X}LDs%_b(xVM z60Srut1DVdaT2V6#AArO236Q371apHfsIKGVY3RTqOZ&O#*x88U8*CimOsZohBK~I z&?_;+6%?j52ogfX{NRceBcbucNrN)xM3^2!7)A^VP-jX3t#J8UGG;Vnp&&6)OB87I zhFS|BVKQ{>F!pa}?MLh*A%BxmD}Gos-HOmZ?tcCafUr8Pca zj50R}6kK2svMAgA#~?@W!z#E~MqLq+b-Vfz9fZ}R*+GrzemKBnCxlr*-`fEl7I zP<>6ArkWgf*ju}BOcG23QwKkSsdjOk+!e%mM7rcZGDneNvsHrL*_f4$1!yD8jiA@h z7cTA0>M6_WhtvU4r-DS3$SB)M318x9agBD&qbE&_!3?Y%WOfkS%LUcUmd!5EgeP#g z-Y6rX6kreHG(Q|^?V$^B(n$pN>Z#qCk#My4Cjxj|*=(DTw&ZRt8~*Y;SwyO=Kr{|A zBv(3A1BBnP5(J`2$v6v}naUz0xC$cx3$j+txDk?tHC(Y+l)+TmE<$l^(8LPG zl~8B2=vuybxee6BG{*$9Y&)D(5UbA=&z9J$yd6iG_~CYfb;f4q(Xk>a$nj2u zgu|p&2Xg$%+V0Z6BNPK7mMhzXu_Gb|~bttrZk4o2e;%ETK(+3+ybP6?T zSZg_zN98`%%AO?nV~v>sg6&~V6f%tys0SiQ2hRlvOM-(SwVEb}ah5Uxs+x)ciMwuA zi%2(B0EvneD!PUa7>ZN1o{4$fnE*1-VPq*2%qUEZ za-ajl3rr-Cyna*UGZ-gJB8hsaCb`q0>TsY#)d-8Ng5)c%1e9@#+i)O`qa4aikvx69 ztnxbD&-CaJlz$fJF=oUeBGN38Cjx;6zy@FqP#Raq3pk=%5E)GleF4BdQ&&|*PcV5Hl#(oIM@w*zNWU%ncrkhAT20KX#32>m=blbM3ptt&Y;!>3AqiCqinlU5!QxH=lK&Of#=9D>7 zfK%+K!9+UZQGypmsEctd39no>F>I3MC8pI6U7&)*ouuSORL>m2LzG|BZYEE_1wc=i zO$HCsdZ~0>v@=HW&A5Ro)uRTq@Swrl5{U&)kV0b%%N(1k0NMjN8r0@9#fVNqPNPU< z)9MuzyG6Z*pVJq8U;~ilEWsMGMpo zxa*Rg&>t!x5D~*Qlz6}=lbD9Z93sT4jCKmv7jwmP97X{fL?j_(lB3iR4QO>3);2%2DMYg~ zJ|>k>0`dTbFBcF=QQ1taa@qxIO>?2bcA=yRs=8xN3iHLDHrZxNtC_8$xoiVd(L?c4a+KCeqCHN+=dwZ0N>F2xwEv{r)()x8GH-|IdEs9sE+IaPVY*BhPTD#qs<+ zd^CSk!%H*2IPwzLYds5wMayU)6&1?~mB?F^i7!kt>ipCJBVH=GaqcO(3xA`wTWc7t z;R!n`Y?0AU@0z}<9L03$h5rCF-2^~^O1}^IsFl4X%~d8{^32S#1~tg;H8tuz zL{!*L{*8+k=c5c&Y59`~2r3?D^*el{Q;YV9#zj+`;1SPz3aUVfN)ldhD#RTD_+s3* z5FSzDlp=8`W@ctraMU9v{{Twi21J)BfHeZiV9mZ4*q~>KW8O#DZQWmos9djTu|z z-WXPcI(gvX5)KZa$SWnCjpEr$$*e5a(5Oi#KZmVX>>A?q8aSG=P%q+^G=<$*dK!_YzGDE)x!q!RNv4tF zgj=MHS~wJz2s}47XA6;XiXmzfZB0M}THr)eRjb=ppI0sNLa8OxHj=b<@-Rh`v{C~c zg9_zbTeB#{cck2O1?*G6s-;TD1G0-(1hi*Dt`A&3;4BEJ2_THpsbNzK$Qq2UDubnZ z*A;GC1~1JvB)cIMXh5ZLTt$(Rq>h`8<3-SrGp-6CJye+%qSXqtp--l!n}qEB^qIK7Tor**hOTu+j| z@=vO(PmU((X#f{T1mfG=BGMroybl-6pQmKDySapkV0Q#=B}ft#u3Lrz=rS$|?)iR; zqLCIeMg*v_xJ8f90*2d`=L4zgaU|-EXi>mb)HB9s2IL7Uy06OQE8*T*PhDn9@9rU*wA(<~= zkwJ>)Fu_}+3NQo}B9u69q+WprqzgnN{K=?UvQ_^8!w_xhtg}(6=o8)~@N+zndy3{r ztz$yA@!P2G_ZomU>JU_Q&kU4_j*!pIECw!+b3fzlukK*tJFRB}Y>sP?1g}q-m<)wZ zgP_H0hfM$vnwZriH!^9zFl$U!H;)v-5VU)o!EA*+RMcP%-YQutc`D?tfd2ptQk0z0 zGzFnKXX8T_y@`Xq`HtGRx28S0H`_jIB5}qkS!uk2LapQlM2+T2RH8P z&v9Qxd&|i)Uqu;>ZUm=xU{KKIO>0a{Z$K~+F>VDG0+mDDau)Y?p&>xAM&X^e5ia^< zTBL(a=}cLUfkdj}5Q1iXGdVI)9R$6Uehx%fnx?tx%DoE6{ z`o)xOGL?|+^^rke<*qyV0(5$z(8@0LyiXvN5=ofVWT^lixeT+=;5}GCoj?=CPJ(d3 z46&ucMz+uaGr#xNnbLuL51tYtE&w1ZPZU*-I4PC~ifJObLZG2p6$NR#APqFn1}zv! z#$zh7jX;MBceI`x7~ghI`$z{;G$eGVOcbn67D3`v35iLNKS-y$A_WC#J4L=L*RZmW}zVR zP{d$>k-(CvkyAi?dUe7Kn9)kY$kI5j-P%_`d~w1?MME-oVyv;Wu_^~zg^-c2QJyq* zz=-OODK`t2DQ&~tTzXZFQnjJXdDj)LPE(?Y#gP!*ExZhkA@0;{G|HVprW?v2u!3qk=^ zx6-r#sMjNkZl19n!!v|(Hn61|%TII0Eb1r-1Fm0Y8ft-Tuo);yRGMeg5+X{9DMf^4s=}@fN{q7U zgY-rjuGE@Y@xTL2hf(L@=ZjW$sZ+R$n%Dvc;HtT0*ABU8J}ZNu+QKOPWee2qRvG^Q zJXe<7L^>fdN*AWsbpoT7(rHD|j??u!KYfM;;hGJAmqK9p=4nUzOI&M0jj#}ct z(r_tt3Kw@+%P!r@Xgc9DkpaSNSrHpCk9NYwv|tBbzh(|3whB{JxQ0&OZ46)_5|&WS zTJ-X!EsOAzX$?xD7RbdCBM}9Ha}4oKUej(N)k(^O{cuJi15B8Mg=!Nb(-qxo!N|CZWQ+&m03w;3@e>9^R6@F5GqJ?*+k@`m|QODdkrjQGj+@Z*Diw* zGci_h$OI6xOl436YOM&R2+ZMAyR1-DF3`w$L%E?0^r-{G%Mol6c%{mSqF8=eqO^3W z15yry$YJE1ICk(*25FtGyGotXL`ze;Ly#w0V%3`_LGT<<%50iQ){ap^Z*73?4fog2 z7N;v^sPs`0B-Z}xhMpTJpyExf-L1OAB&$2Jy9~sI7*H{;gBC7avOpS6pcr!eQp6?> zG)itQW?2*~FKDPCm*x9Mj(A1uG7{z6;)(_W}N%Mhh#(XjB}D0BcQYi#to2WFG>bJ8mh8yZeUG zeY<}j1tjru5v(yy$J{F(&t~LrM`WNi&bs7rrRzipzzShp1#{!bs-ffzkaKg~jhrdP za<^}D##)z(I|X`$Nhn;$N`OYA4L607Oxe#2Pi_jdt%-+j11v+gE zLf1MCPAFgB5*iLiKHoG^vIR~m3p;yxtS(K&;w3~fMx<4V1P!$risE+GVLLL^TQr-~ zB4L$w=WKFLk&~c+Yg|~2TB&6aG0pL6_bXwI?a0xovh*@Jn zB6et@s8w~(sKO@!sA)|SrBiDdt{!NuV9t5lY7i?ysmolo#oI3mIz-r~e2+Xw84nd@ zaA$x@%{<#_P`L#S_=9VJy>JOQ#WLJq6pC5vJPYS9cAeEq<<_Ky`|#PJ;Xen$4vF>t(1v$E}yOqjHU z^wT{0<2Pb1&QhFM14lf$BuuZEFQkG=Zl<+grG&^@+SsvTh)zkr@lbWfw20E~s+>}t z)vYk7njn@cP(ULsdTCrR6f4C+%9O5{lU2;TBL%%VZR&8d2f;EWTK$uC#&O=}<8OJM zBy&~}84u7qg;Oa~B6p}em0L2j&jBk_oJfgcbK&};l!DuU<8ApTzvIl(Ti;yGz6&Un zmb+S$^ym#J-B!6B4tTZ)rU`02PY!)LB}lnJUdemKa!nQd1(^Osw$~JCgeZ1|ZmPj@ zsm~H_Gd2Y;OQpB*+NXc$o=3KMKPS4hkOQ3<45}~}gGC*>l#FitHK_hrr589Rm9n2! zx%gm#suH#;0Xx1K;z+9CQ)@egflTpBG*|Gl{VdUt6b!>|>!GG!ZY@GU$C^78oeNrgwZ#8^imTnc;6PB{tUb8+&d=0C5q0rDk@xBM7?_5<)143C9n?-16Jj+@(;`LhKMB{3Xj!0D2nq!CQbK$z3AU zR-12cSwynM^>e-a2z$F>V{Y2!B&9_>KHOP>(9ALCUjzoJa>Ws}Qe-p50eMulmr@|1Fk8^gk=FNgECIzgvv?~Wvb&* zl`xW53|0vSwL0JpQM!+1X|!feRKOUzAct+$H5+TDSV1K)1?{C%ajw6_Vsx-|0M%}n z8zV88!+_h>sp?kpZ{tjGxY1_k&&3uMP)Mxdq+(s$H*@3SaEUyeoKr(!v2ELSbe2Yr zs6=}}HExRDM*(k1BuJ4;b^H@6lC?+3@~aPFEa4*pB8M^-qe7M|??01tO_$#HNbO)5RScGn8G z0ab`(KCz!{fkTVex3DpC^zMFYv~3edRqjXJSG=T;E&a>RS((-?BMio*h0s*^3};;4 z%2?r&wHsnMC2x4NVy3LxsWl+~09+v586$Kf-cH1c8@U@$vL3s1!j1WyY8MEE-o>8n zWP%72xFdN^=gdZeqy_6r*T)w2-L9xka3G=%OGMq9T}>vyI5$Dz>Z$>F~rxAjRJTpu4Fe68BM}^tzg@dJ*G; zwk4<$iWv~e?W>O9Yl%sj*cnidO?>_s)3AKrb6of&Oj3f2Zdu}R8rZ5NnX~|(NnEo% zYl+_&$UGPWl8Y`eRp}W~Rzn?f(45UY0LE;Hhy;Y(O4{1#oiQLTQpax3T4j}Kg?&S!;DjkeCQpjpE#w3g zH3zT5{d(d=NEBU(Q$~xpkeMl{9W&{Ih)_{1fdPNOG&Iu(Ak|SCltdF29*Pwi=}LW` zSSxcU1X73!c9^SXhb>43r|iL-q!k(hCJWy207bA5oyK$?KV~dj+!Zi=!KbY6rGpfD5yV&DxVRFjQuk5Qrf5#(q2er+RQ*-kRJo43R{Dz zik%d7GF+4L)73&i{+MiUJ_rm}eystk#z6$;G$eT9ePHzqw5H2-Z?zY;K{O&jdg9r= z24+zhm1jI9(e~ti=ZEQ=jhg+q;KF##$9)rd1`78AZTv(~;l?pBc;ocL96Pbi7@2k{ z9@$;1nyJ)+KI~VNWhD5PUQ*B>Ra!rosjWqPv0S~gTot$-LWui#mRS?gyh!v)>zuX1gQ7F$^% zB^{Nw08?+qm8VQ1R%HUk9-u-k?isD)wt~HtrdYn6nGUB*fr*+n;g+2NcCieSOAV@;BF9 zZyo+F*6wK@+lvwzR^BFJQXwM^%n%v^b2O>I8aS*4m7?beZ` z8@EUeS@%=YeiX!9yD30GP!Egbn+O11dI-~U?vB6Q$3xKOaZmvGEel~hNLDpNALhj+ zb^vGt9Yry0LrW1+msG)CO4I&Q^OjiOkeFN>6(S~)M&N0+RY(BSrNJfW+Lj3Bc*8ckkqo<|U2_wD$wm91)0O2o`5$ zG!0*v{{SrUoNo*w7&U(t#vD;Ld}LS7kwte9X-JKhM%dMF#hzPh*A^^o<8p#SpC8dz zx=e8jt#e~7t<1LbMnuraQRC}T;pNvEld~&wF(RO&p$-t>N8n3WTm=_0DrK8RC2j)<(KH8WCoImS;sX`|RGliJ?lKktki_O|m;4+Mk&3S>tP@VzB~3

!?~J2ba3el$r{aYt8v*;B!)Hhy#etHo+N?k$QHxmj&q`$-#qo7 zH^|;{R`#}0Nqu)SccR=b%vGYBg{h1%rdxb)>vp{xVg$PYI&@Wy$6WPI%>MxPa0Zah z!jPb;c2G#C!#oSfhD(&Hph4FY5QM37BVV@+P_`Z?LF0~G>v&;%nd7&Js=V$JJ?s^C z9V*6v4>O1na-_*kZdNHzbMp*jfU494uU+05VC|3!=~O4T9^=23G=>RU);Nj!a~TTk zrGssfMFE>@3aPC|7~q#`^TWX`gogHM?p>~~Boa+ENtlDVn4eK3=Ek~`aJ!TbPTUm5 z1Kui41w&=D=6*O=sK}Xb4aAoBP~E~+W`UMSSg0T}nu9};p}>hTbtE`ZGwzaEop(tg zELyaqF{y97>5c?DvVt;Rkq9+$nCXeR8r5`gTSDy{tFEX)t_so8T@0!jHWubs(pdmr z_-BEO3OG}>sZ8n*jxC6Z^-I)3wpj7;arOe{{?#wxxK(NR^_OcjAfLpwD^dk%ojy36 ze32}8^Ha>KZ`HlLk{DG~%#RZ@F7Hc<5I0w*K2e!C-(2q1A?1om_ zjkr)&o}xj|BZ7mNu|#<+ay+HiGHnv-I2JBCF3q%1M6jq))q-kIjus#ZEye0lJ1p7U zI$N!zE+T-=v&tVvkwH~s;s82f*1*IlmK9EH{ngIfgKg^M*0qav=4DY`2-J8CE>>br z9tt%joVB=uS9h8QxV&A`+CoVXlb+Xa?(0lER38qhQpHj3Tmt#j15ELma!ij)rLOCt zBz4afr6nLB+cU16Fp{N0PfdJlfOX8ZGI;0GxakxjZMcC=Mx)0N=)qe_BT7rP2?{qF zbkJpvkQ6amQ{^9t58sG z7}bsQGC|FUF7&Y-D?EwLiVC8E+C!#U94mQ^Fv&j6LPpYU8$%L55U>1K6hxRZDdM6G zbgf9rxaUB(b_yv_YoFbMECL-xYYZ;?#9*|mQeyy`FZUW^A!wW`czstHqN`|BM{*w8 zbX~0=&0V}$bi)s)_RZoz?mc)Sj;uvOYr@_hGFhaxks3SL8rteLYCFc=6{u)%{hXs} zPZl7CBR=KVL6GRZ$nouMb^(l{cG6v}y|U4|h6R?UgzJdh*b%tn40uzTJ95-2s}mq; zN{T9)(98+&3WP;T_OIihbo%X4WIH*h1v zY?~}@BciebOC8~JY|ckqU7W=2w8aP7MqN_$n90HFkxOaWf%nM9V#91oG+&ye^(Pdi zV?+y|Hx5cn-dvESRabhF7z(PLYlV=(!sWHT@iO;NFqM4{;fb{Ryu%(UB+W$F zTFg;t1d8yc`Q-V5Rx}6TD@_@{{R)lfaOBpxXcNy3pV9(rEwxfab+d!v=KCa zoQk1Y{{R(!ICbfQ%}|s90H|Y9t{Emu2nHY= zjaOP>B^rg!waICgBQ-L?2f4D(3t)uImAakT9YtH^Ud;BA`LYp1zIR+>{40E#7I0b^SH0mi=8 z+#_mNWfLteKwA>dc@M!-xgz2qv!p+|-o>*0y!XGjJ)s9JA3F~ZDx^G&V{Y*38*8W} z2U^j9I^uU$ArTn>MyR_SM{GwBy4=Ze!E;)!k*PGy<%(Sslxhn#2_$MO*8&AsDFS9l z$c=ms2n7mYq#TJRwI>`y6v&sw7ah2D^^a1YMNXd_HV}MJ%&FSk1pth-sM8h=swC>F z^1%|N2>=o_)bz;o#0yaZs&x=(rDV5X%n!ZI2GOafo;ZjKy;A`t2P9#nDHzzmg2-~E zbN;wYs#q=%04z@!TDmPs&6b4KhlkmSx-&%p1r$-X{{WeS8WsuHJv74NT@h0%ylhx{ zXx^YJ>L<(nFkl#$P*|fCg+q#kCaiR*^TmkDs0gCoNSKrZ)~%X@s2+Hkz|%0IC1}>< zZ7k%f=n4L30BsRcQHeU}d@t?yxw$WEb3XO7;-x;__V(ZMT&6-4cG?wHkIqKmTW`xz zx|PPJ-)I02AS6LCj&g3t!B(Bxwjol~D>te-5^4uPemJTFoD*FbrZYu zMHOueLIk^MRsgc=O@25yMp2I^OawZA4ZxBi+(p~Es^cOE&@k#eF?u((MxjQE(MKS8 zSTY@_<)d^SN3C&Q=rb-An`8i-TEjKD?mpD2j^6V^D04K!ZCaJG=A0FSFhcbI080$P zRJ4-6sK>Z4HOy^4&mDF)<0izK;{FO_IX5MlZhMGiX~9>{M6C$vsOmg0!#zRFshUis zTo6xl$Ej9$hiFtG1ePtWPl?M4H*CbY6i`ISU}~Yd^$a0I2@}O5wo3Nt_W{eNair=85AkA-9!#ZVbsGZsUxr(xXhVV`qNY z^1XPf*X>C3RenfF8gS@ZNnE?16I#^x*0{{w5(y1biV+2n7Uozb4Am+|Ky@E)OfPRK zLQaD0K~_iOqxU2d%WUg!%UHr*cu&o963_y_^(SBYei+iZZacv7q{ck>Ds{DvA0}Y#rD(;$R$>860<%D&#$aSH-A@Xm7TB*vYQ!9baE<7;Ic%U8m6Da7OsF|8B>`^SwfA?>eh?baOqqkF<|9X znM2P>T})Ak=%GrAl21}=*9A6_8bfx)BBK=vIRl=wClU)K&bTav*ujAR0L*Kq9tLWu zr2=CEE1{1vYpBq8;nv6@kt^4V0X2Yt0 zNM}Gz!QaN07d@61HsyC+zok@5Qy3)mVc~(fw;<4jaJV=qp#TuBSrnmUXIcV>@e1lZ zDTsg=I)0_rzizlIi1_~icKgyRf3Aat<0pd2HxTP3!kF4-SkC3zrz7WtZVW`>ZT|8+ z1%4_Fi3M>%A@qPrG#UIb!#5=ag56uKXnb&SVwEC7lb|D}qXc;=6sDl(BmGtQkUj)~%pZXuZbku#sf5lau@hG{8ovn{Q}afxM) zPR&ZB4ii+7ZS@>Ru8i!KZu<^{6v8Tl*G7o zpsO7G#V`V;5l*b47uONm3X^cV1eB{Q0hK=7v3fER4ap#a3RuxRZqc%pc-X6{)Df;L zm>85|K&zj&cr@qdmfPy1uolsG%(4P^P}6M&bt4uhcw2xh^*|!!bboPi7M|Sp(oOWT z-Tg^XX~}&?<)QJ8l-of{gO)1o_XhRcS+NcEMJVYDhuui6wUh-U9mHkV{V`(n!Khsj z$YpYNn$%Zc3|7>i5k+g`?d&CjSGbyJ?qgEW#R}B1r3T`1q3esWiK8Jh2`v7CS(cO^ zE_C}mMi+L4*F{fZ%3blNziBUQD~2jpaHz}*ABF=^(q9DzHB(IIleoIOGBQmz`B{xU zLX|&gBA*Od07^9BM1w-9bDhk^N5pyKBH?u45~&!BtDY)KN?8odMF`hAHRF^$HeT@?ol;hZ6}4a`Ok`xQ#-HVq*^5btlkU z`J5!mE?F3f%}B9Gpr3f1Xb zFB4Q|*f^%QlN*4Of*1o##)rU+THH_6X$24(Xp^}hn&^B#rYV{(#R|*-BPw|KU<{~* zmyKa89ZIrhM}gNrh{O_LSmcNSAw?{AH&MEFnPQbeXypQoRP-&>cnlnGT!|WJaeVxE zC@_h|WgV}kSnhK#AdI&;ohvm){vUb!(Le_U=~Q3cSms(21A`H zr>+}!X>!eR96_gYbTr8q6}{ck%OtE@>B6M0#F5-1D8caq7A?Z%&`h#t>-{JsBL;5V z(2r`9GDR5$_w6(_R%4b}T&; z1fkUCo}fwU1|$<^Si6jpW;KRT3yG&Ch#_HG9i;Toiuhth`A(-Glx={fx1JcHNt{94 zNoyNRyK_)fP-#IQz%VHk-PaA@x5=)ncZmujQ!Zx&f2ibmLu+k}Xd|D4rgq%*9mlA0dei#ip0aD22?kN9g|?Yl zq0cj}enTA*63;{>*0*zR*s8#+N)j)JiTiOIi;ln?C>KC7T(x3DP@f!A4slH@(lBKU zLI4>b{4p{wMc62Unw@HWKw>nqhjdF?N{Hr+Qh*jBfLA>5(_&EsR545{nfGifu-Y2|^Ka_S<&h+`8UNy$mc zj+FkGSc9&Vj7o*zaB|9;8g#%LWE864nl+iEA23<~qr{z0!vqAKMHxDZ6SYUoGR$ZEPA}WHM41#UJjtP`pC@|f`52>a&5!$H`W^#iZcVcrIvqNx%h^7vAE3HLUmtPDb8(|r+ zEOI}XMJYUaD^z0g?}xXF_WH`4Ya5obk~A+kC(_SNz1dXe5SoS07qrO48PxdUg*f&q zqeM%}sLdnGGnN_1#h8EvPN&Q6#x$m7Bh6^WAO&Dc>w9h{=Z+jLo88~6dwE9=*ARql z#bNbrQu-50(+{~IA_FmOvt0-m)bvPXc_S(&paV8f1K>s~l4JKL8sNQga;=qp6sLtw zEK2Y+$yAgQX}xDW`hq%rm=}Ci8-s#^MF~&{YEq6XO)yL%ktZu!1zq8*QJqE!fDV@E zh=G)aL6ORXt$Jb5tpW)IXJM^m2-Ga2^JDPxIJ4>ca%0|>?i?xpsiN(bJ7tWk#8>dL zoytd;BL;8j>YzdKS)S_R^5*XL=0f*ZPV(GHb$J}siTIrGu_9cGBQa)7la;<}WwV~< zN$nJ)BrL?BC^n&?{?U-ds9tZlI$5^(Ddv`2`*`FuRI^bGO7CCPV$_Ts05voj3^b2e zP%`1IKCCXr4SzBA6iM za?-$599IRGN~=)YayoRui8d)FD5M~-pN<|X5Q;5{Ds#w>=Ye)cw?%NNlj!+8e60?ul|=uX0Op)1n_2yIc#3E-)V19qBFLS_`HIp^Vk5IS8+ zsbvpuN{UnQYlUgzjnOu-ME&NHPRfKMe_vKYgRXdGs6@M#Ln2iCW#e&|kl!MPme}q^ zI&P<2L>N2fx=x6`?AE1Rw&+lsgbP_e0k?MT{VQMYJHdO+)n`+c~CjK_jG7Yw-^$+fa1 zx~JjRY|BAQ^FB4$0a06MU`r5)Z{ZY#&n8fB{B@ypO|Ukijpj+OQ6jv0VE8ndXM}t zoY!C!O(AC)?jt43I$|VVs6neNq=`lhNiFiw=zp#ROlFwe7m5m&_{NJ5tBxabMMnu8!H5degaM#&Y49e<@UThurN_`%bDH;=i!xsKk_ zKK09n+ZN!vsht5N3gE2So!RM*J_^)8h;qB+pSHu>9Ap<>=DCjHT?Z2KHT< z5_aWP(Cd#uvfJ8iGV?cs{{Y1zcZ|=Lid+64g5T`faFA!saf&1AfK-M_JBp_@2DCmNcyPYJ0$e3Z*h~|&(Z(fKw+wP3 zvP2vIi&aUL z8D$*_s2f;kwE1Afz(OMEwJ9Rd0148*f9r;75)7nANm~nc6ex$%bEl3tS~&$ek&A5P z14;p{aQN9QfXQlX~i4Y$HWHo2Bz{)bFg zlg6mUQApoW5j%>h8jWZU9~o`l z;`~UAnfufNNK)KO0^NfcXqbS~I5n$lxOp56`M_MIIQ8SvI@l&WR9{aF&9+Jh6%flM zcGTxjEGS!q=`3<51Z2oymdjw#%Pd`z-M>VP7&3-EK^Un!1`;8#rzFVvfKx|iQQ_?n z^~!@HJ~)`ch-6w37d8WE_5O88DNM(XeQMfQfwYOw!4WQPM!9 ziaiv+hAhT4ZYWu8JWL%`8*)eZms+13P1uk_8U-;4w;y(}$0Dqz86?QMisjUJ{kXTa zz9AAFi9U zcSzE#J)$VAeOcs49dO$c{lv2Xyuki(kgy324oF!r?nzM+wxT} zz_TR0#l_2A%*jM9cdo{&us?`rO!dzR-QS+CDjQa!)k)e*q@ozbiCxZhVkxv@?&e?GX&*4hujs2=i%rG~y=`wS zhj;~~Q(dRS%g+=n*_5k^R%I|Km?&fsmp;8vpO{lhV$4B{6N&;}iDaAPcP6rLH6-d! zTAWjx%11X%h@y^26;~$S&C|mZqy)KwfeKcFhM?zMu{P+cU5Xx2RsxyyBP}p-X%xj%n!^%>iS;o*!vcJzNb?06oY-l* z@gBH{l?I5Nv>U?%x2W^ONMPteb>*!G!}#De6u}i|_TMLM!}2z_*A{8WC9H+btcHr> zooS19h%hjACo~g@cUF(xA8`Kw@=kKf{M$XGrp6&Wass=FP*s!~dTEfZ6%D_mY(d_o z0GV~m*aB%vF#cEq6uR&g8fm5`E}~UaCRvJ{{{W5~64)SQK+F;2olYByfT9XPH8j8g z#S@}q21>1cICZ}@5KD?R5`?M95w0vkEP_ST3wG_Ku?d31FdfTjJxbCH)~E)Z0oM!> zVujXcz9!yFUeEiDzffLT9IGMA(#C*}m zhsbG$!LW2L%jupwfcBl&6(2Kc3(spJtd`Trg&sYFVIdplBDJ}SvWk73OYd~s@Ua3U0q!)J7NWw65jdvLoWmY+Wa;-5J zZPJ-8fpY2_cXd}(`L(B0<}kZ5AP^HK0u9QsT5`>q--*Ajxwt86>9D>P0zuW3`s#xW=nk*ipArOoyHXNHQpb z>tGp_uv&n2{7%0dEV&L7ql%BXYAS1=Tq{vb6ii``Ni6O!nngCY(#I65y##@!+)|N~ zxre0GftOuy*cuW|0^&smXr`OEp=KS;(E$@zU+r%^T{krbm0VNkkkxU;C=Kfs8fp)Y zGqnI!krGz@w{SL~)`ZtmbO!)xD4HO=VUc&n`<1ClV>y4tFa(&qPk2ohUZELf#fLAx zK@d<0k&lj)8vITs&fH1dw>0e}H5K>U#vgBTe19X!@sD{8jHz=R3X00vdPITx5tt*c zc+#_P&^~ycL}cj9eMpfKx@W(xtgn{Z^6ujGIa#9(Z)E5UOB{qcw|JVkWg?W&)EsEs zXj^QuY|l)YBE$=>V{jpOQhRl7+L~-6mJBo?coKEO<)%;)gSQIf`L2`1vBd_~_i?-; z>1DEpb>6Z~6K&49fk9E`Fd`BJJqL&@tteGizMnHp zMZJK#5g{hyOgm(_UNJ1l>mO}Fe{FFr^N4LN!mriDpscLbqR`OpWA}B$+xFPq3{QB^ zi>I5~GD!?p_KtSgi92G1v8!w1z8*NQ6AMzL9lU-Eu39n}q2`+I*4VN}8VSzn?brrd ztw!V5O)%4T<+wN=Q;0Y!QneCWFo&>vS=!}NHDp|ja#d+vU0ffTIt(7tR_+o2pyN*P zc#aCK;V9ykXgcLA}LdXcFe4kqQe$T?gjL84mra!C^QepPIqlpx}% z+nEn4XQ&1%MXY6&Uad^q{;UXziC}8GR-mShBxyUr6s;)AgRh^*41{D(ra(w$Q#?`; z-f}-M5~vMmaMKAkqnZ##0Z9lfqjJ<%s;|`Gt+^FYXrj0vR2q^E9FDcb-fsjDCZmcG z<3d%#oVEVAM4~ZtK-G8^P|RC?;%a;=g}$1m;)I$wPK)X})S6WMFcJ~T4RA{4gFlv) z8tF_|luV|fW68XmYUE{Z0o z)QPu%S239c*sHA^*4<-p7^QZRP&$lVv;hvua&$w@66C8>nIg0U4VB1@0uTy}&pgC#$yCuFp*Rmx zb2Y(EkOJ50mIhalmTlB#I(#u6uz_;BOQw6^F@mUex>Nva19*HfZ&VCvm_o&A*-2w& zibN71s;zU&QBJr6XihXC!YIp0L)KEpo{rc7qv#3L`Qo$4mf)X6&c)1oj>>21k5EC^ zTwB}EN(n{LazY5+7xI{p#H~ho=Z8)?j1)(nD>k;#%2&2WYdR1z1Z9>w#i-2F1=k4! zn%Y|eS=E?SDyVD4>dT%nE5NE2fq3mV6}X(c5jQlk{k+_M4RoFv82a#_s2r$U2L zPFiP?^Tm1Ckg1| zyHRQ{Co$p^Y|B}t3Q)bLh({ZUnnHg(RMkdQ^2S!UkifI&$zF}KizAnfw=uw}bjA1o z0Nt`=06GdCP8c@OAORxpR_#=EtB#4xyfBX5d#9L-gpB<>5w74GqiAAILY;A;J&u?e zznBUDk*=)NNiI11iB${4)nF@J!yf~sGwX_XHuI1U6u1d%T0qmW5r{U_H5#c?&;y<- z%G3<-Z;~MG#cTd1YiQY>HzR=2NIgJ<<}n|_mAKaoL0o1DL-ytnl|GaY>B~Ld9yn7- zMY42E9YQ3PTRH$L3Gk`l1XrGB?}=mT`0L}ms(<+?io*9tMXDUuwbW-@9EZy zN8HpB5t*icW*rU3rWjQLwW_5;B$nmagx<_cl^OxpFDw9@t``CGLO_ZfA6qK=I#a{# z#d2%GScsxwYMZ4-aomhI=GV)|7dD~f38>8?{s=3`OU&Xm8$t9i8k5s69Cg?{$QUZd zfh=f%6mWb+GB`tVL8X+aiW9trYMLu`K3K7A2GlZD<`xXiBPz24P<((maJ*$gRe4)w z>yrVMI};aHKv=NbM*K=Os2(`$vWb_JsEkMzK{GLIy)@~C>Z$@3$l2Dv8ep|3h(w7Q zsA-)k@&5px1k94GL{UEDE#aQ-DBttoC40qzN-Zk%^BN3a+JI!@td(`yZ_eLc^E|xw z6U^6F7YwN!kCO=F0V7Hbg%kmnCU6?GMI!*^Be;m$TulQy$YE`)$yyRTD}+uaG9!W^ zCl0jSGEzs!5)Md8l^I5Wk%Nf=2?VM4Wl>KG{4mmZC-2P z{5{Vymp?^sCEV80cNz%6Bmwxcu0t0+SU>|J&a0RgqSnsB=1a&RduhYXxnWJES<2K= zcMlOvHc|i*_#gq)A4wZSJ2btUs2^*=CR>JeHPjGw2NFeS7a*E2eHE)}em)q37oz7u zNgn1j0)+nnz{P38si3F`EL8ymJ)oS2+Hed_6iBilLVIDHu66v+hP1;pQObZ&l6tGR z(z;Xn;S#D~UX6;jLoz8rDOc&)BRa}RZLHuIYv zJB}?4j~y1tA@rEu;4$4Y73jj9aN`mIB-H$}3IX7eS@zA!Zj6z%l~QzSYn3v=*<&Pg zpjuyB7>2}MtGK%jO?(N!ZY{8;7^AjaqhXRFrrzo;(GW~-x`9JQuUzvuY-Hi3f*A%b z6?Rtq#)-)>BT;FleMU1TeA-R`t5FOeGC}F!@YyELZf)NBWH4l|OI1?l!FDjFtL75$J zLL{Jdj@WZT!a5UHZ7G4$`LZWag&~MOgU}ql2MQpBab=RGgwsyFF$|4FS6>_~sR2&~ z!MBkeKqVM84u+r81q(PhC@9Vbk7BJ#^;_PxR0usf+&}f z>HrM^^>y>6Dic)E6m(9;HC~DGlh7ST9|@Lj3$!{aHCdchYQTD1&!#6(ndX}dWG0rj zadssQYGj=#Nj2HFy(ySDJ8*!Bc)9p~s=&7**#ysyPTkZZ3uh<2`6z%qs!#s_vnI78 zP!2l8z?fm5eRvI=E)JUau_jIFK&BlndYteYl~^otu11RuO%d^Z6YCptXBbzK#(1(X+Uu3nMBr4 zs|KsKH0Xj;j9JBgDW|z+;`u2qtRb9}?G7FbUM}el=q8pI{LvcFRU|D$a5{J#GB5-d z6>@q$A1b5?7}tqheo3b8n`L6O0hNwaR?UWbXNm$-)ud5P$p&=7>zL%ZmyRw^ke1{_ z1aR6R`BFH>(10I?EyiZyF()1vex*?@3WdFgCnpQZo>ss|#$3i#;Ei`n8oH1QlzQ${ zomA9fA_OF8&M>Yh^=gY^yS%(_wRrA2^Oxm##)FuR*>B+Eu6J6j@~X&-98~nA$khPm zxr*Y%P0dXb8Msxm?+9aXnmVn+!24g^94|3@Vr}d$xaj_(e^jm8fc&eqh#LAjp0vcy zFfsw0N{$=1G-m9gYE=kZ+1v3CHSkZTm`fdvrD-Xj(nO_zs6aA34ucKR2tkOaY}I>` zCRD{!xmjAuJ%z%nq9`i4Z60G$p17;Kk+TMR5IjDq5oyWQYFn6q4ML!J42QsDFx`$g zA|T*^myl?P?a5JEf-9l(!lk=0z@YTO#YHOpTGdLUDD{;!%gYln>WWb;c}mLKIw@z{ zIAy8ZnQDx`=Z+Q(MQco#Y6p^DcB_Y?wKO2;dO3X!J;p$uUPO%}eTKQN|ShmIh=hEbXgZL0f21VygXu3jH*5G*;x7PTZH;i@D| z3C_Cb)`QGo?Yw9LiB)O!BWnXd6{@rv9-!h4&?r|#I@zw;<&jR+C@M!M7EBRv=z#l>0)P;5 zq5JSezDh*}R+Bt!M%trjrDLaO&H|tSr@7L!8dhmJfG!7cLVFDU&}E*ayXi3T*=r(yCO712HW^!{r)N#|wxK zxoDG{^Dbw8gy)XeRz?LAsOB36(MQyg)}3*FHz`D-Dz^u?t+#TuD^LXw*l=Kipr#(@ z=6H@>xXB1@(+8mmfkDl#1~8{Nb%03sX1!kG>xyj0qO zi;}8k5f(GeUL{HzMH!P{|gl-z|) zD_un}d)r`0F>s>EByd=@nnm1>a%xZ>o)q|CELxGxp^6^a(Ok!;5LA&s+Dbp4qH9Av$tk%U!ZrhqG>F0~} zHrc#VTg;NR)yfi)Cv3KgzK|)W-;DEq;G{!3Zh@LQ&8}~ue&W(qqLvwEav6By#feV* z3yPqWL<*WoK9Hm&j_eId7PZ|?Plg#e`b`|cuQd@Gi{w)tLdee=v~N=w44pSCiq@V- z7B_o;P&hbzLCtlkfRLDkV{86IgXNP&Vl=Ax<0erN3}|@e;H^ff*Aoc4OSol}S-64b zwv$w8BNf@#Gt(C~k@ZBPXj#F@!s+=)BDG97zE*b%q#0v1?nZqhOzGfo&93@pn2f@F ztc+Eb$B6dj$0f4)Zf&EujEL6TZs5+ooR6lprXF@%dE6`-L{MNp8K(=kBMvDg?Z5c@ z+3h`ZS-`-n$whtC6$feY%NhHKdKU~TVmRWiS~}tmX@$M~ZC9A>jHq3jjeId`&h{p< z!7k?9xNXBymBM6|GHj%f`4y?|5Z5B!Dno3jhY=id_P4s>=eR8Z}P++3g-*939W?#hsfDZ;}yjR!Lb&C)*T_ zwULW%12S90;;Wg^oGPTjkn+VMy$u->h3S|i_+Tyq^}$SHi4Z~<#kXfg1k~3CL;-9R z#st+*6fB5K4eDD{&i7sPTjyTZlqG(AU9)}jaLvk(v!?${~Zp#)f zo!VI4Op7yHRwZqxQVFM*TrwhZ8jNVJTCg2~RtsxsCYypr(P<}zicMFRELh98bD%_85Q%9*Ftm$ z!(0KqD0x_l;-4RD603r&oImZaxH&6%Zf%|jQ*|w;d4MuV56Kt+n)#8Ah?Sy2lO9Tr z>{+%%WmD4u%_a9ow>{6mMQ?S@E6uo=ZNspYVIs5}fuL#%(2X$pZl?%q64lFxK7Ceb z+F86vhw7+lYjbxXc2b{B8xR!XkiqX!MNo##l5O3%M`FpUu&_2M``Z*tM`p5EkJky~42UPkPi zkE=EAB9+RDC^GAUkkA7SCcl&QRV~U>4<$+{;xOi*@6MT2Q%qExOF81L!a>tpLRvQ1 zX(EaOO$VKEZ*1gK6gNoCY;P}Yu2y?i5lR-7+87Wn@;qtpU$>T**R>2HXNsi`? zRY(dnuZ}C+c@TqBEU=A{Y6V7LA3rQR%F4Z62_hnVg1#p_yzrSY!A_T0j2xarv@T+~ zRAH95l$(Qs+2clp5XZP1JhG-8Ejk}HU5>6xN&rVe)6WW#WY`B&Mm!FuLxI$v2s-S4 zww~0v_ayiIqVUHAN@To@D>Pw&%WG@60x@`QMT>flB+)ADYLNS<+3&(!K{ULAN|&uZ z^BUJ-g~IJz{d5Epa?dP24SGgSLai{ufl&4;$RwOI!y_Ne85aQ1(4M$n1?5n4;+Ke~ zDgp-LML@1!3guiV<3wWxAY6t((?f;;g-)Q-mCR}|$dZJGGSH5d8sPOP5mP7>CqaS; zs;nG+?f(EB6~W`K=Cf&lj!7YQMrCbK5!1&O;|R(uKs{1Rx}M(qk&1h1mf}e+QPjZB z#fhN@XeP9+C~1diiHj7sAgR5@eFr1T+}_&THJFtYT-%lecPU2NMKZ6BcvYxM+!&W- zG9Z;-+)3T{;x*OLXj&6r>M;bUWeY|b_dl!Q*Y3a(RV=q)A7?Ihf4|+u~LLKw(k!3E)0?&+axSDlE&lg0_>W=t3*79A3dy=cYCJ_R%j9`1`nYGu+o_vJjybcl#XkJNC`Fckw2!| z6}PuERE!dH8nY9rt`~5yV2&cG1eq~bS}_y`oqA(BMU8P*0HW478b(yzPf%uapc)*o zR^Vhne9%gP(%bYaJi7rv4%#0qhuey~lG81Mm__0erbZP8xoSsTR49y84HD9t5!d~2 zCLseTh-F&n20(NelOh5Q2zLzRvCAq0;Bc7|N--2faokL0e%YC$k93ZI2pw?1CpRqY zE6GDfD0VHhil0&S0g&<273DPX6@eXHcbW#KeK4k~Xo_tw4QhhX*OP*Otx(;#cM}y& zHpoa6BdEo>Z6GwAVCvzQR1uLcLqs%oazk*D>YJHFgXMj`7({HC%nYm0rqG3#uwKJY zLaiI^k-xYfl+&RaVkKZ`)q@`tV-{LQ0W7Mem+-L}{kTb(!8#U|g42mFD#amSYARKC z8XqB3Uo1K{Jj_+=R-93E=znd!)NTc}t%RJYSVYlX!j6a|BA_!!skE+yHelk{@#Pcd zm~4xu!ghpfMcBCSZTmxk>`%<`^54&GZ3zDWDzY1RzOnxRQaf}?Gnj_1PpIXKzucQ> zU`Hyq5_zgqGcEzA4ob1^uW)-~o#S~cSFwi9dv+4>)2snZiEa?q1 zs5L>zkrFZ!nJCWNgDiw<3-28_odzVuaaPdVPvqe?!tP8d#bKXxDdajUC95gGBM_QGQdtzN+cd7HrAS9im%gf=4mv{Ok*o+jI0u^rim5tNsTh$m9-Mc`42*oSg$jUyM!>_?B zK?hJvm$=MmX%QZbvLhAZ2|Sb%x02Wy781x4ZD~Mie6Yz{8nn@nJBL8S0EwKL2u7~Z zx{`DU3bkxUIw6r+OVe!K(Gy7?Vbth+XhxLBM{(&FXA6uqEoWG6T9)L*#YqT%7gL@h z=#A6mr`2>`IIO`VK_6w9)rkvS$H(u)+9nawO6gR(8saxr^$^Iza=mD1b;55zgIp0n zx`4h+gzYLrEp6#cw6SB(QC&dUX`mn3FQml5x*;V46``mCxsioRiP0iLs8(i5l6Na=r}$%msu@GL{4@hm zLGZ!KxTwKLQeh>(FE5yDo?m_kRS{{;M+D-%x)K!AZFD0M8RVdZ)C6Jz0;=P4Da$=g zF!BMxbV&+SSrLmyPFWB<4^NH?B2PuqVN#nzLL4wDAX=Y1UA8fL6rxg@Q6t?mo!gBF z>z*jiE#@iUy$}xNvRA4W%DU&JaDyjC0@#qTJDRZ5Xf&Z3R}+)2%^PZ@fiQYRDc@D0 zBD&>=*&n&-nq2rT_k$ZC9)N0&I_H;`Cs1a|b5#sW1RDbGAcGGLf6Pc6{I>RE)PS1r9f>(>`8 zjR%S*bz-&S+V&S^AhtVlmo&BPvwkIyBUV39k4i z)^}0H(?=^rB~=W{!zC2Z9RXpB+k5eeB24X`U#d*)lZFbpaTG5*n4B~cAIpjUVYuii zO%5_|MlzYwXmABsfMLx{%?-N9s7om;xZcJ2Yx zX+k=Kh`BiuJov}?f~ckrhsBD?hUd8pANl(=v&o-^UkxN zEY8X@S2~laI9%@Q8K*`pkK=E9aw-Sg3zD+GK&Ro?58Cc@$)1_1owo|~Z#|;E&EzcO z;;xt7li#D*^ASl~WU~Nnjo~Jt%U3b|Gr4wl#j+s6Bwz=dQ_#Lcl88on!8j_#we`#o z5Sf9E4@%U3EKs+(ow7Ax7Lb6J3e|4W^AQ+aFLt4KH5H9cS)8lqjaW)MxM?_`V{E=i zK39Xf;+UL)8%>F*0&Ov0ku@A_P=|*7>LF?%!#S^H!fUN6N|ICYnfu;E$(EN)=k+)yLLCGjKGip zQ<(z37{56IA3FfH_fvp?H_SjIj(@7^Jnyz6=f7|Hn;u%`IJpicSQW0BN&ME4K-*d~ zZc-Ik>s)5ry{7m8JY)?ycExy^Zbhx+O|j*eH0AQ@GF;*wFWFoThb?o>+bh}J#-CBg z+BbS~ARDN_5NM`>tCf6ltt+?YMv4)eFznbWyN^=jfRBk>$CdrZYj17yW+C)^=Qy85 z?dw=+vx(w~D)7X^Gf-Js#>Im@bRI*$VwrK7{$w?>|-o96f&ZbRq6aN zdu}Y@9OCJu*5>t;TY~p4Y1sglInV%naicNoA1*4Hj)7bfOWQdikgTcNlzj2hg=v)! z^};UO(}-fL5cpt$L?yQErABOY^1{G$CW=VofK_T*f~JQIgkUIwM4_goK&3z)pDYZ> zbObn2s48ejoiQ;e2xSb0rz4hM3@+hyFvSxB76ktQZ7NO_9bA9~eFOVhacRWbNzC$h zQb%iLJ389JjK*Rkr6py}RZ9ZCCmJRaxnx2jr#=-oJY+4{xnw~=jOO35YtDH=*i&!I9W@X*D(w?Gp`#eSiTurbX zrChW`lFr#DL!P7g;XpcB3w5e3dUW_=L1iFOZ@4vl4hvcx6huacQgZ9(Ts8p-Obk(! zP=M|qH-YoTgBX!T!ShZmiY#vw`5nKNQ$QcbA)YPTc4VpIx0MtPuc*AI|E5XuE@ zf3ow-QRpLkSGacy=m-%mVY+&O!-SqXkQkR_vKF2x8|hSre@iVZ zk?03pQi+@om02PrRW!P_o;zUo*56FiDD6!qMysg{TIc77OzMxBflvnpy{)yS%wW7i zc2Vls#Aa*i$Y?bgqSy|U{WI{elie;h83c0uSyZd;qi4dVxORH%( zso|9r38Qum6oR6({6ON3*d4T^DB}5|h!X@9E5MVj#moqnx~YVcK?GHZu7d(%CM7tu zd3?|@1Orr=Kw9nsL zwSz>e&*~AKth#mS*YCwy+0Y#1p9s04F4n?%=0>uEy(-Y`QC~q}c#aNV_4Lz6aHfN4?o^~FsRV!?(BLd~$@*HYu{ea~TIX~_;M?IE$*G+dN+&YML+ zi1!t9r3Epi8@FK%G60Y;pe@6Sw`vxQnepbnwDzYh%+2h(4rko6K>W?jvP&!zep8qq zIEiCoeHQ!I+1xr`%l#ux?0J?HKVE=tn#jF|<6ycb0x5GkCiL^p3T zW$9||r7^c>Y+xLdQBs6UNqkD+S5uL5Byqoa7dWY(r1;krXZ}I~aEf58zFr{p96NUsGXfmXpqePGtCU^i(vLTM~bxmX=&M^2cH#?ab2 zbpy;HjonpbrRBJUfU`KJh{T!!(-h??!vawXp@r4NQi)@E1JP`d+GVi6dTn(^A|b}00UiX4dROdTXB5MZ8Lk|ol>)Vs(_@a$M6T2HLAPgu)DWK|37G)M(2_+7j z3o|fQT=r+L#|Vo%rj@U5CRbDdl6_6o4!QNmMVXMuI*b5^KzP4GT^nnHO$}*HG}96z zs8FTgpq9!(v7=q7x}*%L_TVRE(1cN%T`J8R24$l3$ohP+i2@OV>tI(luJ&yJ$-Jpd zN`>y`_5oE!wdp`H&g+>-BNBiZQkg3s3SgPk1QfCCs5J8Nt`~5!iDlA>$$73NK(4ix z7~3%7fb`Cp;7!sns0f9yQ%*iJei>N+VhNz~=msrqW9ztNHwJ`D#Uv8M03%?fdH~vg z&kvMLBsnC~PPOd`8I~=kRzEO0pSPwKVW^!rrvk#OYioxxq#|lKI|(NvPMBT0hfs^v zJDRb>$ShE8Pt1x!YCxqJWly)q8dmpWFkw(oO4%jWi^)aWYg?dq?p9H$1Zz@${0QDh zPKo10LeX~%)Am+mp5(~F;MelN6;d_N!vl0gNJ?*B91*~lVUpP_ohA%~yfpz|sHS<~ zeG?fts7#NU8GeAp6H0=8pzU*+&!tB};fL-eHe6t5+xSF zc9IIrFi%ad6k%1X+)`Aq=m_(`#xrIhb>f&J2~J@*XyQn%$wVHo2H+5y0)7W7oLLtq z65vzlnHyl@Q&f&KIcZ~P(qZ|D^C_?5QZ&QpX5wrxa8WD2St;k?`J z$C$7*2b$|%-rzXDb6U&EUElpzxgaYQmmf5lGh2*=qz%jzcxU5>U$|{bk@Dt$1?Bz2 zeS2duZV_uHra*sJ41@lOhd4Q#yQHyxM8S7p1-Y|~5Q1f)5(fkmydB;>I$|v7h|~oQ zRehJCZW_cMGOL_hgL1=$YK6#MTtmu9#&evBj(AxMG(_!+wL6V!a_SCvxoiR+A!!S? zqi9adXn5wYqnxnz{{XhT+#T%6%=1?SSWj_oijv0zZIQy3^ajq1Yf*~hZ7bJWW6Kd% zJbr7-U!1o)fG&ZeBA^qAz;k51c}p*O%$y%B%%>Y7DTWzsZkh=vkqO)01$M}aSkMEx zMwlsCJ8`N3-W zuJ(B*KBs0Nv8c#UVemIEL`pL2mybo(FI%|-IaHS={{Re^9KW}f0?8|YvJwF&a~4yr zH3Pum7ojMPM+F8Niv-T!+gyzDSzE2Y{nsZ4)!9Q(Bxs2=aynEgBg;HowPZC&8S`1U zXbBlnF6Q{lzCV$=u;pcrYtA*q1VluLMx==aG60HG3BMyE^Dagm5ZSZ{1|o%R$MI8L zrPtFVRv3iE>Z&#aol6i;kQtmEnZxBML4{Q_o>qJLZY8@*$u59)nL4rPMFj}!h3-I%ogy)# zGOJ1?LRBbfsMLSqijufR0#~9`DH#>$dXdt&Ok~K-nl0vlZcv$;RG$-unFpd#uvBu} zxS^*_J{Tz_dL$t`Y^O?tm^e|Q;RQSqGcemyTAyk1zySCwFpDmQ!}62C#$Iu|RpOFZ zrtGmRxzLeQLNo`inAqCRmBeA*hUKtJt9{S2&$vt7ds~LRp1}GNP)5@xMZ}EE0`}|B zd5jgqY=4$OOS2^cVx#1LYdKc87aSBR%G%nkFD|2VLgy`o8lIqZrbJ-`*`R$VfzO&; zrfTb#dxM4KxDHBAHF;(=52T2Qb+v@TDm{}{C zc}b}ULzQvSl~kCc;4}a*45KnDt}R-Z6q(0@Z3;xhI_}tWD#pKNSkSi^%A*8=NX0*r z-Ww#_JS-)3Qq12l4V?!{fkRwAEGiUAseFzc?l}@Npv&TLT7gS3WDeS#$RF1N1ErPi zwAcPTvD#U4sMrCT>C|8d;H5=cd3kwYT}v$sWJ-*iufqaJQXNK4=Fd);NvdEaduSxp zf|Ue-YDuPpEG?6iu{l{4{OWvu{{TEX$@3td3eWBc;IzF0#F)`-;d;`Cbch(xgIueI znH?^1s(}|(xnH_VvetJss1&IFSWU_5%BbN6#ZMi?ivz;Zs}*hi!}I4sLVP?i*5*JV z6oVIDxxTzeAZVrA96+p21qur01vBe{y>?NH#{{^5O;AYEOB{xIURNbTmL<&({Ar4n zlun}MTZv|6Vd5gYv`?+I1|O$lw(}BGbDoR+$II`WEwSwSysKK-pboTF$9Vo zI$^dApep*RIUf9zrD9S925*Y99uD)HN9C1ezLNRnxaF^>W!V(cnIu@Z5;rr1W01z7 zwHu7Wq&;v01_~h^G~l4(Er%F}bZ6Ziv|rH}f31u{;$!l7^;+FN)y4^7pNHm*Q<;v#@SbPWL5! zYVt}xyK^mW+uUeyS&Ua6l}PQdwjK%OcVtRzMhar8C4^5f3AY?p3bbGNKoJfkTFGn2y*U zob~&$AeMB3QrTm0(gm1qW4ToHp{|{AR#wO*iX$*nOG}yU=laV_fd$)*(nb^*i-19_ zZB@(@)2=Ssk&LxOw2mVu>4L8?BpBd>BaWUQtS}fZ)qWcp1_2i=O7EKFbvbju|oV5L%7Uryy#J>-Jv zL!B{3dwa7i1Ll|}0)h#ypm&Z)!n1?8x`Rq}U-@Bnu3Uj2jCh1n5j6{2ik)~=; zWXyH&0|j#Iu0)w7um*`;ox%y0U4-SFXUko2Uu|#+J1DvfGM-s2L#nd6DFu;`=1I<@ z#}1tBg4G=o#AL`TiFYv|k}|5DY2td+;?q z33cR|T?*}H&?qz&{{X1d5-tKTbqrK-p=nCArD`$i%jkP6{P$s)dqB zCEUBSIc@N+7b6n5AikMJ3XoXWOtZptBXt_DX@_+B39SL9o_K*wS1goLe=Ud&nA}J7 z#}UDBLprmXk~Gx#jVpm=21z~;xk`X|=iqQ)1<8a{5E!mh9+B6~;h>>RZ6vBQGls6C z{V;aqq{qcdW09JuHx8%I#|FfqA(ZgGx<^5hoe!A7MoL*9Z+I3|V1&?3}s5MG<#X&D{g#c5wHnVh~ zIvgh9J_(Tl60=1tam6Z!Sn>j%uN;mVE{Q}&Rb(a%Tp(@%M_$+t7;iv4`eMD%#+A)B z9MN{n@8@!{pHB6034QjMM!y$_Di87(b!5AU1K?ho@f}p!nAbdxG9yqV4V3@^vduO+3 zZp#AZO3M#`Q=NQ{6?WOSMDu!%+*9q=iMJS1=6T?sbZaqUHt2_?M}Qr1YiS{JW-_2J z-T5w@OhbjN*77IiNH?+yESjGpFgGoj(A5-6tVKO2voq}`i=9fJ5DtR_3$$rE=3*0$ zF8Nw!id1mKQ6&s2PyJx)i#tuoGSesP_@+wT94kXDjIoZ%?>Y6{DEUIu-o8HpjeC1Ik~J3Oac&_i)?`BQ5+&Zpax~=M;bIXr)^g;!-NPbANyi({aq*kk;<=K* z_WM@!Zrq`z0ScYDP=a?JxUp+_VsRzdQyhD9Q7Fg}nvUXYNNWaBPNy)0IfmU1rk5VT zI$NE7i2neS6GCdMU8J=#7eFKw9n?U;SFeUC z2#apwyje8V(M4l%1adrSbYnHhI|bdlFFzbnjo8GHB;9E1O2l;l;aRMBd5r5axST1f zf~plj&oZYAJ6VZp1^!@0;8O=t_Aa>xSs=1Pkg;Y6PjWyqQp`;aDL??r3-sr7>H?oW9K02+P_i0Q z$G~>xpPql4;OwR1B8}{zyon~dkVIp7w*$0-)M`^Ku*fBeH6Suxo!lO_fN9MD;?&-8+I_PWOG(Yq6=gP`7fY*@$cGG`{P z*i#B*oO_4fJbC2o@Az04CBDIPc`+rfBvbl@4q~9t9dg4hFpEgIKLv+tX>#3(Te@m+ z1NM#%hWBT<_#bdVb8^tyS>N4Alg-Mzyr$NQqDa-yC?TjQtPL~I7A#s8gPD0_;Jod) zUa)k6NEB=xb5C-6iqn?AwV#fHOIv}-9t$p;0U2KrqVp{?QTGxBzGr5#Hankj|49~*Nt&$%3AW)oUGQ+M`*Wj zs>g8`Z9gqaic|$VcMiE?2{HR3Gwt~)v9^f@BoOuFqvCy~H!9y-C$#xKO4?afT3abp z1ZJgo?hQ)#nqV$U*)JdgJXBtQx8>FcRPUblPcQBM1{nVU#&QcA+_ldj?;3V&)kfIk zcUrN2wFhbGgSEMYi$IQFQ`6$ATM@fFN8+hmha-7+#K&oP&oaR-`wN$LrrHH{3QpRJ zY6X07$y{JdRXg}CDtD@m9U*kw5#>kKrQ0@b1HO~}fA%I66 znOY@-mXK5-L@q;`77MDciSQUsx{#mzBT6G<;^Z`9yF&`A9EChbjx5@Vl2y&4EiP=M zS|~lznQqW$(-vgHn6jfivBfQ3Chka@;KZqG9El4~=7<^oTAh4JrW7pBLGTzP7zmcl zX4=r(O3u_|jMZ69K{d#!@bkf2wr!n94nKiK>9}Evd%|(ja{RrmlHEmU*V654yNB(> zg!N`UFzY0lnO2pj(M7?cI4+^?A9E$8iT0-naQCvi#|)grf0MjMHZ);YfU5u~#Nql* zu_8RjELrO3ny(9Q<~Sw(-sO32880BVD(c#ouz1sJI7T4L0#M&KH% zaD37(#<(tT?hF1;ndUCJ9#Y~sy|X7zNR?@uICfC366< z8g$PUjF%fc6p`4@&`ovPV+FZh{GfVJxuR}8DsmVx3Tnv#iFQR=TRUxaBX;3X*$s5X zixDQF1nuNi`-|YxZYJ;C(>w_TcWZ4ml_(LP@d2m63~1Z9H8WI)K&yO1JcGhC-{4b6m&yTZwKi>@A?4w43SU?bmOoF`%V1!tUJz z%0?bOD$H##p~X_(NglWy6IhD(+J%~c)1rC5QM;a-){k&O8f;ICS+O0)8u6{0=F zoN7ro4|a=j#c~W8<%vh?K`306(3&wLF+#ZD z_Ub+|$C!rdelwT20pqxu09?dXX|d!0mE1GwTvpvq8jW1Vfddfv@L`(NH*MO9067FW z89sc#R8Mnz6Pot@(Y3jOnPz2c3FtS?6aJeB>R1-8Lt5g$p*xW#1?%D0@lLdDTn;<> z^;W(U_OIO*oQ;l95F!{3 z_0Hbe?(Od-n)N=aHbq+!7`vk!+BO4i7pSdqOl{|MNzHhE2{$jX3@DJypG-hv%d;}o zp)@ti2$VfMa!8c*B9ity*-W>0EW68ZX2|?^Q?4vV_`4^ZlC+qH0Y>IER*EMsb3UB+ zcvBom14t+j6s~n>w#dV@+P?EsQhE$lyAv9k9%>?9iz=dZd7_E-TPS;(D0YBN0dEZQ z#E8IX5rA?6(b9Wa*4w<2%M<#HE=v*M4r5FVqdQa3;E-}P zTnLbLJ@x+pa@CRTksTN`ata3ZbZoOecz)w`s@oWVM~`|`ZM2=$a_&y}RjnjB06t$F zW!{&lIj2U5IAD$m&`V9EZdU{v6VTyS;vpfaMEt^vE0*6fZme;NP;0JLr(AW}YLLh% zj94upif+}^@u+^t6^!b^vdaT*64NORzN@4|fL7ue3}gTR+q$);?x$X(5-pMx5)^gW z847x382-N#j&=xhUWmwEkC3|{Lj*OJE7rHI zYa*KN@KO%JUWXHBaBZHzNDB>(0 zHUMPG4M_6y!tYxVEJBei(wm5*K9yHos!b>e`*Bis;s$DUl2{?q1^@xjkSUNg!ZaKc zBG{p2j=7Ukxi5|uVz`t$N)^Hg#TU{Vo~-rH%K~Q9WxzR5$ph-1mSdH3p#FFR6Otks zVd9Z;B#_ECb%2Hmw|Knc_AIEQ7*9jZ#vhSF+iC_wNS7EWsF zyODlc>-OM@2ntO?NUjh9Cv_k~MRu0YG3DinQpubf_EkcKBCO0a1LAPdg9R?qtg2lNSQIViG!i7OMz86*B0!?p(aXO&!&}DYk3$;Us`?=I-E}9(~#8zR94(j zrS8h57QMw`Mj9V1RFMOkXb!TrvOA925X(%*`rv&tBS4uJ3A)%a$EfwS8_15BwHpLQ zajIi2l%AlayJ(1tMroIc{68FBmfl%A1{}XGsT#wm1?{IF1q-}5$VHG;#OKc%--mpXSJja!>FUJg!OHq?G5?}Hz zZY49uP+T!)p(RwYtw(|QVMBOK&Y;iW9WdIUY>_frkF5+ykyaBdGmO=hSHoR%&lY84 z`@Cr2@nQI+>++yyxsnNm!`u$-k7i42Nfn$*rlr_8^nfX$*12hfT)8+*N$VCM8oGxB zHxwuT04(H|Xk+iMWt_7_!*C_ej80?<<$(VH+}{!b==gQwqtJoL6KBme$0ZyMBD`{K zK_w{4N6qT-%MoXKZeI~5g@;Zl#v(9vX7>*-3{kj_WiljcV2+1;YMH31%hjpz2O9qC zyNp2q)BxN=VdL^C8+BZZl=|)`)L|1OQZXme;iGzubyB8-;f#T}_4f5`OnSIKCZOo8 z1ES|84YxK0#3okB9CwJ+j-=OIu}(X`I5Oi^ax!5>bmG0w6}8p+!6}A2s9rc{Vd*N_ zjlrw5$hJ=cY zT(N$3z=O2d9QC z!~$icG^PM|p>L9^EkfMP)qCCCHQxsZ1R!x0)ck5UBMgk4$mMrtD8Wf0f`c<$R^HpW zZUR>5&l=~NZrgDivXDGiKZZ$~cTc2F>jJG&p*hrat~~V2%!tw)t?j7+i_u;^v~A>^ zqe{@A9;BfrgXX1r*B!Hr42UFw+56Y3+uV~1I=gbWX*G?cH}g+%94Z#k0VD+6NR0LP zj6ZR9IsluVAD=bp_Ewr^R=^LBUMX#z+|aZV+guikCt3*2cBwV^2Ey!Klt?i&`YU&= zi8zp{8TP?_2kx73?tUkZhF(jJ9_X|%n>(+l02^tA9b~V_R2{@;<&7)0NpT8d-Fb0v zya%>O>~BnnPth*nzi_~gFMwQ5;xlV`Es>VrkdE43*_zRd#`HSIdV`Gk%S`l^AaGu^ zz1w0!CN3SNLOP~5yefZ;kCKY$G}ANo?W0<}3bdhhrj1;wmNmU7nCb++R9F{8%+0eB z!#s~e$tJ(H=Q#U#tuEncVV>i;BT8d2%3@kjpsDoksIQI~Zd`_uE;yVIa>Jh1Hwlz@ zWr%dMm*JV#+WOKoRhlFnsOd+1!&FxzmUI|q?!cHAE$5dNQq`#fV<)1nENttvmPr)) zc8v$0jx%FDL7u7SZb893u#Q+FX)bp(6$;ZK$g$6BdDEse_OA%M@ZuFauq3d>YHB8< z8bu>BAR@T~l|QZ(JB>P;5>=>KG8iUN2FVpvs9e+lNY1$tgY|M4C&O%URvtM+&uk{| zC9rSINabkjpW+Kj)58`m+}7N%MR#UIOA7P~-|ov!M*jfmc}sigZ#}IrF<4tiBkZ;@ z8c72q5Nb%SbtD{hk^vyl=fv}V3pa1Ij7fnFaASpE0=AfYvy|l!KObjcutg2DHhrj3 z5-3;E8Z)Z|4O+K}*Afh3Iae}C=lCRzotQ#|oZq*>R=J;N-9*<>%&QM0X6UooAq=u4 znmkM@2p&fTa&fu=j(w`1XJ~FQh$bgL#aDSRXLB4x@kh$>mpp%eIJ?p8EC~6B--;JD8+0*v`)tzQWGVOMDMs>x4$}kr5Rxy8i&R$^eoWCN~@}9~iQZDcV`C9Zb^7 z3~=lxBb8c*I^$*#g*!U)TaCTI?id6IyeurDtMP}LCOYW8`SZ=QQUK5J;mBjW|Tve_6UVUtkg_bv!b~%z@3lsxI@xcg-f%9Mw zLCXi{nuE6Viz#{`ls^5vZ_xtd&*WO4YOUKR04eb@pwpr*&#ObOr_&) zY}PB$3(IV1!GI%Am>&W#K!8gnkl}56#;ZXc{5zJ?ciQHa2;@{PeDGt;bmovlD*Hwh z?gpZt5&r;=2uCoh%bLt_E4T(#jJM-@g#*r&!2lA9hFeuTzc4xV5=NTqfVpYWz@^d+ zwF5e3UmR4C0W<{?p=jBTS%43orwSqB=;MnczLqg*Z7fXET)RKiMg>BJrpkDeQ(RA` z(F9dCA72xmCqjE^8zW&=yN((11MF7XqnXVTF+o2au^AQ_~Zhi zhKE0n4pBB#h>50GR@Uam-tjI&%+*_)A~R4k+zuIbE;TNOEQht8-JA=Bm5^=#BT>ah zndPo$18(Rzsgwx8ZWcLJWOrt0NLd!6a8A2x{4vsL2YQ5X1TwN(`}>u*xJ{0ZwD?->cOTFEEobBz$Ca|I@^s^!a-v0oJ z+h7Vynv;XvS%|h8t=qv(qD2a$M-h74Ix`miIVn)NX-sEAzCt=43DSmP5;%EM#tY)I zHI(u^Q8R)R%Ng~mwuY4l5$F$3Q@G*J@F?I8rp+{uhqY@CGWsG^%Ph9H<;d8R1HLTA zbTQ{smIwIolwwA7@8+-B5)vc5eFf|uE)Q?}my7nVy*Nf*JC(8>_IrTQ8P$xC+(znX zW6@hODdUGs+#6@KYaYfacjM|tQ-P>FJ5^8bAKUBxFPY_-Uhvj-5X{nXu|p^(VIZnS z4Xk0E7>#NuKHN8Jycb~&Aii|Nsh~%;xf2mWN$rZy?c6@}ktgFg>FqCVdsAN8dv5wi zTWRM&X*S?C)-Ru7Wd@$CSKUNFYPi7Rs8oRY@;FcyS8sX|X-UDLBw{&t@m;s}`X}VM z-bag@nd5n=eu^v6V_^=+EpAl$ih6!gOp6+WmNU2i0Nb`Fra-$n#D!aba6-_Ki3Qot zBql!Y;^2{Igtn6&n;k*jM8~5qCTr!M zQRMc${Px^;C3gj^4#L{z=SimBN0Vk@JOLTwasWmE$*ab=r(B<_QY*=Gi@TmZDPD7WL`;6eMY|xcki9(i^qLD`s-6aSlgF-xU+l{oY zkVqlCsQ%Z{DR}S)M)(> z{{TlE5jEYg8{kphQ;?(OLc^gs3~;dNOkX1xUz>V&wg{cEoi7P);@FM3H<*mO#hHnLzF^T(+n=lTU~B!fov} zVpK}%m+5;Ic%WsCcL|R5bJzWk_x_InPoKwyFflZSfWE7so5+n zaWfdwhb^_Hw803(mIxe*tB1V)S*BrjaS>tDAW3Yr&7E-_5z zyplql(ixNm-Q!G!adLObXT&84)UtugOB0XAv|*J&A7@-HPdJg9n9&FmY+`*N94Nuv5G+EChR~qy z0c%64HU9vf76N3}-O8gKr!Xqo5C#qCm6{GkkJiZB&rsSAjub#d(6REx znZ_a^03@VamT4*tGX&?fP-{Vo?&?{JEoFE~+G;2mP-)jJNRbGc(bkebcf1(JbTTDT zsC5}rUo1A+^E!zJ350-}1R((;iUkMXhfHuo9%zW=Xn!Qo*X59ARE+EJI5@jN-Z!ZL!0Xoq7(t8oDIlY4B7(bFTl18F-Ay_g>4UH!>~l`iKvqG;C|W}xJ5#$D zlQBwW1vNb}sU4#aDapg6%5|y|SYv|U^`0>)RcNz0e@yhkk zkteC!i$?9c@zh6F#2?GSaEXCSuNC*j-3BH>Scy%l>U3`^fr=Y|Txy{hQiO5uR;{*3 zt~yeeARyWlg7VU$gz9lSNtn)_DVGC;?j*NsiF;LzCu&J>1wuZ#`C{}049=PZp9ApEcAyj+#+lbnxndl0t12u$0upeUrES}1(^~H*WjLFjGhOLHv&b>ZWTi)1c8TK ziHQFIkSl-(qH}9!b{f|5TC)WyJZ6J@ZK(T>HMZ6+JZ?)I4=`05(v4yjZPVYHUmub#SP(v0DvM|Tt0Qnm0O{k56XsS$ z6b{nHOVzf-LaeH2DsqT{*lZJ;5u3`V|KF)d0p5UiF4NT}O{gEHz( zYB74nvMP($VyqEz*9yq?aM=;k zEcMc&gj1z)Z*90W)-XqQ=K`$>$s4v=(s6pudzW#^^SJ;huZf@;<6K?!7{u!03PdNS zhKZufYPVsdv`cWscOW5`N@<`t3*y{vIEWm(V6^skWMagS4BgG7|6f*vy zRzHNbD^t?Ar$29p-x5GQ>(*>{q#Y)w!E^|?J_Z{TCoJ<%Gc1tUcBTayL#weG74YlV z3%l*sq6VkoiuBuGbiZ(j+A#wX;;qB;Rm*M?&dTlxvNC zLfpeUVqf65?r$z#f%{#l`K@_7hvfMPrGnB{h8B@+h+rC3(G|b|ReF#!z-}%|{lGvp zcIWyc+gkK35h({O{J4?VE(+Q0{uf66?jPKxB4e4&m5;%rTN@~hj?KBx5EFA5fRd#Ia+lo|onhc|Q+eAlDlMX*=5x}*2Dx{og z{{Y*iNaTVkh;f(Y$_Yb8%9>_$#ORR%2BYMzowccda0V^I5sDr!Xxl=03yxOs@iv@v ziww1lHN=uhnxtrHT(czP1}lpq1d>>BRc~1n&@6!|NI(2Q8I#%4yZeaRJ6lUhNBG-4 z-HTExdyGw9L8j)X*f3MyL@+iGQ}ylx+tp` zaxq$Ns2UNF^&bpeFop0WaqWuEFqYnC1+f&(yLTi>#azbV+q82jl~6K~P0ZUsKW-=+ z7b0FH5bJK#AV-)rI4;2#wm1)O@@>a*lFQ6oS_F%dwuBfXlJdLdRk}6V9C2oH+)jrU zZEMo;qvwh0%NXvi?riI}1OamrYD6#xMr6ymu|Zz)ynN4Z4;g9NhRBAJ7!-pd#QnsP zt6z}hTd3C-p#xVgS4V7O{-Fe(IXGemUL00ct#28=rcrT!ISn7EvjFWQ4YW6Ma{Z@_7TFfok`lvNP@hUD&m-lG>w5Oj9WD=Qb6#Un;>PK3uT+Nmg&;=2jWVq=&l4T=CoM7zJ}TzZ{j^VUrg76A8TQF@ zi=SrM@Gx22+zXCw@U*|?En^ChqzVC2Bqu|iaO)6^Nh61k8ZG$yiQh_4Xu>qoO=M-$ z!VZnQ2@3#Q81M^E9A;4uUhy}W36sx3xdT{ z+l z&$dXVAWJLf4a+KXHkQ2THk{NA+~fHO%@uo@rt-f!Fg_SX+iwG-49DTkCU6Z*7h(4I zym|isZu8v4*OKwTtR^UtN2(IkU{wIma23n##!lyBYW=8)>c_=bov6$NO}9AbkG|$& z`gvvJRL*$oWk}LJj(cE+P^&H}`;+eF=iuY}O8|~x+_<`m z*XieZ(xiga%}r^IeU{t!!bFqGu8I~{5t3=xEWwI|$d$^K=zch9zbOGHM=KyvIFFdR zp2_SdmCRd1!lasR{{TWVIJahTk#?&pH*K|2@2hsQlFcM-q=`gFK*?HX*HSRp%n?jk zRh&zy_`YTM$fjSRx4RQMy9t)HT4smK!^0fHLZps~6N*tIBNEZB#SBWOv3IssMac`47l=-}{kq}FgnEVj|0bx;IgTM@Q(=EkXeXYl> z=OY|nQS{FcGDM_TbebxG(zVwG31|fHO)+rkBgZAQ&aOd`UA|nvAe#RG908HHEK`Iv z1=gbH?)l$o4l>@}S$)GCqA7w=*5b&Di2@Kxykt<3mfS$HA$QcmBzQ~kKQyg5Dij=d z9VZ-K?)mKbbeY-+kqpZuETWsnN|Yq%Nj?J%(=uwAqk>7uTHD1eqSt(oER=>;S{EBd zNgXrAd+Y@`r(3c~s@~EY$%xq7qlIfK$)!91I4cvmA{f&(H!VgXFhzygkx-b}ZS8IK zf;#vdU5uh>lCLXr33b;UByAJM9<<%G5xI|A_+q`=3_**jgPIgG!z40DHkVQW+D3G2 z^6{n-D458O)l33`LSl|N8MRQ=B9tTjaH&Qyl4Nx&S1H0zVZr-#;)UgtnS}BZT&ov} zjEuoz0)azDqOG4?5Q&@&W0CFLiZU9D^g>+mQrORF5SH5R;KLk_kv`=Gs(W&>&;mS( z%MmCLLt;KZlC@-NU2ls0spNgp#&GvO)V_jl1CgFdIgUPgH%Z3c!oIlJ&~6SrD8Oh& z?;KLSy0>JQOf!G;4qsGy<7}OH<;_=lpJ7SDTXT{lT+Jr~G-I0M<+YLrwu)j_87OKc zUBZm&cIF7z91XoMl&ToGE%o@V3pX_w;am?DclNJ0?=Nfdd>zHt)86ry@id$bh1^lx zh+r+WyY%!|mwSX|$f#NeQ|iv3P+|7s5B5p>MMg|Qh|Rp50};rgBK^>g@|S#v2(M!-Ne>{L zWzn{lXLq8Tha+<+E0qD$?7~LG7>yFnjvcxL61Sp&*PdMz%ln*oUS9W<;JbEkT+bA@ zQOes6{uKK z!nMJ|;hm|(63h#6K_R9s0aHq)!V)qNXsb^ZXmgmBkGU43~WlWY!poL z+z1uZ7Piv@ahVx7n-tS!X$l|8mts#P1 z(?MBYGGuv4pfnq4qkqd4{aDnBzrk^VLMHnlr*S~Qw3N)0_<5eVR9?s#Kgn_PDIt!} zkwD+`k{|iqW+YTy`N5C2#dn z#>}n;*RJKz=hy7P`tgZlnjHkCk~4-48KWGfMW7?n7o7!s@$^r0ii0HokhXuWkELDK^4fCp1TKQ$YrML_bw#R*Sl zft(tKU~{0ur4pneV}>+sy|P`X2|179fQV(rsII~?jfW-4fapQcVDviYTXy?2lQPx$ zlwx%0s^=z(PU{cN=*J}$HS!~&#OlpMDa2+#UW60s%hQ?i!!*5AI+{1Ti~v_bsOmg% zI<7?=be^f4GHzmKkLLM}Xnc+=!gccmCOi>U(8lDF4o5?WK476Eirk{Jf+J9N=BFZ0 zm^g|`SOj`V3P~-I&>|^TRrM`uNTqbgT(cQaBZP=s+1j~i)fj@Asu8#v_#7(Dqo^{n z^h}?Qyje}c`omVMO|4pImK!~--CB{tab``po=z)h*jz+rS%U#?;Hxb)JGv3m7q%PN z+a7T5k^EBc+A_eP@8m6XWD#$(s0zhRO8Ax;8sU4H{{V5>p#7s*u+O=Y}C&v_F20DcSPwJTk zH+LwrJ5LhPOtjihPnV{CIC*>58bp!B5E?}jH8#-}Se!&A$$-rIPDQ*1EDugD0cZMg zg#lS-hpJGc1POs@j_mUxfIj@ zb5`=FjvH@t7(FPANRpk}d#Xs3G$R0{KwH1_4&`KZ4zxNN9K|qS`#AyS#<+)C76=%t zw-@jJLe@w_CAn3DX4i-c)b;3p=_fIU$KI~QfIw#8%WA-Z4(A>!)oJdCCYmVbw?t^` zwnTOTHyv{{2MzvhyOIKM4l{E_xnp%WgQiE|uL2M{&JVkZVfascKcX z2NfgmnrU1n*7I+u07!n|{Kr3v(Yx)}uFKVp$%g&9ytL%rE2Fo#IPMbE+xvcNDZk0s zeI@0oRu<^fDOaE-t`T#qelC>7(`-$Ijs}$(cJNq3+pg}Xs`!x8EkOR_*mQG7AGb6Q zvh4l6f4_?5ZzqcWuk8o6!XUG#XbOa^&J3EO_$hIH!Bf&CRB}Y9Pjr zWbYnvjs)=LhW*NdA&lejs3ih z$$8{U@nJzlO|!qYd&^UO3(O=Wn|ES|XgP*)r;aQ`a3vrO3BmH}wl8huEz3azo<9V9 zgv~bBbhw7_g+_eI4NwWx)Og~_FHAvI;~g=eV-(!`b}lQ4xM-F+f5|#6Hn4BNA4D5o%85 zuBSR-aPpoN+@Iw@Sf2>nHmrn`C`3`q9xjjF5O_j z)iL_}f-WW!zWFl%$VoLhpE3qm(1c{hOFHKAC5Pa&x#T5=B`bFD$jU{_D5APB`Fo3* z2dKrHu_7VMai`U0o!iTnU!o2^MpGh^$gHA~NT<_7rk)2CrX)+2>yov%-n9Wg1=MZ% zP9Ew7{{Sql1;WQ1k~<>I^0Nw>lEX8g9WdFzkHF-P)$4@+0Bq8^unO13^S<4-Ss#ew zR?1?gF~}F*M3ksTiLw#Cgp*uWHsx?uPB?bW2Ipb9nF8$f40Pd6AdlQQF3NcqHe596 zd1=MXeFRO~FR?CUU_scR5)nWHPq!JKon#o6C%f}rKlr26xf2;oM4X(&b3fE^R-R+q zd=DdUWML3Yk_I;xyFV^-wxt=onueIIX8p(#@AxdupSW&p%37QefqKWEg5*4Z?WYkB zB9Ptou9){buen{QAs0_2 zjkIapf=bhCPR5V445@`3;AV&ej~?W^zwH<928nMd1d`GmbmaWkHunbyBKw7SZd;16 z<18)vvM}M1R4^oyx>v4!C}~cE7wu`4w~L;u(Cl|nmek$1IZj1~_dbAS)4Zizzqjo8 z9ui(r0DHTaju(rz2}q>KApX{+E0%S|n_GdYjsa%fhw^SpF%$v(G45P;`a2Hv$#5la zr+(bCMB9Rs)6_m7<4e?p$$SMDo8E2Z3XIaOQqICC<$}YNj{Yc7<|{N^sgzUISw2^# zC=_Rol>vz&fn%{H$W?1u-5qw461$Zubsku)V(A8$DV$k8zrDNUriGn|WsFh5B$7JU zr8*9ny)9B8Mw!u9ivXI#?jA-9yF2@cqq&yBN=EXnH`h(n)Q=N}N|7LncEKz}92KkC z9`6s&_Bm_Sw6x_JlK$(qD#YffLW)yRDk)Q*SgU(Y*fa;2U=&@nKu`VIf9>yb-QDpV zM0da9txt1|zqkm~2SG+GtCE5%kil*C_aOjoHlvGS`k=QNMyD0SE~EN+C4^Ma(1HlB zoel!&^vQ@<1T_akLSjjwk=Jxc%ifJzg^(Xm2c<=G#9Fx01=23raA=LYOI75rK8QS4 zQb^Bf9E=^-Gn%U~$dEN78UX2=6X3H=qGE(G1dybv%BztBp*kOi2v133l`9Sqk|9dv zO~*0ijx%JFWkB&)JuCkJ2OW)4Wd@?kAX?N9Ep@~hGAnl76A)HOD$5?q8jwjKrNbk`;Kvh5Y0hFd2XtjXoIdVlB=S?Y06oHg9$}S3>0Gcbb zBibJ3vsk3F{{RDXYa>rQ@WhDM5=cUpC_Y+Oa092FDt~s_apoKk?N;HpBbo<}{kG(8 z`OCXIt5%lI!@FCFWH1Q=l`H9E{wJi^JQ1 zNyjuBZX>vNBW)R4poApmJ_5KqJKIEo1Bt8AyI_?#MtCYfirzTHVOUJAL~{l@oqy%m z8UjKz;+A%jB?%M^q2!P)Hxb$((bvS%glB;l2&|}x?D#G2MX|GqqgEGD5|g+dmy8cd z73v%B7#UpvJD~m~o}nX;ik9|B<66AT!6V9*+;Rt?sW_?W`k0h{k%DV;Jn>R4?w%uwZw zsa=$$!QE|G+YC+%>TlXvc^2X=_cWjfAO(tb<9Tg^1&#Nm$?AXb!z8&MJp0F zcEBJJu2mSwv36dwh}Fdg0P!7F8&HwB;x*xrKbrXpE<*Mj?n{^Bw?bV981XRQ0JfZn zgfhF=YLEj0I_XS$bD}^4R<8=;>(E@-&_wm{MElJzc!3uI!}HU7j=?CrwYppFv0I|Y zVy>b}=0jxOI0#Bp^O!L>ac+D#EZEy|szXW3iz;U;?ap6{;O)6dIJ?Mro7ejd2BlEtmT5wPA$iMsVihb0^2Q{Al>x5>#_M!Y8@ZZ8C_9Y- zBxR;q;Zu~1ofK|>85?KGAz%ykDhPbHs~;K?2tGKow!ar_J|LxCkt2$KXL}U!AekAR zLCsi%kZ2UL`i3@k`-sjUOCN#d#ZjC{lCyE^!CU)xnps-veq#1WZS4Y)vf3aEJiCr; zSb)2HHN}f|#9&yKBDs)qZd`LgDH9=rpkCTEMmW~prdB?;3P=Z_sK!0}1}p$2SP}&l zal_AT4T`n4>3Jy9<6=;h-(8@tpnxiIYxr^zh|^hDq3QKirF1zjf?dY<;eJgCNe9zP zvatd7eh^gZGwLv{p12!;vGSMAvZ4#jSo2jm7F3mY7L0cH#7Q+MbRP_2OH?IS6sJXL zfeBd-(afp1p*y#Msp<*v0~G2(Y!UE7866@46etFzN6dffI9{_D)3-IvRnXSqqlVcf zQnMHWcSxxKoyckBTzbD$#xWAbnf@VA5vgt~d!9zl;^k$!vk`1Si2;-4T2i~Z)aQb^ zySH+0axB4_{-}L9L@+3MEbZY>tAwk|7s~@C@DLn|^r+US3zpsx9;8{uL_IlVyIDR` zf=HI)Mv_@d&2ZnDD-+jU#Nxbdi?VqdoJun-B7%rpjwa?Z14bP+jX?|#hu?)yV{#aW z;G@-vDi+{xg}j$f8bGo7iZqG|&qZ3-EJ60$x(vtxxsQ?`S~{B)vP(G_`sG#wI)Zi7 zjPX?2B-ElLViN>{3svn%V`kWrDxvCgr-Adu*xH4Wq_zOjSJY)xn&;8n5k<9XNnmv+ zI#A+`?<=sPY-@^6M67ob8+}T+8JhIP1E|$BFj|=v3ht#>G!-C>MyAC}A$RT$0szM{ zMxZxbDfuD+Gmgd??TVz1(gGxv89@gs4Xv+TF>V$kI8c|w)9ds~Ga%J?+eZjgk%w() zMtRnnd0@0gA*7bXmkI_&j;^!{!l7wVL;ko-qSZ|YBox5zCWF(hax^_~xr89*y&6bJ zWgD1(bpWS{$3iD1(k{IxZ*?74Djm(HT`@9es)ZEG45%91(V2)boX^A`3=G6bc&;4K z5=T%;dayL=e6_-e=8eN(wCu>a(Ca`z*Uu58g(R&sH8~O}2aPccmameK2D$zC=3Gq@ z^~!*eL#WpP5a5|7Y8`-(LuWyrcxYgOH@B7s3KnXTC|6J8hr>@54vR5EAtebJQh@mQ zVD!Y`xyr&@O0nDQ+pVO9ix3M{{o#>fFN7!*KhH+qon2Q)v}tr2uTGPFS^Y#t~^$9P!1l1@bs|DYa|>Lo!-DBr>m?TVfmwwY!vrUq)^`dJmO1PQ4E&h=pzJt#8R{esKf6-LNn7Ri2=jm z&!bW4FDPJ za(yLfoqTa>Hlubp6ZAPDtWGLv>?X5gZ0SZ|S)~M$q>RHK92MQHtepgR{wSkxPO1SJ zjI@$ls|8R~bpR{k*g%1eOj8~3D|luy1W;1iUgc6`J5Ixv(lIcerotuh92DWv705!| zjjBOmb@fAzP1i9|y=;6d{kme-=F!~S5w$H^1x0K6Bt~M~oB;cg5dr< zRXes`=D3ecy8XniB4ahrD*?D9Tg=f*~5Ex327nts^-~gjO8^*IXj(i2yzefT{o&GAN)V)AFlU9v=)W zIVvSUoJVg2FGBvdj+DMs#6m8jDicJ9PP!gUyqE|Nia z3jYB6fBSHr{N*L$hdamndEn#bzIWwi>_sBN19oDQFkS1AH0pX{{@>ee&LUFO)Nv5z zx&Hvu$1tm2+{z}4pYkf!>b9m$sLafuWOjmjk0FYC>wby!-i~nK>DH&K%#ukmsxFG9 ziCShynWi%C5vP*1Zbwqg5=|G*%D;^kwPFr>;17?&Dv^hv195U`N_cq;NV*9%qdzxV zc6S6TR~OIn5W_4 zy0GX6OjEPB)h?^m?LFLq`32Ukd7F7GEo~)=CN_@FF5?xHS5;;Pgbyrk+K|v9TAAX? z)OUkfo0{d4amMm@5OP+x98f2bSqIU^b}ENC0>(lB6g^EbY9N;)w81BLyt6At7avI# z>=C^G0JypKo;yEs-=4(LcjwrvAgHK7s)TOas8D`5DO=DQOamM^{Z>}jcel26ZR1c_ zeR09~s*=sctVZ(jW@w{t%0j|9B?qHtkz@A^QZ^w7`jd9ZI}`e?`(E#?=#D)o6juDj z>~}8W-b-lN5p7mQWGa-ZZ7oe#Fnlw`TU+aqnL1cy(}L9h0Q&b}0F#%mT-|oRaQmN% zF{J^-vINStUtg+N2 zUXA@DlH)vwJTGL0UJ)x>x8_5(f2fkryWM(jL12Cgoyl@bX?rrX z3k$^{Zpk2p4eAS8=mG15-6GY(3|NEMEQxPS;tS%ny5;-5xdUxGHxxw*s!miH>5CU` zYGcbPGNT>SI8lq4Ua3~zfEE%Otq*{~#u6d3=YmYPPFC^UyiJmUQUPriqfCYblM{#F zn`-moRiliSH%TVDpJH0V@}q<@2YQMIrh=b~L59LEHA=19;IwUSh+!Pcy?bul@@;V? zkLES9cV$)|mg|-u7-sn?*mAfrX+% z4OK*stuqt=3<;l}_}(*)ipPbsnn}3& zB8#fXsvJ!!)3`SZii+cm=-9qIJBCXWbM5l8DN5v?XC58HCCjCOm;eYMjDX8A*W-o& zNM(g~3{ddJvDlwZ+``kZjx1OjO;&a2z6sjMi3oV2CvL7u&ZfU*G{(#%1Y8A~AYG8x zHxg|HP@n*Ux{$d>veezxqhntfs1SRzwujKy{9Tn^^T#1{P* zTJq7=X5P_cWmY3|Fag^o3*t^I+O`fjshmo_`zPDHZ@76_y}v9h+?4ksOI}DyRCXgq z-wBR{9oZ1t^us4`S&5szo?Zo1zi7rfvO@dA+L3U4y!?H$w17xgyCEuxL0;WYUygWn zsd~^78KgoE9IBm<8ZWNlf_c7~C2AR|^5xeIgbb=uuS7&9e9yOD!cy=??Q6MXec%Hd z5tfA2TcdTu<6JXT%pC<~!T$i0iWPTm%giIMBSXtyj z7$ms?0P!Y(Vws6`a6~2($H>6nL2z9JPC~)IdMWA_gpEyd!IN|CMHoe$Y4r0%k~HYn z@)D~Wkxkw|!^;9*F(yHZF$XkOP8RZ8DebRgBe`knRV%qeY3fsv1R7Hg6BC0=22GCL z%5?;gBSa!rlXDp%SiwLG9UJB^;p2texB}VQ?a5zXdjpo^y~oB`@?P-b9y`lIky_kB zL@>@Gs-E%;#Wa1x&mLcYYIbBrnNZ>lNa^%cw|jZok&UTP!z$ zTFLG|ZpGZ@<7frEvc$)>Q9DA6)jPMa-CU`QCgkl)5+f`#W8d_mE1OwaxXYP^Aa1o|0tm*raa@va4#V4= zvqdi=oQ(Et*7vsYD*~)mpy%m&9H=xo<4(=cL*YegTO)P=h_m3T7dD;Z3{aauNq*&7 zi!k|5t4+8I*POdB$EtOoZerN3%gOsv$DQ`l{@{CUQquki;9h>kWUO}AC^kz?)F>L8 zm&bK6QagzYnkDxiwDBDIj1u?JsL^S5q$;e8y|2Wtq*wHOY~g zp^`v%B|~MAr^}3uuH;(1If{x3Qk+1|d2Nm8+T32a2B?M?KznF-I&B6WP>DC8gwdDguxVQOTxbZ;#uaEYEK4VKFa(@a*co zw!|_cg}vhK1=8}|bX=@_gi8RBO3=?@cT~$5QActG0BnXMYjWHV_W+QU5A_evrv=jz zm)cm50*!{zVR_OS9qi;%;mP$dC)2p;QKz0STiXZ{B1wS{+o#1YSDl{}cOQE8FMJDC%*OR~cm~5f8l}IfOvIycEKotlw6{Sy}Gj~^o z+knO_LT$Kd6)93LX6+_j%M8YpQr&g$t(ALXzmIr8hUG}t`mAwrAd0$o(YkN2yqCM zD_t=$I-QQAa|#@*Pdo%+tM9=0sF7?F`#Za6;do_9naYtHB?5|Q8lz8!H8%I*7?{Wx zRi^?=gcI9N5J?p#K`>TbThuB=Kduw$NO^@r{P`)Afu;!YZ@0MNBm;M(zHABTPA>W^ z<&S54MCB1!DXw39>wawV!50^fq5 ze@s_9x5XExvkazK%!N^!lqdkH#M_>r^mWnN$jfC_S9x;=YTMb#u=#+A!0r| z^FdZsC=Rp(Z`-fK5e=uBnJ$&uDdvtlaONYmnP|mHAmQ`2ExC$Vo8p(XSsXNBmQzo+ z#}#B8VTv&-)eW`e+qyHoXaPU**9!p1Gbk;J%=Xsq6iD=S&4o^%*9CISNU5rUGV4Ot ztF}1Utq21>PoMnoGSDa#f=UAB5)MoXlamc8iuWLjB?Ka9gEK8b8$*pg2AEco5t50G zyU~@WsEMx{0u$TBM-5$1@UxCOQ$|F%g|u;HFRps5#0O0R~zvb;$L^NT2{9 zj^(S0?q8R#01~25YN6qvb==faMM?3;3{WGdL^T8zQS!F69)I$|7QsmcoeYk`yL}?M zjQ}4UMx;6kO`?*kmUI;v<=5@QB4~)B?5?f@DmH^Yxzqc+@Y`2p3W-1z&97zzs2#8x zfhmy(&kvsFSPCeGp^Ah`vh6OWpUdNg#$s5am}Q2c-?EPxB$&>Wr8BNNXM*Shn$;sg zLlkY=9bKqt@fZLDxD-Yx69{EMLjbF@Afu@t95hS{q7f;rt-zGBM;6&;6cVYWGuD~| zi&k#xa0O0kB?iQ)=Z$Uu04=32-X|ld1F7&e(z@Z70JlPM?fP+00X0Kg$s`X{0hLc* zm@i7<7UW=Q*d`jL_hvbWkcLS}4fO-%&q{%j@Hn%%X_wE6D=rjvA-9Djw)!iuIqg3k zaILeuCrvzSRJvHiN+4*-Ga&qQ(t@3Qaic3D=mIosd87$x#UPe$@-#H;m2x3m$YpPs zSHz5E&hDY73e%X)SP;(@=Z@sE+cK6)Rv^DB*T4>g10iwrWtRYqMmXlJ9^T{cjl;Ca zVzz)~DfxG(G!^S#3~PH<+VPntks0$CCEqa-Y|~y>>uz2Pp7Cp?Alyo|BV|5T%9WtS zz2vUkF_1oCi*Vpj+qW2k8j82d*~>#DZMrF%s~%*J1K~_%Z!AdGI26lrY*49TJZkrH zMkQ#*Q0@S>T7B8zE$wFzW<$14qIX6JE)xAL?xdKna88majg12q83KMdA8g!|G zLvc#n#L6wfA&^zvuqeTgr>Hf|XW@+LM7eaqFphu;;}-JBAUlbMSqGr*$g3WLx*R$Y z)-*`B0&wVfDH6<858G&+*D%OvU!_6laaLB0NgNfJ-J)>)scj2NcFGh5j-DM@^sX=H zjIH^ocz!7+XH_s&i?>lR?IA%xR=y)pF`0TmN|a52rBJIZh&G_^Bbt<`*RFcuLSzOA z*k+x&wbGY{F!3@fgrMB4qKC{M9A6;Z4-rNlAy+LETu_U~vu=2aSx|Q=p$ezR_+fF| z6H$n-f`dLQVPhoBWLW75QMeD5qp!xe<7!i=6kQeple>FTyHcPQ0kZJ_08D6EvyxT9 zvn_?t4A#igox6i={3BY|JT`kt{>L;(7hCS4)(@;P9^{U@ljK^GV?$iP^A*QgH)9ua zDV8i3NPWy;t-&11o~Nyxi(m@DS|0ak?}=Tl1H_U;F-fb0SRP|gVaVB!Hs-w_6e1X^Dil7-_t!oiRn}ZtcKp4ohaKl1#`|%Q+3M&@s zQ;srfyhvG2kqBVKo?a6Da%#tluxgFHbwdsc4u`mqc#ymkE6{EJ^06;kOD&y_{0C4fKaS6u1 z5eygYdS`EO_hc{h%^uICFn*mk`uF_R%SlE6ChoJBOe+^#g}Av$=zj5!Hnjz16t3yPE6ri5}@JC_a%+|p&_RcibX#scRa#LFD1E#0IE= zddV`O@{A82Y_+!DnD5kfZrNT8;q77Q~G_JVO+sn!fO?f5W-#H-Q zif(4xidlm*M|E`x1WKTtvJJvcw0fVr8qm3GY%1bJXY=Z?cN>}B=nAC9R(2_J)oE&4 zZo9e@@zWW$?TONOocW~Ba6xdSu)KagaVSvoLtfg*q0|%UH3tQ?nX@NnBZ?cd))Tup z_=mf+lajua5)DhDMwqj%nYAcgEp`>QJ zGyBfP`F7>~x5h!irOc$=@yel;jp2!Nqi@$}8%Io8j@%o1B`sX=?e$i+a5^+xk&|G1 zaN~-xue$k$=B_Sn^vp|xvkJ-Ceg$A>;^ zuGo97`;N4WlIAU?xU#)Sf5S+oF*7-+F3K|jwe@21eYcBp+5R z+&j4{Z!7P6&vi?8W63b%Eeq6K=iE~TPi+XvxAm?=7Hw?fVT@{4zSG(5>_lg4&n_8P zGr_(pix;^THu`QZDENyo{q{1idg6D~G?I^wKx8oBBQxeMehtgBt?7GVBURF8CTdbK z9EaBut-NP3YkM2b$`*v02%9!L3CY%{$5DZ~XvgeXJDrs67PVi;f@{qCp3QBV%HbE1 zv}Fl3uuk^cXy>^=M};Us!fox3-GZ&N_Pd69;&jU*?cGn&eC5ufNpS99SfY`R#6d+1 z(-!1GYAbvDG6cC)$t`_HZ3fk6C5Qrxnb-MX?Z&iTUv&m@QkjcXwP{^gX^RF$V$Lc! zXJ87kCc2LtS+RJtDi^KQ(GNL-2123t515LOy3}ID$(X^9V3P)P1T)5_hjChymbjxC zL>jAFigz^8S}m!L>I;!~YLd#f`?o^PP+*j>9<`^dZAM~*;@G?e87axH0-kW(#A$aM z&k{{+<~6yuU=2}npsfXS*A3Pufn-81IjdXnyazjfaW5LJXB<#W-$5B#nRe7{Es+4> z5{ZZgRX9Iis%#9RDy-hf_H5iKPjhk;3n?uRZU{-Nh1^kwS`aj+TvNR`x2GDDiA=mi z&XBHrm$tZ$SB$!d@?V&|!-fXPvabe`JJ+&wMoQ}Fxlxq;opCn|CJat}sJL4a zqLbYGe-p@DKP|!_4|M&@t5g9M30js^8c^g%jv^3{i%SujWvgcbjpKM|?Ra~RRtXa1 z#hh|W7L2qF>1y>k5s5cE!UZ-qoU%=8?QVbEuPxoZyWTpmMt5*3SkO|s)2SGxenH+v zxGh*&jka}Tv-Te~Z!%eOylk9gvVtR;c@ZOLQ(dLW+A1`uz{30taegeVLfl(aORIFA z!M(8KEHCWhyq5F1+!qlAFsKx0h^MGG*{@tK8@L%5k^uPgRxL^F=cmNNIH zTDJ13+LFB}WEDSVrw_ZPaV#B%9Jni&w#Q59pv#XgOS<#CMfVZyiR`&$o-cG6&meh- zWR2Er%yo&DgJF(@sRuKRi#KC(?x;3~X01B&bwk^(LiXTF+Z%1CNqT2qZmRL#U0C}+ zjJmm5KDN`8nhBjG5uU?FtOn2q+OW=}Ea``s30@#zVmwya*~aefQIFbS2DCIcc zZE~EgpE8rFiX$BS#hWJX>PBh~fUgy2ZEhAEPZ-2!=IGxQ z)<14|E+5*S-{mLwys*p1``S3I7ltReRpDj{B#wrt2&g1!mNU09xpH7yeNd@A*bXZn z-No(I_`_xnyDm(*9Dq3V&06d@A8lG&rRBE~1%czQx4sZKYU@>ONf! zYk-~WvMgjvhrzJMot;&=e{yA@%*#{^sx*pM6d3?k;IP&C0`XJ=ZODxlL(3{dqUBIII|IFNx8O==lpKd3g!;*5>AFepY;!hK0v`*X)I ze*`*2u|!(ieRvZ_s@El`VFHSz5kf~?KEP+3K7akT`t z@W{^v6m8rC9m%+i*G~*-Zmve{kst=Hv~QwCsF=;3i9Mu9j_fxo823mQCKNe=iaU6S z%abb?BH?<|kK@hD$;mvBT9zg@R1ROMpe05_$F2(2*3p@j$_%NBT&_q4ir)C}4Ddn3 z@t1cy=oRiHq@~Sj3~`;G`Dk%BCAK0lw``JmoO*nah}?2zCPD}zWobgZQb$hRzJaP} zz!9MXJn*kdC(TesS#wMhB8pp!cD#XS5s+gdI6=`s(Ev534(*eA8o zt4~8ayAJA7s#&uwL8VR(S7-MM^7^ER0ZbB}YmwwFnA1P23xu-3{&6k@7g*I z4sH0OwQ3TsO1TBgi6#1=W|7x$RVJE#I{yG1X4<@5>!~BNqMQavZNnEk+52rxr!P$_ zrd~L!aJh0>7(!gzJ-Z_-5M2W)VbJu;!wJ1;+ascw%TksLh;8FFQMtuK^(RVYgSB!n z9LkBrlsets26jeLja|qoT6tFs7w!jTIs){P_Y_EE+AFj~4Lx3XiO*1X?otCGWx8cG z+9WZWDXF3V0G1ak?TuMSr@;;N22hGxnb#_5;4nV6rV2ehCDf8nA87iRl_az1Pk_$_ zDUB)ss$OoILQ0Xe8YuJl;<>uzGB(K$fRa*Vpi*g;v>AUqFH^2GMhle@nvzK)UjwP9 z#|#sq7GkAY8BG~SZNUYr)5v3l*%zi%26)lOpwL#Eayj(GYhzUm_$_60+{FgqTDkZi zjv_=o7cv!3+E_7ewX`e}=R3++(VO05XaxY6_>ZZY#? z)3++Ialr&hku zfwUw>Aw-xI#YwhFOtPp=v}oz8d5;V{y|76kn*}hcBHY_Xpsa4U4xp=U-53Wja@MC4 zXxoUOI*&Rgkt5Mqqf`=Hv$=ugfeiH|XA6$sObLXU=~MSoy%8I(LySHNJ-hLXExONj z{{U{XcH|TXKOJ)WaZ_$=2}DX>S7N&HlNJ?9J;iDMKI!u^xN#(RtG8^Z!yjFw8)eFin(+2yg*yNdV@5t_6W8 zH56P@6-JDZz|fF%#Ook3YzAnk_JAp-dss5YpZhoT!joJ1fNb zsSD%OXM===sEHc6!0=LItn@<9VcaV+Md{Uo(u2s?3%R$|<^gb%P^GsPP&}-?_~Is} zH)_z4p5D2i99Er(nKOag1i^5Dg3^=m<|~U!m6loKBHWAP z6p$K}cLrw}HGBt#7i#$tF*p-mD9kG9_YYwahFiG|juC>#5!KxMsyu0pKX2Q|Nx3Jc z1Bu8g_sM-BC*&ULNw<>7pgCykKmar}rYhf^$w~0WiZp-{=ez>i>L6QxrHs3ZuqX~d zXjeL62LAw(QO}F;`XSR$ReA1ZmL*nTK|dmj>C}wzoNh`%KS%{-sTopZ4=jt31dtC} z96_d4Mk|_(NJi5Wjr9h(=U$n0!u8gLHZWmTxsBRYXFCfDvXMcaM=v}Cph>E9X2YU? zXoIl7o3)jO_<*LpLBr#0X~(%bH)^^Ko!5HFZK`8L1HNgw9CQ>u9dWe@>$D+&81O%$ zJ9B9|GTtz-+zsqiz!RUtLUN$-7zk~~nO27tcy3sP&f4W-XyA=Y`aot%gS%R1;fLFZ zi4hz!Mf{S^tg+sjkf5r)0VMic#I`kKk6zVD{zHW&+gmK{Ii5?UDivmLNLmU}i8>D~ zHuZ~QW=>_#@#K~_a%N^hTyr*YM7F$q&B)&{3b%AcEEvMDoJaL=kmR`pmvz>+6 z%@x}+7K1#^F=7JVxfayrqV%sGm`@mf|O9q=rvk##2MLX`wai zhuRQi!cw8HMoo-}6-_0yxPV73 zQXxPMJ!PJs!lMqmVs_e89~!3Hn4J-cV>5A&cx4foB||iH$SKG$JxzLIe~lw&TeBLD zNwK;F^r^VBTaR5?Sel}Y-FncBhL|0-x1DhLt3J5`iHuy6E3gEC86nu30pLHTE6(B6 zTP3l!yZ~K0+n)5E%p@FyFNCPb3}uBnsNLCx*!{uM>yK^Ta!)$N zYPP1`OGg`mv4o{*y}tUBi|iyTj!VUFt$H*rS3kJpkUPX!RU0N5f}>hfBk{vwVltsC z&h9~qOz<0bPg=3m6*(0?9(Xv~^yDhC?#ob6y~HvDA5eV+*DCZU2P?3Z6?QRD1~DtH z)YCRPkGHNABcu?E)T)XJq*Fy@HKOv@qbdrT;%$fuN5NCM5nU>y?mu%} z-14`#FkQ9HgyBWJa;-#TXauKKI^nk9Ekpvd&8jNV=D7wtC1#x|ziR?$Df3sRSZ}D= zB#U5_L>}nm(8nA%9heoeg>)))2DnkX2^xgR*mP=6msd{1y9&&AP9j~%YP3F)m?ZVC z9A+|f`&JGL(Q9RMKOYwrXDiN<$X;&bfi^Q_qLt~9I7H+kOp4L7wXUKS--ooDhPFs9 zNMlW;?%hBQM$n{J)tzxh?1jTcemhNgD>1#}`6*+5(nAfhnP!4o%L<&AdxxzLU2^G) znk50u_Z4c+!cZN2dzWnC@Axj5%@x$y>X+o-IEg+ax%?s`yd;M z`bJJhM<2~`YhDKa>UeJMqG))bEOFmo6sTU{Bmh4X8fY`cn3>99*==q%;@ieGlTdV5 zYd!|ggX8&u&RSe?cL~@&-kiilcg98`wVCl@0_^mCr(pzyM2-ZhZy-Ukl z^5c#F03wL7@vs|NIffn9xmdRd_s2oIJc|!3QWlN3)0uYR-j{D>J+POi?;`qe()h8< zkVts1ZhOa*Tf43|j~9G8s|ha&NNt%{G9!65l1GRXu2^N;_Ms+`uMF0P>wU4YrZ*(l zI8@8L1!u6~cnh8a`O!YRpW_I7+c_l=+ag9tW(aB}-B64&rlSd++mX03iNLd;$!1^N z?jgC0`E5%A1IUxl_O>ABf}+ls9F_EsX?pE&SuL%^g+;O=k4lGf7Bx^Z4XriBrqLgd zZYy#cEL#FmrAcqNo`SL`l6A%2Pwl%~9zxx1`Kx&DCxY|oL$nZIMNZQmjtOB#>s>O! zClPe%G(SxGDtns|-p*F!@FW5?HmN}4)22(Z@V7EtT*1v>af!v;-^;ONnR{DOSky2; zyF}JwfN-(xEZf*TNGha0R>vGojd_;@vz8S3(pPXItH{hx=O0kLt3%Ati zm?tf1o;UVZFGLqFAQ*l>MXPSa?a8+ja}dL)-$J~YrAi4anrDG@|V*p zKWx`?ENsA>zzPpj;fKd-IYgO*Oh2gc{A#kd+nB(eH9rMT_dT3ETz32=*BZP>D%R$1 zM)qm9ti%@WQBta^>Hz?CI^o-$5r?K&5*_lV9=|n?L7v)Psh`)SwMrgOT`jNtA&?7PyHCSAWeSKaBDb)7!%C;w&oNo1aBm?4xY; zO=q2DCdTCLkyG;63KawJ0n_1)8<#}?0JS_?oVk8Vv|`?1tI`nD6$f!*08%Nt#2*Y~ z%=y)riYqS}6{MW4oVTDa9VD=e;*>jM+&APi(;8Nz8C?<}H^C^lfdM-AA0fxw^VfpL z$~$f~5>*|Frcj|{c(|FWQ=ze0T_yB^-PVuSfaTL<9%snxA*ePdF!6yIS2>2E^I|9O$Jzf`=aHz z3CQZij%5TRrbUGkgybZSAqbV-1wtt`1F75Lim=?uG1BFiP5_r`pxcy@Ng<47#Q+|i zIt&TkNM_EL>AIXz0NSxZ-D2I< z%!&&Az8Iim`wLezPnub@s;=}dqNT=^#W6q}I$=^>BV0l|Y-Mt%bW2-b;GJXfw^-j&`7 zAdgO_n%4txBZNUqRb2q6qY9986vcBy`(l+^m1>6lL0YjoVnuO5D43TEWslaZ+N)P@ z+gun7ltY!Y(<>HNARNH}5EOL8%1*cnsEcl3R1CUP`QT3^L6aD#iVHidS?m@|n}ZwL zUbC{a0Z!(kk4tYE9olLz=*&h2CN(%731kvo(x!c^H#I=7sEn|QI%FgPb)=B_3mp&4DM3NujwB^ORn)$E*Gxic-YIqhDZOb%Q-X@R~iLov{4|~fsv_|YoA^3^oAg~hYMWX3C5S9!S1cLJINAnUg}3|+MYqfNR*)%f-3 zlPVXMDl7ZjZZ^$ri?p-eM_Dc1y)Zb=IZ)Q2q+gg)gB`iO4Yj=nrb7q&PEs5UhB*Wf zdCBr09$m_xCo1MxC3k58#j#^1y9hZErhYiWmh9?`jcComSTV!|qHBi|OGexzH8tu^ zD#}IAHO6asFJ^mXgwD?qH7LfQP*X2DV#lpB4K7Gkra>-*DvrDN`s+^F*W+C7PKqgn6*S@ww=BMs5#}0jh)CFUY;lDt6qWB>Z{J!M`a>S0Cibv zS~+N04~0fEeZy=l$QZjGID}TGs4++oO*u$`E@G=F8q&2t8dDSil-Od)g@sd?x2>@N zs=oc%3XrE3V&WaJL5WQuwO2cYfSC$|9YEY`=ltQzCFcNgl!kDOn%K%f$KOyn`PuD8>~- zcBRQ%O4fwu{{ROH(r``G5ir}aa#&E0l}Vw*#?f>}`SPk6MOtBSPFV61WOJGP)TqOE8L zhAfK)=_Car=77nqt-*#ij4@_&l$|^)PYgcXw8g$D!fE}TGf3NfZSz7&KB1YdI%55Z zWGXl)mEI}La$3g=+`RBSrHa97r`J*VnDrRYgl)zqWW=1KpHh-yb`RZ|}x7ZoQ=Ozcdlb?oet6bh_ECp3|-rnZwTQh!CDe3@MAl2*C<2u~l zW^nSyfcmSBzynf@y}p3m$@I~K60JyZ7zd}QiUE~#7>(7)`iDpabXIoLA~h+u9<9iB zDRhr(Ed+eS4i&f?#yG~vuH%k9y^`+~?ow#~=ghcaA5vKCOo zsw-zo`TQ`O#&*lQh2#CgJB_8yMCy(LpEgkQp4#R(n?}2`f2m01{{XkUjmv_pY6C_= z13Zoj&G=j_Xi@CF!p7oyCK{CleN`Kr9LyG?UScJ5op#Ft8hqk{y#O@D-LZ?&7VmGj zyA$Z-xQ{fjs3T>uZV@7ffMdP=2h&5dD`DpGFa9UJu*Uq3~jm&7WCl(1o zVrZa>(t@==%lcqpHA-<-K5AcXyu5Pzd+Xwh=wMsn$uw^xasVHxFqnV>B6C1}RIPDx zQ*gwCi!CpEG8FZ#9m^su-{tEbxWV+~{`GbdlYw_GuOK{V2Hpb@G<)SKkwzV@5i;-MW z+6l_!iNH|z;oh@Eq$W=V^EJiVn|Q4RaqWzf(gEsX+2&7&Ols-?X-c|kN(1T&vqe_e z!)Zcu&!ND|>lUjeLN8Qpv{CKcK&s{`p16-IIacjJlEFEFu9&Ju#T9?HfYAAj@lN*U zO+vi}$6zHa7f1HL3NLPxw{P8b{{Yc7JC?qx(_AFq3}u4!!`sEHPa?ryuDzkmi!0lx z?2U!3xRUPKE}vtvM^M5g)$;3v{{Sv71G(*r7+l+l#u|i)V04FKaDEE4?S3Sqmj}t* z@f@qYmnFtZV4gksBPgncVXBdup9~Z(!eB@j1#9f(YjI{bZF!*};+Xz?SJVE?{mS6x z;rLz`nSudZHMfrWm`N0pDfJ|%L3B0DoenT}e%*6irvsb*i{`%Z{ix0{1 zWS?dCy}XRJySYrpY%_4j?K1nA=ap9iet(#-SFoPhXW*oDzMkKiXSzn*DBYU zM~z|=f9f4swIJt+l>Ih&Im?;uQ8|sUfj3O#{!zwQ9a?{GKr2=6w`}=NF4BH3@95gr z-6FY*w$n?t7{AS+;l6v3gOv9ZpFV08<{MV^&OTEPct& zN5*?Z%LR`Y!=Z-yF)3G@V+RY{W4Y9PrE}J}T;*!fH*qHpO1=BLU8$b!jHfcQDZwEp-VBKG~Geh6*jw@!g>sy>au;O z-M6s1HuAZx-gN+gbEw6INWpJq`*FbW{B8ID04bUa**O&k>cT0)#FBwd+L+e9olBA^ z)uu+6>F@4NL(>E{ZSnk+UjG1K+}^t%;)4+!Bt=N#T<85fIxcbV9&?BGwbi5^$m6)K z)w-%(06wN@r-)|ESddE$t4iYT-qp*oChnu~qVzt|u)n{ArM;Zo;rl^}$aF}j{m1te z`+Z!+A&knVTL|FwMn+U8M_DV-*WrfS*;@ga_mz6z`rg*pkW{zaPCtQ)w@p7C?uJ_n zOQO+sm2PZio4LhB%{#;a3u}Y%!pvx={^7Y6NEs`{?E4x_2*nt@gaa>E0zq*#~CccT~ zZ~%Seuqrb31D;(mL~pJciA)z>TX(jIaU2j_t<~Q(d@rwNEan(sid>s&LIOs#84#)| zOj^5m?k?+=Y_Mfx(~AYSxh-S=03&Xed~;Y@+(3_Ls{Pd!tw4UD5Pdx~#m{iG*JBvP zfrw_WZka6WL&`}mL0GY}n(8T(LM|>06Gbv08-~%iN-L-U8u?-SYjT`T9!x>{6pNq( zz&JmW^^Xw`B`}BUyf3|2%dPTe(D&n;<+c16vt;6sA!d39ZOB5@#u)0~(I#Mbl*XakBf z14`8WxWDdK+Ipjhk9w_Q*OiL(t+X<%7ZaMc(Km%G5b;9gijjN0>M>rV;Z;tNf*N)^k>G+#-X~>vl7n8+Xh&wI4 zdroOU^`m%KR!Q1nA!$T4Nx}o!4sdT-aTKG+B$)nn)Mwpt9zJ0`QMiw z*()E%Ck4MJ#M??fveBh0A^9a;8>*58GSpzVTS!cLkS4r-NFYd|N@C(U7KqDYt#TK9 zvaDc-Rftu{p%qXwG}9Ghvb-Ux6%Sq`@?9&Db}Lqb;z1nJ!P$j~IUI=808d;ViOHlx z4&M}$qyiqOxh_M>(k+6+z0}GoH#X5i74%x`mMzZisS+U7uRez-RpS;6N~uq7jd8!W z%E7AvCcV7tLF2A5XJi?>7t4~du8h6D2;+Ey2@7OLRV$qbmyQ@E2t>u7>Dx4!10w3X zb#DFYOJ33n#w(flA3SGVv`qZi1V(Hqp?UI9JrX{d>(j278C}7#CjJQ$y$W;WDt&MkhrC>#|PKr);LuqcKjErXq1^HdrAtqDpxAS0OD{ zQdLGr@A%@B_QV8GxmAH~@yW4jHva%`{C_McTOv%KA{o}=*yd)}@RQ;+IB%pzDH?%5 zvOQR}R;}tZ*Px~=$|n@q$Y6z*A~q>X1g_FPV_j?T!p*eLRhFHgwI|Y`R5dA3d@%wH zhEp<8Fl7Y*2t{a`<u|pcl`N&64jv%%Rgib3|3Mv8G*$_^de0*^+ z6cs{ zohyOVtk%y+!KkRB*CDiwU9~0(Bom0{^eJyzoQeUV=y84*90y5|QCtU+PRR+VqVziH zL)Qzu46rDn%`1`?^tW+XsjCkGreN!eGl|93i1b+PmXIq`Zrsjv&!!ebmN+KFFrsf| zV9~IgG8p7LRgS)O#hW{0A2k@F*7Q~>ERsl7qeC2!oyIgCq7UL8K4Tg)vLzY@BCVfa z$p9tly$mlDTc?&A8DwGFXU!;})D_I8Sm;Jki^zx)X!w8lqF_w}sNiPbvPM$UC}`P6 zN5D1{YGv4*a7~mbkK}l@Yb#r{P>S^q^z`I<(@!tE7PosqZARdrJ{`YAt8zMwRbt}K zdvJ{+0SxL|2~>s;L-}5(#Y9wz1HirT0@j=yK~^D%&S%I3~~r zk%dr_2rNcooi+3E#fZ$$B*@#+yB)V5aJ&Ow$qLR}WL7W&p`UNAP(^eAQoea(-tDbS zZS^yj3^`&}CG#C^hZV;8ySKmOE-z;d4a}sMj#SuufFha-4Kd?4_f7l8as)`^Ln~I} zq6{h$LaOPxWdcfiqB&$nqzX+UOHq>xQTLky3eBn~KK zYeljGXa;^=Yl)0rfkUmx(xR092OMIINz~|qPQNa>W^h6}mlC!Lzb#7FGl|j-6p0YA z+j4)mO4Q^=5pvm9ZA}$zx;YiWD(KmfooUkpXc!k(Np#Pgid)!Yn%X}36gMyop1l}& zgXN7K{3UtlGAe1A0G%mX z;@7tAJ!h1@(ZjY%Z(Y#9VpaN1VqQCkYc=itHQQ2nT!6)wuZRQ4>yJe}*|E3M!H*KE z2no&CJ-_C=*4?uqH*Q)v-b}}A=}wvB&h9tncH8$F7vQW5O()4zByMO5iKl$S# zKqd@SKQN|%9Q<$&>zQthv}Iwbsm`_dV4_zLr;0FW+o)@k9Y@6Bkb|L=h(-w6*m`|S zP0Qowi4Zb4COc-D1~HUWB?(YB)}ozpa^`a$1N92<^5rUhzkOxQ^ zqb;0_{sZwVDeH!vFmW1jf1wBj%&JhgT%(@bM=)nmv$;@7Q>ZyHv2dIWW+Z9aXGH1 z?yuWFdw$zkOLfliZN$fTB3Vng??kr)d}>e{^r7%MV&$8bg}ECO5*2e=52~yutcP6A zM|)XZO**`!Zg~~MS9qy48l3Qn6K-B(RQQo0L=SLC>r!N?8P_^uv5=ACm!3dX(cVV9e90sd#G|++(cvN6$;hJaQ8O+J*CZ*QT|ZxUtFlEX8CB3n4s!05|IU?MQ>@nh1;exIM5Ho ze2{zxIeEog$1D@7GgV{(H-Z}~dEx*UMwwMw-|Qi{ff64UUGsqVR5B4`brhYepgXrQ zM$U>z19?qU1FuYH-`bJp87~RH_NhnD5*%O&0Q7v+Ke!&^G;&Zj(=QhYJ1wzM=n@Jg8=u*C}Q zqGDi-pgIN>ARfLI!Y&c3$Q6h_Y1Okd&_^4v6*~#=u5>1( zGPNXyg?H^WTGtT}MKc9E)XiD0J=N}sIBPq5o@44P__-PQ`w3MZNLA_!C#Q0Qm^u7$ z!)+Ky$V3Sod5&tVrw1o8xzw(v;<3UcR`n|A0L0T(1FF{~PG}22zZKXIbd+Ty;4;Qs(@E$q0CTbcLQB7Llu*2TCx4be$= zdplQQSk>Fmq-Tt~_v0x>7KXai)Ci7ej|IK5_ZbWDg@|h;jYgnEXI?xP&_A|ZX8~`* z#qJsS_~*agj|?SB!vewrt1wbGvma5eGCjt34E-=zeBDp`4gJLK{{S8mA`RYNw0r=; zR=;pLpLYAM?V_{cWqUhYa`0S4r4eEz?~rH>bUs^41txqAPEA*=g*fyzNx&n?{Tw30T%GQB@l%*RU(-HJT%9hfoVBkF0(y1 zM5R*ek#iovpWF>&{#Mzi<1HYXJ1cVO6C~3%=9rHX20-bJTU+62^qP_%yCv&(e)}Du zm!w)`f=d$Me&59+)ZV~?Nypo*tZf})`A5zps2}>GxNiR_=Bz?LU!Y2#5^#cC@CFlkFCOS)3 z#a+1GUh|ZO#?o1nh~nV{!P^osCPKV9jtdWSX3dF8L(c}( zBf$Rv#Ny{33a4`1)Hg9p9g9CLYb0wNa5;wI8b)Q0U;tH%W(d?^Zc1QkF$cdQu1fyg z+aOEGLBu%1ugm1C9QPBmC+JQhC)P)V@fn-GOwU#(*+w6x-~?x z4VP~f=66@^K>9GK9OyVyGI0eQ>?e5VQdV z%lf!BPnyD=gDIQ<;m4mPL7K#tGe$!|%uK^>-L2*ak4$BV*HARiCMvD#88We6@lPKE z!k*-YNsYzLH>paq1X7?1ih-W(dSiZeNA3&-+2lE=o}NI3RUB(HRKl8U>WGaQM_)6%(O%=WOoF{GV1 z%by>~S3007E0X6okP~qsi3y0c5o?%H^6vAdFmDH$VMqNFG%%_+jqS%9$2kmG&?z}n z$c+B%T-oV_NS11~&}3+ac;I`ZBrIVW2=nt3E1uW~Rq9yH;}HV({JK=!rL^0)T( z9I{8*oGrYZgR3e>Pfqz5X-$02Hntn7UnVyq^k)Ny6gO=PVd7Q8iT3ZYF8R(ud5>@# zUKfp8$H}1IER2j7w#d|>rg;P9TsnJeMdcWY5YF<$x5am>IErSgJeN1YTJo3Hc74U+ z=8=WCW89Hr2hb~(O*1B#BkneAPehA?D%d|H9)zbC%^3dX<|c;n;@P6Jw|ij>;@TC7 zUM-<0;0@lPtu@7gdQ*Xr4-sD3s&aq@vs|kB^5i6pBu0S`QbuFJb;q6DU%14$VcP`p z7`r7O<)w0x+{?L8epE}9Jm@;&px;Q=W|;-X*vS;LJ5CMEW)*Y|7#@&ooqFd@F=jU; zX7de7WRoBSX;iv+$(1$*jey!o>JGYLHzM+&WHENBOD~GCiTl-!y&c6h&%&6gxHuQ0 zD2GZbN20A2bn8)E@loqQxseh`Q*K>NTX)PUr@-OUnGApjUf%MAITc@(N$}53w81%( z6e>@snGH!H0QE=)b?ZTb^`Q>YOylz-n$KJPa1e)1Y`wQQzf*LyP@o$s(=|*fv9@d6DdkV$`>#g zrP9h&?&yOtOzY6%w5D-Vz$N)NuB}~ZQ(X1e3C63I@-KA`!UB(+opQ`#NYp5~FOZp; zT1D-udRd24pcLz#5id3#yH{O@kt7-s@#}?%qKzt?Tg5_m4d9DtCH-BD&KOL{lRcM8ypeJ3@}lP4&yj;Nc1e#dM^ay}R~+%}bF(p!;!b+mj%0 zqU<__-Re=1&ri1iU_h!Uv#n(ig6d;A4_W?S99Nl-1!gfSTXaGc#>Ycl!lJzgo(j_( z6v`(Q?HYS)1hynP%-z&M^7?YCljV!rrEbWEM!%|v#2G$mjkh5j18j-8wMPP!r$bM_ z4YRzAF&(>+O35j`)s>edmiHHOn_IHQo#Qnwhw(LiA&2qB>-H?}VkL0tljWG=atG#u zCU7kpgpT8gh@b!o|P zzd=EJ1E;*Z{DhSrFK+1IbTl!qyl$3yw|_iq{5cyKf7c z?nJ9L?Y=dk@W+q8I2|z)l*chq(K*d%0>=_iO}G*k{=}7asa6!YD^<~ zfz+JR+RI8-HN`o_a5YiM5dxqFZF9iN42Vg2A>F9yt~gtD z+L=g}%1tSkiT?mxPo#(!N3FFoD@}Jc8X%;_H?y{=CFr3=LpOlXeYn53wBo5#Dmhfh z#kTG7QRCx)xHT738Y!azN;Y4XMQi1WivsA&wN!JlEK02l=S@f1h`CbyR63YVIzkFj zXxoIHPE<6*qbUecDnvRF-c%vZN(lisXXB=nIIk^0x@eGFkq-4^CeYfc6(h$=4RJam z?&>{EkxzRKy%IGqB7CmLB_pV&8#~drK~viW(RpIC1dAzN<52DdisV1>z(PVsskI5@ z7ZTdZ8$f$tHsRtJXOnA<3so;YRQy|NzExiKB6 zhBqYbAcl$)Yq6z4M-++cP)}cmE8Dl}Rzn;UWi41CrI&3;6(*GfPaIa9**+jFE7gU4 z3U#J`b`)ghsj=j&vs&AyX(77$hj;*iQhFi4A!N%2#N(`{{RfeC?+gR&b94N{{Rd{{i$Im z$0fD3h^XMM96hSohQEr=3%Ko`9^{iQ{jN<`fcTM%Hm$+|z<-}|x9ORANg>|_bHDeE z&n+GOtTqux1@IBhHULzs2HdAmLDS0zZUSFxk~2dK5wJlfp)2Bf=y>TbE!cNjWHB3s zBO_13aUevUB;oN^r+mnQo^XEkmfqx9%(2PGUJlLmvw^c|%Y8HrPPD>h2;Gwa$0Ylg zLuv%-6$KG}#$4F*PLRUqj*-XGUPnfNiD|R8>PRCxVNkI0aY|Q_TAP1=61FuLIfM0G zKaAtKUvDgYzcpun97% zNiDs(70Rsh2uX#m`*dXQ6{3>4>{b=(4m38KJ3CXV6_MlpJwB^C8+&%-TOXp~@}oE) zS8IMAqp#hE+$1Lm>O!HG2?0#&sMk*sityY{28oi|f|*Ih{{Y*?e{>;OZh>f4H>`?O z=eY)z#lZm~u3$DQtfJJ4p6ycR6uGxpY{W>A+*_?nG@1I=wF15X;>_Mb!R}Q6(paSc zBYIgk8j#*1qo>0ai3Wrx2$g8I;%@mkIO{)e*}cWWtX6!JF$24Gb0Zj;38v6;Um`Hy zvKWSM%%C%3btPP-%(k}=1n?NHAt5GL2XefAlB6Foh`)b96w4IY4RJ%ubt!v!)`e0|G;b@Fh!ZM9YZDS{9;9Hc4xsSH-l>`8CsXZId0jNe=DCt1<8Z4C#bkwm{V*LGj?dHq+b%rzKw|_op$%a~ADm%L5k^ zDhPW_KAKS;UZfcv!%}gJyAg?Ip~ZV2Z?U%BSTVT@$YcA1@I04#_LuJ0vjv^?zdOcW zM7L4RC=tjS5YDt{lSWlKhSXy^_Re<*mAMLW$FDW#z0>_qeJRFUdBm{;3eyQ3iRFT; z-22mtyY_Vc(&6|?tSl^LmP=%7hn-m@ZNXky0c~kocxj8a_OchfLnkf4mZiUBy>EOs zcdiLaKm+9wsHGw)XY4k*3j-nUz81VRDahkphKJPQ@|)vx$F3FEM{m1Y+3D_cPU0d}0ITDj9)dASRc z8jfXrp6quQVs1<`nv%A(=4a)vo-RFSNh~BoaPr1d8U~}rE8+n)#7fAwA2V0QMcs^c z_QAN#AX$r^MNiLiaz>VN@v*{rJBeh1(Pw|iLZYtn6{rVj%A{f}S_Qj@gs0JNzrc0x6Ke>FLCq1_t%W{jv-|?l5yo_WpNLXzVJPb%xr-92+o+|$U9u7c_ za~bsodF}W5)vFPe%TU)DV}_y3OEcHLipk7B32$_Z$q6j3Ig5VG*R~GV7P5`I%0G0P zDLD;1@K%J#^3{$8hv2g|!uf;1f*@Q80T~ROHhGov71uu(9e7&O(5SR`j%zk{SmaX2 zYLcX61{-&9Ey{wTi`L$myB0FX1D*+o{{STy{CCn^TS*nDf;edpZYj)ri;1LQpw0z$ zl0``CmMq$7f>_nO4-d&>N#S!)lb0s0M+P6$$B|dgbK94*dso{WmkP0RFy2{8ZKkqu zaIGW;rY4w#B(i+LskG2yZQTUUB7`$PZ`EYk_dy%?BXE$%I%Au4!LeMzcjh=dsnXzm zP277KZ|&t-VvdxM0WC_GQoC6j`QYIhvq%&8cKnr_o7;Dy8iRrG!=DhL_x}Jg-v0nt zxtJ{^;(fzyBQGy&1JVq@Z>dexbuakT)B}pM+Dh%MHpzIJWJgomn$Fs`&&W=w5khh4 z!kI26Zn>*BnhDTHW(e$i{WNY3zV0ZXYYKL2CKTH zH3kNpd;Us_EugfrCZtCmW%4>O9vyMkN2dup78D!@;;U}0yn}bD&78$A zk-MuR_S%rL?nWauGNGU=U*n4VYv0|*jDIadht*QQVWWp`OKY2>ZFwBlkj7Fj+s4iV zhLjLplv0}XrX726qT|2@r;co^ivm%qE1bTP`sa|jwY5$&{ETV!utuX|u=O#BWwA?V zv}vX;U7W}|XyK1VpC|~hCEEo-Xhpwq?jvx!%xvwUexkZm1Ew;B1-H}=E#881)q)HK zjyHj0TD#OrzNZ;!UYTGVMkXLRw)|nb$ ztY0?dE(m}_hs(TiMJsMJlZw(FLzCpL3PUV*h=NJBf>jtUWGM3RI178N#^!AjA_Ja9 zxFVDxY*Z4F-P~UhwPaAC>c*m`xzu&0GwaDdDuAr0 zMSg6v2gegF?zu)YjR13%I{qmVw!n~5xw#8fkqmar6lH@2Y{~Mj6D`fKX%-14GR&dw zIVp9B0EWLdU!mjS5-dsNvLL)V-GfvV(9md8Ygq=Kvan|lgkmjAJqCg@hFvU9} z!$|hjid9Gc7;VEC&48!D0CE%-=F{p{J%L3C+@JtW zPz=EE7z@_C<<~}3P(=)hUAt9OhC78m(}mlFqtOv!j!B{QuHZo#jI(NgGmB8W5aY9@ zN+kh2#YkO>du>g`)cIwKw{A9ABaBdwJmr&ZBa9JN$X1&9;dtJlm+0_l*0ime3G2Mt1|Jc#hA&moS5$pYwZ0HSswq-GUH(J~}>Q2cSyH6);j zQN18Sw0GD{92YIBa(zpo+s0gDbP#6dqt0Ol;C^O6M!o4D#Zzy|cq=LXO`H4AG$Y6v( zNHZl6CW|1lZ7c{MW?yCv!huzw-laqcT~|G{%-65{u?})wrA2cfV9Ls*MXfSFZ;l31 zbs#WM+u1TNa!slRj3{g3F#_9Es0BEJC13(5V?$cxGS#6&@AOOc*aR0a`{Mlvbhj)1a?hS%C~rOSH0H)-ukZ4X(AVI{9Lpw(^*w zd}PS!xV9Gd^Tu5xM+qr#eN1!HLAc4>DM+=b%xUAq2BRFxj{cBPxz9b(!GCO$btKx{vx{@<2@;k%?yD9)y z6c5yo5#@-ExyX@T{L>sVm|SwOpo%jjcI1|lN|I~T4xm#kFkRe0X$~WqLeM47D>nNX zV-YGn80|nPHPnm^q6iGhgcnwh2~1br=;vspxkeN1T9T(wy(`xm8xJkrLQG^UOt~gV zd1^3E9uYKxAd*YG(m15_HBL%PROg1y->EGuPXK6n7gr#3hgP06UvQ!+VrGWxI9=id zh|~bY8W3tnT`{$^u|2o|ir{GAXI^~O9nHwi_$p_=dA>{BHn!7W%q}hk5*a8W5=Nxx zC>EzuMrW=wecDFu-Z25IOrOP2fDoB0j5@MN%FDE=r~LBAmLSBk;$1@Y*ck>xEbu1^ zC}cBwy(d~`di}VJQi}47_Kt@T%0k#Ls8oO9<&I?_CNNvob81lhe%x5MY1ER+d6`g+ ztOyy_okpUVWyuKOR75P!pG$8W_hORb;-tbTN)P(JBNKK$lmT#MEVw9%5|d;U4I6D{ zMKqS4y7dFY`r$KyYG#=Nn(=TehY}|8G8=wjPwlQOZ0rd;hevYh$ylvQLAUE#OMQyl zB>XA~rg>*vY;8 z`2c3_I4?pnuF;Uiea7Qx1BjFG?N1aih0{V;KAF4aih;D9#2n}jn83L&QOH*!G@_OO zAcdotM=5iHrgvjPFdL?q&i z#?|{va;sFX!hf{*W4#lnURW-0?4U7|LO|Moo)aL|Mgys%jdicY1D*~bDblAzsZa=2 z>4{`<0YBsI;hx~z$jTOgcZu2yAD3R8F`>1!8P80-en@UefZ-o|8gbHyBPNZ|jeJE; zEpB2q^3pR(hnza}+-2->M{(F9+Tp1a(u=#oryX-?b}B#5A? z-x$<*;+cpOAco|KlGH^@X&O31X&Jd2Hx@KIm4!n9DNVg`YI|_vHpZ%WzJ1ELxY*Gs zxCSX&ATm%Dfgpf-(w#9%;L$B8!Fr*byi5Sl=BRTA3Xw4^h#||6^kH4Xta_35;YMsx zX(p;cvC=)FtVgJy!g^v05k$b~$ipd0{KVwH(BR?-WNxgMR|ZY+%F3O}E@G+=ndwb& zskghS;&birOPFe=F+b(5U+{dg&6hV>9N&ehEK1ntG?5Hx^E=Bpm!<|yl} z2DKP`ElOdg8=}sY`NpyVbD5?{+Ek5pN045*4Nu#O@_+<@D3W&v6awBnGY30T ztJ_}MvF0z8Z?4|L*-z#^&Djqe##jj3VXdE+6#c}#IM6y@?(1kRxl4;X352|Tkr3KQ zhM|-SmIwZ#Yn~l+$i^hnm~d1f2M$F_sR*u|GRDlx7u3Be@bdA*LQ^4uRjyiM>QQNP z1Qz$*rdvywD{pnIY|)=u?j1*l4pA`Vh9Ef!w;Re$Wp*ZpcZH;3v<533Mq;b+%pRDr z3z3m&XW*4~-50&fVSjx%<*lKT_TBdzsnV{|x>I?YpDjtKuS_F*YDC9K!4}+z(5p}F z?bo$aj^`{r!eqC;nj`)q>$W9}a{>r{pn^diKHMtQ?vW91BUuV;I#s)C}gzIIWubx1?KuJK7kO(MG2)0gSEXsNM5$UccIm z;zW3>=eD?eE>SPz<-5Fft(~d3iiylc zVd=D_OBk9z{nZg8jHp*$_8+k9xh9+G?BwNL%ExY;sy(bxZLao3g|pmGr*X((cefsh z`Oomyosb5cU-?x`MO^vJ;tp%93i?o)u;3^2~QkC0M zKHOp5-o|9Fnr}V&8;g>Zfs>bWi}6`L#<5$bm6Gad+e9z6EQlawLQQ&jVt<(?$&?Ry zxM0Ib9V(D>-tzX}wVG(Tu5Q=r>aB5MX+HUwR)IugBU(|b{4m=)TbG+irxLI1eV28= z0NJ-KIZ8o?SNSrod!OIF(dK=beJ>J|@&5o<2#(U`IKhcSF;x>3EXY(;u&2PBS=#Jx zLh#hZyHkqL_RnD7ZMX3kT1;GmYySXi(7r|d7tW3BOK2`_B^Er5-xy&t-cN3z%I;RG z2JklKK@3J>w8qb=89hLg=DvnK>T-mJs0q6OaA)O?bjvh<2m5eulH%u-Tgw}HgGp=4 zHsDl}6s(Z7O0Yhqsmx(FZ$<~pQ^Ed88{hU1NQm0gA}C`{w2;JPcoob2-|e1bg1Whh z(p%_l+{p(t0qxBgBW!^51RX0}R=Z|*0F+559${?lJ?72ZVnL!vtaFLrmcKoIoE%?U z$+y;}$xb#jJE?C1<~>>F%$-eKMY*a4Zsr9`1oe9Z|^Sc$pWESBDVJDA!8(W62e{wnBZ$a)G zI~ii+cUj$njYMMLRa!wB`cyL2Tqqlt;fnVxTQb%67@S5U^u%yOxV3Kafiy7; z4<$wA#h`&_;#TTQVg%Q=(l?^j*{E4nO-fLx4B7bC9l5sA)f$ZJhcY_^%U8>^neyhW zJaxp@-rBgD@L60pBIec}LRFEjH@BtZZ^CLcb4m|9S+N2lHOb%W#Hv^BYPivG*=5_3 zS9k4c{{Z;=b9|+llZ;!2v*K^1My=aYfsCN~l|E5lhfE@STT**-8i>KoTPJ1F-jQ*l zSmH+n!;0q{+g38kf9^YubY5FLQ2Solnpo{wlp@?n@`aD`)MXND*DNkJrDVAz;YuG4 zL$FbL>~9||L|FaYd3W(t?rW9y?<01i3z<0kbcDKGy}0hm#cQ#Z7=vDf{kUbz_HMSR zF=uwimu%H@E07fqsxjKx$rDR!EQ>X}RV_;H-BD4PHOPt(aa!Kq*^9uJ88?UK=~ph7 zW12^BW|4!;trVrVFcmdAmZpOgrez}XaB=+kDIftw2PMf#da>I`#gfega8HmexROC5 zT+T-pFK&&{AaITci>%q&5hRS&GUYCze%RjXDnw?w^gkSB-Sr?^sbV0hZRK$?%ONnz z96XiL*mVP-J#gDsNRW}CcRbJLmna5gba#s4RA^&T^$dy8wWzO899xFxP#}R`A4Hj2 zZsi1O#+%hlbg7gPkQ$PF2V5@LCmcAgnQRvK7Pe9ZQ~AZJ85C1Pk@E)*or_Xus!^Pl zW#E{=*S7ZMVas!?8dPLyU2$e!*nK}z5u&7b9&IGm6?eq((OW=X;7T1>M{Wkzj!J`9 zIn`S-0L7cTDLS#)m2DleU=&JqlGD5RXTMnF~Q4vZ_*(_9Sh zxfv;pGC|%8gd!$Q!0Wdy!;u~3t2Li0b{g@Y&b7j;~tmG%8?qB^% zHo0teYlal65Gm9#Ik?sYMWc>TFzVJ5{v4yKw|=A-D^Ei=#h zVCOL^t^txumfgHiZc+oO8GLGV#c3`oDCrv^Z=3^|q0bS5ky4m_P)LuYvq|_yRX-nx zOdqJhPMW0+BFfvPuWwfK!UUYv9D@Yj-XMJ&>a2C9SbRgJ;E$3iZKE$5g^9+x>8&f% z4Y_Q@IKfONDxtUBNn=8iF736*XN5#22@{GWpp1g7XmvX4(DlKyV5B4AiZ0-2rDa#E zGLR`l&=Kc{LNV1sxVtL^5y@{7(L;lnf5d!-FUBSjP%3DNiI!GGYj#BkRPpIip~pgc z%NUS3CunTb7*PpvF;rnjjzA7(x)3p90wwigx~Zl4;gIGzq{0z1X0H^6a7c6wh z595NA18RLeDwziy)0=0G)#DQ@OUE+}_f@0mkx(?Il*6scHi*?*d~@zkVsOWTxY=AM z)LKnz6WzxeyUP4pb zOQ__FY7j`EVVbZxH;yyz?vC2=E@TL&;6`X<*CWAGxxP*-ugieWZQP`f45q6bfSQD+ zf|#Mb-A3a^8nl)ya0izqPzG{Y(jMXnrxV0j$faPE*V0B~JqX2ZKtzcQMG8R`qF!YD zG}4;lxRR0zh>uaBpw#$$Jn<})rcs?M{{SjrfLsbF6ahUHlkpz4^TVhBrBnj9R%Wd- zBd?YOIZOrC(nc77x$W!x>5iOSvXG-lgD^(v^5ihE9)%llTeM8B7k=}hUydeL&lgh} zF=7*rCe~Y-o-}GoV{N;Q1#~98C^N;~g_+%v0~SMmQH4q_`ej=ids7OD2_#6w)xalU zIq0V$i+80FZZIQ0@-pzrBp)#60K_EZhY)OSMB|na{YTdb$JNuZ=`nXJ z+x%O8Y*pRbwm{N+I@21vW0T=UHm4zqt3?`z?g-0-uc0fK+ny=ggS} zZlo$#a)!vz=CrPV1B+HRmaO=6t1zoYA z%qZ{}t2?u}YutRAPK8RC@0Y|Kap>W$2U6)mG8cIHAoRiMa~8WIPH#f`LtT0`_m zy%(ZEakO_yc$wlph_x&U*QeWz+pHd;##~b(!y)No8~{S3oZ z=uSs2xU*`6s3ARrYb_;W4ys4+sKv-O5>r!xWfif2$2C>M9I2W6LB*?fv^23$T+uK| zCz5#PmaCX5)W~ha#pz07QtZpU5Ca5T+KA>9pSc~u-5{oWiLFQ(b<+&F0U6Rx3Mfa* zh6$C|7O;-YhO+u(4n9x_$S0A-oBL4_q~k;Sby03a*Ck=&{kbL0ovq|Ie0h@Q;q9a2 zTH$`N0xGeZNJs%9JE*Q(G7ec_Be&K_11Eo==C0b7oLzKDE#l*N%WFP9{TgeABbBy= ziIm9+)S7HDRQhS2ElvatF$58ZZ<^QH7n8^*{@k*T?)uV6?wG;dkLp!W$Q4a@6&X~3 zGsS6JltGiZZsq7k=tc|$Rr8p)<9I81d0s%zeJiAi#XzLPH3s_ZgIs`XR~76#hF49 zYI78?LJk0nKy<&jU-3)3sy8pV!2u<@24D!8qczB7i92!Bg-qW=yk%wdfH!C}(+Zu2 zk|^J!E4%O<-JiCh=H;{t#&Sq!wRcllRyn?znLr);c>VZVtmX#;B;H)i0$76`&)*G0m03f`U zN0#Tb28vmf0&_INrD{RxpTjQoXKv0(%|~S$su8qQ9Kjzh+(oz*rvd<0-Y=H7v5r=` zgSjlRG;zv34I7;+O+^le2PhcnActvosb4@t;uHj^o*6K@nPo_p!J6%pxVWA%!6}`)WTBm;j&JK%;(IK2kG(Jw@Oi>Vt83OC}&GJnw4vqV%@my3r0|NBmrDlpZ6eJ z41Xk#;blg5C7o}?4v;yQ}*&!R-yp6^C*heBVSndw; zxP=rYL2q3SeJhK1Or`~B6YXuI4>M!ltUL|f*B1rUR?;jpT!l%c0a=Vo_*9XQJ!!5f z&hVF)5(@R3A7+VZ+y#Y2bLP4yu|17>?!Io?87+)9bF(u{)kOn!O?uNKrYYaNEJjl} z@J{#7dAG3Jk_*UXk7B<0_J_2sy}M-{v=f8xO=Bc{%=W1hTF)v%E+LQ$meMj*glcsp>4#Z?CC3$aXKH3z zq8*5*9xL;Q-e0%;=L5>iKO=nw<+c3m2PX|?ITA^c6mL^XWlb^b;W4qCBjuE0Iuic? z72)iARoTZxty+vrgDA>UFU&|M7Qee5(7e90x4-(HGHd8VTyi^t+A*be$sS}LfsF`0 zSgv+c6p01!8TkDcZsXWD7A?wAF_4L*Sn3?X`Yw6zzjQ&#Ja(_fS#o?`oRY1D)K@__ ziByDf+G3!sa|CCNU6#;w@Iv z))nI>xJjflG65rZH*KVjasd6W(?+vSShwMmUKNtDGMYWJ6@B0HF?$N5t=XjJ|a zrALT3B5w^OxeY_hhvb**+b$Kt``qwc^ETIZ{7=;Te%FsnF~&2qBvG_MShJu9^+9mo z0gH!mEn$Pfs@MnQs)%_DmXR*~xh{|FUQ>|f{jbUUQtf8v8 z_0(~hrniOMB%hTbSMEj$^qOuxbFLOFPQ=-~gwgyMy+uOimo?z1VK0|J^jVygV01$ z;Xp4swKtQPaC(ejZpGULnWe-WdGlATZXq#^6`TB(mn{UhF%vz-n#3n@UHf*8@-oxq z-IteKY=0uw>IP!6i$4}>$c_)-s_K=p#(=-*tDK2&42VB0WNVU;de=-+zo-pE1P%#g z3N#lAC777vfll`PN5C&k&N>Dc2B}aE)Kw(#pv0iyxV4ICW1ijRG@-aGYNVZV6sL|C zYVEkl2}GW6hvbIfEkdy7(rKjIx)wq|JlC|;%W~zA$4k?ki%^XJ0BPnI0zmBQLdhxZ zGBvzW)`p&`HwqKyUYKYiUREFvi~Q21O5(jG#jT<<7~}=OSfrCm46-*>_ul;8#nwed@KQP@btYq`8UKFn8UELT+2DH2I}LeE-Ts(Dz@#lqY9rY9-3mKX>yoqw1xYU6%?w_cFtL!?ZjJ?$#kPd z>FuPDl8nd}o|YL3`Haml$=Z~wf=hsbWiix(Sg--X)v4iJ@PZi-Ui#~pf|Mac(z}IC zMw#kyBK+fm;{a4wGD|3M)HQX>p}<^`mMTDGBqBlrqoULrgP9|)SX>=RQ!S%4 zJcgu!mxdV|PL^cYq7Q6D5ayBQRA*kA_;}!r10s!7FCqX+3IHlXyiO{_-x4OAYP>s$#cV;4}$0L_?|Ca2->z>tej7@%dLsTz-$ zEpWWl$(R*qUEQQ0P_A@gm&A-*7$qE3j@Je~&ItylCL+1ujHK0Fq0JUyLy&4kQ$hxZ zFCRQ83h-722HE77oDHAwNpD-;FVQW?9XU4$dlH%vt|&GV5E`}R`FUx$OvSZNPv*c zeKZ{ob?b&(g}7eQONGS9#n$3^*5$3GUC~EXLr+hYbr|njQJI9W9tgAo94zuYGWKMi zH7Xj4(PY4bopb1Xu{*zS8cd_$qTTATRmQR*yGrE(16_wgbD#&NF{NO>kXg7Zu{3oh zwSdSMV)Niwe`F zajUi2&vR_Wzyktsf6QT$3z85nLXzu>ej|`*Z&Ev$rnXrvt{{*qvaqNH#X&374!A3u zQ?|TCz~IJ&7JmL;6#`n~@#3Y1-qsswBb5T&UB(HFW@}y5sp@<@FxXhP8)P54Ll2Af zLT*UQkXG(G+2ev&GCv&^LFA*vUbLr1DPW8v;*(yi7 zcw5UmkEsf7ZMF}no-}1tIs(9ortX!-C%t=Z%Tp6)i4|do;EQj$5)GQANolzjK;6u% z5E*Ci#xJGicYX-vQkBeZB#cB$_E3IYS?yXM;jR-oPEpfV86}8;RJnl*&}Wf3SI6wa zVh~&_1xZpyT6%T+aAyi7fyGM=RP4t%p5gm(5BX;%!Qbx4!^Tfr; za-c4kT2-hZMETR;u*EZ-i%z0o6n1@F+(_~2`zFWVvj}IE* zrgJHtSgi!3Bq>0RyFRqmhX5t}TLmPHR?-a1u3@vVw*X@}dpAq@ldP(@s+VKElT3f&x|8@7OaK*Q|mCl5ARBwQq6f*>1sRJ$p50)nTn zQ-%=;hs3B8B&}q-nc_;3vsE;y&%pJ-%Jj@f1VBaBEVgfEF_)7{*V99;J8DLvNOSN} zb|t8XmfVRX?nVkoxiS171Jet+Y`G**{1n9GgnN9%XiKy79X$RxPo_-*;y@|<7SOzE zS$lFI{K=R5d^5(3EX2mNIg~ocD^H@@>`^<>Mss!0j<{Ic=`;=kVV0%1gaCyJ+-tch zmxdxyr4c|@sg<>+=%jth8Zl4}0X;IVxOJ;f5_l#^fKyQ2xKUa>?g~7K7~b8sY>RCK&}ZRX9ClON`J6~*6J9eIH#O7v z{{U%O+;H4ix^6fti~j&=-Q7yJYuu#vF-HBe#fSxiR)}e~qcdDumDpT9l{J9j`HVYN zBSDF0s;>LT_Vbzch25jZt;+j%m55$@f88<0RvU|UY7XfY2_k6fPPvSZGh$8B(G4J2 zjN*Cm916X+xe_an1<*fjtgN|dt!=MwCB3{8JKJ&7_R`AkXxH)~S*f{L)QTLAShIdt zA#BOtjI$g|W&(7tX}~wlG39x$ZF_6omr&U});2c_6WoXrv)M{=mI4W&F)$-7M@rx# z4DA6n)$k)D-mOOLr3(J4?fa*}a=gDC?VoV_Y})&m+40!yPG^r{Ge>Yn=eD|yM)=$c zu&%hP?U!R2&fNU7d?lF3$B0!d?*w%TI4-_mx@jJFXsW21FsV^agq-oMD@R>2Q9Z+q zP{R5$#58Q=uF`^{mFh9V=zIxCl)50~x-JL{+Et>+qb8{9TmiaB!Mw*MvsaD|lBl!zCZ04*}3#(S4g83D@ za}h#zmjIol(D~p?yQf5gIjmjsQbl-|JbYrzBCmC0JArMWIjPfkh6e2A95BswxHw{( zaX#$2;^i}1+Q9NhUfRlm)m6T6L#=erPMA!uM(cw9DgOY)5&#me+{Ycja`!eiyJUV+ z;w5X2PSrQ2?VZPjBGYk<9OwzAI7EOs0 z-nhxtJAP&Bww~P!v(oi$OSDJrD}HN&kCMCNB)WS?g28UBR3fQ!SlOh{cwtpF`A#fd zx+O3q+<#A+T(gPaAd`vnA0Z5nxCBgvAy>F#9WshdXU-+ad~4Bo%3%(0f>qU zGS@ofa29uBWrZ>$F1_lu((d1OG)Nsz#()mJ4q2hSvtw_}^VYLo#Y=}~Yo;ivY=D9b zvd|A2j5h7!Ex4mCE#AgEI|RnOKdYc!Gu$5Nx4o7wKGnXq!;ZJvZ*y-QBavbh*pUpQ zRnon2OK-L?8jT4(x~z?#vFVPvjWUs_IET!f$y|s30Eph*Ow-R}b1TcbR#ir(-D=E1 z(-!V%mM6fkNp9xe%QT}-EsC>yXW3W$_1akbe#LGc0VK0s%9~YtR4hGS8Vs}Ph1|Pq zZx@w5X@2AG*0z@Q-;)Bs0nZFO1@#y0=NDn^&JbR6R}wF{`3X!dZ$3p*wFWZ}!$6F$BvT41wUjc>UVvz0D^p%3IrB%)Z;cyA#+(9PE?Qt^fq@O}c|XF|V|< z7}|-58o*;k^bhr4Z`wx0B{+{-F=_z!%ER!2thKEP z%yq_&-qhR7JD4pk_UmnKIxOi9a#b6@aK91A%?166%=WHITFBv)Gp=Qr3N}>xa8tjc zL`ppt72VdjyeE%UUq0meIfc!zA(SzTxaFBk45?g&E8&heBNF01DxJ;wkRZ$Ekj?Hp ztJ#;k3{D|az1pKX=G7D=;^C^ALF+G!sVz>z`fIJ0Brov4c zhQG%RCU$BiQ-@BAGWWQPw8aR%<(_MlmT7y=gcjdMuH61$2j7O;-pI^7S!dk3G|>%t z%%1yCI}%;{gfS+h`h_t!uW6H>F003I;gFZ!;(Li+;z-vdAiyZ7Ji>ubJTC6|%36ra z43q-FfmHeKV=k%=(skZ?9W=&7*p^0bGCnJdpc>ZU-|2?q8*8;+Z&UE^sSbXzh%_8j7XDJ0DW`=hTl39f(`j#|Lg9BJ7JglK$$=B_u>+ zN|IaU+B6g%7_+&*XiEkj468;mY*lroxV&iWp;G%vpcNpg>p|g+*PZe$#=n9o5pBs@ z&o3b)g=cUCARtkoMfq~WCT|kbI8(SJYK}@R<;htAFsji*<^^^5V}LWE!kYWMzlJ)PTX1k#aUrakrLtJV?0YZYG9XK48rvy}T%_vOpjomf}J|EZ(Kt zmZtt|W5X3l zDoIku3WT9j&0WBrz9S5bDS`rOi8iT0BvWlg$&rCl2ab7R#=vKZq5(633KL{sdWjN6 z1Oy{J-|#UWlhTLkfX29##?~7sgn`caoNbP39Q?2IpL=bT}9@rsiaYw*njwX@4 zYNIHP31eR|WZj9mCAE>h{tHD`0Zoxu=0S9jaxiq}j@d|cp4DA7eZvq&3!)tt2! zGoZ^d)XVO|?s{SsK5p2fj-qg)LM1W2^%PZKQ~4b!U2#q&i-i)Crb6}>5v|03Y4-5%|s*1+BL3&FE6_J5qpUo`!&Q@x)A$6Ya&Sj<$+d+NM47WW&$x!(kF=)l%WpUfD6xm7`@j zFwpp6#5mxH22AYj4oq^P>z3pFacae$DkUXkDH}i`+*Bweu<1<3H75XLr7i`Fq2V$> zcPz1#8cDbUGObGMQ;P7_90={nIl)a~HhC~=F{o)Hp(m|2k&AHj#dGEOD5*>?t&(eN zi@SN&d8-n%DO4<)RfkdyGR2GbBXZoXMnKAeuyOV1hTP0#B1I~n*7m!W|IpyW?nUxn+NYfTUgvj(D=bbdT&fW|ju=ME_>+@*!&uXlfAw90q7 zC{R(3MxX&rzF5z>yt8oYxdwlS=&VB2g(6Y*AL1pLOES$mK%}H71tepoDf0Q^cK-mz zoZe1A$Y=N~EpQ4l>(?IMGRq~Gw76Hi;i0w{w{plk^L;s0k)@kzffm!bNb=Vnhtu@o z80m7hfxNMa>g6N?u zm0lvvaWh1vV%$tB-4eND$KC={COBo$Tgs>ngdC3H)B0Bx${;F=f)ebi2Hn{Xrkya` za55{TKt(K6pxA5%ZkrgoA_*yx z0*A*u3}(u}h%2Led)pRX;I^10`q|xEDUpnTkOrcpR)Mr0c=bNp?Kbz;%Sog=cq%vd z2F$RcykCEb31P*-b@Xk;L|>WY6sc+GYe>KXriX1Y=&#D#i(aE>0nThP=BYqS?rd^Y zf2`uAlIln;+Rold7C99T=5(*je8I<^{$Acvk%V-_kPB7E9-&|KE--TC5$-E{5Ak-X zZenJJMhz7x<$~9946-2WiyrG6K7>RFp~E+9(yYc>%Z1HuZOgEdAylq_P?CBYcyz~> zxo=fKqO&BGdNo&0@$q^am+OiuAUx4~VV4-Y3F#KUDJ^K-Jj%X@+; zghItsGW{5|btXc^Yu)YvLruA2?wHA-F*x@5d{WqgNx@g{Be=DhR%B@8rdx$7Kdvg= zjO`YXVyDY25!M$9($YnvQiy*EJ!(AhV{dpFR8>KR6CosRKF$4*S9FB>bJm%7;pRZi zow%ZnB8`Eqnm**R6Ed|XP$-~R(L>kI4v(f{@-@%sxEVbHDsc)+9Pmb_Jc&llSeq^b z3RM97BzV+kf{Y;sG9}M~Yymi6iiY2H$T72pA1i50SJUTkO4GL&48Dc-AG_W`W$pf6 z&exK+X(`9cFcH6Sjk_h8M&iHQo=2`WZQeJ3aT07sZOe*_n)a^&3cS;okWbvxC3 zr|wbielPsDwfRfCn_Er>Mu>2dNXrOq-jZSju3&}+x#N3GZbQ|86&Ug4dMOf!Ag*xS zmBdh(qLJ;~k-9`}rKy;uG@%u)DbDnSbcz(%&5Ml&t&s@e6dQy~~9AW@MFrEdEy}N4)qK}k{=TY&(+IHJlauP(Hmzr}V zgK+f}bztzWdt*k` zD0I@fWrpc89Z`x+ESeNHuib>StjqMb0Fgx>Fg*{4mI8LQ3a-}0!WJ7aP*uQWZ%ANN z_~9dJX}KRXjTvj(yJ|6VFke7>$BvTY{0FwIZs8u>;Y%xChe08l zU<{JIKv7B>0&CM5R)(P|$;74f!Iht4+*`G-{D=1>Fv*4hW|(_l+#Ca_ND;wVlEYX_N9r?t3fS>#@5Ai7W|xBlwOOuA%;0+26R! zC7&f5duQBZjwlVJsPK~;P{U}>L})=Cs(?l_{Tur_$IS=N9;Y?t#?yQ3#7@x{Z0r5N z>aXsY9%IWTW47hLZ~p*q{kA=+e%906%Mwp}b222tSG=iLn9zoxpkguyOjnhy&hGE3 z9kR)rg3r6M_b+$de<}_l2>=2^2xT4|odJ2le%sk_e0YusU1qqEEbd=fWRo)*h|L%R zY88!eaJ{;f!(5Z?Z#~lH;%-dGv11I9?tr4j%G88Y;*5$Fm@#rwD0yh!Ca zJFYgt@1dRUc@gx zRj=JE+nMh8u4dbZpe?tV9l7FO}@p5^54xuJ;1B7h2NOA;zhUkqB9^w_m~RaL*d z^=9P!YO5WYIjLiY-X~H8BZF{rpW#8PW^}_2++Pl82Oiie7dOTaS9H6a;dx#HQ)$TA zJTesz6Unu=1Jy#4mrNtjXuN#GkL0RLdMANY_v9y;rqVeAY&$5vnrD?dj4l@?GI+L1 zo$IX0G_xmjB^2mMsr&r!i9#k=B>w;)fr`@HxSEV9xE-M603*i*X46WkGu#pq%ekdi zjwU;b)B;c3F-rcR(ZxPD1}=rTn26LC(0qprm|z_Nypr6zZ(yySsz-p=6|TX}5DVle zBffP-KUhI6Mv8@qN_v{QQ>8EvnQyy1IdS}yO6uNO;OvE9#aQ<@D`W}QiJ&Hx!OupP zBcEWPU6DAZ&&j0GEOxRmK!_evzlxb7A1;LA58{A6YG@^vIHDJ1&mGdz zHZ4|A)TKPmA7)aFK%GRe=|4{L10hmXmu5tY1Fu@*=(TPjzuNu` zs!HUE4T`VNb+$=jM-m{ZmcE%iBhm=ZEb*Cg^Ai_wpBiD@ngg=ugrE0qbcj+;-yz#m5Msk?lpC9A z(9n}jF>h_M+QOt9>Tt&_QCz=vbOdzGRyh^p?e6X(w z^r12>niGlP!;-TBDF>D*7c<6NiRW{BK(sL_QdXJ`wAbT`yX~X|$=A}9?n4R4fEh=^ z&jp*$a-mB=juc1$Ry3wVTKHj}*>)CWW*UIwf~~rNkkXOQ$V_D|Gxxir^+**xGN*zk3aQi-5y32I^USUza8fYdI*=>V0}C<$%1+oIl*6#a zE@0)d)D1MqV!3ysmg0*WTogMIg70^dxzkE`V#HX|fV0&qR8en`Acb_-)lH-RJg_>X z29?Y)QOi3iABZr_9Vzk3xQSgLC=jctH*Hmak-(@$K7Jl}R;CY{Hgdf8b4sO)fLA1l zEh-OOv^bewl*T^=8e2z0k;(x5Xk*L0F(O8js!ftW&kv`pZRKHljldNCjtALub^++xm9 zNR&Or%n?)aLn@jQa?jy~+`Aa$x-lv>xPxx?ga*}DJ*NULMVy38c%f&$nE{S8*}pc+ zL*Q$L%JhW-krA3pJC|bZFLB7JCbS0?WJx%t3M?rE1#_2{d4F6&mFYsp&9sR_3i?Js zd~j?6Q6T)_^g3-iexDd8`!4ouB3ij?kP#1L+`E|z~#+pgN=;}lt1UzkTcioa0lt=(A z9ZBwe{{Sh%Bck(|iv0fo1kFY?DETf;p5>2Z>f0QKYMOza1u`QRXFp1Th@nFg{E^%j zEo&9s)!#7`@<#B=mL?*jWx-#{X%MRiMLDvH6VQwv$95xd&g-^cqMNZYh!IbC9!|<@ z`J|JPYg?IU2W@I!clYk8Y-#&u?$qxYO5u!;0gqS3F8m}Sz&JsBmCSb?^fAnm){=xE z<&oaG3gV}|7M`%g9NXp-_GX$=n=6KfSm`=PxB|2!sra6l$F(yF4=@W*7Yn!hJKvt* z;P;+3;yB-tvwIuWn6q2mTDYN(S}-)v?8mO#ZsmFrjKCyR9+(%)@KkQvh$WIvTHP-# z&{@N8YxNAqTX-t5#u=(rYhOqsTr+uN*0uxy1mfQx)eJ6ZH9<2gT{ zz9%AaCWe|2cS(}75JHjo zPK0Bp0BVrwYtb2nHk?(E0F+?SO>WzLRnC+P{czh-5kO*Pnv^rhzz}rJyoMpniZzyv zT|+HFb;ea&gg_{Xsvu~?_mow%F*3JSe`xL768|627nyNINRDx*o%_V6leH!Rc;+; zl82MLYssXU6vh|=$_*%bn)%@y>;ANifMn|fNM}&k{Xli>g=UhQ3F}P#BNg`g#Jsuo zqI{XEo?lHLW?^>}Qr)mo+{}=A0i6wTse0seA5a52RaVkmF`}o zOs6J1P{;>LA&Q72Y&A7qDb~8_g^*bo#YqTW=&3Z)qb#vD z+ftb?FkQ?P5&=1%;Ax2=LfJvxLfPw1mHRQn6~rbH?cKJZk@A+%_~O)A(3Puhk?Wmm z1%Id6iFYVv6_BTMDWNr>=|k5NV^tB8EL0&3a~frUeI*g7Q*ZPw28N+@&#pRBOoORo ztNf;nGbDLwOcXrWDIt?6ZRM6Ahfqn6Kx@q08<&I*`xzx(; zPTcd#aazA3O3H>Lm+3Fg(xdc-@xgJw|-ijm0}PLg1Ef$TpL)fCr8?Y zw=o+^sU(m{8TjJm`_j14nGV?gD?@E)MxZO_w)o@q7V8giT1w-?daCymXb?|=dhMS*BQs_rD_<+a-lgNh5&60 zu1Y-YZU5o(=+8r?lIfWv8QyAa?C}!L=1pG7mu-RK-jT3F3 z6l8FB0oXU5gU1LV{@Se@aR(JA(>&oL+{d@_M@+#dIuATdV<~_uL{qi}R9A7*1%^bS zA0>Z{e(XN%f3_k*q-iG!89P{oKsM%Sq4UKl0y0q<3Zm_&ZOW%0JtTZiIyVR`Rftyw zWw&>ThEuk=sOgJTOcG+&#_VQIA`fy+b9c!1 zzM}Va{J#Ts_=Umb+*5awspxGBPs^;KrZQY4K0FK3d0}nya~KF(Hl!_qra5WM^L!uTvEjL%+{WBai+D#!p(BgbeOD8> z_f^xzkVhnmZxLe*bX9VVkXK+TKp7FH8#{sM7MwRmCElxOISJ>Q*&0?C7c2P)2x@M~ zR+?AC4Yvm)RwPkOz0OQn&~#UOs3rE)cI`V=B#n}2S;ERBakfp2C=~5Db(?Xx8aXU& z$GS@E*W{}n?e|BsrQ@TEh2kzOxe3qx?aRsxP#DPCiI=Rn`Hg%qP=w%5sUSv7K5G(t z%g$a-xeeF2W|d_PBb0MMgw}v{9(Wn-mf)pllb)#J+qN%qYHi6N8^RAe0#^ui;4a6Ccf@J4P%L5hFR@{-+MSn_sv6Qoxb z(LA8ktWqfh&dHdwYX?*Cc0`!BrY9f^#%?I`}3|U z?Lmah&ISG{JBy-G04;2yvo}$jwqa}o7uW%9)H`SoohyqLEJIt%52~eh^qQEZe1xfO zC~fa z74Oh4h|ME;Pi%%XEnKQ=PYhGlMo}cPO~_==}DQ(T9h6)2GDCQH{hB6%K8(!vR^ zW+6pfzX-=)n3*MjX0%+NunPB#NdCo+MMl{UO zjv1#;=mP?JD;Rrdk7&w(7TO9`qGmdb^c5P6Yl&Nh9Cv-HvD9n&qGG(1O?L{)Vp$_0 z;;kwO^(a0KheLEkr5D6u^YK9|E&)O{y}MY=Jn=^b^V}la$dwJSe8i0jCnJQ)+$Chn zKndy%(MWjBh76B{S=`&Tt2;w?D{hwHoyz@J&~zf5HS3EO{VT9AC8Tr9!;ef*ol!56 zCJEZvWwyATt^);)Vug0Gj2euNgd8$A4X|M{`7q)1AxI8f22Wdzw&g9PHqgfeYCE$X z+nf++RFC6}bK1jm1E2sgJbHam!e$4}QmUN9Fu@AT+dI@4*bz$SjGgQw2m;l?G9;2! z7VX29iWs)LW&+R}9>4O&9m#5>MOR2>Qh-nAMCuIj<`t?5QI$c`zBp6^yiOrknQn_P z#I#eei-J$4l?n!bejRQBg*?iD|2xHYOs~`e5f)SQkvim>v>8;navQ4xfPpRTW5yh=9!hUWJ8^N zbN;l$Hui1GGBPPQWI>{ZlEBHf4bULbWffq0iuJBI!pSWf4t=VFT(d%4TPJMH6zW%T zI-ZmraErD^ok0|2T_|BnvaidYLo@bbjE4Z86lO?>c$q;jp#vdKhr{1#$ z=qaGWnp{eOC8W2i>Ba2GB;NvdQ{KqBquEM3&7Qlw>C)4-0EICYDL zq$S>t0S7JPE3z6DHLg|o0f3d_?4U&r^$9xcc*2@do25GBb;9+D1|dr=eIzJW?W$xB zpm_bAD~MdBkx7H*4nfIRs)4D&NO@NbQle2KYSN^Nlhk}ao)XNvP%gE37C6NLA*-Dz zRFCz?DAb2pSc)}R*V9kyP8L%N-Vu|lic1Opf+Uxp=@8Bq#SL_5A(gRhpNo>&7F z+KwwM2wJr>@WRMe0SXsoDrog1BiAf*D3pO1t17}X28{k$(w#Hc7X(sCWMoXrdqG16 z0DwhB4@?l56bR#N8kJ?RMwx<;RzsqlDdS9D+l^{3de24MH9o*!?Q8mxE%{tRyP_M~eFpIp( z@*hnI1h(9&e(bQBZtj-UYxC`rF$mK- zJFTS>KKqiaktwGA)u1%#<6N;a22VVcVMXi7qqJyZas!1@Vgpg*yP?ExCM^*YjVOxP zGN@Zy%9kX)s0E`n^nB_Dey*jXX%C*zIZBkK9&Id$HaJJBJRd6(Uzcc6p$Gne8Rg8#Ip>E;^(*mK@6_q1wWIgp-o%h zJaIc&Og@rJWy>_vAwarEwxPJ>c`FMm3&e^}UTEz=nUiAo7!O|Ts5K`ndQE{Oyk$d( z#+b7zm*fDb!CAf6%<&7y+VI!Bb6nln&hg31ETi(3Uu2;bL0Ln93X_`jsK%eTZY>5A z1jjyH$2CgSWL$+rb8UHH6mi36NjDfw$`(?Ur32G5O*afsCf(a2F%YY>ink;9sq;o| zU%7Le-XchDW)PukXw7#niZSLc>}3hdNO*;0-2@IP6yS#d)j>4}TIY%v0d!FzY#?b6 z>{cuXuDNZdbr>ON$WSOUUPW*=cQQXEYfp!k8Eh73NuDl*ksE&Fnegz!X95eU5^$%t z9;IimY~;mqIctuFE^tf%7#Il&h@GW$BQP-VeBM+oN~nTQEVM*v2>dE5LF0haIZA=i zQIYU)*SEI|3|7)faVr3k>^ZUNmLG51?%tl5#F-vQWqL6VO%;|aTYd`3EvAMUxk(+I zGbv#T0g#|Mn&W0RZR~9bNCR+}{{WgQEWx~ub;cnEQ`A+r zV41weLcog0+uPd!4~L$(vvO|ZCc$;SD+?ruq-3n>1a%Z34Qb(ogD8b$Rc?p2RFEWR zuHw}>oHE-*jwx3iC!8>yjVV*8(0#rbuQ1a}CBhD9i?DhV<6PY4EbtHo)Rnl*HBO?2o?2jmbqI)}E(_?YDotdFk=OX97ulLLn49kWhdCQr@c9 zTmcS*!%EpjhJmCxOVL&C_SzZ%26Y2EpXq@&k&A4%M=!LN%z0E1{PDoO zQ366SW>%7@YG@8)N?@fRO%rX&Ikl2SaMRem}?zBCiWlh0Z z2B3`1Ym2rv`pDBz>q0l%71e#X;yvzI+pCb4lCR)>HxsF#@avC7vWrCUI3t|heGy}M z!diQ4k>xEQg5R0qtYnJYm2@d7?$ZP=vkI_?@B$B9R-riZs5|xEc>Er-ZDAcNw zDo2N0W{Yr~sA-?*s?3;#Enn2CcPKx28Xvn59{`k5cA_Q@BpoP@24L5(fW?bCOM;gm znKj7>*6IO9qOOz?pNi>VhA zXy=WiUg>5Tg;C?iY4Mba;wNzPMnU5~+4s_b#yNu!W|j1zC<% z8U2`iEt#rQzPcB)`1m5Zmz}=3h6_#_)?0=W$=ls>h<=_LjLBxsgTogmYeYa8mK_FV zXW!h&jUzQn_eZ?%dEJo9G?IkRxhP%L)P*BO#e0{a9u|WRJW!T}b5s^tLU z*`+TsMbbb*U6TZ=h<8%EM_qEy&jWtmg25^`%FH~R(MK#2hMfYD6fVcN6pi@6(4Lq( zSIhy44@v`oJW}T;s$VwPP|YRMvp6KiwcKmd!vQN|*wkbk|DsLom%dTX6eT491Zg9>rz zm?Qy0%XJKrBvShA>Qu6TEXwN28a7QB zFvy<+esu*OgO9m_tl@6He znh0PRu81KQV`VkWu%s-3=LJ)73sxE}G^y!aHpPitkP#xkJ{?q<02Pw$rIpe<=%Pm0 zunxdgVo+^R)X0*0<418R64w9)nwZmy>u}B|#Ri&|p`o4Ea~@#m$xBdf*bHoj zqaZO>n;R?3IV8LF4mp}TOY7tv#D(S?lokgvKskMwziQO>_Z{eHPAvSR$Hiob0#ux;cZ;xSS1&&)zb*E4KF-3@HMh^rCi0LRc((wT zKxn_oMy(=?c1UfvvqnQ4)=g_%@!BB=rB@jh8eEwF06N?(0Z!RkFbT|Ot~wVCe9@;C zLm~|dUp(t0OOmN3s{a6s!!g$hxpPq~q8TNUppe^G6I%5r6sLnHK(Tc^cPNWWH_Nb9 zvZqr_9A*GRCnai%yMu-#xH}ZnXa~fca2cpjJ47-br(cu}J~iqvB!Hv^ygjLCvP!TZ z(4QY6iHl1T%Zr61a94k1w7^s~Yo;Vc@T!MUlwfGVN}T%EgCR=w#E{8hWWsg_Z%72F zAO!>w;;dqbtQ|CW z63ZnQ1LcB>^1)eJUdd=m1!h1uf;2yFBXP9^J5jR53@#9Ps-d)VGN5WPBV=r7MNU9A znd1=ICQb1C)vat34#d6D8?cT@PiMIK5D(#?*YCxXZd#boiaHQOQAZlhYj7S-3IC;HxRu=3~>PHN}1I&NgpK zHr=9g$He>_6x%n9;ta7U{yIgvf^%^jjk%@AgCD}gQk#cdJ8L0!64no1d=FJJ@{ryM zlreTARJV2~xD3s-5w@9te%fL7?HgbS67N!r)C9Rk@)L{6(JkU}AvCy}Vhv~j27^IN zsf&A?p0wH^zGU{LGD!nSuX7>!XeP5Zx2h6rX`@jE(+Wn(PfaP~m?sgvw<}t11~DuF z$(o6FrX=ytf~(0j+|3*=)o+wXU7>n|UjtonmFnD^M4IsJ^F=6(lK11;-IOtrl%LC{ zb*^+L2s?8rHawR*1-jea+mjrUtV+MA7!gjHbvQ9<<+G%aIKOJ4c*r_2EMb@w7YbMb zwu`VaA02UK8+gu|gY<8nDN>mgWs}1R*Is8r9r%*w`9gey>XUTzswlPGx; zZCOQXn|0mcftR=GtelURR6_I6D6Q;|d-5&hX;E zX*49pyH{}4Hw^T~&feT0YhHuk>a?7rWqaki6WOz*uu@rVWGf!UVUunY+$o06EN@itmOoWPqPL$IuFa3rPGmM$0Kz;}GL$V|S z9mA>|B$)+$RP?gxo;gM9zCb)$yr4y&p%-*OOm{H1n%jr2`mah2>TeoimRT7Os zK`X=poq_0c2caDfm?+92sOzK&N^Y~2)$(>V1a%)~D_vtE=qnT$jf$}zv7tVHZWW;j zldYaI%&nUZ3Do#dU}X|ZrbL89HgH_c9B@BsMWGP6GRhKu3ltIMdBen$c!B#Ek9&qK{EQpTrLw2#&H%5sxTk zIEuM|RIgtV{IDhroGPE#S(}WSH)^d_(=qTqIJa&FV+8APVw*+888VFtk}iiZLH<~S zY5v?oziPwcm_@)(JtMh86giPHC}WV*p`kdtV`n>_S<*aN(l6VLDlt`?s}_z%U93tI zLDHTht|;8KD3qfBP?EsKY7v+NpFl7&i6aD)01AQamfc48tI8FXX_W}*a3rT1JO;Qp&?OLwf)`l@MpdnPk%EP?3Mk20>}_6lNY!Y}a&2?zUmRVxw>Jm_ zHD(ty)pQ;z!r@&`(QgPLUf`Nlm{EQ;J{Z^9?Bovt#ai{pQo6PLd}Xf@ZwKHJ;NQZ5yrdRw7}1D3KFq)*LLBw zf=H+U9;XbuayFx?U#d;nwO3f5{{YFZ@7$aR9B#Q=KW%e%23X{d8+opzo)9-A+=|A< zAvMaXOH(6^4cEKdmBs*=@o)q1i`HCzOFCEdlGrbdz1!`cL)w1gJgvNKqhEprIr$UydCZfGVrVm!dk{R1vvA z85bs*Vb;OorNS%}k0eTx0p8vR!we!LBvFwC8wpc1Cg40!NlerL#yZfI>0GcP+sJC5 zKP74x+p5gd6`oavonwrZQuMCgfr!iQ#~9050|2Doi&qrNe|K{Y?U{X`(ud(@xrXps z5t2&|?XI-Sr*Q|%6L5+hK4xd-!Br$mPU@db$j@sWsfwrIjv+9DHwm_ao<|(S(Ob3{ zRXDW-DuzwV&;y-1j5Z>eD>ln3HNDhDVvAs2*!;2%zZ_k+b~GF?PQWKTzausDZ3lEi zYcs}Ww?p$X3Jmq}*DN}ALo=$vOkG!6Sdv#nlxLZ57IbJz1Ov z3Guv`L2~H(kbvo!6w|`EfZ)+wjle}y&Ot0>hT3}zqVme1TvM$2U zkS@y2i-a1Xp`MQlyCK;^MxiUv;;@@A>=v{GmrrJ7ySZs6aVxi_gdi`aMFG;9VrK}- zoxD}M1jJE83cq}-)z}I}QKdAlGvx!Wy~}fNa*EN#Tnny8jj(HvqqmXKCzf(dNbQrz zN&rH!rd=^Hx?IudpLwHhQpEDat6we0@Ya02wUzChyq&XKIk+)Mv=~pq>nvM`)l-y6PWeb6gW4+`xA8}E_kGmkyKZHX*i&*i^z8~WC*g+Q z9-XodV;`ccD&24wD3mdB7c*S3lp|EDg=qJ)96H7fl1inGM#4Xi3M2ujl~|JO0$B2Ik;l#yojQU3xT!Mb z6l#T*rP)IY5-8ssu!+>NU#+XFtSu!;U=?Rhmv9PPrTAp9s=Z4SC z1{wCMm`h2jT#|_8B4yfEyFj7LX^i;KOuWkJtZ1d=Sn@&=#*T;;1wh=RELq&h?f@qc zJXJv*1giVS_U@8WyB|3RLZo%_IL?#|2s}G{5x6TdD@w*k1iXw$bD3)AUpz#?k#mXo zq72Lwut6|{%BsY70<&m0YfSR5mL?FEmmGdSia4+-)wB0n87GBhP1So+rIui)N+k&d zohC4{?ZIp z+`i5PKmsf>9qQekpn$}ZYL!15JQtA30+}u11wmu9$6piWt|}XHw{#fRBaTU?&Zw77 zr{pKUNbP1TYb0QZBvX+z)<$DfP(P+MC+;%b0SPon!~X!t_TZ@Wu1$4u%ZUijGTzq(7s(Mc{68k&bm7L735NcyTD*)B5+`*_vMXv-!r!(AawS@RJ$KA!PN_v7I!3D zqBLxPHCgHdlU+a87~7vt=n(;k=bBLxi6vBpiX+JrI;(CwX0D!9)9=P)Ho_#tn(;w$ zZUIYWx0)H2DPEhiM__5YsXkalt;!N<6fWV>w_JPxBvHFDkvBWLF4i6@!_OA)ZKD2ev4~U9JE6?S+{LH!?hSwDz+xe zN{?Q6c&?j_sF*iq2Tt`EQM-%t6P8)%MlE?Qk*mEe%!L%TEVl_XkuZW~Pt1+RO%9n? z@mCJpG{G^U;l@9TP0A1tVuro8OJNZbtdg}^{8z4@4wz2j$hOr4qlDd7q?|1E3n~gN zNPOrzjXvXy-&;(aKZIkSg1@9`$9^s{P+}5&s0tSgwMV@O;#50Tmu$4E z00l_$>4eCUKyh3l$tbxy=A|g;Xw=AjaaLzhM9ilD01TaS|Qxbj*^`@QiP zk-sN*a1Eq-_U*1!u2?VQ$XfMi&fNSys71hKr6(l@WNr(RQ>8rdUWtrWE4U4J9GHL0 z9O!^UvWn!@2P%&bABF&~Q=~Ggmo)(Vm8N)Lg9l49syfc?Av9uLWdyw!G3F1)4z)2J z^aaX-Sy2jw%ry)^^v^S2w*x6I3P^XVv}!lT=B&U9Ee@vz2g4;2;-GSYn1@gSs05Ms z4z$1=Q6TOP-OLCCDpr~0*AmG<99KcNja;(`*b+vXQ{jym!SY5VnOnrD;Y#g6p5vJ{(=1uG1WPC& z%M~=GSXDq7)Bp&lo)>aJ)GHAUME8nuu*A*_Eea0|^FL-Zc2c7~QsxnJ-OUx0i)tzy zhLn&C01k8~Jk2!2uI?oZL_?`iErTa15V($5nA`x|)gGl|xiU_qku zTA2i8BLYcYf<4q5e5;mt=~>jwDozf%GGsJX(WLDWt-~csFce}%YLxNu%L=z*B3f}H zvm%|!a9(?hn}`?698&M_o& zvY7!^Ijn=gS1f%1nC@&sLIOr1!N!~l$N<}!s{*wT#@SmKk~VvZ(04@Os+VfeB^w|H zT2~6yV#EwU^Bi?x{Hs8m)0qU|IDJs|_8YB>+{~O}*eBFm!obVj+(i_+{IwZ^*hQ_g zz!{MNA21lZ^B8h;a-C^cqOg0fjk>mu&)o0?gOB$N4GoO2qdWw_6=sQ80^5@!cMiC@ z?y+h5(2(;)3JN!JR@l=)7!^v5CXU)z9_luM*SgS=kgtVwBNzOaDBX&i4cw-r`n zv@zG#qr(f{Z!Exw0PWoULUp?mA<~#H8q!6Tt-*?P-yC(w=b0W=7^`b=ZAeJQggYpm zu^`T^yl*4L@=)E`z1#6O5-)ZUAT12+fc{b2O|?1`mNz!L+Z%{V-lGW`*X@&Jcq((V zD`ZKv4~XV~be1_|vXNRo;S8jm$wQS(4Dnthr|qM zZLZq6XxqO-5vWLF!z0Ni=#*uu7#cQ8jeBs{Gsz&G+A!NtNt1=ue$09O#qUx?>VCMk zN%4a)Wefo}%1Z8Kp^0lvbw6e+zy>^WRt6ziBZdpBOMS2TsaKIm@cD@NV^TKZcGOtc zv!%I=xg~Q$*p`N>8!@d&JwqanrPWg3RGHBiDYweJeP(p)4r~ViT2S5s$BVCj~i0jh~hzx{>D;av1 zXcZ?iGVsjeIU-YTK;lS~wc7v!r#-{*0&vYh7l>y0@leEyp>F}Xo=N4AWNCAJfbya9 zI^kP^>PX0!B}5L8%OVDhChYQ~SI5G?3|I7J996+^5Qw%?q!FO?2d-cPp%`VT5LB5u zVRvx{Aa+WEGX#5Woi%Q>ApCK1?da|cNHYpDMvWB-2F6^OXy1ek>M=)20g8vKsiKFt z%sd5G!xI~Bi(8_QEdb1bXb|{xIO56n#Z`-pytua9u&RLHGZ9ieC~(_X=WdZ&7NRp< z2GZdY6LBglBPb0uGu=#$2DsUT+B(SZR$(E4UL2cUziK+cN{4ZfKWM>P+{)~Egt)L(i@TbsfJfU>+l38HPMYPGGj884 zqy|%Q6{Hd`6?%6!@;K76L_Df=y;p4ZCn@c#6`o#i zjsE~HBr(SYyvOtqwR^EGYR^yyKsCm+L7V`DnDgyKQgebnY50zB-}1LJJ?)paTIJ)O z?#d*%x{3iA?e@``5&d)qqzz6IV|BocL6k;r0X=a8>a=ah!qpko%iBEaaXjU;Tz`A% zlGYR}v>n1s*_a&m*E3F-vAD1X5V^(K6 zu_vwyf;m=SPF|(!UbMilBr;hfI+`^_3LG#cy+uINr7PFth6qFo zx&bol%)to;q^Tecf0hDNESnOwY022_k);W#si$8oaW2Jin<=~fz$(=sQlAdEah9Qq zP&urutSC>fZj~JdButEIx`fdcYYY=m?kX$lQ%ainc;Ol$HGat-9}~r zx#;F$pMbJmJmZgu%4?))! z4KPcHDrlNW)theRC-p0(aIGW#D#+Mgp|;?p@eJxJatRyC49127nwYB2kG1G2@bDz0Ju$#i|7gt@j&~xw($ryK!93 z?-jXi&l)~NZZs^XELpZd7`h9Bf$~xFp4PkK_%Eor7VNS}I|{G5MQV}hBg734^Tm1G zjG$u|EUUzeml!G?g_)Lhh|xrh2KF>XBR^5{!ZxwhCMfUP(-&4ts{?SdwAU6D;E@n< z(=!8i6Fpc*uzIQ1hO{-tq~hcNJ9Aj~C^N2n7e2n?ZC&mzZ7w#z)Oal=%2j4L$5Bvr z_?>Z3?IR#$4|Zy$$;c20??Odjkw)`KRLF%@6Ry|lJh0n#1O}sz;;PQ2f-j8Wt@&%q z8w9ikq z13IZ%74klR3b z2l`~{#<|xow+htDv@as0txdr}8Iz&-;$!AeVgedOSDArUX^jTZGCvQq37FL~_@ao? zD39X9m$|muqDdllf=8gE=odV*(-w9>lPFQhEKeQ?E|3~ZnPK2)-MheqiP32*!~vNUu?t@7R;2x%emP=fK=ThC z-&DL-Ea1Aom_{54b9k8KSl6bXVZhn5b8$9$<;@qV8*${FJYo(#VSS;y#NK+nXHJ=l zQy_6>P%q$H=td_10<@a=ck85Tn6)JcFCywX{caZHM_F63xb*D z^j#C$UevVamTO7up5dg1Nn~j51YNg5Q0!a~QL9pZVbdDB3l^^1^New>e7gJ;?)K8P zQSwy&WA^&*j`tKiZRO3YY%$CA*0ZFR=SHeZXoiDYFu(z~{>~QtjBA zM1XoE+?Nk|b;~`JS5Y~4%JykGi|Jy!va4BXEsy`;@l$;$kwf!A9anC9*(6!zJihB$c2s z1y0#oD;m%$(^lJ=CtO9HfW1;#vdf_6*pjPUyQi9$w`}O}2DXps+K~xfrAg=rt}F;! zkTCLwG;*uR$X2yg&P>8Wvz3li$-q0e9+eqWEpeB;F*P(J;+<{Mt-@DXOO-A*$sjb^ z%bw~F3?N8I>N(Zs0wnP3=#UWnvgG)1I{>kBz$Vd+*KLC`fd z!_2h-+r=sjF-!%;rHgMc_f?vMx(g^j5lS3B61QZz57w$COt2|s&Cr*4hybt9kH60p z?%aGZPJ=%*q`Ey;gvi+~24DlGD}+-asH1Cgb2JJ%uB7-JOo0et5iC@0fdxnhBUU+s zO)w9|GEgG~IAG*&eVtb=&U_ScS70jOmY!FiSHx|tNXmaqUObt{PP{lLdNA4JR@KY0k2ONi-6&Y%%0dG&{>e& zq_SGu_HAuog5KqK#~@A8RE-(hxsNO-dvM#1n{kMYswrObb46w#nv&sDk-JgK0IJNi zZ4DVtqr$kriP8w-u9}p8A89?)OC%PuOK)iyd)Z<_!YIoH4c#&xFbx}+Rxk^mlJUuoHhKsdfFPrwCq0Wd{l9R#w?EmDh#mg`uSHkV zjnB9_QANw#T|AS?BTI2Bp5(QzM!zUI3i%8qZ|+=?kuM@@e+6PTqY%Rc^2&bfEFpw_ zL9Bb)zNKN3fz;ydi`t?@N1F%Z%c_%XVsKrH+gxN`<@UcT$G0kNulNf$yW_aIW12%O z%6B=pF@gr@>Z}`Fk4$=fw8ibHfCp4)f8)=XYBJ5e0}HQ_T(gk4oo8EU1TsXRciUj~ zjem$Z#@*hWXX(X=7}FJE-JoNryP$1&^E`|qi5Rb^u$gVITGLLM;Wl>uth}If9k5*^ zrxV_pUqak?Hq%*_wUGnNs|o)Awg6JHF#@%%Ym57s9kA0VJP2~b?8>E8f%Pg4M?6(Z z=KXCCVXc&c&nD}ICo?i;}esP>gvW<`rvmh zi5`|(dV)DQk;*&~l5rR#*WQ>8@VNJj24k*aZ zGHGHmOpu8V6nnGR(tc|6t|ih{+k*E6ylS>Qt*m!ke#S!V4{-}+xm;#EvFUxU-60X_ zUx<`GBcW6`7703_So{+Xca7uSV>~^L%Pe9hpOu-zN9sPEfG9NsBV0e+_EwMhAtnvy zCYA2RcHZ>=0DOjYRL)IMUP!UZ(unfjdXw`SbjP0F04@*f+g*UJ=$V8=Atm83;cTYhAm&ydGKny4y> zP}^HFdej4;%p4dLL<*KCk_nPn>Lp*&kuzaXK^gfIf`KuRBNfCt!$h@C*a1(= zj+8|ia41>eWtG{KFRFwL#e9we<+2J8Q8sr*29^h1@Xtc=oX3StaW=1dWW>}IdUaPd zD4e7dm=R-(HDgW2he8R&`mGrlh8`(`H4lnb4L=S*R-SmJ64@pY=;!S`P{|tY3Mshj zTILUyF37@B1}d{i5(*|IMN&$zBRAWfd?;{2APmukIzo@zQ5jZZYHOFi2_o#KwU%{~YM4UNoSHW7hd(};vA318a2a6V z6uHRhrYXGqRBs%2rWQPX$8l|3)GUo11NP*l7@;F_jVe5Gep^US&HHk#dj3kOxB@PFG*=kbOEcMt25J@3k0wfMe{e*tegM#-g9IQ7D?k5nZ10bolQXZ1Kh0OYM70V8lt8ntuJx(8{ zpQ;^GBoTs11>L>7M3G7^Sw#aHpI1uMbj4AA7RyBHKUJe{CPRX_aPt<Q})1WmUei@;P11AgH2@K1$Y*J6En}(TqoN*b2(W)G| z%7T^XKI|x-2!UP-TPgB0_K zw1t`3;tT?iA#YJW74ZXHF4RL6ts8E&Hd{hDgJ@!CX_4@!jsw!GvampAQj2KW3hXH^ zk+z><>t2|%82NBiZo;WtmM}9GX6;D1vM{0ha3<6V;8JB063eSrLRHp*1w#W(aEsQ+ zp+OK0LLMksf}zT*dbS-6FcE@E#yd3i;$5O*>b4hi`{%Rdh+AjVoc zD3T{!+Xv|+NPFZ4|zzF89TEA9B!jdv~Kp_hN&ILfGXAAU;I=OE1mIXhK+1VhT z3ze(6jIC)ZFck-FYE+K8bi|P&e5GjEh$5r#R@ROlPmD!3i5=CAutXpc-(bWAZE8U4 z*DOA{XWPLn*wHK;6X2_JaF-C<4p!Mjw(v+JyJ11HMjMneob$qGA5K8W9Dg)g1pJ3Q z7SnrQ{{WE71M%DKq6QyJTf0iG?}wGfVBRRyZ-xuTYmIuwye z8L^-nPfsz5aJC4S5uaX3S13Xgw4vNex&z#d>rt=Yh!L-w!6ICcQo#`=;c6&4b*=!y zIKfu5SYU?#4-xu$`O@KGaWt$0e8xRCCW)G#iDrRC<2mE zKolgL&3YWMn=a#z;; z?;B{`jr_3y66!78*0zZN&(WH&G_FS)vbpG95g-8~&-moe-jO}|Gtn>%O$Q@`u2=4B zjz5L>cLhHm#aqd5#eFpQ3x5K{sZuAAF5(5FkQF(aXI(L)s#0x37Y0E6qlo#A3WfVx zt;)4O9H_W=xc$v#aSiNN++Q3ludXFFHzqBz*~apjDQw|}%GQJ$ieo>0zqVimKqC!b zRi6#CgsMyMO1+!QNA1pDtaMC<3pE z#)hFNu$3!cz$y+w!BZ|_mfovwK#bM`nW-T2) zVNaQdhnJ2s<^;au`ld!lAc(Lr$A1&aY_A)U1d*J@9BmC#)N5Q=+Rib&9w385-$zQj z0$^)`(~(rSovuF%9^BHdM9CDlF4Re6Xw;umE_wKY=Zhc6GGI#tp=5wgX=TE9 zR)mHz0=53-t#idImF`awEP+VwW&>($(P#k_707%Cju#ltRSG0PrePm-Zz!}-;e(Mx zYE)&NO)}3GF58fRaF!$;B3R`i=s;~o<3T}@rYY%61e^lcsLqloX!=s1)1dLDIhQXf zEUCPcL$yH4pKq2ss^C-;ML;OSXe4Kl74g6rvOQ=n*#@K>kJ&@ualj=UQD#B{1zKz! zbp+~hGL{JA5)=}&q*2)Jtz46yes~gBF(GLjotYzcQ6j5Xwn?D_rV27*>2ixHrj@Q< zp~|5(+Qyl5#FMFZ3M5#D>eRM%T539H@x%ZWEGmFX^%_$!e%uKOkU1;D^&)q>V|} zT?zPLZNiDNHCKyh7;#dnORAuaCVvUYJ2wC*=5 z5$ObvNw1c;MV-WK7hp;7MK~FTbP;>0-*S+$%G6^SCoa0{lRv<#&|u9dDl)!R}Ap_YsQ zY*E%7$fLN5JC}i`qR6VnQb@twM*z{r;0On7l@{^m5qH$%UTe0^T&Vd_Sf&rNo_3St#Rj)Ppv4$ie3Ag#rt!H<*x5P zZkkAVn{|SIGrYuxgd%R8S=4R@P}{4apuleI+_PX@w$ZpT0)Pj{oiRL8ZILNyl|fwh z-G8{;-?;dTc<%XDxMhK@?xK(l&ALM)lwbiUPJ2$D46&8J_tST4rr8nH8enEdW0Pg# znP+4pan4wN3zy3;)x)u6->`Qbb1%P7KsBXCMww>)XPUfx^7smv%WV7~9fn6H87% zn1&R%vyZZ<3`80hJCwHlrz%kEi@SZk>JbxwY`N4sw+?An3<+YVn$X6}#`0tr?5P)< zDk5hhfH3)xWnA(&u{%O1(Y=cgGkvd<=NuoJLlQMd^;N6eNo^%)CQXwiL5hbz0=-B* zF`0hMtw_c}j|CvOaD;|=E!;>btr@E2L$8JvZtSg>87Y)riQ(riBeaqjLv4@%z_BY( zYx181jW7L_<7~z*$DKS9Jpg3tzGN;90NhDCiSfosli;lYvk+G*3F)nI(GIwj*3ttc z%L~XM+%tC2cvhIVX5Og?lFA*bj;7L4kgTzq5PH+c4m2!r3P%*u=23L9Dn?aAV7h}^ zxYdXqaeDRfZ~z4xSTWy7a{YW2la4pcYL($J2md_V}j4Z;Am3Ry6{&BW|^>D#S5HWklB9l_QN^Jqo3p%#)29CNTgJMOt9X zs@>%WY;pP{I^b_z$~Y$3wVA~fvKZA_t5(sxK*tF%s(U6v}+`b6*h-7uCzWU5pDufWWgp@ z{vYUg#ftLc&93g_mE&7kS9~)mT!{lP%6jz}+t|X^*b9@1GIAKy8hpX=Rqsw$9x*gl z(RCHR;eW)5B9#o#+Q%bpfXPb8h{USyr>cMxjgvUqB;2wp9+`7UfHEFgB7exmX~)`0 z!@QPv?9bf{!J{FvG-n=@(1Z42pUD>N$I&`uP8oBlQ=?SQs)cR$Gja0R@ljjL#mKkT zv44<^s7r`$V^Q7BMoLaB-CWQ5(la$GOB#=}88?ComX~kMG zAS>h?W&PI!%y+G$mJ-ky?_B|9Xqu!eWZ9|E4~{RGN?utS<=f<soGfg%i8yVL&wRlz4|ZlGm~JBh&0$QX92uj$ANl%O-A%=%7b9=H)Rnyz3$Tb3kh zK=425iIbEv)M9i}3Fsju}DN5H>t{_Q9lv-^fw5tIK#^K3bMRt&kL~6AZo3lIUIq)?Og@kD)lf*=f8qxQWWiK{M`vZZY17} z$l=XZkV4#1ml7K00+q1a$n?cA4TE;kH zSwp!Exug{Y0ZyH9Z)-7fC4c}QraaXx!61Q(rLEnB+ma}m7{2<0n5LUYk6$cSw|dO! z5u5&;)qA2t5|ZAMF`2pAOA&%(E&`I6AEMJ}Crqdg zzIe_y%5#KFQIw21$OA?s(3d$|!wNR`M4T-PNe(--5mj_%8kxI4C7 zJCI67+}kBwWtzrPulQI8q5dBXVBdtS$&VGQwwNM`{gvTjvcPly0MrNY(?To#ab9rM z=8t;xJ1yyj3hCa*{lxcYvw2%P?i-W2wUQYI*xpxo3bSUf5j$CYw8M5=tG1*eF{&nn z8so!(87+(Qv$%m0AByWgxPIY}oaDKFcH53?YaUf$n(o|3MYp*tQ%Yn3U`q5g$F{r; zn>tNE80W+lfeCp)CZpuIr1nx=MkJq$k*()0l3p;VFG}{!bjv^nGKSpT9&2Tb*Pjl- zRl9IR(pW0DxDxel{{ZeS5k!F_GAIq{006{-bD+f^akq3_dB9bJ^5fN#VR9_Mq<8#U z$sBj4Kw#S+WzX~AuVuA!U3aJaJd3{?XH-(PP)gvQ3E1|o;hYI1Cb?fnf5sYyC*`??vr1vVj_YAJvgfnp01O*-}0;fOQIa1~i=wQZz>xkU?8Jiq0F^#rjsKwddI4q2GS3|_6I zGAKSBI$s6VmtDgMA)1zaeYJyUtkh=v@LSu7RkbK!|gK^w}%G>G*Qr-3m zT)GC5M0nW5!!q2M=~`XFtQPAET7oO08q+8ifU_2 zu-KI74Ar9AXiCzXjcBqBej^$drxrsfmqtZu^Ru8;Dr!WPre1Z!BVtzx0Z5pQN`Gx@ z4Y{`7z{1CL)fx>eIitj6A#G|fqwF3Q#a0BjOA&J~G0GeiLdbP95v=ZUoINbIT|LxL8(h@AJB{{SB0^mobg=5kY0&l5?l6I%%HdSFd*lpIuDOrQj@`p{8Qq^Shy}`;udYP z6^OWSgwi7Gr9j4)w|j)(aihQdT@C9Xg=xJh$=R)|`lTc5t<3Hscu?;^Xbp(~7TV za+HZAHw@iVQr6&7M~u^OU8GYydA~+( zCBlA~O)yQYk(I9X%;m3!xbYeUJ^MePC-}Wk1@QlYIhH!br&V_Zb|mcgnaZ>sml`@l?r1`ppO%&IL)|C z2LOs8M+^@jpaq*xNX(6Jn1Xqf(HBQrSxqAz)O(7zs8h#GyfVY=LQ^yfCu~Nl%N4g` zjQ;?aIVx9ose$r8>y2pJ(Nja>l+S|nw#AFjEAM7LwmEu<&rA&MY9>-I_@WdE#~a04 z&u=`Y{UVYo0Tgv-U~BRZ9JR&Wrp6P5rK|!n7@mk{bcPLz5>7f^$eN@ClWQmAQ>e?s z70rnV>fn3AX%1OzmJ1t3vLQgjbCa*D{wsoogBdiahCpddXM#BGfjfd0-MXHgC^P9? zUX`&Ja`-C5)d6&^GYOzZiV(GlT#AZnMK!6y??lhd5W^=+1PW$=5gT=F!CpxP2aR!9 zL(>K7N;lM^X$W?KRV7G<^xiwSk2i81}K;YqMUBeVQ^x}t} zCyYr1$~^}qribJ3!Y;tY<1CY6L8w785-L4Lw60lVu?~zCx|U6iu(F(iI$~Ua?4)A1 zNvc3Gtx5GaPqzabkBCfWN5@xXE&6|m=~6y8e0;}}mtj@4+|0`iHS|Od;CxMgrWTSApq1r1#zZ|+@e(kw7CoK{NQWg9 zR8WKCU+IrNHxmv?HN|K!M90Xg+dlZ1ZlJfGwJZI?o(ECkhK<0`Ty#7*`1}_~8WbW; zxcZA#jX}j|NE}n8BAN&$iK9uBhiabNWNFZxTQ;Qv1hGLGi3bV12m-|p;#iWzcpWhK z#)2-J0>#za+wj81^Xg?0G%y(=Vlpl$0I!~SyRx?zmZN}mq9j;0Yp8p3o1I9sox7Hh z0^;ldW{C8 z{g|^mAOWPg&xdzJn9ilwjkIv~VDe zt=nfgsJ(T=WTEG*=e53^Z4V22W0_QhAb1X+3>#|>I8{(H0Z{H0!w>=5O)4>;J9WZ~ zrF6C_WYRoxJZuV-G-~OHkTE10DrVs*ca@(q$A5`Cso|~yV^vf_;}%8R&SM}Ex|$p$ zOG&6&HqL6@X6r0MD{%2mu(YeGG|r%WF{5M&MWW!R8;o4wq=$7RkxGSew8YfcT8vG* zW~QANO7P%@zk61byK5R-MYR#_m7R%TDD74!<~h^u#Y^HKxHRCbS|zHYS&4LtNmL_N zkJU#_*r$3xkrG38#b|A$MMAf5R~EJxF}3tkT)`UdxwnnBmZ1d*aZp7@I>;8wI~K3g zs@ja_DA9Ib+&Q0;_U8x5a+m3M$^0fOSoa3Wwy1XiSvx|l`Vf(v(U@+-3YUzFqz2go&!a>RFCm0i-u6H<i=@d*oNRvh4-AnygGROx0pslj&278bqS-VmN*a zD(%RM@bFY_<;me>ic<{D9m4j^tG3`U1Tx1=sh6s_vuYDIfhEsxj|GRhy&Yw!mEFCQ zarY&z3UU!Lvco5-HUaBe*IhiY%fdPhLykWsL)0c%QF8mfNJ#ruGKC4;a?_=8=jD7% zvoc-Dn2c0bjzq>#_0>rk8XmZ{wt&>(XWYD5CcU_8X8`6~LO*0!`@FRmI$X1A3 zi@7@yp^$|YDpylq947Vipa-Iu#5<*La3qhjB9?E!^!^@06s31mbef!#L~}q)!WDh* z>0HcbGfu1s@au}w4Nrn#PW{L2zH8dNnc_XcYaboT#cyqJ)(JFoj?LUlaRc`uc@XZ6 z)rj3uS`ZCJ3jKovQaTRVev7SL5)Kp3Vf&`%+dSNSm6~z#mxw$^gA2$(#T9u5nWis?|o=^p)$Fka~L^nxp2EP3z! zUHIH>CAhY)fW>Os+{K;#iv7m%P=N6I=ot9JLYW;A};V!FM=_Fn4Zd3l!ZcsXu5+6g%brjnmjV<8$sDMnbvN)M=I zK}zFv=-oiTI3QPrIQQVI8?v-UV=had&&a_nHkR^RY~&F_r(#WscCngnbrn6@X3f_W zp?V|;NF8}G``iBjxi0RYso@MwG`?GH#WEBwf^9YNz6z) zj#-Xsq~q#&Nj=DpTi%!4jDjb$vE$jzFm# zE0T*_I9tq>UA$=Swk)K|PP48}O5_ay(;1hDyF*@S-);)9>aocpI)D*~Wf|l;_~))N zz!8%kD5hLdVNxx$bu@G7*F)C?1X`#Yf?GAR?U+eL2&AiO4}l#qT6V=<8>HeofXyh+ zJ%XUrdFhIpb4>-Pi6|NuB2#$e<+7LcHa2iQcSOtcFM=cvt)l})0 zns|&1p;U02DCG3F<+yt02o$CS#AJ(ED=F(z8`A0vGmq{5zF3#yghlXBgmaZBYnuI@ z2N2Gn7R0F8N>mj&9L6DuQAmXwQHst$1!@~ADA=IT^r^%$ons{f1}&X- zj)xoq2}#t*Q3!2IYftsTCTfjDOh}0;%wzy1Jb~0F<)KhPH96FH zV#EtzyAbK6t;>V8fTGZzrlar0yH`jpk`oX|H1O8uC1|BW$V(`40|BnRadt!0kCcw} z(32XeCX|~cC4nZVWM`*|QNT4K=o}5K{=dRGo0WAiPAq-1uOs!F+klYnU$bT>Oft95nA}4jw)Xo z%fvXrIt8&(#NyOG$cZ)D5orU`?z?Ng&3TlbFfhH;|>eUs=f`zorD?M~$K6H>&kK~6m^p=SFt3OPO5DnfFF5?`t0d$LIb z7uZ74SXF%K{c)e`-_%S?vVWxl7^XIMP~E#N?6&rG213mvS90e-7NF;u#htx~-XvTx zj(DGtK{;sqT%jhg=w!n&;i%Ro*1ojX<|T1GOrHRWa!sh!RU;%dos;gSGabN$IG^S>H^`TF3tY5N2I^*dQ|UC5)e4eaYGVMdjoz9gJp5 zw{)=GE4$RFp{`k+St1fLyLJG|L4YUY{{SB3u~`&V$g@C zE&cj&f3$vRKsvQx{wch6@C$g-%HgfA8T^useue7^34tC2@2$nj?0N=YndIyi<^X@jjNVb*FKoJ8+&3*i7(3p zoioW;B;h!Vg^jrRWuEThAmTWvtc_Z^a54Z4v7vWiwzvVbNs$i2Bb)L84Y}M0%qZv| zZ`nlrm<3GmW~ie&ij3=)LmB?mAaCH~x4~W9Svoi?wA=x@y0~_D(g1eLw^isVUYPWg z*m~C_NdRZbP}QITnilVkc#-Xv6lH}~BU)6k8J+aZpN0bV)PbM@N_FeS2CT}7EU$Rz zorDpH=A*RkyI=$HC3 zZD<-5bEC59v~&j-U@cgCveP+a1_1HsiKTPO90Y$Qb!~HL7dgs9747#Ua{mBbEktY> zP>+`(QQ$FZ<=ZCAZrp$*mNjN&T-%gnV-i3e>z?w3CA%gK!qP?#& zUEWyBo5<=`A4p}G&=_b(=CP}jreD_`7=sqgOVv+rd@OEOXkw(1trZ@O19Qe=D( z>YzJpJBayuYB2^ZXqOo#7Oe0(PJvnDHC@7>A2q|RJ+dSj$7~Uks)aeXxs5GcPb({L zGC+$~MJ#+OJTZ3F*o$XT&BqF%AelNzbtiF|f|DW5i8Unn<2L!!d8-gCu@i|D0qSs+ zHRy|;0AbC(2*GlvT75gd(zT!<<_Ym08Eb}s1PM^?Xrcwn5~FH^)5v1JbWRc}wYs)!U?$0fEcZ24oLB1jwCQsG{IDODk>zE322S zD@>_ghY~EYa9_3xb<(MTo|f$zo$fOrkCvW&PA$gi(88rEQ4Z@-*a^918=o?ir2+83 zOG8lA6dyE1R}bhy`;~HCF|d0eKl(COu|9y3^dGZH{A4L#P*gP#2u-%c{pE#Ec`#F}oznnrLt`-08xF zR*(*>)83i4LnRY-Mb|2?Ot6!<*5J`1ab!7!&vOI`BGzNHO5`f(kR_-FopHu5Fdr0x zSUOnfLsEbftubChCBfawF4h@kV6mwn0^{H_WAGSAwq|G+g{f%?)rokWCp**?Zq&Je zSY$n2X{K1Qwu>EAPL$3HDek998mDVl)P6o#MeCD{ldZ@|DN9erY{O^1x~m zVmMV;gpLb-{A{4OR`ibJ(@*>{QtjxRcvWcFfmY5Vxir>LJ-+x-WCq{lB^Zi>T{jOL zGRc(44M4S^(TlxTOu4_dypr>WmPH&=TtCtBQb3#S{oH8h0|tT0xT6uYtu2&nX>7sv|u( zA>?TSovlS%fz1?01nmeQe}&+W`agLPzO7RJAbAK z+9a?_l<8HVvXPLf1qk_p^1+J|A+So+0@mu@SkV?(w*gSJ^3uO%2K}i-0U)Ll2LhJH z8VN+Is98S@gL395K~vI)6yWyds5Lm$CK`rOx>_ub?tVolw1nz(+Qz+b5{HMB#lULK0hG$P!LCV@sQTaCgw1V-djdp=5ZokTNtC_&oVdU}eV<%<@#Q;htj(*?MZP`WP-cV)@T zadUTX6w)`Zae7J_R)JTk81$Pfw)b+B=MYXf`J4>1N|81|5hv)eCnq(nt;Zi|>LHru zIW8sbg^@Obs+s3X9PpW4m8i_Fu(~I|`m~iC_e{&FWS~ick1v_h=l9oDzj}Wz-M0r_TsR&0a>9kIVl>rQO zyBI3k0>9i3mxc~oa~k5|K)I4e_VOu`X!~U%`J!>TSe&*I{{S91%=CyRL6~Lq?bSTU zFa-c?p5Or~?J006Pgz=KX`%4KeFHpcUiCWL1)@S@NdpB%Vd>8?w@mON3=63xE@-D z?Bo!48r6J;xI}>^5Gb28mJ&##qYR>ADBctY`C#n>6$YrsjnOJ&CCQDg=zw>wetAl2zAcL4UJhT zlqXu}{{Sp-E~0VLR6s7`Hx;K|mHTnXRAid42EIoEWXObF6&sKhMG5}^Ty~_v5(3?1 z8|tQur$hWOaiU!6P}d5if*7`DwHXR&o+3dCZwAC zh=?#0%@wJaFN%~}O>u7!j3}7s%+%bzVC9!g2cavG4Ub&8r|J>M1+~4T_Olws0V|ks zQ(ul7X4I`q4-~1i(aB}qjESe*flDk%NdOINN@deLG+5L;#+b4pA(GdSNTZ6~?Z<6E zDBwN2f59Ye=HP?03t2d#-m*DBX9`A43l&x++1_r$f6~Tk?Ik~l`Zh` z#+J%5x@g>J5^j+ZRcPW?Pp?~f>dNwNyO6fjjy{a^%hRnfx3P@9T@t8wk-!1Os+VL0 zTw{`pmQ!cQ-37dg`ZF;_k|{S9ra`v21ZAaqV!r$vS7bzlfjnIJCvD^>5aEwR3^UAH zmlM6jQMvWIR)pkgG_IJb3$s6QCLrcjjUyn%TBD67L`x~*oQTVPIBl$~1sPhj75E%& zLIPo}$QogT9tBr+K45W5EuiH-q8RQGevhQuIRMb0FL} zs%_+O@^;f*2qlhtRY>S7yeI$-)ESemFz-e?m>KCJQ2=vpeDhBa1EuIv_^o(|tt3mU z8K=0o+HGzDBek^VcA5qh>4n;}w}rAULPkde{XNGXiB~m~mDnJmNH})Fxvp$ zwiRY!sT9*Lnqv0fZMK|z+Jt^2_U=_CE=19ZPk6pRhT-`oVa1+$%Ht?tl+ZTi)}oXE z>(>|d+ikYi>qZ9TWrv16uu7k)ayaQBA>{d2Xn)3WwyDM}(#p+kWT(^^(`=Kst>^|o zWHFJy_XDTVvmFjgh-b*i)btcrw!2XJP zNesM)C}JJiXO0oJHE)#{tqI6tjHQ2a)g%l#BaVm~Q9I+Jf-6=sOvIDuiHD{@HS5zB ztXqt2)c0{lB;_>?9JUE=p}{A(3ot55)Ga>4OkaT#vLGLiE=e;UcU9}umMw&C6QL?l zu2en;ubwI1c(JabOcG38#!9t$b0famdzBrO<>3XtT0s@9oD%oYz;fNtJCXTe-Q$b9PYBHhlz#=tF`1VAW zG;#`w6#D*BDl6*gUmRcAP9o%W;Nc?dPLj*K{_XqQ_TSt~4-@-q>=^x_z*|cV#CP}i z5?%6zlGs5tshl~F>6%K+2F=~dwLm*YhWl`5Y(jSg3h+wS|v7{k3wQ>Lq&hPH=^2O&g0XhZMgN=owwwhTtBMSD2$dcOs0Kmg6+tY4R zJoo=gp4p+pn8x}I_4>z50)9WnBe@D&6@f z8m2&vx#TI9dE?Lvj@-lc`X+xH_65{9&+%N+dwvc_in@M1p^n#-LyjML6+U`<=0XH4A^->qBwvNp2jT7m%^OR`#vU#EA>3RW1=FB}%_& zQK)njrD=ujCSx{<6&2w9I6A|XuqDTe`8VA@ z5=78#1RdIz!me5|XARXzxFwsQnU*H2B?^&LIqT<&$I5CEg6qO%V?Z(>kOq{(%VeDy z@kLusM&*3S(0E~Sdu%dAd!9h_>#_ALNemJ!PA{|evWkn2<2_ky11PY4kN7;#y z5{XOIRI#p^m$Yc1N!ogoPao-ulD=C?F#xo8X(Lly>G_ozeZL%WxJ-U%O}eQeaKqGU zst#U$7$Go1=)k%z8AK7JvC7@j$8ys}r7}Hh;f{s<0l}|tntz~436G7pgDsC7C>{iy! zZ&hXD`3T_>OK~GyDVVXAdVoeR!oN&(J+GkN_vl zD5t{{ZV{YG5o6<3V$GOYlgB@j-`ZDyQ^~<)amYQ5mn43gOT})}qZ;gd@*!G=xLuvZ zq~O6_usZ}c|T=G&vSBpH#rsKK|S23E4bkFsbZ=Ek_~FZF^0Tu z6KX$b0$n)we3zD+LhhJ{4dCnL&vDy}dy>)HwXLMz?a1CzN@Qe0*|2XMD|rD4I1Lkr zK5H)FEI}?+Qr6`nof=TVByFx~N>tLh>wwzcjAjYItewOO1ZJbvgITW zv}Mk}#}+p*Hgyl&RS&(mDw8f{r7RopQ2qGL(&x;AMTHbs@xtj6#5NThUTW8It$&6K za~O~`(Xl*IV(wiJ6_v!6?{uQErsXvt{JO9n3JxaD+IJvkFdd2L5^mkmAQFc3u_($& z$q36C(i%=F@j8|b+^nDzwbw_|plMoSJ!uim5sNIta?#Yv``qOkjcRc)ykm)Tl7kmc zB)fq)`FqX2>4LSiLrrK&`!S&_@D@(5yC9Gtbq2#VT`MKr5*IIB)ItE;mZR(#%F=GY zyQ>byi8zVS7Ak3>0BhllvlA6^AQVlxStM1s4v~USpi?oWd@#!-N=+wjOQtDA;3Sfb zoN|?Y$_I4%12&a3$avEi;}bI0-x2XjcC3>=V(Wsin&*$=E$;5EoeWGYuT6iNy1CpfncKj(;UZksV~*lWjVG(nvX1u3lKc(m|n3mK8*- z!qKIT`%U$c_GMWRJ1UYG$qNxwIa7ADsOyWdBH3bbq5MLlKQ1s$6w3104-t=Icvl~ZIo`d0vK$9XF$H_(^OsiAf?mC62 zXcSZ9PaLq&9O`q?F09DYb|4#pFBltLkEjhOLDv=z<3MpxheMue_bEHaWotI(eeeN6 zmdaF*NXYz7HFtLmZN^x*@a|Qk5J?=;8&tHtghA9ZYWDcxk zPn0oXkS7`Y zp-KcC7p@jbUO6^UWU4e9*D6=0I&UKDnME~|M5UqKA_MCq=H2D+#7fB@ZB&U2)-C1~ zq>*l6KwW4}MnfzNWY~qy_$h_q2n1>Qgq?EJQgD8u0+^@_Qs%hc8IFj?v=ktp=Y+X6 zQsGE$3R{yxBy5XQHCj+>p}~Sc=Ae|g&ANfWB}Ezfj4jZq2vUDcQ0AtzH0fMHlO~8d zjnk_x&;5$V7e@ERsiIxfVqkQ$E|vbV%w4h z5dsq%SZ|@27gTs0P^D{C@FV!*&AWG@DzhjCC#r1xNl8qQE6r}}e89F{PD%-mN;}>j>c%0utt5bg zI%W7+_Z^TK6tg3(79II5CZR$`Hsqf`oX z9(2zWFeXHEL?G2pZFnwD>Jd6Yw%#&-GD4~e{98e#emKyxu)lU1gnXki!>a_DN--?; zO)mI8+IQ08IiQ9p#H4x{$tI|Zb=%b8+n;XIHHiZd2P&L^<;6DD=b;7D?kdt{Rf$y9 zb6~VPMJr!FhBUS|q{2PBa!I~wy?rC1J+d*{<8-JF((E)0df>M*kOl)hd7-ujB_{90 zBSw}3Ek$Dr)n#Fo9Gvl-ZbSfNABAcX<-RTX{BPYK%`#w1D+bu9!z4L2_3nbwVgB;g*)R#2%WuwwCGIg-WOakyLtA5xRitPfTe;-1d_KGl{Jnha_WD*sAAiazAOoR~h(q zNFqy^ZtW6TWoVU*Zp!2n6=+Bx3Rel$wqOK=qU7*3{k_U$Ct4R_`m8JPw>C~C+XbXW zlG-ibm|J-u7V-v_pz*|s?QU7~Fo>WTlIR3(3DXr`vpiG^BeA)j9#%J#wQ%uN|vpN02?OtAq_*y zGN;Fn6k;)mC9z)MeU*30adW(|JT_J#?x(nV0z_-_M^Xtbkjoamv)Ya8Eign~`I=!K zt0#SMTa_{GilB10lAv2iEu-UNMx$HiWvJ@RMRAwC+{g_Oh=3V>?($M?+hXLoLs%Cw zt5KcmJyp}}IHhPEPOe5y70TK;93r38w_sKvE0O6z=Z%XxB~0RQQ8-J*Tcm+5Y_4Ir zwh>y#9E`8Fq{$fQ--Oibk4+FR+LUJ&hzF~Vc@>d*I%EhnTqBU}ytPolPD{JT%#R#+ z3#KMiR;M2-Su9MTW%E-$pdBgk!i)$>B}5l~-0J!7J{0)lqc0RPw)I3d#ECY!FH_x$ zhau2|*9R#8F|J`mMoUB$C5~Mw=jJfH(;^WlO-LkGnI4t#!y_fcBH=8jhfF>N z!!Ba$V*!cCCvhLl;ZwJys}{`>w#h(Mq7Eeaj^Z|uYBK)-Tph9iW_S1|XeB-3cx#?r z=Z?*j>yb;xY|IqN8j8N!>QrY>yBGFbS#C^(2-lD~jN77J{{SNr?1`QWemXUQ?VIb3 zT3IDhtOzuv8ku#|7N;9_A|l>=$?bwc5|Mn8E-=B zNhYVShsPA&s&u2R(j!wNlmKKvs6Xk4+tP6=2qOe-kOD@kETAx=9)h}qhuHhDbrKXr zPLC|E;O;JW0HT0+f;wVvM9NRa6|%u;6m)S#&%>r(SWt^5Mx`@`001;0q$9$BX@ZPf zy<3b`mf97HHE@+`(HIH^eRIXg#6m7H`lrAWLUjOeq94@=+l_SI+Wc@6G6PO6^IH3O zf?ZuWc#JQ%XjcRsq*M<)E;2Ud&3c`UjbJaLJ+EtZ$y&n%Tx)XAM1sQ3D9cPGl+uuF z^;ES9t~Nb!piT7ByePGQg&4UfPGpv599?$~FZSDt_V2p*t~Z>Yn~#->A$iSSaklZx zZDs-9(V-`FvIYTMiUCthX59BF-m@uN5z~MYBooZ=92cD4PFJiM+Y!=f7c5WV#3la# zzrM@&7rA)OE%?qd3F290y1PiD+u5FS0xU{M30T0~b2u+&y=VzSQes#Ktp-083kB*2TzW|C2pEM+adpZVN}OynJKD#7tc6OsDizpmR?3Gh zacle#G3x$&P134OJbvFRj#1Yt@h!Y+t%k66?7KjL3|Y+NnOH? z{lGF+rnUIv26Hma)xfd2;x%-2W&9*ifOM!h5hD{5cTm+owX(?Ly;B#7YK{v+ z-bS=eZBkY+LM@DuF5-#4nlr5I^tw!O} zqZu}LakX&cAaP!T5I3QuuBGk{eSPc6adUPD`5PNmwC~$QktER|EE$$C6f)~TGsUm% zPT-BQUCHFfpDb3U$7%d)W&YA$xfODU-ct8Hx$WP2apTUDVZ- z0zFCQI@6{oZSLxEAy0_rKD?4Q78?Y%?$YAjVKPUyE0J4SLEMf3rbpwhBJG*NAd%%b z9FIj(nwVlSc2Rw$-U)U-C!C7H$w& z6hbZ&z5|zsjBB`VqmD~!(5ozu5O+Y0xQL1Q3;e9ZrZ4+;{u_BnT>DNme-00UC@)wu z0E|Lt*7ldv&iq=jiU3`jqLI*gfg-;zo_M)C5WO;Ng1|pP_$U)G170aqgu^FhS6Pge zAmjp_L2na^67ow-i@$27iiZhwm(oKeyz3Z>IKU(w2?x(y@mgDnM8-fcA2eEV2NWgc z+g-ZLD+iDo_bO|duiuLMi{|OoEO@3{hysX#c(+AT>`};AQt>Dp4xPo(_19c5ZbjN$ z#)DAD{^9$&;-k~khgSR(SFxJa+Q#J>Zc+BG(^%b3g&1m2hAmy&8)wp=+zwa~$f>h8 z^9&IqjhZ$Qvb0Wh3=J>`Whj<3>a51_l|qZPDoU|7wWhg!m{y5KVkI+EhgYF<(M0#e2CIB3W zAe>N;{yp~t3_50+_r;Zv4mud8pN_Iz$K?r26A59M3_uU|3S(#s5sal~1Czg%{{Z^F zN}1M35^ZG0HpgWavX_!hPX51b3C?29Z zV=8kXu~wrO4uVH$WMeI&&JgFlh$I7`rg`B}mXlbzA~+Oh)ml$3=`97bYTGvztw9wT zk*2tJtqDoYTc!v!5Egh8qWG;b64VRrNimBh%=6L=63%H$aWnB-rQhg$W_VD}~?4pqr@n3+{q?%ox; zmEhcvGJ#P_?xtp*c%ybv)=Y3s0*s-It3y<(vo_OFTGOpC4@zRB2gLxyi6})+$_`nI z>OAlv1hG>FSB=!IHe?@Mutd?9L^)7wp#ac>S~pL(3uMYD_LXw~0Ee%Id@(GR?Ik%$ zWKkfk6w@J)%c#TvKunPnG((jKxLb2Jin!-X&`{1POn|8bDe&otP|UWGox;=~%Nur` z0Pq;%Xt)A!Q2HurE1sXz5TRh4h%}{ZOmdauqV4|x%0b5!$}%W5+6{9W_+U!qV_V7N zblw6+r*vIvPmjkB7f8nh(*eOhv$$tq%qhF(9RctM&lhdn62&J>fpukpRDj69f@$f_ zfcYF~TZqW`C?uRhZ3J+^B0Mn`c@(PdB-h1)`QpTF#@vC3$FujQMnr}yqI+UnZ>f$8 zs0U$y-`gP^efb(3dT(c(HHbRl!e0ZHHqib=Co{FVg{T>Dy%q3E>YPUI6{DBX`gD4 zdZ6oEWDjqZ&`2P0a^4(OpHxQ|JwB?LFBv$w-Ptonk{>_^w#!_>CYbZH+g$Z9a1U`; zLlB%lo_pW}#dSKBlhtUDO7z)%PTiQI27xdSB zml=0tm#EESB(S>2GOKNK2_la}mPF9yjvmu;!PRmkcKPy0>c(`5bZy0#DnwH(5=9Eu zJ5aPFgXQtXyVkb^2?&rd9TMRf0?$?Je{S;a8c1xIt+NrZsVrEE`a#LE@WQQoZs34S zX&kfe;;b3KU~yN@8-?X(u@>BCA8|G8P)T(wK_1|dC0XQheo%ulbORofX}7r>F^oYH zc{1-}@WSr*J)ycrjL_~?2B&U=6gL}9#0a&a zd+rMvn7w+M&MTod#; z)K7ANT3fX7Bw(>(sUovv)NI%>p-?N=369zZU=BgPuaY_4ASImrjjf+6aSGj17|QG* zg3@J~13(Tcd$!Wmt;D0MfxG#l+g_BQ4ry1^lP1rn?W0p{AW+k$xXhHQ!ZbN6vAI_z zH-bSA9@jF>u{V{DAyDUN%;(^8#oJNQXIzeWXV@T>=aU62{DD@EISUkMmO@LCTX4#h z@xk1<#0fhy5$S+zJr&?)+eA<2^6qc=TZf0s*$h4xM_hTNEfXS z(QIvE4HtCbJ+sN4IxDUwAFY-}0{+t8HkMmx>qEO->qAkGS+lb{R)nI#=tJS&Xz8=H z0$N?iiu!if_8W`#p9dc??%5t2xvj;+#Cvh7ih5#w)voI2LzW|N?h*A2Ht`1{aVNLM zW8asmX_EQh-dxp}8^Qe#4Q~S8lP36JQos;S&f5{Xqk)o&HV`O8=&4)w8wiiK( zEiZ>oF02_CS0!xVeZ40a$tBcxkXn@W!6ekGNV%r$jR)|?zqfm7+uhZu0nh8fBXMv} zEXhy1d3n9f$=}~iHtCHPF_01!uIJA`QOpjQt-styaUvpV5Ygtz5Zn4-IL51)T%l@u zcGD^yap$hd(>*#MJ6Z!!2lDe6K;XE+7ZhSbKtNc~ZSlk4HDD04VwhVralA_^hd`wd zLc6+xJTYp_z#vNm6N8E)qzVCk&?afTy?vfQnL_csFlc~ zt81<*U9)Y0)s8#@_dd}H&P>bf57`5M#PWaSW3@LBao`E(ih-^74OMCj5~D0u-ArAx zppo?L&3cb|_N!xRAu`jJ0E~O`s{3cz9A5{`@`sSNz8sGo98dMual+z+*K$!$rli%0 z%;U~)F5I^bBr(Xk`ES1Z+k09k4KgN$$B#ZskpBI0e8s(|yH}34jqE{zY(qrbBMQN0 zp#qc&1~-4#?OT+s>NTs^!DDUqz{W3&Rep1GpHU1qvD`y#ZE1SYyx zpa4GHeHtV+4=ix%v$t?!xctSU-w2!P7D7XV{{T)v=jEm-32E}`cls(9Vp-b-qpgxh z7_6-!C%AF}hd`st7IfN-MkngCr704WT}YuqLsc3a^YgAM-jHSrN5v}0l73oKD%Y+m z03FoGlSPT*gud%^Xw<0QtZG9MoezhG2K-=T@B~xhirFA}i>SBA=CZp;`$DO5S*S7s zzC$cmB$DR6Q-R4xbcCw*^2&vJeVB{JftN-qD2J$lkph%GF;TcHcGbQ|wt^Uu57gLQ z#;tK4d!cYCM_mrnny~4OSybPAi<;y2c|^^+`g~Q$L5?F^MaJECwkv zw&#*E%H@Hf9t2Q**t2VLa7m4f)xOr$&m?gs*141B3_t>alU6xpOlU&hxd@8L_QhC? zSUJITZ)E#p-2U$5ISXHGSjo#v$JssPkR)emh89rN27;uuDO#Le+uso;QkW6I5-3XR z@{OpCTvc{=xS4sFu3-tuD>QpE3m>YEiZl62(+Rp|au;=vK3p4@(O$J6B?dHEkByob zEpBZgWoU}UaT7l2o=r;?(`gwkGx5eY=VdrXGq)TlL-~o~*f$36UYpymiisYFAQxEu zyt$Ukm*eiPcBVr%4Xw?CT&>)YyquSP07&NDmu1xYmPMiU071nK{A`h~G&uI=SD3%G zyBQEg9-TS#T&~#4ldHte7URxr%`QfX%p62W-foU5EnAXA&vdDx2b9oOkDI>yQa4qy+;Mjz2LlLzT@Pk z;L=EVrn{8!u`nT)HgXn=KtLm=D0_v-9l_DZTfdO8zDhJ)xL@3;bMl_DdN^yp1GV2nSH9Y+!=(Ji%>87lOO;MAzhYDQG@#(8xl zA){7iDo(&^1$;cPrY4J`R>q--txgd+5LLJYY%%xdwt^S!89gD+f}_;T-7x!6^(Pp_ zv-U2cbOfuN-?%1TYmRw2H{}w-!qz{ZaCX8c6sXl~)Q-3=1d z7y@v7nZBh}^o;G73~@_t?kpjfkca@$$mCnf!_H)Zt3;LGAUO{j;=S#>u^0@| z!ecZdxvp)H1lOppLobFYgH>mm>M6-V^jvo#X#3{03l-AHYb0ew1eBo_Bd$G<@}ucn zy==LQ2|gqKUz(v9`K1|9969n)Hz@Nvg<~oaUG0Sy`%RDDD0woQVdHqEy&2^nNm8xGo?!zNcFLDW+od=S!$)u~MQ9th`=QCObIxVU0# z00QCweR~PXso`F@ZqVp?oUs|V6p5u2xq6A+M zcUFRw#nUJeB2GAds<8&26<+jG;u+)HG=W_t(4pu@hn^}?r5OsE^g)9Zn)ppDvb>;) zg&2(i=yLJKZsbZ*CRnH2APz`t3y-If8dWkBrAhwMO+`K!UfS=cAZ1inBdAeX`yIq- zS(Ky;z9e-gcw_0t$EBz_z*Ihb6>}g3F-oVsxV4fPV~VO@av&^1k~HxH6)tXPYC<4U z*9&4n$wu>*FKcgYbt=ZIc^P<0y+Z*(RRb_9)Z)*&ZH<^lFIsKrq%mP=r_4Kpp{zQb=! zic{vV$0}jQ7X2+wbvrjM0GB{$zc27)8iwzOmSgJF+-I-%z2AirYRXr)?f{8jyqnv}VN$z&D1|o`R3Gk;% zVKY$`BwJ!ea#-wPwwe)Kh&?eeVO7SccR>FDn5#vuMC+cI0yA90HHVH!g;)XLweilF zA_zhl6#~gnRFI$=gXhyM0wFL~%|^|Lsi`ADUxqrXh=|2bve6cdRzp%0S32vTju=f4 zM->E=S{$mwEk+bVYk`Ut)})c2!yE%8PEJ%+ATSito_OT|vWuV^A0D_B%fJ#q)SU(- zE=)d_-0{zO^-3;QK!VPPaavb?l%;aReK`7hwN=@(Zaf<duuv);UF;%6K#t{_Ov`kk z_+xWxYyiaKs@#*6Xh*kHh%odjA0O#gFz=*naHxt*^6fxf9EuspIbzyFgvM zVkc{YOK)AE5C(^)ct3F3Z9UZ6yE)1pm|_5-4*p&R@g)pnI5+?oUoF2qVJlr;wUSA5 zcJoPa@X#vvn7L6+K_@~EH~#?kHWJI$jpI9|mvbKJ zIgQG6rrN?;61m?TyR{MCGUPl-Wa5h z+^|9|IOtL33U>E_c^Kw_KpFb5P@L@9)&tO-L7C`&(8!|=a{$qE82!)7UvY5zcG@HK zYj$ta#T4am$=mK019KHYPXV4W$GF_Q1Y-*K(yLHyV;7Mty?)qn22Ov9lZ$wwyNb+5 zKQA+&vyN+`V^HZS3RE!_)S79H{lJaAznDETdbLY)SvPAWxA&Ks;`lkat}4pYl1@rt z3^x}yGA{d`LK92Ni(7~`tZ_+`1dD38r9s7exBWe+l-QE`0CDBYJz_C>s?fKpY&+M; zmyc@5Ar})FNht3iEESvJe#+y>ZYOR-PNMi$we6bJfRL*Mj>;YLByp^ZEOJzpW441Y zzN4-)cDA)h0PYWRZQ1D#R=k%jG`p(oB*|DGP}(#E4xr$-o7qc?_W2;U21vf7@7$PcOnuI46_WTQ@QuBuGU~^Dl{wQ z<%U{m7d7pYRIU&)Q_8Z%-ANdp^A7B4YT(x@c;l{Glw1>zS^jCTy6lRzhE?qa8=Zl7 zuBxEYq+t=VKpa*3cPmU4^N72UNQjCjJ3!jQHle1uXNJP$wJ@smJ2EjV>yOy~0D4>d zPu%=}HFJF}q;NrT9sGb5RgL3dPl50mYmZ&B5!~(N0&31)fH8bg@8a;%-4&zv2lsE0 z{m103xp%iq8y*{vYg;ZLzWCMxPp(>!9rFa5V_VxTTie=~reF6Gdter9>6VO$S9pMtpNW1_!sESJxBX*7Z*yJi8Kf!4w;PciS8R&3#Kut zNQ{9FRYp5`TYl7IK}je-<1A!bgpLlTOthBO<1ATf6qRPB27Y)sLQyFuAw;&o*0~cv zppW>bI9s9&(_TA-yS|Z)v_;x3f|`u;CqavQU4`57@&{!SoMDM&e23e-PiZHXthop5Svi9+=DA?nL51m0QH|Ob}yHMMZOP z%nY;)52WMIna%2~dSI_^jpN-i7G=*Yvg@858HopytvEIab&5A}zB-{lH&74569E${ ziX=`hDT;w1Ws*XwXszhi_#8lvlY$0yyGOhU7eym*u66Lln$#)MMk$$;cH%`+nH4HL zb*bx~EXw1sWe|f5Q(iG1RuQy{s;AV>XsiDKRY2%5XKNEW5{hsCc-h5fl?pqE%Fj7uRJ3`X#fd2sLGqSA% z*KJhe7j?e13oQr|GJZdjt^UjY*<$wFTx`lm2!P?Be`9DXHdlTIsN$ZM{;h<`=?Xpa$gia=PlLJcTzLenZ`Xia$h}u<$G(H_eZq7 z!aFxDCB!@1jx(ee7p$hTTbTy#)NI*qBCVjNJs-91ZP>pIF~yumpEJuPvL$NG*v2F` z5bOp=nQXFOlwR^@<2}N^=e?wO`)gz|S^IkC;$npq5JE~>oTl?ppO!w6YV1sEUxcY% z>=j-0pnlT)O5>AU#Ilhb0X83yjl<5h)L;eJ>+;3ED;Dq|7b$FeN!nPl)U;?S4t+uL z!?xfW6VYYvC8n&mnkYd;a*%J$o@1E@N@B&!a10Aas;?6)aZ3z#+uzr_WmYy(^Y|Td z#VrtXTrlRC=YqF;PuM=;_r0&VuYJ1}z1_dFxS4srce^}R?;VsTl1Um$%4I5l3RL-N zh!D0k>XQk}OlV8UZit~<|r@*}yvMm)zQMBe8 z$bVc`o(j}JP%SH6yJ~;pxUH#Lj5s2eSt504j$jaLu6-~%%u9u22cjmu&-b31e+ z?Z&p=)MdAppSV&(g>eejqpSmgz@*&du-!)_5=M+Sg}1mPX=c+u3gw;^y}29SQU)|Q zRVPV+b(Z3>)e!7_Iv5#|f)5B~rsKX6`K@*d;jf6m+R za9{CvHx|5%sC(V$V;kVMW(F|t9V)Mp11#~ScpJ82OibECrGKlCiA* z{p?(Qt+lLEtam6P=M<`|Nhvi)tq2Unu`Sa*F}b?6>Hq}@s%?v+CC`HM@VsveDkOJS z{MRth%^l|j5(&&wBENEYCXLFnqNR6KQ^4aUc5PcanaLCx;Zwvd{g&c$r9@m;=$G-_ z{nV_?Q6s%lUf%H##z8BzprsXRC~7munY->YE*J?63w$_tucLcj(j}h^$9^m6f7#wg z*qr|W8_53I`k9(Yd5 z7VVu=8o6cSyyo+0O$9lt-2Cqz+)e$8@RnRsa`IZ-+{?!IRom%uF~G=*F6^wU|ZCE?8y>J zND848iqk*DDT0l-!e;Dk26N^oh;vNaC5e3Al)XHh4h!V}0Cn;)LuqHgS#}!I!n54X z5|Y#1Oo~~aLP>3kHuz&J+;@O7I1G}jiJZKWZ)b!MH!#qV;e_0oB+2NKDNN8Ubi`GGrE@+QNAd_n zZ92e^kgfug{iNyVOcuI2Tw_`<7j@ir*Lb07Xg}jzCUPSsVi82eBO*re64DJ#DYwXv z=YoaZAQ;r98&8Tl$~#-zjn^hvCXtOCP@yN|rY&uuZv5VE3Ghj|ssV*rdRti$Wnx5z z3ao{N8D6HDXOj&uS1cHUacUkQ^yiWo$RvuYvs9Bzw(Z3$Z~(5kG#kwz^ao(4RIWm} z8AysHg5^rF6SdV%4FRFc{#aM0^#NMe)K`u*tu3IDBDpsAPMy1$nL$|wtd$j~#~zbp zE!%++lS!C{q_~Af^vNN^kC!x#c~w}bk>N_8QjpH1{GjQVjWLyVfoC9ik;A!Lg!|RU z+SZct_P3u!6HR@?!7P`0v|&%+|w%H zQ+tT-8qPSUwUvINBiaB^x)vU>;Yw6vLUFon2+AaC6y_fv!7bnKnrvwF8-MK9yv(pGvU(L?>R9rVi+c&E=#J zfBJz{%!%j?eu@q|m6`}{1HlBaNVRhDt2pvj0;3(Y-pbr$3}Qjz0X@Yk?V%znT^()y zKawpFv}kTxIzw>_Wgfv_S~Yhm^2Ob;v$^tUB27XL4a6KrMPB%nJkL%EXD!4@Xd;jv z;XziM9m1zNXQ9Pi_QF#7+VG- zcq1SMK+g-gvM;Fpsh+Sj%~h|hTBJrhY)H>K{4tky+etOvG)vf2g^(4kYOD@qVP=@6 zpD_rFXwipncdEPKYWi!dEj7;!wOV)~oHW(K6gf8l8{+?NRY%M4%r5*BnB@&mm?_qtUV7z$F6@MW&VmYlVNgH1o;Vgz z7TZZtRVJrjhfnK?Wy{0Ykvh_?Ubq)h1J!xUD-FYT%#CYLJWDd;CtA1^-CBxhH5lTc zsJ4vD15yDW>s$$38DWqLbz`TVIEBGRq>q$*a;d}up=j<&1m-}XKM#fk$w&$!+q%=? z@bSQshz3^Gwu}NuNXP{5R;@tk{BdA_6X6FAQI@cx?J=KPPz5AcJqXt^hCn_Tu3!_0 zrdS5yAz7OyL!j`_tubyF1S<7HMy`s*X>lSneae|&8-pId0gXF1WC(mhM4}pq-}3WF z4|XwHlC9Ni(D`{_r@xf`;rS-pwWk8Nx4)WHFa`}7G~GZ5u38Vf5pQuh$4k*L#6DCQAOU7< zM-W0AmdGGGf>#;fecj7@dzH22tghrsn@JVnl~2k+(uZ8Uv6Zyqy4Y9+jiU|a@|COxXAG9^HimNGA1&kWPWOgeP@2pd)$b{DPSEbN*^p> zZg$sRT7wkGU5)_JEHS(e#mF)bNTn!fGd1%5II3V^Yl@vuf{uNQ30uS_eX1?lXaa(3 zQ%!Qf+yF<;E0=DHM7SlT%w|Q8(laQh<|D-Uj92?fWd=`*e`|d@@u!OVYjX|6%W&7l zKkfr6Q(%2|XPEKN8g{SBHoYw&i3Quu;*w$vwK?gMF3#Q?yM=9|wQm>_IP|e{4$=wM zr&?g_+J)J^Kv%9^d7?5g3uv~1A92i*Jyfn}MNVMitv_*cdzOW_7%LYV(ecmRWILP+ zHGM|98VxImg}B)+MM~J)?hA_1Uz?hfkF|7KmbzpTE1H0aDpxNPjVWK2-UNSBKS7s@ zzBeAB2ZGiK1Ert-yi zIf6|~9W?X9tnQ<3KwKK3ixrc6N?@3lDIC0Iz4Khompd9d7_FLzBV4Qgm_gXW`ILm1 zPR=*z{Y;ELsQxA*hvP z`eck`rGo?N^2eguY~cYY4>>Za6aaH45y@lUnUMriiC?;ZXQ8m*Tikct>^3PJKli*; z#xZjZ!8DH6NRXYgGP1W^s&d7B&$n&w5=^8yx0H?}PeDj4}tq})`&LVTu@w(nS#u4#@iLjKu1tX zBy|VF4Sy4c!35l^QUnq>xQ3puoo5gn*D_1OOBukF^hu;qC9 z=TU!gZjUF>yo?b{VvNL$oRD&+S!2)c0h9<7=Da_+LU(M=G4g{)YS%7Y*U-EtzBv1y zB5VFQU2@P{T#H%eWeQZSH+n|nv{tn^!M(DOn2eYb9en=)d+c{%cw4!q1cw9V$d$9*PQ2a1fw*~6Fmg)g9x4VYrpdG;sr_&7J z3I}6AU;dvOV{>o0jm+^vSU0VZN*?Gv<1)+<=8c&IgCIaO%b^)%h`tT_Nwowv z+8AJ#JTGf2#V6&wbfMIdO6%7wQj`s;7@829Nrww`npo7Yb(B7)y*dxK4Tk1$1Oh|i zhtUMNT00T}kZuIib#&{Wo)b9}ieLa>q>t4sb)k)OYUT+V0zC0p%gxDNw+CBtv3)(^ zjT9!-Li=+Cm{gJBo>)fz0LgWQC?Be~w}CN3Z7=FftEF}OaZKF@1#UZOVpA(cF|lF` zE{zs}tI*)B-Dz^*tw(HIn%d&nyt0VnJ5c0+l1GkbGfYLuxhyD;)4}mxS0ZXMDn&{J z3qZ7{bj5p@Jk@4a>_J_4d8M(Fke(vVZ#oI0lW^SRnrb{jIb&C0Ia!s-3dFGok8066 z=!~NtI3c~;!d=)Uoy$BoR$Po}b8RdR7<$Eal^LrphY0sgtl$Lkf%)|M;Fn_TX7S7} zcO(VUX&yq*pfw&0GXvsrkEc{gCW%vyl9NL$s~~44ta2cb1#}?dgl8vmn-CpzpJ+9x zyPj*<&C|&frrBAd3S<;nmQ~S|^kG6V>3x?$nKQ?oG0#>qe#y@OoM6> z`HB*?PPG*{%h*KjCT_o(s19%Oz%2`xB^YRrAD8ByT<|f(E@tB;xMBWIF&*+oO}g7o z2}E_(Um;H%{4rD9{h_?jEM+m#jv={mUh~;K-k?ps-uDZo`&0Y~<#<+;mRn)Td8_rNFOP$aP39peeZ59&MYWg)3z(+ z-`sCxUi()5J~xq;3Aw$p+;a2A${~hUm6hRES^{GrhNoXFV{i7Jn1OI)UPfPNsmqte zWX-OEKxp7Nu1D?*YYTB}ZDDjTB~V)KV8PK?fOe|@wI9nBx6rX{Mi!;0{^N*#0MTF= zOp;_7RGQjGDnGb|+-i2$u3a&lEtw@qHYhn@F}oxou+2GC>?hS9Tj0a1Bwev>IoO z+ZK$crXk7kMRp(uDb!Zabd4%TC6$k6atIO%ngG@LYtWo)+q7=Qz;l7)-^0C7nGusJ zyq01cnPrtpiYIN%M!Rd4S!;~1M?}expd}p3h6xKHkTb0+tw$p|*Gy2Km=!RIiBsC% z7>{9;yfU(xBNWeX^1;};N0iiNisJ;+lnZGco7>zgMLG!~gkx>Ku%+(JtSwj+**am&FVmi`+$xz2j;4n+k}ir z@8bC?S1W1So9Z4@a;qqHE-EAytr#6gLyS%3jWX0r)%y0$9Ax2?H}Tt}T1yqWKyDgF zyS7O7EJjnfq-aShiVYV%Fn8ey2pEPX^#;N69Jnf>$&>dWZY<-swCzJMm+EBS8KGQ< zN*@d+?SXFFM82ZxV=YFb1zQ)F3m}jH8HokQ@CKO8hT>vQ5!|*JlQ_8-mJZaCor_m! znAW~O8g#~lH)e3tBTQLUHuRSYTT2@&w}`ye?}qwleo)RdQgi~koE?p|tHe3S0fm2D zP|9nn-izB}mDF)ae9B9Ep-V6AU2Se&DFyobeftwvxNs5xjO?*g$H;kiA- z5&SYPSvQ!%_x3@PfWlR71an{ zA*5pY4lSQdQ!Y#ag?T4;myq3COqQ{kV~o>b08rObF{OWT8@9-Ra20U_8C6v-0hD%R z29PlusX#07%;OU1)#W)WQ91EQC9_vK?qCUAswhUjRK;0YbiGSOwFthVssXAv`}OOA z7TXmrhP@&wWQkDikY;+2-AzA`z+Upmg)!olyfQB5Y6=iF)SSf!mMiHYGgG3i?gAr6 zA{l`-jmAg7pN1I;fEb5CA;A)7fzh_aS?U7R)x|p3t{JW;BqhLEx4DH}$fQQ#4^rrB zkpydlgyIY4l*N(KK(Yp55}+Ul^`D#jv(mm;GXQGeABs5=%N#55Ja;q4-SfP2b9_7# ztMXh#a~o+cV69p-oGTdEjT>pFh6co;Zs3){sv{A_4B}-UDPoac%Wl`#5?jOCwrN@5 zwI^{zB<)6QszA!PP02*en1&BQ%Yq;nG7eC+ZJ9@|-#-F;u(GArj7w(OF`+(q7j?y8 z3T`A+^#`UTC|UIFUr(t{oex~F1SSav0EG?C<0j`D3ud$w7~<_!6Kzz%491k`bExtE z0LKDK1sS7Kpiq3o4-5)6Q60oKv?iJ26suFpvP|XHyL~~F1EJT$7L1(Lb24XV97;pD z+Jt0IMEQ}|%MY~}ij*XjNR@8qO{_pZl`CA2h!`S8$v+fPG68~Qjdg9Zn?r-OWfjVr zAC4L|!MO28NKYUnN4=PqeB6B1C&R-UHrPea;*?1yi117{`|T}zQn(_Sur&Fan&Qav z!QmDsv!HjCN(nC|kg7|WCV{%tc>FP+8^%*$V< zP=HNPz1ePir@Ot{yOD|Xh0u&tGdEtZ*Cl2?R!r^f?~Sz@U9d>MnnP+Ul9ABj&AS(c zx|$w;1>US>Dhv_JByA$Z^6c7n%HNAWkCqJSC5dh+v6%|P#-rObbIA2qRuGjXNQ@sG zXzcAu(GoZu8-g3xgs2eHa&2!sYZR;@3|N8l15>Af#e18h34sz>G6BU_Ah@1HXPf2b6i+zrOhgQ`Nk)w~g=4sGUbSrKbU51B??gP(I0vn8`W2hF zvf+YV&3m#7+lDsQwzd%59rqUYasE_mkP59OUq6m3Z++@F3q$}8ECeOe~S z{{R^syl`_xw>gSX#7I^D0JPWBTtD2l;jP}c2ev6Je6_7rOHv@pB-aqRpDkx;$MY8v zK?_}R#kX0zf`&+&Fm{azJ~;B5?Y+AjlNg7Cyk3qEC3?-tO52jhHCdU()cX~CE54=B z6SaDJPQPX{=l#jH70d8U)WH;Z$<4b;tF=iAj@gFKBb^BYTIq+&YD6Eg{JEvVT8bIj zV<@o#C5#Zws6GTA=Y&pR296;zAiYr*W}8S$+N#V(=IYqIY<}rfkB>CVGRP}G8^)#8!Mrns5smM^KIJk22U^m&ySCX2 zv(`&Bdh|~_jRArgCx%J;OAE;wJ25q>EnM@jTvdpKr=$WvD$lJU7j-Pl6SJ&J%8J#k z4$+-9lc6A-9PLDsA`5&J3+EDoleN4Yb@J-crS+y+L2HA8YtV?(rahw6UHiMoIkLsQX5vm!gBpZ=~ zZrBJJ)N7ZPDBOwE#4EO>8N#*koReA2Zen*tAefnk+{Q$%T@IMi+V5qzoJ?E{za-OS zTm|u8M_YUI+!wyy z0U0sF=)P#=IeubG8`r(LStT-=E+dqOl16qZx}7oQ?t6~rR%9n3jX`HQVUr`C-q?^J zDstXjTr#3E#t6!kP<}PWIK4ZCg+2(_MQaPI%UP=BwNv=8sMNfwn)w9MONe8Ic19p5 z4)Ib$6QRRyU5JZ-$*_qOb)>g4&as&?C<2j66{eN*!tULaz;w%TVzrXe;wFqRQnC<9 zRt-w&n9$)DEKVd2D$FJ-troCL#zgZ=61Q$qwttywp!}>pKW;X5_NBFnkphPvoC>XS zV(9>IReA2^oxbV0V9O3XI-!J!qFno74z0N)3@GQr!|lZ>jR1_* zh!G;J{@;#E>H9zml`q?=$X(5Mp%dj?z z9+j_7haS4s%MpvlF4^R=?g>3la;1BM=ZgTR9VvLgUH1~??&Ny5)aW#>F@4JIhHFNg zP9)~aZ3$x~Ns@FDZbhoSH#=)lkv{{BDNH+oif9Kk&I_4Uf`(aL#S~L@PL$6VZC#Kp zi}$5Tl!oNgD~+zKdyUq*PiP%F_zlL3LMTslf`&Hoy z1@)Kh=ef@bFB{25!K8uMK#!OpDOV+YJz8SeoNe10u#s=Xude$>jrEz>If3)1diqAo z-uB%27S6KS$!lXRy_Mn;Xj^Ha2AMgoeK6QrjZ6!N4!ZZT%W38fAY=(1KQD^=BleTI z!uxLK^;vmD=u>!RMm7uOX$GQ(v=omBpL41Gxt|N205c>=sq&dcs z3bk)xFBk8wLvI9@e%|A(?x#T;v#EQ5>1p0mQ&p`3)Gu7kF=)(BZamK-N5g}5Df`LC zaj>>c!z-kLPzT%nAbid_P%p=?-ac(PpL1UF5<-#7-jQ|+WU9wvu>c03%CyI<-%1wr zKvcvk``x*>7F=Y;_eyS}jh+i<-y$McVvOq5%9YDJGQ-`DuspG?1|3(8-N#Ib%%n1z znrUupQtr%7Kxh8|O5{Gw0J%9x%ZXX{EeM2twZxMJs?_xw3J)A;*u5#LbBGB3Mg!W4 zWqrj|cZQ$?psz!VTiaeyC$4`)t1>RiD|=;lgseME$7})WcT>aRgj=)>bz#BtPA01} z*v%5viqeO4d%a5D3@|sgvw->|g~*j1qsWp(#AO)_Dl0;!pndqJ45C5cuUaBhR)pfu zBVxA;5$?6qJ?yFgPz?fs&~?XNvTs?|1$7-q<-K9MHP2 zRi$g0##ZxXa>4Jw<_87ow!2u|3lng+7HE^byZtn!OmecFrn!}=>M&k}?SUyo={dDJ zA-Q5T0M#s>iuHwQu#yPYoifDAb@Jq>8*PdnYgP$wAcMnt(zfZ(mRQAHi9#}l!Zb^#H+ zAZ;F|2SZ&kqiQjYwu!0wVpAhoS0!)ac$=&EZYM={ju@HVWnr;GD>)6HP^Ot&+ZVJx@%q<$R5*@q7qMG7`&?gB%hcB8DCXkclqIF3p-vm&I>~nG=@9Y zuq9xGFPAFEKrUkMtt5^Xnb0Xan=dnjOt~dj5oMynvP`N4cWc&zslaH|Xowam z?V=>FJcIJYF)WEzRa;K@djk@>{-z%*k|AC5W^Z#D=C1x0fsRw&=rAyo@s z?A1r{z+Rbf4O`^8Azg3f_GGpm+8*8y1lWJ2zx5-8yIsGruZe{7!3y$;LWkTC=W??W+%O-2F@P0`rfGXnv!Og2bn+I|XEF z{JxP=e6i>~zindSz{gcU2lk$r9w`^DP9PcyF4)`;TIQ#eh}R(-fveqf9$?D6s0P zaz`XGq^}<6+2~_!NNp>OX+Xk4L{Zb+$TA({61=RZYbyb?iV{42IPXkMlg%PhATrsO zSfh<#dax`*S6XU+=ZTah5HuArn69O~e5=OpleBZdJsU{%P-XKBOn0(`h?^1HHQtzz z^5U#~dPT@ZCA34)5e%YMp;CMaI%8jJr*RVq;5e$+27={7Byrk_ZRQcl4|8$4hz-Pm z15xv+t`{iA*fEn3_>YZvIwDD`9dEe%XylMa{mE*vF(9F)M|Cg*b7IgXi<~$p(J7Rc zSjm;u>Q%)LRQa=@J{A7}OdgVf z9cgqSi)@I^8Eu`zs5ou8=@n2^a<<|&DUF*(txn$${BaXJ5X2#5Lm>6WP=Qk=2(N}% zR+Q5sRfF2T%jUi9?oJolKH0Ya03q%laa^UJ5677jBR#{{Y+>YOL0*NJd~suMwKwhv z0t13v;2Nbaa}kcEUF0lfG`=uh{(r350j-Z8-CMe>fpwNOUGQuxeHfCWgL1a;u zun5fsv;t_<9cpu-`1xUMxoXP4C^>*Zu2mRKz zkg(Ytx}KlU5NL=O3M!hafl>TUAxgFjkIPir9YsvUW%qwfS@i%6j9VuKjhn$&4J~tx zX-%h~%g3%E!CmRgf-cqG$=*p~q=JPgDnPH69SInhBcfm0t?|0uLA_)S%4*_*zH}JV z2h@%=3$Q$qHnKao5LA$8qztNjFxxVbEfgdSRfY@ED3Z^(mgv>)PC==Cw91+I!QL7d6^2Oh7*ncKvyZH_*gK>Y; z2#!+vC1Gh2$@G?s(_`a?%6`?pImpok7a?pm^>jUiC|)#Aql%6&*YVFWTPgff6;v(&cH3g`_r; z$Qn^NSd?yfk3}OeYl5}6CFQD|IVIe=kP5+T#Cs6K4b=RE?ROLnAhfknB(u5DFK~rG zy-sJqV`duM^>m{p%@xdsN=HKF;{MDE9mV?VO}!6wOXqKd%F zCvM)}X=qk5HzB9?w?Z|=+rR7k%Z)pLMauwA1GmK@8_QAh#m{o2UvQU}7cB+E4GqAL zdPdZ)!gC;kMm*N<+wNGoqF{+O9F_Z51jEM#wT~a&Dzc$wqc%p0zGu$~vtSa(nz8{Q z)x8qOjik4eJ=u+^^vm+fj=qu(s%x!!V`uw2dfX;VaQ>i0I&@r55r?WjiEblq?+$2`8stw;7i19Zm`ES2Va} z_kd^#>H? z0dntEViMC8Wf#p2vLtAtF#iCU=ylIJV_qARZUP`@l0@w5s&9D*`8ZId6V9rRi4rbR zy#ZHh{3(rF(f(9H0FcImBavC)dSu`}s-JALSzR+umAH)VhBg|oHOylc#;Z3TSd2e3 z`;pWeC1t<4u;wMPyL67(wfo3N%M-Z#njO~*g zLQ>b8Z{Y4JHkP$Tgpyi-?jpWt!x;B&{{VD9+Zs2;YFeaE61oMiIKn<%7GB32%D|CL zZ(47S7&r_(h}RyUZ@i3*-|Uc}?cnP^{jvb!7c1v3O#F=dXt1FR0;Wh4pkMgU9%I}t z>b)kQ$*^u+s+nu;4v|s8Bp<$+{{Z8PI+;m|DI8_Gqzw;KhsHpmAcZvbbgLeer&Xqy zi-E;cVsl4vmXh3e8Ln0c;{oNln3@6OTrB3zSYIxq`{!hSEk^wt*~_ z6#>B9nRs~O{LE~~M%k`?_=KTw$ULxH-g6Pu*+sfYVo}>aC#&%jg1@{U;uQl7tC|?Z zea}*m+)8eDGUTVysB@|D7@=}rr9wOuH#ZS9cCp5yGKdy!y<0y~^YO&pyAmP*YFF|6 zQUES$q_&n-F#1nvi7`t|nwcNF6B)=gDUnA29HJWZmnBVVatBWe;=Rl6Nm>@b3>Axp zy!EEzQnc9KAawh1Fu3ftwo}qqdiK97B$LKl)EyQ$X-`S0%AOR%F5WUEo(wy1Ur+x4 zS-qxFW0-#x-~F$A-%%|LpXCn7jcIhOXQt@u&#UjYV)apfO4Gnr>wTyiz zu|IR>n>aPU;y^}4g!MH;3j914{OC*l{1;;n)+~PN|Qv7!=-Tho1iw)vuxGL zm(VX0dcpNf<=m>KR}Hhc#EmKN!fi~uI?UWbO(pNsIxJ;a5Db!2<|h~Dxb&m|S<$zs zCKf!*aNNT=1gINm-k?Q#gW-!7J;+Ajk`uL}Z*6rEN307a=HgJ1Q-F1cpNDp4%%tp3`*hug0gF?+{ba`w{0J-hK&KB(Rch}u2= zlT~FTI+2(o7IxA8JUvO^cr)qkk}HSR@<$P$GNSOmSJqftL#jRZ3duM8XnDj!V<4QbN>L3AcucrRY0n9&3i`Y+XDLb!;-M)Y#_FN z?VKGV_K#E|5NUD8QH5y{yq-?~=ss>{aasL3}mzEAP!Q1nt%-f2UCwFxtX;vWmvmoR{8~g5OK{`xohZ>I6jqUNRHtXzFwN- z6|`_PIK%e~(9$$G6=(SlA!u!(t_aoZ*OO4c+ z@#3y+y{7H!aRd`4scJrdqWTNmymj9#`$yjF{{Wrkc`JK+*zFZRH6o3Ba+>Bt*ZXnm z%N4B+(Fi2Rfp)JtecL z9}I2X{!zGZzuE;y?d8axD>g>hj*dSRf-A4{7M!;kaNA^>M7*$i1No8UBL^>;PANkF z0P`(fvn)vyk5T)3!s8E0QJBhy@j>ynJ?G_Rp3+u|(jvDeGIl`c(^)zZxMU8vUdwJI zZW%?E23Yja-G3Sswivk85?#CNRY+SCp^@UpiW)v* z*Pr7hkC(WXG(rbdS63%zhja?s8T$ZDY#um5LTyxZbI9TPLjmRRcz*FqY8QYRcXJVUdAe!H~A(g_bfs*O>kLQGX21ik4-mFCtHoe~J1Z~nN8(O3; z!}9=o;nqaNgJbl~M5P%8V}{P&?~J*XE*ZO3Qi`DNdg)r^xYoC~h1(L4mK?D^KT zG69uJ<_16`cVH0F5di~Q)SWSfb_7tBZVi&1q%fO#Ad`D29nIQhs6QMwS4?!6ln}Rw zDQv4-`8J9POKnPkv^{Ht+#lUM(29gfh9Io!?8YJqq1xFT)Qqc!X@fiA*_3IQ1?#Ef zDpE^PDnttbxYKPk%dQIb&_fuw2xAg6Rq1Clu!Uk&+-iX;K=SzGK35Ej0GdS*Gwm|f z;~fxb>#sa;P3B#~Qnx!L$H?0P#U)I_gkS_Z`V{HXN7$0Bll=$kzp7fKDQK z<7nvNN8(aHh_8k&i9|CY4l15oy`%1qNkbGM0D5)I>5F#7vfz|LMU=D3Cy=eAW|8F1 zt-63_Yf*x^KT=I>Vcw=R6)DdVX>ES%G?Kpb%X3gKkzS^U%NiREt-Zn3B46R$mv;QE zsHeP#jz_Suy?KnXZMl^PZHdmYg48;HrWJPdcEH-VGF;T*)-|d)lXJ{M-fn&dXl<_T z%reT9kCBuB#IU6$G|U1u!Cm(#QZo!l`;I^Na^|Alxjiu9_$u|>$sF%f+h~Xk15&3_ z*?9Cg#N0`yawFs0iqW?w6+~H^DMaC|`V{FSRUhZ3_3UEDf|?i?7aGtNybT!_yqj7_OrnW4h2hEV}p zEMp68+-W1JZKr)$wRFp<@y7Phh}&}9E87J|?XqP@O>J!~?xr(IERl;i%XZ@fxbM)C z*#Ik_mMvJZYV`FIMv;KTp8S-~a)etKRwb}JHP;`=@*J1a+C96^V_*Y4TpBNNPFqRL zgP9oBg^%Igh1<6@$4N1bap%iEDx}E06BxzI)T-0+9G^SM-rc~m@{7pK$&- zZOvCBs#PuU9lTTm#fAxF%Ik1kAaS#BDNtK1#Sexv?nH^ZWtM-Uvl%d=4Nq@;k10ZE zWsPbFl|C4#4v^&a3d1>~Z63!f5)#dI>6llk^Y9qE7Cuq?u}dkXngG&6bGhQ7iYbOf zPUEFSDHkC&-G7N}t zKp@c4n9kp9?h5J0=8na{?CV(U8cy38Lb4so2^p<@T6N2=5e=@UF2q;6HDt||j`CQn zZmc1NS{P@I)GH{ExnOEVDm;caF3L78LNN>oIXl0>P%kiDa{HoKny~>YHl0Ndne`a* zS1a7Ct!J4XgsDUYM)=9d5Ghs1UX)~9Q;O&~p?30sl2*GX+{g`Kk9QHv>!PSn);Xa()71Bma)h5&wFn>OLC{twu%T+bZXNv zjP0)Y+k-$fq;biY+&|c?gSXc1B0~)G_%GSNVtZ$bw)X9`O&S!ww}GZ50+wY^K_q`X zQ{7#Vn*)OUd+(m(dV8WlK2ljzJ@>%-X5!Lmc|{yNd}q{LS>Cact>Fm?Sj6a_r$Z$R z4EJL8#`V!4BUfNXc;(!-J&$|4guu1uGhjtE7cO*@Ky=`8Ux?qm4a(g6la%JUI6~d> zay0i25{ulf!&)J^>q$z4+RshdsX6K4 z@WqMT^0KAr08p{XRtilCGyrLq6A8Jh;utI66L)01H#K+2*vHC86|`{LT1xJUw}I&# z^^Sz>Le&RctB*ytx(?Rm$$=mM41cNUdx0)hE0I2=KqO;cN~>vg*qjL*?T;eB(xa%T z@zWU=cRrlhm2OsbhesvY54p%2wJI_d>4twKJyF8Z;G5dqQI+)m&^4x+Vl|0XXxNc~ zWnhbw0FBik9Dq6D5|m#B=q&Dt7^@|RG9^Z`5*0}nw$A3eTdH}3;ftGV&;7S&!;#_N z!8+#Q{Me+IeZa2O0T`0NXRxld>#hb+kPp~0qjumWk_j&uu=N_L>z|%jtt<6a**5-%QX*8bmj zxDf=cXd`T;RB%<8XeuZxUYNbN+)CxmIIv&|`>8?I4&u=Ci2>bR{{VD9ZI_j}_ZPgq zqiok!cK4Sl?yDm4%G_+GP|!B;Ybdx=xm|kHbi=*J+s)Ym2los|{moYcDGUhjRkoXf z03$pyTn#vhCyMe|Vc7+gW!>dDcL1qSX_-9+G2^n8$j(s|h;saRbLg&0=!pX}!Arwg z7M?igAtCvgHkH(Z6p|`2Uuj^Ofh;lX%R$3a74^sMpY3lQ?yqg~7cRTygORtiUT)Gv zXf2|=8+Y7B#5%RLH{?B4+vkr=Ck?0r%3Kqhoj3u^;mZ}5yuT>Sbinq_S9p$ljrMQ3 zc`hH^JanADvn&rQ#mm7?6bq93qK;_->mtePjg3lHi8s<)4*jB6zcb869O9Ut!3-3sLjYj2Nx>p#RziHMCgrYSE z5p$$BI+oxQ?cdVTxEfzRi{~pV0dsQj@^>;Vmm37rM662 zwrhY0_SfNLJfylr5RN|Wc)zQR!`%n#5yYVFK;DA69mgX~v1@g*7N_W$27G98dNnKH zy(hGLi47s)g6{st_s#8v?;mr)a`M>n^3JyQ@~nm~)LnO#$SGr12Dxd6ZMTBtV+fr_ zQf((7K2`7Fz1$^g@G-p*VWr5$&wgv@X?@{k?{D$k9~teNU-N9RaqGzO(4ErF3zG7P z%>x(Cg@&5b7VTfQWg!`pQtyOYu0tiSv-at1qb$q|Up@Z-aQFLr=^e~%$^vbq5a6+Ai5#(f3i%iR0LoK|_QxOY-bar1?T66H0GFRq zb(xn)fYAsQKlN7|R9={dly~@D0#P_Zp%e<1PcBFfyle-x^PD4s` z_+!p)Z+d~vDqJjC*f2bj$eEec03zK&u6lqe{BRcKT2WV+bmk@&@%oQyRx}a1^zr`y zmM`0$fm#%!0B}|=E_IBg>q0|??e*T;ABHuycLYd~|Tmm}@_bTgo{aFNL90*QNIl~ z+-${0lZhX@ky*Ck3wKHE7azQ4MYxgAu0jaTv^B^ac-z3lNRv{nYIX@n)kh-+loX5_ zGNl>59;{OrgS@a)D3gLLPsgc_;TBdv!EPfUQKCAE=TnD^wnIoeJxBadX_gAmp5Kb* zJ6o7Ua#+raZaD>ArU1U5m5)$GMmB%-LhNHWv4Itr^tCWNa|sdLX(SpR98&l==^V&<9@f-YuGHuTPsiH*B%NeHZN3H2k4>MP@n>pSUfuId5U_Z}ef zM|R(-7USZIn~}A@cI2Z)w7CK1nNp!eaw?g0I%4_U+uRd+BTTAGVbFaQ2}V%znuL-D zSxasqW|8SixBS*|{V57J*+Qjue1#z>rn9yuS zgPkkGuLWLIma?mJ+Fm8g85`FNsR4}`3e>3w$DugLotv?n%Mg3h-Xu{hxY;|h>}Z=d zgfOLiEB0t{TI)=+G09A5hWcqHuz4hLw7pb4DjZ~K)a8-sfe@7Jx#OQ6*r723bV0!8 z3bN6dD|D{fjVa)9RyQ>DO&02`Dae=h?`;`iD>k8MGOo1v<5oMpTOA^mNj946s=nu# zFnLFAxly$wbfz&0Gj}vr*aQ?xQbW0vD%OFHqMBu?!eA=Mq;o^cvK9gm2n-B+h$k_a zt|oCNkw}b~x|N@Gv$oOo4d_kPB#?3g?D519@jO#?gtlpz1!Ss7GmzKP7#bWX%AC^9 zD?xB0-zoyK8g7o6H4bEb_@7V!;}jqlOI+?}C8|l()RHTvD-!9TDHXz%U7^vwW%3?a zIMFPXi7nX(p;tzx+6sytGWcMO848I=G6KL$7!>oM@XPt&S0+VFk&;TJLW8%ZLDMf2 zg8-4q8Enw&2XHVRm8r?9GVrcALGVj<#bV|FE!EU+F_NuHR)fTOVr3sIt_G=97}kUg zzWi4u7>O%MK42?DRnN($$fu=c1V`f-Pp+QDt z@>f5*2X1X92#um*?yueTZaggZ-S>%tL;=uhbMn(0p0n9$$591>uc4*opg=~b-nUNL zDK*dJQP(b~6`}#D3_d|I_$j5DCow!@Y;+V*YrD*zwZ~k$84y5W^G6tv5zz7sjK3)P zP(D=y&!#NHcEmqK8aOK`HunmN#zi8?<7Dzk;0FHS23dS@rqH+=$S!dt5!^PCDgJ=T2^V~uK6Z*s3hmOoMz7S zr6-e<#Qf9Z01OjXn%|RHo>?S{@evbi4af&puC+ONV&twvas!eiz;PXW{1U)0G{Hr8 zWhJ?T{^@3k>qkOPnSn!|6@P4P5$18pGBed&6ANWw90XCAzDi92^7tG&5nvBAz+GNA zTlPne*_=xmkaul>C%3y(T{?8fqxS9Di4Y~j)NoX<+5|YqiV}W4(tGLd5@mwb9LY1W zp`w~(06F|{i`#2=FG_9%L2~Hr%20qAq3?MfIp>DL!Awwx1?FNKdaqTd+gvAeyRj*Y zR)Yt}k3@E@Obt@0M$71yGLC0rp~MO45$-uIdgZPkGp0d{@)>eb5aOw=uO_yoCbsRZ zzySbZxwAB&sG!$8U9-OQnow<6aY>bpR5&TQTW(vC88yqn)+caq;k|N3~WK=AKl&;!&^}}PgJ76Ml0Foaz zrWi5}gSU1to|!QR9*c}g51Q_OxBlGXzjHnB?ays{v)$Zhvbag0 zPB}fr$iyJFw}J$1i?R?4xinDBeMI`3u01uli|;8!+|w3}BGHujN2Vn36bnA=jiKeE znw(cE_x}J3#(QhroaeWAZc;vW%Zlhms8tqwf@0KHhZx1Xl~ zL80dwIf*zpz_)U}vXrhwNcQHbW)R3yFj&i+k~k(zzBs`#1TfDR#cK{Fb)R8yS1hvL z{{WA+Ol1S*kT}G0JXS}zUlFB2#3(Mg zIJoKNK$Y-^i$bXOx7qHnoaEupj6>I()lJLsq~QQ%E<#hu3XHlYSQ zUGfcuEMp-l+#}fTfMsVg<0L) zQC9S{{FM&vL(MEi?qbE5j}zyQKXkl|b53RsmNTaErAc9_(uWm{gRxM`OL7Sr8vZKj zO>q#CFdQo%<;QPsQPsAB>S}ie@TZ0~;$k8Q>)xx(6e$mK%)lzwA_Xa)x#3fLwOwz@ zp}inU8%9%dqU|7PSNY<;;Ix5@J14+Wstd(wZDYBrg6u?)Daa9_1J4V;6FXvlAxut^ z$xJbfu>hH8t5KC~01YT4DQ(L`V_)fGxoGsx0J%u5;;8zgAR@HhwV`j01jvC;)ew&)NQzb1@3f)@xIkDzBm&N9@U2cTA}($> zI)2y+avTRTSLttUJA0nk4Z>w2saN@JA`xWrlAz+v|p#8)O*C+5_oc{p+Q9rf^ z*ptr~7ktf!J;%p2r#*I!63KBe?n^2m6W znGuYwlM@KBVG_}aInyw{0p@tWr;TTV-d@BAzgr+vwH=tKJGzJIjL$^ch>!(<8jk`? z3g@YKe{-@WA~?HtG9nF*SxBn#vRTtBuWw0bY~1Cu z04$jr>eceD?3_j$PySU> zji&2G20=HXuQ!RJYD?c!k^l0_Q>Dn}s)V>;9W zLqnYoE!~(BY(cMwZuA;S9116#;`r;XR!fcs!hSN#lK%j>;&>_CO(ak|9f7_RjOP;pq{<-a%bRA|^5&{rl!Q*A?Ltw0;^OVNh>jeS=7iGYS=0 z_L>q~Qhafr4ZLIka_mn==b2Z<^B&ja&Ss7T!o=&#^Gd zs>MMCjz>*#x3t}VCQ!F<%T-!JhxPfYJH5ElW(xt5QGI{xo2%|h+v%qEgwv^X*k0?3 zOR((HD1|>aw%~+9OKhg>#vOL`t5P=bZZwRK88$NJ$ZgxWK$br?>XrMAc(LtoZ%@P8 zt)C~u#yH!m&X)%M85yN(nBFy3J*GQ-U>aqeF`w=hJu3osna7k@Q^$xok(;+grLwq9 z!X{{I!H*90)4h}Kzj|ZvH}$D$R#qM#)ivi z_Mt1V^8j(p^K6p0BHZp1so7P3b{h40wdXFaZSAi)*o54@y{oLY!uHsRXYD#wTC`ST z4y5Uf{{V1%F$Oqu`8F!nz=;hbEIKOhu|3fRhc+blBy!w)dgYC`AlCA1c+x~DcBng8 zY$O$Ko_JTc`;FaF*4j=7D9bM5D4V?6i9^ZvaN?~z7q!1`c~5oTTgSj%-to}EDYv$P zhh}(C*XmeIcdqP}P-jz(D|;QGo5lg!uUN6q@GC2Ia{OQkKaWN8XTCW5-)(!NnBtZz zjxrdoWLUVya!fIkRg92G$Q^5s5$_P5({(67kpoZxqZ}D%?PM-n5;*Znp}3R;w^a1e zyDZJLS50&n&A9EP4vSN1d5gNZdur;|c z!Fs*7xM{{+%;y{+!sKXEKw=CgSnYz(Jz&dSJrMy9IAUktIgW>%#+g5XMx zix;jquT6Gx-|UXwQVelCm(VBo3!L|}TFZOMOMA-kP+nX|Hy;v5C7H@wbwU9AphaG% zE}G*`#j9`xTLF$BzjsouZ9ThZvIJWY5SfS~QY23)6aN4%9CJ{6XZH?E8~dMk&wQho z=I$f2=cI_27qEpbE%L{oZd4!wz|izuRg7)jfEi@iQ{$g4MQ;UoaZBA_)SifM_K);pn~QgOgn z?anmu3&f9fjknvJ9JF(eL@$R$n%vr6+A}Lk$7Q5SPEt9df=+8wl?bjQVI6koY>@c} z%;5Yv=Dg3l+F~Ts&!XiX>Gs{ia!JL{VIy4ITx^hSeeT48Ed!!8J|h{v;jodt8(Lh0 zm32Sd)D&K9nCLRdj}8e;e$q>4Zbsm=oLDW8WepsFl~|dOnpK8W*B2~%Ac6I!=G}Nu z6aA7kBNDMMEqpb88!R?d{_NDQTH9K7Go4xnj+!#y27h04RE&-S{P3a}w27 zj(SCtjfO4e=s>_QB$(2mQ9y5&pj6YYH$Beam4O%3-UEQH9Qmp?ZJk^`sw=B|hW6AK zmoYSQHQ2Yd*eV%TJ;a*kNXU3+h`nxSWG+ZC)uc9Iy95A_S4iOHC0p4gvX;n^8o5T6 z8tChip0pyl;=R4Wm7{L}S;suO6swSFYEC>vvHVEXgHpleAKLu}3ZyLSpQ>;izG z<-5#lBO{#Xa_DkC7{!c4eDkhq$s~pe_qAuXOX<|d9o%w2(Jicx>ScX)ohk-3J&xtE zc(@VF98Egdk-qKGM9|2R2miCTK@nnTlR}O{G@^lkAkVYpNK(nHtlP0%F4T< zS~0Fpp!!;#U2vV{vubQc9}$sJXzB@-r+Rcw)u+_5o%6)iW^e^JFOP~uy446Seg!8nJO2mUj<&fPTWr%Y5A@y(Dg%>WxDRhRru+N z09S_&{M}fIb5y2CXsmYykk#D*ts1nTJ$&&(cGz?J@J*qN3IKDCPnwP4 z)`MTW1t~;zKm(y3eM|A|xTG z;zSH8tyMI_NN#AILa3k}wJd43aTEi@;s8?Wdq^VM3x*XWF()bpWO=d;A2H`#bE!i-?C$IbpyU?44j`4vDiOAo^#hR9;91m{iq@N|H3z4O z$1)WQDFm8V%fgt23O698(OM>ipZFT$3gkH;S1Px};0horv|>Q1Q@Dy&y8YOMK|*LW zIT4xh_+k{RC9JCuX#`*}2W$EH4;(fU0;tG!=xvOQP_lx=ZA0nJv&fBWiHu!zuuNaI zY$CUGjzbggci&o#c7ncmbec3E9@rp=;F)pK(n*zKR4TidX!R3XgP(x##O>t7(O9}1 zVy`yvtoAavXqAB4u*$({zaqooOnMtI7c7%NcoNv=sZ8mUD#W)jLkPD@%`szHsgNMk zAV;eh^ScXuC+$`r$J%mN@cF4iWb243T$!r(?z`M%4Hb z@HlO_!b4W95$cc(n%Z2=IF1hdYHdl8DD-fALDZaGv2s@$EmhQ#1D9QhO4USlF(Vah6?a zigvx2Lid`H$mCm^aNU^-RI3$|7_J+>jI6|&Selisa?i)d8e4ejx#sUtGUABHc;5St z%&QqtWN^nSS0z$(^R6sIW+r^34F3QigViGyX}9HOcy5qRVVJ=zV)S}iA4b#a6f|Mb zV`A3+QjCMK(nhc8r^}MBExQp+@ZzgBwrj~<%XbySEvht8$f{|-FI6d?gRhP;ZCULiECD%Wfi{m;=N<}9pj zd$(4ydd(Rim~Va6qp>4GHP00H+iOw)4SXZjP?8cD~v0#A>N6FByd;* zO*7Y1(AN}+d{=1Tj)E6;mQ)muGCPe>1$+f@Y8H&*WH1SOw3bFu%w}%Wi*VaR=Suij z%MSB4raD(p(>0WyHA%83xT9$qP=lZF#|yv%%@&Lik=wk|KoEUMm1v5DRZl=c(D`A| zv}Y){neaknBKanKrM0AXR{U+Xqg&s^Pa-aZo#qI5@QM4^WCNl-(^>g${ zwq+?965}L}-;B6v3r84Z7_5OYjPa^DWrlZr@mOs()QRfW;^1?u@HywoyMtYqnKb|Yb*ps~!6zbeV6Q^mDcmRi#2KzkmZZnKz1X=l}M%f|CVvKgC z@VHVD-ENY~3eC)SjSjAM@slnV`sL`TNm zsygIJb!kqX`U>;ApOCEo|b-FfR@|*mmkPEas;Uf*N^a2+xfCa(SbcrGnrb?t9! z#mPZ!#>poy%JH&A#@|fc$m6(bQdO-sfL5D^ei%;6ce2<9vR_L8xWIZ|%9>MoXSfYj?Ok;Fnhb09r=yQA+8k9~^m!{{Sy^WqLr$tWOiuw>3ib zt9F_KoC1L$-Bp|N-9-uy0jM~!3_R2-grMbFczCSixVG;0;!{h~oXK>##jElx%LY#Vh zSy#JfO-3P=2IqykM6?ES6J= zn8>LU_ZSec6(kz;Am!H?m#xX#CC&kD?KaPdqVB%R_TMSYLvQu4*3R9Ub%ddEZhuZU ziZVvkm6!+61L`9l%h_#Sy$GAb$P2gpg*8NECHuuH9jd2ywS*r}+;io?^vP2b+Lv}0 z{LQ~ChQ>}dR*l{eCSK)#O|}xdf9eM;W9@yuV(rgY$|7+A!8rrK9yup&A_O8~QhJJU zKwGpi-bEG20XJ-Y)u1)hcx8v!lzmVqh8?&p+rWs?beU{Zi?{aw03#d7ZWNh#*@aQ! zb(FkIxD&dR3<#w`r7`P{+7_X1L_2-HE(doU!p1jD%!i5>-CV)<42wK+TdQ3}P3^QX z2;o^FB$E_qD7{DkXPyUpdN<)1TOfumImWc-!6x0aXp(!o)gO?OUN9}JR^5o1D#6Lj39QM7Z!LtEV{?+ElXBXA&n zxK76Du_Jd+dq3!o?1jOl331B*0Fk~{-zN9oWHlYfVmARp=hLn$-rWBHBI~(w{ZDU- zv2I?RTO`O{TJhJh&11{ZZ4NBi7_v`IyGS`2p13QMx3{__YVSQPTuTQ0)r%J;IJBeR z$#t*W&vNoJ-bG_~`O6%}Tb?nb5X&P(3y_Z41GEuF$+X7*0JQJ!--(671cQp={l6r= z)wsva9~F;!@@JUjqqtr{<>4e*54Wsi%`GhpHrQ6%C4`Flhf|(-t?n!trfim{ipx?Klb;K4H>_I%$H~?XB(h@{ofJ zPO9qR-<2>{FGhDR2R#~$sVAGhw&d)uEylxZAz8u$vV@(g2DAq+EM{BxE3my8#{gLH zbem9vPacNN=xxyoK} zkzT#~$zvZNlUUqcD;7jxSGX5x8>kp+O)HJvp4-tA^-DbsTm$+QtN#GG^$c{>h9ZG% zoTN6BYL_>(N>N0Ajf?0Vh{-`k(f9-n@sn zY@+sk(YClq?d6Z#++9n}AXR6TjY$Lm)c!*kZdr(czS>KNAmkaBfd2qw(X8GCxjth- z(R?d^#oR^8a$-I!>6LG0o_IqN@v^y7xs44J{Gbd4y`=5#Bx7!dMqiobm;pxe>~7i~ zY=Hd}f835@@7^4xi*u4a$2UJ6XtwjljrBJMJu1q?F63I8=1ylD8_!6X*Z}IGhydy( z+<9%I-Gx>xw(_$dQxlTl{H*HsJ-|CI*JOx$VFJXUtaK+ZNEL3F@q4@C zR-9AMgEy2?J^XS<8+v8k`l`fN6Gw3>vVs_F6#(nhe@tY?^rJExl5T)TE3kWVC*`A( z=g=paQr=kQ17wV7k+TN$gXfQV?H11JCgmJ}3*d4Dj34H*_fr=9z3S=is~bx$KaAmT zSXZ12pHur0g}$!lPStk9KQw5 zc`L3K;zzWDWwde727HW+pzV1WjdR8h<8igSFHS4~_?(Q2KThNWn)bQ52PJ3j;c_5BoEnZ*T)W&$KOx9oUpX=fTvqF@^c1O6 zo^;2T_f30?^15p09%Gj^cF+)jj|`Q1?pBB7!ZM##jVnaNbzX972hEo!8!3pj=nB=&5AXVPy z)glTC{Aq=Iwdl&>F%{w$ZQ@yq2ab6y!dq!oNZ`6Na5p~Z;}Y)L&tcrDHPa9ide_t|pgm8HJ%RSQ`=;DZ5adoyGg+U>jft@; zI6bTM&2Ap>t+AoKxmKZxO#xRbNfbGqx!`SkAEl+_(f!5n zXr@>IFY7XbeSJYb6eC<`-=3>uP{%$gv4{qWgFNpfvT5riJr1<#_I1aXxpc}$n!Er2 zBog-=nIou@gtC)Da>#$KGNw$6j8&L`f%>NIA^8erI8&+Ais3$?aq&_>OcLq=BY=`t zgzhxR_*14W3C1pJk`AKFSBe%dx6!x_-yLW?u>v5wQAGKq_bDv1qMt@|RyhhCJn>rO zOr*tdG+IXj+U}LvWCVf%%oiGI(;Ok9roW2kbUTw@sR_P6nWIxpta=X+PGbu{)TKcw za+#@QBBklH*RR`vku0PKP_RZ|!Ow|fpTrO{#4u8(buhS9uE{CAiOVsSFv^6Y&Wi4a z%pU6G3Xd96pJp4W(%VW?Fp>!YR@zak9V?JNSV0;}XptdHBNmP+qd?LwQv>nH`BxHf zP@%XZc&61meM-3xhsO(*Q(^!?_XR;3AH)8*gaS-yf|59l`-xml(Q6pa1#bSk~M5M{WJ4u+U~nkN)-4x_i1v$|3G&y+^BRXt4)^}ySfn&zfM zC5YK%ZPGa)(^`+VzF3i5R31siiyx|8?^hsapcT+p%dQ;*<_n^Xy1$#d+Mog!AwbL$ za;c%uJayZ}+k$){M+*Y-R~sb>O~Q-~8_kVtt~=Exg$|Mt(8qNwGD~j~Ttja|KGF`= z{sd=+!rbK&VjK*4E;9hJDDE<4l1*z7^-xloX{YhSc9MB=U3(5{*Jv3oA!*Q*4Zm>I zE}&DUH!OlC42LyJY}8s@-&{{I22euDxHfWAM6TthkB{0hv2I{6nN`e5R=8h_y0o>5JGX}B zFzQlA0wY~Kv&PhCx4&vJ5+Xt9PnA{zcBV@>D!7cREUhiTB_CtLtamc_1M$WfI%G_x zfo56)xCNEFbmMkD{a2EnB<=IaomX67?k~<3OwZZ{NG)7}97ZbDs0mM- zs_SwxP9kXS`>P-l3xdR!L6KKckrm8!#w53fU^HFo{6{{{u8S?2?Ec-J=HAZU#K|>^ zxJSB|XQDXBBnti_)uwp*542sJEk@CJ;7Mu$*D`Rb$=t+hGZj?sTiw>ToQ1?}wX=oU z6o9doprWw=AD6$!{k+ZzKP0-9HSsJhF)Dz*Z z-z<5}&5O4~#JltDMQSpLHA}Ae_O+Hcd&_eafHKGpGahHdOjq1(O{oaDkj2#7mZ116 z1-#{~s<#GsmBSZdr83*QLJlw6x=p7NaQ%buTp{McbRH_wK0A!J=B|-0VY^pYEoSwr zupm^BYAN<((`;?WYhZ3B0TKm)s6G6ZOW)m=fkw?yuP%kf%OCOZ6m9Efv8@ma^*Yny zapreBp>}^{TDn+M@ouX|-Gc#-RA(Jz;tPgwvfbP5ctuY`(wYD@!EJWrLPXYasO`We z&Tc@+p=Rbe1&UaeyXhv6;-BQk=M@?yNs?7*kAyoCEJFV z`K@5$&fyBi^4|gq+vo_-r(EzB_Ht@OnLBcR38eF)CyzsJ^4 zqMzyEh_Fq$mjgbBmuweYgM?FXR~Bd_zDVt#wj3m_RSMtVO!reT1}q~5w`S~yBAtOxw>cOEByt8Fv_g9Zx`KA;P;@>ROl0%}50bT~;;bBP zD>+#iR%N2H43wOx-WA5C#Qnq*QQ_4l{BQ~y%`Lp~r{qZ+?YK2HA%0Liuumz#fkF*_ zi7ds+M-9xWB$GUa=-3%PA=E>cT&Sv!bWI*6VBj7f$%@R!Mn_cmlQ5Ne;;l(Yi{V#X!>;*KV7efgiX4$BE6CtoFUf zrxz5e=^Q7ynVtyR77Go?B{XH*nkcSc6O3!69LT<&*(=`Z>F-)M zKsKP#sQcypBz%JUehx;;Yd>>vQ%(N>$^FB9$J+=j{;iveXldP**`3tOG>z#B!_sPS zM%09%Ff_yymz#j-K5OS&jkMm?*pE)ol$_}vuB;*`Jg|tXjBsBn`^%KPy5XeZSB8eq z+SlwY%r@wdIk`$15?PQ`rAXYQ)2PP0z^r5pgo7IK`A3OO+d}6=(IsnoR(u#x)pd&&>D~k4gn%u6LYHG6p<@po)SCjX9o}55u zCkpnerhB7?_Qx5+9?MruTinA_ThLo;dak*j^wv&y! zgI(i87hw{4iauPkRpbr8Wg1716?*ok6aG#|w&S?oL7F9+>EkLSCI}j{FcIfO6{$Lm zZhK^H&XJ78Pu$h60kg1jvdtsXEpL?!W z^v=*dj1vPepjfR;Qm@Rw5*r{f==PT9Zr+n!SjbVq!1n|jn{pRv1_7}+aW1R=;Nrcv z!SJ^+bFwwvnChE-YT>jYR z$L796<(?ahtE0!d%eH;di7H*9BQk0L^y)g}!QZ_Lmn3Z$tB1tL^6^zJ*fAbzek$BK zxtrP0@Q1r~4V~ZBEwIhEl-cMb)tdeI^y798#6gUt2=K@Z)&aEF^YLVJi@}L&@^v0(0 z;GLdkATZ`LNuZa;4?@l#p3`9f@wif z*Gy%5md5p~nx^If+FV->>=hVZw{kvQcq&WrQ}aUBD;U=1?L#Y#)!a)|li(7yCmAPa zJ>ZOOjZ*ynLo&F`T5?MSsMuU_w^xwfGOD9VXm%2+tSHpnM_!o9y|kX*a)jE1#+U=u zXzlL_u?wmDHfZlG3nVEe#hvt57Vt3)10s@G7RY7>SoEIBINr5@GK|E4=sEn8FM}Cl zLK$>_q2&1AZdrSR=H@OrW}0`jitr!%h_0qR_f#P66&2h(F}WL4wYC?`gh-UW?8M8- z#}kNd3M085p|%6iVaQQ)x&6Ut@^>vR7EHpkucdb%#G#E(kjIw4yR$O(%lw~+e}dMv zcI0U#)cuR^ci?&63zL($Z8+Pwt|V)B*!!bunlQ`*)M#|aq4w>~Jvlas205|fsqgOk z(2&fI3+R8{xo!QW%GrM5dt%!rXmsK94T4O4E zZ%R^`CsqgQTN0_>8kl6MT>k(aaRfG;Zz4pZYk6+%Vv{0|AgZ#O1E|v!clKupLe1KP z6Ce&m;78!Iga)G_kpXjvtp5P+T|jS8C_&T#naJbL+O+d-t1KoX%BCzw=T#Re)&Q(!)}x;o>?RR?=b% z;qpbT%GS;}cS0`ZV`{SQk_2inS0AV=m2&%Oj@!ZxHJ>Oo1DgoWj>ka2A5X%WV_w$w?%n{~FA_*_Xh%g>R-+?PRNmJ9`s2MU5r&R59ndMV zhb=NE7wm3tTyp_HE5q|joFg1olJZQXu>s+th}NWRVXoh|5k1>uQI{@?1Rn&p+!`Kv$-M! z`VQnk#yB8e2a-m3!7WN7H{r__=VnB>M+=ccn-jW1%i1ai%20#w!lPk{dMTOI11(lP zq?QGg(C*NRf2W29LcEm1Bx8yqCyHR5?j0?ro#l))@iqMc0 zD9Bn|@0o&{?E`WXN>qH=4=hCd%0&=My=p-_3k4%A{_*F40SPtaq;F7o!_`obN02#S zjTBUcn{Mf1DW~GDW||R+i8(0I#T9oPg(EXYMC!kpxrS@d<%Zn^0jO0BYD*!akh1{H zSgk=!v#yoX_+enFL0kgzK3iJ8s`&ZgQY=wv)E!0;jOeDBnw;}Ehh3neEu5>4+rQlYjpJKK}r5KWP1#`^#y{e(~GcOUB8@+*@&6wfqS*7I&{gC!JUj zKt*K?LE24m?RFEryY~CGHqsHkNG|$iI0ty@rE|uhGpxI!Htz{cd42%#MgIW*07AXt z`!DZb-PrkG*{JyM@!#VkPJfi+;uiL|cc7Zch!sE~C<&mc6~u3C-?Ol_Yj+@T11w09 zj53LpT)UB43MsTAC{B{)YZzldE>}i zvl;4n2(WtR{{RuptqDn)gSxHBKuXgg^7!JElVXP_GeKJDf2hEsS`nssllFXZ3zdhq zsTyuVK_JM4kcY^8FxCJjDT=EAJD?Sy^sQs^J8@)O0-Hs-jLpgK0{m}S&;?s9m-7G3|8wD z$VEfCpPow4d@Gh%F&5&M^LnypVxeXN6*4tKxvodY?8Els%}TDgX;k)3Mb=k=WGyqD z(@F=V05l)V7w&G1Nr*Mf<=Z5vTXpMcB8}KaQZpbVPc2%E!^b^Nm|cs}1c1TwJbPfB zJ4KwLla_llxUsm6XN}kA6f}BLweYV@S&sbL616bn>-Z#_I+{TeZ={;t5u;hVXb*Ub zJ1r?q!!QOMcLs0(hhdIrM0At_BdR;bXjuA}#B?NerYXkR0GOwGoK)8Kb9SX-7h;go zS51G8CL4JGcq7-TA6P8oXR3E)uJl?85^|+HHN}>VsJ$GenK@-3xMn5ebK6Cs>D+w! zbsroMxMVd9K4o?Vvp_BUra3?h2F+I?yLW)kOj8?)X*n{nq&P*|-Yv`aryyhmglK%t zI*d$r0%fJ%n{E_Vt}lm{>SJh^o`wbOqduU=sZpIVrM1|bvNpu&h#0>_!*frWx~`MQ z`#;=L*mBd^@z*yu9^bP|+oKB9tPH_Kk^@gl)`uQ~9@%=`xloD32LAw;=rT!_=*mM4 zB{KcAySIw*FS!W6$eRfsRI`iFbFCfNRPBtKk=Mr;f7UMR22ws?Xv2xey9P-23q&v& z6r-2n>il3R&x<~b0LP^WLCRN}t>0AU-mco{s2ktdO$r2=iMrXsCI2wrj| zyS%dFtYd;Ckzyn3+hI?8>?BJIi}G zuC1*tV}S^c2u*5RYLL?%-#ZhXPfTQc#^&9q$`FVGksSESzi~M9R<^d~A|y+kelAQFWmhxBiv4^*1I`4kH&GPvD2$E;YPZlCR&qyoHCh zBDD6u6@3-N)|RV3AVRR0y>VA7B{CZUqJfwPJZt{|v-^Z>*z{sp6TABatXw zy+8nKrE5y~VX?g?V}TvJl!kgI9A_X>_6Vb|)5yUZ4R;1U7;e*Y*F;C!OER%Ic}dN6 zi%ZKncuW30?mm`#5*is8Zbnx$kT4ZB(5*4-t?n&LYdc0-Oezjl$G?K6Ez8sr0l`?{ ztecfLXts+j)up3cM4*WKsTC?SAQBfkVz;+i{zk7W$}w@4rpv;r-QlIHLQ_s-f}YEa zOL?qhwdDB}OO;Ys7~qrCg;aldroAxj_R!ng>C)FHUW4=Ij>AfB50q2A55;?Fq+PN^ zu|+BmsCRG@tI>fK1Z!L?W$k7|%oq_@!k<*@vTQL%+WRiXH)%w%%43j(m9wpU^fc0= z7k1vmXdO-q8Xnv^DtE8T21vcZ1+}gErL6CI@Wwl`6$-$Cny^}fPaIJ9NL#mgp(7#% zPJIhv+)?e^#-Wm1YnPsOW`s^v34wGVoPYzaXB2F14CRB;if&pAm`LkkIDiu+(Mq)j z?!=6JWoxBrnHaurdK1tqChMe}Sywhh!<;^9$1gp}!|d1gfxaW#5_44i&Z8Q@9jUy|o8 z#RdLBp|zgQFd93R+bAr3Bxpy+t}9P{qSUR7C5k(HXPA-6HQ+cao>5T4ByTYiA+}}$ zoS__FlQ@$xh8EU}L5!7eka27Al%_7yIJc_X5Smdmd@|GN2cGIo16DX>>)DH}g zQ;k{fZEZwlrxXKK*AAq!nOer?WNLTTj<1s+RYKH^&2>0t-0HO{4EW=ZYM`9JkOw3s zj9h$@IJqqZibF>kA(lcKv~274j8@y)vm!;x9vHoIO_j+C#anLg9{pXaPS8{nQhhms zDgAM$ySi_Ji)?)|nDJJE;x6=ZpQzXa6{#VB*DTKAiuSg`?0=YBmPXmjSxMLCr-4W(? z)u-yRee-8H+dHdaxX3es8qx9O7ZCl;_Q$$?i^yJCay71RcB3xPhNnHE(zn&A{bNF<*DOwHbk@RDsFBY@dl+mp!I8j=QvKhR>)g=U;Pj zQCwNv8H?_}kjDjr`cgXP&gw-?I#UYXZlgO#Q7*2<24f@YL-T=7#&4%zqq@%w%21C$?|PbmlwqISYk6T z0&w^d!E=9c`>&VfqBGxIOwo2?wG&8kcs%EP1Q9oK(LBVlES268`F0eN!?qJ5E}RwerKZ8;g^bOD5cm zVim?HR@loO)g+ea2^OogEPV?3pFC`OV$;TTGOq?4ltAksjFS!y-;lJmvG79=Nt(5uG8&KQaNR_hUU~PlJ_CHo&puz zPP-R)a8`Ml zie{ZLPh>4xc}6ZxVhF(Xe1<>6@!Bv1;fn(hoh zBeYpBliybDSBZ4r=0+&kxOUSv!FH(U5yf=xdVomwE9}48Z`_Y&`^WbG0FnKh{mJenloyZ5 z`vcrs%g0>KDLsm|eYKo`RfsALK^cROMYOngGxaT2L}{E)?~Y&hL&S_QSo^zkvv6I9 zf8v&L6Z<#Xe&o56nD#^@TXC-(b}MxEmiKcqg^i_lZJ=ab!ip1?Sl$~*LBu?yv&;TD zhT?)(E?tcz^;HNxt0%qv^!Afo+1W2QDeT>U_Ngir-yWz?8iG8s%wo3ZY$tkCn0SHI z`EeXy1I;|#7HrcW#Y_AD0Q(Jn`)74%ytVk`c+OhhEA9`Skg86evX>AfD7$vmwEdyj4TX)V6DLr_IAh8FsBT=H$}=ILjpgKJ%15|j5)h}+x!2OFGSfqju@gJwS5^aq zkw7{m-Dtt`%_QXPnpTDbFl*5x3a{yvCn{34`vxoScE)W7^S^U;;E@@#oRW@YPY)D{ z5SL?2#f?bNdW$DY4J-EIuKxgBHsA+mKMY)Q{Z~PyKIKRpRIX%YqC~W0mRy4ZMrs9o zdSezlQzvQ;Cq9a0CdFIrq_N^H1Xhte?{XZq<;4S#00g9CAT!95TyNT)ovp1l!6r}U zmOatIl>-@ElggZeO~~EW;fjdBeY--ES0O;z>0D6VUU|`~->PhA5=)7na8&^SQ&|A; z*KR4?C%4f^lc_Bmx{oBz%d~AQGX}pXHR*4e7Z+ha*ArcsHgMyov0C11N5k{uO+W&Z%EjWg309Lx&1;h5%t zQF>@2dkI2<;u<9AupLsWf7by1kjVGk-~0ACs7i_I;r2=w{$#AX(8PpC&bW? z;f%ROiha*DLXjhuUD5BNg#`sExKk=)gbe7rUW%ZD?qae4RC-CSd0+%rO5>?*C5kJ% zdx_xsh!SNo+OrfA#)hpKWzBa0R-;WuCI?J`A;36s~Gd0v^JdqB&H2yjd zEOpJ)t_CZk0To`6+M#r%a{id8OCv(c#M42S;lj!&s1CWB=aIxBULfi#o`<0rh05u3 zc?3|$4Wx4_&ZoNXKv_Hh6{dL{Ub}KJ072`E@I!6oieD66*NJVBi%5SdPQIZ^RARhi zsDT{QNo-R)c)L@!)?gIvok62345&5B!w-*?pb^wn_k`r7N#l`jH%1SrvhHC)^AV`{ zV{hB{lNSNiPZYb>K#MCC*STRb+x<-_@%~UyJx0GVt!eSbrSEu&luY$B+J5|_Hv~12onsmk` ztGbH4I50=tM)t*2Ad|X5nYE|(<~(s?^bNW*zCT2`5hNw#&29n;M(Pi7SZLaj_F*@q zVNCN!5a^^*_VG&UzfkHPH3pSE7}xn>!UVt)JlOt!k_|!IB|I)AEw~t2NiGyoSbt3L z+h<$755WYBb4_f*f*FBH0jx^HaHg7c#qGFinjaLKg%NjhjT**VY?LhJKt8Vw7UJNL zW7oYEx?q#r!zI(CW~?S)gFjZe5BcJit5Ui^;#nM~BBj4*p}8?5nAQaVF73fc$k2^z zgWXCnxuj4IeVs+OAEHGAWjMqW-x49*X42J-vApl1uJ&TWho2aQ{{SHnD7537J*{0=)CSh3F77|ojq9>H#vWdLtAS+@_W>A+9&4#^ z{@q{O{x0T4xs7L*+&j#aGLoQ3RhEXEl#2Lc)O%mHTK1bVV)Sxb7FoNk(cMTdmU+2u zxnHQ{X5JP@cHHEaa?OydX4!Se%RRz(H(IXA*prSXzZI)#pwSAXZDzHSh89L;B{vM| zrhmsQW1CX8aP8Y9&|Lu~v>ns7UCFp?Vd>A|h0fFg#))y6DYy8^-q_!wJKNh3C7?7> zN{XJ9II?z=HqFoph{Z^_H3*Ycm|59T%&QYCR;r{b(>%!26~svZyB^uAk+=bDmA2QC zmu#y|u0Upyl(Awor8KXOHEr%B#4{d?gE%=Wg{-I|vAb)QisE7m!%}ue2c+gd7lt&o z2*wlCM2=hrUMj_jYLN|3s_pzAJ7dhF!^pdGJdMI9wsg`oy7;-~Bq~Yd`0AEe}7u%n=zr1VgA82v5u={7+KHagpo0Gb<8{y<)hE4A7 zvVz_6G|rR^HsUVsV`ehE8sr=p$NCT3{{X`Hysw_ouRFYSG3a;+Z8>Z zx?hDIjt<-Wc{L9`YVvgTS0X&I7QOuJyt`QF=b7r8{{XHRt8lss-r5dSF&4okUC$#% z0=Z^2Cp?Zb9vh*98j{pMg3`0LFg!wk!uwlv0$JsWV=Q+f*SI$38lxeuCui-NqpDI3 z!!@h+(UszRR9-&Z-B~{)b{GqBGcyE4$&CdEsN>O-{g~^4obqyL20kj3_U$6Yhi{Uv zU*2kR#crsov6#sq4@fi$bFR1v?sr#MfYF3mvIKWN9xF2Ki&orXNnH1s z1vTZmlki@$NWP}CX*QasL>%-wGNTWv6K)PE4Or5!SH(NWrXiI3_LrGd%cwt$Lf zkpnNc7~*h{8r*~vBof%I&BNKuvPWpqypcA+I1WJ|gl)MBgQwqyiF#AiBE*dA(6=@I;{O$GOQ>`3iV*x*UPOjk106PIID2D#np~0txX0- zxG71bWHDDQNEo(C&v#|X@o8f_zvW-TlSCtJ=hdnjWEgb^rZqP^OZ!;DMAC5tHF3+R z%p8zezYCHeWLIJKuMu}^#>4J8qkzQ~#03zrQyhy{3oL&%8kEdXj=1$6+pv|ZBXK6g z5HKUJ4)o9DiO=X@gCt4GprLv_ff7yz{9sHjSfgo znf1n%i>Bq{sJ@~4crR(a_V{mox^`O-TmGR@@m+8ChlrcI$IELiz0b6vitc}AS|Leg zfJk=*Gip_V4Mx|M7S~C{Z&jdGSWmQnx7hDCKo*@G>De0DN*^VKJV@CIszM`Doamy$Ie>b-|41# z1X0L{8G&I+gId!Kx4*f!o4_%4c7FBa@B3_S20d21qAWZmz2_suU2`%=Goo@=60)ET z>TR?qaNKCs7|`8rV-2KdcHFKINYx@*wWk{5;bM<(k-S6*jW7TzKh-}h&?HJ@Iv5s; zcW6CFQU*Mp<9>H+1vzu;n%&uZf2As};q6W`@7vK^-MB*5unVNPxEsPOgzZHGB1siK zc-`3TZtP$#7V?cxDzG>Kkta3iw&oX(jwP5b-26W{-pu0pTRVH+XOQk<1+&jRP2nJNoTy1)nW42%Gruzj8|- zEQqK(Z*feO-H;uiDIh&^AZSK-ccTHg6PWUrJOM59b(eE=Zd&ph*TMcvn(`L$^1O_3 zT*)o9taCCOuhng&g7j}r_5kE7ic+vQSA=9p0Fdtg036TBWbUr|P$X25h6+cAn;jxCFb!BiIj5s_dC0;gIWY3z4#+uU*qw_JvUwrE?kepv9?ft#0TjL00TpmAaMGJ+9WVY`4FOW*14a z24neUl+}0qGuIow*(-7KT@R=*;oh#1EMrFTSH>Ji8D)1XM*aCnhQXt9RyhF-(lG*s zNEFX5xV^fyV{c^03YrY-#rQ2Po%zb(4@^(sx@11!8Ky3NvEx3R@VOjPc^-&NqHm5xgJ4LCd{%euHP(Y zdxQkx5eTsn21J?@`-s7wNU^U5ys>>ZMu{PH8@AL?Poce zp70G{rv;%qzyKF)w&N|VJ*9Ea@$o9OfLfx;-Nuq#+r=a!(kLrVhaTqM*52P^EB3=k zhGSAo@yic_q;8v+gd}L zFPk=Cjw6W8Sif}J9#Q~HZk25KzD9e;o+g1=hWJcw3s6P|c`48RFjBTGSe&jnZ}_pV z+uT-k?;DZ~)#kbNuOlq-!s`PG6w!4gD6LqYxoeCI7v*w5h}0vW_VZmIfaG4@b(u62 z8>>pwN*_FWZ*9D7NJu1HxF#8PR_Efmff2&RAXVC5p%WdT;Cn;t50TJL+=yrKXq_iR8w>C!y%T>bl?<7RDhy*lzw(pW;tn! zHg*$@x#^C98N5gCBQi!~I6eVp+qxk1ps z`_cTHWXdc-p&0)F-OGXq%S5PLH)d7-50bNr<;Nnc9B?wp^$IEr1Db(>;$uXAcQ zKfOR0zkVFhZiKY?b5agZi?{b3mnXwowUpdbeMcX4-40S!JCl3}(nIw~}uPZ|KLvpSLngC1f#%aWE38Q2aVMP_grC?>u7 znGXK|oF>hy{lxB|15XUF7ccsUn|^3SbcDW14(pH0-5jx%EzmcB!VJhJlp(wLDKT^+ zn08f-OP#A+z#w(6LxG8j31z}{!^LWnPaWir_Qg~@kc`uD0E#zH9BO-XErTI&ojgWQ z+Nz%7QY>SSG$rtYCXhhilN*|{ttvsqZP0{C5Wpu|ax01s7}jXc!&0reVmUk3l-dTT z7464dY2lgZjL_9sp|Xw+I$Mz={Yap^iAse;ElB7Os=hR?HDR|F>>0V$`-LbToZpTr zxt^(kk_~Rcpc_Gs7A)I|$dN!?j|?Uk*fUUes+q#6T#`U#V$wA1<8rysR-QWjxT!fn z$hjrafLUbS_KGZI24P)|kf_ybkGwLvr^>8*b*^NQN*d+nF#WdRnKv3JyJ_OI zl6CHt2tAs4YtvZq8iOEVC+MPCmT#2p)*A))-CA1xB;qd8! z)Tc_-h-&U)4^#fQ5=tnJD05ooDNpB!Qncyu2N1btqPdK^ifdePT&(vB{o)ySG00Or zqws;ROg?X_sG`6rZT|o!Sjx_Q720C)BDDw01s^G)@LXyY!-L{Q)RW0Jaa$@&c;M{r zMo8WTY5@cNaj&r1dd5WI5DCe~YQ5XK8M9BALp0LGZDSpp!U%vf?qeQiuK90br^^KjWX02WYzqUMpG`~ zks=#-5iTQL(E<6fmZex4fm&*QRm*YH)k(&!sHBt1!5U=^9CR;2GkP6I!%R-v5XNM)<&RZ2ZX5!z$!Z{y zIPIht7V^IFb+`@m%!0KaE;MInM1X;Kn!g_INimy;G&~YJ_?aYm<&jB}k|NV4706S_ z>T#cbBui9|HBO0mun1^mnpj<y5!^xAK}Lg; z+FOV$!I-Bx;{Bbzstf{rF7aIhj=Wwv)+>oFH(X3gw&P5P;>+&F=F;HX+Y^+$$B)ew z$r+XyD~-*?rRNy7v0lk>cgf}@iD^kRDoN>29D0dP-TMLpWX^exJUTMSoTUl7P%7s$ zJ(mS&yhW?8*05K)xO8IAw<33Fr#et$Kinl}V{7>EZFD5Dt8>XknNIZeoHA959#T0j z+H1+3Vnw3mQVNew+IZs=Z@Y=Ps^Kl!o2s~AS)#1z?(RnN!qUdt;H{)`)!`J}q#Afs z5NHLnFWcUT(cPUcJD%4Z$c2G7d(2N z3W0$aH4~bx+Cgq(naFBprj13~PD4!2F)Z4Kl1jW}U4q2%UBnM*-6CdE4QZd@sqj&) zaJ$y7N9`mEeqIT%m{x0URvVzP(f*>+Hb|tP1&j6bq0+dw{K(y-9Z>`W*YM`8Sb>Fd zE2h|7O$Qc>YXE_xRQjo;1A9B1v#2C|F}rNa78(&|0m;OZ+a+$?!JSK|92dEHA8$;& zuMf!2XUfKRTi?MaY$%~t*jGB7#c-{z@a@4MxjcT-I5uka*bBjkqP=mvMVI)i&v|k_ z>$l`Dqq&8p_Tz_&?r83Fl2au%9fZ>_JbF!yuT1{{B6Bkg{2B6>J``#!ebnFkVlB;7 zJ?(t}u;ZoTClh;eWbGs_${gM1)2kpP&}27$A&S2HyZ+1#vJI0!9~oxj9;XDYrIW0Q zeZ%FGE=C&e_VOjJ?&%7!M^BUN>C(9IV)e_n2Rw%bsBFXq))C`RaV)Y;2Q6-pBnr~D z*MZdn0*;^-D_ph5vp2`{K{6AFh>cBRS*S%zWV7S8Yb?YUeyOeBw_m-A@vc43XghtX?YvDZ0%a#kBy4R%m;1RO$dk# z)K||ed0p|_O7xAmkpbXO{CEdj8$mrIQLk)QOX0o0YcCUT%G+8`BSUGr{Dj;YGuon= zji);6O>w)o_PcW1M*L!2N6pM+IWg~K=x$7Im=ZCfW5e+`7EwLb;7ILmWA2a*SkU@t zy434TCuQx|EX3ToNXS1vRN}Sgxs3dy5U0BLKOJ=&@oi=yAOx}u0!$vehVoBbTpsUY z@HR{vD7_^7)hqTV4?FeXxt}BM87w8aGs?EH%8ma3Y!2~3mTYTQuA>=J_bF}WbrBFo z82otg3ny`GTohbd?sCFu<$T?krqXg1&{HgVNlcJrb1JRFR#nL+W$pxWH;U96oX(*2 z#cgCzW~<7fFprm-V<4J98W_r}$(YPguUelBU5@rreMX>X^6IPlZGb?v6{Ckdb3bHz4E6Q{{CxcNvK6VzjC+4sj$v35G)HUu1`KG_Zjo?#u>P);R?`EXqp;`%ND z&7WnG3y9ham+mufOqc*oPDX@de|3605^ZT{kYZ{}kI7Eho4#kLs6oTZg29!Q!1SR% z+BDsagSZaiirBFtM+CxNVpND*8H3uWDr2QV2UF%oD(-iZjC4PhZEa%Z^HvXOUCPoi zH4B;=k5SB0r=~INyqx8SHSc|+aMAVHgw42+1ryy3@9I}@z)|w z^6a1vn1_)V85{xV2b;Nk&F-5^DR1S1SQZ&%s@jU3i7j=Z`*rJ#z3sbxu96s>D?u(j zvr64W+>W7!bgL=~@pE3YNd!Vhfc||{6;PnmH9T=v&AXS-faHx-4s+gpVWX@4;s zO~u6qARwwAkmpGXz$Zn5YN_MyD@^G`2p%BOO^+;tN50dJzm^+V6a}|?fO}F%B&OB`u5DTYo)3R)-<7*IVnhZM zr)+vHErrNgjIYlU9PwWj^fyusB!Sf@UP~%HzGMFSyma~DHNrW3D^V@NojOqx^|g8Lp;_ zkvDfFl!YiQrBbFX1qv_+a)Z~d6C3h{{{T{EfM96d+(t_-{jn%%kBC|=rN=*Q+_aV$ z+SckeNTrgpxVe3*p-nf?inTsbt}MpX_s|B}sFT*G%yZ+b4ob|l@VoW!T3 zHV)@5*{Vg4wybSil;m!uk}KXe=^6`(=wfxxdIcYkEVIQ;kG9&iE0?YkB?$&H`$)_; z^>C`MyVPSCz&Il;M?Q;{&uLaeO$ndm(8u9(30X5H2vSx~T`k^Z*&;I#Ij+s32i$urJ;@l38|z!R?wU|PE`6=)1R5^dtqpugIGvWtaWUNCEl%V23=c2WSe?-)w}@tL z3#mo>hbJL*$-{9Cyu4>4bT5M2Mv$`03OWRhRYL5eoXX?TZN1jq?vTSpbhbSkFnEYD{;_4{En~qlCC^FnMbvE(EAIgKw*Qv*_j?``J8q`;b;M7@Xc`K5t;#}u7 zabs@HBW&{aOW$FnAq$?lk;f%@eCfLxXFkNTbf4AJXx&49r zf$zI+dxf>N_6k_Z$#HkLYY!!SFJ$b-wid(|oJM_8Z6j#Mq}c3D+Xik)FN9oq1Nr6q zK_74R8Z3>@?@Yv7$2?`(YF_ElFnn;7^8_=nqa*%QX`^hALZ{UE z=p^cawlJZn(xSI|>zPT5V3ipdPzrHcn?yF~#P*9RL_iHr-|nV;ayXG>Xa^42 zp_JURF4`Gw;Jq~O!qBWjMQnj$D136yTt3t#2v0E0PJe=2h$L}!yof@9w22i(2+oW% z%zv&5aV^chD}k>hM-^(bJdW`cW?k+h^niNie0;RSc2)$*BsWTS`XIYDpj+NfDfx&I zq71My=3753@LP+tsHmV(2=G;xorx*9p%tYxX0DjZGdL%*T5cIwisX&BgOz#=SJqt> z1}brSRE04HiH`6HtwlUe2wozMMcRB(mRFsrP}_q-chHh*I^p&%=#bOZ0rLu!>Fy?Y zn&R42N)fpj2PAa^7yU_)WfI>MnJ}RVS#sdJqOzj^v{9aY21b}bG$euB=z>ym5LZn^ zNm&4fLcoriROyPBO#x~ZY89f3jb(yFmDjo%!mMVx9Z!*_2W=q<0z=hJz({0$;s~#< zh>W3G3o5RgNT|%`{ANa5eh465ApJQXfw)!oec(67(t1hQ5+cuB%P9= z%FN0DB7{<-sqn`cGgTp(8ya`Y%NqufLEN8-YvJYLhekT;G5Db+u|P$;ktJm@y+W&;hmo!-hk+ob#x4?@*p}W>zbdvsj;Ey$Ojf%cB@}9vvw=z| z1waOar&52OD@eM0Vg?9zLAkUv{9Y%f0|dhesEU9qUA6g-LJx*GNd)bH9|aRLR| zl+y(145B1yS^zyYz@lQbXVajdulyWADnM8cbf92!>(>xe_bqA-Y6UeUpAMDBE?WFf zdgqoy9Jy-M6sQ!gWMT^Cd9mY!v}TxW3+u1obC5I`zh=g&y%b7yWnr-P^gxH2Q5r5z~Z4WnU< z)%SjX?z;9q*WTwo=RVJKcFuh&-X1-@^y)X95H~CM*e)%-GG_7X;WbG+ld9>@q{hOg z)AGhEjYmgD zH|4icez21cDyRldF+`=+cx#T-|g(`%TvsiIyYe}!(I|H-TL@l4n3^t{U+FBhi7E93D| zbdk3wfvj(_nQs4;XBR7-OGO}oB4P2nG5*zf>TWP`b9q|?{U-Q*ckWrtyE^fo78kF2kCvIjC5aK}wp?kd? zmRVI+oC>7HQWo+cy~imXwlqI#c^o{YyX_(D@10l6&A-N!fK!p51N9w*nSXzpxB2?3 z5tqjF3c|J9h2!M;o&PY*lC4xIMy}oCDWbv1(N4MLc~33^{4B-o^>GX7jwNI#v@lpS zy{EQNi>K!Cs`py0j0dGzWK)lK%Y22|N(FVQRJB6a?L{Rcjw{+ozo(1%nSCc_3C0#l zkC=#S9dBk|hPh(8Q16yO!cO5%A*yCO+H7vj$b#zv0fn(KO?F+Mb9fb3kFKCRbA{z= z-WQSNpKpIM7vyQ(cr5Svgcd@BUX})^IJ2ct)p-@%ZZV4@8b^0hO1Du$)`TJj;v7$Gkug3 zFioN&`nF6f=Pw?Yj~7Qx#mh;ImD?w`>fE300Py_P!TOCJ{=LU`V}?&EYb zmHi0CRCxnVm+l!?)1i>T!+&#L)mKdFGW&bfLrwY*ue1$l>UyI~o!uO73P8kW*I4J{ z3uA5S$snQHDh$nKfEwhguu!zC##R^=o12@U2QF+ZGBtJ?;qq0rr1|Kk=0JXVety|6 z41-i_khoS#$rLyLus>s8Z`AbILQLmPxhM$wPK3*Mi`za=?nWzW5CiRH?wnORUbT$n z=6?UwPNBJor@@DMZBJQa8yFFAZXYuA`!V%fjh-qYSl{YEV^Rz#$2M#3WKO1ah7Z-* zAv>%0h^@-uTjSk=XC+N(OB#WkD-Fb78^=R$)WRt~GR)i@JKWiRvFF;C?)83^406jE zOIdZqkIxG;Ybr}n(Fn&!gqkbgdwGxMzAJLNjpoa`?laq-li{@7<{6cvm434Tw_AOW zcg!+{n=)xq_6nxF3UadG8g3N<)91wRMPFke$-P=56C`jJ!(}FiEVul-zS0U;u6a1& z%8$5zoz4ZVZ7D2ui@6-JLXRo55e1a~u3FcMuf1U4d?*p5=qNd#IXHc2F>0q7?f!?PN-Q)nTCjeAA0G{{HW@xprM^s@wVKn zQxswWUsdfi9TUkx#ebk=sZ^jjq4n~Ggz45T1~)U3X6Fa}l< zzf>$t33P=M6g553bXCQx>D~?WwppZqq4Tq>4@!8hD5y?4XQa~xxcuX zjo*f>Nr;G(mM!jFnRs9bH~LutPqgf;al%BFqw+mI;zB;r!`JW@&Y7Jt_EI(p@! zS$dY8j@ubLDF5Vz*R6Sh>kfAM^{?*T({{S{P(Iu24Q}H-bBRe(mCq?=?)MF#;SsYN zHx}WecPA~XlfFk@ogP34LO);Ut^uo{P?6y;Y;^?pL-r zD>T4H8m$|FKD9)0F^7*nOSd8B7C8N2p=k`!W7w(?e{JU_EY{`80qQoOhu7A0D>etB6)h`VYr2>vSgYKJ8eE!ZMp#adnTDK9$PK6 zCY=A7NDa3%8J04xAa;tgod_f4Yp_=M>)j)rbvg>JdIiAuJ=$1 zxp2Q+^O~F7@nDHxmRfss2{y+BCoycaxKjnV+1AvjtlUxOz7t>l;5&trUQ~{(k6%iw zAoDYt?@-G2WQ-M_i>=4EWyC|vwc9bE!LR-q!t2&Tb(t-M>v~jLVS)nn*?+Q0Uu=z+ zy9CMx7chM{3$^k;y(0ux=M{^J=79QC~V5Q5-* zY*guF)zx)mwF=)>9zRb1CV20O60y>$n2wwwWX^ zfcjG!Q{ELSh!@QdRo$4L@6kSS8|~=UTJ)24jp;vVLNvF;hMP=M607MbB=4t*8~xnq zCOW=+)1V8`V&t|2(N)s9(Dqy9>d=?g; ztIS*?AkOQWlz8U<0EuCOwHqL;rL=>Wd3YB)rPWhpUF&}ZOB1lD09EFL#GM^p-~;G1S!ddqwdSy+D;c(Z*uqZs8@>>zM%RIn~Wa+oIRc{bx25) zBZK16`tbn)cr}cKLdT7W%_f)k|E)+zX1+32SCq2_d%Jb}UAlCu7)P>5+!R}ge6JyE zlAQggS=L)iOd)a5OYex=pNZR8kEb1YhliPaWv&MU#%fmv znHm-U!!EN32YH3xWXB3rDlE}Cma!GYjeFHtww}G=(_Vgdg?{Gw=;|<#CWuY0=l*Z? ztscRAyF0?BXg;m|7v;S%4e7N3pT2m- zrIvYr{=V?vZEDNr5*lTD(UW_6I=;a_iBry)mUp!cXiTH1eN}_>SWJKHx54IDiuTmW z`W1q~_x2Gtq@ooT|Gs{&<$h^aqAr^5U1jcxIW>X{E$-_RX&?)e%Cdb z)@0by$DffP)0S;DrYqih?^l_S5asg`frl;WcSLzhmB0RWdzz+hDR z{8JA!i}dCZ&Cm*>IOv4fax=wl6b-tqFA8COQ8)%?bKG4P%?G2VDj%rnKzf5O^KisM zHif-Uqo2nu;B%5n^~tf2-=3?DQ&_I2gWmmG8|KmSx-3RgLn(7_6FK~CpIo&{_6o2c zRy6JrkbKpJK}gGQw%zI&E3mWp#}=3WX$Id~Jx$C}OdW7p!F8+N-tCt#uQ}z*GRjaE z-)1xQ_S9FMQ+`xn8gEqB2&uPaHkpY`aB@?rNHZOHxyrE)W~l;!hbZKz;?mz;>nIx2 zin!@fHs0Z&l;c$}&b$WJ#3^Je;ph!{m(Gee?<~59YqT_r~QQwAb)MD+E{RSu=OpO)Z7{a>2a4tn+FoSDnSNFvu+U^;)pNxH)Eh1t&rmx>F@Tv&kuXAu% z3|omzE9hY=^3qxXnKsvQ`0G6zkghQn2=_heNhE{JIX5R#vfq^2UK4+v#ZjM^A1TN^ z$h1v3de}g$=J&)EH3=4f8RTlRETgKER&0Vjc-?$;M=!z)fvihTK`c=28(Dwhkvci) zl(}W6RQf9Es@NNcaFOvVelof`Otq}1nYqkUDJ~M!=i9tTLdDAOobC($tc>ZY)VBZy z{hY{a_Dc0UG*L3)a5JfT=U1lvl2X@!emtsOcJxD8?`Xhx<)hz++r!4m>A7YPe0OQ@ zzPXqB=-T9u!tesgis@EeYR*9+Wjj6j=53-!QD1jsw}icx-l}{G!}P!9@w5@o zZL_zBUESR{HpWF3O`-VQ;vkLEq{sO*?;$E>L7jXsv^bo-hF95?8^wRMilueu{+KiR!;P!98BTY<-AnftQs+!T@KYiRzF+0L&c7=5HO7_T1cnwhzcbSIbV35+RrRJ^pk;XTmzeD$Dl4InThJr}80?^$)q^ zo4DY9OIG4Fr_%~f zh{-oejI_N2pVyEoa@Q{4*&_^O(CIhNe(5C~TWSQ+fXJ8QJ~gp!ok~J-I|kb?rc0uJ zbdfYGONNjKOoNx@04`du0qwoJCg0dDN>Q~?^UB>YXoe0^XFE}e)Q0unj1DSp>uNH3 zl1Tgmj1~qa+%Dl@q#0rW3Ya>-Hp0|+o=8ZGA%i|CF6dn-2AmNe<9sJ~KQJ}==rb}I z*pWe)W!xDd$dPbl7y31CvHPxtKWTEQ@R)BJr|1Shd$Tb^2JuM{Ah>+Z{b3_o6572G zKMOejOW0~=e!EkDN##!8)m=#NAk|mI_q+;DV^@dV-n#1uOz= z5QgM{z?}hC!p$f+!S;N8=JfJs1L=8!v-1-6>T$@@C6uZ%BZ|rsyPlwa)IsY@nx5ap zq52C7H+o*8{<7lPzl<}TXDoqt?=}+(b)bA=a(rmG?lF$YLc1Wx7Pt<50UaZjjPFI5caA2;7J&dT*%VI2zv&!-@PGmB5ShlLx$BkEg2L` zy9@lp;}CfHF9OMm{S3N`!~y?O#h(rCuXpgG34)9-_O1fzA-f7v+a&ZU5)W`7(E7H6 zp5r5fW*Oz%2~d~>Jy8CEQiyuuZ5f?T2H7*=56*9dkU=7YWKcO^b3p#BKBz?s0kU`ra z$ifo<0GO5ua9OMmSfAh?wd(e}$E&~DjtkR9f`_1qXPy3hK8Jh3{zXuSSO1*CtjBgQ zL!pV$^O48|6aTPQ<~z|rm6kBfApro1)G&Nq6rzKc@$QWMFKxHVvm<6m5%Mz0-X2f(Ha656qY#hlW2We z?Z&Qpea{=;RH<3ljb1v{x`3b8kU`DFyF}|$rDNFTKa;|0yfD_rv#VvdKM3IDhL(oq zq=k@rzVZ{MjP*%Ejuo%TP|F7hrmLQQ(lf)I4R(HjFT}Mwk~o<%M!H6LBY|4#zM#RX z%`^43^Xn0!(Zpfojt>z$2|z$_j57+`vQ01{A(h>*bHP*ae|&hI2IOp5DG9kt`hg>~ zLbgKD1S8TA%uk`QQWU^cjI<}&p(_F~sF)%QOMCiw_XKAvPX--}qp@L2mEisdn|~F* zmO!77L9PAAutq2j0k~K(;9mW*p^Li@4lYhQyeEOjmo{*;J47TnBLRYet@+!}_vp2p zi-H@G=UQ#zB)DY< z5gnA6Mh3ZphcA<1O+?r0Iaab^2L#n3eEYguDDf{p22oE2;Q&6GCtUh;&k~Vmj1WWn zh^=yIxDX7C-+}`BiLL~Q$vR4=jMx;4=DS2*Hj4elE_-Yr8zMu2-o%VlB6Ow+2Q$_` z2@JrY<%yqwSZ!h}2GIxX@diqG#06#vvtHjmLVc-DaMmhyX8?Gr=MpYEu|87?j{*an zf2?YCF!R1fv9rZ+gba!X4g*T-as;?LU4gcCaL`lpRG2sCzb~vE3lM!`8@egS!<$fqjg|Q~z1o0l= zS*NE2=nSU!-|qSA@UH6zmB38S)uL~xfhRE&@ih11k_uw)5e2FBvWr~gGl^F-Ao`e)`OlUX$ZAr;{ z_#h38*DV~n3<3NIx*b1=MDq|^>{6K;3vMmpb!0AK7`Qe3`Eel3PwX!l)Y}$47lid% z%>W;(maL(O&D%3CefbWbR<8=4m#eR~^#EhCETIN4iOlbXI9kKoic_BsrZdhShbk(- zDg>|#o+AybjW)jkvs=;`)5%`PH3y=jXM>osINq=(!5ZANH~4-Y?Z!4lg%0MwXLnE( zc_~E-lf4>hVBR6Wid--YYmZ)=Sa*f)kTNG`Lyu5ZP`+Q~FsW(u=`X;x48!DndUlZx zDAt&t*2Fz{`DHX3h_2iMuytAVd>d=nB%dH@$9fzmh?5$1j%yh?=6=X7daH_F6gkEx z(uW+Wgr9a>bcwb2zR)vw$Lf*_hr)Dft+(UOk$n(#VyU+3CJe3w$R}FCXKpri7e_G! zAm@NcI8^|@KQTywr-ix2)}N>@!uCRRwn^XSU>m!eE1w!*N3O3ww1<8*O2paysv}Cz zY+6T?WYzF5A}57;B=^yq1|Y`-_MTs zHn)P+K^0>wyKcFMeqAeOd^H{dk1RkIPFOrJ@v}4iF+m(cf_L~PaF0200l3$&mfEnG z1bRc<(i*{9WUz9Xlqq(M>7e&T0T6}ySZ7;aZ#QYH$0vFz4;j=Wg@Q=MxG+l?(^-ev zZ{K~Ckk=*u0m<|D6c@H2;u&|(CiNezCe-KuP+P&!n#6vEMEu}On5h&QGz8J(TjNn3 zHcgy0Oaz?t2nGgDZ9stx;I9s0?ocKac!caO$zTp_dXr~cT*15+xR~AId(V3qG4z0dgl6|Aug)}agguB_DN{waubaF_kWs+4*CE9 diff --git a/platform/commonUI/general/res/sass/_about.scss b/platform/commonUI/general/res/sass/_about.scss index a676018961..a95ed0cd77 100644 --- a/platform/commonUI/general/res/sass/_about.scss +++ b/platform/commonUI/general/res/sass/_about.scss @@ -43,7 +43,7 @@ color: $colorAboutLink; } .s-description, - .s-btn { + .s-button { line-height: 2em; } .l-licenses-software { diff --git a/platform/commonUI/general/res/sass/_archetypes.scss b/platform/commonUI/general/res/sass/_archetypes.scss index 432566a1b4..d51944e2f4 100644 --- a/platform/commonUI/general/res/sass/_archetypes.scss +++ b/platform/commonUI/general/res/sass/_archetypes.scss @@ -121,17 +121,16 @@ .l-flex-row { @include flex-direction(row); &.flex-elem { @include flex(1 1 auto); } - .flex-elem { - height: inherit; - line-height: inherit; + > .flex-elem { min-width: 0; + &.holder:not(:last-child) { margin-right: $interiorMargin; } } .flex-container { @include flex-direction(row); } } .l-flex-col { @include flex-direction(column); - .flex-elem { + > .flex-elem { min-height: 0; &.holder:not(:last-child) { margin-bottom: $interiorMarginLg; } } diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss index 6ad315f61e..2dc3bcbed3 100644 --- a/platform/commonUI/general/res/sass/_autoflow.scss +++ b/platform/commonUI/general/res/sass/_autoflow.scss @@ -29,7 +29,7 @@ font-size: 0.75rem; &:hover { - .l-autoflow-header .s-btn.change-column-width { + .l-autoflow-header .s-button.change-column-width { @include trans-prop-nice-fade(50ms); opacity: 1; } @@ -43,7 +43,7 @@ .t-last-update { overflow: hidden; } - .s-btn.change-column-width { + .s-button.change-column-width { @include trans-prop-nice-fade(500ms); opacity: 0; } diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index a07a7d6e56..5550a9019e 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -43,9 +43,10 @@ $ueColMargin: 1.5%; $ueAppLogoW: 80px; $ueEditToolBarH: 25px; $ueCollapsedPaneEdgeM: 22px; -$uePaneMiniTabH: $ueTopBarH; -$uePaneMiniTabW: 10px; -$uePaneMiniTabCollapsedW: 11px; +$uePaneMiniTabH: 22px; +$uePaneMiniTabW: 8px; +$uePaneMiniTabFontSize: 8px; +$uePaneMiniTabCollapsedW: 18px; $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; $ueTimeControlH: (33px, 18px, 20px); @@ -73,7 +74,7 @@ $treeTypeIconHPx: 16px; $treeTypeIconW: 18px; $treeContextTriggerW: 20px; /*************** Tabular */ -$tabularHeaderH: 22px; //18px +$tabularHeaderH: 22px; $tabularTdPadLR: $itemPadLR; $tabularTdPadTB: 3px; /*************** Imagery */ @@ -107,7 +108,7 @@ $bubbleMaxW: 300px; /*************** Forms */ $reqSymbolW: 15px; $reqSymbolM: $interiorMargin * 2; -$reqSymbolFontSize: 0.7em; +$reqSymbolFontSize: 0.75em; /*************** Wait Spinner Defaults */ $waitSpinnerD: 32px; $waitSpinnerTreeD: 20px; @@ -136,8 +137,3 @@ $dirImgs: $dirCommonRes + 'images/'; $controlFadeMs: 100ms; $browseToEditAnimMs: 400ms; $editBorderPulseMs: 500ms; - -/************************** LIMITS */ -$glyphLimit: '\e603'; -$glyphLimitUpr: '\0000eb'; -$glyphLimitLwr: '\0000ee'; diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 6f2fe22d08..9d3627f3aa 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -22,18 +22,34 @@ /************************** FONTS */ @font-face { /* - * Use https://icomoon.io/app with /platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json + * Use https://icomoon.io/app with icomoon-project-openmct-symbols-16px.json + * to generate font files */ font-family: 'symbolsfont'; - src: url($dirCommonRes + 'fonts/symbols/wtdsymbols.eot'); - src: url($dirCommonRes + 'fonts/symbols/wtdsymbols.eot?#iefix') format('embedded-opentype'), - url($dirCommonRes + 'fonts/symbols/wtdsymbols.woff') format('woff'), - url($dirCommonRes + 'fonts/symbols/wtdsymbols.ttf') format('truetype'), - url($dirCommonRes + 'fonts/symbols/wtdsymbols.svg#armataregular') format('svg'); + src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot'); + src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot?#iefix') format('embedded-opentype'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.woff') format('woff'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.ttf') format('truetype'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.svg') format('svg'); font-weight: normal; font-style: normal; } +@font-face { + /* + * Use https://icomoon.io/app with icomoon-project-openmct-symbols-12px.json + * to generate font files + */ + font-family: 'symbolsfont 12px'; + src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.eot'); + src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.eot?#iefix') format('embedded-opentype'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.woff') format('woff'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.ttf') format('truetype'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.svg') format('svg'); + font-weight: normal; + font-style: normal; +} + /************************** HTML ENTITIES */ a { color: $colorA; diff --git a/platform/commonUI/general/res/sass/_glyphs.scss b/platform/commonUI/general/res/sass/_glyphs.scss new file mode 100644 index 0000000000..876cf36c0a --- /dev/null +++ b/platform/commonUI/general/res/sass/_glyphs.scss @@ -0,0 +1,212 @@ +@mixin glyph($unicode, $family: 'symbolsfont') { + &:before { + content: $unicode; + font-family: $family; + } +} + +/************************** CHAR UNICODES */ + +$glyph-icon-alert-rect: '\e900'; +$glyph-icon-alert-triangle: '\e901'; +$glyph-icon-arrow-down: '\e902'; +$glyph-icon-arrow-left: '\e903'; +$glyph-icon-arrow-right: '\e904'; +$glyph-icon-arrow-double-up: '\e905'; +$glyph-icon-arrow-tall-up: '\e906'; +$glyph-icon-arrow-tall-down: '\e907'; +$glyph-icon-arrow-double-down: '\e908'; +$glyph-icon-arrow-up: '\e909'; +$glyph-icon-asterisk: '\e910'; +$glyph-icon-bell: '\e911'; +$glyph-icon-box: '\e912'; +$glyph-icon-box-with-arrow: '\e913'; +$glyph-icon-check: '\e914'; +$glyph-icon-connectivity: '\e915'; +$glyph-icon-database-in-brackets: '\e916'; +$glyph-icon-eye-open: '\e917'; +$glyph-icon-gear: '\e918'; +$glyph-icon-hourglass: '\e919'; +$glyph-icon-info: '\e920'; +$glyph-icon-link: '\e921'; +$glyph-icon-lock: '\e922'; +$glyph-icon-minus: '\e923'; +$glyph-icon-people: '\e924'; +$glyph-icon-person: '\e925'; +$glyph-icon-plus: '\e926'; +$glyph-icon-trash: '\e927'; +$glyph-icon-x: '\e928'; +$glyph-icon-brackets: '\e929'; +$glyph-icon-arrows-out: '\e1000'; +$glyph-icon-arrows-right-left: '\e1001'; +$glyph-icon-arrows-up-down: '\e1002'; +$glyph-icon-box-with-dashed-lines: ''; +$glyph-icon-bullet: '\e1004'; +$glyph-icon-calendar: '\e1005'; +$glyph-icon-chain-links: '\e1006'; +$glyph-icon-collapse-pane-left: '\e1007'; +$glyph-icon-collapse-pane-right: '\e1008'; +$glyph-icon-download: '\e1009'; +$glyph-icon-duplicate: '\e1010'; +$glyph-icon-folder-new: '\e1011'; +$glyph-icon-fullscreen-collapse: '\e1012'; +$glyph-icon-fullscreen-expand: '\e1013'; +$glyph-icon-layers: '\e1014'; +$glyph-icon-line-horz: '\e1015'; +$glyph-icon-magnify: '\e1016'; +$glyph-icon-magnify-in: '\e1017'; +$glyph-icon-magnify-out: '\e1018'; +$glyph-icon-menu-hamburger: '\e1019'; +$glyph-icon-move: '\e1020'; +$glyph-icon-new-window: '\e1021'; +$glyph-icon-paint-bucket: '\e1022'; +$glyph-icon-pause: '\e1023'; +$glyph-icon-pencil: '\e1024'; +$glyph-icon-play: '\e1025'; +$glyph-icon-plot-resource: '\e1026'; +$glyph-icon-pointer-left: '\e1027'; +$glyph-icon-pointer-right: '\e1028'; +$glyph-icon-refresh: '\e1029'; +$glyph-icon-save: '\e1030'; +$glyph-icon-sine: '\e1031'; +$glyph-icon-T: '\e1032'; +$glyph-icon-thumbs-strip: '\e1033'; +$glyph-icon-two-parts-both: '\e1034'; +$glyph-icon-two-parts-one-only: '\e1035'; +$glyph-icon-x-in-circle: '\e1036'; +$glyph-icon-activity: '\e1100'; +$glyph-icon-activity-mode: '\e1101'; +$glyph-icon-autoflow-tabular: '\e1102'; +$glyph-icon-clock: '\e1103'; +$glyph-icon-database: '\e1104'; +$glyph-icon-database-query: '\e1105'; +$glyph-icon-dataset: '\e1106'; +$glyph-icon-datatable: '\e1107'; +$glyph-icon-dictionary: '\e1108'; +$glyph-icon-folder: '\e1109'; +$glyph-icon-image: '\e1110'; +$glyph-icon-layout: '\e1111'; +$glyph-icon-object: '\e1112'; +$glyph-icon-object-unknown: '\e1113'; +$glyph-icon-packet: '\e1114'; +$glyph-icon-page: '\e1115'; +$glyph-icon-plot-overlay: '\e1116'; +$glyph-icon-plot-stacked: '\e1117'; +$glyph-icon-session: '\e1118'; +$glyph-icon-tabular: '\e1119'; +$glyph-icon-tabular-lad: '\e1120'; +$glyph-icon-tabular-lad-set: '\e1121'; +$glyph-icon-tabular-realtime: '\e1122'; +$glyph-icon-tabular-scrolling: '\e1123'; +$glyph-icon-telemetry: '\e1124'; +$glyph-icon-telemetry-panel: '\e1125'; +$glyph-icon-timeline: '\e1126'; +$glyph-icon-timer: '\e1127'; +$glyph-icon-topic: '\e1128'; +$glyph-icon-box-with-dashed-lines: '\e1129'; + +/************************** 16 PX CLASSES */ + +.icon-alert-rect { @include glyph($glyph-icon-alert-rect); } +.icon-alert-triangle { @include glyph($glyph-icon-alert-triangle); } +.icon-arrow-down { @include glyph($glyph-icon-arrow-down); } +.icon-arrow-left { @include glyph($glyph-icon-arrow-left); } +.icon-arrow-right { @include glyph($glyph-icon-arrow-right); } +.icon-arrow-double-up { @include glyph($glyph-icon-arrow-double-up); } +.icon-arrow-tall-up { @include glyph($glyph-icon-arrow-tall-up); } +.icon-arrow-tall-down { @include glyph($glyph-icon-arrow-tall-down); } +.icon-arrow-double-down { @include glyph($glyph-icon-arrow-double-down); } +.icon-arrow-up { @include glyph($glyph-icon-arrow-up); } +.icon-asterisk { @include glyph($glyph-icon-asterisk); } +.icon-bell { @include glyph($glyph-icon-bell); } +.icon-box { @include glyph($glyph-icon-box); } +.icon-box-with-arrow { @include glyph($glyph-icon-box-with-arrow); } +.icon-check { @include glyph($glyph-icon-check); } +.icon-connectivity { @include glyph($glyph-icon-connectivity); } +.icon-database-in-brackets { @include glyph($glyph-icon-database-in-brackets); } +.icon-eye-open { @include glyph($glyph-icon-eye-open); } +.icon-gear { @include glyph($glyph-icon-gear); } +.icon-hourglass { @include glyph($glyph-icon-hourglass); } +.icon-info { @include glyph($glyph-icon-info); } +.icon-link { @include glyph($glyph-icon-link); } +.icon-lock { @include glyph($glyph-icon-lock); } +.icon-minus { @include glyph($glyph-icon-minus); } +.icon-people { @include glyph($glyph-icon-people); } +.icon-person { @include glyph($glyph-icon-person); } +.icon-plus { @include glyph($glyph-icon-plus); } +.icon-trash { @include glyph($glyph-icon-trash); } +.icon-x { @include glyph($glyph-icon-x); } +.icon-brackets { @include glyph($glyph-icon-brackets); } +.icon-arrows-out { @include glyph($glyph-icon-arrows-out); } +.icon-arrows-right-left { @include glyph($glyph-icon-arrows-right-left); } +.icon-arrows-up-down { @include glyph($glyph-icon-arrows-up-down); } +.icon-bullet { @include glyph($glyph-icon-bullet); } +.icon-calendar { @include glyph($glyph-icon-calendar); } +.icon-chain-links { @include glyph($glyph-icon-chain-links); } +.icon-collapse-pane-left { @include glyph($glyph-icon-collapse-pane-left); } +.icon-collapse-pane-right { @include glyph($glyph-icon-collapse-pane-right); } +.icon-download { @include glyph($glyph-icon-download); } +.icon-duplicate { @include glyph($glyph-icon-duplicate); } +.icon-folder-new { @include glyph($glyph-icon-folder-new); } +.icon-fullscreen-collapse { @include glyph($glyph-icon-fullscreen-collapse); } +.icon-fullscreen-expand { @include glyph($glyph-icon-fullscreen-expand); } +.icon-layers { @include glyph($glyph-icon-layers); } +.icon-line-horz { @include glyph($glyph-icon-line-horz); } +.icon-magnify { @include glyph($glyph-icon-magnify); } +.icon-magnify-in { @include glyph($glyph-icon-magnify-in); } +.icon-magnify-out { @include glyph($glyph-icon-magnify-out); } +.icon-menu-hamburger { @include glyph($glyph-icon-menu-hamburger); } +.icon-move { @include glyph($glyph-icon-move); } +.icon-new-window { @include glyph($glyph-icon-new-window); } +.icon-paint-bucket { @include glyph($glyph-icon-paint-bucket); } +.icon-pause { @include glyph($glyph-icon-pause); } +.icon-pencil { @include glyph($glyph-icon-pencil); } +.icon-play { @include glyph($glyph-icon-play); } +.icon-plot-resource { @include glyph($glyph-icon-plot-resource); } +.icon-pointer-left { @include glyph($glyph-icon-pointer-left); } +.icon-pointer-right { @include glyph($glyph-icon-pointer-right); } +.icon-refresh { @include glyph($glyph-icon-refresh); } +.icon-save { @include glyph($glyph-icon-save); } +.icon-sine { @include glyph($glyph-icon-sine); } +.icon-T { @include glyph($glyph-icon-T); } +.icon-thumbs-strip { @include glyph($glyph-icon-thumbs-strip); } +.icon-two-parts-both { @include glyph($glyph-icon-two-parts-both); } +.icon-two-parts-one-only { @include glyph($glyph-icon-two-parts-one-only); } +.icon-x-in-circle { @include glyph($glyph-icon-x-in-circle); } +.icon-activity { @include glyph($glyph-icon-activity); } +.icon-activity-mode { @include glyph($glyph-icon-activity-mode); } +.icon-autoflow-tabular { @include glyph($glyph-icon-autoflow-tabular); } +.icon-clock { @include glyph($glyph-icon-clock); } +.icon-database { @include glyph($glyph-icon-database); } +.icon-database-query { @include glyph($glyph-icon-database-query); } +.icon-dataset { @include glyph($glyph-icon-dataset); } +.icon-datatable { @include glyph($glyph-icon-datatable); } +.icon-dictionary { @include glyph($glyph-icon-dictionary); } +.icon-folder { @include glyph($glyph-icon-folder); } +.icon-image { @include glyph($glyph-icon-image); } +.icon-layout { @include glyph($glyph-icon-layout); } +.icon-object { @include glyph($glyph-icon-object); } +.icon-object-unknown { @include glyph($glyph-icon-object-unknown); } +.icon-packet { @include glyph($glyph-icon-packet); } +.icon-page { @include glyph($glyph-icon-page); } +.icon-plot-overlay { @include glyph($glyph-icon-plot-overlay); } +.icon-plot-stacked { @include glyph($glyph-icon-plot-stacked); } +.icon-session { @include glyph($glyph-icon-session); } +.icon-tabular { @include glyph($glyph-icon-tabular); } +.icon-tabular-lad { @include glyph($glyph-icon-tabular-lad); } +.icon-tabular-lad-set { @include glyph($glyph-icon-tabular-lad-set); } +.icon-tabular-realtime { @include glyph($glyph-icon-tabular-realtime); } +.icon-tabular-scrolling { @include glyph($glyph-icon-tabular-scrolling); } +.icon-telemetry { @include glyph($glyph-icon-telemetry); } +.icon-telemetry-panel { @include glyph($glyph-icon-telemetry-panel); } +.icon-timeline { @include glyph($glyph-icon-timeline); } +.icon-timer { @include glyph($glyph-icon-timer); } +.icon-topic { @include glyph($glyph-icon-topic); } +.icon-box-with-dashed-lines { @include glyph($glyph-icon-box-with-dashed-lines); } + +/************************** 12 PX CLASSES */ + +.icon-eye-open-12px { @include glyph($glyph-icon-eye-open,'symbolsfont-12px'); } +.icon-collapse-pane-left-12px { @include glyph($glyph-icon-collapse-pane-left,'symbolsfont-12px'); } +.icon-collapse-pane-right-12px { @include glyph($glyph-icon-collapse-pane-right,'symbolsfont-12px'); } +.icon-folder-12px { @include glyph($glyph-icon-folder,'symbolsfont-12px'); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 8922fe241e..a8990d4fe8 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -30,25 +30,17 @@ .ui-symbol { font-family: 'symbolsfont'; - &.type-icon { - color: $colorObjHdrIc; - } - &.icon { - color: $colorKey; - font-size: inherit; - &.alert { - color: $colorAlert; - &:hover { - color: lighten($colorAlert, $ltGamma); - } - } - &.major { - font-size: 1.65em; - } - } - &.icon-calendar:after { - content: "\e605"; - } +} + +.ui-symbol.icon { + color: $colorKey; + font-size: inherit; + &.alert { + color: $colorAlert; + &:hover { + color: lighten($colorAlert, $ltGamma); + } + } } .bar .ui-symbol { @@ -60,39 +52,31 @@ display: inline-block; } -.s-menu-btn .invoke-menu, +.s-menu-button .invoke-menu, .icon.major .invoke-menu { margin-left: $interiorMarginSm; } .menu .type-icon, .tree-item .type-icon, -.super-menu.menu .type-icon { +.super-menu.menu .menu-item-a:before { position: absolute; } -.l-icon-alert { - display: none !important; - &:before { - color: $colorAlert; - content: "!"; - } -} - .t-item-icon { // Used in grid-item.html, tree-item, inspector location @extend .ui-symbol; @extend .icon; - line-height: normal; // This is Ok for the symbolsfont + line-height: inherit; position: relative; &.l-icon-link { .t-item-icon-glyph { - &:before { + &:after { color: $colorIconLink; - content: "\f4"; + content: $glyph-icon-link; height: auto; width: auto; position: absolute; - left: 0; top: 0; right: 0; bottom: 10%; + left: 0; top: 0; right: 0; bottom: 20%; @include transform-origin(bottom left); @include transform(scale(0.3)); z-index: 2; diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index 68784ceca8..bb325dbe17 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -39,14 +39,6 @@ .pane-header { color: pushBack($colorInspectorFg, 20%); font-size: 0.8rem; - &:before { - color: pushBack($colorInspectorFg, 10%); - content: '\e615'; // e615 Crosshair symbol - display: inline; - font-family: symbolsfont; - margin-right: $interiorMargin; - vertical-align: bottom; - } } .split-layout { @@ -115,7 +107,7 @@ background-color: $colorInspectorSectionHeaderBg; color: $colorInspectorSectionHeaderFg; margin-bottom: $interiorMargin; - padding: $formTBPad $formLRPad; + padding: floor($formTBPad * .75) $formLRPad; text-transform: uppercase; } @@ -159,7 +151,7 @@ } &:not(.last) .t-object-label .t-title-label:after { color: pushBack($colorInspectorFg, 15%); - content: '\3e'; + content: '\e904'; display: inline-block; font-family: symbolsfont; font-size: 8px; diff --git a/platform/commonUI/general/res/sass/_limits.scss b/platform/commonUI/general/res/sass/_limits.scss index 51f9a1c863..4eaee19ec1 100644 --- a/platform/commonUI/general/res/sass/_limits.scss +++ b/platform/commonUI/general/res/sass/_limits.scss @@ -1,4 +1,4 @@ -@mixin limitGlyph($iconColor, $glyph: $glyphLimit) { +@mixin limitGlyph($iconColor, $glyph: $glyph-icon-alert-triangle) { &:before { color: $iconColor; content: $glyph; @@ -21,8 +21,8 @@ tr[class*="s-limit"] { &.s-limit-yellow td:first-child { @include limitGlyph($colorLimitYellowIc); } - &.s-limit-upr td:first-child:before { content:$glyphLimitUpr; } - &.s-limit-lwr td:first-child:before { content:$glyphLimitLwr; } + &.s-limit-upr td:first-child:before { content: $glyph-icon-arrow-double-up; } + &.s-limit-lwr td:first-child:before { content: $glyph-icon-arrow-double-down; } } // Handle limit when applied directly to a non-tr element @@ -34,6 +34,6 @@ tr[class*="s-limit"] { &.s-limit-yellow { @include limitGlyph($colorLimitYellowIc); } - &.s-limit-upr:before { content:$glyphLimitUpr; } - &.s-limit-lwr:before { content:$glyphLimitLwr; } + &.s-limit-upr:before { content: $glyph-icon-arrow-double-up; } + &.s-limit-lwr:before { content: $glyph-icon-arrow-double-down; } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 7e2705b64d..a3d6f5e665 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -21,6 +21,7 @@ *****************************************************************************/ @import "effects"; @import "global"; +@import "glyphs"; @import "archetypes"; @import "about"; @import "text"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index a6badcf361..318bfff495 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -294,10 +294,9 @@ @function splitterHandleInset($splitterD: 21px, $splitterHandleD: 1px) { // Space to either side of the handle - @return ($splitterD - $splitterHandleD) * 0.5; + @return ($splitterD - $splitterHandleD) / 2; } - /*********************************************** CONTROLS, FORM ELEMENTS */ @mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) { @@ -305,24 +304,34 @@ border-radius: $controlCr; box-sizing: border-box; color: $fg; - display: inline-block; + //display: inline-block; } -@mixin btnBase($bg: $colorBodyBg, $bgHovColor: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { +@mixin btnBase($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $fgHov: $colorBtnFgHov, $ic: $colorBtnIcon, $icHov: $colorBtnIconHov) { @include user-select(none); - .icon { + color: $fg; + .icon, + &:before { color: $ic; } - @if $bgHovColor != none { + @if $bgHov != none { &:not(.disabled):hover { - background: $bgHovColor; // was just background, and background-image before that - >.icon { - color: lighten($ic, $ltGamma); + background: $bgHov; + color: $fgHov; + >.icon, + &:before { + color: $icHov; } } } } +@mixin btnSubtle($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $fgHov: $colorBtnFgHov, $ic: $colorBtnIcon, $icHov: $colorBtnIconHov) { + @include containerSubtle($bg, $fg); + @include btnBase($bgHov: $bgHov, $fg: $fg, $fgHov: $fgHov, $ic: $ic, $icHov: $icHov); + text-shadow: $shdwItemText; +} + @mixin input-base($bg: $colorInputBg, $fg: $colorInputFg, $shdw: rgba(black, 0.6) 0 1px 3px) { @include appearance(none); border-radius: $controlCr; @@ -344,7 +353,7 @@ @mixin contextArrow() { text-shadow: none; - content: '\76'; + content: $glyph-icon-arrow-down; display: inline-block; font-family: 'symbolsfont'; margin-left: $interiorMarginSm; diff --git a/platform/commonUI/general/res/sass/_object-label.scss b/platform/commonUI/general/res/sass/_object-label.scss index fc9410c01d..bcaaf18b9c 100644 --- a/platform/commonUI/general/res/sass/_object-label.scss +++ b/platform/commonUI/general/res/sass/_object-label.scss @@ -35,31 +35,28 @@ } } -mct-representation, -.rep-object-label { - &.s-status-pending { - .t-object-label { - .t-item-icon { - &:before { - @include spinner($waitSpinnerTreeBorderW, $colorLoadingFg); - content: ""; - height: $waitSpinnerTreeD; width: $waitSpinnerTreeD; - } - .t-item-icon-glyph { - display: none; - } +.s-status-pending { + > .t-object-label { + .t-item-icon { + &:after { + @include spinner($waitSpinnerTreeBorderW, $colorLoadingFg); + content: ""; + height: $waitSpinnerTreeD; width: $waitSpinnerTreeD; } - .t-title-label { - font-style: italic; - opacity: 0.6; + .t-item-icon-glyph, + &:before { + display: none; } } + .t-title-label { + font-style: italic; + opacity: 0.6; + } } } -.selected mct-representation, -.selected .rep-object-label { - .s-status-pending .t-object-label .t-item-icon:before { +.selected { + .s-status-pending .t-object-label .t-item-icon:after { border-color: rgba($colorItemTreeSelectedFg, 0.25) !important; border-top-color: rgba($colorItemTreeSelectedFg, 1.0) !important; } diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index b360f5aa9e..17e03941df 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -22,21 +22,24 @@ $baseRatio: 1.5; $pad: $interiorMargin * $baseRatio; -.s-btn, -.s-icon-btn { +.s-button, +button { @include user-select(none); + @include btnSubtle($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $ic: $colorBtnIcon); + box-sizing: border-box; cursor: pointer; + display: inline-block; + font-size: 0.7rem; text-decoration: none; height: $btnStdH; line-height: $btnStdH; -} - -.s-btn { - box-sizing: border-box; padding: 0 $pad; - font-size: 0.7rem; vertical-align: top; - @include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon); + + &.labeled:before { + // Icon when it's included + margin-right: $interiorMarginSm; + } &.lg { font-size: 1rem; @@ -50,58 +53,20 @@ $pad: $interiorMargin * $baseRatio; padding: 0 ($pad / $baseRatio) / 2; } - &.major, - &.key-edit, - &.key-properties { - $bg: $colorBtnMajorBg; - $hc: lighten($bg, 10%); - @include btnSubtle($bg, $hc, $colorBtnMajorFg, $colorBtnMajorFg); + &.major { + @include btnSubtle($bg: $colorBtnMajorBg, $bgHov: $colorBtnMajorBgHov, $fg: $colorBtnMajorFg, $fgHov: $colorBtnMajorFgHov, $ic: $colorBtnMajorFg, $icHov: $colorBtnMajorFgHov); } - &.t-save:before { - content:'\e612'; - font-family: symbolsfont; - margin-right: $interiorMarginSm; - } - &.t-save-as:before { - content:'\e612'; - font-family: symbolsfont; - margin-right: $interiorMarginSm; - } - &.t-cancel { - .title-label { display: none; } - &:before { - content:'\78'; - font-family: symbolsfont; - } + &.no-label { + .label, .title-label { display: none; } } &.pause-play { - .icon:before { - content: "\0000F1"; - } + @extend .icon-pause; &.paused { - @include btnSubtle($colorPausedBg, pushBack($colorPausedBg, 10%), $colorPausedFg, $colorPausedFg); - .icon { - @include pulse($dur: 1000ms); - :before { - content: "\0000EF"; - } - } - } - } - - &.show-thumbs { - .icon:before { - content: "\000039"; - } - } - - &.t-export { - &:before { - @extend .ui-symbol; - @extend .icon; - content: '\e623'; + @include btnSubtle($bg: $colorPausedBg, $bgHov: pushBack($colorPausedBg, 10%), $fg: $colorPausedFg, $ic: $colorPausedFg); + @extend .icon-play; + &:before { @include pulse($dur: 1000ms); } } } @@ -114,166 +79,59 @@ $pad: $interiorMargin * $baseRatio; } } -.s-icon-btn { - @extend .ui-symbol; - // Color and styling additionally in _controls.scss -} - -body.desktop .mini-tab { - // Meant to be used as pane hide/show control elements in concert with mct-splitter - $iconH: $uePaneMiniTabH; - $iconW: $uePaneMiniTabW; - $iconInnerLR: 0; - $arwD: 9px; - $arwOffsetX: 0px; - $arwAnimOffsetX: 2px + $iconInnerLR; - $cBg: pullForward($colorBodyBg, 15%); - $cFg: $cBg; - - - border-radius: $basicCr; - //@include boxShdw($shdwBtns); - box-sizing: border-box; - @include trans-prop-nice((color, background-color), 100ms); - color: $cFg; - cursor: pointer; - font-family: symbolsfont; - font-size: $arwD; - display: block; - position: absolute; - line-height: $iconH; - height: $iconH; width: $iconW; - text-align: center; - - &.collapsed { - // State when the pane this element controls has been collapsed - @include btnSubtle($colorBtnBg, $colorKey, $colorBtnFg, $colorBtnIcon); - &:before { opacity: 0; } - &:after { opacity: 1; } - &:hover { - &:before { opacity: 1; } - &:after { opacity: 0; } - } - - } - - &:before, - &:after { - @include trans-prop-nice((left, right, opacity), 250ms); - display: block; - height: 100%; - position: absolute; - } - - &:before { - // Always the arrow icon - width: $arwD; - } - &:after { - // Always icon; content is set in _layout.scss - width: 100%; - text-align: center; - opacity: 0; - } - - &.anchor-left { - // |< - text-align: right; - &:before { - content:'\3c'; // Collapse left icon e613 - right: $iconInnerLR; - } - &.collapsed { - @include border-left-radius(0); - text-align: left; - &:before { - content:'\3e'; - left: $iconInnerLR; - } - &:hover:before { left: $arwAnimOffsetX; } - } - } - &.anchor-right { - // >| - text-align: left; - &:before { - content:'\3e'; // Collapse right icon e614 - left: $iconInnerLR; - } - &.collapsed { - @include border-right-radius(0); - &:before { - text-align: right; - content:'\3c'; - right: $iconInnerLR; - } - &:hover:before { right: $arwAnimOffsetX; } - } - } -} - body.desktop .mini-tab-icon { // Meant to be used as pane hide/show control elements in concert with mct-splitter - $d: $uePaneMiniTabW; - color: pullForward($colorBodyBg, 15%); + // Font glyphs set in _layout.scss + background-color: $colorMiniTabBg; + color: $colorMiniTabFg; cursor: pointer; display: block; - font-family: symbolsfont; - font-size: $d; + font-family: 'symbolsfont'; + font-size: $uePaneMiniTabFontSize; position: absolute; - height: $d; width: $d; - line-height: $d; + height: $uePaneMiniTabH; width: $uePaneMiniTabW; + line-height: $uePaneMiniTabH; overflow: hidden; - word-break: break-all; - - &.collapsed { - $d: $uePaneMiniTabCollapsedW; - width: $d; font-size: $d; - } - - &:before, - &:after { - position: absolute; - display: inherit; - } + text-align: center; &:before { - content: '\78'; // X icon + display: inline-block; } &:hover { - color: $colorKey; + background-color: $colorMiniTabBgHov; + color: $colorMiniTabFgHov; } } .l-btn-set { // Buttons that have a very tight conceptual grouping - no internal space between them. - // Structure: .btn-set > mct-representation class=first|last > .s-btn - font-size: 0; // Remove space between s-btn elements due to white space in markup + // Structure: .btn-set > mct-representation class=first|last > .s-button + font-size: 0; // Remove space between s-button elements due to white space in markup - .s-btn { + .s-button { border-radius: 0; margin-left: 1px; } .first { - .s-btn, - &.s-btn { + .s-button, + &.s-button { @include border-left-radius($controlCr); margin-left: 0; } } .last { - .s-btn, - &.s-btn { + .s-button, + &.s-button { @include border-right-radius($controlCr); } } } .paused { - &:not(.s-btn) { + &:not(.s-button) { border-color: $colorPausedBg !important; color: $colorPausedBg !important; } diff --git a/platform/commonUI/general/res/sass/controls/_color-palette.scss b/platform/commonUI/general/res/sass/controls/_color-palette.scss index bd3ea9eb0b..1f98c3afc1 100644 --- a/platform/commonUI/general/res/sass/controls/_color-palette.scss +++ b/platform/commonUI/general/res/sass/controls/_color-palette.scss @@ -40,13 +40,15 @@ border: 1px solid transparent; color: $colorSelectedColor; display: block; - font-family: 'symbolsfont'; float: left; height: $d; width: $d; - line-height: $d; + line-height: $d * 0.9; margin: 0 ($m * 1px) ($m * 1px) 0; text-align: center; - vertical-align: middle; + &:before { + // Check mark for selected items + font-size: 0.8em; + } } .s-palette-item { diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 1a7a4631f7..7900739668 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -72,6 +72,23 @@ } } +.s-icon-button { + // Clickable icon elements that have hover + @extend .ui-symbol; + color: $colorClickIcon; + &:hover { + color: $colorClickIconHov; + } +} + +.s-toggle-icon { + // Has default (in-active) and .active states + @extend .s-icon-button; + color: $colorToggleIcon; + &:hover { color: rgba($colorToggleIconHov, 0.5); } + &.active { color: $colorToggleIconActive; } +} + .l-composite-control { vertical-align: middle; &:not(.l-inline) { @@ -166,10 +183,10 @@ label.radio.custom { } } -label.checkbox.custom input:checked ~ em:before { content: "\32"; } -label.radio.custom input:checked ~ em:before { content: "\e619"; } +label.checkbox.custom input:checked ~ em:before { content: $glyph-icon-check; } +label.radio.custom input:checked ~ em:before { content: $glyph-icon-bullet; } -.s-menu-btn label.checkbox.custom { +.s-menu-button label.checkbox.custom { margin-left: 5px; } @@ -218,10 +235,12 @@ input[type="search"] { /******************************************************** SELECTS */ .select { - @include btnSubtle($colorSelectBg); + @include btnSubtle($bg: $colorSelectBg); + @extend .icon-arrow-down; // Context arrow @if $shdwBtns != none { margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers } + display: inline-block; padding: 0 $interiorMargin; overflow: hidden; position: relative; @@ -239,10 +258,11 @@ input[type="search"] { margin: $interiorMargin 0; // Firefox } } - &:after { - @include contextArrow(); + &:before { + //@include contextArrow(); pointer-events: none; color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent)); + display: block; position: absolute; right: $interiorMargin; top: 0; } @@ -439,17 +459,13 @@ input[type="search"] { width: $pagerW; @extend .ui-symbol; &.prev { + @extend .icon-arrow-left; right: auto; - &:before { - content: "\3c"; - } } &.next { + @extend .icon-arrow-right; left: auto; text-align: right; - &:before { - content: "\3e"; - } } } .val { @@ -539,12 +555,11 @@ textarea { } /******************************************************** MISC */ -.context-available, -.s-icon-btn { - $c: $colorKey; - color: $c; +.context-available { + @extend .icon-arrow-down; + color: $colorKey; &:hover { - color: lighten($c, 10%); + color: $colorKeyHov; } } diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 665ad339a7..61e87b5b2b 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -20,34 +20,41 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ /******************************************************** MENU BUTTONS */ -.s-menu-btn { +.s-menu-button { // Formerly .btn-menu - @extend .s-btn; + @extend .s-button; span.l-click-area { // In markup, this element should not enclose anything. @extend .abs; } .icon { - font-size: 120%; + font-size: 16px; //120%; } .title-label { margin-left: $interiorMarginSm; } + .color-swatch { + // Used in color menu buttons in toolbar + $d: 10px; + display: inline-block; + border: 1px solid rgba($colorBtnFg, 0.2); + height: $d; width: $d; + vertical-align: middle; + margin-left: $interiorMarginSm; + margin-top: -2px; + } + &:after { // Adds the downward facing 'context available / invoke menu' arrow element @include contextArrow(); color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent)); } - &.create-btn { - &:before { - content:'\2b'; - display: inline; - font-family: symbolsfont; - } + &.create-button { + @extend .icon-plus; .title-label { font-size: 1rem; } @@ -56,9 +63,6 @@ .menu { left: 0; text-align: left; - .ui-symbol.icon { - width: 12px; - } } } @@ -77,6 +81,7 @@ } .menu { + // TODO: reduce size of icons @extend .s-menu; display: block; position: absolute; @@ -86,7 +91,8 @@ li { box-sizing: border-box; border-top: 1px solid pullForward($colorMenuBg, 10%); - color: pullForward($colorMenuBg, 60%); + color: $colorMenuFg; + //color: pullForward($colorMenuBg, 60%); line-height: $menuLineH; padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW; position: relative; @@ -97,33 +103,37 @@ &:hover { background: $colorMenuHovBg; color: $colorMenuHovFg; - .icon { - color: $colorMenuHovIc; - } - } - .type-icon { - left: $interiorMargin * 2; + &:before { + color: $colorMenuHovIc; + } } + &:before { + @extend .ui-symbol; + @extend .type-icon; + @extend .icon; + display: inline-block; + left: $interiorMargin * 2; + } } } } .menu, +.icon-menu, .context-menu, .super-menu, -.s-menu-btn .menu { +.s-menu-button .menu { pointer-events: auto; ul li { - a { - color: $colorMenuFg; + a.menu-item-a { + color: $colorMenuFg; display: block; } - .icon { - color: $colorMenuIc; - } - .type-icon { - left: $interiorMargin; - } + &:before, + a.menu-item-a:before { + color: $colorMenuIc; + left: $interiorMargin; + } } } @@ -148,7 +158,8 @@ } } } - .type-icon { + &:before { + // Type icon left: 25px; } } diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 7126006e95..2604d498bd 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -62,6 +62,12 @@ } } +.subdued { + .status-indicator { + color: pullForward($colorStatusBarBg, 40%); + } +} + .status-block-holder { // Applied to mct-include element // Contains status.block elements @@ -122,7 +128,7 @@ font-weight: bold; opacity: 1; } - .s-btn { + .s-button { background: $colorStatusBtnBg; padding: 0 $interiorMargin; height: auto; @@ -233,7 +239,7 @@ @mixin messageBlock($iconW: 32px) { .type-icon.message-type { @include txtShdw($shdwStatusIc); - &:before { content:"\e608"; } + @extend .icon-bell; color: $colorStatusDefault; font-size: $iconW; padding: 1px; @@ -241,15 +247,15 @@ } .message-severity-info .type-icon.message-type { - &:before { content:"\e608"; } + @extend .icon-info; color: $colorStatusInfo; } .message-severity-alert .type-icon.message-type { - &:before { content:"\e610"; } + @extend .icon-bell; color: $colorStatusAlert; } .message-severity-error .type-icon.message-type { - &:before { content:"\21"; } + @extend .icon-alert-rect; color: $colorStatusError; } } @@ -272,12 +278,10 @@ @include flex-direction(row); @include align-items(stretch); .type-icon.message-type { - //@include test(red); @include flex(0 1 auto); position: relative; } .message-contents { - //@include test(blue); @include flex(1 1 auto); margin-left: $overlayMargin; position: relative; diff --git a/platform/commonUI/general/res/sass/features/_time-display.scss b/platform/commonUI/general/res/sass/features/_time-display.scss index 328402b0fd..94f64f9bb7 100644 --- a/platform/commonUI/general/res/sass/features/_time-display.scss +++ b/platform/commonUI/general/res/sass/features/_time-display.scss @@ -8,6 +8,15 @@ } &.l-timer { + .l-value:before, + .control { + font-size: 0.8em; + } + + .l-value:before { + // Direction +/- element + margin-right: $interiorMarginSm; + } .control { @include trans-prop-nice((width, opacity), $transTime); line-height: inherit; @@ -25,8 +34,5 @@ .value { color: pullForward($colorBodyFg, 50%); font-weight: 400; - .direction { - font-size: 0.8em; - } } } diff --git a/platform/commonUI/general/res/sass/forms/_channel-selector.scss b/platform/commonUI/general/res/sass/forms/_channel-selector.scss index 00de4437b8..615315ee63 100644 --- a/platform/commonUI/general/res/sass/forms/_channel-selector.scss +++ b/platform/commonUI/general/res/sass/forms/_channel-selector.scss @@ -36,7 +36,7 @@ .btns-add-remove { // background: rgba(#ff0000, 0.3);; margin-top: 150px; - .s-btn { + .s-button { display: block; //font-size: 1.5em; margin-bottom: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index fcd04a7a53..d8de2fc435 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -136,18 +136,13 @@ } } -.no-validate { - .form .form-row >.label { - padding-right: 0; - &:after { - display: none; - } - } -} - .hint, .s-hint { font-size: 0.9em; + .req { + color: $colorFormRequired; + font-size: 0.7rem; + } } .l-result { diff --git a/platform/commonUI/general/res/sass/forms/_filter.scss b/platform/commonUI/general/res/sass/forms/_filter.scss index 27b017c14f..aa594c0765 100644 --- a/platform/commonUI/general/res/sass/forms/_filter.scss +++ b/platform/commonUI/general/res/sass/forms/_filter.scss @@ -85,6 +85,7 @@ .l-filter { $iconEdgeM: 4px; $iconD: $formInputH - ($iconEdgeM * 2); + @extend .icon-magnify; // Adds a magnifying glass before, holds an input and a clear button display: inline-block; position: relative; @@ -106,7 +107,6 @@ &:before { // Magnify glass icon - content:'\4d'; left: $interiorMargin; @include trans-prop-nice(color, 250ms); pointer-events: none; @@ -144,11 +144,4 @@ &:hover:before { color: pullForward($colorInputIcon, 10%); } - - .clear-icon { - // 'x' in circle icon - &:before { - content: '\e607'; - } - } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/forms/_validation.scss b/platform/commonUI/general/res/sass/forms/_validation.scss index b985c158ed..b13e11cef9 100644 --- a/platform/commonUI/general/res/sass/forms/_validation.scss +++ b/platform/commonUI/general/res/sass/forms/_validation.scss @@ -19,43 +19,44 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -.validates { - > .label { - padding-right: $reqSymbolM; // Keep room for validation element - &::after { - position: absolute; - right: $interiorMargin; - font-family: symbolsfont; - font-size: $reqSymbolFontSize; - height: 100%; - line-height: 200%; +mct-form.validates { + .form-row.validates { + > .label { + padding-right: $reqSymbolM; // Keep room for validation element + &:before { + position: absolute; + right: $interiorMargin; + font-size: $reqSymbolFontSize; + height: 100%; + line-height: 200%; + } + } + &.invalid, + &.invalid.req { + > .label { + @extend .icon-x; + &:before { + color: $colorFormInvalid; + } + } + } + &.valid, + &.valid.req { + > .label { + @extend .icon-check; + &:before { + color: $colorFormValid; + } + } + } + &.req { + > .label { + @extend .icon-asterisk; + &:before { + color: $colorFormRequired; + } + } } } - &.invalid, - &.invalid.req { - > .label::after { - color: $colorFormInvalid; - content: "x"; - } - } - &.valid, - &.valid.req { - > .label::after { - color: $colorFormValid; - content: "2"; - } - } - &.req { - > .label::after { - color: $colorFormRequired; - content: "*"; - } - } -} -.req { - font-size: $reqSymbolFontSize; -} -span.req { - color: $colorFormRequired; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss index 0cf115fec0..bdedb9c3ec 100644 --- a/platform/commonUI/general/res/sass/helpers/_splitter.scss +++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss @@ -26,7 +26,6 @@ // Main width is used to provide a good click area, and is always transparent // :after will be a positioned and colored element that is the handle - //@include test(red); display: block; position: absolute; z-index: 3; @@ -37,6 +36,7 @@ @include absPosDefault(0); background: $colorSplitterBg; display: block; + z-index: 4; @if $splitterEndCr != 'none' { border-radius: $splitterEndCr; @@ -61,7 +61,7 @@ } .split-layout { - $inset: splitterHandleInset($splitterD,$splitterHandleD); + $inset: splitterHandleInset($splitterD, $splitterHandleD); &.horizontal { // Slides vertically up and down, splitting the element horizontally overflow: hidden; // Suppress overall scroll; each internal pane handles its own overflow @@ -102,17 +102,16 @@ cursor: col-resize; top: 0; bottom: 0; - &:not(.flush-right) { - width: $splitterD; - &:after { - left: $inset; right: $inset; - } + width: $splitterD; + &:after { + left: $inset; right: $inset; + //width: $splitterHandleD; } &.flush-right { width: ceil($splitterD / 2); &:after { - background-color: transparent; - left: auto; right: 0; width: $splitterHandleD; + width: $splitterHandleD; + left: auto; right: 0; } &.edge-shdw { @include background-image(linear-gradient(90deg, rgba(black, 0) 40%, rgba(black, 0.05) 70%, rgba(black, 0.2) 100%)); @@ -120,4 +119,15 @@ } } } + &.splitter-sm { + $inset: splitterHandleInset($splitterDSm, $splitterHandleD); + .horizontal >.splitter { + height: $splitterDSm; + &:after { top: $inset; bottom: $inset; } + } + .vertical >.splitter { + width: $splitterDSm; + &:after { left: $inset; right: $inset; } + } + } } diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index 8588eeca80..ef1bacae42 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -31,7 +31,7 @@ $iconMargin: 40px; $iconD: ($d - ($iconMargin * 2)) * 0.85; $transTime: 200ms; - @include btnSubtle($colorItemBg, $colorItemBgHov, $colorItemFg, $colorItemIc); + @include btnSubtle($bg: $colorItemBg, $bgHov: $colorItemBgHov, $fg: $colorItemFg, $fgHov: pullForward($colorItemFg, $hoverRatioPercent), $ic: $colorItemIc); box-sizing: border-box; cursor: pointer; float: left; @@ -91,7 +91,7 @@ font-size: $iconD * 0.95; &.l-icon-link { .t-item-icon-glyph { - &:before { + &:after { @include transform(scale(0.25)); } } @@ -121,7 +121,7 @@ &.selected { $cfg: lighten($colorItemBgSelected, 35%); $cfgh: lighten($cfg, 30%); - @include btnSubtle($colorItemBgSelected); + @include btnSubtle($bg: $colorItemBgSelected); color: $cfg; .item-type, .top-bar .icon:not(.alert) { color: $cfg } .item-main .item-open { color: $cfg } diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index da35a3f823..5671fe178d 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -86,12 +86,12 @@ table { color: $colorIconLink; font-family: symbolsfont; font-size: 8px; - content: "\ed"; + content: "\e906"; display: inline-block; margin-left: $interiorMarginSm; } &.sort.desc:after { - content: "\ec"; + content: "\e907"; } } &.sortable { @@ -119,19 +119,12 @@ table { } } &.filterable { - thead, .thead { - tr.s-filters, .tr.s-filters { - th, .th { - //border-left: none; - } - } - } tbody, .tbody { top: $tabularHeaderH * 2; } input[type="text"] { box-sizing: border-box; - width: 100%; //50px; + width: 100%; } } @@ -182,7 +175,7 @@ table { .tabular-holder { &.t-exportable { $btnExportH: $btnFrameH; - .s-btn.t-export { + .s-button.t-export { @include trans-prop-nice(opacity, $dur: 50ms); opacity: 0; } @@ -191,7 +184,7 @@ table { top: 0; } &:hover { - .s-btn.t-export { + .s-button.t-export { @include trans-prop-nice(opacity, 150ms, 100ms); opacity: 1; } @@ -202,5 +195,4 @@ table { } } } - } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index 4e7c2b01d4..777990235a 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -37,7 +37,7 @@ body.mobile { } } - .create-btn-holder { + .create-button-holder { // Hide the create button by default in mobile; // This can be overridden by the examples/mobile bundle display: none; @@ -88,10 +88,7 @@ body.mobile { position: absolute; top: $bodyMargin + 2; left: $bodyMargin; - &:after { - content:'m' !important; - font-family: symbolsfont; - } + @extend .icon-menu-hamburger; } .object-browse-bar { diff --git a/platform/commonUI/general/res/sass/mobile/_tree.scss b/platform/commonUI/general/res/sass/mobile/_tree.scss index 40f1ae0969..e45472fed4 100644 --- a/platform/commonUI/general/res/sass/mobile/_tree.scss +++ b/platform/commonUI/general/res/sass/mobile/_tree.scss @@ -32,28 +32,37 @@ body.touch { .search-result-item { height: $mobileTreeItemH !important; line-height: $mobileTreeItemH !important; - margin-bottom: 0px !important; .view-control { - font-size: 1.2em; - margin-right: 0; - order: 2; - width: $mobileTreeItemH; + font-size: 1em; + margin-right: $interiorMargin; + width: ceil($mobileTreeItemH * 0.75); &.has-children { &:before { - content: "\7d"; + content: $glyph-icon-arrow-down; left: 50%; - @include transform(translateX(-50%) rotate(270deg)); + @include transform(translateX(-50%) rotate(-90deg)); } &.expanded:before { - @include transform(translateX(-50%) rotate(90deg)); + @include transform(translateX(-50%) rotate(0deg)); } } } .t-object-label { line-height: inherit; - .t-item-icon.l-icon-link .t-item-icon-glyph:before { + .t-item-icon.l-icon-link .t-item-icon-glyph:after { bottom: 20%; // Shift up due to height of mobile menu items } } } + + .pane.treeview { + .tree-item, + .search-result-item { + @include containerSubtle($bg: $colorMobilePaneLeftTreeItemBg, $gradRatio: 2%); + } + } + + .selector-list .tree-item { + @include containerBase($bg: $colorMobileSelectListTreeItemBg); + } } diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 2f2c2c452a..018197dac0 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -25,7 +25,7 @@ background: $colorOvrBlocker; z-index: 100; } - .clk-icon.close { + .close { font-size: 0.8rem; position: absolute; top: $interiorMarginLg; @@ -87,7 +87,7 @@ .bottom-bar { text-align: right; - .s-btn { + .s-button { $bg: $colorOvrBtnBg; &:not(.major) { @include btnSubtle($bg, pullForward($bg, 10%), $colorOvrBtnFg, $colorOvrBtnFg); diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index 295b9dd07c..964a36a708 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -23,17 +23,9 @@ .clear-icon, .menu-icon { cursor: pointer; - font-family: symbolsfont; @include trans-prop-nice((opacity, color), 150ms); } -.clear-icon { - // 'x' in circle icon - &:before { - content: '\e607'; - } -} - .holder-search { $iconWidth: 20px; @@ -41,6 +33,7 @@ $textInputHeight: 19px; // This is equal to the default value, 19px $iconEdgeM: 4px; $iconD: $treeSearchInputBarH - ($iconEdgeM*2); + @extend .icon-magnify; font-size: 0.8em; position: relative; @@ -50,16 +43,17 @@ } &:before, - .clear-icon, + .clear-input, .menu-icon { + // :before is magnify glass icon box-sizing: border-box; color: $colorInputIcon; height: $iconD; width: $iconD; line-height: $iconD; - position: absolute; - text-align: center; - top: $iconEdgeM; + position: absolute; + text-align: center; + top: $iconEdgeM; } .search-input { @@ -76,8 +70,6 @@ &:before { // Magnify glass icon - content:'\4d'; - font-family: symbolsfont; left: $interiorMarginSm; @include trans-prop-nice(color, 250ms); pointer-events: none; @@ -89,7 +81,8 @@ color: pullForward($colorInputIcon, 10%); } - .clear-icon { + .clear-input { + // Hiding for now with addition of Cancel button right: $iconD + $interiorMargin; // Icon is visible only when there is text input @@ -107,12 +100,10 @@ .menu-icon { // 'v' invoke menu icon - &:before { content: '\76'; } font-size: 0.8em; padding-right: $iconEdgeM; right: $iconEdgeM; text-align: right; - &:hover { color: pullForward($colorInputIcon, 10%); } @@ -126,20 +117,25 @@ } } + .results-msg { + font-size: 0.8rem; + } + .active-filter-display { $s: 0.7em; $p: $interiorMargin; box-sizing: border-box; line-height: 130%; - padding-left: $s * 2.25; + //padding-left: $s * 2.25; font-size: $s; - .clear-filters-icon { + .clear-filters { color: $colorInputIcon; opacity: 1; - font-size: 0.8em; - position: absolute; - left: 1px; + font-size: 0.9em; + margin-right: $interiorMarginSm; + //position: absolute; + //left: 1px; cursor: pointer; } } diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index ed7f94fb11..fc92f17941 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -21,52 +21,57 @@ *****************************************************************************/ ul.tree { - @include menuUlReset(); - @include user-select(none); - li { - display: block; - position: relative; - } - ul.tree { - margin-left: $treeVCW + $interiorMargin; - } + @include menuUlReset(); + @include user-select(none); + li { + display: block; + position: relative; + } + ul.tree { + margin-left: $treeVCW + $interiorMargin; + } } .tree-item, .search-result-item { @extend .l-flex-row; - box-sizing: border-box; - border-radius: $basicCr; - @include transition(background-color, 0.25s); - font-size: 0.8rem; - height: $menuLineH; - line-height: $menuLineH; - margin-bottom: $interiorMarginSm; + box-sizing: border-box; + border-radius: $basicCr; + @include transition(background-color, 0.25s); + font-size: 0.8rem; + height: $menuLineH; + line-height: $menuLineH; + margin-bottom: $interiorMarginSm; padding: 0 $interiorMarginSm; - position: relative; + position: relative; - .view-control { - color: $colorItemTreeVC; + .flex-elem { + height: inherit !important; + line-height: inherit !important; + } + + .view-control { + color: $colorItemTreeVC; font-size: 0.75em; - margin-right: $interiorMargin; + margin-right: $interiorMargin; height: 100%; line-height: inherit; - width: $treeVCW; + width: $treeVCW; &.has-children { &:before { position: absolute; @include trans-prop-nice(transform, 100ms); - content: "\3e"; + content: "\e904"; @include transform-origin(center); } &.expanded:before { @include transform(rotate(90deg)); } } - } + } - .t-object-label { - line-height: $menuLineH; + .t-object-label { + line-height: $menuLineH; .t-item-icon { @include txtShdwSubtle($shdwItemTreeIcon); font-size: $treeTypeIconH; @@ -76,34 +81,34 @@ ul.tree { .t-title-label { @include ellipsize(); } - } + } - &.selected { - background: $colorItemTreeSelectedBg; - color: $colorItemTreeSelectedFg; - .view-control { - color: $colorItemTreeSelectedVC; - } - .t-object-label .t-item-icon { - color: $colorItemTreeSelectedFg; - } - } + &.selected { + background: $colorItemTreeSelectedBg !important; + color: $colorItemTreeSelectedFg !important; + .view-control { + color: $colorItemTreeSelectedVC; + } + .t-object-label .t-item-icon { + color: $colorItemTreeSelectedFg; + } + } - &:not(.loading) { - cursor: pointer; - } + &:not(.loading) { + cursor: pointer; + } - .context-trigger { - $h: 0.9rem; - top: -1px; - position: absolute; - right: $interiorMarginSm; - .invoke-menu { - font-size: 0.75em; - height: $h; - line-height: $h; - } - } + .context-trigger { + $h: 0.9rem; + top: -1px; + position: absolute; + right: $interiorMarginSm; + .invoke-menu { + font-size: 0.75em; + height: $h; + line-height: $h; + } + } } body.desktop { @@ -151,7 +156,7 @@ mct-representation { @extend .ui-symbol; @include pulse($dur: 1s, $opacity0: 0.25); color: $colorItemTreeEditingFg; - content: '\70'; + content: $glyph-icon-pencil; margin-right: $interiorMarginSm; } .t-object-label { @@ -164,6 +169,16 @@ mct-representation { font-style: italic; } } - .view-control, + .tree-item-subtree { display: none; } + .view-control, + .tree-item-subtree { + display: none; + } + + &.selected { + .t-title-label, + .t-item-icon, + &:before { + color: rgba($colorItemTreeSelectedFg, 0.5); + } + } } } diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index b4a9471649..eebf256633 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -49,8 +49,8 @@ left: $myM; } &.frame-template { - .s-btn, - .s-menu-btn { + .s-button, + .s-menu-button { height: $ohH; line-height: $ohH; padding: 0 $interiorMargin; @@ -60,7 +60,7 @@ } } - .s-menu-btn:after { + .s-menu-button:after { font-size: 8px; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 431d835e24..9740171ff0 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -82,7 +82,7 @@ top: auto; height: $ueFooterH; line-height: $ueFooterH - ($interiorMargin * 2); - background: $colorFooterBg; + background: $colorStatusBarBg; color: lighten($colorBodyBg, 30%); font-size: .7rem; .status-holder { @@ -147,44 +147,40 @@ } body.desktop .pane .mini-tab-icon.toggle-pane { - $d: $uePaneMiniTabH; - $paneExpandedOffset: $splitterD + $uePaneMiniTabW; - top: $bodyMargin; - height: $d; - line-height: $d; - &:after { - // Always the icon that shows when the pane is collapsed - opacity: 0; + $hi: splitterHandleInset($splitterD, $splitterHandleD); + $paneExpandedOffset: $hi + $splitterHandleD + $uePaneMiniTabW; + top: $bodyMargin + ($ueTopBarH - $uePaneMiniTabH)/2; + + &.toggle-tree.anchor-left.collapsed, + &.toggle-inspect.anchor-right:not(.collapsed) { + @extend .icon-arrow-right; + border-bottom-right-radius: $controlCr; + border-top-right-radius: $controlCr; } - &.collapsed { - &:before { - opacity: 0; - } - &:after { - opacity: 1; - } + + &.toggle-tree.anchor-left:not(.collapsed), + &.toggle-inspect.anchor-right.collapsed { + @extend .icon-arrow-left; + border-bottom-left-radius: $controlCr; + border-top-left-radius: $controlCr; } + &.toggle-tree.anchor-left { left: 0; @include transform(translateX(-1 * $paneExpandedOffset)); - &:after { - content: '\6d'; // Menu 'hamburger' icon - } &.collapsed { - left: 0; - @include transform(translateX((-1 * $ueCollapsedPaneEdgeM) + $interiorMargin)); - } - &:not(.collapsed):before { - @include trans-prop-nice(opacity, 200ms, 200ms); + @include transform(translateX(-1 * $ueCollapsedPaneEdgeM)); } } + &.toggle-inspect.anchor-right { - right: $bodyMargin; - &:after { - content: '\e615'; // Eye icon + right: 0; + @include transform(translateX($paneExpandedOffset)); + &.flush-right { + @include transform(translateX(($uePaneMiniTabW + ceil($splitterD / 2)))); } &.collapsed { - right: $interiorMargin; + @include transform(translateX($ueCollapsedPaneEdgeM)); } } } @@ -196,11 +192,11 @@ body.desktop .pane .mini-tab-icon.toggle-pane { right: 0; bottom: $interiorMargin; left: $bodyMargin; - .create-btn-holder { + .create-button-holder { &.s-status-editing { display: none; & + .search-holder .search-bar { - // .search-holder is adjacent sibling to .create-btn-holder + // .search-holder is adjacent sibling to .create-button-holder // Add right margin when create button is hidden, to make room for the collapse pane 'x' button margin-right: $interiorMarginLg * 2; } @@ -220,7 +216,7 @@ body.desktop .pane .mini-tab-icon.toggle-pane { .holder-inspector { top: $bodyMargin; bottom: $interiorMargin; - left: $bodyMargin; + left: $bodyMargin + $interiorMargin; right: $bodyMargin; } .holder-elements { @@ -241,11 +237,11 @@ body.desktop .pane .mini-tab-icon.toggle-pane { @include trans-prop-nice-resize(0.25s); } -.object-browse-bar .s-btn, -.top-bar .buttons-main .s-btn, -.top-bar .s-menu-btn, -.tool-bar .s-btn, -.tool-bar .s-menu-btn { +.object-browse-bar .s-button, +.top-bar .buttons-main .s-button, +.top-bar .s-menu-button, +.tool-bar .s-button, +.tool-bar .s-menu-button { $h: $btnToolbarH; height: $h; line-height: $h; diff --git a/platform/commonUI/general/res/templates/controls/action-button.html b/platform/commonUI/general/res/templates/controls/action-button.html index ffb5816b51..eeaaa2613d 100644 --- a/platform/commonUI/general/res/templates/controls/action-button.html +++ b/platform/commonUI/general/res/templates/controls/action-button.html @@ -19,13 +19,10 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - - - {{parameters.action.getMetadata().glyph}} - {{parameters.action.getMetadata().name}} diff --git a/platform/commonUI/general/res/templates/controls/input-filter.html b/platform/commonUI/general/res/templates/controls/input-filter.html index 67fbfd0245..a2a8c32aea 100644 --- a/platform/commonUI/general/res/templates/controls/input-filter.html +++ b/platform/commonUI/general/res/templates/controls/input-filter.html @@ -25,7 +25,7 @@ - diff --git a/platform/commonUI/general/res/templates/controls/selector.html b/platform/commonUI/general/res/templates/controls/selector.html index 3d522e2d6d..3a64cd3140 100644 --- a/platform/commonUI/general/res/templates/controls/selector.html +++ b/platform/commonUI/general/res/templates/controls/selector.html @@ -43,11 +43,11 @@

- > - < diff --git a/platform/commonUI/general/res/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html index 177f658517..9f6b0c5f8c 100644 --- a/platform/commonUI/general/res/templates/controls/switcher.html +++ b/platform/commonUI/general/res/templates/controls/switcher.html @@ -20,26 +20,20 @@ at runtime from the About dialog for additional information. --> -
+ ng-controller="ClickAwayController as toggle"> - - - {{ngModel.selected.glyph}} + title="{{ngModel.selected.name}}"> {{ngModel.selected.name}}
  • - {{option.glyph}} + ng-click="ngModel.selected = option; toggle.setState(false)" + class="{{option.cssclass}}"> {{option.name}}
diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index 523dcd66ad..5e85c2d9bc 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -22,7 +22,7 @@
- C + - - {{ngModel.getGlyph()}} - {{ngModel.getText()}} - G +
\ No newline at end of file diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html index 2f626c60fe..90c9a7ebdc 100644 --- a/platform/commonUI/general/res/templates/label.html +++ b/platform/commonUI/general/res/templates/label.html @@ -20,8 +20,6 @@ at runtime from the About dialog for additional information. -->
-
-
{{type.getGlyph()}}
-
+
{{model.name}}
diff --git a/platform/commonUI/general/res/templates/menu/context-menu.html b/platform/commonUI/general/res/templates/menu/context-menu.html index f29e4d6f1d..5c245e5975 100644 --- a/platform/commonUI/general/res/templates/menu/context-menu.html +++ b/platform/commonUI/general/res/templates/menu/context-menu.html @@ -22,17 +22,12 @@
    -
  • - - {{menuAction.getMetadata().glyph}} - + class="{{menuAction.getMetadata().cssclass}}"> {{menuAction.getMetadata().name}}
    • -
\ No newline at end of file diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index 44c7f915b6..68e3c452dc 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -16,6 +16,5 @@ ng-click="action(active.notification.model.primaryOption.callback, $event)"> {{active.notification.model.primaryOption.label}} - +
\ No newline at end of file diff --git a/platform/commonUI/general/res/templates/tree/tree-label.html b/platform/commonUI/general/res/templates/tree/tree-label.html index 8c6dcb2e86..564784445c 100644 --- a/platform/commonUI/general/res/templates/tree/tree-label.html +++ b/platform/commonUI/general/res/templates/tree/tree-label.html @@ -1,8 +1,6 @@
-
-
-
+
diff --git a/platform/commonUI/general/src/ui/TreeLabelView.js b/platform/commonUI/general/src/ui/TreeLabelView.js index 7d654f21f8..49ff2bdf5b 100644 --- a/platform/commonUI/general/src/ui/TreeLabelView.js +++ b/platform/commonUI/general/src/ui/TreeLabelView.js @@ -30,23 +30,22 @@ define([ this.gestureService = gestureService; } - function getGlyph(domainObject) { - var type = domainObject.getCapability('type'); - return type.getGlyph(); - } - function isLink(domainObject) { var location = domainObject.getCapability('location'); return location.isLink(); } + function getClass(domainObject) { + var type = domainObject.getCapability('type'); + return type.getCssClass(); + } + TreeLabelView.prototype.updateView = function (domainObject) { var titleEl = this.el.find('.t-title-label'), - glyphEl = this.el.find('.t-item-icon-glyph'), iconEl = this.el.find('.t-item-icon'); titleEl.text(domainObject ? domainObject.getModel().name : ""); - glyphEl.text(domainObject ? getGlyph(domainObject) : ""); + iconEl.addClass(domainObject ? getClass(domainObject) : ""); if (domainObject && isLink(domainObject)) { iconEl.addClass('l-icon-link'); diff --git a/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js b/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js index 50ac0ddfc7..898bec9c7f 100644 --- a/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js +++ b/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js @@ -35,7 +35,7 @@ define( beforeEach(function () { mockIndicator = jasmine.createSpyObj( "indicator", - ["getGlyph", "getText"] + ["getGlyph", "getCssClass", "getText"] ); testIndicatorA = {}; diff --git a/platform/commonUI/general/test/ui/TreeViewSpec.js b/platform/commonUI/general/test/ui/TreeViewSpec.js index 9b267e5cda..4337bc5bcd 100644 --- a/platform/commonUI/general/test/ui/TreeViewSpec.js +++ b/platform/commonUI/general/test/ui/TreeViewSpec.js @@ -106,7 +106,7 @@ define([ return { context: jasmine.createSpyObj('context', ['getPath']), - type: jasmine.createSpyObj('type', ['getGlyph']), + type: jasmine.createSpyObj('type', ['getCssClass']), location: jasmine.createSpyObj('location', ['isLink']), mutation: jasmine.createSpyObj('mutation', ['listen']), status: mockStatus diff --git a/platform/commonUI/inspect/res/templates/info-button.html b/platform/commonUI/inspect/res/templates/info-button.html index cecd783a29..5c72f0cf74 100644 --- a/platform/commonUI/inspect/res/templates/info-button.html +++ b/platform/commonUI/inspect/res/templates/info-button.html @@ -21,4 +21,4 @@ --> - + diff --git a/platform/commonUI/notification/res/notification-indicator.html b/platform/commonUI/notification/res/notification-indicator.html index 2a2ec074df..95a1a32620 100644 --- a/platform/commonUI/notification/res/notification-indicator.html +++ b/platform/commonUI/notification/res/notification-indicator.html @@ -2,7 +2,7 @@ - + {{notifications.length}} Notifications {{notifications.length}} diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 1c4087eaec..ae4607a15d 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -2,10 +2,11 @@ $colorBodyBg: #333; $colorBodyFg: #999; $colorGenBg: #222; -$colorFooterBg: #000; +$colorStatusBarBg: #000; $colorKey: #0099cc; $colorKeySelectedBg: #005177; $colorKeyFg: #fff; +$colorKeyHov: #00c0f6; $colorEditAreaBg: #31363e; $colorEditAreaFg: #587ab5; $colorInteriorBorder: rgba($colorBodyFg, 0.1); @@ -21,11 +22,20 @@ $smallCr: 2px; $colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); $colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent); $colorBtnFg: $colorBodyFg; +$colorBtnFgHov: pullForward($colorBtnFg, $hoverRatioPercent); +$colorBtnIcon: $colorBtnFg; +$colorBtnIconHov: $colorBtnFgHov; $colorBtnMajorBg: $colorKey; +$colorBtnMajorBgHov: pullForward($colorBtnMajorBg, $hoverRatioPercent); $colorBtnMajorFg: $colorKeyFg; -$colorBtnIcon: $colorKey; +$colorBtnMajorFgHov: pullForward($colorBtnMajorFg, $hoverRatioPercent); +$colorClickIcon: $colorKey; +$colorClickIconHov: $colorKeyHov; +$colorToggleIcon: rgba($colorBodyFg, 0.5); +$colorToggleIconActive: $colorKey; +$colorToggleIconHov: rgba($colorToggleIconActive, 0.5); $colorInvokeMenu: #fff; -$contrastInvokeMenuPercent: 20%; +$contrastInvokeMenuPercent: 30%; $shdwBtns: rgba(black, 0.2) 0 1px 2px; $shdwBtnsOverlay: rgba(black, 0.5) 0 1px 5px; $sliderColorBase: $colorKey; @@ -168,7 +178,7 @@ $colorItemTreeSelectedBg: pushBack($colorKey, 15%); $colorItemTreeSelectedFg: pullForward($colorBodyFg, 20%); $colorItemTreeEditingBg: #344154; $colorItemTreeEditingFg: $colorEditAreaFg; -$colorItemTreeVC: $colorBodyFg; //rgba(#fff, 0.3); +$colorItemTreeVC: $colorBodyFg; $colorItemTreeVCHover: pullForward($colorItemTreeVC, 20%); $colorItemTreeSelectedVC: $colorItemTreeVC; $shdwItemTreeIcon: 0.6; @@ -177,23 +187,35 @@ $shdwItemTreeIcon: 0.6; $scrollbarTrackSize: 10px; $scrollbarTrackShdw: rgba(#000, 0.7) 0 1px 5px; $scrollbarTrackColorBg: rgba(#000, 0.4); -$scrollbarThumbColor: lighten($colorBodyBg, 10%); -$scrollbarThumbColorHov: lighten($scrollbarThumbColor, 2%); -$scrollbarThumbColorOverlay: lighten($colorOvrBg, 10%); -$scrollbarThumbColorOverlayHov: lighten($scrollbarThumbColorOverlay, 2%); +$scrollbarThumbColor: pullForward($colorBodyBg, 10%); +$scrollbarThumbColorHov: pullForward($scrollbarThumbColor, 2%); +$scrollbarThumbColorOverlay: pullForward($colorOvrBg, 10%); +$scrollbarThumbColorOverlayHov: pullForward($scrollbarThumbColorOverlay, 2%); // Splitter -$splitterD: 17px; // splitterD and $splitterHandleD should both be odd, or even -$splitterHandleD: 1px; -$splitterDSm: 17px; // Smaller splitter, used inside elements like a Timeline view -$colorSplitterBg: rgba(#fff, 0.1); //pullForward($colorBodyBg, 5%); +// All splitterD* values MUST both be either odd or even numbers +$splitterD: 20px; +$splitterDSm: 10px; // Smaller splitter, used inside elements like a Timeline view +$splitterHandleD: 2px; +$colorSplitterBaseBg: pullForward($colorBodyBg, 10%); +$colorSplitterBg: $colorSplitterBaseBg; $splitterShdw: rgba(black, 0.4) 0 0 3px; $splitterEndCr: none; -$colorSplitterHover: pullForward($colorBodyBg, 40%); +$colorSplitterHover: pullForward($colorSplitterBg, $hoverRatioPercent); $colorSplitterActive: $colorKey; +// Minitabs +$uePaneMiniTabH: 24px; +$uePaneMiniTabW: 8px; +$colorMiniTabBg: $colorSplitterBg; +$colorMiniTabFg: pushBack($colorMiniTabBg, 10%); +$colorMiniTabBgHov: $colorSplitterHover; +$colorMiniTabFgHov: #fff; + // Mobile $colorMobilePaneLeft: darken($colorBodyBg, 5%); +$colorMobilePaneLeftTreeItemBg: pullForward($colorMobilePaneLeft, 3%); +$colorMobileSelectListTreeItemBg: rgba(#fff, 0.05); // Datetime Picker $colorCalCellHovBg: $colorKey; diff --git a/platform/commonUI/themes/espresso/res/sass/_mixins.scss b/platform/commonUI/themes/espresso/res/sass/_mixins.scss index cfbe58dd66..f6a46b06c2 100644 --- a/platform/commonUI/themes/espresso/res/sass/_mixins.scss +++ b/platform/commonUI/themes/espresso/res/sass/_mixins.scss @@ -1,15 +1,9 @@ -@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { +@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $gradRatio: 5%) { @include containerBase($bg, $fg); - @include background-image(linear-gradient(lighten($bg, 5%), $bg)); + @include background-image(linear-gradient(pullForward($bg, $gradRatio), $bg)); @include boxShdw($shdwBtns); } -@mixin btnSubtle($bg: $colorBodyBg, $bgHovColor: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { - @include containerSubtle($bg, $fg); - @include btnBase($bg, $bgHovColor, $fg, $ic); - text-shadow: $shdwItemText; -} - @function pullForward($c: $colorBodyBg, $p: 20%) { // For dark interfaces, lighter things come forward - opposite for light interfaces @return lighten($c, $p); diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 292358078a..492444e737 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -2,12 +2,13 @@ $colorBodyBg: #fcfcfc; $colorBodyFg: #666; $colorGenBg: #fff; -$colorFooterBg: #000; +$colorStatusBarBg: #000; $colorKey: #0099cc; $colorKeySelectedBg: $colorKey; $colorKeyFg: #fff; +$colorKeyHov: #00c0f6; $colorEditAreaBg: #eafaff; -$colorEditAreaFg: #4bb1c7; //587ab5; +$colorEditAreaFg: #4bb1c7; $colorInteriorBorder: rgba($colorBodyFg, 0.2); $colorA: #999; $colorAHov: $colorKey; @@ -21,9 +22,18 @@ $smallCr: 3px; $colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); $colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent); $colorBtnFg: #fff; -$colorBtnMajorBg: $colorKey; -$colorBtnMajorFg: $colorKeyFg; +$colorBtnFgHov: $colorBtnFg; $colorBtnIcon: #eee; +$colorBtnIconHov: $colorBtnFgHov; +$colorBtnMajorBg: $colorKey; +$colorBtnMajorBgHov: $colorKeyHov; +$colorBtnMajorFg: $colorKeyFg; +$colorBtnMajorFgHov: pushBack($colorBtnMajorFg, $hoverRatioPercent); +$colorClickIcon: $colorKey; +$colorClickIconHov: $colorKeyHov; +$colorToggleIcon: rgba($colorClickIcon, 0.5); +$colorToggleIconActive: $colorKey; +$colorToggleIconHov: rgba($colorToggleIconActive, 0.5); $colorInvokeMenu: #000; $contrastInvokeMenuPercent: 40%; $shdwBtns: none; @@ -105,8 +115,8 @@ $progressBarStripeW: 20px; $shdwStatusIc: rgba(white, 0.8) 0 0px 5px; // Selects -$colorSelectBg: #ddd; -$colorSelectFg: $colorBodyFg; +$colorSelectBg: $colorBtnBg; +$colorSelectFg: $colorBtnFg; // Limits and staleness colors// $colorTelemFresh: pullForward($colorBodyFg, 20%); @@ -133,7 +143,7 @@ $colorFieldHintOverlay: pullForward($colorOvrBg, 40%); // Items $colorItemBg: #ddd; -$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent); +$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent * 0.7); $colorItemFg: $colorBodyFg; $colorItemFgDetails: pushBack($colorItemFg, 15%); $colorItemIc: $colorKey; @@ -183,16 +193,29 @@ $scrollbarThumbColorOverlay: darken($colorOvrBg, 50%); $scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov; // Splitter -$splitterD: 16px; // splitterD and $splitterHandleD should both be odd, or even +// All splitterD* values MUST both be either odd or even numbers +$splitterD: 16px; +$splitterDSm: 10px; // Smaller splitter, used inside elements like a Timeline view $splitterHandleD: 2px; -$colorSplitterBg: pullForward($colorBodyBg, 10%); +$colorSplitterBaseBg: $colorBodyBg; +$colorSplitterBg: pullForward($colorSplitterBaseBg, 15%); $splitterShdw: none; $splitterEndCr: none; -$colorSplitterHover: pullForward($colorBodyBg, 30%); +$colorSplitterHover: pullForward($colorSplitterBg, $hoverRatioPercent * 2); $colorSplitterActive: $colorKey; +// Minitabs +$uePaneMiniTabH: 24px; +$uePaneMiniTabW: 8px; +$colorMiniTabBg: $colorSplitterBg; +$colorMiniTabFg: pullForward($colorMiniTabBg, 30%); +$colorMiniTabBgHov: $colorSplitterHover; +$colorMiniTabFgHov: #fff; + // Mobile $colorMobilePaneLeft: darken($colorBodyBg, 2%); +$colorMobilePaneLeftTreeItemBg: pullForward($colorMobilePaneLeft, 3%); +$colorMobileSelectListTreeItemBg: rgba(#000, 0.05); // Datetime Picker, Calendar $colorCalCellHovBg: $colorKey; @@ -206,4 +229,4 @@ $colorAboutLink: #84b3ff; // Loading $colorLoadingFg: $colorAlt1; -$colorLoadingBg: rgba($colorLoadingFg, 0.1); +$colorLoadingBg: rgba($colorLoadingFg, 0.1); \ No newline at end of file diff --git a/platform/commonUI/themes/snow/res/sass/_controls.scss b/platform/commonUI/themes/snow/res/sass/_controls.scss index 4ff28bbfaa..3b247d7670 100644 --- a/platform/commonUI/themes/snow/res/sass/_controls.scss +++ b/platform/commonUI/themes/snow/res/sass/_controls.scss @@ -1,4 +1,4 @@ -.s-btn { +.s-button { &.major { .title-label { text-transform: uppercase; diff --git a/platform/commonUI/themes/snow/res/sass/_mixins.scss b/platform/commonUI/themes/snow/res/sass/_mixins.scss index 34f6462d41..a79405b166 100644 --- a/platform/commonUI/themes/snow/res/sass/_mixins.scss +++ b/platform/commonUI/themes/snow/res/sass/_mixins.scss @@ -1,14 +1,8 @@ -@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { +@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $gradRatio: 5%) { @include containerBase($bg, $fg); @include boxShdw($shdwBtns); } -@mixin btnSubtle($bg: $colorBtnBg, $bgHovColor: none, $fg: $colorBtnFg, $ic: $colorBtnIcon) { - @include containerSubtle($bg, $fg); - @include btnBase($bg, $bgHovColor, $fg, $ic); - text-shadow: $shdwItemText; -} - @function pullForward($c: $colorBodyBg, $p: 20%) { // For dark interfaces, lighter things come forward - opposite for light interfaces @return darken($c, $p); diff --git a/platform/core/bundle.js b/platform/core/bundle.js index 4af6c9dccd..8b4baf83ff 100644 --- a/platform/core/bundle.js +++ b/platform/core/bundle.js @@ -258,12 +258,12 @@ define([ { "key": "root", "name": "Root", - "glyph": "\u0046" + "cssclass": "icon-folder" }, { "key": "folder", "name": "Folder", - "glyph": "\u0046", + "cssclass": "icon-folder", "features": "creation", "description": "Create folders to organize other objects or links to objects.", "priority": 1000, @@ -274,11 +274,11 @@ define([ { "key": "unknown", "name": "Unknown Type", - "glyph": "\u003f" + "cssclass": "icon-object-unknown" }, { "name": "Unknown Type", - "glyph": "\u003f" + "cssclass": "icon-object-unknown" } ], "capabilities": [ diff --git a/platform/core/src/actions/ActionAggregator.js b/platform/core/src/actions/ActionAggregator.js index 009975dadd..db21a7be52 100644 --- a/platform/core/src/actions/ActionAggregator.js +++ b/platform/core/src/actions/ActionAggregator.js @@ -58,7 +58,7 @@ define( * @property {string} key machine-readable identifier for this action * @property {string} name human-readable name for this action * @property {string} description human-readable description - * @property {string} glyph character to display as icon + * @property {string} cssclass CSS class for icon * @property {ActionContext} context the context in which the action * will be performed. */ diff --git a/platform/core/src/types/TypeImpl.js b/platform/core/src/types/TypeImpl.js index 5226ece852..5e032917a0 100644 --- a/platform/core/src/types/TypeImpl.js +++ b/platform/core/src/types/TypeImpl.js @@ -56,13 +56,13 @@ define( * @method Type#getDescription */ /** - * Get the glyph associated with this type. Glyphs are - * single-character strings which will appear as icons (when + * Get the cssclass associated with this type. cssclass is a + * string which will appear as an icon (when * displayed in an appropriate font) which visually * distinguish types from one another. * - * @returns {string} the glyph to be displayed - * @method Type#getGlyph + * @returns {string} the cssclass for this type + * @method Type#getCssClass */ /** * Get an array of properties associated with objects of @@ -144,8 +144,8 @@ define( return this.typeDef.description; }; - TypeImpl.prototype.getGlyph = function () { - return this.typeDef.glyph; + TypeImpl.prototype.getCssClass = function () { + return this.typeDef.cssclass; }; TypeImpl.prototype.getProperties = function () { diff --git a/platform/core/src/views/ViewProvider.js b/platform/core/src/views/ViewProvider.js index a388f187b5..99ab0fc6ed 100644 --- a/platform/core/src/views/ViewProvider.js +++ b/platform/core/src/views/ViewProvider.js @@ -61,7 +61,7 @@ define( * domain object's whose `type` capability matches or inherits * from that type. * - * Views themselves are primarily metadata, such as name, glyph, and + * Views themselves are primarily metadata, such as name, icon and * description (to be shown in the UI); they do not contain any * information directly applicable to rendering to the DOM, although * they do contain sufficient information (such as a `templateUrl`, diff --git a/platform/core/test/types/TypeImplSpec.js b/platform/core/test/types/TypeImplSpec.js index caf45c5465..60b6c101e3 100644 --- a/platform/core/test/types/TypeImplSpec.js +++ b/platform/core/test/types/TypeImplSpec.js @@ -33,7 +33,7 @@ define( key: 'test-type', name: 'Test Type', description: 'A type, for testing', - glyph: 't', + cssclass: 'icon-telemetry-panel', inherits: ['test-parent-1', 'test-parent-2'], features: ['test-feature-1'], properties: [{}], @@ -54,8 +54,8 @@ define( expect(type.getDescription()).toEqual('A type, for testing'); }); - it("exposes glyph from definition", function () { - expect(type.getGlyph()).toEqual('t'); + it("exposes CSS class from definition", function () { + expect(type.getCssClass()).toEqual('icon-telemetry-panel'); }); it("exposes its underlying type definition", function () { diff --git a/platform/core/test/types/TypeProviderSpec.js b/platform/core/test/types/TypeProviderSpec.js index 7c04845fc9..c6a3225aff 100644 --- a/platform/core/test/types/TypeProviderSpec.js +++ b/platform/core/test/types/TypeProviderSpec.js @@ -30,18 +30,18 @@ define( testTypeDefinitions = [ { key: 'basic', - glyph: "X", + cssclass: "icon-magnify-in", name: "Basic Type" }, { key: 'multi1', - glyph: "Z", + cssclass: "icon-trash", description: "Multi1 Description", capabilities: ['a1', 'b1'] }, { key: 'multi2', - glyph: "Y", + cssclass: "icon-magnify-out", capabilities: ['a2', 'b2', 'c2'] }, { @@ -70,7 +70,7 @@ define( it("looks up non-inherited types by name", function () { captured.type = provider.getType('basic'); - expect(captured.type.getGlyph()).toEqual("X"); + expect(captured.type.getCssClass()).toEqual("icon-magnify-in"); expect(captured.type.getName()).toEqual("Basic Type"); expect(captured.type.getDescription()).toBeUndefined(); }); @@ -78,7 +78,7 @@ define( it("supports single inheritance", function () { captured.type = provider.getType('single-subtype'); - expect(captured.type.getGlyph()).toEqual("X"); + expect(captured.type.getCssClass()).toEqual("icon-magnify-in"); expect(captured.type.getName()).toEqual("Basic Subtype"); expect(captured.type.getDescription()).toEqual("A test subtype"); }); @@ -86,7 +86,7 @@ define( it("supports multiple inheritance", function () { captured.type = provider.getType('multi-subtype'); - expect(captured.type.getGlyph()).toEqual("Y"); + expect(captured.type.getCssClass()).toEqual("icon-magnify-out"); expect(captured.type.getName()).toEqual("Multi-parent Subtype"); expect(captured.type.getDescription()).toEqual("Multi1 Description"); }); diff --git a/platform/entanglement/bundle.js b/platform/entanglement/bundle.js index ae10733cb1..1835fec43c 100644 --- a/platform/entanglement/bundle.js +++ b/platform/entanglement/bundle.js @@ -66,7 +66,7 @@ define([ "key": "move", "name": "Move", "description": "Move object to another location.", - "glyph": "f", + "cssclass": "icon-move", "category": "contextual", "implementation": MoveAction, "depends": [ @@ -79,7 +79,7 @@ define([ "key": "copy", "name": "Duplicate", "description": "Duplicate object to another location.", - "glyph": "+", + "cssclass": "icon-duplicate", "category": "contextual", "implementation": CopyAction, "depends": [ @@ -95,7 +95,7 @@ define([ "key": "link", "name": "Create Link", "description": "Create Link to object in another location.", - "glyph": "è", + "cssclass": "icon-link", "category": "contextual", "implementation": LinkAction, "depends": [ @@ -108,7 +108,7 @@ define([ "key": "follow", "name": "Go To Original", "description": "Go to the original, un-linked instance of this object.", - "glyph": "ô", + "cssclass": "", "category": "contextual", "implementation": GoToOriginalAction }, @@ -116,7 +116,7 @@ define([ "key": "locate", "name": "Set Primary Location", "description": "Set a domain object's primary location.", - "glyph": "", + "cssclass": "", "category": "contextual", "implementation": SetPrimaryLocationAction } diff --git a/platform/features/clock/bundle.js b/platform/features/clock/bundle.js index b29d8751ed..5699527e36 100644 --- a/platform/features/clock/bundle.js +++ b/platform/features/clock/bundle.js @@ -136,7 +136,7 @@ define([ ], "category": "contextual", "name": "Start", - "glyph": "ï", + "cssclass": "icon-play", "priority": "preferred" }, { @@ -147,7 +147,7 @@ define([ ], "category": "contextual", "name": "Restart at 0", - "glyph": "r", + "cssclass": "icon-refresh", "priority": "preferred" } ], @@ -155,7 +155,7 @@ define([ { "key": "clock", "name": "Clock", - "glyph": "\u0043", + "cssclass": "icon-clock", "description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.", "priority": 101, "features": [ @@ -212,7 +212,7 @@ define([ { "key": "timer", "name": "Timer", - "glyph": "\u00f5", + "cssclass": "icon-timer", "description": "A timer that counts up or down to a datetime. Timers can be started, stopped and reset whenever needed, and support a variety of display formats. Each Timer displays the same value to all users. Timers can be added to Display Layouts.", "priority": 100, "features": [ diff --git a/platform/features/clock/res/templates/timer.html b/platform/features/clock/res/templates/timer.html index 88f8979e21..411012bac1 100644 --- a/platform/features/clock/res/templates/timer.html +++ b/platform/features/clock/res/templates/timer.html @@ -21,20 +21,13 @@ -->
- - {{timer.buttonGlyph()}} - - - {{timer.sign()}} - {{timer.text() || "--:--:--"}} - + class="flex-elem control s-icon-button {{timer.buttonCssClass()}}"> + + {{timer.text() || "--:--:--"}} +
diff --git a/platform/features/clock/src/controllers/TimerController.js b/platform/features/clock/src/controllers/TimerController.js index ae306ce3d8..a95ff3d6a4 100644 --- a/platform/features/clock/src/controllers/TimerController.js +++ b/platform/features/clock/src/controllers/TimerController.js @@ -50,10 +50,13 @@ define( if (formatter && !isNaN(timeDelta)) { self.textValue = formatter(timeDelta); self.signValue = timeDelta < 0 ? "-" : - timeDelta >= 1000 ? "+" : ""; + timeDelta >= 1000 ? "+" : ""; + self.signCssClass = timeDelta < 0 ? "icon-minus" : + timeDelta >= 1000 ? "icon-plus" : ""; } else { self.textValue = ""; self.signValue = ""; + self.signCssClass = ""; } } @@ -126,12 +129,13 @@ define( } /** - * Get the glyph to display for the start/restart button. - * @returns {string} glyph to display + * Get the CSS class to display the right icon + * for the start/restart button. + * @returns {string} cssclass to display */ - TimerController.prototype.buttonGlyph = function () { + TimerController.prototype.buttonCssClass = function () { return this.relevantAction ? - this.relevantAction.getMetadata().glyph : ""; + this.relevantAction.getMetadata().cssclass : ""; }; /** @@ -164,6 +168,15 @@ define( return this.signValue; }; + /** + * Get the sign (+ or -) of the current timer value, as + * a CSS class. + * @returns {string} sign of the current timer value + */ + TimerController.prototype.signClass = function () { + return this.signCssClass; + }; + /** * Get the text to display for the current timer value. * @returns {string} current timer value diff --git a/platform/features/clock/src/indicators/ClockIndicator.js b/platform/features/clock/src/indicators/ClockIndicator.js index f8721ca87e..35ea9448b3 100644 --- a/platform/features/clock/src/indicators/ClockIndicator.js +++ b/platform/features/clock/src/indicators/ClockIndicator.js @@ -44,12 +44,12 @@ define( }); } - ClockIndicator.prototype.getGlyph = function () { - return "C"; + ClockIndicator.prototype.getGlyphClass = function () { + return "no-collapse float-right subdued"; }; - ClockIndicator.prototype.getGlyphClass = function () { - return "no-icon no-collapse float-right subtle"; + ClockIndicator.prototype.getCssClass = function () { + return "icon-clock"; }; ClockIndicator.prototype.getText = function () { diff --git a/platform/features/clock/test/controllers/TimerControllerSpec.js b/platform/features/clock/test/controllers/TimerControllerSpec.js index 5c84b5aed3..89fb0a4afc 100644 --- a/platform/features/clock/test/controllers/TimerControllerSpec.js +++ b/platform/features/clock/test/controllers/TimerControllerSpec.js @@ -85,8 +85,8 @@ define( 'timer.restart': mockRestart }[k]]; }); - mockStart.getMetadata.andReturn({ glyph: "S", name: "Start" }); - mockRestart.getMetadata.andReturn({ glyph: "R", name: "Restart" }); + mockStart.getMetadata.andReturn({ cssclass: "icon-play", name: "Start" }); + mockRestart.getMetadata.andReturn({ cssclass: "icon-refresh", name: "Restart" }); mockScope.domainObject = mockDomainObject; testModel = {}; @@ -144,14 +144,14 @@ define( expect(controller.text()).toEqual("0D 00:00:00"); }); - it("shows glyph & name for the applicable start/restart action", function () { + it("shows cssclass & name for the applicable start/restart action", function () { invokeWatch('domainObject', mockDomainObject); - expect(controller.buttonGlyph()).toEqual("S"); + expect(controller.buttonCssClass()).toEqual("icon-play"); expect(controller.buttonText()).toEqual("Start"); testModel.timestamp = 12321; invokeWatch('model.modified', 1); - expect(controller.buttonGlyph()).toEqual("R"); + expect(controller.buttonCssClass()).toEqual("icon-refresh"); expect(controller.buttonText()).toEqual("Restart"); }); diff --git a/platform/features/clock/test/indicators/ClockIndicatorSpec.js b/platform/features/clock/test/indicators/ClockIndicatorSpec.js index 7918e9fe35..6c9a8c2977 100644 --- a/platform/features/clock/test/indicators/ClockIndicatorSpec.js +++ b/platform/features/clock/test/indicators/ClockIndicatorSpec.js @@ -48,8 +48,7 @@ define( }); it("implements the Indicator interface", function () { - expect(indicator.getGlyph()).toEqual(jasmine.any(String)); - expect(indicator.getGlyphClass()).toEqual(jasmine.any(String)); + expect(indicator.getCssClass()).toEqual(jasmine.any(String)); expect(indicator.getText()).toEqual(jasmine.any(String)); expect(indicator.getDescription()).toEqual(jasmine.any(String)); }); diff --git a/platform/features/fixed/bundle.js b/platform/features/fixed/bundle.js index 121501588b..890df811a3 100644 --- a/platform/features/fixed/bundle.js +++ b/platform/features/fixed/bundle.js @@ -36,7 +36,7 @@ define([ { "key": "fixed-display", "name": "Fixed Position Display", - "glyph": "3", + "cssclass": "icon-box-with-dashed-lines", "type": "telemetry.fixed", "template": fixedTemplate, "uses": [ @@ -49,28 +49,28 @@ define([ "items": [ { "method": "add", - "glyph": "\u002b", + "cssclass": "icon-plus", "control": "menu-button", "text": "Add", "options": [ { "name": "Box", - "glyph": "\u00e0", + "cssclass": "icon-box", "key": "fixed.box" }, { "name": "Line", - "glyph": "\u00e2", + "cssclass": "icon-line-horz", "key": "fixed.line" }, { "name": "Text", - "glyph": "\u00e4", + "cssclass": "icon-T", "key": "fixed.text" }, { "name": "Image", - "glyph": "\u00e3", + "cssclass": "icon-image", "key": "fixed.image" } ] @@ -81,52 +81,61 @@ define([ "items": [ { "method": "order", - "glyph": "á", + "cssclass": "icon-layers", "control": "menu-button", + "title": "Layering", + "description": "Move the selected object above or below other objects", "options": [ { "name": "Move to Top", - "glyph": "\u00eb", + "cssclass": "icon-arrow-double-up", "key": "top" }, { "name": "Move Up", - "glyph": "\u005e", + "cssclass": "icon-arrow-up", "key": "up" }, { "name": "Move Down", - "glyph": "\u0076", + "cssclass": "icon-arrow-down", "key": "down" }, { "name": "Move to Bottom", - "glyph": "\u00ee", + "cssclass": "icon-arrow-double-down", "key": "bottom" } ] }, { "property": "fill", - "glyph": "", + "cssclass": "icon-paint-bucket", + "title": "Fill color", + "description": "Set fill color", "control": "color" }, { "property": "stroke", - "glyph": "â", + "cssclass": "icon-line-horz", + "title": "Border color", + "description": "Set border color", "control": "color" }, { "property": "color", - "glyph": "ä", + "cssclass": "icon-T", + "title": "Text color", + "description": "Set text color", "mandatory": true, "control": "color" }, { "property": "url", - "glyph": "ã", + "cssclass": "icon-image", "control": "dialog-button", "title": "Image Properties", + "description": "Edit image properties", "dialog": { "control": "textfield", "name": "Image URL", @@ -135,9 +144,10 @@ define([ }, { "property": "text", - "glyph": "G", + "cssclass": "icon-gear", "control": "dialog-button", "title": "Text Properties", + "description": "Edit text properties", "dialog": { "control": "textfield", "name": "Text", @@ -146,15 +156,17 @@ define([ }, { "method": "showTitle", - "glyph": "ç", + "cssclass": "icon-two-parts-both", "control": "button", - "description": "Show telemetry element title." + "title": "Show title", + "description": "Show telemetry element title" }, { "method": "hideTitle", - "glyph": "å", + "cssclass": "icon-two-parts-one-only", "control": "button", - "description": "Hide telemetry element title." + "title": "Hide title", + "description": "Hide telemetry element title" } ] }, @@ -163,7 +175,7 @@ define([ { "method": "remove", "control": "button", - "glyph": "Z" + "cssclass": "icon-trash" } ] } @@ -175,9 +187,11 @@ define([ { "key": "telemetry.fixed", "name": "Fixed Position Display", - "glyph": "3", - "description": "A panel for collecting telemetry" + - " elements in a fixed position display.", + "cssclass": "icon-box-with-dashed-lines", + "description": "Collect and display telemetry elements in " + + "alphanumeric format in a simple canvas workspace. " + + "Elements can be positioned and sized. " + + "Lines, boxes and images can be added as well.", "priority": 899, "delegates": [ "telemetry" diff --git a/platform/features/imagery/bundle.js b/platform/features/imagery/bundle.js index 69684a2d85..63a12fd582 100644 --- a/platform/features/imagery/bundle.js +++ b/platform/features/imagery/bundle.js @@ -41,7 +41,7 @@ define([ { "name": "Imagery", "key": "imagery", - "glyph": "ã", + "cssclass": "icon-image", "template": imageryTemplate, "priority": "preferred", "needs": [ diff --git a/platform/features/imagery/res/templates/imagery.html b/platform/features/imagery/res/templates/imagery.html index 5242c1b189..fbdf4535af 100644 --- a/platform/features/imagery/res/templates/imagery.html +++ b/platform/features/imagery/res/templates/imagery.html @@ -5,18 +5,16 @@
- - < - - I
@@ -27,24 +25,24 @@
- + {{imagery.getZone()}} {{imagery.getTime()}} {{imagery.getDate()}}
- + ng-class="{ paused: imagery.paused() }"> - y + class="s-button icon-new-window"> + diff --git a/platform/features/layout/bundle.js b/platform/features/layout/bundle.js index 8af0706e68..7e976f3da1 100644 --- a/platform/features/layout/bundle.js +++ b/platform/features/layout/bundle.js @@ -56,7 +56,7 @@ define([ { "key": "layout", "name": "Display Layout", - "glyph": "\u004c", + "cssclass": "icon-layout", "type": "layout", "template": layoutTemplate, "editable": true, @@ -65,7 +65,7 @@ define([ { "key": "fixed", "name": "Fixed Position", - "glyph": "3", + "cssclass": "icon-box-with-dashed-lines", "type": "telemetry.panel", "template": fixedTemplate, "uses": [ @@ -77,28 +77,30 @@ define([ "items": [ { "method": "add", - "glyph": "\u002b", + "cssclass": "icon-plus", "control": "menu-button", "text": "Add", + "title": "Add", + "description": "Add new items", "options": [ { "name": "Box", - "glyph": "\u00e0", + "cssclass": "icon-box", "key": "fixed.box" }, { "name": "Line", - "glyph": "\u00e2", + "cssclass": "icon-line-horz", "key": "fixed.line" }, { "name": "Text", - "glyph": "\u00e4", + "cssclass": "icon-T", "key": "fixed.text" }, { "name": "Image", - "glyph": "\u00e3", + "cssclass": "icon-image", "key": "fixed.image" } ] @@ -109,52 +111,61 @@ define([ "items": [ { "method": "order", - "glyph": "á", + "cssclass": "icon-layers", "control": "menu-button", + "title": "Layering", + "description": "Move the selected object above or below other objects", "options": [ { "name": "Move to Top", - "glyph": "\u00eb", + "cssclass": "icon-arrow-double-up", "key": "top" }, { "name": "Move Up", - "glyph": "\u005e", + "cssclass": "icon-arrow-up", "key": "up" }, { "name": "Move Down", - "glyph": "\u0076", + "cssclass": "icon-arrow-down", "key": "down" }, { "name": "Move to Bottom", - "glyph": "\u00ee", + "cssclass": "icon-arrow-double-down", "key": "bottom" } ] }, { "property": "fill", - "glyph": "", + "cssclass": "icon-paint-bucket", + "title": "Fill color", + "description": "Set fill color", "control": "color" }, { "property": "stroke", - "glyph": "â", + "cssclass": "icon-line-horz", + "title": "Border color", + "description": "Set border color", "control": "color" }, { "property": "color", - "glyph": "ä", + "cssclass": "icon-T", + "title": "Text color", + "description": "Set text color", "mandatory": true, "control": "color" }, { "property": "url", - "glyph": "ã", + "cssclass": "icon-image", "control": "dialog-button", "title": "Image Properties", + "description": "Edit image properties", "dialog": { "control": "textfield", "name": "Image URL", @@ -163,9 +174,10 @@ define([ }, { "property": "text", - "glyph": "G", + "cssclass": "icon-gear", "control": "dialog-button", "title": "Text Properties", + "description": "Edit text properties", "dialog": { "control": "textfield", "name": "Text", @@ -174,15 +186,17 @@ define([ }, { "method": "showTitle", - "glyph": "ç", + "cssclass": "icon-two-parts-both", "control": "button", - "description": "Show telemetry element title." + "title": "Show title", + "description": "Show telemetry element title" }, { "method": "hideTitle", - "glyph": "å", + "cssclass": "icon-two-parts-one-only", "control": "button", - "description": "Hide telemetry element title." + "title": "Hide title", + "description": "Hide telemetry element title" } ] }, @@ -191,7 +205,9 @@ define([ { "method": "remove", "control": "button", - "glyph": "Z" + "cssclass": "icon-trash", + "title": "Delete", + "description": "Delete the selected item" } ] } @@ -258,7 +274,7 @@ define([ { "key": "layout", "name": "Display Layout", - "glyph": "\u004c", + "cssclass": "icon-layout", "description": "Assemble other objects and components together into a reusable screen layout. Working in a simple canvas workspace, simply drag in the objects you want, position and size them. Save your design and view or edit it at any time.", "priority": 900, "features": "creation", @@ -290,7 +306,7 @@ define([ { "key": "telemetry.panel", "name": "Telemetry Panel", - "glyph": "t", + "cssclass": "icon-telemetry-panel", "description": "A panel for collecting telemetry elements.", "priority": 899, "delegates": [ diff --git a/platform/features/pages/bundle.js b/platform/features/pages/bundle.js index 2b6a1bdf72..10be4de673 100644 --- a/platform/features/pages/bundle.js +++ b/platform/features/pages/bundle.js @@ -36,7 +36,7 @@ define([ { "key": "example.page", "name": "Web Page", - "glyph": "\u00ea", + "cssclass": "icon-page", "description": "Embed a web page or web-based image in a resizeable window component. Can be added to Display Layouts. Note that the URL being embedded must allow iframing.", "priority": 50, "features": [ diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index 3034d76814..3ce136abdf 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -45,7 +45,7 @@ define([ { "name": "Plot", "key": "plot", - "glyph": "6", + "cssclass": "icon-sine", "template": plotTemplate, "needs": [ "telemetry" diff --git a/platform/features/plot/res/templates/plot-options-browse.html b/platform/features/plot/res/templates/plot-options-browse.html index b5a02887db..6e790ba95b 100644 --- a/platform/features/plot/res/templates/plot-options-browse.html +++ b/platform/features/plot/res/templates/plot-options-browse.html @@ -25,13 +25,13 @@ ng-model="configuration.plot.xAxis" structure="xAxisForm" name="xAxisFormState" - class="flex-elem l-flex-row no-validate no-margin"> + class="flex-elem l-flex-row no-margin"> + class="flex-elem l-flex-row no-margin">
@@ -60,7 +60,7 @@ ng-model="configuration.plot.series[$index]" structure="plotSeriesForm" name="plotOptionsState" - class="flex-elem l-flex-row no-validate"> + class="flex-elem l-flex-row"> diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 98ca7338ca..6dc3cd71b9 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -87,33 +87,27 @@
- - < - - I -
- {{plot.getMode().glyph}} {{plot.getMode().name}}
diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index e240ac907d..88d82ea31b 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -313,7 +313,7 @@ define( /** * Get the current mode that is applicable to this plot. This - * will include key, name, and glyph fields. + * will include key, name, and cssclass fields. */ PlotController.prototype.getMode = function () { return this.modeOptions.getMode(); diff --git a/platform/features/plot/src/modes/PlotModeOptions.js b/platform/features/plot/src/modes/PlotModeOptions.js index 81be41f705..39658a35ac 100644 --- a/platform/features/plot/src/modes/PlotModeOptions.js +++ b/platform/features/plot/src/modes/PlotModeOptions.js @@ -27,13 +27,13 @@ define( var STACKED = { key: "stacked", name: "Stacked", - glyph: "m", + cssclass: "icon-plot-stacked", Constructor: PlotStackMode }, OVERLAID = { key: "overlaid", name: "Overlaid", - glyph: "6", + cssclass: "icon-plot-overlay", Constructor: PlotOverlayMode }; @@ -115,7 +115,7 @@ define( /** * Get all mode options available for each plot. Each - * mode contains a `name` and `glyph` field suitable + * mode contains a `name` and `cssclass` field suitable * for display in a template. * @return {Array} the available modes */ diff --git a/platform/features/static-markup/bundle.js b/platform/features/static-markup/bundle.js index afbc71e11b..ae610b3adc 100644 --- a/platform/features/static-markup/bundle.js +++ b/platform/features/static-markup/bundle.js @@ -36,7 +36,7 @@ define([ { "key": "static.markup", "name": "Static Markup", - "glyph": "p", + "cssclass": "icon-pencil", "description": "Static markup sandbox", "features": [ "creation" diff --git a/platform/features/table/bundle.js b/platform/features/table/bundle.js index f4d7b62b15..4c7b77b47e 100644 --- a/platform/features/table/bundle.js +++ b/platform/features/table/bundle.js @@ -60,7 +60,7 @@ define([ { "key": "table", "name": "Historical Telemetry Table", - "glyph": "\ue604", + "cssclass": "icon-tabular", "description": "A static table of all values over time for all included telemetry elements. Rows are timestamped data values for each telemetry element; columns are data fields. The number of rows is based on the range of your query. New incoming data must be manually re-queried for.", "priority": 861, "features": "creation", @@ -83,7 +83,7 @@ define([ { "key": "rttable", "name": "Real-time Telemetry Table", - "glyph": "\ue620", + "cssclass": "icon-tabular-realtime", "description": "A scrolling table of latest values for all included telemetry elements. Rows are timestamped data values for each telemetry element; columns are data fields. New incoming data is automatically added to the view.", "priority": 860, "features": "creation", @@ -127,7 +127,7 @@ define([ { "name": "Historical Table", "key": "table", - "glyph": "\ue604", + "cssclass": "icon-tabular", "templateUrl": "templates/historical-table.html", "needs": [ "telemetry" @@ -138,7 +138,7 @@ define([ { "name": "Real-time Table", "key": "rt-table", - "glyph": "\ue620", + "cssclass": "icon-tabular-realtime", "templateUrl": "templates/rt-table.html", "needs": [ "telemetry" diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html index fc18775742..6d96b17afd 100644 --- a/platform/features/table/res/templates/mct-table.html +++ b/platform/features/table/res/templates/mct-table.html @@ -1,4 +1,4 @@ - Export diff --git a/platform/features/table/res/templates/table-options-edit.html b/platform/features/table/res/templates/table-options-edit.html index 01dc4904cd..db6c190acf 100644 --- a/platform/features/table/res/templates/table-options-edit.html +++ b/platform/features/table/res/templates/table-options-edit.html @@ -25,6 +25,6 @@ ng-model="configuration.table.columns" structure="columnsForm" name="columnsFormState" - class="flex-elem l-flex-row no-validate no-margin"> + class="flex-elem l-flex-row no-margin">
\ No newline at end of file diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js index 231622f1f9..12effc50a3 100644 --- a/platform/features/timeline/bundle.js +++ b/platform/features/timeline/bundle.js @@ -151,7 +151,7 @@ define([ { "key": "timeline", "name": "Timeline", - "glyph": "\u0053", + "cssclass": "icon-timeline", "description": "A time-oriented container that lets you enclose and organize other Timelines and Activities. The Timeline view provides both tabular and Gantt views as well as resource utilization graphing of Activities.", "priority": 502, "features": [ @@ -194,7 +194,7 @@ define([ { "key": "activity", "name": "Activity", - "glyph": "\u0061", + "cssclass": "icon-activity", "features": [ "creation" ], @@ -240,7 +240,7 @@ define([ { "key": "mode", "name": "Activity Mode", - "glyph": "\u0041", + "cssclass": "icon-activity-mode", "features": [ "creation" ], @@ -280,7 +280,7 @@ define([ { "key": "values", "name": "Values", - "glyph": "\u0041", + "cssclass": "icon-activity-mode", "template": valuesTemplate, "type": "mode", "uses": [ @@ -291,7 +291,7 @@ define([ { "key": "timeline", "name": "Timeline", - "glyph": "\u0053", + "cssclass": "icon-timeline", "type": "timeline", "description": "A time-oriented container that lets you enclose and organize other Timelines and Activities. The Timeline view provides both tabular and Gantt views as well as resource utilization graphing of Activities.", "template": timelineTemplate, @@ -302,18 +302,17 @@ define([ "items": [ { "method": "add", - "glyph": "\u002b", "control": "menu-button", "text": "Add", "options": [ { "name": "Timeline", - "glyph": "\u0053", + "cssclass": "icon-timeline", "key": "timeline" }, { "name": "Activity", - "glyph": "\u0061", + "cssclass": "icon-activity", "key": "activity" } ] @@ -323,13 +322,13 @@ define([ { "items": [ { - "glyph": "\u00e9", + "cssclass": "icon-plot-resource", "description": "Graph Resource Utilization", "control": "button", "method": "toggleGraph" }, { - "glyph": "\u0041", + "cssclass": "icon-activity-mode", "control": "dialog-button", "description": "Apply Activity Modes...", "title": "Apply Activity Modes", @@ -342,7 +341,7 @@ define([ "property": "modes" }, { - "glyph": "\u00e8", + "cssclass": "icon-chain-links", "description": "Edit Activity Link", "title": "Activity Link", "control": "dialog-button", @@ -355,7 +354,7 @@ define([ "property": "link" }, { - "glyph": "\u0047", + "cssclass": "icon-gear", "description": "Edit Properties...", "control": "button", "method": "properties" @@ -368,7 +367,7 @@ define([ "method": "remove", "description": "Remove Item", "control": "button", - "glyph": "\u005a" + "cssclass": "icon-trash" } ] } diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss index d97dc4a58b..badbffe0b6 100644 --- a/platform/features/timeline/res/sass/_timeline-thematic.scss +++ b/platform/features/timeline/res/sass/_timeline-thematic.scss @@ -52,8 +52,8 @@ .l-pane-l { // Left pane of the tabular area .l-cols { - .s-label .ui-symbol.icon { - color: $colorGanttBarTabularFgIcon; + .t-object-label .t-item-icon { + color: pullForward($colorGanttBarBg, 10%); } } } @@ -104,7 +104,7 @@ } .s-ticks { - @include bgTicks($timelineColorAlt1); + @include bgTicks( $timelineColorAlt1); } .s-hover-btns-holder { $bg: $timelineHeaderColorBg; @@ -112,7 +112,7 @@ $l: 5%; @include user-select(none); @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); - .s-btn { + .s-button { height: 16px; line-height: 16px; .icon { diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss index 62cb103e46..62b6ace5da 100644 --- a/platform/features/timeline/res/sass/_timelines.scss +++ b/platform/features/timeline/res/sass/_timelines.scss @@ -241,8 +241,8 @@ @include trans-prop-nice-fade(500ms); opacity: 0; height: $timelineTopPaneHeaderH; - width: 100px; left: auto; - padding: $interiorMargin; + left: auto; + padding: $interiorMargin $interiorMargin $interiorMargin $interiorMargin * 10; text-align: right; z-index: 10; } @@ -266,9 +266,6 @@ width: $timelineColIconW; text-align: center; padding: 0; - .ui-symbol { - color: $colorKey; - } } &.l-plot-resource { diff --git a/platform/features/timeline/res/templates/activity-gantt.html b/platform/features/timeline/res/templates/activity-gantt.html index 1436ab9d6e..df8f12ef0a 100644 --- a/platform/features/timeline/res/templates/activity-gantt.html +++ b/platform/features/timeline/res/templates/activity-gantt.html @@ -29,9 +29,7 @@ } : {}">
- - {{type.getGlyph()}} - + {{model.name}} diff --git a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html index 09b798fcc1..8da5fe17c7 100644 --- a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html +++ b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html @@ -31,20 +31,17 @@ - - é + - - è -
@@ -27,7 +27,7 @@ - +
- é - è + + Title
@@ -102,26 +102,23 @@
-
- + - I - - X - - Y
diff --git a/platform/forms/res/templates/controls/button.html b/platform/forms/res/templates/controls/button.html index c0aa5cd2f9..c7ce5383ad 100644 --- a/platform/forms/res/templates/controls/button.html +++ b/platform/forms/res/templates/controls/button.html @@ -19,12 +19,9 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - - - {{structure.glyph}} - {{structure.text}} diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html index 548cad3a3a..e7e4913341 100644 --- a/platform/forms/res/templates/controls/color.html +++ b/platform/forms/res/templates/controls/color.html @@ -19,54 +19,37 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
+
- - {{structure.glyph}} - + {{structure.text}} -
+ ng-show="toggle.isActive()">
-
- {{ngModel[field] === 'transparent' ? '2' : '' }} + ng-if="!structure.mandatory"> +
None
-
+
- {{ngModel[field] === color ? '2' : '' }} + ng-click="ngModel[field] = color">
diff --git a/platform/forms/res/templates/controls/menu-button.html b/platform/forms/res/templates/controls/menu-button.html index 17957177a7..bb57c9cdda 100644 --- a/platform/forms/res/templates/controls/menu-button.html +++ b/platform/forms/res/templates/controls/menu-button.html @@ -19,25 +19,20 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
- - {{structure.glyph}} {{structure.text}}
diff --git a/platform/forms/src/controllers/DialogButtonController.js b/platform/forms/src/controllers/DialogButtonController.js index 4cdd5ffbbd..9a79b0c9da 100644 --- a/platform/forms/src/controllers/DialogButtonController.js +++ b/platform/forms/src/controllers/DialogButtonController.js @@ -63,7 +63,7 @@ define( // Prepare the structure for the button itself self.buttonStructure = {}; - self.buttonStructure.glyph = structure.glyph; + self.buttonStructure.cssclass = structure.cssclass; self.buttonStructure.name = structure.name; self.buttonStructure.description = structure.description; self.buttonStructure.click = showDialog; diff --git a/platform/forms/test/controllers/DialogButtonControllerSpec.js b/platform/forms/test/controllers/DialogButtonControllerSpec.js index dca6ef9da2..554ba4861f 100644 --- a/platform/forms/test/controllers/DialogButtonControllerSpec.js +++ b/platform/forms/test/controllers/DialogButtonControllerSpec.js @@ -46,7 +46,7 @@ define( ); testStructure = { name: "A Test", - glyph: "T", + cssclass: "icon-T", description: "Test description", control: "dialog-button", title: "Test title", @@ -83,7 +83,7 @@ define( mockScope.$watch.mostRecentCall.args[1](testStructure); buttonStructure = controller.getButtonStructure(); - expect(buttonStructure.glyph).toEqual(testStructure.glyph); + expect(buttonStructure.cssclass).toEqual(testStructure.cssclass); expect(buttonStructure.description).toEqual(testStructure.description); expect(buttonStructure.name).toEqual(testStructure.name); expect(buttonStructure.click).toEqual(jasmine.any(Function)); diff --git a/platform/identity/src/IdentityIndicator.js b/platform/identity/src/IdentityIndicator.js index 1632e4747a..9a03df5f51 100644 --- a/platform/identity/src/IdentityIndicator.js +++ b/platform/identity/src/IdentityIndicator.js @@ -43,11 +43,8 @@ define( }); } - IdentityIndicator.prototype.getGlyph = function () { - return this.text && "P"; - }; - IdentityIndicator.prototype.getGlyphClass = function () { - return undefined; + IdentityIndicator.prototype.getCssClass = function () { + return this.text && "icon-person"; }; IdentityIndicator.prototype.getText = function () { return this.text; diff --git a/platform/identity/test/IdentityIndicatorSpec.js b/platform/identity/test/IdentityIndicatorSpec.js index 0aeefa0963..3fd75e6cff 100644 --- a/platform/identity/test/IdentityIndicatorSpec.js +++ b/platform/identity/test/IdentityIndicatorSpec.js @@ -46,25 +46,21 @@ define( key: "testuserid", name: "A User" }); - // Should have a single character glyph - expect(indicator.getGlyph().length).toEqual(1); - expect(indicator.getGlyphClass()).toBeUndefined(); + expect(indicator.getCssClass()).toEqual("icon-person"); expect(indicator.getText()).toEqual("A User"); expect(indicator.getDescription().indexOf("testuserid")) .not.toEqual(-1); }); it("shows nothing while no user information is available", function () { - expect(indicator.getGlyph()).toBeUndefined(); - expect(indicator.getGlyphClass()).toBeUndefined(); + expect(indicator.getCssClass()).toBeUndefined(); expect(indicator.getText()).toBeUndefined(); expect(indicator.getDescription()).toBeUndefined(); }); it("shows nothing when there is no identity information", function () { mockPromise.then.mostRecentCall.args[0](undefined); - expect(indicator.getGlyph()).toBeUndefined(); - expect(indicator.getGlyphClass()).toBeUndefined(); + expect(indicator.getCssClass()).toBeUndefined(); expect(indicator.getText()).toBeUndefined(); expect(indicator.getDescription()).toBeUndefined(); }); diff --git a/platform/persistence/couch/src/CouchIndicator.js b/platform/persistence/couch/src/CouchIndicator.js index 3c3981c368..280a73e239 100644 --- a/platform/persistence/couch/src/CouchIndicator.js +++ b/platform/persistence/couch/src/CouchIndicator.js @@ -95,8 +95,8 @@ define( $interval(updateIndicator, interval); } - CouchIndicator.prototype.getGlyph = function () { - return "D"; + CouchIndicator.prototype.getCssClass = function () { + return "icon-database"; }; CouchIndicator.prototype.getGlyphClass = function () { diff --git a/platform/persistence/couch/test/CouchIndicatorSpec.js b/platform/persistence/couch/test/CouchIndicatorSpec.js index ea27669ba3..01fb3d7d23 100644 --- a/platform/persistence/couch/test/CouchIndicatorSpec.js +++ b/platform/persistence/couch/test/CouchIndicatorSpec.js @@ -57,7 +57,7 @@ define( }); it("has a database icon", function () { - expect(indicator.getGlyph()).toEqual("D"); + expect(indicator.getCssClass()).toEqual("icon-database"); }); it("consults the database at the configured path", function () { diff --git a/platform/persistence/elastic/src/ElasticIndicator.js b/platform/persistence/elastic/src/ElasticIndicator.js index 2c4efc5d61..2c871fd77d 100644 --- a/platform/persistence/elastic/src/ElasticIndicator.js +++ b/platform/persistence/elastic/src/ElasticIndicator.js @@ -81,8 +81,8 @@ define( $interval(updateIndicator, interval, 0, false); } - ElasticIndicator.prototype.getGlyph = function () { - return "D"; + ElasticIndicator.prototype.getCssClass = function () { + return "icon-database"; }; ElasticIndicator.prototype.getGlyphClass = function () { return this.state.glyphClass; diff --git a/platform/persistence/elastic/test/ElasticIndicatorSpec.js b/platform/persistence/elastic/test/ElasticIndicatorSpec.js index eff0c7667f..3086b52c66 100644 --- a/platform/persistence/elastic/test/ElasticIndicatorSpec.js +++ b/platform/persistence/elastic/test/ElasticIndicatorSpec.js @@ -59,7 +59,7 @@ define( }); it("has a database icon", function () { - expect(indicator.getGlyph()).toEqual("D"); + expect(indicator.getCssClass()).toEqual("icon-database"); }); it("consults the database at the configured path", function () { diff --git a/platform/persistence/local/src/LocalStorageIndicator.js b/platform/persistence/local/src/LocalStorageIndicator.js index c010ebb60e..9a59085ddb 100644 --- a/platform/persistence/local/src/LocalStorageIndicator.js +++ b/platform/persistence/local/src/LocalStorageIndicator.js @@ -40,8 +40,8 @@ define( function LocalStorageIndicator() { } - LocalStorageIndicator.prototype.getGlyph = function () { - return "D"; + LocalStorageIndicator.prototype.getCssClass = function () { + return "icon-database"; }; LocalStorageIndicator.prototype.getGlyphClass = function () { return 'caution'; diff --git a/platform/persistence/local/test/LocalStorageIndicatorSpec.js b/platform/persistence/local/test/LocalStorageIndicatorSpec.js index 99bc9462d0..c2e23683b5 100644 --- a/platform/persistence/local/test/LocalStorageIndicatorSpec.js +++ b/platform/persistence/local/test/LocalStorageIndicatorSpec.js @@ -38,7 +38,7 @@ define( }); it("has a database icon", function () { - expect(indicator.getGlyph()).toEqual("D"); + expect(indicator.getCssClass()).toEqual("icon-database"); }); it("has a 'caution' class to draw attention", function () { diff --git a/platform/search/res/templates/search-menu.html b/platform/search/res/templates/search-menu.html index 50d1f955b8..e051071f0d 100644 --- a/platform/search/res/templates/search-menu.html +++ b/platform/search/res/templates/search-menu.html @@ -23,10 +23,9 @@ diff --git a/platform/search/test/controllers/SearchControllerSpec.js b/platform/search/test/controllers/SearchControllerSpec.js index d03336fba0..bcb7b01dd0 100644 --- a/platform/search/test/controllers/SearchControllerSpec.js +++ b/platform/search/test/controllers/SearchControllerSpec.js @@ -69,7 +69,7 @@ define([ ); mockSearchService.query.andReturn(mockPromise); - mockTypes = [{key: 'mock.type', name: 'Mock Type', glyph: '?'}]; + mockTypes = [{key: 'mock.type', name: 'Mock Type', cssclass: 'icon-object-unknown'}]; mockSearchResult = jasmine.createSpyObj( 'searchResult', diff --git a/platform/search/test/controllers/SearchMenuControllerSpec.js b/platform/search/test/controllers/SearchMenuControllerSpec.js index 2c17777c36..dcee87fd47 100644 --- a/platform/search/test/controllers/SearchMenuControllerSpec.js +++ b/platform/search/test/controllers/SearchMenuControllerSpec.js @@ -39,8 +39,8 @@ define( ); mockTypes = [ - {key: 'mock.type.1', name: 'Mock Type 1', glyph: 'a'}, - {key: 'mock.type.2', name: 'Mock Type 2', glyph: 'b'} + {key: 'mock.type.1', name: 'Mock Type 1', cssclass: 'icon-layout'}, + {key: 'mock.type.2', name: 'Mock Type 2', cssclass: 'icon-telemetry'} ]; mockScope.ngModel = {}; From 54dcccb4720b61cfa18c9cf15439f451df65ce3e Mon Sep 17 00:00:00 2001 From: Andrew Henry Date: Tue, 2 Aug 2016 14:37:32 -0700 Subject: [PATCH 004/150] [Documentation] Add mention of new API to README Added two paragraphs to the readme mentioning the ongoing API work with a link to the tracking task. The website will also link to this. --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index e2d3a979d9..cce52a9921 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting S Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/). ![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg) +## New API +A new API is currently under development that will deprecate a lot of the documentation currently in the docs directory, however Open MCT will remain compatible with the currently documented API. An updated set of tutorials is being developed with the new API, and progress on this task can be followed in the [associated pull request](https://github.com/nasa/openmct/pull/999). Any code in this branch should be considered experimental, and we welcome any feedback. + +Differences between the two APIs include a move away from a declarative system of JSON configuration files towards an imperative system based on function calls. Developers will be able to extend and build on Open MCT by making direct function calls to a public API. Open MCT is also being refactored to minimize the dependencies that using Open MCT imposes on developers, such as the current requirement to use Angular JS. + ## Building and Running Open MCT Locally Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website. From 06f2c74444ce5a3ff94d9f2be8b2cb8e3e3cc66b Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 2 Aug 2016 15:57:43 -0700 Subject: [PATCH 005/150] [Frontend] Minor search enhancements Fixes #1093 Finessed and cleaned up filters display element; added '# results found' element; --- .../commonUI/general/res/sass/search/_search.scss | 7 +++---- platform/search/res/templates/search.html | 13 ++++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index 964a36a708..51c451147f 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -126,16 +126,15 @@ $p: $interiorMargin; box-sizing: border-box; line-height: 130%; - //padding-left: $s * 2.25; + padding-left: $s * 2; font-size: $s; .clear-filters { - color: $colorInputIcon; opacity: 1; font-size: 0.9em; margin-right: $interiorMarginSm; - //position: absolute; - //left: 1px; + position: absolute; + left: 1px; cursor: pointer; } } diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html index c7d5e101e0..04d3871f5d 100644 --- a/platform/search/res/templates/search.html +++ b/platform/search/res/templates/search.html @@ -43,7 +43,7 @@
- Cancel @@ -51,13 +51,16 @@
- Filtered by: {{ ngModel.filtersString }}
-
- No results found
+
+ {{ + !results.length > 0? 'No results found': + results.length + ' result' + (results.length > 1? 's':'') + ' found' + }} +
From 0274490b68ec21afdc38e9aba5e3f416ae55fca8 Mon Sep 17 00:00:00 2001 From: Andrew Henry Date: Fri, 5 Aug 2016 16:30:20 -0700 Subject: [PATCH 006/150] [search] Reverted previous change to ClickAwayController and introduced a custom fix to search menu. Fixes #888 (#1109) --- platform/commonUI/general/bundle.js | 2 +- .../src/controllers/ClickAwayController.js | 4 ++-- .../general/src/controllers/ToggleController.js | 2 ++ .../test/controllers/ClickAwayControllerSpec.js | 16 +++++++++------- platform/search/res/templates/search-menu.html | 4 ++-- platform/search/res/templates/search.html | 10 +++++++--- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/platform/commonUI/general/bundle.js b/platform/commonUI/general/bundle.js index b2eccc1732..1ec3c5a1f4 100644 --- a/platform/commonUI/general/bundle.js +++ b/platform/commonUI/general/bundle.js @@ -259,7 +259,7 @@ define([ "implementation": ClickAwayController, "depends": [ "$document", - "$scope" + "$timeout" ] }, { diff --git a/platform/commonUI/general/src/controllers/ClickAwayController.js b/platform/commonUI/general/src/controllers/ClickAwayController.js index 94ae71c2ea..6a01c528e9 100644 --- a/platform/commonUI/general/src/controllers/ClickAwayController.js +++ b/platform/commonUI/general/src/controllers/ClickAwayController.js @@ -34,7 +34,7 @@ define( * @param $scope the scope in which this controller is active * @param $document the document element, injected by Angular */ - function ClickAwayController($document, $scope) { + function ClickAwayController($document, $timeout) { var self = this; this.state = false; @@ -44,7 +44,7 @@ define( // `clickaway` action occurs after `toggle` if `toggle` is // triggered by a click/mouseup. this.clickaway = function () { - $scope.$apply(function () { + $timeout(function () { self.deactivate(); }); }; diff --git a/platform/commonUI/general/src/controllers/ToggleController.js b/platform/commonUI/general/src/controllers/ToggleController.js index 728d912c9a..8930c7fef2 100644 --- a/platform/commonUI/general/src/controllers/ToggleController.js +++ b/platform/commonUI/general/src/controllers/ToggleController.js @@ -33,6 +33,8 @@ define( */ function ToggleController() { this.state = false; + + this.setState = this.setState.bind(this); } /** diff --git a/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js index 8edf90e2c6..22b4035919 100644 --- a/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js @@ -26,7 +26,7 @@ define( describe("The click-away controller", function () { var mockDocument, - mockScope, + mockTimeout, controller; beforeEach(function () { @@ -34,11 +34,10 @@ define( "$document", ["on", "off"] ); - mockScope = jasmine.createSpyObj('$scope', ['$apply']); - + mockTimeout = jasmine.createSpy('timeout'); controller = new ClickAwayController( mockDocument, - mockScope + mockTimeout ); }); @@ -78,15 +77,18 @@ define( }); it("deactivates and detaches listener on document click", function () { - var callback, apply; + var callback, timeout; controller.setState(true); callback = mockDocument.on.mostRecentCall.args[1]; callback(); - apply = mockScope.$apply.mostRecentCall.args[0]; - apply(); + timeout = mockTimeout.mostRecentCall.args[0]; + timeout(); expect(controller.isActive()).toEqual(false); expect(mockDocument.off).toHaveBeenCalledWith("mouseup", callback); }); + + + }); } ); diff --git a/platform/search/res/templates/search-menu.html b/platform/search/res/templates/search-menu.html index e051071f0d..daa350a77b 100644 --- a/platform/search/res/templates/search-menu.html +++ b/platform/search/res/templates/search-menu.html @@ -22,13 +22,13 @@
-
+
  • -
``` - __tutorials/todo/res/templates/todo.html__ A summary of what's included: @@ -573,6 +570,7 @@ We will define that in an AMD module (see http://requirejs.org/docs/whyamd.html) in the directory `tutorials/todo/src/controllers` (`src` is, by default, the directory where bundle-related source code is kept, and controllers is where Angular controllers are stored by convention.) + ```diff define(function () { function TodoController($scope) { @@ -971,6 +969,7 @@ by the tool bar we've defined. Additionally, we need to make changes to our template to select specific tasks in response to some user gesture. Here, we will select tasks when a user clicks the description. + ```diff
@@ -996,6 +995,7 @@ __tutorials/todo/res/templates/todo.html__ Finally, the `TodoController` uses the `dialogService` now, so we need to declare that dependency in its extension definition: + ```diff define([ 'legacyRegistry', @@ -1248,7 +1248,6 @@ another file to the res directory of our bundle; this time, it is `css/todo.css` font-style: italic; } ``` - __tutorials/todo/res/css/todo.css__ Here, we have defined classes and appearances for: @@ -1261,6 +1260,7 @@ Here, we have defined classes and appearances for: To include this CSS file in our running instance of Open MCT, we need to declare it in our bundle definition, this time as an extension of category `stylesheets`: + ```diff define([ 'legacyRegistry', @@ -1430,7 +1430,6 @@ define([ }); }); ``` - __tutorials/bargraph/bundle.js__ The view definition should look familiar after the To-Do List tutorial, with @@ -1499,6 +1498,7 @@ The third is for labels along the horizontal axis, which will indicate which bar corresponds to which telemetry point. Inline `style` attributes are used wherever dynamic positioning (handled by a script) is anticipated. The corresponding CSS file which styles and positions these elements: + ```diff .example-bargraph { position: absolute; @@ -1596,6 +1596,7 @@ actual telemetry data in subsequent steps.) Notably, we will not try to show telemetry data after this step. To support this, we will add a new controller which supports our Bar Graph view: + ```diff define(function () { function BarGraphController($scope, telemetryHandler) { @@ -1647,6 +1648,7 @@ Whenever the telemetry handler invokes its callbacks, we update the set of telemetry objects in view, as well as the width for each bar. We will also utilize this from our template: + ```diff +
@@ -2471,7 +2473,6 @@ define([ }; }); ``` - __main.js__ ...we will be able to reload Open MCT and see that it is present: @@ -2942,6 +2943,7 @@ identifier, the pending promise is resolved. This `history` method will be used by a `telemetryService` provider which we will implement: + ```diff /*global define*/ @@ -3027,6 +3029,7 @@ Finally, note that we also have a `subscribe` method, to satisfy the interface o `telemetryService`, but this `subscribe` method currently does nothing. This script uses an `ExampleTelemetrySeries` class, which looks like: + ```diff /*global define*/ @@ -3058,6 +3061,7 @@ This takes the array of telemetry values (as returned by the server) and wraps it with the interface expected by the platform (the methods shown.) Finally, we expose this `telemetryService` provider declaratively: + ```diff define([ 'legacyRegistry', @@ -3324,7 +3328,6 @@ define( } ); ``` - __tutorials/telemetry/src/ExampleTelemetryProvider.js__ A quick summary of these changes: From b02de171f13bde6352b52c611e088550368a7238 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 26 Aug 2016 12:39:24 -0700 Subject: [PATCH 023/150] [Testing] Remove protractor hierarchy Remove protractor test hierarchy; until work is completed on #348, this is not useful and will be impractical to maintain. --- protractor/README | 69 ------- protractor/UI/DragDrop.js | 129 ------------ protractor/UI/Fullscreen.js | 50 ----- protractor/UI/InfoBubble.js | 43 ---- protractor/UI/NewWindow.js | 90 -------- protractor/UI/RightClick.js | 84 -------- protractor/bin/clean.js | 15 -- protractor/bin/ctrl.sh | 90 -------- protractor/bin/run.js | 12 -- protractor/bin/start.js | 40 ---- protractor/bin/stop.js | 44 ---- protractor/common/Buttons.js | 41 ---- protractor/common/CreateItem.js | 194 ------------------ protractor/common/EditItem.js | 66 ------ protractor/common/Launch.js | 29 --- protractor/common/RightMenu.js | 116 ----------- protractor/common/drag.js | 70 ------- protractor/conf.js | 67 ------ protractor/create/CreateActivity.js | 57 ----- protractor/create/CreateActivityMode.js | 58 ------ protractor/create/CreateButton.js | 40 ---- protractor/create/CreateClock.js | 109 ---------- protractor/create/CreateDisplay.js | 58 ------ protractor/create/CreateFolder.js | 59 ------ protractor/create/CreateSineWave.js | 59 ------ protractor/create/CreateTelemetry.js | 59 ------ protractor/create/CreateTimeline.js | 81 -------- protractor/create/CreateTimer.js | 74 ------- protractor/create/CreateWebPage.js | 59 ------ protractor/ctrl.sh | 60 ------ protractor/delete/DeleteActivity.js | 38 ---- protractor/delete/DeleteActivityMode.js | 38 ---- protractor/delete/DeleteClock.js | 38 ---- protractor/delete/DeleteDisplay.js | 38 ---- protractor/delete/DeleteFolder.js | 38 ---- protractor/delete/DeleteTelemetry.js | 38 ---- protractor/delete/DeleteTimeline.js | 38 ---- protractor/delete/DeleteTimer.js | 38 ---- protractor/delete/DeleteWebPage.js | 37 ---- protractor/package.json | 20 -- protractor/stressTest/StressTest.js | 78 ------- protractor/stressTest/StressTestBubble.js | 59 ------ .../stressTest/StressTestCreateButton.js | 56 ----- protractor/stressTest/StressTestMenu.js | 55 ----- protractor/stressTest/StressTestNewPage.js | 61 ------ protractor/stressTest/StressTestRightClick.js | 59 ------ 46 files changed, 2751 deletions(-) delete mode 100644 protractor/README delete mode 100644 protractor/UI/DragDrop.js delete mode 100644 protractor/UI/Fullscreen.js delete mode 100644 protractor/UI/InfoBubble.js delete mode 100644 protractor/UI/NewWindow.js delete mode 100644 protractor/UI/RightClick.js delete mode 100755 protractor/bin/clean.js delete mode 100755 protractor/bin/ctrl.sh delete mode 100755 protractor/bin/run.js delete mode 100755 protractor/bin/start.js delete mode 100755 protractor/bin/stop.js delete mode 100644 protractor/common/Buttons.js delete mode 100644 protractor/common/CreateItem.js delete mode 100644 protractor/common/EditItem.js delete mode 100644 protractor/common/Launch.js delete mode 100644 protractor/common/RightMenu.js delete mode 100644 protractor/common/drag.js delete mode 100644 protractor/conf.js delete mode 100644 protractor/create/CreateActivity.js delete mode 100644 protractor/create/CreateActivityMode.js delete mode 100644 protractor/create/CreateButton.js delete mode 100644 protractor/create/CreateClock.js delete mode 100644 protractor/create/CreateDisplay.js delete mode 100644 protractor/create/CreateFolder.js delete mode 100644 protractor/create/CreateSineWave.js delete mode 100644 protractor/create/CreateTelemetry.js delete mode 100644 protractor/create/CreateTimeline.js delete mode 100644 protractor/create/CreateTimer.js delete mode 100644 protractor/create/CreateWebPage.js delete mode 100755 protractor/ctrl.sh delete mode 100644 protractor/delete/DeleteActivity.js delete mode 100644 protractor/delete/DeleteActivityMode.js delete mode 100644 protractor/delete/DeleteClock.js delete mode 100644 protractor/delete/DeleteDisplay.js delete mode 100644 protractor/delete/DeleteFolder.js delete mode 100644 protractor/delete/DeleteTelemetry.js delete mode 100644 protractor/delete/DeleteTimeline.js delete mode 100644 protractor/delete/DeleteTimer.js delete mode 100644 protractor/delete/DeleteWebPage.js delete mode 100644 protractor/package.json delete mode 100644 protractor/stressTest/StressTest.js delete mode 100644 protractor/stressTest/StressTestBubble.js delete mode 100644 protractor/stressTest/StressTestCreateButton.js delete mode 100644 protractor/stressTest/StressTestMenu.js delete mode 100644 protractor/stressTest/StressTestNewPage.js delete mode 100644 protractor/stressTest/StressTestRightClick.js diff --git a/protractor/README b/protractor/README deleted file mode 100644 index 5734e5702d..0000000000 --- a/protractor/README +++ /dev/null @@ -1,69 +0,0 @@ -E2e Protractor Tests. - -1. Instructions: - - 1. 3 Control Scripts located in bin/. - run.js : node script used to start tests - start.js: node script used to setup test(starts node,localstorage and webdriver) - stop.js : node script, kills the 3 process started in start.js. - clean.js: node script used to remove the node_module directory.(clean up directory). - - 2. Use npm(Node Package Mangager) to Run Scripts. - a. cd protractor; - b. npm install; - c. To Run: - -npm start : will start processes need by protractor - -npm stop : will stop the processes need by protractor - -npm run-script run : will execute Protractor Script - -npm run-script all : will execute "start", "run", and "stop" script - -2. Directory Hierachy: - - -protractor: base directory - -common: contains prototype javascript functions that all other tests use. - -Buttons: common prototype functions related to enter fullscreen - -CreateItem: common prototype functions related to creating an item - -drag: common functions to test drag and drop. - -editItem: common functions used to test edit functionality. - -Launch: common script used to navigate the specified website. - -RightMenu: common functions for right click menu(remove). - -create - -e2e tests that creates the specified object. - -delete - -e2e tests that removes the specified object - -logs - -ctrl.sh redirects console output of MMAP, webdriver and elastic search and pipes them to log files. - -UI - -Contains tests that test the UI(drag drop, fullscreen, info bubble) - -conf.js: - -protractor config file. Explained below - -stressTest: - Tests that are used to test for memory leaks. You can use the new tab option on WARP and then open the - timeline in the new tab during the browser.sleep(). Once the test is do the browser will pause and you - can look a the timeline results in the new tab. - - NOTE: Cannot open chrome dev tools on same tab as the test are run on. Protractor uses the dev tools to - exectute the tests. - - -StressTest will create and delete folders. - -StressTestBubble.js: creates manny bubbles. - (Delay variable in InfoGesture.js was changed to 0) -3. Conf.js - Conf.js is used by protractor to setup and execute the tests. - -allScriptsTimeout: gives more time for protractor to synchronize with the page. - -jasmineNodeOpts: Protractor uses jasmine for the tests and jasmine has a default time out 30 seconds - per "it" test. Changed to maximume allowed time 360000 ms - -seleniumAddress: Protractor uses a Selenium server as a "proxy" between the test scripts and the browser - driver. A stand a lone version comes with protractor and to run use "webdriver-manager" - default address is: http://localhost:4444/wd/hub. - -specs[]: Is an array of files. Each File should have a "describe, it" test to be executed by protractor. - -capabilities: Tells protractor what browser to use and any browser arguments. - -4. bundle.json - bundle.json is used by npm to determine dependencies and location of script files. - -Dependencies: - "protractor": Contains protractor and webdriver package. - "psnode": Window/Unix Command, used for list/kill process.(ps aux) - "shelljs": Window/Unix Common JS Commands. eg rm,ls,exec - "sleep": Window/Unix Commands used to sleep the script - "string": Window/Unix Commands for string manipulation. \ No newline at end of file diff --git a/protractor/UI/DragDrop.js b/protractor/UI/DragDrop.js deleted file mode 100644 index 0e87f974bf..0000000000 --- a/protractor/UI/DragDrop.js +++ /dev/null @@ -1,129 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var fullScreenFile = require("../common/Buttons"); -var createItem = require("../common/CreateItem") -var itemEdit = require("../common/EditItem"); -var rightMenu = require("../common/RightMenu"); -var Drag = require("../common/drag"); - -describe('Test Drag and Drop', function() { - var fullScreenClass = new fullScreenFile(); - var createClass = new createItem(); - var editItemClass = new itemEdit(); - var rightMenuClass = new rightMenu(); - var dragDrop = new Drag(); - - beforeEach(require('../common/Launch')); - - it('should create a folder', function(){ - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - - browser.wait(function() { - return createClass.createButton().click(); - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - }); - it('should create a timer',function (){ - var ITEM_NAME = "Timer"; - var ITEM_TYPE = "timer"; - var ITEM_MENU_GLYPH = 'õ\nTimer'; - var ITEM_GRID_SELECT = 'P\nõ\nTimer'; - - browser.wait(function() { - return createClass.createButton().click(); - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1500); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - it('should drag timer into folder', function(){ - var ITEM_SIDE_SELECT = ">\nF\nFolder" - var name = "õ\nTimer"; - - rightMenuClass.select(ITEM_SIDE_SELECT, true).click(); - browser.sleep(2000); - var object = element.all(by.css('.ng-isolate-scope.ng-pristine.ng-valid')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }); - var clock = object.get(1); - var panel = element(by.css('.items-holder.grid.abs.ng-scope')); - - //drag - expect(panel.isPresent()).toBe(true) - expect(clock.isPresent()).toBe(true) - browser.executeScript(dragDrop.DragDrop,clock.getWebElement(),panel.getWebElement()) - browser.sleep(3000); - //check - var dragObject = element.all(by.repeater('childObject in composition')).filter(function (ele) { - return ele.getText().then(function(text) { - return text === "P\nõ\nTimer" - }) - }) - }); - it('should delete the Folder Item', function(){ - var ITEM_SIDE_SELECT = ">\nF\nFolder" - browser.wait(function() { - return element.all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).isDisplayed(); - }); - rightMenuClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - it('should delete the Timer Item', function(){ - var ITEM_SIDE_SELECT = "õ\nTimer"; - browser.wait(function() { - return element.all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).isDisplayed(); - }); - rightMenuClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); -}); diff --git a/protractor/UI/Fullscreen.js b/protractor/UI/Fullscreen.js deleted file mode 100644 index 577cf4bef4..0000000000 --- a/protractor/UI/Fullscreen.js +++ /dev/null @@ -1,50 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -//TODO Add filter for duplications/ -var fullScreenFile = require("../common/Buttons"); - -describe('Enable Fullscreen', function() { - var fullScreenClass = new fullScreenFile(); - - beforeEach(require('../common/Launch')); - - beforeEach(function() { - browser.wait(function(){ - return element(by.css('[title="Enter full screen mode"]')).isPresent(); - }, 7000); - browser.sleep(1000); - }); - - it('should find fullscreen button', function(){ - expect(element(by.css('[title="Enter full screen mode"]')).isDisplayed()).toBeTruthy(); - - });it('should enter fullscreen when fullscreen button is pressed', function(){ - function getFullScreen(){ - return document.webkitIsFullScreen; - } - var fullscreen = browser.executeScript(getFullScreen) - expect(fullscreen).toBeFalsy(); - fullScreenClass.fullScreen() - fullscreen = browser.executeScript(getFullScreen) - expect(fullscreen).toBeTruthy(); - }); -}); diff --git a/protractor/UI/InfoBubble.js b/protractor/UI/InfoBubble.js deleted file mode 100644 index 07a77d9b41..0000000000 --- a/protractor/UI/InfoBubble.js +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var fullScreenFile = require("../common/Buttons"); -var createItem = require("../common/CreateItem") -var itemEdit = require("../common/EditItem"); -var rightMenu = require("../common/RightMenu"); -var Drag = require("../common/drag"); - -describe('Info Bubble', function() { - var fullScreenClass = new fullScreenFile(); - var createClass = new createItem(); - var editItemClass = new itemEdit(); - var rightMenuClass = new rightMenu(); - var dragDrop = new Drag(); - - beforeEach(require('../common/Launch')); - - it('should detect info bubble', function(){ - var myitem = (element.all(by.repeater('child in composition'))).get(0); - browser.actions().mouseMove(myitem).perform(); - browser.sleep(4000); - expect(element(by.css('.t-infobubble.s-infobubble.l-infobubble-wrapper')).isDisplayed()).toBe(true); - }); -}); diff --git a/protractor/UI/NewWindow.js b/protractor/UI/NewWindow.js deleted file mode 100644 index 8f166ca55b..0000000000 --- a/protractor/UI/NewWindow.js +++ /dev/null @@ -1,90 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var fullScreenFile = require("../common/Buttons"); -var createClassFile = require("../common/CreateItem") -var itemEdit = require("../common/EditItem"); -var rightMenu = require("../common/RightMenu.js"); - -describe('New Window', function() { - var fullScreenClass = new fullScreenFile(); - var createClass = new createClassFile(); - var editItemClass = new itemEdit(); - var rightMenuClass = new rightMenu(); - - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(require('../common/Launch')); - - it('should create an object and open it in new window', function(){ - function replaceString(string){ - //used to remove timestamp on the output so files can be compared - return string.replace(new RegExp("([0-1]?[0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]","g"),"z"); - } - browser.wait(function() { - return createClass.createButton().click(); - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - //open file in new page - var before = browser.driver.getPageSource(); - before = browser.executeScript(replaceString, before) - - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - fullScreenClass.newWidnow().click(); - - var after = browser.driver.getPageSource(); - after = browser.executeScript(replaceString, after) - - browser.getAllWindowHandles().then(function (handles) { - browser.driver.switchTo().window(handles[1]); - browser.sleep(1000); - expect(before).toEqual(after); - browser.sleep(1000); - browser.driver.close(); - browser.driver.switchTo().window(handles[0]); - }); - }); - }); - it('should delete the object in the new window', function(){ - browser.wait(function() { - return element.all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).isDisplayed(); - }); - rightMenuClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/UI/RightClick.js b/protractor/UI/RightClick.js deleted file mode 100644 index 07a52f2d9b..0000000000 --- a/protractor/UI/RightClick.js +++ /dev/null @@ -1,84 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -var itemEdit = require("../common/EditItem"); - -describe('The Right Menu', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - - beforeEach(require('../common/Launch')); - - it('should Dissapear After Delete', function(){ - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }).then(function () { - var MyItem = ">\nF\nMy Items" - element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === MyItem; - }); - }).all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).click(); - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === ">\nF\nFolder"; - }); - }); - browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - browser.actions().click(protractor.Button.RIGHT).perform(); - browser.sleep(1000) - var menu = element.all(by.css('.ng-binding')).filter(function (ele){ - return ele.getText().then(function (text) { - return text == "Z\nRemove"; - }) - }) - menu.click(); - browser.sleep(1000) - - expect(menu.isDisplayed()).toBe(false); - }) - }); - -}); diff --git a/protractor/bin/clean.js b/protractor/bin/clean.js deleted file mode 100755 index 82e776901f..0000000000 --- a/protractor/bin/clean.js +++ /dev/null @@ -1,15 +0,0 @@ -#! /usr/bin/env node -var shell = require("shelljs/global"); - -var startdir = process.cwd(); -var command = "npm unlink"; - -console.log("Cleaning Directory") -exec(command, function(code, output) { - if(code != 0){ - console.log('Exit code:', code); - console.log('Program output:', output); - } -}); -console.log("rm -rf node_modules") -rm('-rf', __dirname + "/../node_modules") diff --git a/protractor/bin/ctrl.sh b/protractor/bin/ctrl.sh deleted file mode 100755 index faf385d2ad..0000000000 --- a/protractor/bin/ctrl.sh +++ /dev/null @@ -1,90 +0,0 @@ -#! /bin/bash -ARGUMENT=$1; - -if [ $# != 1 ]; then - echo "Expected 1 Aurgument. Received " $# 1>&2; - exit 1 -fi -#Start webdrive and http-server -if [ $ARGUMENT == start ]; then - echo "Creating Log Directory ..." - mkdir logs; - - cd .. - node app.js -p 1984 -x platform/persistence/elastic -i example/persistence > protractor/logs/nodeApp.log 2>&1 & - sleep 3; - if grep -iq "Error" protractor/logs/nodeApp.log; then - if grep -iq "minimist" protractor/logs/nodeApp.log; then - echo " Node Failed Because Minimist is not installed" - echo " Installng Minimist ..." - npm install minimist express > protractor/logs/minimist.log 2>&1 & - wait $! - if [ $? != 0 ]; then - echo " Error: minimist" - echo " Check Log file" - echo - else - echo " Started: Minimist" - echo - node app.js -p 1984 -x platform/persistence/elastic -i example/persistence > protractor/logs/nodeApp.log 2>&1 & - if grep -iq "Error" protractor/logs/nodeApp.log; then - echo " Error: node app failed" - echo " Check Log file" - echo - else - echo " Started: node app.js" - echo - fi - fi - else - echo " Error: node app failed" - echo " Check Log file" - echo - fi - else - echo " Started: node app.js" - echo - fi - echo "Starting webdriver ..." - - cd protractor; - webdriver-manager start > logs/webdriver.log 2>&1 & - sleep 3; - if grep -iq "Exception" logs/webdriver.log; then - echo " Error: webdriver-manager" - echo " Check Log file" - echo - else - echo " Started: webdriver-manager" - fi - echo "Starting Elastic Search..." - - elasticsearch > logs/elasticSearch.log 2>&1 & - sleep 3; - if grep -iq "Exception" logs/elasticSearch.log; then - echo " Error: ElasticSearch" - echo " Check Log file" - echo - else - echo " Started: ElasticSearch" - fi -#Runs Protractor tests -elif [ $ARGUMENT == run ]; then - protractor ./conf.js -#Kill Process -elif [ $ARGUMENT == stop ]; then - echo "Removing logs" - rm -rf logs - echo "Stopping Node" - kill $(ps aux | grep "[n]ode app.js"| awk '{print $2}'); - - echo "Stopping webdriver ..." - kill $(ps aux | grep "[p]rotractor" | awk '{print $2}'); - kill $(ps aux | grep "[w]ebdriver-manager" | awk '{print $2}'); - sleep 1; - echo "Stopping Elastic..." - kill $(ps aux | grep "[e]lastic" | awk '{print $2}'); - sleep 1; -else - echo "Unkown: Command" $1; -fi diff --git a/protractor/bin/run.js b/protractor/bin/run.js deleted file mode 100755 index 316caa11d0..0000000000 --- a/protractor/bin/run.js +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env node -var shell = require("shelljs/global"); -var sleep = require('sleep'); - -var command = __dirname + "/../node_modules/protractor/bin/protractor " +__dirname + "/../conf.js"; -console.log("Executing Protractor Test") -exec(command, function(code, output) { - if(code != 0){ - console.log('Exit code:', code); - console.log('Program output:', output); - } -}); \ No newline at end of file diff --git a/protractor/bin/start.js b/protractor/bin/start.js deleted file mode 100755 index 21aacc7efe..0000000000 --- a/protractor/bin/start.js +++ /dev/null @@ -1,40 +0,0 @@ -#! /usr/bin/env node -var shell,sleep; -try { - shell = require("shelljs/global"); - sleep = require('sleep'); -}catch (e){ - console.log("Dependencies Error"); - console.log("Run npm install"); - throw (e); -} -///Users/jsanderf/git/elastic/wtd/protractor/bin -var startdir = process.cwd(); -var command; -mkdir(__dirname + '/../logs'); - -command = __dirname + "/../node_modules/protractor/bin/webdriver-manager update"; -console.log("Installing Webdriver"); -exec(command,{async:false}); -sleep.sleep(1); - -console.log(); -cd(__dirname + '/../../'); -console.log('Installing Dependencies'); -exec("npm install minimist express", {async:false}); -console.log('Starting Node'); -sleep.sleep(1); -exec("node app.js -p 1984 -x example/persistence -x platform/persistence/elastic -i example/localstorage > protractor/logs/nodeApp.log 2>&1 &", {async:false}); -console.log(' Started Node'); - -console.log(); -console.log('Starting Webdriver'); -sleep.sleep(1); -exec("protractor/node_modules/protractor/bin/webdriver-manager start --standalone> protractor/logs/webdriver.log 2>&1 &",{async:false}); -if(error() == null){ - console.log(" Webdriver Started"); -}else{ - console.log(" Error : ", error()); -} -sleep.sleep(1); -cd(startdir); diff --git a/protractor/bin/stop.js b/protractor/bin/stop.js deleted file mode 100755 index ac2c3b4295..0000000000 --- a/protractor/bin/stop.js +++ /dev/null @@ -1,44 +0,0 @@ -#! /usr/bin/env node - -var shell = require("shelljs/global"); -var ps = require('psnode'); -var S = require('string'); -var sleep = require('sleep'); - -// A simple pid lookup -ps.list(function(err, results) { - - results.forEach(function( process ){ - //Killing Node - if(S(process.command).contains("node app.js")) { - console.log(); - console.log( 'Killing Node: %s', process.command); - ps.kill(process.pid, function(err, stdout) { - if (err) { - throw new Error(err); - } - console.log(stdout); - }); - }else if(S(process.command).contains("webdriver")) { - console.log(); - console.log( 'Killing WebDriver: %s', process.command); - ps.kill(process.pid, function(err, stdout) { - if (err){ - throw new Error(err); - } - console.log(stdout); - }); - }else if(S(process.command).contains("protractor")) { - console.log(); - console.log( 'Killing Chrome Drive: %s', process.command); - ps.kill(process.pid, function(err, stdout) { - if (err){ - throw new Error(err); - } - console.log(stdout); - }); - } - }); -}); - - diff --git a/protractor/common/Buttons.js b/protractor/common/Buttons.js deleted file mode 100644 index ec3d3c9c45..0000000000 --- a/protractor/common/Buttons.js +++ /dev/null @@ -1,41 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var Buttons = (function () { - function Buttons() { - } - //finds the Edit Button - Buttons.prototype.fullScreen = function () { - element(by.css('[title="Enter full screen mode"]')).click(); - - }; - Buttons.prototype.newWidnow = function () { - return element.all(by.css('[ng-click="parameters.action.perform()"]')).filter(function (arg) { - return arg.getAttribute("title").then(function (title){ - //expect(title).toEqual("Edit this object."); - return title == 'Open in a new browser tab'; - }) - }); - }; - return Buttons; - -})(); -module.exports = Buttons; diff --git a/protractor/common/CreateItem.js b/protractor/common/CreateItem.js deleted file mode 100644 index 6791b21d9e..0000000000 --- a/protractor/common/CreateItem.js +++ /dev/null @@ -1,194 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var CreateItem = (function () { - function CreateItem() {} - //finds the Create Button - CreateItem.prototype.createButton = function () { - return element.all(by.css('[ng-click="createController.toggle()"]')); - }; - function getFolderType(arg) { - switch(arg) { - case 'folder': - return "F\nFolder" - break; - case 'display': - return "L\nDisplay Layout" - break; - case 'telemetry': - return "t\nTelemetry Panel" - break; - case 'webpage': - return "ê\nWeb Page" - break; - case 'clock': - return "C\nClock" - break; - case 'timer': - return "õ\nTimer" - case 'timeline': - return "S\nTimeline" - break; - case 'activity': - return "a\nActivity" - break; - case 'activity-mode': - return "A\nActivity Mode" - break; - case 'sinewave': - return "T\nSine Wave Generator" - break; - default: - throw new Error("Unexpect State"); - } - } - //Selects Object from Create Menu - CreateItem.prototype.selectNewItem = function (itemText) { - item = getFolderType(itemText); - browser.wait(function(){ - return element(by.css('[ng-click="createAction.perform()"]')).isPresent(); - }, 6000); - this.els =element.all(by.css('[ng-click="createAction.perform()"]')); - this.todoButton = this.els.filter(function(elem) { - return elem.getText().then(function(text) { - return text === item; - }); - }); - return this.todoButton; - }; - //Fills Out Folder Forum - CreateItem.prototype.fillFolderForum = function (folderName, type) { - this.namefields = element.all(by.css('[ng-required="ngRequired"]')).filter(function (elem) { - return elem.getAttribute('type').then(function(text) { - return text === 'text'; - }); - }); - - browser.sleep(1000); - this.namefields.clear(); - browser.sleep(1000); - - this.namefields.get(0).sendKeys(folderName); - switch(type) { - case 'folder': - // return "F\nFolder" - break; - case 'display': - this.namefields.get(1).sendKeys("1"); - browser.sleep(1000); - this.namefields.get(2).sendKeys("2"); - break; - case 'telemetry': - this.namefields.get(1).sendKeys("1"); - browser.sleep(1000); - this.namefields.get(2).sendKeys("2"); - this.dropdownElement = element.all(by.model('ngModel[field]')).filter(function(elem) { - return elem.getTagName().then(function(tag) { - return tag === 'select'; - }); - }); - this.dropdownElement.click(); - this.dropdownElement.all(by.css('option')).get(1).click(); - browser.sleep(1000); - break; - case 'webpage': - this.namefields.get(1).sendKeys("http://test.com"); - browser.sleep(1000); - break; - case 'clock': - this.dropdownElement = element.all(by.model('ngModel[field]')).filter(function(elem) { - return elem.getTagName().then(function(tag) { - return tag === 'select'; - }); - }); - this.dropdownElement.get(0).click(); - this.dropdownElement.get(0).all(by.css('option')).get(0).click(); - browser.sleep(1000); - this.dropdownElement.get(1).click(); - this.dropdownElement.get(1).all(by.css('option')).get(0).click(); - browser.sleep(1000); - - break; - case 'timer': - this.timerDate = element.all(by.model('datetime.date')); - browser.sleep(1000); - this.timerDate.clear().sendKeys("2015-07-22"); - browser.sleep(1000); - this.timerDate = element.all(by.model('datetime.hour')); - this.timerDate.get(0).sendKeys("7"); - this.timerDate = element.all(by.model('datetime.min')); - this.timerDate.get(0).sendKeys("30"); - this.timerDate = element.all(by.model('datetime.sec')); - this.timerDate.get(0).sendKeys("000"); - browser.sleep(1000); - break; - case 'timeline': - this.timerDate = element.all(by.model('datetime.days')); - this.timerDate.clear().sendKeys("10"); - browser.sleep(1000); - this.timerDate = element.all(by.model('datetime.hours')); - this.timerDate.get(0).sendKeys("7"); - this.timerDate = element.all(by.model('datetime.minutes')); - this.timerDate.get(0).sendKeys("30"); - this.timerDate = element.all(by.model('datetime.seconds')); - this.timerDate.get(0).sendKeys("3"); - browser.sleep(1000); - break; - case 'activity': - this.startDay = element.all(by.model('datetime.days')); - this.startDay.clear().sendKeys("10"); - this.startHours = element.all(by.model('datetime.hours')); - this.startHours.get(0).clear().sendKeys("7"); - this.startMinutes = element.all(by.model('datetime.minutes')); - this.startMinutes.get(0).clear().sendKeys("30"); - this.startSeconds = element.all(by.model('datetime.seconds')); - this.startSeconds.get(0).clear().sendKeys("3"); - browser.sleep(1000); - //Duration - this.startDay.get(1).clear().sendKeys("1"); - this.startHours.get(1).clear().sendKeys("1"); - this.startMinutes.get(1).clear().sendKeys("0"); - this.startSeconds.get(1).clear().sendKeys("0"); - browser.sleep(1000); - break; - case 'activity-mode': - this.namefields.get(1).sendKeys("55"); - browser.sleep(1000); - this.namefields.get(2).sendKeys("10"); - break; - case 'sinewave': - this.namefields.get(1).sendKeys("10"); - browser.sleep(1000); - break; - default: - throw new Error("Unexpect State"); - } - return element.all(by.css('[ng-click="ngModel.confirm()"]')); - - }; - //TODO USAGE FOR CLICK ON OBJECT ONCE CREATED - CreateItem.prototype.findFolder = function (){ - return element.all(by.css('[ng-click="action.perform("navigate")"]')); - }; - return CreateItem; - -})(); -module.exports = CreateItem; diff --git a/protractor/common/EditItem.js b/protractor/common/EditItem.js deleted file mode 100644 index fb45fb1daf..0000000000 --- a/protractor/common/EditItem.js +++ /dev/null @@ -1,66 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var EditItem = (function () { - function EditItem() { - } - //finds the Edit Button - EditItem.prototype.SelectItem = function (item_title) { - return element.all(by.css('.item.grid-item.ng-scope')).filter(function (arg){ - return arg.getText().then(function (text) { - // expect(text).toEqual("fh"); - return text == item_title; - }); - }); - }; - EditItem.prototype.EditButton = function () { - return element.all(by.css('[ng-click="parameters.action.perform()"]')).filter(function (arg) { - return arg.getAttribute("title").then(function (title){ - //expect(title).toEqual("Edit"); - return title == 'Edit'; - }) - }); - }; - EditItem.prototype.CreateActivity = function () { - element.all(by.css('[ng-controller="ClickAwayController as toggle"]')).click(); - browser.sleep(1000); - var list = element.all(by.css('[ng-repeat="option in structure.options"]')).filter(function (arg){ - return arg.getText().then(function (text){ - //expect(text).toEqual("Edit this object."); - return text == "a\nActivity"; - }); - }).click(); - }; - EditItem.prototype.saveButton = function () { - element.all(by.css('[ng-click="currentAction.perform()"]')).filter(function (args){ - return args.getText().then(function (text) { - //expect(text).toEqual("Save"); - return text == "Save"; - }); - }).click(); - }; - function getFolderType(arg) { - - } - return EditItem; - -})(); -module.exports = EditItem; diff --git a/protractor/common/Launch.js b/protractor/common/Launch.js deleted file mode 100644 index 75d3631cc4..0000000000 --- a/protractor/common/Launch.js +++ /dev/null @@ -1,29 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/*global module,browser*/ - -module.exports = function launch() { - 'use strict'; - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984'); - browser.sleep(2000); // 2 seconds -}; diff --git a/protractor/common/RightMenu.js b/protractor/common/RightMenu.js deleted file mode 100644 index d7df8efad4..0000000000 --- a/protractor/common/RightMenu.js +++ /dev/null @@ -1,116 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ - -var RightMenu = (function () { - - function RightMenu() { - } - function carrotMyItem(){ - var MyItem = ">\nF\nMy Items" - element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === MyItem; - }); - }).all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).click(); - } - //RightMenu Click on Object - RightMenu.prototype.delete = function (name, flag) { - if(typeof flag === 'undefined'){ - flag = true; - } - if(flag === true){ - carrotMyItem(); - } - browser.sleep(1000) - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }); - browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - browser.actions().click(protractor.Button.RIGHT).perform(); - browser.sleep(1000) - element.all(by.css('.ng-binding')).filter(function (ele){ - return ele.getText().then(function (text) { - return text == "Z\nRemove"; - }) - }).click(); - browser.sleep(1000) - element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }).then(function (folder) { - expect(folder.length).toBe(0); - }); - }; - RightMenu.prototype.reset = function (name) { - carrotMyItem(); - browser.sleep(1000) - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }).click(); - browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - browser.actions().click(protractor.Button.RIGHT).perform(); - browser.sleep(1000) - var remove = element.all(by.css('.ng-binding')).filter(function (ele){ - return ele.getText().then(function (text) { - return text == "r\nRestart at 0"; - }) - }).click(); - browser.sleep(1000) - }; - //click '<', true==yes false==no - RightMenu.prototype.select = function(name, flag){ - if(typeof flag == "undefined"){ - flag = true; - } - if(flag == true){ - carrotMyItem(); - } - browser.sleep(1000) - return element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }); - - }; - RightMenu.prototype.dragDrop = function(name){ - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }); - var folder = object.get(0); - var panel = element(by.css('.items-holder.grid.abs.ng-scope')); - - browser.actions().dragAndDrop(folder, panel).perform(); - }; - return RightMenu; - -})(); -module.exports = RightMenu; diff --git a/protractor/common/drag.js b/protractor/common/drag.js deleted file mode 100644 index b8170e3057..0000000000 --- a/protractor/common/drag.js +++ /dev/null @@ -1,70 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -//drag function -/* -var e = document.createEvent("Event"); -e.initEvent('dragstart',true,false); -_element.dispatchEvent(e); -*/ -// qux.js -var Drag = (function () { - - function Drag() {}; - Drag.prototype.DragDrop = function(elem, zone){ - createEvent = function(type) { - var event = document.createEvent("event"); - event.initEvent(type, true, false); - event.dataTransfer = { - data: { - }, - setData: function(type, val){ - event.dataTransfer.data[type] = val; - }, - getData: function(type){ - return event.dataTransfer.data[type]; - } - }; - return event; - } - var event = createEvent('dragstart'); - event.effectAllowed = "copyMove"; - elem.dispatchEvent(event); - - var ele = createEvent('dragover'); - ele.preventDefault(); - zone.dispatchEvent(ele); - - var dropEvent = createEvent('drop', {}); - dropEvent.dataTransfer = event.dataTransfer; - dropEvent.preventDefault(); - zone.dispatchEvent(dropEvent); - - var dragEndEvent = createEvent('dragend', {}); - dragEndEvent.dataTransfer = event.dataTransfer; - elem.dispatchEvent(dragEndEvent); - }; - return Drag; -})(); -module.exports = Drag; - - - diff --git a/protractor/conf.js b/protractor/conf.js deleted file mode 100644 index ab3ed054dc..0000000000 --- a/protractor/conf.js +++ /dev/null @@ -1,67 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/*global exports,process*/ - -// conf.js -exports.config = { - allScriptsTimeout: 500000, - jasmineNodeOpts: {defaultTimeoutInterval: 360000}, - seleniumAddress: 'http://localhost:4444/wd/hub', - //specs: ['StressTestCarrot.js'], - specs: [ - // 'create/CreateActivity.js', - // 'delete/DeleteActivity.js', - // 'create/CreateActivityMode.js', - // 'delete/DeleteActivityMode.js', - // 'create/CreateClock.js', - // 'delete/DeleteClock.js', - 'create/CreateDisplay.js', - 'delete/DeleteDisplay.js', - 'create/CreateFolder.js', - 'delete/DeleteFolder.js', - // 'create/CreateTelemetry.js', - // 'delete/DeleteTelemetry.js', - // 'create/CreateTimeline.js', - // 'delete/DeleteTimeline.js', - // 'create/CreateTimer.js', - // 'delete/DeleteTimer.js', - 'create/CreateWebPage.js', - 'delete/DeleteWebPage.js', - 'UI/Fullscreen.js', - 'create/CreateButton.js', - //"UI/DragDrop.js", - "UI/NewWindow.js" - //'UI/InfoBubble.js', - //'UI/RightClick.js' - ], - capabilities: { - 'browserName': 'chrome', // or 'safari' - 'chromeOptions': {} - } -}; - -// Allow specifying binary location as an environment variable, -// for cases where Chrome is not installed in a usual location. -if (process.env.CHROME_BIN) { - exports.config.capabilities.chromeOptions.binary = - process.env.CHROME_BIN; -} diff --git a/protractor/create/CreateActivity.js b/protractor/create/CreateActivity.js deleted file mode 100644 index fc1880e52e..0000000000 --- a/protractor/create/CreateActivity.js +++ /dev/null @@ -1,57 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Activity', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Activity"; - var ITEM_TYPE = "activity"; - var ITEM_MENU_GLYPH = 'a\nActivity'; - var ITEM_GRID_SELECT = 'P\na\nActivity\n0 Items'; - beforeEach(require('../common/Launch')); - it('should Create new Activity', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - var ok = createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - //ok.click(); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - }); - - }); - -}); diff --git a/protractor/create/CreateActivityMode.js b/protractor/create/CreateActivityMode.js deleted file mode 100644 index 76b600837d..0000000000 --- a/protractor/create/CreateActivityMode.js +++ /dev/null @@ -1,58 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Activity Mode', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Activity Mode"; - var ITEM_TYPE = "activity-mode"; - var ITEM_MENU_GLYPH = 'A\nActivity Mode'; - var ITEM_GRID_SELECT = 'P\nA\nActivity Mode'; - beforeEach(require('../common/Launch')); - it('should Create new Activity Mode', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); - browser.sleep(1000); - - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/create/CreateButton.js b/protractor/create/CreateButton.js deleted file mode 100644 index 1c5afcdc34..0000000000 --- a/protractor/create/CreateButton.js +++ /dev/null @@ -1,40 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -//TODO Add filter for duplications/ -describe('Create Button', function() { - beforeEach(require('../common/Launch')); - //it('should hava title "My Items"', function(){ - // expect(browser.getTitle()).toEqual('My Items'); - //}); - it('should find create menu to be invisible', function(){ - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeFalsy(); - }); - it('should find create menu only visable after the create button clicked', function(){ - element(by.css('[ng-click="createController.toggle()"]')).click(); - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeTruthy(); - }); - it('should find create menu only visable after the create button clicked', function(){ - element(by.css('[ng-click="createController.toggle()"]')).click(); - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeTruthy(); - }); - -}); diff --git a/protractor/create/CreateClock.js b/protractor/create/CreateClock.js deleted file mode 100644 index 02dc81bb88..0000000000 --- a/protractor/create/CreateClock.js +++ /dev/null @@ -1,109 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var rightClick = require("../common/RightMenu"); -describe('Create Clock', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var rightClickClass = new rightClick(); - - var ITEM_NAME = "Clock"; - var ITEM_TYPE = "clock"; - var ITEM_MENU_GLYPH = 'C\nClock'; - var ITEM_GRID_SELECT = 'P\nC\nClock'; - beforeEach(require('../common/Launch')); - it('should Create new Clock', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - it('should check clock', function () { - - function getTime(flag) { - function addZero(time){ - if(time < 10){ - return '0' + time; - } - return time; - } - var currentdate = new Date(); - - var month = currentdate.getMonth() + 1; - month = addZero(month); - - var day = currentdate.getDate(); - day = addZero(day); - - var hour = currentdate.getHours() - 5; - hour = addZero(hour); - - var second = currentdate.getSeconds(); - if(flag == true) { - second = second + 1; - } - second = addZero(second); - - var minute = currentdate.getMinutes(); - minute = addZero(minute); - - return ("UTC " + currentdate.getFullYear() + "/" + (month) + "/" + - day + " " + (hour) + ":" + minute + ":" + second + " PM"); - } - this.addMatchers({ - toBeIn: function(expected){ - var posibilities = Array.isArray(this.actual) ? this.actual : [this.actual]; - return posibilities.indexOf(expected) > -1; - } - }) - rightClickClass.select(ITEM_MENU_GLYPH, true).click().then(function () { - browser.sleep(1000); - browser.executeScript(getTime, false).then(function(current){ - browser.executeScript(getTime, true).then(function(current1) { - var clock = element(by.css('.l-time-display.l-digital.l-clock.s-clock.ng-scope')); - clock.getText().then(function (ele) { - expect([current,current1]).toBeIn(ele); - }) - }); - }); - - }) - }); -}); diff --git a/protractor/create/CreateDisplay.js b/protractor/create/CreateDisplay.js deleted file mode 100644 index 716e0c3ebd..0000000000 --- a/protractor/create/CreateDisplay.js +++ /dev/null @@ -1,58 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Display', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Display"; - var ITEM_TYPE = "display"; - var ITEM_MENU_GLYPH = 'L\nDisplay Layout'; - var ITEM_GRID_SELECT = 'P\nL\nDisplay\n0 Items'; - - beforeEach(require('../common/Launch')); - it('should Create new Display', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/create/CreateFolder.js b/protractor/create/CreateFolder.js deleted file mode 100644 index d1731791b9..0000000000 --- a/protractor/create/CreateFolder.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -//TODO Add filter for duplications/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Folder', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - - beforeEach(require('../common/Launch')); - it('should Create new Folder', function(){ - - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/create/CreateSineWave.js b/protractor/create/CreateSineWave.js deleted file mode 100644 index 396e3c70b5..0000000000 --- a/protractor/create/CreateSineWave.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); - -describe('Create Sine Wave Generator', function() { - var createClass = new itemCreate(); - var ITEM_NAME = "Sine Wave G"; - var ITEM_TYPE = "sinewave"; - var ITEM_MENU_GLYPH = 'T\nSine Wave Generator' - beforeEach(require('../common/Launch')); - it('should Create new Sin Wave Generator' , function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - var ok = createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE); - browser.sleep(1000); - ok.click(); - }).then(function (){ - var checkfolder = element.all(by.css('.title.ng-binding')).filter(function (ele) { - return ele.getTagName('div').then(function (tag){ - return tag == 'div'; - }); - }) - expect(checkfolder.getText()).toEqual([ '', 'Sine Wave G' ]); - - }); - - }); - -}); diff --git a/protractor/create/CreateTelemetry.js b/protractor/create/CreateTelemetry.js deleted file mode 100644 index 1e12c3f266..0000000000 --- a/protractor/create/CreateTelemetry.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Telemetry', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Telemetry"; - var ITEM_TYPE = "telemetry"; - var ITEM_MENU_GLYPH = 't\nTelemetry Panel' - var ITEM_GRID_SELECT = 'P\nt\nTelemetry\n0 Items'; - - beforeEach(require('../common/Launch')); - - it('should Create new Telemetry', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/create/CreateTimeline.js b/protractor/create/CreateTimeline.js deleted file mode 100644 index 2f193fde3f..0000000000 --- a/protractor/create/CreateTimeline.js +++ /dev/null @@ -1,81 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Timeline', function() { - var createItemClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Timeline"; - var ITEM_TYPE = "timeline"; - var ITEM_MENU_GLYPH = 'S\nTimeline'; - var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; - beforeEach(require('../common/Launch')); - it('should Create Timeline', function(){ - //button.click() - browser.wait(function() { - createItemClass.createButton().click(); - return true; - }).then(function (){ - var folder = createItemClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createItemClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var fo= element.all(by.css('.item.grid-item.ng-scope')).filter(function (arg){ - return arg.getText().then(function (text) { - expect(text).toEqual("fh"); - return text == ITEM_GRID_SELECT; - }); - }); - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - - }); - }); - it('should Create Timeline Activity', function(){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - item.click(); - browser.sleep(1000); - expect(browser.getTitle()).toEqual(ITEM_NAME); - browser.sleep(1000); - var edit = editItemClass.EditButton(); - expect(edit.count()).toBe(1); - edit.click(); - browser.sleep(1000); - editItemClass.CreateActivity(); - var ok = createItemClass.fillFolderForum("Activity", "activity"); - browser.sleep(1000); - ok.click(); - browser.sleep(1000); - editItemClass.saveButton(); - //save.click(); - browser.sleep(5000); - }); - -}); diff --git a/protractor/create/CreateTimer.js b/protractor/create/CreateTimer.js deleted file mode 100644 index 666c820907..0000000000 --- a/protractor/create/CreateTimer.js +++ /dev/null @@ -1,74 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var rightClick = require("../common/RightMenu"); - -describe('Create Timer', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var rightMenu = new rightClick(); - - var ITEM_NAME = "Timer"; - var ITEM_TYPE = "timer"; - var ITEM_MENU_GLYPH = 'õ\nTimer'; - var ITEM_GRID_SELECT = 'P\nõ\nTimer'; - - beforeEach(require('../common/Launch')); - - it('should Create Timer', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1500); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - }); - it('should test Timer', function(){ - browser.sleep(2000) - rightMenu.reset(ITEM_MENU_GLYPH); - browser.sleep(1000) - var timer = element(by.css('.value.ng-binding.active')) - timer.getText().then(function (time) { - var timerChecker = false; - if(time == "0D 00:00:01" || time == "0D 00:00:02"){ - timerChecker = true; - } - expect(timerChecker).toEqual(true) - }) - }); - -}); diff --git a/protractor/create/CreateWebPage.js b/protractor/create/CreateWebPage.js deleted file mode 100644 index b7ac7dbd6e..0000000000 --- a/protractor/create/CreateWebPage.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Web Page', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Webpage"; - var ITEM_TYPE = "webpage"; - var ITEM_MENU_GLYPH = 'ê\nWeb Page'; - var ITEM_GRID_SELECT = 'P\nê\nWebpage'; - - beforeEach(require('../common/Launch')); - - it('should Create new Web Page', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem('webpage') - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/ctrl.sh b/protractor/ctrl.sh deleted file mode 100755 index 04d6ebcc45..0000000000 --- a/protractor/ctrl.sh +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/bash -ARGUMENT=$1; -DIRECTORY=/Users/jsanderf/Applications; - -if [ $# != 1 ]; then - echo "Expected 1 Aurgument. Received " $# 1>&2; - exit 1 -fi -#Start webdrive and http-server -if [ $ARGUMENT == start ]; then - echo - echo "Starting MMAP ..." - $DIRECTORY/MAMP/ctlscript.sh start > logs/MAMP.log 2>&1 & - wait $! - if [ $? != 0 ]; then - echo " Error: MMAP" - echo " Check Log file" - echo - else - echo " Started: MMAP" - echo - fi - echo "Starting webdriver ..." - webdriver-manager start > logs/webdriver.log 2>&1 & - sleep 3; - if grep -iq "Exception" logs/webdriver.log; then - echo " Error: webdriver-manager" - echo " Check Log file" - echo - else - echo " Started: webdriver-manager" - fi - echo "Starting Elastic Search..." - elasticsearch > logs/elasticSearch.log 2>&1 & - sleep 3; - if grep -iq "Exception" logs/elasticSearch.log; then - echo " Error: ElasticSearch" - echo " Check Log file" - echo - else - echo " Started: ElasticSearch" - fi -#Runs Protractor tests -elif [ $ARGUMENT == run ]; then - protractor ./conf.js -#Kill Process -elif [ $ARGUMENT == stop ]; then - echo "Stopping MAMP" - $DIRECTORY/MAMP/ctlscript.sh stop >> logs/MAMP.log 2>&1 & - sleep 1; - echo "Stopping webdriver ..." - kill $(ps aux | grep "[p]rotractor" | awk '{print $2}'); - kill $(ps aux | grep "[w]ebdriver-manager" | awk '{print $2}'); - sleep 1; - echo "Stopping Elastic..." - kill $(ps aux | grep "[e]lastic" | awk '{print $2}'); - sleep 1; -else - echo "Unkown: Command" $1; -fi diff --git a/protractor/delete/DeleteActivity.js b/protractor/delete/DeleteActivity.js deleted file mode 100644 index a9e9d48333..0000000000 --- a/protractor/delete/DeleteActivity.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Activity', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Activity"; - var ITEM_TYPE = "activity"; - var ITEM_MENU_GLYPH = 'a\nActivity'; - //var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; - var ITEM_SIDE_SELECT = ">\na\nActivity" - beforeEach(require('../common/Launch')); - it('should delete the Activity', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteActivityMode.js b/protractor/delete/DeleteActivityMode.js deleted file mode 100644 index 8568b1ac51..0000000000 --- a/protractor/delete/DeleteActivityMode.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Activity Mode', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Activity Mode"; - var ITEM_TYPE = "activity-mode"; - var ITEM_MENU_GLYPH = 'A\nActivity Mode'; - var ITEM_GRID_SELECT = 'P\nA\nActivity Mode'; - var ITEM_SIDE_SELECT = "A\nActivity Mode" - beforeEach(require('../common/Launch')); - it('should delete the Activty Mode', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteClock.js b/protractor/delete/DeleteClock.js deleted file mode 100644 index 600619db09..0000000000 --- a/protractor/delete/DeleteClock.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Clock', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Clock"; - var ITEM_TYPE = "clock"; - var ITEM_MENU_GLYPH = 'C\nClock'; - var ITEM_GRID_SELECT = 'P\nC\nClock'; - var ITEM_SIDE_SELECT = "C\nClock"; - beforeEach(require('../common/Launch')); - it('should delete the Clock', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteDisplay.js b/protractor/delete/DeleteDisplay.js deleted file mode 100644 index d33a1d1c94..0000000000 --- a/protractor/delete/DeleteDisplay.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Display', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Display"; - var ITEM_TYPE = "display"; - var ITEM_MENU_GLYPH = 'L\nDisplay Layout'; - var ITEM_GRID_SELECT = 'P\nL\nDisplay Layout'; - var ITEM_SIDE_SELECT = ">\nL\nDisplay" - beforeEach(require('../common/Launch')); - it('should delete the Dispay', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteFolder.js b/protractor/delete/DeleteFolder.js deleted file mode 100644 index d38c9b9910..0000000000 --- a/protractor/delete/DeleteFolder.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Folder', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - beforeEach(require('../common/Launch')); - it('should delete the folder', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteTelemetry.js b/protractor/delete/DeleteTelemetry.js deleted file mode 100644 index 447473fa4c..0000000000 --- a/protractor/delete/DeleteTelemetry.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Telemetry', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Telemetry"; - var ITEM_TYPE = "telemetry"; - var ITEM_MENU_GLYPH = 't\nTelemetry Panel' - var ITEM_GRID_SELECT = 'P\nt\nTelemetry\n0 Items'; - var ITEM_SIDE_SELECT = ">\nt\nTelemetry" - beforeEach(require('../common/Launch')); - it('should delete the Telemetry', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteTimeline.js b/protractor/delete/DeleteTimeline.js deleted file mode 100644 index 9230700cd9..0000000000 --- a/protractor/delete/DeleteTimeline.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Timeline', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Timeline"; - var ITEM_TYPE = "timeline"; - var ITEM_MENU_GLYPH = 'S\nTimeline'; - var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; - var ITEM_SIDE_SELECT = ">\nS\nTimeline" - beforeEach(require('../common/Launch')); - it('should delete the specified object', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteTimer.js b/protractor/delete/DeleteTimer.js deleted file mode 100644 index a1f1985905..0000000000 --- a/protractor/delete/DeleteTimer.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Timer', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Timer"; - var ITEM_TYPE = "timer"; - var ITEM_MENU_GLYPH = 'õ\nTimer'; - var ITEM_GRID_SELECT = 'P\nõ\nTimer'; - var ITEM_SIDE_SELECT = "õ\nTimer" - beforeEach(require('../common/Launch')); - it('should delete the Timer', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteWebPage.js b/protractor/delete/DeleteWebPage.js deleted file mode 100644 index dc6fd34e22..0000000000 --- a/protractor/delete/DeleteWebPage.js +++ /dev/null @@ -1,37 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Webpage', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Webpage"; - var ITEM_TYPE = "webpage"; - var ITEM_MENU_GLYPH = 'ê\nWeb Page'; - var ITEM_SIDE_SELECT = "ê\nWebpage" - beforeEach(require('../common/Launch')); - it('should delete the Webpage', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/package.json b/protractor/package.json deleted file mode 100644 index b43b9b1cdb..0000000000 --- a/protractor/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "ProtractorLauncher", - "version": "1.0.0", - "scripts" : { - "start" : "bin/start.js", - "protractor" : "bin/run.js", - "stop" : "bin/stop.js", - "all" : "bin/start.js; bin/run.js; bin/stop.js;", - "clean" : "bin/clean.js" - }, - "dependencies": { - "protractor": "^2.1.0", - "psnode": "0.0.1", - "shelljs": "^0.5.2", - "sleep": "^3.0.0", - "string": "^3.3.1" - }, - "description": "E2e Protractor Tests.", - "license": "ISC" -} diff --git a/protractor/stressTest/StressTest.js b/protractor/stressTest/StressTest.js deleted file mode 100644 index f5f7bc25be..0000000000 --- a/protractor/stressTest/StressTest.js +++ /dev/null @@ -1,78 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(5000); - for(var i=0; i < 25; i++){ - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(500); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(500); - }).then(function (){ - browser.sleep(500); - clickClass.delete(ITEM_SIDE_SELECT, true); - //element.all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).click(); - - - var MyItem = ">\nF\nMy Items" - element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - //expect(text).toEqual(MyItem); - return text === MyItem; - }); - }).all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).click(); - // clickClass.delete(ITEM_SIDE_SELECT, false); - }); - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestBubble.js b/protractor/stressTest/StressTestBubble.js deleted file mode 100644 index de77c5be7e..0000000000 --- a/protractor/stressTest/StressTestBubble.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/StressTestBubble.jsStressTestBubble.js -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(10000); - for(var i=0; i < 1000; i++){ - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === ">\nF\nMy Items"; - }); - }); - //browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - //browser.actions().click(protractor.Button.RIGHT).perform(); - - element.all(by.css('.items-holder.grid.abs.ng-scope')).click(); - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestCreateButton.js b/protractor/stressTest/StressTestCreateButton.js deleted file mode 100644 index 19699ba123..0000000000 --- a/protractor/stressTest/StressTestCreateButton.js +++ /dev/null @@ -1,56 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(10000); - for(var i=0; i < 1000; i++){ - createClass.createButton().click(); - - //browser.sleep(1000) - //browser.actions().mouseMove(object.get(0)).perform(); - //browser.actions().click(protractor.Button.RIGHT).perform(); - - element.all(by.css('.items-holder.grid.abs.ng-scope')).click(); - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestMenu.js b/protractor/stressTest/StressTestMenu.js deleted file mode 100644 index 4475d592c9..0000000000 --- a/protractor/stressTest/StressTestMenu.js +++ /dev/null @@ -1,55 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(10000); - for(var i=0; i < 1000; i++){ - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - element.all(by.css('.items-holder.grid.abs.ng-scope')).click(); - }) - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestNewPage.js b/protractor/stressTest/StressTestNewPage.js deleted file mode 100644 index df8f305818..0000000000 --- a/protractor/stressTest/StressTestNewPage.js +++ /dev/null @@ -1,61 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); -var fullScreenFile = require("../common/FullScreen"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var fullScreenClass = new fullScreenFile(); - - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(15000); - for(var i=0; i < 1000; i++){ - fullScreenClass.newWidnow().click(); - - browser.getAllWindowHandles().then(function (handles) { - //browser.driver.switchTo().window(handles[1]); - browser.sleep(1000); - browser.driver.close(); - browser.sleep(1000); - // browser.driver.switchTo().window(handles[0]); - }); - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestRightClick.js b/protractor/stressTest/StressTestRightClick.js deleted file mode 100644 index abd51a256b..0000000000 --- a/protractor/stressTest/StressTestRightClick.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(8000); - for(var i=0; i < 1000; i++){ - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === ">\nF\nMy Items"; - }); - }); - //browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - browser.actions().click(protractor.Button.RIGHT).perform(); - - element.all(by.css('.items-holder.grid.abs.ng-scope')).click(); - } - browser.pause(); - - }); - -}); From 39f2f94a535413c093d03e8178a693277859faa2 Mon Sep 17 00:00:00 2001 From: Derek Webb Date: Sat, 27 Aug 2016 21:00:37 -0400 Subject: [PATCH 024/150] Info bubbles now allow the user to copy text from them (issue #101) --- platform/commonUI/general/res/sass/helpers/_bubbles.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index e4cc8a2797..16bc08f0b4 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -21,9 +21,6 @@ *****************************************************************************/ //************************************************* GENERAL -.bubble-container { - pointer-events: none; -} //************************************************* LAYOUT From 08eaa822fe5545250fc2622f6476e768674c436c Mon Sep 17 00:00:00 2001 From: Derek Webb Date: Sat, 27 Aug 2016 21:29:30 -0400 Subject: [PATCH 025/150] Removing use of bubble-container class (issue #101) --- platform/commonUI/inspect/src/InfoConstants.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/commonUI/inspect/src/InfoConstants.js b/platform/commonUI/inspect/src/InfoConstants.js index 3eb6df921d..959f475a94 100644 --- a/platform/commonUI/inspect/src/InfoConstants.js +++ b/platform/commonUI/inspect/src/InfoConstants.js @@ -29,8 +29,7 @@ define({ BUBBLE_TEMPLATE: "" + + "bubble-layout=\"{{bubbleLayout}}\">" + "" + "" + From 89f2e0943c0b1a4ca21aa364a732cc517c01f879 Mon Sep 17 00:00:00 2001 From: Dhrubomoy Das Gupta Date: Sun, 28 Aug 2016 02:02:18 -0400 Subject: [PATCH 026/150] [Documentation] Fixed typo "Framework.md" was showing a 404 error. Changed it to "framework.md", which is the actual file name. --- docs/src/architecture/platform.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/architecture/platform.md b/docs/src/architecture/platform.md index 1f5e087a11..5fdffb6cfc 100644 --- a/docs/src/architecture/platform.md +++ b/docs/src/architecture/platform.md @@ -1,6 +1,6 @@ # Overview -The Open MCT platform utilizes the [framework layer](Framework.md) +The Open MCT platform utilizes the [framework layer](framework.md) to provide an extensible baseline for applications which includes: * A common user interface (and user interface paradigm) for dealing with From 542dea69a1fc8f0626c6e5a98db7c2e0504f3deb Mon Sep 17 00:00:00 2001 From: Alex M Date: Sun, 28 Aug 2016 14:50:15 +0300 Subject: [PATCH 027/150] [Documentation] Fix added lines in tutorial --- docs/src/tutorials/index.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/src/tutorials/index.md b/docs/src/tutorials/index.md index 038f76cf5c..250f9bb888 100644 --- a/docs/src/tutorials/index.md +++ b/docs/src/tutorials/index.md @@ -2746,14 +2746,14 @@ with the platform): ```diff define([ 'legacyRegistry', - './src/ExampleTelemetryServerAdapter', - './src/ExampleTelemetryInitializer', - './src/ExampleTelemetryModelProvider' ++ './src/ExampleTelemetryServerAdapter', ++ './src/ExampleTelemetryInitializer', ++ './src/ExampleTelemetryModelProvider' ], function ( legacyRegistry, - ExampleTelemetryServerAdapter, - ExampleTelemetryInitializer, - ExampleTelemetryModelProvider ++ ExampleTelemetryServerAdapter, ++ ExampleTelemetryInitializer, ++ ExampleTelemetryModelProvider ) { legacyRegistry.register("tutorials/telemetry", { "name": "Example Telemetry Adapter", @@ -2764,7 +2764,7 @@ define([ "key": "example.spacecraft", "glyph": "o" }, - { ++ { + "name": "Subsystem", + "key": "example.subsystem", + "glyph": "o", From 0e24de2b697ee9b0b02d4f635bdbc960911eb4c1 Mon Sep 17 00:00:00 2001 From: Abner Terribili Date: Sun, 28 Aug 2016 09:33:23 -0300 Subject: [PATCH 028/150] Add .swp to git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index aacf7f9728..b8eea4a5be 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.gzip *.tgz *.DS_Store +*.swp # Compiled CSS, unless directly added *.sass-cache From 5a819a96def2027bf457355298afb375b4df94da Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 22 Aug 2016 15:24:27 -0700 Subject: [PATCH 029/150] [Build] Add gulp-nsp dependency ...to begin integrating checks for vulnerabilities in dependencies, fixes #1130. --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index f825d33a71..77589c54ce 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0", "gulp-jshint-html-reporter": "^0.1.3", + "gulp-nsp": "^2.4.2", "gulp-rename": "^1.2.2", "gulp-replace-task": "^0.11.0", "gulp-requirejs-optimize": "^0.3.1", From 05e88e5dcf73a7afe7f5ad5aeea00946ef65405e Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 22 Aug 2016 15:32:08 -0700 Subject: [PATCH 030/150] [Build] Add NSP task ...to check dependencies for known vulnerabilities. --- gulpfile.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gulpfile.js b/gulpfile.js index ff994c6a2c..5bacb58ef9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -103,6 +103,11 @@ gulp.task('stylesheets', function () { .pipe(gulp.dest(__dirname)); }); +gulp.task('nsp', function (done) { + var nsp = require('gulp-nsp'); + nsp({package: __dirname + '/package.json'}, done); +}); + gulp.task('lint', function () { var nonspecs = paths.specs.map(function (glob) { return "!" + glob; From 64d8b5fcd1c9a07f49f9ea040d121df0c6e74947 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 22 Aug 2016 15:32:44 -0700 Subject: [PATCH 031/150] [Build] Incluse NSP in verify tasks --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 5bacb58ef9..bf52224863 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -157,6 +157,6 @@ gulp.task('develop', ['serve', 'stylesheets', 'watch']); gulp.task('install', [ 'static', 'scripts' ]); -gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]); +gulp.task('verify', [ 'lint', 'test', 'checkstyle', 'nsp' ]); gulp.task('build', [ 'verify', 'install' ]); From 6cbdaa442b4c8c4666cff9c61560a5fb05f0c83d Mon Sep 17 00:00:00 2001 From: Kevin Van Kessel Date: Sun, 28 Aug 2016 12:01:42 -0700 Subject: [PATCH 032/150] [Search] Repurposed checkAll test. #1117 Changed test to ensure checkAll and it's appropriate filter string are set whenever checkAll is changed. Removed redundant line checking for a filter string of 'NONE' as this is no longer a possibility. --- platform/search/test/controllers/SearchMenuControllerSpec.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/search/test/controllers/SearchMenuControllerSpec.js b/platform/search/test/controllers/SearchMenuControllerSpec.js index be4443d4cf..611f0d5a08 100644 --- a/platform/search/test/controllers/SearchMenuControllerSpec.js +++ b/platform/search/test/controllers/SearchMenuControllerSpec.js @@ -76,13 +76,15 @@ define( expect(mockScope.ngModel.filtersString).not.toEqual(''); }); - it("changing checkAll status updates the filter string", function () { + it("changing checkAll status sets checkAll to true", function () { controller.checkAll(); + expect(mockScope.ngModel.checkAll).toEqual(true); expect(mockScope.ngModel.filtersString).toEqual(''); mockScope.ngModel.checkAll = false; controller.checkAll(); + expect(mockScope.ngModel.checkAll).toEqual(true); expect(mockScope.ngModel.filtersString).toEqual(''); }); @@ -117,7 +119,6 @@ define( controller.updateOptions(); - expect(mockScope.ngModel.filtersString).not.toEqual('NONE'); expect(mockScope.ngModel.filtersString).not.toEqual(''); }); }); From dd4e20cfb52df17d169c694ed804c33c99951a55 Mon Sep 17 00:00:00 2001 From: Dhrubomoy Das Gupta Date: Mon, 29 Aug 2016 11:30:36 -0400 Subject: [PATCH 033/150] [Documentation] Updated /architecture/index.md maintaing -> maintaining --- docs/src/architecture/index.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/src/architecture/index.md b/docs/src/architecture/index.md index a4586a3542..6f2fbcfcef 100644 --- a/docs/src/architecture/index.md +++ b/docs/src/architecture/index.md @@ -6,7 +6,7 @@ overall architecture of Open MCT. The target audience includes: * _Platform maintainers_: Individuals involved in developing, - extending, and maintaing capabilities of the platform. + extending, and maintaining capabilities of the platform. * _Integration developers_: Individuals tasked with integrated Open MCT into a larger system, who need to understand its inner workings sufficiently to complete this integration. @@ -63,7 +63,7 @@ These layers are: application-specific knowledge; at this layer, we have only established an abstraction by which different software components may communicate and/or interact. -* [_Platform_](platform.md): The platform layer defines the general look, +* [_Platform_](platform.md): The platform layer defines the general look, feel, and behavior of Open MCT. This includes user-facing components like Browse mode and Edit mode, as well as underlying elements of the information model and the general service infrastructure. @@ -74,5 +74,3 @@ These layers are: typically consists of a mix of custom plug-ins to Open MCT, as well as optional features (such as Plot view) included alongside the platform. - - From b8eeeaeede8158e000a61de0cbb688b023b6ae68 Mon Sep 17 00:00:00 2001 From: Dhrubomoy Das Gupta Date: Mon, 29 Aug 2016 11:41:38 -0400 Subject: [PATCH 034/150] [Documentation] Updated /architecture/platform.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changing following two words makes them a bit easier to read: look­and­feel -> look-­and-­feel userfacing -> user-facing --- docs/src/architecture/platform.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/architecture/platform.md b/docs/src/architecture/platform.md index 5fdffb6cfc..f7f0c48cda 100644 --- a/docs/src/architecture/platform.md +++ b/docs/src/architecture/platform.md @@ -38,7 +38,7 @@ in __any of these tiers__. are initiated from here and invoke behavior in the presentation layer. HTML  templates are written in Angular’s template syntax; see the [Angular documentation on templates](https://docs.angularjs.org/guide/templates)​.  These describe the page as actually seen by the user. Conceptually,  - stylesheets (controlling the look­and­feel of the rendered templates) belong  + stylesheets (controlling the look-and-feel of the rendered templates) belong  in this grouping as well.  * [_Presentation layer_](#presentation-layer): The presentation layer is responsible for updating (and providing information to update) @@ -48,7 +48,7 @@ in __any of these tiers__. display. * [_Information model_](#information-model): ​Provides a common (within Open MCT  Web) set of interfaces for dealing with “things” ­ domain objects ­ within the  - system. User­facing concerns in a Open MCT Web application are expressed as  + system. User-facing concerns in a Open MCT Web application are expressed as  domain objects; examples include folders (used to organize other domain  objects), layouts (used to build displays), or telemetry points (used as  handles for streams of remote measurements.) These domain objects expose a  From fe00d3e50141c5495e9dd7968bdb6aeef34c06cb Mon Sep 17 00:00:00 2001 From: Dhrubomoy Das Gupta Date: Mon, 29 Aug 2016 11:54:14 -0400 Subject: [PATCH 035/150] [Documentation] Updated APIRedesign.md Contributer -> Contributor effects -> affects (Effect is usually used as a noun. When an "s" is added, "effects" means personal belongings) --- docs/src/design/proposals/APIRedesign.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/design/proposals/APIRedesign.md b/docs/src/design/proposals/APIRedesign.md index d14f4ce469..e6230823ed 100644 --- a/docs/src/design/proposals/APIRedesign.md +++ b/docs/src/design/proposals/APIRedesign.md @@ -180,7 +180,7 @@ to develop a tabular visualization plugin. * Add a model property to the bundle.json to take in "Hello World" as a parameter and pass through to the controller/view -### Open Source Contributer +### Open Source Contributor * [Failures are non-graceful when services are missing.]( https://github.com/nasa/openmctweb/issues/79) @@ -214,7 +214,7 @@ to an entirely different framework. We can expect AngularJS 1.x to reach end-of-life reasonably soon thereafter. -Our API is currently a superset of Angular's API, so this directly effects +Our API is currently a superset of Angular's API, so this directly affects our API. Specifically, API changes should be oriented towards removing or reducing the Angular dependency. From cbb7ada63c44340fdf60118c482236e20c2607ca Mon Sep 17 00:00:00 2001 From: Dhrubomoy Das Gupta Date: Mon, 29 Aug 2016 12:01:11 -0400 Subject: [PATCH 036/150] [Documentation] Update APIRedesign_PeteRichards.md imperitive -> imperative set up -> setup compiliation -> compilation --- docs/src/design/proposals/APIRedesign_PeteRichards.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/src/design/proposals/APIRedesign_PeteRichards.md b/docs/src/design/proposals/APIRedesign_PeteRichards.md index 3fa78fe2ed..dce80c41ae 100644 --- a/docs/src/design/proposals/APIRedesign_PeteRichards.md +++ b/docs/src/design/proposals/APIRedesign_PeteRichards.md @@ -3,7 +3,7 @@ **Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - [Reducing interface depth (the bundle.json version)](#reducing-interface-depth-the-bundlejson-version) - - [Imperitive component registries](#imperitive-component-registries) + - [Imperitive component registries](#imperative-component-registries) - [Get rid of "extension category" concept.](#get-rid-of-extension-category-concept) - [Reduce number and depth of extension points](#reduce-number-and-depth-of-extension-points) - [Composite services should not be the default](#composite-services-should-not-be-the-default) @@ -30,11 +30,11 @@ # Reducing interface depth (the bundle.json version) -## Imperitive component registries +## Imperative component registries Transition component registries to javascript, get rid of bundle.json and bundles.json. Prescribe a method for application configuration, but allow flexibility in how application configuration is defined. -Register components in an imperitive fashion, see angularApp.factory, angularApp.controller, etc. Alternatively, implement our own application object with new registries and it's own form of registering objects. +Register components in an imperative fashion, see angularApp.factory, angularApp.controller, etc. Alternatively, implement our own application object with new registries and it's own form of registering objects. ## Get rid of "extension category" concept. @@ -126,9 +126,9 @@ Allow developers to use whatever module loading system they'd like to use, while ## Use gulp or grunt for standard tooling -Using gulp or grunt as a task runner would bring us in line with standard web developer workflows and help standardize rendering, deployment, and packaging. Additional tools can be added to the workflow at low cost, simplifying the set up of developer environments. +Using gulp or grunt as a task runner would bring us in line with standard web developer workflows and help standardize rendering, deployment, and packaging. Additional tools can be added to the workflow at low cost, simplifying the setup of developer environments. -Gulp and grunt provide useful developer tooling such as live reload, automatic scss/less/etc compiliation, and ease of extensibility for standard production build processes. They're key in decoupling code. +Gulp and grunt provide useful developer tooling such as live reload, automatic scss/less/etc compilation, and ease of extensibility for standard production build processes. They're key in decoupling code. ## Package openmctweb as single versioned file. From 6b8a2a7770081942a510ce45e5968d7c0646a9ea Mon Sep 17 00:00:00 2001 From: Dhrubomoy Das Gupta Date: Mon, 29 Aug 2016 12:12:59 -0400 Subject: [PATCH 037/150] [Documentation] Update /docs/src/guide/index.md work flow -> workflow (one word) domaiwn -> domain (typo) pop up -> popup (one word) --- docs/src/guide/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md index 081f1df45a..308ca6d2c1 100644 --- a/docs/src/guide/index.md +++ b/docs/src/guide/index.md @@ -643,7 +643,7 @@ to be passed along by other services. ## Domain Objects Domain objects are the most fundamental component of Open MCT's information -model. A domain object is some distinct thing relevant to a user's work flow, +model. A domain object is some distinct thing relevant to a user's workflow, such as a telemetry channel, display, or similar. Open MCT is a tool for viewing, browsing, manipulating, and otherwise interacting with a graph of domain objects. @@ -981,7 +981,7 @@ Examples of gestures included in the platform are: composition. * `drop`: For representations that can be drop targets for drag-and-drop composition. -* `menu`: For representations that can be used to pop up a context menu. +* `menu`: For representations that can be used to popup a context menu. Gesture definitions have a property `key` which is used as a machine-readable identifier for the gesture (e.g. `drag`, `drop`, `menu` above.) @@ -1153,7 +1153,7 @@ For example, the _My Items_ folder is added as an extension of this category. Extensions of this category should have the following properties: -* `id`: The machine-readable identifier for the domaiwn object being exposed. +* `id`: The machine-readable identifier for the domain object being exposed. * `model`: The model, as a JSON object, for the domain object being exposed. ## Stylesheets Category From c3d158584bbaa995dbb043810f000526d711828e Mon Sep 17 00:00:00 2001 From: Dhrubomoy Das Gupta Date: Mon, 29 Aug 2016 12:23:21 -0400 Subject: [PATCH 038/150] [Documentation] Update ../process/testing/plan.md Clicking `Long-duration testing` was showing the right doc but wrong section due to typo in `procedures.md#long-duration-testng`. Fixed it, so now clicking `Long-duration testing` will take us to the right section. --- docs/src/process/testing/plan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index 47ab60ee34..34e75855c9 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -102,7 +102,7 @@ perform: * A relevant subset of [_user testing_](procedures.md#user-test-procedures) identified by the acting [project manager](../cycle.md#roles). -* [_Long-duration testing_](procedures.md#long-duration-testng) +* [_Long-duration testing_](procedures.md#long-duration-testing) (specifically, for 24 hours.) Issues are reported as a product of both forms of testing. From f0064fd91ff7928445fdaa6856b83ca671367bf5 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 29 Aug 2016 10:58:02 -0700 Subject: [PATCH 039/150] [README] Warn about root installation issues Mitigates #1151. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cce52a9921..3bdb9835d2 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Differences between the two APIs include a move away from a declarative system o ## Building and Running Open MCT Locally Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website. +(These instructions assume you are installing as a non-root user; developers have [reported issues](https://github.com/nasa/openmct/issues/1151) running these steps with root privileges.) 1. Clone the source code From 2e8d021a6ab22361cc028a6a9f16cb3b2666017b Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 9 Aug 2016 16:06:53 -0700 Subject: [PATCH 040/150] [Frontend] Improve layout of "locator" Fixes #1118 Locator in Save In, Move, etc. dialog now expands vertically to use as much vertical as possible; --- .../edit/src/creation/CreateWizard.js | 4 +- .../commonUI/general/res/sass/_inspector.scss | 2 +- .../general/res/sass/forms/_elems.scss | 28 ++++++--- .../src/actions/AbstractComposeAction.js | 2 +- .../entanglement/src/actions/CopyAction.js | 2 +- .../src/services/LocationService.js | 1 + platform/forms/res/templates/form.html | 62 +++++++++---------- 7 files changed, 59 insertions(+), 42 deletions(-) diff --git a/platform/commonUI/edit/src/creation/CreateWizard.js b/platform/commonUI/edit/src/creation/CreateWizard.js index 37ef530dbd..6921ca8669 100644 --- a/platform/commonUI/edit/src/creation/CreateWizard.js +++ b/platform/commonUI/edit/src/creation/CreateWizard.js @@ -90,7 +90,9 @@ define( // Ensure there is always a "save in" section if (includeLocation) { sections.push({ - name: 'Location', rows: [{ + name: 'Location', + cssclass: "grows", + rows: [{ name: "Save In", control: "locator", validate: validateLocation, diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index bb325dbe17..7d30c978af 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -71,7 +71,7 @@ .form { margin-bottom: $interiorMarginSm; padding-bottom: $interiorMarginLg; - .form-section { + .l-section-body { margin-bottom: 0; &:not(.first) { border-top: 1px solid $colorFormLines; diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index d8de2fc435..1e0cdefa13 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -25,11 +25,21 @@ .form { color: $colorFormText; + height: 100%; width: 100%; - .form-section { - position: relative; - margin-bottom: $interiorMarginLg * 2; - } + + .l-form-section { + position: relative; + &.grows { + .l-section-body, + .form-row { + @include flex(1 1 auto); + .wrapper { + height: 100%; + } + } + } + } .section-header { border-radius: $basicCr; @@ -43,10 +53,14 @@ .form-row { $m: $interiorMargin; box-sizing: border-box; - @include clearfix; border-top: 1px solid $colorFormLines; + margin-bottom: $interiorMarginLg * 2; padding: $formTBPad 0; position: relative; + //&ng-form { + // display: block; + //} + &.first { border-top: none; } @@ -92,9 +106,9 @@ .selector-list { // Used in create overlay to display tree view @include nice-input(); - $h: 150px; position: relative; - height: $h; + min-height: 150px; + height: 100%; >.wrapper { $p: $interiorMargin; overflow: auto; diff --git a/platform/entanglement/src/actions/AbstractComposeAction.js b/platform/entanglement/src/actions/AbstractComposeAction.js index 3b43d568d9..943c2adb0a 100644 --- a/platform/entanglement/src/actions/AbstractComposeAction.js +++ b/platform/entanglement/src/actions/AbstractComposeAction.js @@ -95,7 +95,7 @@ define( this.locationService = locationService; this.composeService = composeService; this.verb = verb || "Compose"; - this.suffix = suffix || "to a new location"; + this.suffix = suffix || "To a New Location"; } AbstractComposeAction.prototype.cloneContext = function () { diff --git a/platform/entanglement/src/actions/CopyAction.js b/platform/entanglement/src/actions/CopyAction.js index 805b5f48ba..6388c25b74 100644 --- a/platform/entanglement/src/actions/CopyAction.js +++ b/platform/entanglement/src/actions/CopyAction.js @@ -54,7 +54,7 @@ define( copyService, context, "Duplicate", - "to a location" + "To a Location" ); } diff --git a/platform/entanglement/src/services/LocationService.js b/platform/entanglement/src/services/LocationService.js index 4ecf5d982b..7cb92265f5 100644 --- a/platform/entanglement/src/services/LocationService.js +++ b/platform/entanglement/src/services/LocationService.js @@ -58,6 +58,7 @@ define( sections: [ { name: 'Location', + cssclass: "grows", rows: [ { name: label, diff --git a/platform/forms/res/templates/form.html b/platform/forms/res/templates/form.html index 4326aead68..376dc152d7 100644 --- a/platform/forms/res/templates/form.html +++ b/platform/forms/res/templates/form.html @@ -19,39 +19,39 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
- -
+ + +
{{section.name}}
-
- -
-
- {{row.name}} -
-
-
- - -
-
+ +
+ {{row.name}} +
+
+
+ +
- -
+
+ \ No newline at end of file From b48ca991196d9442a8147dce9b1347c184169577 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 9 Aug 2016 23:08:25 -0700 Subject: [PATCH 041/150] [Frontend] Sanding on larger locator control Fixes #1118 --- platform/commonUI/general/res/sass/forms/_elems.scss | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index 1e0cdefa13..186dd2f84f 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -106,17 +106,14 @@ .selector-list { // Used in create overlay to display tree view @include nice-input(); + padding: $interiorMargin; position: relative; min-height: 150px; height: 100%; >.wrapper { $p: $interiorMargin; + box-sizing: border-box; overflow: auto; - position: absolute; - top: $p; - right: $p; - bottom: $p; - left: $p; } } } From 1a284ac9dcc413dbf257603fe0e9264092f2d5b0 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 10 Aug 2016 10:10:25 -0700 Subject: [PATCH 042/150] [Frontend] Proper classes added to text input configs Fixes #1108 --- example/plotOptions/bundle.js | 2 +- platform/features/fixed/bundle.js | 5 +++-- platform/features/layout/bundle.js | 5 +++-- platform/features/layout/src/elements/ElementFactory.js | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/example/plotOptions/bundle.js b/example/plotOptions/bundle.js index 66a2e81937..ae47d2a97c 100644 --- a/example/plotOptions/bundle.js +++ b/example/plotOptions/bundle.js @@ -129,7 +129,7 @@ define([ { "name": "Period", "control": "textfield", - "cssclass": "l-small l-numeric", + "cssclass": "l-input-sm l-numeric", "key": "period", "required": true, "property": [ diff --git a/platform/features/fixed/bundle.js b/platform/features/fixed/bundle.js index 890df811a3..e2e40ff511 100644 --- a/platform/features/fixed/bundle.js +++ b/platform/features/fixed/bundle.js @@ -139,6 +139,7 @@ define([ "dialog": { "control": "textfield", "name": "Image URL", + "cssclass": "l-input-lg", "required": true } }, @@ -213,12 +214,12 @@ define([ { "name": "Horizontal grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" }, { "name": "Vertical grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" } ], "pattern": "^(\\d*[1-9]\\d*)?$", diff --git a/platform/features/layout/bundle.js b/platform/features/layout/bundle.js index 7e976f3da1..134b0f68a4 100644 --- a/platform/features/layout/bundle.js +++ b/platform/features/layout/bundle.js @@ -169,6 +169,7 @@ define([ "dialog": { "control": "textfield", "name": "Image URL", + "cssclass": "l-input-lg", "required": true } }, @@ -329,12 +330,12 @@ define([ { "name": "Horizontal grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" }, { "name": "Vertical grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" } ], "pattern": "^(\\d*[1-9]\\d*)?$", diff --git a/platform/features/layout/src/elements/ElementFactory.js b/platform/features/layout/src/elements/ElementFactory.js index 2e686de192..121f94176e 100644 --- a/platform/features/layout/src/elements/ElementFactory.js +++ b/platform/features/layout/src/elements/ElementFactory.js @@ -55,6 +55,7 @@ define( key: "url", control: "textfield", name: "Image URL", + "cssclass": "l-input-lg", required: true } ] From cc6b9d4099b2ac7d1bff828be76ce9eb1f2a3e79 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 10 Aug 2016 16:43:14 -0700 Subject: [PATCH 043/150] [Frontend] Revised mobile styles for form layout Fixes #1118 --- .../res/sass/mobile/overlay/_overlay.scss | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss index a5459aa1d9..1feb4f1c9a 100644 --- a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss @@ -25,7 +25,6 @@ @include phone { .overlay > .holder { - //@include test(orange); // This works! $m: 0; border-radius: $m; top: $m; @@ -38,36 +37,30 @@ overflow: auto; @include transform(none); - .editor .form .form-row { - > .label, - > .controls { - //@include test(blue); - display: block; - float: none; - width: 100%; - } - > .label { - &:after { - float: none; + .editor .form .form-row.l-flex-row { + // Display elements in a columnar view + @include flex-direction(column); + > .flex-elem { + &:not(:first-child) { + margin-top: $interiorMargin; + } + &.label { + width: 100%; + } + &.controls { + overflow: auto; } } - } - - .contents { - .abs.top-bar, - .abs.editor, - .abs.message-body, - .abs.bottom-bar { - //@include test(orange); - top: auto; right: auto; bottom: auto; left: auto; - height: auto; width: auto; - margin-bottom: $interiorMarginLg * 2; + + &.validates > .label:before { position: relative; + right: auto; + line-height: inherit; + margin-right: $interiorMargin; } } } .t-dialog-sm .overlay > .holder { - //@include test(blue); height: auto; max-height: 100%; } } From 2c2d9c1bfed11cfa0a6569c7921461921e87c41d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 29 Aug 2016 14:26:27 -0700 Subject: [PATCH 044/150] [Frontend] Updated test specs Fixes #1118 --- platform/entanglement/test/actions/AbstractComposeActionSpec.js | 2 +- platform/entanglement/test/actions/CopyActionSpec.js | 2 +- platform/entanglement/test/actions/LinkActionSpec.js | 2 +- platform/entanglement/test/actions/MoveActionSpec.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/entanglement/test/actions/AbstractComposeActionSpec.js b/platform/entanglement/test/actions/AbstractComposeActionSpec.js index cc7e59bc09..80fde42748 100644 --- a/platform/entanglement/test/actions/AbstractComposeActionSpec.js +++ b/platform/entanglement/test/actions/AbstractComposeActionSpec.js @@ -150,7 +150,7 @@ define( it("prompts for location", function () { expect(locationService.getLocationFromUser) .toHaveBeenCalledWith( - "Compose selectedObject to a new location", + "Compose selectedObject To a New Location", "Compose To", jasmine.any(Function), currentParent diff --git a/platform/entanglement/test/actions/CopyActionSpec.js b/platform/entanglement/test/actions/CopyActionSpec.js index a626268440..380d5ebd18 100644 --- a/platform/entanglement/test/actions/CopyActionSpec.js +++ b/platform/entanglement/test/actions/CopyActionSpec.js @@ -173,7 +173,7 @@ define( it("prompts for location", function () { expect(locationService.getLocationFromUser) .toHaveBeenCalledWith( - "Duplicate selectedObject to a location", + "Duplicate selectedObject To a Location", "Duplicate To", jasmine.any(Function), currentParent diff --git a/platform/entanglement/test/actions/LinkActionSpec.js b/platform/entanglement/test/actions/LinkActionSpec.js index c04e14f2a4..f7930bf0dd 100644 --- a/platform/entanglement/test/actions/LinkActionSpec.js +++ b/platform/entanglement/test/actions/LinkActionSpec.js @@ -126,7 +126,7 @@ define( it("prompts for location", function () { expect(locationService.getLocationFromUser) .toHaveBeenCalledWith( - "Link selectedObject to a new location", + "Link selectedObject To a New Location", "Link To", jasmine.any(Function), currentParent diff --git a/platform/entanglement/test/actions/MoveActionSpec.js b/platform/entanglement/test/actions/MoveActionSpec.js index 7226ecb2ec..bc5398d599 100644 --- a/platform/entanglement/test/actions/MoveActionSpec.js +++ b/platform/entanglement/test/actions/MoveActionSpec.js @@ -126,7 +126,7 @@ define( it("prompts for location", function () { expect(locationService.getLocationFromUser) .toHaveBeenCalledWith( - "Move selectedObject to a new location", + "Move selectedObject To a New Location", "Move To", jasmine.any(Function), currentParent From a7f830177a2c67d82024d73b620d524e7f79dee2 Mon Sep 17 00:00:00 2001 From: Derek Webb Date: Mon, 29 Aug 2016 18:33:48 -0400 Subject: [PATCH 045/150] [Context Menu] New Tab button available in edit mode. #843 --- platform/commonUI/edit/bundle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 2c5a79bda3..33d92f913c 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -387,7 +387,7 @@ define([ "constants": [ { "key": "editModeBlacklist", - "value": ["copy", "follow", "window", "link", "locate"] + "value": ["copy", "follow", "link", "locate"] }, { "key": "nonEditContextBlacklist", From 98486f718baf6a6f0d07fb170920e4746d80cc7d Mon Sep 17 00:00:00 2001 From: raoulsullivan Date: Tue, 30 Aug 2016 18:59:31 +0100 Subject: [PATCH 046/150] [proxyUrl] pass URL parameters to proxied URL Addresses issue #1158 Passes query parameters on to proxyUrl proxied URL remove the url parameter before passing Naming convention for variables Re-order code to reuse variable --- app.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 6b7b1bb635..20429a3a5f 100644 --- a/app.js +++ b/app.js @@ -67,10 +67,14 @@ }); app.use('/proxyUrl', function proxyRequest(req, res, next) { - console.log('Proxying request to: ', req.query.url); + var targetUrl = req.query.url; + var queryParameters = req.query; + console.log('Proxying request to: ', targetUrl); + delete queryParameters['url']; req.pipe(request({ - url: req.query.url, - strictSSL: false + url: targetUrl, + strictSSL: false, + qs: queryParameters }).on('error', next)).pipe(res); }); From 3a25704f4142cf2eed2ff5a4ab0aa4b6639b50de Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 30 Aug 2016 13:55:37 -0700 Subject: [PATCH 047/150] [README] Add link to KSP plugin Add link to David Hudson's Kerbal Space Program plugin from #1146, along with other information about Examples relevant in that context. Resolves #1064 --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index cce52a9921..c19be6ee1d 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,22 @@ Open MCT is now running, and can be accessed by pointing a web browser at [http: Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). The documentation can also be built locally. +### Examples + +The clearest examples for developing Open MCT plugins are in the +[tutorials](https://nasa.github.io/openmct/docs/tutorials/) provided in +our documentation. + +For a practical example of a telemetry adapter, see David Hudson's +[Kerbal Space Program plugin](https://github.com/hudsonfoo/kerbal-openmct), +which allows [Kerbal Space Program](https://kerbalspaceprogram.com) players +to build and use displays for their own missions in Open MCT. + +Additional examples are available in the `examples` hierarchy of this +repository; however, be aware that these examples are +[not fully-documented](https://github.com/nasa/openmct/issues/846), so +the tutorials will likely serve as a better starting point. + ### Building the Open MCT Documentation Locally Open MCT's documentation is generated by an [npm](https://www.npmjs.com/)-based build. It has additional dependencies that From fc7d2672db7f1a99b7824c1ff1aa3c49d725ba3c Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 30 Aug 2016 14:01:28 -0700 Subject: [PATCH 048/150] [Build] Remove SNAPSHOT status ...to close sprint Orwell, https://github.com/nasa/openmct/milestones/Orwell --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 77589c54ce..f63e661565 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "0.11.2-SNAPSHOT", + "version": "0.11.2", "description": "The Open MCT core platform", "dependencies": { "express": "^4.13.1", From 6364bbc6b320ecb4669cdae6046eb9db0f08d2ca Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 30 Aug 2016 14:10:48 -0700 Subject: [PATCH 049/150] [Build] Restore SNAPSHOT status ...to begin sprint Pratchett, https://github.com/nasa/openmct/milestones/Pratchett --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f63e661565..491904fe4d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "0.11.2", + "version": "0.11.3-SNAPSHOT", "description": "The Open MCT core platform", "dependencies": { "express": "^4.13.1", From 852ac3cd550f3173556c168e81677e8d8d7b262c Mon Sep 17 00:00:00 2001 From: David Hudson Date: Wed, 31 Aug 2016 23:03:48 +0900 Subject: [PATCH 050/150] [Enhancement] Quick prototype of PDF export --- bower.json | 4 +++- main.js | 19 +++++++++++++++++++ platform/features/plot/src/GLChart.js | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 7c913754cf..670cbd4b70 100644 --- a/bower.json +++ b/bower.json @@ -18,6 +18,8 @@ "node-uuid": "^1.4.7", "comma-separated-values": "^3.6.4", "FileSaver.js": "^0.0.2", - "zepto": "^1.1.6" + "zepto": "^1.1.6", + "html2canvas": "^0.4.1", + "jspdf": "^1.2.61" } } diff --git a/main.js b/main.js index 268c70060d..668f3409e2 100644 --- a/main.js +++ b/main.js @@ -28,6 +28,8 @@ requirejs.config({ "angular-route": "bower_components/angular-route/angular-route.min", "csv": "bower_components/comma-separated-values/csv.min", "es6-promise": "bower_components/es6-promise/promise.min", + "html2canvas": "bower_components/html2canvas/build/html2canvas.min", + "jspdf": "bower_components/jspdf/dist/jspdf.min", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", @@ -43,6 +45,9 @@ requirejs.config({ "angular-route": { "deps": ["angular"] }, + "html2canvas": { + "exports": "html2canvas" + }, "moment-duration-format": { "deps": ["moment"] }, @@ -59,6 +64,8 @@ define([ './platform/framework/src/Main', 'legacyRegistry', + 'html2canvas', + 'jspdf', './platform/framework/bundle', './platform/core/bundle', './platform/representation/bundle', @@ -95,6 +102,18 @@ define([ './platform/status/bundle', './platform/commonUI/regions/bundle' ], function (Main, legacyRegistry) { + setTimeout(function() { + var plotEl = document.getElementsByClassName('gl-plot')[0]; + + html2canvas(plotEl, { + onrendered: function(htmlCanvas) { + var pdf = new jsPDF('l', 'px', [plotEl.offsetHeight, plotEl.offsetWidth]); + pdf.addImage(htmlCanvas.toDataURL('image/jpeg', 2.0), 'JPEG', 0, 0, plotEl.offsetWidth, plotEl.offsetHeight); + pdf.save("plot.pdf"); + } + }); + }, 5000); + return { legacyRegistry: legacyRegistry, run: function () { diff --git a/platform/features/plot/src/GLChart.js b/platform/features/plot/src/GLChart.js index 56ca29bb3e..348a64f923 100644 --- a/platform/features/plot/src/GLChart.js +++ b/platform/features/plot/src/GLChart.js @@ -54,7 +54,7 @@ define( * @throws {Error} an error is thrown if WebGL is unavailable. */ function GLChart(canvas) { - var gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl"), + var gl = canvas.getContext("webgl", { preserveDrawingBuffer: true }) || canvas.getContext("experimental-webgl", { preserveDrawingBuffer: true }), vertexShader, fragmentShader, program, From bb3af4eff758cf0e084bd738146ea6d1ce699705 Mon Sep 17 00:00:00 2001 From: Zachariah Moreno Date: Wed, 31 Aug 2016 15:56:57 -0700 Subject: [PATCH 051/150] :octopus: Updated from OpenMCTWeb to OpenMCT minor change & please let me know if I can help with anything else --- docs/src/tutorials/index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/src/tutorials/index.md b/docs/src/tutorials/index.md index 250f9bb888..62547fe60a 100644 --- a/docs/src/tutorials/index.md +++ b/docs/src/tutorials/index.md @@ -48,17 +48,17 @@ for a more general overview of how to run and deploy a Open MCT application. First step is to check out Open MCT from the source repository. -`git clone https://github.com/nasa/openmctweb.git openmctweb` +`git clone https://github.com/nasa/openmct.git openmct` This will create a copy of the Open MCT source code repository in the folder -`openmctweb` (relative to the path from which you ran the command.) +`openmct` (relative to the path from which you ran the command.) If you have a repository URL, use that as the "path to repo" above. Alternately, if you received Open MCT as a git bundle, the path to that bundle on the local filesystem can be used instead. At this point, it will also be useful to branch off of Open MCT v0.6.2 (which was used when writing these tutorials) to begin adding plugins. - cd openmctweb + cd openmct git branch open-v0.6.2 git checkout @@ -79,7 +79,7 @@ changes to stylesheets, or you are running the minified version of the app The next step is to run a web server so that you can view the Open MCT client (including the plugins you add to it) in browser. Any web server can -be used for hosting OpenMCTWeb, and a trivial web server is provided in this +be used for hosting OpenMCT, and a trivial web server is provided in this package for the purposes of running the tutorials. The provided web server should not be used in a production environment @@ -91,7 +91,7 @@ To run the tutorial web server Once running, you should be able to view Open MCT from your browser at http://localhost:8080/ (assuming the web server is running on port 8080, -and OpenMCTWeb is installed at the server's root path). +and OpenMCT is installed at the server's root path). [Google Chrome](https://www.google.com/chrome/) is recommended for these tutorials, as Chrome is Open MCT's "test-to" browser. The browser cache can sometimes interfere with development (masking changes by From 76527b310de6c34fa48ffcacd93f41be3fc90d7b Mon Sep 17 00:00:00 2001 From: Zachariah Moreno Date: Thu, 1 Sep 2016 09:23:35 -0700 Subject: [PATCH 052/150] [Documentation] Revising to uphold standard naming convention of Open MCT :octopus: # Author Checklist: Changes appear to address issue? Y Appropriate unit tests included? N/A - No code changes Code style and in-line documentation are appropriate? N/A Commit messages meet standards? Y --- docs/src/tutorials/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/tutorials/index.md b/docs/src/tutorials/index.md index 62547fe60a..0e48fcf11f 100644 --- a/docs/src/tutorials/index.md +++ b/docs/src/tutorials/index.md @@ -79,7 +79,7 @@ changes to stylesheets, or you are running the minified version of the app The next step is to run a web server so that you can view the Open MCT client (including the plugins you add to it) in browser. Any web server can -be used for hosting OpenMCT, and a trivial web server is provided in this +be used for hosting Open MCT, and a trivial web server is provided in this package for the purposes of running the tutorials. The provided web server should not be used in a production environment @@ -91,7 +91,7 @@ To run the tutorial web server Once running, you should be able to view Open MCT from your browser at http://localhost:8080/ (assuming the web server is running on port 8080, -and OpenMCT is installed at the server's root path). +and Open MCT is installed at the server's root path). [Google Chrome](https://www.google.com/chrome/) is recommended for these tutorials, as Chrome is Open MCT's "test-to" browser. The browser cache can sometimes interfere with development (masking changes by From 5e0975ddfac3b8d83ac4a66ef270beec2c39f1da Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 02:29:26 +0900 Subject: [PATCH 053/150] [Formatting] Remove test code --- main.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/main.js b/main.js index 668f3409e2..057346d91e 100644 --- a/main.js +++ b/main.js @@ -102,18 +102,6 @@ define([ './platform/status/bundle', './platform/commonUI/regions/bundle' ], function (Main, legacyRegistry) { - setTimeout(function() { - var plotEl = document.getElementsByClassName('gl-plot')[0]; - - html2canvas(plotEl, { - onrendered: function(htmlCanvas) { - var pdf = new jsPDF('l', 'px', [plotEl.offsetHeight, plotEl.offsetWidth]); - pdf.addImage(htmlCanvas.toDataURL('image/jpeg', 2.0), 'JPEG', 0, 0, plotEl.offsetWidth, plotEl.offsetHeight); - pdf.save("plot.pdf"); - } - }); - }, 5000); - return { legacyRegistry: legacyRegistry, run: function () { From 06a453333adf48f8f50175b39f7c13ad51f4c52a Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 02:31:34 +0900 Subject: [PATCH 054/150] [Enhancement] Pass element to plot controller This will be used for exporting an image of the plot. --- platform/features/plot/bundle.js | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index 3ce136abdf..c09a965197 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -70,6 +70,7 @@ define([ "implementation": PlotController, "depends": [ "$scope", + "$element", "telemetryFormatter", "telemetryHandler", "throttle", From 219301a85b55fd78840892e75ec7c47a4b7626e5 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 02:32:42 +0900 Subject: [PATCH 055/150] [Frontend] Add export plot buttons --- platform/features/plot/res/templates/plot.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 6dc3cd71b9..c4b5321226 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -21,6 +21,21 @@ --> + + Export as PDF + + + Export as PNG + + + Export as JPG +
From ea8f4299028647b6b381c366f2c5a5beee1d2fa8 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 02:41:43 +0900 Subject: [PATCH 056/150] [Enhancement] Add export functionality to PlotController Extends PlotController by adding three new scoped methods: exportPDF, exportPNG, exportJPG. All three methods use basically the same steps. The HTML node of the plot is passed through html2canvas which generates a canvas. From the canvas we export a blob, PNG, or JPG then save the file. --- platform/features/plot/src/PlotController.js | 41 ++++++++- .../plot/src/services/ExportImageService.js | 92 +++++++++++++++++++ 2 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 platform/features/plot/src/services/ExportImageService.js diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 88d82ea31b..1cbccb8cfb 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -32,7 +32,8 @@ define( "./elements/PlotLimitTracker", "./elements/PlotTelemetryFormatter", "./modes/PlotModeOptions", - "./SubPlotFactory" + "./SubPlotFactory", + "./services/ExportImageService" ], function ( PlotUpdater, @@ -41,7 +42,8 @@ define( PlotLimitTracker, PlotTelemetryFormatter, PlotModeOptions, - SubPlotFactory + SubPlotFactory, + ExportImageService ) { var AXIS_DEFAULTS = [ @@ -63,6 +65,7 @@ define( */ function PlotController( $scope, + $element, telemetryFormatter, telemetryHandler, throttle, @@ -246,6 +249,7 @@ define( }); self.pending = true; + self.$element = $element; // Initialize axes; will get repopulated when telemetry // metadata becomes available. @@ -254,6 +258,18 @@ define( new PlotAxis("ranges", [], AXIS_DEFAULTS[1]) ]; + $scope.exportPDF = function() { + PlotController.prototype.exportPDF(self.$element, 'plot.pdf'); + }; + + $scope.exportPNG = function() { + PlotController.prototype.exportPNG(self.$element, 'plot.png'); + }; + + $scope.exportJPG = function() { + PlotController.prototype.exportJPG(self.$element, 'plot.jpg'); + }; + // Watch for changes to the selected axis $scope.$watch("axes[0].active.key", domainRequery); $scope.$watch("axes[1].active.key", rangeRequery); @@ -364,6 +380,27 @@ define( return this.pending; }; + /** + * Export the plot to PDF + */ + PlotController.prototype.exportPDF = function (element, filename) { + ExportImageService.exportPDF(element[0], filename); + }; + + /** + * Export the plot to PNG + */ + PlotController.prototype.exportPNG = function (element, filename) { + ExportImageService.exportPNG(element, filename); + }; + + /** + * Export the plot to JPG + */ + PlotController.prototype.exportJPG = function (element, filename) { + ExportImageService.exportJPG(element, filename); + }; + return PlotController; } ); diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js new file mode 100644 index 0000000000..b1dc8a51d7 --- /dev/null +++ b/platform/features/plot/src/services/ExportImageService.js @@ -0,0 +1,92 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/** + * Module defining ExportImageService. Created by hudsonfoo on 09/02/16 + */ +define( + ['saveAs'], + function (saveAs) { + + /** + * The export image service will export any HTML node to + * PDF, JPG, or PNG. + * @constructor + */ + function ExportImageService() { + } + + /** + * Renders an HTML element into a base64 encoded image + * as a BLOB, PNG, or JPG. + * @param {node} element that will be converted to an image + * @param {function} callback for passing the resulting image + * @param {string} type of image to convert the element to + * @returns {string} the color, in #RRGGBB form + */ + function renderElement(element, callback, type) { + type = type || 'jpeg'; + + html2canvas(element, { + onrendered: function(canvas) { + switch (type.toLowerCase()) { + case "blob": + canvas.toBlob(callback); + break; + + case "png": + callback(canvas.toDataURL('image/png', 1.0)); + break; + + default: + case "jpg": + case "jpeg": + callback(canvas.toDataURL('image/jpeg', 1.0)); + break; + } + } + }); + } + + ExportImageService.exportPDF = function(element, filename) { + renderElement(element, function(img) { + var pdf = new jsPDF('l', 'px', [element.offsetHeight, element.offsetWidth]); + pdf.addImage(img, 'JPEG', 0, 0, element.offsetWidth, element.offsetHeight); + pdf.save(filename); + }, 'jpeg'); + }; + + ExportImageService.exportJPG = function(element, filename) { + renderElement(element, function(img) { + saveAs(img, filename); + }, "blob"); + }; + + ExportImageService.exportPNG = function(element, filename) { + renderElement(element, function(img) { + saveAs(img, filename); + }, "blob"); + }; + + return ExportImageService; + } +); From ee917b0e1d4513cb4bd299377e87fce5e4608a40 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 1 Sep 2016 10:55:07 -0700 Subject: [PATCH 057/150] [Frontend] Initial styling for selectable styling Fixes #1161 New .s-selectable, .s-hover, .s-selected and .s-moveable classes New supporting color constants Markup in layouts, fixed position/panels updated Removed old commented code --- .../general/res/sass/_fixed-position.scss | 20 +-------- platform/commonUI/general/res/sass/_main.scss | 1 + .../general/res/sass/edit/_editor.scss | 2 +- .../res/sass/user-environ/_selecting.scss | 39 +++++++++++++++++ .../themes/espresso/res/sass/_constants.scss | 3 ++ .../themes/snow/res/sass/_constants.scss | 3 ++ .../features/layout/res/templates/fixed.html | 2 +- .../features/layout/res/templates/layout.html | 43 +++---------------- 8 files changed, 54 insertions(+), 59 deletions(-) create mode 100644 platform/commonUI/general/res/sass/user-environ/_selecting.scss diff --git a/platform/commonUI/general/res/sass/_fixed-position.scss b/platform/commonUI/general/res/sass/_fixed-position.scss index 66c9baf7a6..03364c1983 100644 --- a/platform/commonUI/general/res/sass/_fixed-position.scss +++ b/platform/commonUI/general/res/sass/_fixed-position.scss @@ -21,7 +21,6 @@ *****************************************************************************/ .t-fixed-position { &.l-fixed-position { - // @include test(red); position: absolute; top: 0; right: 0; @@ -35,7 +34,6 @@ height: 100%; width: 100%; .l-grid { - // @include test(orange); position: absolute; height: 100%; width: 100%; @@ -49,11 +47,6 @@ position: absolute; border: 1px solid transparent; - &.s-selected { - @include boxShdwLarge(); - border-color: $colorKey; - cursor: move; - } &.s-not-selected { opacity: 0.8; } @@ -76,26 +69,19 @@ } .l-fixed-position-text { - //@include txtShdwSubtle(); border: 1px solid transparent; font-size: 0.8rem; - $p: 1px; //$interiorMarginSm; + $p: 1px; line-height: 100%; &.l-static-text { - // overflow: auto; padding: $p; } &.l-telemetry { .l-elem { - //@include absPosDefault($p); - //@include absPosDefault(0); box-sizing: border-box; display: block; padding: 2px; - //width: 50%; &.l-title { - //right: auto; - //left: $p; float: none; overflow: hidden; text-overflow: ellipsis; @@ -103,9 +89,6 @@ width: auto; } &.l-value { - // @include test(blue); - // right: $p; - // left: auto; border-radius: $smallCr; $valPad: 5px; float: right; @@ -125,7 +108,6 @@ .l-fixed-position-item-handle { $brd: 1px solid $colorKey; - // border-radius: $controlCr; background: rgba($colorKey, 0.5); cursor: crosshair; border: $brd; diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index a3d6f5e665..e092f1474a 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -65,6 +65,7 @@ @import "user-environ/frame"; @import "user-environ/top-bar"; @import "user-environ/tool-bar"; +@import "user-environ/selecting"; /********************************* VIEWS */ @import "fixed-position"; diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 565e9e0666..20132161b6 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -97,7 +97,7 @@ .frame.child-frame.panel { &:hover { @include boxShdwLarge(); - border-color: $colorKey; + border-color: $colorSelectableSelectedPrimary; .view-switcher { opacity: 1; } diff --git a/platform/commonUI/general/res/sass/user-environ/_selecting.scss b/platform/commonUI/general/res/sass/user-environ/_selecting.scss new file mode 100644 index 0000000000..e20a19872f --- /dev/null +++ b/platform/commonUI/general/res/sass/user-environ/_selecting.scss @@ -0,0 +1,39 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ +.s-selectable { + border: 1px solid transparent; + + &.s-hover { + // Styles when hovering over a selectable object + border-color: $colorSelectableHov !important; + } + + &.s-selected { + // Styles for a selected object. Also used by legacy Fixed Position/Panel objects. + border-color: $colorSelectableSelectedPrimary !important; + } + + &.s-moveable { + @include boxShdwLarge(); + cursor: move; + } +} \ No newline at end of file diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index ae4607a15d..12c8d45ebf 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -63,6 +63,9 @@ $colorInvokeMenu: #fff; $colorObjHdrTxt: $colorBodyFg; $colorObjHdrIc: pullForward($colorObjHdrTxt, 20%); $colorTick: rgba(white, 0.2); +$colorSelectableSelectedPrimary: $colorKey; +$colorSelectableSelectedSecondary: pushBack($colorSelectableSelectedPrimary, 20%); +$colorSelectableHov: $colorSelectableSelectedSecondary; // Menu colors $colorMenuBg: pullForward($colorBodyBg, 23%); diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 492444e737..f119559ba6 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -63,6 +63,9 @@ $colorInvokeMenu: #fff; $colorObjHdrTxt: $colorBodyFg; $colorObjHdrIc: pushBack($colorObjHdrTxt, 30%); $colorTick: rgba(black, 0.2); +$colorSelectableSelectedPrimary: $colorKey; +$colorSelectableSelectedSecondary: pushBack($colorSelectableSelectedPrimary, 20%); +$colorSelectableHov: $colorSelectableSelectedSecondary; // Menu colors $colorMenuBg: pushBack($colorBodyBg, 10%); diff --git a/platform/features/layout/res/templates/fixed.html b/platform/features/layout/res/templates/fixed.html index 76fc991102..4db5addf43 100644 --- a/platform/features/layout/res/templates/fixed.html +++ b/platform/features/layout/res/templates/fixed.html @@ -44,7 +44,7 @@ -
- - - - - - - - From 3a19890be9c3855ec26131c08852bf9953fa6800 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 03:11:26 +0900 Subject: [PATCH 058/150] [Formatting] Linting --- main.js | 7 +++--- platform/features/plot/src/PlotController.js | 6 ++--- .../plot/src/services/ExportImageService.js | 24 +++++++++++-------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/main.js b/main.js index 057346d91e..58ea2b1756 100644 --- a/main.js +++ b/main.js @@ -29,7 +29,7 @@ requirejs.config({ "csv": "bower_components/comma-separated-values/csv.min", "es6-promise": "bower_components/es6-promise/promise.min", "html2canvas": "bower_components/html2canvas/build/html2canvas.min", - "jspdf": "bower_components/jspdf/dist/jspdf.min", + "jsPDF": "bower_components/jspdf/dist/jspdf.min", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", @@ -48,6 +48,9 @@ requirejs.config({ "html2canvas": { "exports": "html2canvas" }, + "jsPDF": { + "exports": "jsPDF" + }, "moment-duration-format": { "deps": ["moment"] }, @@ -64,8 +67,6 @@ define([ './platform/framework/src/Main', 'legacyRegistry', - 'html2canvas', - 'jspdf', './platform/framework/bundle', './platform/core/bundle', './platform/representation/bundle', diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 1cbccb8cfb..0e134c05e9 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -258,15 +258,15 @@ define( new PlotAxis("ranges", [], AXIS_DEFAULTS[1]) ]; - $scope.exportPDF = function() { + $scope.exportPDF = function () { PlotController.prototype.exportPDF(self.$element, 'plot.pdf'); }; - $scope.exportPNG = function() { + $scope.exportPNG = function () { PlotController.prototype.exportPNG(self.$element, 'plot.png'); }; - $scope.exportJPG = function() { + $scope.exportJPG = function () { PlotController.prototype.exportJPG(self.$element, 'plot.jpg'); }; diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index b1dc8a51d7..2f55c4eaad 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -24,15 +24,19 @@ * Module defining ExportImageService. Created by hudsonfoo on 09/02/16 */ define( - ['saveAs'], - function (saveAs) { + [ + 'html2canvas', + 'jsPDF', + 'saveAs' + ], + function (html2canvas, jsPDF, saveAs) { /** * The export image service will export any HTML node to * PDF, JPG, or PNG. * @constructor */ - function ExportImageService() { + function ExportImageService () { } /** @@ -47,7 +51,7 @@ define( type = type || 'jpeg'; html2canvas(element, { - onrendered: function(canvas) { + onrendered: function (canvas) { switch (type.toLowerCase()) { case "blob": canvas.toBlob(callback); @@ -67,22 +71,22 @@ define( }); } - ExportImageService.exportPDF = function(element, filename) { - renderElement(element, function(img) { + ExportImageService.exportPDF = function (element, filename) { + renderElement(element, function (img) { var pdf = new jsPDF('l', 'px', [element.offsetHeight, element.offsetWidth]); pdf.addImage(img, 'JPEG', 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); }, 'jpeg'); }; - ExportImageService.exportJPG = function(element, filename) { - renderElement(element, function(img) { + ExportImageService.exportJPG = function (element, filename) { + renderElement(element, function (img) { saveAs(img, filename); }, "blob"); }; - ExportImageService.exportPNG = function(element, filename) { - renderElement(element, function(img) { + ExportImageService.exportPNG = function (element, filename) { + renderElement(element, function (img) { saveAs(img, filename); }, "blob"); }; From 55603b927f425114c87811e292d5050feb970316 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 1 Sep 2016 19:37:36 -0700 Subject: [PATCH 059/150] [Frontend] Generalized markup and CSS for control-bar Fixes #1166 New markup and CSS MIgrated existing tabular views to use new styles --- .../commonUI/general/res/sass/_views.scss | 40 +++++++++++++++++++ .../general/res/sass/lists/_tabular.scss | 36 ----------------- .../table/res/templates/historical-table.html | 2 +- .../table/res/templates/mct-table.html | 12 +++--- .../table/res/templates/rt-table.html | 2 +- 5 files changed, 49 insertions(+), 43 deletions(-) diff --git a/platform/commonUI/general/res/sass/_views.scss b/platform/commonUI/general/res/sass/_views.scss index 96c78f1dd2..2400d540be 100644 --- a/platform/commonUI/general/res/sass/_views.scss +++ b/platform/commonUI/general/res/sass/_views.scss @@ -1,4 +1,12 @@ /* Styles for sub-dividing views generically */ +$cbH: 25px; + +.l-control-bar { + // Element that can be placed above l-view-section + height: $cbH; + +} + .l-view-section { @include absPosDefault(0); @@ -15,4 +23,36 @@ .inline-block { display: inline-block; } +} + +.has-control-bar { + .l-view-section { + top: $cbH + $interiorMargin; + } +} + + +.child-frame { + .has-control-bar { + $btnExportH: $btnFrameH; + .l-control-bar { + @include trans-prop-nice(opacity, $dur: 50ms); + opacity: 0; + } + .l-view-section { + @include trans-prop-nice(top, $dur: 150ms, $delay: 50ms); + top: 0; + } + &:hover { + .l-control-bar { + @include trans-prop-nice(opacity, 150ms, 100ms); + opacity: 1; + } + .l-view-section { + @include trans-prop-nice(top, $dur: 150ms); + top: $btnExportH + $interiorMargin; + } + } + } + } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index 5671fe178d..d68486547e 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -160,39 +160,3 @@ table { } } } - -/********************************************************** SPECIFIC TABULAR VIEWS */ -.tabular-holder { - &.t-exportable { - $btnExportH: 25px; - .l-view-section { - top: $btnExportH + $interiorMargin; - } - } -} - -.child-frame { - .tabular-holder { - &.t-exportable { - $btnExportH: $btnFrameH; - .s-button.t-export { - @include trans-prop-nice(opacity, $dur: 50ms); - opacity: 0; - } - .l-view-section { - @include trans-prop-nice(top, $dur: 150ms, $delay: 50ms); - top: 0; - } - &:hover { - .s-button.t-export { - @include trans-prop-nice(opacity, 150ms, 100ms); - opacity: 1; - } - .l-view-section { - @include trans-prop-nice(top, $dur: 150ms); - top: $btnExportH + $interiorMargin; - } - } - } - } -} \ No newline at end of file diff --git a/platform/features/table/res/templates/historical-table.html b/platform/features/table/res/templates/historical-table.html index e2cd91b0db..d306601daf 100644 --- a/platform/features/table/res/templates/historical-table.html +++ b/platform/features/table/res/templates/historical-table.html @@ -4,6 +4,6 @@ rows="rows" enableFilter="true" enableSort="true" - class="tabular-holder t-exportable"> + class="tabular-holder has-control-bar">
\ No newline at end of file diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html index 6d96b17afd..ac06f53e28 100644 --- a/platform/features/table/res/templates/mct-table.html +++ b/platform/features/table/res/templates/mct-table.html @@ -1,8 +1,10 @@ - - Export - +
+ + Export + +
diff --git a/platform/features/table/res/templates/rt-table.html b/platform/features/table/res/templates/rt-table.html index c6fb0d2422..573eeb89f6 100644 --- a/platform/features/table/res/templates/rt-table.html +++ b/platform/features/table/res/templates/rt-table.html @@ -4,7 +4,7 @@ rows="rows" enableFilter="true" enableSort="true" - class="tabular-holder t-exportable" + class="tabular-holder has-control-bar" auto-scroll="true"> \ No newline at end of file From e3702710930eeb8cab1e70e75724ef26068eed86 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 11:54:38 +0900 Subject: [PATCH 060/150] [Code Review] Updates based on code review by @VWoeltjen Set export functions on the ExportImageService prototype. Insantiated ExportImageService in the PlotController for better dependcy injection. --- .../features/plot/res/templates/plot.html | 6 ++--- platform/features/plot/src/PlotController.js | 25 ++++++------------- .../plot/src/services/ExportImageService.js | 6 ++--- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index c4b5321226..e1a712cbee 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -22,17 +22,17 @@ Export as PDF Export as PNG Export as JPG diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 0e134c05e9..0c721f01fd 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -250,6 +250,7 @@ define( self.pending = true; self.$element = $element; + self.ExportImageService = new ExportImageService(); // Initialize axes; will get repopulated when telemetry // metadata becomes available. @@ -258,18 +259,6 @@ define( new PlotAxis("ranges", [], AXIS_DEFAULTS[1]) ]; - $scope.exportPDF = function () { - PlotController.prototype.exportPDF(self.$element, 'plot.pdf'); - }; - - $scope.exportPNG = function () { - PlotController.prototype.exportPNG(self.$element, 'plot.png'); - }; - - $scope.exportJPG = function () { - PlotController.prototype.exportJPG(self.$element, 'plot.jpg'); - }; - // Watch for changes to the selected axis $scope.$watch("axes[0].active.key", domainRequery); $scope.$watch("axes[1].active.key", rangeRequery); @@ -383,22 +372,22 @@ define( /** * Export the plot to PDF */ - PlotController.prototype.exportPDF = function (element, filename) { - ExportImageService.exportPDF(element[0], filename); + PlotController.prototype.exportPDF = function () { + this.ExportImageService.exportPDF(this.$element[0], 'plot.pdf'); }; /** * Export the plot to PNG */ - PlotController.prototype.exportPNG = function (element, filename) { - ExportImageService.exportPNG(element, filename); + PlotController.prototype.exportPNG = function () { + this.ExportImageService.exportPNG(this.$element[0], 'plot.png'); }; /** * Export the plot to JPG */ - PlotController.prototype.exportJPG = function (element, filename) { - ExportImageService.exportJPG(element, filename); + PlotController.prototype.exportJPG = function () { + this.ExportImageService.exportJPG(this.$element[0], 'plot.jpg'); }; return PlotController; diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 2f55c4eaad..7721714b52 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -71,7 +71,7 @@ define( }); } - ExportImageService.exportPDF = function (element, filename) { + ExportImageService.prototype.exportPDF = function (element, filename) { renderElement(element, function (img) { var pdf = new jsPDF('l', 'px', [element.offsetHeight, element.offsetWidth]); pdf.addImage(img, 'JPEG', 0, 0, element.offsetWidth, element.offsetHeight); @@ -79,13 +79,13 @@ define( }, 'jpeg'); }; - ExportImageService.exportJPG = function (element, filename) { + ExportImageService.prototype.exportJPG = function (element, filename) { renderElement(element, function (img) { saveAs(img, filename); }, "blob"); }; - ExportImageService.exportPNG = function (element, filename) { + ExportImageService.prototype.exportPNG = function (element, filename) { renderElement(element, function (img) { saveAs(img, filename); }, "blob"); From 3e3d3ebcf9c3015e3b5937fa004c2d70ff5fecff Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 11:58:15 +0900 Subject: [PATCH 061/150] [Formatting] Switched to double quote across the board for consistency --- platform/features/plot/src/PlotController.js | 6 +++--- .../plot/src/services/ExportImageService.js | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 0c721f01fd..3183d3d82f 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -373,21 +373,21 @@ define( * Export the plot to PDF */ PlotController.prototype.exportPDF = function () { - this.ExportImageService.exportPDF(this.$element[0], 'plot.pdf'); + this.ExportImageService.exportPDF(this.$element[0], "plot.pdf"); }; /** * Export the plot to PNG */ PlotController.prototype.exportPNG = function () { - this.ExportImageService.exportPNG(this.$element[0], 'plot.png'); + this.ExportImageService.exportPNG(this.$element[0], "plot.png"); }; /** * Export the plot to JPG */ PlotController.prototype.exportJPG = function () { - this.ExportImageService.exportJPG(this.$element[0], 'plot.jpg'); + this.ExportImageService.exportJPG(this.$element[0], "plot.jpg"); }; return PlotController; diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 7721714b52..e05dfe47db 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -25,9 +25,9 @@ */ define( [ - 'html2canvas', - 'jsPDF', - 'saveAs' + "html2canvas", + "jsPDF", + "saveAs" ], function (html2canvas, jsPDF, saveAs) { @@ -48,7 +48,7 @@ define( * @returns {string} the color, in #RRGGBB form */ function renderElement(element, callback, type) { - type = type || 'jpeg'; + type = type || "jpeg"; html2canvas(element, { onrendered: function (canvas) { @@ -58,13 +58,13 @@ define( break; case "png": - callback(canvas.toDataURL('image/png', 1.0)); + callback(canvas.toDataURL("image/png", 1.0)); break; default: case "jpg": case "jpeg": - callback(canvas.toDataURL('image/jpeg', 1.0)); + callback(canvas.toDataURL("image/jpeg", 1.0)); break; } } @@ -73,10 +73,10 @@ define( ExportImageService.prototype.exportPDF = function (element, filename) { renderElement(element, function (img) { - var pdf = new jsPDF('l', 'px', [element.offsetHeight, element.offsetWidth]); - pdf.addImage(img, 'JPEG', 0, 0, element.offsetWidth, element.offsetHeight); + var pdf = new jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); + pdf.addImage(img, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); - }, 'jpeg'); + }, "jpeg"); }; ExportImageService.prototype.exportJPG = function (element, filename) { From 39dcb937d5a4eb0029a2b13a6578dca3cdd6651e Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 1 Sep 2016 20:09:38 -0700 Subject: [PATCH 062/150] [Frontend] CSS and markup tweaks Fixes #1166 New control-bar height constant Removed font-size definition in .l-view-section --- platform/commonUI/general/res/sass/_constants.scss | 1 + platform/commonUI/general/res/sass/_views.scss | 11 +++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 5550a9019e..8fb1a39cb1 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -126,6 +126,7 @@ $menuLineH: 1.5rem; $menuLineHPx: 24px; $btnStdH: 25px; $btnToolbarH: $btnStdH; +$controlBarH: $btnStdH; $btnFrameH: 16px; /************************** PATHS */ diff --git a/platform/commonUI/general/res/sass/_views.scss b/platform/commonUI/general/res/sass/_views.scss index 2400d540be..357f9f3c7c 100644 --- a/platform/commonUI/general/res/sass/_views.scss +++ b/platform/commonUI/general/res/sass/_views.scss @@ -1,16 +1,11 @@ /* Styles for sub-dividing views generically */ -$cbH: 25px; - .l-control-bar { - // Element that can be placed above l-view-section - height: $cbH; - + // Element that can be placed above l-view-section, holds controls, buttons, etc. + height: $controlBarH; } - .l-view-section { @include absPosDefault(0); - font-size: 0.8rem; h2 { color: #fff; margin-bottom: $interiorMargin; @@ -27,7 +22,7 @@ $cbH: 25px; .has-control-bar { .l-view-section { - top: $cbH + $interiorMargin; + top: $controlBarH + $interiorMargin; } } From e7a7025961c29c56cbbe84bf09d37893cb3c1205 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 1 Sep 2016 17:10:21 -0700 Subject: [PATCH 063/150] [Frontend] Markup for #967 Fixes #967 WIP to be integrated with work from hudsonfoo in PR #1164 (cherry picked from commit ebadad61c64cbf57381112bedcb605cdef33b614) --- .../features/plot/res/templates/plot.html | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index e1a712cbee..192fbaab2e 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -21,21 +21,23 @@ --> - - Export as PDF - - - Export as PNG - - + - Export as JPG - + title="Export This View's Data as JPG"> + JPG + + + PNG + + + PDF + +
From 3736f84c12edc4bbe07e49a3ca67c0ddfa45e098 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 19:36:39 +0900 Subject: [PATCH 064/150] [Frontend] Set plot export buttons to show/hide on hover It's worth noting that I changed the .gl-plot position from relative to absolute in an attempt to match the results to a similar requirement in MCT Table. Setting to absolute caused no regressions as far as I could tell, but I have not attempted browsers outside of Chrome. --- .../general/res/sass/plots/_plots-main.scss | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 572b5429e3..12f148c0d9 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -20,14 +20,35 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .abs.holder-plot { + $btnExportH: $btnFrameH; + // Fend off the scrollbar when less than min-height; right: $interiorMargin; + + .s-button.t-export { + @include trans-prop-nice(opacity, $dur: 50ms); + opacity: 0; + } + .gl-plot { + @include trans-prop-nice(top, $dur: 150ms, $delay: 50ms); + top: 0; + } + &:hover { + .s-button.t-export { + @include trans-prop-nice(opacity, 150ms, 100ms); + opacity: 1; + } + .gl-plot { + @include trans-prop-nice(top, $dur: 150ms); + top: $btnExportH + $interiorMargin; + } + } } .gl-plot { color: $colorPlotFg; font-size: 0.7rem; - position: relative; + position: absolute; width: 100%; height: 100%; min-height: $plotMinH; From de85f79ab6ddb3c98b9e1c52a179dc55917ccb91 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 20:41:38 +0900 Subject: [PATCH 065/150] [Enhancement] Hide export buttons during export Buttons temporarily hide until export completes. --- platform/features/plot/res/templates/plot.html | 2 +- platform/features/plot/src/PlotController.js | 18 +++++++++++++++--- .../plot/src/services/ExportImageService.js | 15 ++++++++++++--- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 192fbaab2e..dc230bcfa9 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -21,7 +21,7 @@ --> - + diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 3183d3d82f..89b650b086 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -373,21 +373,33 @@ define( * Export the plot to PDF */ PlotController.prototype.exportPDF = function () { - this.ExportImageService.exportPDF(this.$element[0], "plot.pdf"); + var self = this; + self.hideExportButtons = true; + self.ExportImageService.exportPDF(self.$element[0], "plot.pdf", function() { + self.hideExportButtons = false; + }); }; /** * Export the plot to PNG */ PlotController.prototype.exportPNG = function () { - this.ExportImageService.exportPNG(this.$element[0], "plot.png"); + var self = this; + self.hideExportButtons = true; + self.ExportImageService.exportPNG(self.$element[0], "plot.png", function() { + self.hideExportButtons = false; + }); }; /** * Export the plot to JPG */ PlotController.prototype.exportJPG = function () { - this.ExportImageService.exportJPG(this.$element[0], "plot.jpg"); + var self = this; + self.hideExportButtons = true; + self.ExportImageService.exportJPG(self.$element[0], "plot.jpg", function() { + self.hideExportButtons = false; + }); }; return PlotController; diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index e05dfe47db..d07f40c97f 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -71,23 +71,32 @@ define( }); } - ExportImageService.prototype.exportPDF = function (element, filename) { + ExportImageService.prototype.exportPDF = function (element, filename, callback) { + callback = typeof callback === "function" ? callback : function () {}; + renderElement(element, function (img) { var pdf = new jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); pdf.addImage(img, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); + callback(); }, "jpeg"); }; - ExportImageService.prototype.exportJPG = function (element, filename) { + ExportImageService.prototype.exportJPG = function (element, filename, callback) { + callback = typeof callback === "function" ? callback : function () {}; + renderElement(element, function (img) { saveAs(img, filename); + callback(); }, "blob"); }; - ExportImageService.prototype.exportPNG = function (element, filename) { + ExportImageService.prototype.exportPNG = function (element, filename, callback) { + callback = typeof callback === "function" ? callback : function () {}; + renderElement(element, function (img) { saveAs(img, filename); + callback(); }, "blob"); }; From 40ad9c47a8bf626d2a3872ab062fdc05f0e3e5c3 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 3 Sep 2016 13:51:16 +0900 Subject: [PATCH 066/150] [Tests] Add jsPDF and html2canvas --- test-main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-main.js b/test-main.js index c329407f93..0e28eb5661 100644 --- a/test-main.js +++ b/test-main.js @@ -54,6 +54,8 @@ requirejs.config({ "angular-route": "bower_components/angular-route/angular-route.min", "csv": "bower_components/comma-separated-values/csv.min", "es6-promise": "bower_components/es6-promise/promise.min", + "html2canvas": "bower_components/html2canvas/build/html2canvas.min", + "jsPDF": "bower_components/jspdf/dist/jspdf.min", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", From 92bfea1773398865cbac575402f7d0ff613e7e2e Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 3 Sep 2016 13:51:37 +0900 Subject: [PATCH 067/150] [Tests] Mock new argument in PlotController --- platform/features/plot/test/PlotControllerSpec.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/features/plot/test/PlotControllerSpec.js b/platform/features/plot/test/PlotControllerSpec.js index a3de710bdf..de3230858c 100644 --- a/platform/features/plot/test/PlotControllerSpec.js +++ b/platform/features/plot/test/PlotControllerSpec.js @@ -29,6 +29,7 @@ define( describe("The plot controller", function () { var mockScope, + mockElement, mockFormatter, mockHandler, mockThrottle, @@ -65,6 +66,7 @@ define( "$scope", ["$watch", "$on", "$emit"] ); + mockElement = angular.element('
'); mockFormatter = jasmine.createSpyObj( "formatter", ["formatDomainValue", "formatRangeValue"] @@ -107,6 +109,7 @@ define( controller = new PlotController( mockScope, + mockElement, mockFormatter, mockHandler, mockThrottle From 26c14d2bcadf6f2ce4c0bf1ac1ffa0fa798e5b01 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 3 Sep 2016 14:02:19 +0900 Subject: [PATCH 068/150] [Formatting] Fix styling errors --- platform/features/plot/src/PlotController.js | 6 +++--- platform/features/plot/src/services/ExportImageService.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 89b650b086..fa7e1dc726 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -375,7 +375,7 @@ define( PlotController.prototype.exportPDF = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportPDF(self.$element[0], "plot.pdf", function() { + self.ExportImageService.exportPDF(self.$element[0], "plot.pdf", function () { self.hideExportButtons = false; }); }; @@ -386,7 +386,7 @@ define( PlotController.prototype.exportPNG = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportPNG(self.$element[0], "plot.png", function() { + self.ExportImageService.exportPNG(self.$element[0], "plot.png", function () { self.hideExportButtons = false; }); }; @@ -397,7 +397,7 @@ define( PlotController.prototype.exportJPG = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportJPG(self.$element[0], "plot.jpg", function() { + self.ExportImageService.exportJPG(self.$element[0], "plot.jpg", function () { self.hideExportButtons = false; }); }; diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index d07f40c97f..633635a2c6 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -29,14 +29,14 @@ define( "jsPDF", "saveAs" ], - function (html2canvas, jsPDF, saveAs) { + function (html2canvas, JsPdf, saveAs) { /** * The export image service will export any HTML node to * PDF, JPG, or PNG. * @constructor */ - function ExportImageService () { + function ExportImageService() { } /** @@ -75,7 +75,7 @@ define( callback = typeof callback === "function" ? callback : function () {}; renderElement(element, function (img) { - var pdf = new jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); + var pdf = new JsPdf("l", "px", [element.offsetHeight, element.offsetWidth]); pdf.addImage(img, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); callback(); From fecf419f83288d2cf68b4c2679b78994047d8a8a Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 3 Sep 2016 14:44:33 +0900 Subject: [PATCH 069/150] [Testing] Move ExportImageController into constructor for dependency injection --- platform/features/plot/bundle.js | 10 ++++++++++ platform/features/plot/src/PlotController.js | 9 ++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index c09a965197..bec42694b3 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -25,6 +25,7 @@ define([ "./src/PlotController", "./src/policies/PlotViewPolicy", "./src/PlotOptionsController", + "./src/services/ExportImageService", "text!./res/templates/plot.html", "text!./res/templates/plot-options-browse.html", 'legacyRegistry' @@ -33,6 +34,7 @@ define([ PlotController, PlotViewPolicy, PlotOptionsController, + ExportImageService, plotTemplate, plotOptionsBrowseTemplate, legacyRegistry @@ -71,6 +73,7 @@ define([ "depends": [ "$scope", "$element", + "ExportImageService", "telemetryFormatter", "telemetryHandler", "throttle", @@ -85,6 +88,13 @@ define([ ] } ], + "services": [ + { + "key": "ExportImageService", + "implementation": ExportImageService, + "depends": [] + } + ], "constants": [ { "key": "PLOT_FIXED_DURATION", diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index fa7e1dc726..074e17f9b6 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -32,8 +32,7 @@ define( "./elements/PlotLimitTracker", "./elements/PlotTelemetryFormatter", "./modes/PlotModeOptions", - "./SubPlotFactory", - "./services/ExportImageService" + "./SubPlotFactory" ], function ( PlotUpdater, @@ -42,8 +41,7 @@ define( PlotLimitTracker, PlotTelemetryFormatter, PlotModeOptions, - SubPlotFactory, - ExportImageService + SubPlotFactory ) { var AXIS_DEFAULTS = [ @@ -66,6 +64,7 @@ define( function PlotController( $scope, $element, + ExportImageService, telemetryFormatter, telemetryHandler, throttle, @@ -250,7 +249,7 @@ define( self.pending = true; self.$element = $element; - self.ExportImageService = new ExportImageService(); + self.ExportImageService = ExportImageService; // Initialize axes; will get repopulated when telemetry // metadata becomes available. From a566265a72f7ebacfb0ba23d66664d2bcdd3db48 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 3 Sep 2016 14:45:09 +0900 Subject: [PATCH 070/150] [Testing] Add ExportImageService mock --- platform/features/plot/test/PlotControllerSpec.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/platform/features/plot/test/PlotControllerSpec.js b/platform/features/plot/test/PlotControllerSpec.js index de3230858c..73a01d716a 100644 --- a/platform/features/plot/test/PlotControllerSpec.js +++ b/platform/features/plot/test/PlotControllerSpec.js @@ -1,3 +1,5 @@ +/*global angular*/ + /***************************************************************************** * Open MCT, Copyright (c) 2014-2016, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -30,6 +32,7 @@ define( describe("The plot controller", function () { var mockScope, mockElement, + mockExportImageService, mockFormatter, mockHandler, mockThrottle, @@ -67,6 +70,10 @@ define( ["$watch", "$on", "$emit"] ); mockElement = angular.element('
'); + mockExportImageService = jasmine.createSpyObj( + "ExportImageService", + ["exportJPG", "exportPNG", "exportPDF"] + ); mockFormatter = jasmine.createSpyObj( "formatter", ["formatDomainValue", "formatRangeValue"] @@ -110,6 +117,7 @@ define( controller = new PlotController( mockScope, mockElement, + mockExportImageService, mockFormatter, mockHandler, mockThrottle From e75146119417a3d4f6c51df836a2a55fc4bf277e Mon Sep 17 00:00:00 2001 From: steven mirecki Date: Sat, 3 Sep 2016 09:16:54 -0400 Subject: [PATCH 071/150] Typo corrections, I avoided making changes to words that have regional spelling differences. --- build-docs.sh | 2 +- docs/src/architecture/platform.md | 2 +- docs/src/design/proposals/APIRedesign.md | 4 ++-- docs/src/design/proposals/APIRedesign_PeteRichards.md | 2 +- docs/src/tutorials/index.md | 2 +- example/eventGenerator/data/transcript.json | 2 +- platform/commonUI/dialog/src/DialogService.js | 2 +- platform/commonUI/edit/test/creation/CreationServiceSpec.js | 2 +- .../commonUI/edit/test/representers/EditRepresenterSpec.js | 2 +- .../edit/test/representers/EditToolbarRepresenterSpec.js | 2 +- .../general/src/controllers/ObjectInspectorController.js | 4 ++-- platform/commonUI/general/src/filters/ReverseFilter.js | 2 +- platform/commonUI/general/src/services/PopupService.js | 2 +- .../general/test/controllers/ClickAwayControllerSpec.js | 2 +- .../general/test/controllers/ToggleControllerSpec.js | 2 +- platform/commonUI/mobile/test/MCTDeviceSpec.js | 2 +- platform/commonUI/notification/src/NotificationService.js | 2 +- platform/containment/test/CapabilityTableSpec.js | 2 +- platform/containment/test/ContainmentTableSpec.js | 2 +- platform/core/src/models/ModelCacheService.js | 2 +- platform/core/src/models/RootModelProvider.js | 2 +- platform/core/src/models/StaticModelProvider.js | 2 +- platform/core/src/types/TypePropertyConversion.js | 2 +- platform/core/src/types/TypeProvider.js | 2 +- platform/entanglement/README.md | 2 +- platform/features/layout/src/FixedDragHandle.js | 2 +- platform/features/layout/src/LayoutController.js | 2 +- platform/features/layout/test/LayoutControllerSpec.js | 2 +- platform/features/plot/test/Canvas2DChartSpec.js | 2 +- platform/features/plot/test/GLChartSpec.js | 2 +- .../timeline/src/controllers/TimelineGanttController.js | 2 +- .../timeline/src/controllers/TimelineTickController.js | 2 +- .../timeline/src/controllers/drag/TimelineDragHandler.js | 2 +- .../timeline/src/controllers/drag/TimelineSnapHandler.js | 2 +- platform/framework/src/load/Bundle.js | 2 +- platform/persistence/couch/src/CouchDocument.js | 4 ++-- platform/persistence/couch/test/CouchIndicatorSpec.js | 6 +++--- platform/persistence/elastic/src/ElasticSearchProvider.js | 2 +- platform/persistence/elastic/test/ElasticIndicatorSpec.js | 4 ++-- platform/persistence/queue/src/PersistenceQueue.js | 2 +- platform/persistence/queue/src/PersistenceQueueHandler.js | 2 +- platform/search/src/services/GenericSearchProvider.js | 2 +- platform/search/test/controllers/SearchControllerSpec.js | 4 ++-- .../search/test/controllers/SearchMenuControllerSpec.js | 2 +- platform/telemetry/src/TelemetrySubscriber.js | 2 +- platform/telemetry/src/TelemetrySubscription.js | 2 +- 46 files changed, 53 insertions(+), 53 deletions(-) diff --git a/build-docs.sh b/build-docs.sh index 73d387bcff..29841f921e 100755 --- a/build-docs.sh +++ b/build-docs.sh @@ -32,7 +32,7 @@ WEBSITE_DIRECTORY="website" BUILD_SHA=`git rev-parse HEAD` # A remote will be created for the git repository we are pushing to. -# Don't worry, as this entire directory will get trashed inbetween builds. +# Don't worry, as this entire directory will get trashed in between builds. REMOTE_NAME="documentation" WEBSITE_BRANCH="master" diff --git a/docs/src/architecture/platform.md b/docs/src/architecture/platform.md index f7f0c48cda..48ceebb9ef 100644 --- a/docs/src/architecture/platform.md +++ b/docs/src/architecture/platform.md @@ -616,7 +616,7 @@ follows: part of an action's extension definition. * `CreateActionProvider` provides the various Create actions which populate the Create menu. These are driven by the available types, - so do not map easily ot extension category `actions`; instead, these + so do not map easily to extension category `actions`; instead, these are generated after looking up which actions are available from the [`TypeService`](#type-service). * `ActionAggregator` merges together actions from multiple providers. diff --git a/docs/src/design/proposals/APIRedesign.md b/docs/src/design/proposals/APIRedesign.md index e6230823ed..03ce2f212f 100644 --- a/docs/src/design/proposals/APIRedesign.md +++ b/docs/src/design/proposals/APIRedesign.md @@ -98,7 +98,7 @@ Worked on bug fixes in the platform and a plugin for search. It is hard to figure out what the difference between the various ways of dealing with telemetry are. e.g., what is the difference between just "Telemetry" and the "Telemetry Service"? There are many - "Telemetry Thing"s which seem related, but in an unclear way. + "Telemetry Things" which seem related, but in an unclear way. ### Developer Intern 2 @@ -456,7 +456,7 @@ Instead, propose that: For parity with actions, a `View` would be a constructor which takes an `ActionContext` as a parameter (with similarly-defined properties) and exposes a method to retrieve the HTML elements -associateed with it. +associated with it. The platform would then additionally expose an `AngularView` implementation to improve compatibility with existing diff --git a/docs/src/design/proposals/APIRedesign_PeteRichards.md b/docs/src/design/proposals/APIRedesign_PeteRichards.md index dce80c41ae..517d61cc50 100644 --- a/docs/src/design/proposals/APIRedesign_PeteRichards.md +++ b/docs/src/design/proposals/APIRedesign_PeteRichards.md @@ -99,7 +99,7 @@ To reduce interface depth, we can replace our own provider and registry patterns ## More angular: for all services -Increasing our commitment to angular would mean using more of the angular factorys, services, etc, and less of our home grown tools. We'd implement our services and extension points as angular providers, and make them configurable via app.config. +Increasing our commitment to angular would mean using more of the angular factories, services, etc, and less of our home grown tools. We'd implement our services and extension points as angular providers, and make them configurable via app.config. As an example, registering a specific type of model provider in angular would look like: diff --git a/docs/src/tutorials/index.md b/docs/src/tutorials/index.md index 0e48fcf11f..d8842de9d7 100644 --- a/docs/src/tutorials/index.md +++ b/docs/src/tutorials/index.md @@ -3238,7 +3238,7 @@ define( __tutorials/telemetry/src/ExampleTelemetryServerAdapter.js__ Here, we have added `subscribe` and `unsubscribe` methods which issue the -corresponding requests to the server. Seperately, we introduce the ability to +corresponding requests to the server. Separately, we introduce the ability to listen for `data` messages as they come in: These will contain the data associated with these subscriptions. diff --git a/example/eventGenerator/data/transcript.json b/example/eventGenerator/data/transcript.json index 0416220e71..ce78735330 100644 --- a/example/eventGenerator/data/transcript.json +++ b/example/eventGenerator/data/transcript.json @@ -10,7 +10,7 @@ "LMP: 47 degrees.", "CC: Eagle, looking great. You're GO.", "CC: Roger. 1202. We copy it.", - "O1: LMP 35 degrees. 35 degrees. 750. Coming aown to 23.fl", + "O1: LMP 35 degrees. 35 degrees. 750. Coming down to 23.fl", "LMP: 700 feet, 21 down, 33 degrees.", "LMP: 600 feet, down at 19.", "LMP: 540 feet, down at - 30. Down at 15.", diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js index ca0a4b09b7..071710fb68 100644 --- a/platform/commonUI/dialog/src/DialogService.js +++ b/platform/commonUI/dialog/src/DialogService.js @@ -187,7 +187,7 @@ define( /** * A description of the model options that may be passed to the - * showBlockingMessage method. Note that the DialogModel desribed + * showBlockingMessage method. Note that the DialogModel described * here is shared with the Notifications framework. * @see NotificationService * diff --git a/platform/commonUI/edit/test/creation/CreationServiceSpec.js b/platform/commonUI/edit/test/creation/CreationServiceSpec.js index 1cc6d55e1b..090437b8c7 100644 --- a/platform/commonUI/edit/test/creation/CreationServiceSpec.js +++ b/platform/commonUI/edit/test/creation/CreationServiceSpec.js @@ -195,7 +195,7 @@ define( expect(failure).toHaveBeenCalled(); }); - it("logs an error when mutaton fails", function () { + it("logs an error when mutation fails", function () { // If mutation of the parent fails, we've lost the // created object - this is an error. var model = { someKey: "some value" }; diff --git a/platform/commonUI/edit/test/representers/EditRepresenterSpec.js b/platform/commonUI/edit/test/representers/EditRepresenterSpec.js index 7cb2626e64..7af3740fd6 100644 --- a/platform/commonUI/edit/test/representers/EditRepresenterSpec.js +++ b/platform/commonUI/edit/test/representers/EditRepresenterSpec.js @@ -112,7 +112,7 @@ define( expect(mockPersistence.persist).toHaveBeenCalled(); // Finally, check that the provided mutation function - // includes both model and configuratioon + // includes both model and configuration expect( mockDomainObject.useCapability.mostRecentCall.args[1]() ).toEqual({ diff --git a/platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js b/platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js index 0147601d7d..7cc8314fc6 100644 --- a/platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js +++ b/platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js @@ -79,7 +79,7 @@ define( it("removes state from parent scope on destroy", function () { // Verify precondition expect(mockScope.$parent.testToolbar).toBeDefined(); - // Destroy the represeter + // Destroy the representer representer.destroy(); // Should have removed toolbar state from view expect(mockScope.$parent.testToolbar).toBeUndefined(); diff --git a/platform/commonUI/general/src/controllers/ObjectInspectorController.js b/platform/commonUI/general/src/controllers/ObjectInspectorController.js index eb164dc76b..ef066d6774 100644 --- a/platform/commonUI/general/src/controllers/ObjectInspectorController.js +++ b/platform/commonUI/general/src/controllers/ObjectInspectorController.js @@ -38,7 +38,7 @@ define( $scope.contextutalParents = []; //$scope.isLink = false; - // Gets an array of the contextual parents/anscestors of the selected object + // Gets an array of the contextual parents/ancestors of the selected object function getContextualPath() { var currentObj = $scope.ngModel.selectedObject, currentParent, @@ -61,7 +61,7 @@ define( $scope.contextutalParents = parents; } - // Gets an array of the parents/anscestors of the selected object's + // Gets an array of the parents/ancestors of the selected object's // primary location (locational of original non-link) function getPrimaryPath(current) { var location; diff --git a/platform/commonUI/general/src/filters/ReverseFilter.js b/platform/commonUI/general/src/filters/ReverseFilter.js index a951e940e4..775d9fca86 100644 --- a/platform/commonUI/general/src/filters/ReverseFilter.js +++ b/platform/commonUI/general/src/filters/ReverseFilter.js @@ -25,7 +25,7 @@ define(function () { /** * Implements the `reverse` filter, which reverses text strings. * Useful in cases where text should be reversed for presentational - * reasons (e.g. in conjunction with CSS tricks involing text direction), + * reasons (e.g. in conjunction with CSS tricks involving text direction), * allowing such behavior to be handled independently from the controller * layer. * diff --git a/platform/commonUI/general/src/services/PopupService.js b/platform/commonUI/general/src/services/PopupService.js index b87c553ccd..3f65106fb0 100644 --- a/platform/commonUI/general/src/services/PopupService.js +++ b/platform/commonUI/general/src/services/PopupService.js @@ -35,7 +35,7 @@ define( } /** - * Options controlling how the popup is displaed. + * Options controlling how the popup is displayed. * * @typedef PopupOptions * @memberof platform/commonUI/general diff --git a/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js index 22b4035919..8b114f9948 100644 --- a/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js @@ -60,7 +60,7 @@ define( expect(controller.isActive()).toBe(false); }); - it("allows active state to be explictly specified", function () { + it("allows active state to be explicitly specified", function () { controller.setState(true); expect(controller.isActive()).toBe(true); controller.setState(true); diff --git a/platform/commonUI/general/test/controllers/ToggleControllerSpec.js b/platform/commonUI/general/test/controllers/ToggleControllerSpec.js index 32a9568200..b51e2f0920 100644 --- a/platform/commonUI/general/test/controllers/ToggleControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ToggleControllerSpec.js @@ -46,7 +46,7 @@ define( expect(controller.isActive()).toBe(false); }); - it("allows active state to be explictly specified", function () { + it("allows active state to be explicitly specified", function () { controller.setState(true); expect(controller.isActive()).toBe(true); controller.setState(true); diff --git a/platform/commonUI/mobile/test/MCTDeviceSpec.js b/platform/commonUI/mobile/test/MCTDeviceSpec.js index 4d130c56ee..421d3d7aca 100644 --- a/platform/commonUI/mobile/test/MCTDeviceSpec.js +++ b/platform/commonUI/mobile/test/MCTDeviceSpec.js @@ -72,7 +72,7 @@ define( expect(directive.restrict).toEqual("A"); }); - it("transcludes at the elmeent level", function () { + it("transcludes at the element level", function () { expect(directive.transclude).toEqual('element'); }); diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 5412eb951e..e37571759a 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -361,7 +361,7 @@ define( autodismiss specified), leave it to run. Otherwise force a timeout. - This notifcation has been added to queue and will be + This notification has been added to queue and will be serviced as soon as possible. */ this.active.timeout = this.$timeout(function () { diff --git a/platform/containment/test/CapabilityTableSpec.js b/platform/containment/test/CapabilityTableSpec.js index 851ac2f99f..646ef82882 100644 --- a/platform/containment/test/CapabilityTableSpec.js +++ b/platform/containment/test/CapabilityTableSpec.js @@ -45,7 +45,7 @@ define( ['getKey', 'getDefinition', 'getInitialModel'] ); mockType.getKey.andReturn(type); - // Return a model to drive apparant capabilities + // Return a model to drive apparent capabilities mockType.getInitialModel.andReturn({ id: type }); return mockType; }); diff --git a/platform/containment/test/ContainmentTableSpec.js b/platform/containment/test/ContainmentTableSpec.js index d0ab71b459..a83d9c1c82 100644 --- a/platform/containment/test/ContainmentTableSpec.js +++ b/platform/containment/test/ContainmentTableSpec.js @@ -50,7 +50,7 @@ define( // third one defines no containership rules contains: (index < 2) ? [{ has: 'b' }] : undefined }); - // Return a model to drive apparant capabilities + // Return a model to drive apparent capabilities mockType.getInitialModel.andReturn({ id: type }); return mockType; }); diff --git a/platform/core/src/models/ModelCacheService.js b/platform/core/src/models/ModelCacheService.js index a204ef0b87..783509a774 100644 --- a/platform/core/src/models/ModelCacheService.js +++ b/platform/core/src/models/ModelCacheService.js @@ -24,7 +24,7 @@ define([], function () { /** * Provides a cache for domain object models which exist in memory, - * but may or may not exist in backing persistene stores. + * but may or may not exist in backing persistence stores. * @constructor * @memberof platform/core */ diff --git a/platform/core/src/models/RootModelProvider.js b/platform/core/src/models/RootModelProvider.js index 0dfb656c31..205d41e66b 100644 --- a/platform/core/src/models/RootModelProvider.js +++ b/platform/core/src/models/RootModelProvider.js @@ -42,7 +42,7 @@ define( * @implements {ModelService} * @param {Array} roots all `roots[]` extensions * @param $q Angular's $q, for promises - * @param $log Anuglar's $log, for logging + * @param $log Angular's $log, for logging */ function RootModelProvider(roots, $q, $log) { // Pull out identifiers to used as ROOT's diff --git a/platform/core/src/models/StaticModelProvider.js b/platform/core/src/models/StaticModelProvider.js index 45d89dbe2f..e20f9232fb 100644 --- a/platform/core/src/models/StaticModelProvider.js +++ b/platform/core/src/models/StaticModelProvider.js @@ -49,7 +49,7 @@ define( } } - // Prepoulate maps with models to make subsequent lookup faster. + // Prepopulate maps with models to make subsequent lookup faster. models.forEach(addModelToMap); this.modelMap = modelMap; diff --git a/platform/core/src/types/TypePropertyConversion.js b/platform/core/src/types/TypePropertyConversion.js index 84fba54e02..fcf71b2011 100644 --- a/platform/core/src/types/TypePropertyConversion.js +++ b/platform/core/src/types/TypePropertyConversion.js @@ -43,7 +43,7 @@ define( }, ARRAY_SUFFIX = '[]'; - // Utility function to handle arrays of conversiions + // Utility function to handle arrays of conversions function ArrayConversion(conversion) { return { toModelValue: function (formValue) { diff --git a/platform/core/src/types/TypeProvider.js b/platform/core/src/types/TypeProvider.js index c3256c57ba..e8cf83f3e2 100644 --- a/platform/core/src/types/TypeProvider.js +++ b/platform/core/src/types/TypeProvider.js @@ -68,7 +68,7 @@ define( }) : array; } - // Reduce an array of type definitions to a single type definiton, + // Reduce an array of type definitions to a single type definition, // which has merged all properties in order. function collapse(typeDefs) { var collapsed = typeDefs.reduce(function (a, b) { diff --git a/platform/entanglement/README.md b/platform/entanglement/README.md index f3685bad05..aaf517decf 100644 --- a/platform/entanglement/README.md +++ b/platform/entanglement/README.md @@ -3,7 +3,7 @@ Entanglement is the process of moving, copying, and linking domain objects in such a way that their relationships are impossible to discern. -This bundle provides move, copy, and link functionality. Acheiving a state of +This bundle provides move, copy, and link functionality. Achieving a state of entanglement is left up to the end user. diff --git a/platform/features/layout/src/FixedDragHandle.js b/platform/features/layout/src/FixedDragHandle.js index de4b8ec92d..86fa4fb8c3 100644 --- a/platform/features/layout/src/FixedDragHandle.js +++ b/platform/features/layout/src/FixedDragHandle.js @@ -94,7 +94,7 @@ define( }; /** - * End a drag gesture. This should be callled when a drag + * End a drag gesture. This should be called when a drag * concludes to trigger commit of changes. */ FixedDragHandle.prototype.endDrag = function () { diff --git a/platform/features/layout/src/LayoutController.js b/platform/features/layout/src/LayoutController.js index 80470f25b3..88eae7462c 100644 --- a/platform/features/layout/src/LayoutController.js +++ b/platform/features/layout/src/LayoutController.js @@ -152,7 +152,7 @@ define( } // Convert from { positions: ..., dimensions: ... } to an - // apropriate ng-style argument, to position frames. + // appropriate ng-style argument, to position frames. LayoutController.prototype.convertPosition = function (raw) { var gridSize = this.gridSize; // Multiply position/dimensions by grid size diff --git a/platform/features/layout/test/LayoutControllerSpec.js b/platform/features/layout/test/LayoutControllerSpec.js index dbc79e2769..6a23a29c04 100644 --- a/platform/features/layout/test/LayoutControllerSpec.js +++ b/platform/features/layout/test/LayoutControllerSpec.js @@ -164,7 +164,7 @@ define( // Populate scope mockScope.$watchCollection.mostRecentCall.args[1](); - // Verify precondtion + // Verify precondition expect(testConfiguration.panels.b).not.toBeDefined(); // Do a drag diff --git a/platform/features/plot/test/Canvas2DChartSpec.js b/platform/features/plot/test/Canvas2DChartSpec.js index b20d7b9c70..446c07d841 100644 --- a/platform/features/plot/test/Canvas2DChartSpec.js +++ b/platform/features/plot/test/Canvas2DChartSpec.js @@ -59,7 +59,7 @@ define( expect(mock2d.clearRect).toHaveBeenCalled(); }); - it("doees not construct if 2D is unavailable", function () { + it("does not construct if 2D is unavailable", function () { mockCanvas.getContext.andReturn(undefined); expect(function () { return new Canvas2DChart(mockCanvas); diff --git a/platform/features/plot/test/GLChartSpec.js b/platform/features/plot/test/GLChartSpec.js index fb575d7709..1ab0e6ea0a 100644 --- a/platform/features/plot/test/GLChartSpec.js +++ b/platform/features/plot/test/GLChartSpec.js @@ -82,7 +82,7 @@ define( expect(mockGL.clear).toHaveBeenCalled(); }); - it("doees not construct if WebGL is unavailable", function () { + it("does not construct if WebGL is unavailable", function () { mockCanvas.getContext.andReturn(undefined); expect(function () { return new GLChart(mockCanvas); diff --git a/platform/features/timeline/src/controllers/TimelineGanttController.js b/platform/features/timeline/src/controllers/TimelineGanttController.js index 7c3ee03244..6153064ebe 100644 --- a/platform/features/timeline/src/controllers/TimelineGanttController.js +++ b/platform/features/timeline/src/controllers/TimelineGanttController.js @@ -26,7 +26,7 @@ define( /** * Control for Gantt bars in a timeline view. - * Primarily reesponsible for supporting the positioning of Gantt + * Primarily responsible for supporting the positioning of Gantt * bars; particularly, this ensures that the left and right edges * never go to far off screen, because in some environments this * will effect rendering performance without visible results. diff --git a/platform/features/timeline/src/controllers/TimelineTickController.js b/platform/features/timeline/src/controllers/TimelineTickController.js index 41c57dedbf..fb1f2ad6b8 100644 --- a/platform/features/timeline/src/controllers/TimelineTickController.js +++ b/platform/features/timeline/src/controllers/TimelineTickController.js @@ -28,7 +28,7 @@ define( /** * Provides labels for the tick mark area of a timeline view. - * Since the tick mark regin is potentially extremeley large, + * Since the tick mark reign is potentially extremely large, * only the subset of ticks which will actually be shown in * view are provided. * @constructor diff --git a/platform/features/timeline/src/controllers/drag/TimelineDragHandler.js b/platform/features/timeline/src/controllers/drag/TimelineDragHandler.js index 7a356d91dc..745c3cc5cf 100644 --- a/platform/features/timeline/src/controllers/drag/TimelineDragHandler.js +++ b/platform/features/timeline/src/controllers/drag/TimelineDragHandler.js @@ -148,7 +148,7 @@ define( var timespan = timespans[toId(id)]; // Use as setter if argument is present if ((typeof value === 'number') && timespan) { - // Set the end (ensuring it doesn't preceed start) + // Set the end (ensuring it doesn't precede start) timespan.setEnd( Math.max(value, timespan.getStart()) ); diff --git a/platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js b/platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js index 70d854d008..42d13b8681 100644 --- a/platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js +++ b/platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js @@ -41,7 +41,7 @@ define( ids, candidates; - // Filter an id for inclustion + // Filter an id for inclusion function include(id) { return id !== exclude; } diff --git a/platform/framework/src/load/Bundle.js b/platform/framework/src/load/Bundle.js index a97dc3af5b..91bd966754 100644 --- a/platform/framework/src/load/Bundle.js +++ b/platform/framework/src/load/Bundle.js @@ -174,7 +174,7 @@ define( * category. * * @param {string} category name of the extension category - * @returns {Array} extension definitions of that cataegory + * @returns {Array} extension definitions of that category */ Bundle.prototype.getExtensions = function (category) { var extensions = this.definition.extensions[category] || [], diff --git a/platform/persistence/couch/src/CouchDocument.js b/platform/persistence/couch/src/CouchDocument.js index 59fa3bfa3f..c16ca27f5c 100644 --- a/platform/persistence/couch/src/CouchDocument.js +++ b/platform/persistence/couch/src/CouchDocument.js @@ -27,7 +27,7 @@ define( /** * A CouchDocument describes domain object model in a format * which is easily read-written to CouchDB. This includes - * Couch's _id and _rev fields, as well as a sseparate + * Couch's _id and _rev fields, as well as a separate * metadata field which contains a subset of information found * in the model itself (to support search optimization with * CouchDB views.) @@ -37,7 +37,7 @@ define( * @param {object} model the model to store * @param {string} rev the revision to include (or undefined, * if no revision should be noted for couch) - * @param {boolean} whether or not to mark this documnet as + * @param {boolean} whether or not to mark this document as * deleted (see CouchDB docs for _deleted) */ function CouchDocument(id, model, rev, markDeleted) { diff --git a/platform/persistence/couch/test/CouchIndicatorSpec.js b/platform/persistence/couch/test/CouchIndicatorSpec.js index 01fb3d7d23..166b8fc82a 100644 --- a/platform/persistence/couch/test/CouchIndicatorSpec.js +++ b/platform/persistence/couch/test/CouchIndicatorSpec.js @@ -69,7 +69,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, without + // Nominal just means getting back an object, without // an error field. mockPromise.then.mostRecentCall.args[0]({ data: {} }); @@ -88,7 +88,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, with + // Nominal just means getting back an object, with // an error field. mockPromise.then.mostRecentCall.args[0]( { data: { error: "Uh oh." } } @@ -110,7 +110,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, without + // Nominal just means getting back an object, without // an error field. mockPromise.then.mostRecentCall.args[1]({ data: {} }); diff --git a/platform/persistence/elastic/src/ElasticSearchProvider.js b/platform/persistence/elastic/src/ElasticSearchProvider.js index 4bc0504760..c0930c7025 100644 --- a/platform/persistence/elastic/src/ElasticSearchProvider.js +++ b/platform/persistence/elastic/src/ElasticSearchProvider.js @@ -51,7 +51,7 @@ define([ * Search for domain objects using elasticsearch as a search provider. * * @param {String} searchTerm the term to search by. - * @param {Number} [maxResults] the max numer of results to return. + * @param {Number} [maxResults] the max number of results to return. * @returns {Promise} promise for a modelResults object. */ ElasticSearchProvider.prototype.query = function (searchTerm, maxResults) { diff --git a/platform/persistence/elastic/test/ElasticIndicatorSpec.js b/platform/persistence/elastic/test/ElasticIndicatorSpec.js index 3086b52c66..bfc3effcd0 100644 --- a/platform/persistence/elastic/test/ElasticIndicatorSpec.js +++ b/platform/persistence/elastic/test/ElasticIndicatorSpec.js @@ -71,7 +71,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, without + // Nominal just means getting back an object, without // an error field. mockPromise.then.mostRecentCall.args[0]({ data: {} }); @@ -90,7 +90,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, without + // Nominal just means getting back an object, without // an error field. mockPromise.then.mostRecentCall.args[1]({ data: {} }); diff --git a/platform/persistence/queue/src/PersistenceQueue.js b/platform/persistence/queue/src/PersistenceQueue.js index de9ede2cfe..d0d4671f72 100644 --- a/platform/persistence/queue/src/PersistenceQueue.js +++ b/platform/persistence/queue/src/PersistenceQueue.js @@ -35,7 +35,7 @@ define( /** * The PersistenceQueue is used by the QueuingPersistenceCapability - * to aggregrate calls for object persistence. These are then issued + * to aggregate calls for object persistence. These are then issued * in a group, such that if some or all are rejected, this result can * be shown to the user (again, in a group.) * diff --git a/platform/persistence/queue/src/PersistenceQueueHandler.js b/platform/persistence/queue/src/PersistenceQueueHandler.js index 958b954e8f..679fbbb8df 100644 --- a/platform/persistence/queue/src/PersistenceQueueHandler.js +++ b/platform/persistence/queue/src/PersistenceQueueHandler.js @@ -25,7 +25,7 @@ define( function () { /** - * Handles actual persistence invocations for queeud persistence + * Handles actual persistence invocations for queued persistence * attempts, in a group. Handling in a group in this manner * also allows failure to be handled in a group (e.g. in a single * summary dialog.) diff --git a/platform/search/src/services/GenericSearchProvider.js b/platform/search/src/services/GenericSearchProvider.js index 8e35373fbb..6c8ce257ef 100644 --- a/platform/search/src/services/GenericSearchProvider.js +++ b/platform/search/src/services/GenericSearchProvider.js @@ -246,7 +246,7 @@ define([ /** * @private - * @returns {Number} a unique, unusued query Id. + * @returns {Number} a unique, unused query Id. */ GenericSearchProvider.prototype.makeQueryId = function () { var queryId = Math.ceil(Math.random() * 100000); diff --git a/platform/search/test/controllers/SearchControllerSpec.js b/platform/search/test/controllers/SearchControllerSpec.js index bcb7b01dd0..b8c5c0c496 100644 --- a/platform/search/test/controllers/SearchControllerSpec.js +++ b/platform/search/test/controllers/SearchControllerSpec.js @@ -123,7 +123,7 @@ define([ expect(mockScope.results).toContain('a'); }); - it('is loading until the service\'s promise fufills', function () { + it('is loading until the service\'s promise fulfills', function () { expect(mockScope.loading).toBeTruthy(); // Then resolve the promises @@ -163,7 +163,7 @@ define([ // Flag should be true with nonempty input expect(mockScope.ngModel.search).toEqual(true); - // Flag should be flase with empty input + // Flag should be false with empty input mockScope.ngModel.input = ''; controller.search(); mockPromise.then.mostRecentCall.args[0]({hits: [], total: 0}); diff --git a/platform/search/test/controllers/SearchMenuControllerSpec.js b/platform/search/test/controllers/SearchMenuControllerSpec.js index 611f0d5a08..e4d566431c 100644 --- a/platform/search/test/controllers/SearchMenuControllerSpec.js +++ b/platform/search/test/controllers/SearchMenuControllerSpec.js @@ -54,7 +54,7 @@ define( controller = new SearchMenuController(mockScope, mockTypes); }); - it("gets types on initiliztion", function () { + it("gets types on initialization", function () { expect(mockScope.ngModel.types).toBeDefined(); }); diff --git a/platform/telemetry/src/TelemetrySubscriber.js b/platform/telemetry/src/TelemetrySubscriber.js index 9cf17b5fa7..6466566423 100644 --- a/platform/telemetry/src/TelemetrySubscriber.js +++ b/platform/telemetry/src/TelemetrySubscriber.js @@ -31,7 +31,7 @@ define( * `telemetrySubscriber`. * * Subscriptions may also be made directly using the - * `telemetry` capability of a domain objcet; the subscriber + * `telemetry` capability of a domain object; the subscriber * uses this as well, but additionally handles delegation * (e.g. for telemetry panels) as well as latest-value * extraction. diff --git a/platform/telemetry/src/TelemetrySubscription.js b/platform/telemetry/src/TelemetrySubscription.js index ca0f11125d..dd5e4d3191 100644 --- a/platform/telemetry/src/TelemetrySubscription.js +++ b/platform/telemetry/src/TelemetrySubscription.js @@ -57,7 +57,7 @@ define( * `telemetrySubscriber` service. * * Subscriptions may also be made directly using the - * `telemetry` capability of a domain objcet; the subscriber + * `telemetry` capability of a domain object; the subscriber * uses this as well, but additionally handles delegation * (e.g. for telemetry panels) as well as latest-value * extraction. From 9847c40e3421b2d580c360c893c10c0be83daf71 Mon Sep 17 00:00:00 2001 From: Alex M Date: Thu, 1 Sep 2016 23:01:57 +0300 Subject: [PATCH 072/150] [Edit] SaveAction not navigating anymore --- .../commonUI/edit/src/actions/SaveAction.js | 29 ++++--------------- .../edit/test/actions/SaveActionSpec.js | 6 ---- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/platform/commonUI/edit/src/actions/SaveAction.js b/platform/commonUI/edit/src/actions/SaveAction.js index 6f96e84192..8d3ea7f509 100644 --- a/platform/commonUI/edit/src/actions/SaveAction.js +++ b/platform/commonUI/edit/src/actions/SaveAction.js @@ -25,9 +25,8 @@ define( function (SaveInProgressDialog) { /** - * The "Save" action; the action triggered by clicking Save from - * Edit Mode. Exits the editing user interface and invokes object - * capabilities to persist the changes that have been made. + * The "Save" action; it invokes object capabilities to persist + * the changes that have been made. * @constructor * @implements {Action} * @memberof platform/commonUI/edit @@ -41,7 +40,7 @@ define( } /** - * Save changes and conclude editing. + * Save changes. * * @returns {Promise} a promise that will be fulfilled when * cancellation has completed @@ -51,40 +50,22 @@ define( var domainObject = this.domainObject, dialog = new SaveInProgressDialog(this.dialogService); - function resolveWith(object) { - return function () { - return object; - }; - } - // Invoke any save behavior introduced by the editor capability; // this is introduced by EditableDomainObject which is // used to insulate underlying objects from changes made // during editing. function doSave() { - return domainObject.getCapability("editor").save() - .then(resolveWith(domainObject)); + return domainObject.getCapability("editor").save(); } - // Discard the current root view (which will be the editing - // UI, which will have been pushed atop the Browse UI.) - function returnToBrowse(object) { - if (object) { - object.getCapability("action").perform("navigate"); - } - return object; - } - - function hideBlockingDialog(object) { + function hideBlockingDialog() { dialog.hide(); - return object; } dialog.show(); return doSave() .then(hideBlockingDialog) - .then(returnToBrowse) .catch(hideBlockingDialog); }; diff --git a/platform/commonUI/edit/test/actions/SaveActionSpec.js b/platform/commonUI/edit/test/actions/SaveActionSpec.js index 0243f89a11..7324b53085 100644 --- a/platform/commonUI/edit/test/actions/SaveActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveActionSpec.js @@ -105,12 +105,6 @@ define( expect(mockEditorCapability.save).toHaveBeenCalled(); }); - it("navigates to the object after saving", - function () { - action.perform(); - expect(mockActionCapability.perform).toHaveBeenCalledWith("navigate"); - }); - describe("a blocking dialog", function () { var mockDialogHandle; From 90c13a3959c695fd30e43c6a69a848fee692c2a7 Mon Sep 17 00:00:00 2001 From: Alex M Date: Thu, 1 Sep 2016 23:16:31 +0300 Subject: [PATCH 073/150] [Edit] EditorCapability continues edit on save --- .../commonUI/edit/src/capabilities/EditorCapability.js | 10 +++++----- .../edit/test/capabilities/EditorCapabilitySpec.js | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/commonUI/edit/src/capabilities/EditorCapability.js b/platform/commonUI/edit/src/capabilities/EditorCapability.js index aa7670d8aa..a997eb3033 100644 --- a/platform/commonUI/edit/src/capabilities/EditorCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js @@ -81,14 +81,14 @@ define( }; /** - * Save any changes from this editing session. This will flush all - * pending persists and end the current transaction + * Save any unsaved changes from this editing session. This will + * end the current transaction and continue with a new one. * @returns {*} */ EditorCapability.prototype.save = function () { - var domainObject = this.domainObject; - return this.transactionService.commit().then(function () { - domainObject.getCapability('status').set('editing', false); + var transactionService = this.transactionService; + return transactionService.commit().then(function () { + transactionService.startTransaction(); }); }; diff --git a/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js b/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js index 3ffb81921d..e72793be53 100644 --- a/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js +++ b/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js @@ -134,8 +134,8 @@ define( it("commits the transaction", function () { expect(mockTransactionService.commit).toHaveBeenCalled(); }); - it("resets the edit state", function () { - expect(mockStatusCapability.set).toHaveBeenCalledWith('editing', false); + it("begins a new transaction", function () { + expect(mockTransactionService.startTransaction).toHaveBeenCalled(); }); }); From ab4ce0caba1cac308d0db3f2fc2334a490bf1e5f Mon Sep 17 00:00:00 2001 From: Alex M Date: Sat, 3 Sep 2016 17:25:21 +0300 Subject: [PATCH 074/150] [Edit] Introduced SaveAndStopEditingAction It replaces SaveAction in the bundle. --- platform/commonUI/edit/bundle.js | 6 +- .../src/actions/SaveAndStopEditingAction.js | 73 +++++++++++ .../actions/SaveAndStopEditingActionSpec.js | 118 ++++++++++++++++++ 3 files changed, 194 insertions(+), 3 deletions(-) create mode 100644 platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js create mode 100644 platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 2c5a79bda3..b81e057764 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -30,7 +30,7 @@ define([ "./src/actions/EditAction", "./src/actions/PropertiesAction", "./src/actions/RemoveAction", - "./src/actions/SaveAction", + "./src/actions/SaveAndStopEditingAction", "./src/actions/SaveAsAction", "./src/actions/CancelAction", "./src/policies/EditActionPolicy", @@ -69,7 +69,7 @@ define([ EditAction, PropertiesAction, RemoveAction, - SaveAction, + SaveAndStopEditingAction, SaveAsAction, CancelAction, EditActionPolicy, @@ -205,7 +205,7 @@ define([ { "key": "save", "category": "conclude-editing", - "implementation": SaveAction, + "implementation": SaveAndStopEditingAction, "name": "Save", "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", diff --git a/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js new file mode 100644 index 0000000000..a6a1eb9e62 --- /dev/null +++ b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js @@ -0,0 +1,73 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +define( + ["./SaveAction"], + function (SaveAction) { + + /** + * The "Save and Stop Editing" action performs a [Save action]{@link SaveAction} + * on the object under edit followed by exiting the edit user interface. + * @constructor + * @implements {Action} + * @memberof platform/commonUI/edit + */ + function SaveAndStopEditingAction( + dialogService, + context + ) { + this.context = context; + this.domainObject = (context || {}).domainObject; + this.dialogService = dialogService; + } + + /** + * Trigger a save operation and exit edit mode. + * + * @returns {Promise} a promise that will be fulfilled when + * cancellation has completed + * @memberof platform/commonUI/edit.SaveAndStopEditingAction# + */ + SaveAndStopEditingAction.prototype.perform = function () { + var domainObject = this.domainObject, + saveAction = new SaveAction(this.dialogService, this.context); + + function closeEditor() { + return domainObject.getCapability("editor").cancel(); + } + + return saveAction.perform() + .then(closeEditor) + .catch(closeEditor); + }; + + /** + * Check if this action is applicable in a given context. + * This will ensure that a domain object is present in the context, + * and that this domain object is in Edit mode. + * @returns true if applicable + */ + SaveAndStopEditingAction.appliesTo = SaveAction.appliesTo; + + return SaveAndStopEditingAction; + } +); \ No newline at end of file diff --git a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js new file mode 100644 index 0000000000..a5d14e3d6d --- /dev/null +++ b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js @@ -0,0 +1,118 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +define( + ["../../src/actions/SaveAndStopEditingAction"], + function (SaveAndStopEditingAction) { + + describe("The Save and Stop Editing action", function () { + + var mockDomainObject, + mockEditorCapability, + actionContext, + dialogService, + mockActionCapability, + capabilities = {}, + action; + + function mockPromise(value) { + return { + then: function (callback) { + return mockPromise(callback(value)); + }, + catch: function (callback) { + return mockPromise(callback(value)); + } + }; + } + + beforeEach(function () { + mockDomainObject = jasmine.createSpyObj( + "domainObject", + [ + "getCapability", + "hasCapability", + "getModel", + "getOriginalObject" + ] + ); + mockEditorCapability = jasmine.createSpyObj( + "editor", + ["save", "cancel", "isEditContextRoot"] + ); + mockActionCapability = jasmine.createSpyObj( + "actionCapability", + ["perform"] + ); + capabilities.editor = mockEditorCapability; + capabilities.action = mockActionCapability; + + actionContext = { + domainObject: mockDomainObject + }; + dialogService = jasmine.createSpyObj( + "dialogService", + ["showBlockingMessage"] + ); + + mockDomainObject.hasCapability.andReturn(true); + mockDomainObject.getCapability.andCallFake(function (capability) { + return capabilities[capability]; + }); + mockDomainObject.getModel.andReturn({ persisted: 0 }); + mockEditorCapability.save.andReturn(mockPromise(true)); + mockEditorCapability.isEditContextRoot.andReturn(true); + + action = new SaveAndStopEditingAction(dialogService, actionContext); + }); + + + it("only applies to domain object with an editor capability", function () { + expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(true); + expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor"); + + mockDomainObject.hasCapability.andReturn(false); + mockDomainObject.getCapability.andReturn(undefined); + expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(false); + }); + + it("only applies to domain object that has already been persisted", function () { + mockDomainObject.getModel.andReturn({ persisted: undefined }); + expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(false); + }); + + it("does not close the editor before completing the save", function () { + mockEditorCapability.save.andReturn(new Promise(function () { + })); + action.perform(); + expect(mockEditorCapability.save).toHaveBeenCalled(); + expect(mockEditorCapability.cancel).not.toHaveBeenCalled(); + }); + + it("closes the editor after saving", function () { + action.perform(); + expect(mockEditorCapability.save).toHaveBeenCalled(); + expect(mockEditorCapability.cancel).toHaveBeenCalled(); + }); + }); + } +); \ No newline at end of file From ded52b8d199ec96c787db78e94d5920786836f9e Mon Sep 17 00:00:00 2001 From: Alex M Date: Sat, 3 Sep 2016 17:45:23 +0300 Subject: [PATCH 075/150] [Edit] Rename cancel() to finish() --- platform/commonUI/edit/src/actions/CancelAction.js | 2 +- .../commonUI/edit/src/actions/SaveAndStopEditingAction.js | 2 +- .../commonUI/edit/src/capabilities/EditorCapability.js | 4 ++-- platform/commonUI/edit/test/actions/CancelActionSpec.js | 8 ++++---- .../edit/test/actions/SaveAndStopEditingActionSpec.js | 6 +++--- .../edit/test/capabilities/EditorCapabilitySpec.js | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/platform/commonUI/edit/src/actions/CancelAction.js b/platform/commonUI/edit/src/actions/CancelAction.js index 13b005958e..a48ceec996 100644 --- a/platform/commonUI/edit/src/actions/CancelAction.js +++ b/platform/commonUI/edit/src/actions/CancelAction.js @@ -62,7 +62,7 @@ define( } function cancel(allowed) { - return allowed && domainObject.getCapability("editor").cancel(); + return allowed && domainObject.getCapability("editor").finish(); } //Do navigation first in order to trigger unsaved changes dialog diff --git a/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js index a6a1eb9e62..6145ecd05b 100644 --- a/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js +++ b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js @@ -52,7 +52,7 @@ define( saveAction = new SaveAction(this.dialogService, this.context); function closeEditor() { - return domainObject.getCapability("editor").cancel(); + return domainObject.getCapability("editor").finish(); } return saveAction.perform() diff --git a/platform/commonUI/edit/src/capabilities/EditorCapability.js b/platform/commonUI/edit/src/capabilities/EditorCapability.js index a997eb3033..53dea8c91c 100644 --- a/platform/commonUI/edit/src/capabilities/EditorCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js @@ -95,11 +95,11 @@ define( EditorCapability.prototype.invoke = EditorCapability.prototype.edit; /** - * Cancel the current editing session. This will discard any pending + * Finish the current editing session. This will discard any pending * persist operations * @returns {*} */ - EditorCapability.prototype.cancel = function () { + EditorCapability.prototype.finish = function () { var domainObject = this.domainObject; return this.transactionService.cancel().then(function () { domainObject.getCapability("status").set("editing", false); diff --git a/platform/commonUI/edit/test/actions/CancelActionSpec.js b/platform/commonUI/edit/test/actions/CancelActionSpec.js index 3bd0cee72f..7fdc51b0e9 100644 --- a/platform/commonUI/edit/test/actions/CancelActionSpec.js +++ b/platform/commonUI/edit/test/actions/CancelActionSpec.js @@ -63,7 +63,7 @@ define( capabilities.editor = jasmine.createSpyObj( "editor", - ["save", "cancel", "isEditContextRoot"] + ["save", "finish", "isEditContextRoot"] ); capabilities.action = jasmine.createSpyObj( "actionCapability", @@ -105,7 +105,7 @@ define( return !!capabilities[name]; }); - capabilities.editor.cancel.andReturn(mockPromise(true)); + capabilities.editor.finish.andReturn(mockPromise(true)); action = new CancelAction(actionContext); @@ -130,8 +130,8 @@ define( capabilities.action.perform.andReturn(mockPromise(true)); action.perform(); - // Should have called cancel - expect(capabilities.editor.cancel).toHaveBeenCalled(); + // Should have called finish + expect(capabilities.editor.finish).toHaveBeenCalled(); // Definitely shouldn't call save! expect(capabilities.editor.save).not.toHaveBeenCalled(); diff --git a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js index a5d14e3d6d..6570dd6037 100644 --- a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js @@ -57,7 +57,7 @@ define( ); mockEditorCapability = jasmine.createSpyObj( "editor", - ["save", "cancel", "isEditContextRoot"] + ["save", "finish", "isEditContextRoot"] ); mockActionCapability = jasmine.createSpyObj( "actionCapability", @@ -105,13 +105,13 @@ define( })); action.perform(); expect(mockEditorCapability.save).toHaveBeenCalled(); - expect(mockEditorCapability.cancel).not.toHaveBeenCalled(); + expect(mockEditorCapability.finish).not.toHaveBeenCalled(); }); it("closes the editor after saving", function () { action.perform(); expect(mockEditorCapability.save).toHaveBeenCalled(); - expect(mockEditorCapability.cancel).toHaveBeenCalled(); + expect(mockEditorCapability.finish).toHaveBeenCalled(); }); }); } diff --git a/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js b/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js index e72793be53..77fbd9b74f 100644 --- a/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js +++ b/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js @@ -139,10 +139,10 @@ define( }); }); - describe("cancel", function () { + describe("finish", function () { beforeEach(function () { capability.edit(); - capability.cancel(); + capability.finish(); }); it("cancels the transaction", function () { expect(mockTransactionService.cancel).toHaveBeenCalled(); @@ -158,7 +158,7 @@ define( beforeEach(function () { mockDomainObject.getModel.andReturn(model); capability.edit(); - capability.cancel(); + capability.finish(); }); it("returns true if the object has been modified since it" + " was last persisted", function () { From 7d52d348b25a6f318de902bf953faf74b3a70bea Mon Sep 17 00:00:00 2001 From: Alex M Date: Sat, 3 Sep 2016 18:33:27 +0300 Subject: [PATCH 076/150] [Edit] Fix style issues --- .../commonUI/edit/src/actions/SaveAndStopEditingAction.js | 4 ++-- platform/commonUI/edit/src/capabilities/EditorCapability.js | 2 +- .../edit/test/actions/SaveAndStopEditingActionSpec.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js index 6145ecd05b..a0a0583048 100644 --- a/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js +++ b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js @@ -50,7 +50,7 @@ define( SaveAndStopEditingAction.prototype.perform = function () { var domainObject = this.domainObject, saveAction = new SaveAction(this.dialogService, this.context); - + function closeEditor() { return domainObject.getCapability("editor").finish(); } @@ -70,4 +70,4 @@ define( return SaveAndStopEditingAction; } -); \ No newline at end of file +); diff --git a/platform/commonUI/edit/src/capabilities/EditorCapability.js b/platform/commonUI/edit/src/capabilities/EditorCapability.js index 53dea8c91c..2280b04e0c 100644 --- a/platform/commonUI/edit/src/capabilities/EditorCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js @@ -81,7 +81,7 @@ define( }; /** - * Save any unsaved changes from this editing session. This will + * Save any unsaved changes from this editing session. This will * end the current transaction and continue with a new one. * @returns {*} */ diff --git a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js index 6570dd6037..cfed63c0d3 100644 --- a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js @@ -115,4 +115,4 @@ define( }); }); } -); \ No newline at end of file +); From 3dee0821410becb0e89209c376a3051cd5f5f925 Mon Sep 17 00:00:00 2001 From: Alex M Date: Sat, 3 Sep 2016 19:02:05 +0300 Subject: [PATCH 077/150] [Edit] Add reason for redundant mocks --- .../edit/test/actions/SaveAndStopEditingActionSpec.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js index cfed63c0d3..1fb8fa6492 100644 --- a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js @@ -26,6 +26,11 @@ define( describe("The Save and Stop Editing action", function () { + // Some mocks appear unused because the + // underlying SaveAction that this action + // depends on is not mocked, so we mock some + // of SaveAction's own dependencies to make + // it run. var mockDomainObject, mockEditorCapability, actionContext, From 9bb647e27577f78c281a950bb27f9fd3eebb5a07 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sun, 4 Sep 2016 19:19:14 +0900 Subject: [PATCH 078/150] [Testing] Add better dependency injection and error handling --- platform/features/plot/bundle.js | 13 ++- platform/features/plot/src/PlotController.js | 6 +- .../plot/src/services/ExportImageService.js | 93 +++++++++++-------- 3 files changed, 68 insertions(+), 44 deletions(-) diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index bec42694b3..874f8fa240 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -92,7 +92,13 @@ define([ { "key": "ExportImageService", "implementation": ExportImageService, - "depends": [] + "depends": [ + "$q", + "$timeout", + "$log", + "EXPORT_IMAGE_TIMEOUT" + ] + } ], "constants": [ @@ -101,6 +107,11 @@ define([ "value": 900000, "priority": "fallback", "comment": "Fifteen minutes." + }, + { + "key": "EXPORT_IMAGE_TIMEOUT", + "value": 500, + "priority": "fallback" } ], "policies": [ diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 074e17f9b6..97e848f66a 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -374,7 +374,7 @@ define( PlotController.prototype.exportPDF = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportPDF(self.$element[0], "plot.pdf", function () { + self.ExportImageService.exportPDF(self.$element[0], "plot.pdf").finally(function () { self.hideExportButtons = false; }); }; @@ -385,7 +385,7 @@ define( PlotController.prototype.exportPNG = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportPNG(self.$element[0], "plot.png", function () { + self.ExportImageService.exportPNG(self.$element[0], "plot.png").finally(function () { self.hideExportButtons = false; }); }; @@ -396,7 +396,7 @@ define( PlotController.prototype.exportJPG = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportJPG(self.$element[0], "plot.jpg", function () { + self.ExportImageService.exportJPG(self.$element[0], "plot.jpg").finally(function () { self.hideExportButtons = false; }); }; diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 633635a2c6..611330c2d9 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -29,75 +29,88 @@ define( "jsPDF", "saveAs" ], - function (html2canvas, JsPdf, saveAs) { + function ( + html2canvas, + JsPdf, + saveAs + ) { + var self = this; /** * The export image service will export any HTML node to * PDF, JPG, or PNG. * @constructor */ - function ExportImageService() { + function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT) { + self.$q = $q; + self.$timeout = $timeout; + self.$log = $log; + self.EXPORT_IMAGE_TIMEOUT = EXPORT_IMAGE_TIMEOUT; } /** * Renders an HTML element into a base64 encoded image * as a BLOB, PNG, or JPG. * @param {node} element that will be converted to an image - * @param {function} callback for passing the resulting image * @param {string} type of image to convert the element to - * @returns {string} the color, in #RRGGBB form + * @returns {promise} */ - function renderElement(element, callback, type) { - type = type || "jpeg"; + function renderElement(element, type) { + var defer = self.$q.defer(), + renderTimeout; - html2canvas(element, { - onrendered: function (canvas) { - switch (type.toLowerCase()) { - case "blob": - canvas.toBlob(callback); - break; + renderTimeout = self.$timeout(function() { + defer.reject("html2canvas timed out"); + }, self.EXPORT_IMAGE_TIMEOUT); - case "png": - callback(canvas.toDataURL("image/png", 1.0)); - break; + try { + html2canvas(element, { + onrendered: function (canvas) { + switch (type.toLowerCase()) { + case "blob": + canvas.toBlob(defer.resolve); + break; - default: - case "jpg": - case "jpeg": - callback(canvas.toDataURL("image/jpeg", 1.0)); - break; + case "png": + defer.resolve(canvas.toDataURL("image/png", 1.0)); + break; + + default: + case "jpg": + case "jpeg": + defer.resolve(canvas.toDataURL("image/jpeg", 1.0)); + break; + } } - } - }); + }); + } catch(e) { + self.$log.warn("html2canvas failed with error: " + e); + defer.reject(e); + } + + defer.promise.finally(renderTimeout.cancel); + + return defer.promise; } - ExportImageService.prototype.exportPDF = function (element, filename, callback) { - callback = typeof callback === "function" ? callback : function () {}; - - renderElement(element, function (img) { + ExportImageService.prototype.exportPDF = function (element, filename) { + return renderElement(element, "jpeg").then(function (img) { var pdf = new JsPdf("l", "px", [element.offsetHeight, element.offsetWidth]); pdf.addImage(img, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); - callback(); - }, "jpeg"); + }); }; - ExportImageService.prototype.exportJPG = function (element, filename, callback) { - callback = typeof callback === "function" ? callback : function () {}; - - renderElement(element, function (img) { + ExportImageService.prototype.exportJPG = function (element, filename) { + return renderElement(element, "blob").then(function (img) { saveAs(img, filename); - callback(); - }, "blob"); + }); }; - ExportImageService.prototype.exportPNG = function (element, filename, callback) { - callback = typeof callback === "function" ? callback : function () {}; - - renderElement(element, function (img) { + ExportImageService.prototype.exportPNG = function (element, filename) { + return renderElement(element, "blob").then(function (img) { saveAs(img, filename); - callback(); - }, "blob"); + }); }; return ExportImageService; From 989e4e1b75606e9383cd7f95c7f6419017e1b269 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sun, 4 Sep 2016 23:02:23 +0900 Subject: [PATCH 079/150] [Testing] Add jsPDF, html2canvas, and saveAs as injectible dependencies I would prefer this be passed in via the bundle, but it continues to fail saying "Unknown Provider". I have chosen to require them into the module the old-fashioned way, then allow an injectible dependency to override. --- .../plot/src/services/ExportImageService.js | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 611330c2d9..37300686a9 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -31,7 +31,7 @@ define( ], function ( html2canvas, - JsPdf, + jsPDF, saveAs ) { var self = this; @@ -39,13 +39,20 @@ define( /** * The export image service will export any HTML node to * PDF, JPG, or PNG. + * @param {object} $q + * @param {object} $timeout + * @param {object} $log + * @param {constant} EXPORT_IMAGE_TIMEOUT time in milliseconds before a timeout error is returned * @constructor */ - function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT) { + function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injJsPDF, injSaveAs) { self.$q = $q; self.$timeout = $timeout; self.$log = $log; self.EXPORT_IMAGE_TIMEOUT = EXPORT_IMAGE_TIMEOUT; + self.html2canvas = injHtml2Canvas || html2canvas; + self.jsPDF = injJsPDF || jsPDF; + self.saveAs = injSaveAs || saveAs; } /** @@ -59,12 +66,13 @@ define( var defer = self.$q.defer(), renderTimeout; - renderTimeout = self.$timeout(function() { + renderTimeout = self.$timeout(function () { defer.reject("html2canvas timed out"); + self.$log.warn("html2canvas timed out"); }, self.EXPORT_IMAGE_TIMEOUT); try { - html2canvas(element, { + self.html2canvas(element, { onrendered: function (canvas) { switch (type.toLowerCase()) { case "blob": @@ -83,9 +91,9 @@ define( } } }); - } catch(e) { - self.$log.warn("html2canvas failed with error: " + e); + } catch (e) { defer.reject(e); + self.$log.warn("html2canvas failed with error: " + e); } defer.promise.finally(renderTimeout.cancel); @@ -95,7 +103,7 @@ define( ExportImageService.prototype.exportPDF = function (element, filename) { return renderElement(element, "jpeg").then(function (img) { - var pdf = new JsPdf("l", "px", [element.offsetHeight, element.offsetWidth]); + var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); pdf.addImage(img, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); }); @@ -103,13 +111,13 @@ define( ExportImageService.prototype.exportJPG = function (element, filename) { return renderElement(element, "blob").then(function (img) { - saveAs(img, filename); + self.saveAs(img, filename); }); }; ExportImageService.prototype.exportPNG = function (element, filename) { return renderElement(element, "blob").then(function (img) { - saveAs(img, filename); + self.saveAs(img, filename); }); }; From a49eebf9f5a46f8f1cffdb27b6673f154c347950 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sun, 4 Sep 2016 23:04:46 +0900 Subject: [PATCH 080/150] [Testing] Add test spec for ExportImageService --- .../test/services/ExportImageServiceSpec.js | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 platform/features/plot/test/services/ExportImageServiceSpec.js diff --git a/platform/features/plot/test/services/ExportImageServiceSpec.js b/platform/features/plot/test/services/ExportImageServiceSpec.js new file mode 100644 index 0000000000..e25572e3a1 --- /dev/null +++ b/platform/features/plot/test/services/ExportImageServiceSpec.js @@ -0,0 +1,122 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/** + * ExportImageServiceSpec. Created by hudsonfoo on 09/03/16. + */ +define( + ["../../src/services/ExportImageService"], + function (ExportImageService) { + var mockQ, + mockDeferred, + mockPromise, + mockTimeout, + mockLog, + mockHtml2Canvas, + mockJsPDF, + mockJsPDFSave, + mockSaveAs, + mockExportTimeoutConstant, + exportImageService; + + describe("ExportImageService", function () { + beforeEach(function () { + mockDeferred = jasmine.createSpyObj( + "deferred", + ["reject", "resolve"] + ); + mockPromise = jasmine.createSpyObj( + "promise", + ["then", "finally"] + ); + mockPromise.then = function (callback) { + callback(); + }; + mockQ = { + "defer": function () { + return { + "resolve": mockDeferred.resolve, + "reject": mockDeferred.reject, + "promise": mockPromise + }; + } + }; + mockTimeout = function (fn, time) { + return { + "cancel": function () {} + }; + }; + mockLog = jasmine.createSpyObj( + "$log", + ["warn"] + ); + mockHtml2Canvas = jasmine.createSpy("html2canvas"); + mockJsPDFSave = jasmine.createSpy("jsPDFSave"); + mockJsPDF = function () { + return { + "addImage": function () {}, + "save": mockJsPDFSave + }; + }; + mockSaveAs = jasmine.createSpy("saveAs"); + mockExportTimeoutConstant = 0; + + exportImageService = new ExportImageService( + mockQ, + mockTimeout, + mockLog, + mockExportTimeoutConstant, + mockHtml2Canvas, + mockJsPDF, + mockSaveAs + ); + }); + + it("runs html2canvas and tries to save a pdf", function () { + exportImageService.exportPDF("", "plot.pdf"); + + expect(mockHtml2Canvas).toHaveBeenCalled(); + expect(mockDeferred.reject).not.toHaveBeenCalled(); + expect(mockJsPDFSave).toHaveBeenCalled(); + expect(mockPromise.finally).toHaveBeenCalled(); + }); + + it("runs html2canvas and tries to save a png", function () { + exportImageService.exportPNG("", "plot.png"); + + expect(mockHtml2Canvas).toHaveBeenCalled(); + expect(mockDeferred.reject).not.toHaveBeenCalled(); + expect(mockSaveAs).toHaveBeenCalled(); + expect(mockPromise.finally).toHaveBeenCalled(); + }); + + it("runs html2canvas and tries to save a jpg", function () { + exportImageService.exportJPG("", "plot.png"); + + expect(mockHtml2Canvas).toHaveBeenCalled(); + expect(mockDeferred.reject).not.toHaveBeenCalled(); + expect(mockSaveAs).toHaveBeenCalled(); + expect(mockPromise.finally).toHaveBeenCalled(); + }); + }); + } +); From 7d13ce06261af94efa67386e30402c05961d6b34 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Mon, 5 Sep 2016 01:22:43 +0900 Subject: [PATCH 081/150] [Licenses] Add license information for html2canvas, jsPDF, saveAs --- platform/features/plot/bundle.js | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index 874f8fa240..b218fefe2a 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -125,6 +125,38 @@ define([ "key": "plot-options-browse", "template": plotOptionsBrowseTemplate } + ], + "licenses": [ + { + "name": "FileSaver.js", + "version": "0.0.2", + "author": "Eli Grey", + "description": "File download initiator (for file exports)", + "website": "https://github.com/eligrey/FileSaver.js/", + "copyright": "Copyright © 2015 Eli Grey.", + "license": "license-mit", + "link": "https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md" + }, + { + "name": "html2canvas", + "version": "0.4.1", + "author": "Niklas von Hertzen", + "description": "JavaScript HTML renderer", + "website": "https://github.com/niklasvh/html2canvas", + "copyright": "Copyright © 2012 Niklas von Hertzen.", + "license": "license-mit", + "link": "https://github.com/niklasvh/html2canvas/blob/master/LICENSE" + }, + { + "name": "jsPDF", + "version": "1.2.61", + "author": "James Hall", + "description": "JavaScript HTML renderer", + "website": "https://github.com/MrRio/jsPDF", + "copyright": "Copyright © 2010-2016 James Hall", + "license": "license-mit", + "link": "https://github.com/MrRio/jsPDF/blob/master/MIT-LICENSE.txt" + } ] } }); From 35a331f3fd102e01f9e9ca931f914f6e1710a22a Mon Sep 17 00:00:00 2001 From: David Hudson Date: Mon, 5 Sep 2016 17:02:04 +0900 Subject: [PATCH 082/150] [Frontend] Fix plot image cutoff on export The images were being cutoff due to the "top" attribute of .gl-plot not changing when the buttons were hidden. The buttons are now hidden by CSS class rather than ng-show, which makes updating the .gl-plot top attribute easier. --- .../commonUI/general/res/sass/plots/_plots-main.scss | 10 ++++++++++ platform/features/plot/res/templates/plot.html | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 12f148c0d9..8fda639bea 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -43,6 +43,16 @@ top: $btnExportH + $interiorMargin; } } + &.hide-l-btn-set { + .s-button.t-export { + @include trans-prop-nice(opacity, 0ms, 0ms); + opacity: 0; + } + .gl-plot { + @include trans-prop-nice(top, $dur: 0ms); + top: 0; + } + } } .gl-plot { diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index dc230bcfa9..ac4fb0c388 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -20,8 +20,9 @@ at runtime from the About dialog for additional information. --> - + class="abs holder holder-plot" + ng-class="{'hide-l-btn-set': plot.hideExportButtons}"> + From ceb3e8e3dd2825e7d716f6ef0fe707e92691a472 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Mon, 5 Sep 2016 19:40:22 +0900 Subject: [PATCH 083/150] [Enhancement] Add IE, Opera, Safari support for canvas.toBlob() This is currently being used for exporting plots to PNG/JPG. --- .../plot/src/services/ExportImageService.js | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 37300686a9..21b56e2bda 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -101,6 +101,30 @@ define( return defer.promise; } + /** + * canvas.toBlob() not supported in IE < 10, Opera, and Safari. This polyfill + * implements the method in browsers that would not otherwise support it. + * https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob + */ + function polyfillToBlob() { + if (!HTMLCanvasElement.prototype.toBlob) { + Object.defineProperty(HTMLCanvasElement.prototype, "toBlob", { + value: function (callback, type, quality) { + + var binStr = atob(this.toDataURL(type, quality).split(',')[1]), + len = binStr.length, + arr = new Uint8Array(len); + + for (var i = 0; i < len; i++) { + arr[i] = binStr.charCodeAt(i); + } + + callback(new Blob([arr], {type: type || "image/png"})); + } + }); + } + } + ExportImageService.prototype.exportPDF = function (element, filename) { return renderElement(element, "jpeg").then(function (img) { var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); @@ -121,6 +145,8 @@ define( }); }; + polyfillToBlob(); + return ExportImageService; } ); From 4517bd13563978ac1467fcd69c55e8c4aed7d8bc Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 1 Sep 2016 19:48:41 -0700 Subject: [PATCH 084/150] [Frontend] New markup for CSS from #1166 Fixes #967 Requires new styles implemented in #1166 (cherry picked from commit 0457f7bee80f228878912f7ea1fcbe191c2046dc) --- .../features/plot/res/templates/plot.html | 237 +++++++++--------- 1 file changed, 120 insertions(+), 117 deletions(-) diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index ac4fb0c388..411fd15629 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -20,138 +20,141 @@ at runtime from the About dialog for additional information. --> - - - JPG - - - PNG - - - PDF - - -
-
- + class="abs holder holder-plot has-control-bar"> +
+ + + JPG + + + PNG + + + PDF + + +
+
+
+
+ + class='plot-legend-item' + ng-repeat="telemetryObject in subplot.getTelemetryObjects()" + ng-class="plot.getLegendClass(telemetryObject)"> {{telemetryObject.getModel().name}} -
-
- {{subplot.getHoverCoordinates()}} -
-
-
- {{axes[1].active.name}}
-
- {{tick.label | reverse}} +
+ {{subplot.getHoverCoordinates()}}
-
-
- +
+
+ {{axes[1].active.name}}
-
-
-
- - -
-
-
-
-
-
- - - -
- - - - -
- - {{plot.getMode().name}} -
-
    -
  • - {{option.name}} -
    • -
+
+ {{tick.label | reverse}} +
+
+
+
-
-
-
- {{tick.label | reverse}} -
-
- {{axes[0].active.name}} -
-
-
- +
+ + +
+
+
+
+
+
+ + + +
+ + + + +
+ + {{plot.getMode().name}} +
+
    +
  • + {{option.name}} +
    • +
+
+
+
+
+ {{tick.label | reverse}} +
+
+ {{axes[0].active.name}} +
+
+
+ +
+
+
From 222b4421e511f3a26b3f43bd370c9c50a42777fb Mon Sep 17 00:00:00 2001 From: David Hudson Date: Thu, 8 Sep 2016 11:03:36 +0900 Subject: [PATCH 085/150] [Frontend] Remove styles that are no longer necessary Based on updates from 0457f7bee80f228878912f7ea1fcbe191c2046dc these styles are no longer necessary and have been removed. --- .../general/res/sass/plots/_plots-main.scss | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 8fda639bea..6ab9a373ec 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -20,8 +20,6 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .abs.holder-plot { - $btnExportH: $btnFrameH; - // Fend off the scrollbar when less than min-height; right: $interiorMargin; @@ -38,20 +36,6 @@ @include trans-prop-nice(opacity, 150ms, 100ms); opacity: 1; } - .gl-plot { - @include trans-prop-nice(top, $dur: 150ms); - top: $btnExportH + $interiorMargin; - } - } - &.hide-l-btn-set { - .s-button.t-export { - @include trans-prop-nice(opacity, 0ms, 0ms); - opacity: 0; - } - .gl-plot { - @include trans-prop-nice(top, $dur: 0ms); - top: 0; - } } } From 911ece761250a7ae52819035326cd17069d75df2 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Thu, 8 Sep 2016 11:03:36 +0900 Subject: [PATCH 086/150] [Frontend] Remove styles that are no longer necessary Issue #1164. Based on updates from 0457f7bee80f228878912f7ea1fcbe191c2046dc these styles are no longer necessary and have been removed. --- .../general/res/sass/plots/_plots-main.scss | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 8fda639bea..6ab9a373ec 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -20,8 +20,6 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ .abs.holder-plot { - $btnExportH: $btnFrameH; - // Fend off the scrollbar when less than min-height; right: $interiorMargin; @@ -38,20 +36,6 @@ @include trans-prop-nice(opacity, 150ms, 100ms); opacity: 1; } - .gl-plot { - @include trans-prop-nice(top, $dur: 150ms); - top: $btnExportH + $interiorMargin; - } - } - &.hide-l-btn-set { - .s-button.t-export { - @include trans-prop-nice(opacity, 0ms, 0ms); - opacity: 0; - } - .gl-plot { - @include trans-prop-nice(top, $dur: 0ms); - top: 0; - } } } From f7dfccb096748d41c30ac8173812d7fe5db29ac6 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 8 Sep 2016 13:41:51 -0700 Subject: [PATCH 087/150] [Build] Depend on phantomjs-prebuilt 2.1.11 ...due to issues installing 2.1.12 on Linux. Fixes #1176. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 491904fe4d..6d23b86d52 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "mkdirp": "^0.5.1", "moment": "^2.11.1", "node-bourbon": "^4.2.3", - "phantomjs-prebuilt": "^2.1.0", + "phantomjs-prebuilt": "2.1.11", "requirejs": "2.1.x", "split": "^1.0.0" }, From 32e7f57a7c65bbcf97f13ae769d5eb8ea22f748b Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 8 Sep 2016 13:48:53 -0700 Subject: [PATCH 088/150] [Build] Accept future phantomjs versions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d23b86d52..5563f65c82 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "mkdirp": "^0.5.1", "moment": "^2.11.1", "node-bourbon": "^4.2.3", - "phantomjs-prebuilt": "2.1.11", + "phantomjs-prebuilt": "2.1.11 || >2.1.12 <3.0.0", "requirejs": "2.1.x", "split": "^1.0.0" }, From c6caae8647273ff19572c5c604c65af113fb730b Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 9 Sep 2016 12:06:42 +0900 Subject: [PATCH 089/150] [Frontend] Remove unnecessary export button styles --- .../general/res/sass/plots/_plots-main.scss | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index 6ab9a373ec..572b5429e3 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -22,27 +22,12 @@ .abs.holder-plot { // Fend off the scrollbar when less than min-height; right: $interiorMargin; - - .s-button.t-export { - @include trans-prop-nice(opacity, $dur: 50ms); - opacity: 0; - } - .gl-plot { - @include trans-prop-nice(top, $dur: 150ms, $delay: 50ms); - top: 0; - } - &:hover { - .s-button.t-export { - @include trans-prop-nice(opacity, 150ms, 100ms); - opacity: 1; - } - } } .gl-plot { color: $colorPlotFg; font-size: 0.7rem; - position: absolute; + position: relative; width: 100%; height: 100%; min-height: $plotMinH; From 72ecbb0abc455ab5a0a1012ef5eda36def9b9168 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 9 Sep 2016 12:07:02 +0900 Subject: [PATCH 090/150] [Frontend] Fix typo --- platform/features/plot/res/templates/plot.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 411fd15629..e25b582044 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -26,7 +26,7 @@ - JPG + PDF - PDF + JPG
From a6386b16123d2589c892cb034d6b5b9dca73a5a2 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 10 Sep 2016 01:45:50 +0900 Subject: [PATCH 091/150] [Formatting] Rename export image service variables Issue #1164 --- platform/features/plot/bundle.js | 4 ++-- platform/features/plot/src/PlotController.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index b218fefe2a..4564ec5d3c 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -34,7 +34,7 @@ define([ PlotController, PlotViewPolicy, PlotOptionsController, - ExportImageService, + exportImageService, plotTemplate, plotOptionsBrowseTemplate, legacyRegistry @@ -91,7 +91,7 @@ define([ "services": [ { "key": "ExportImageService", - "implementation": ExportImageService, + "implementation": exportImageService, "depends": [ "$q", "$timeout", diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 97e848f66a..3b23bce34a 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -64,7 +64,7 @@ define( function PlotController( $scope, $element, - ExportImageService, + exportImageService, telemetryFormatter, telemetryHandler, throttle, @@ -249,7 +249,7 @@ define( self.pending = true; self.$element = $element; - self.ExportImageService = ExportImageService; + self.exportImageService = exportImageService; // Initialize axes; will get repopulated when telemetry // metadata becomes available. @@ -374,7 +374,7 @@ define( PlotController.prototype.exportPDF = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportPDF(self.$element[0], "plot.pdf").finally(function () { + self.exportImageService.exportPDF(self.$element[0], "plot.pdf").finally(function () { self.hideExportButtons = false; }); }; @@ -385,7 +385,7 @@ define( PlotController.prototype.exportPNG = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportPNG(self.$element[0], "plot.png").finally(function () { + self.exportImageService.exportPNG(self.$element[0], "plot.png").finally(function () { self.hideExportButtons = false; }); }; @@ -396,7 +396,7 @@ define( PlotController.prototype.exportJPG = function () { var self = this; self.hideExportButtons = true; - self.ExportImageService.exportJPG(self.$element[0], "plot.jpg").finally(function () { + self.exportImageService.exportJPG(self.$element[0], "plot.jpg").finally(function () { self.hideExportButtons = false; }); }; From b51ffcada6c92713e3ee7efebbd116b7b6561a7c Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 10 Sep 2016 01:59:07 +0900 Subject: [PATCH 092/150] [Formatting] Add inline JSDoc Issue #1164 --- .../plot/src/services/ExportImageService.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 21b56e2bda..093360dcce 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -125,6 +125,12 @@ define( } } + /** + * Takes a screenshot of a DOM node and exports to PDF. + * @param {node} element to be exported + * @param {string} filename the exported image + * @returns {promise} + */ ExportImageService.prototype.exportPDF = function (element, filename) { return renderElement(element, "jpeg").then(function (img) { var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); @@ -133,12 +139,24 @@ define( }); }; + /** + * Takes a screenshot of a DOM node and exports to JPG. + * @param {node} element to be exported + * @param {string} filename the exported image + * @returns {promise} + */ ExportImageService.prototype.exportJPG = function (element, filename) { return renderElement(element, "blob").then(function (img) { self.saveAs(img, filename); }); }; + /** + * Takes a screenshot of a DOM node and exports to PNG. + * @param {node} element to be exported + * @param {string} filename the exported image + * @returns {promise} + */ ExportImageService.prototype.exportPNG = function (element, filename) { return renderElement(element, "blob").then(function (img) { self.saveAs(img, filename); From 98deac042ec8598c7b35015ba73304431ee3409e Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 10 Sep 2016 02:56:23 +0900 Subject: [PATCH 093/150] [Formatting] Reduce line length of gl declaration Issue #1164 --- platform/features/plot/src/GLChart.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/features/plot/src/GLChart.js b/platform/features/plot/src/GLChart.js index 348a64f923..0ca7776171 100644 --- a/platform/features/plot/src/GLChart.js +++ b/platform/features/plot/src/GLChart.js @@ -54,7 +54,8 @@ define( * @throws {Error} an error is thrown if WebGL is unavailable. */ function GLChart(canvas) { - var gl = canvas.getContext("webgl", { preserveDrawingBuffer: true }) || canvas.getContext("experimental-webgl", { preserveDrawingBuffer: true }), + var gl = canvas.getContext("webgl", { preserveDrawingBuffer: true }) || + canvas.getContext("experimental-webgl", { preserveDrawingBuffer: true }), vertexShader, fragmentShader, program, From 8e39da672633c26b40834f21fd55a2b523453410 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 10 Sep 2016 03:12:00 +0900 Subject: [PATCH 094/150] [Formatting] Rename export image service key Issue #1164 --- platform/features/plot/bundle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index 4564ec5d3c..87b2723113 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -90,7 +90,7 @@ define([ ], "services": [ { - "key": "ExportImageService", + "key": "exportImageService", "implementation": exportImageService, "depends": [ "$q", From d62989bc5d9f8a925057e1b22461bb6ef03d82d8 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 10 Sep 2016 03:18:46 +0900 Subject: [PATCH 095/150] [Formatting] Rename export image service key Issue #1164 --- platform/features/plot/bundle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index 87b2723113..691e310791 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -73,7 +73,7 @@ define([ "depends": [ "$scope", "$element", - "ExportImageService", + "exportImageService", "telemetryFormatter", "telemetryHandler", "throttle", From 24cb72e5b53da4c19d151e7e5757134d3114854a Mon Sep 17 00:00:00 2001 From: David Hudson Date: Mon, 12 Sep 2016 15:28:04 +0900 Subject: [PATCH 096/150] [Frontend] Delay visibility of progress bar Resolves #1168 --- .../commonUI/general/res/sass/overlay/_overlay.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 018197dac0..34bd1fd46f 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -19,8 +19,18 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + .overlay { font-size: 90%; + z-index: 5; + @include keyframes(fadeInFromNone) { + 0% { display: none; opacity: 0; } + 1% { display: block; opacity: 0; } + 95% { display: block; opacity: 0; } + 100% { display: block; opacity: 1; } + } + @include animation(fadeInFromNone 100ms ease-in); + .blocker { background: $colorOvrBlocker; z-index: 100; From 3093ab80673eef86a498845264adb92a10207c65 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Mon, 12 Sep 2016 16:58:21 +0900 Subject: [PATCH 097/150] [Testing] Convert blob to proper format. Inject FileReader. Issue #967 --- .../plot/src/services/ExportImageService.js | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 093360dcce..7fc2708b3e 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -45,7 +45,7 @@ define( * @param {constant} EXPORT_IMAGE_TIMEOUT time in milliseconds before a timeout error is returned * @constructor */ - function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injJsPDF, injSaveAs) { + function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injJsPDF, injSaveAs, injFileReader) { self.$q = $q; self.$timeout = $timeout; self.$log = $log; @@ -53,6 +53,7 @@ define( self.html2canvas = injHtml2Canvas || html2canvas; self.jsPDF = injJsPDF || jsPDF; self.saveAs = injSaveAs || saveAs; + self.reader = injFileReader || new FileReader(); } /** @@ -64,8 +65,14 @@ define( */ function renderElement(element, type) { var defer = self.$q.defer(), + validTypes = ["png", "jpg", "jpeg"], renderTimeout; + if (validTypes.indexOf(type) === -1) { + self.$log.error("Invalid type requested. Try: (" + validTypes.join(",") + ")"); + return; + } + renderTimeout = self.$timeout(function () { defer.reject("html2canvas timed out"); self.$log.warn("html2canvas timed out"); @@ -75,18 +82,14 @@ define( self.html2canvas(element, { onrendered: function (canvas) { switch (type.toLowerCase()) { - case "blob": - canvas.toBlob(defer.resolve); - break; - case "png": - defer.resolve(canvas.toDataURL("image/png", 1.0)); + canvas.toBlob(defer.resolve, "image/png"); break; default: case "jpg": case "jpeg": - defer.resolve(canvas.toDataURL("image/jpeg", 1.0)); + canvas.toBlob(defer.resolve, "image/jpeg"); break; } } @@ -133,9 +136,12 @@ define( */ ExportImageService.prototype.exportPDF = function (element, filename) { return renderElement(element, "jpeg").then(function (img) { - var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); - pdf.addImage(img, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); - pdf.save(filename); + self.reader.readAsDataURL(img); + self.reader.onloadend = function() { + var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); + pdf.addImage(reader.result, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); + pdf.save(filename); + }; }); }; @@ -146,7 +152,7 @@ define( * @returns {promise} */ ExportImageService.prototype.exportJPG = function (element, filename) { - return renderElement(element, "blob").then(function (img) { + return renderElement(element, "jpeg").then(function (img) { self.saveAs(img, filename); }); }; @@ -158,7 +164,7 @@ define( * @returns {promise} */ ExportImageService.prototype.exportPNG = function (element, filename) { - return renderElement(element, "blob").then(function (img) { + return renderElement(element, "png").then(function (img) { self.saveAs(img, filename); }); }; From 487ec7907c02297efcadcf05f8bdf9559c0454a2 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Mon, 12 Sep 2016 16:59:39 +0900 Subject: [PATCH 098/150] [Formatting] Fix missing space Issue #967 --- platform/features/plot/src/services/ExportImageService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 7fc2708b3e..666ddf5505 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -137,7 +137,7 @@ define( ExportImageService.prototype.exportPDF = function (element, filename) { return renderElement(element, "jpeg").then(function (img) { self.reader.readAsDataURL(img); - self.reader.onloadend = function() { + self.reader.onloadend = function () { var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); pdf.addImage(reader.result, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); From bb34528a863f891f64ac06a2a0092530ebf0786b Mon Sep 17 00:00:00 2001 From: David Hudson Date: Mon, 12 Sep 2016 17:00:28 +0900 Subject: [PATCH 099/150] [Testing] Add tests to ensure correct image type Issue #967 --- .../test/services/ExportImageServiceSpec.js | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/platform/features/plot/test/services/ExportImageServiceSpec.js b/platform/features/plot/test/services/ExportImageServiceSpec.js index e25572e3a1..111a8d3432 100644 --- a/platform/features/plot/test/services/ExportImageServiceSpec.js +++ b/platform/features/plot/test/services/ExportImageServiceSpec.js @@ -32,10 +32,13 @@ define( mockTimeout, mockLog, mockHtml2Canvas, + mockCanvas, mockJsPDF, mockJsPDFSave, mockSaveAs, + mockFileReader, mockExportTimeoutConstant, + testElement, exportImageService; describe("ExportImageService", function () { @@ -69,7 +72,13 @@ define( "$log", ["warn"] ); - mockHtml2Canvas = jasmine.createSpy("html2canvas"); + mockHtml2Canvas = jasmine.createSpy("html2canvas").andCallFake(function (element, opts) { + opts.onrendered(mockCanvas); + }); + mockCanvas = jasmine.createSpyObj( + "canvas", + ["toBlob"] + ); mockJsPDFSave = jasmine.createSpy("jsPDFSave"); mockJsPDF = function () { return { @@ -78,7 +87,12 @@ define( }; }; mockSaveAs = jasmine.createSpy("saveAs"); + mockFileReader = jasmine.createSpyObj( + "FileReader", + ["readAsDataURL", "onloadend"] + ); mockExportTimeoutConstant = 0; + testElement = {}; exportImageService = new ExportImageService( mockQ, @@ -87,32 +101,37 @@ define( mockExportTimeoutConstant, mockHtml2Canvas, mockJsPDF, - mockSaveAs + mockSaveAs, + mockFileReader ); }); it("runs html2canvas and tries to save a pdf", function () { - exportImageService.exportPDF("", "plot.pdf"); + exportImageService.exportPDF(testElement, "plot.pdf"); + mockFileReader.onloadend(); - expect(mockHtml2Canvas).toHaveBeenCalled(); + expect(mockHtml2Canvas).toHaveBeenCalledWith(testElement, { onrendered: jasmine.any(Function) }); + expect(mockCanvas.toBlob).toHaveBeenCalledWith(mockDeferred.resolve, "image/jpeg"); expect(mockDeferred.reject).not.toHaveBeenCalled(); expect(mockJsPDFSave).toHaveBeenCalled(); expect(mockPromise.finally).toHaveBeenCalled(); }); it("runs html2canvas and tries to save a png", function () { - exportImageService.exportPNG("", "plot.png"); + exportImageService.exportPNG(testElement, "plot.png"); - expect(mockHtml2Canvas).toHaveBeenCalled(); + expect(mockHtml2Canvas).toHaveBeenCalledWith(testElement, { onrendered: jasmine.any(Function) }); + expect(mockCanvas.toBlob).toHaveBeenCalledWith(mockDeferred.resolve, "image/png"); expect(mockDeferred.reject).not.toHaveBeenCalled(); expect(mockSaveAs).toHaveBeenCalled(); expect(mockPromise.finally).toHaveBeenCalled(); }); it("runs html2canvas and tries to save a jpg", function () { - exportImageService.exportJPG("", "plot.png"); + exportImageService.exportJPG(testElement, "plot.png"); - expect(mockHtml2Canvas).toHaveBeenCalled(); + expect(mockHtml2Canvas).toHaveBeenCalledWith(testElement, { onrendered: jasmine.any(Function) }); + expect(mockCanvas.toBlob).toHaveBeenCalledWith(mockDeferred.resolve, "image/jpeg"); expect(mockDeferred.reject).not.toHaveBeenCalled(); expect(mockSaveAs).toHaveBeenCalled(); expect(mockPromise.finally).toHaveBeenCalled(); From bad901a162e4d777f29bac480162586a2b0d02b8 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Mon, 12 Sep 2016 17:06:23 +0900 Subject: [PATCH 100/150] [Typo] Add reference to self Issue #967 --- platform/features/plot/src/services/ExportImageService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index 666ddf5505..d49adc15ec 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -139,7 +139,7 @@ define( self.reader.readAsDataURL(img); self.reader.onloadend = function () { var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); - pdf.addImage(reader.result, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); + pdf.addImage(self.reader.result, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); }; }); From 37cf56a2b3233fe617115dd5b0c76e42537eaa2c Mon Sep 17 00:00:00 2001 From: Alex M Date: Tue, 13 Sep 2016 00:53:50 +0300 Subject: [PATCH 101/150] [Documentation] Add extra controls --- docs/src/guide/index.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md index 308ca6d2c1..1d8a422299 100644 --- a/docs/src/guide/index.md +++ b/docs/src/guide/index.md @@ -933,7 +933,7 @@ Note that `templateUrl` is not supported for `containers`. Controls provide options for the `mct-control` directive. -Six standard control types are included in the forms bundle: +Ten standard control types are included in the forms bundle: * `textfield`: An area to enter plain text. * `select`: A drop-down list of options. @@ -941,7 +941,13 @@ Six standard control types are included in the forms bundle: * `color`: A color picker. * `button`: A button. * `datetime`: An input for UTC date/time entry; gives result as a UNIX -timestamp, in milliseconds since start of 1970, UTC. +timestamp, in milliseconds since start of 1970, UTC. +* `composite`: A control parenting an array of other controls. +* `menu-button`: A drop-down list of items supporting custom behavior +on click. +* `dialog-button`: A button which opens a dialog allowing a single property +to be edited. +* `radio`: A radio button. New controls may be added as extensions of the controls category. Extensions of this category have two properties: From 2740b6f9572a8a209c7239fd6f5e290a1332e336 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Tue, 13 Sep 2016 16:36:25 +0900 Subject: [PATCH 102/150] [Frontend] Add optional delay parameter to dialog service Issue #1168 --- .../commonUI/dialog/res/templates/overlay.html | 2 +- platform/commonUI/dialog/src/DialogService.js | 3 +++ .../edit/src/actions/SaveInProgressDialog.js | 3 ++- .../commonUI/general/res/sass/_constants.scss | 3 +++ .../general/res/sass/overlay/_overlay.scss | 15 +++++++-------- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html index 825d8fe4f4..dcc847029d 100644 --- a/platform/commonUI/dialog/res/templates/overlay.html +++ b/platform/commonUI/dialog/res/templates/overlay.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
+
Date: Tue, 13 Sep 2016 10:33:32 -0700 Subject: [PATCH 103/150] [Build] Update to es6-promise 3.3.0 ...including changes to filename associated with that version. Fixes #1183 --- bower.json | 2 +- main.js | 2 +- test-main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 670cbd4b70..922eb905f3 100644 --- a/bower.json +++ b/bower.json @@ -13,7 +13,7 @@ "moment-duration-format": "^1.3.0", "requirejs": "~2.1.22", "text": "requirejs-text#^2.0.14", - "es6-promise": "^3.0.2", + "es6-promise": "^3.3.0", "screenfull": "^3.0.0", "node-uuid": "^1.4.7", "comma-separated-values": "^3.6.4", diff --git a/main.js b/main.js index 58ea2b1756..3fc2c4da36 100644 --- a/main.js +++ b/main.js @@ -27,7 +27,7 @@ requirejs.config({ "angular": "bower_components/angular/angular.min", "angular-route": "bower_components/angular-route/angular-route.min", "csv": "bower_components/comma-separated-values/csv.min", - "es6-promise": "bower_components/es6-promise/promise.min", + "es6-promise": "bower_components/es6-promise/es6-promise.min", "html2canvas": "bower_components/html2canvas/build/html2canvas.min", "jsPDF": "bower_components/jspdf/dist/jspdf.min", "moment": "bower_components/moment/moment", diff --git a/test-main.js b/test-main.js index 0e28eb5661..43142766b9 100644 --- a/test-main.js +++ b/test-main.js @@ -53,7 +53,7 @@ requirejs.config({ "angular": "bower_components/angular/angular.min", "angular-route": "bower_components/angular-route/angular-route.min", "csv": "bower_components/comma-separated-values/csv.min", - "es6-promise": "bower_components/es6-promise/promise.min", + "es6-promise": "bower_components/es6-promise/es6-promise.min", "html2canvas": "bower_components/html2canvas/build/html2canvas.min", "jsPDF": "bower_components/jspdf/dist/jspdf.min", "moment": "bower_components/moment/moment", From 79b16ddda643239e555a8807300bc0650e3b795e Mon Sep 17 00:00:00 2001 From: Alex M Date: Tue, 13 Sep 2016 21:24:20 +0300 Subject: [PATCH 104/150] [Edit] SaveAs now calls finish() --- platform/commonUI/edit/src/actions/SaveAsAction.js | 10 ++++++++-- .../commonUI/edit/test/actions/SaveAsActionSpec.js | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platform/commonUI/edit/src/actions/SaveAsAction.js b/platform/commonUI/edit/src/actions/SaveAsAction.js index 57a055429a..402fccb86c 100644 --- a/platform/commonUI/edit/src/actions/SaveAsAction.js +++ b/platform/commonUI/edit/src/actions/SaveAsAction.js @@ -166,11 +166,16 @@ define([ .then(resolveWith(object)); } - function commitEditingAfterClone(clonedObject) { + function saveAfterClone(clonedObject) { return domainObject.getCapability("editor").save() .then(resolveWith(clonedObject)); } + function finishEditing(clonedObject) { + return domainObject.getCapability("editor").finish() + .then(resolveWith(clonedObject)); + } + function onFailure() { hideBlockingDialog(); return false; @@ -182,7 +187,8 @@ define([ .then(getParent) .then(cloneIntoParent) .then(undirtyOriginals) - .then(commitEditingAfterClone) + .then(saveAfterClone) + .then(finishEditing) .then(hideBlockingDialog) .catch(onFailure); }; diff --git a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js index fd8ce18c07..6bf631feed 100644 --- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js @@ -78,9 +78,8 @@ define( mockEditorCapability = jasmine.createSpyObj( "editor", - ["save", "cancel", "isEditContextRoot"] + ["save", "isEditContextRoot"] ); - mockEditorCapability.cancel.andReturn(mockPromise(undefined)); mockEditorCapability.save.andReturn(mockPromise(true)); mockEditorCapability.isEditContextRoot.andReturn(true); capabilities.editor = mockEditorCapability; From 438274501231e46a2049054312fa67e2085385d5 Mon Sep 17 00:00:00 2001 From: Alex M Date: Tue, 13 Sep 2016 22:35:11 +0300 Subject: [PATCH 105/150] [Edit] Final two actions now use finish() --- platform/commonUI/edit/src/actions/EditAction.js | 2 +- platform/commonUI/edit/src/creation/CreateAction.js | 2 +- platform/commonUI/edit/test/actions/EditActionSpec.js | 6 +++--- platform/commonUI/edit/test/creation/CreateActionSpec.js | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/commonUI/edit/src/actions/EditAction.js b/platform/commonUI/edit/src/actions/EditAction.js index bd30968289..9c14abad2a 100644 --- a/platform/commonUI/edit/src/actions/EditAction.js +++ b/platform/commonUI/edit/src/actions/EditAction.js @@ -71,7 +71,7 @@ define( EditAction.prototype.perform = function () { var self = this; function cancelEditing() { - self.domainObject.getCapability('editor').cancel(); + self.domainObject.getCapability('editor').finish(); self.navigationService.removeListener(cancelEditing); } //If this is not the currently navigated object, then navigate diff --git a/platform/commonUI/edit/src/creation/CreateAction.js b/platform/commonUI/edit/src/creation/CreateAction.js index 14b8443462..3cfbdb0ef9 100644 --- a/platform/commonUI/edit/src/creation/CreateAction.js +++ b/platform/commonUI/edit/src/creation/CreateAction.js @@ -72,7 +72,7 @@ define( } function onCancel() { - return editorCapability.cancel(); + return editorCapability.finish(); } newModel.type = this.type.getKey(); diff --git a/platform/commonUI/edit/test/actions/EditActionSpec.js b/platform/commonUI/edit/test/actions/EditActionSpec.js index c896e83dd1..5e54b67e15 100644 --- a/platform/commonUI/edit/test/actions/EditActionSpec.js +++ b/platform/commonUI/edit/test/actions/EditActionSpec.js @@ -58,7 +58,7 @@ define( ); mockEditor = jasmine.createSpyObj( "editorCapability", - ["edit", "isEditContextRoot", "cancel"] + ["edit", "isEditContextRoot", "finish"] ); capabilities = { @@ -98,11 +98,11 @@ define( expect(EditAction.appliesTo(actionContext)).toBe(false); }); - it ("cancels editing when user navigates away", function () { + it ("finishes editing when user navigates away", function () { action.perform(); expect(mockNavigationService.addListener).toHaveBeenCalled(); mockNavigationService.addListener.mostRecentCall.args[0](); - expect(mockEditor.cancel).toHaveBeenCalled(); + expect(mockEditor.finish).toHaveBeenCalled(); }); it ("invokes the Edit capability on the object", function () { diff --git a/platform/commonUI/edit/test/creation/CreateActionSpec.js b/platform/commonUI/edit/test/creation/CreateActionSpec.js index d65621f9a8..19dc46896f 100644 --- a/platform/commonUI/edit/test/creation/CreateActionSpec.js +++ b/platform/commonUI/edit/test/creation/CreateActionSpec.js @@ -103,7 +103,7 @@ define( [ "edit", "save", - "cancel" + "finish" ] ); @@ -178,10 +178,10 @@ define( expect(capabilities.editor.save).toHaveBeenCalled(); }); - it("to cancel the edit if user cancels dialog", function () { + it("to finish the edit if user cancels dialog", function () { action.perform(); promise.then.mostRecentCall.args[1](); - expect(capabilities.editor.cancel).toHaveBeenCalled(); + expect(capabilities.editor.finish).toHaveBeenCalled(); }); }); }); From d87ed1414e41e3a8fa4555c910aa615ac5da52c5 Mon Sep 17 00:00:00 2001 From: Alex M Date: Tue, 13 Sep 2016 22:36:27 +0300 Subject: [PATCH 106/150] [Edit] Update EditorCapability comments --- platform/commonUI/edit/src/capabilities/EditorCapability.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/commonUI/edit/src/capabilities/EditorCapability.js b/platform/commonUI/edit/src/capabilities/EditorCapability.js index 2280b04e0c..1cbf239d7d 100644 --- a/platform/commonUI/edit/src/capabilities/EditorCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js @@ -28,8 +28,8 @@ define( * A capability that implements an editing 'session' for a domain * object. An editing session is initiated via a call to .edit(). * Once initiated, any persist operations will be queued pending a - * subsequent call to [.save()](@link #save) or [.cancel()](@link - * #cancel). + * subsequent call to [.save()](@link #save) or [.finish()](@link + * #finish). * @param transactionService * @param domainObject * @constructor @@ -45,7 +45,7 @@ define( /** * Initiate an editing session. This will start a transaction during * which any persist operations will be deferred until either save() - * or cancel() are called. + * or finish() are called. */ EditorCapability.prototype.edit = function () { this.transactionService.startTransaction(); From 0be84a4e5166d8f5eacc0b98df9bd1ddab3df2b1 Mon Sep 17 00:00:00 2001 From: Alex M Date: Tue, 13 Sep 2016 23:59:28 +0300 Subject: [PATCH 107/150] [Edit] CreateAction closes editor after save --- .../commonUI/edit/src/capabilities/EditorCapability.js | 1 - platform/commonUI/edit/src/creation/CreateAction.js | 9 +++++++-- platform/commonUI/edit/test/creation/CreateActionSpec.js | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/platform/commonUI/edit/src/capabilities/EditorCapability.js b/platform/commonUI/edit/src/capabilities/EditorCapability.js index 1cbf239d7d..2ea532f6a6 100644 --- a/platform/commonUI/edit/src/capabilities/EditorCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js @@ -103,7 +103,6 @@ define( var domainObject = this.domainObject; return this.transactionService.cancel().then(function () { domainObject.getCapability("status").set("editing", false); - return domainObject; }); }; diff --git a/platform/commonUI/edit/src/creation/CreateAction.js b/platform/commonUI/edit/src/creation/CreateAction.js index 3cfbdb0ef9..711e4001a6 100644 --- a/platform/commonUI/edit/src/creation/CreateAction.js +++ b/platform/commonUI/edit/src/creation/CreateAction.js @@ -67,12 +67,17 @@ define( editAction, editorCapability; + function closeEditor() { + return editorCapability.finish(); + } + function onSave() { - return editorCapability.save(); + return editorCapability.save() + .then(closeEditor); } function onCancel() { - return editorCapability.finish(); + return closeEditor(); } newModel.type = this.type.getKey(); diff --git a/platform/commonUI/edit/test/creation/CreateActionSpec.js b/platform/commonUI/edit/test/creation/CreateActionSpec.js index 19dc46896f..60040b5410 100644 --- a/platform/commonUI/edit/test/creation/CreateActionSpec.js +++ b/platform/commonUI/edit/test/creation/CreateActionSpec.js @@ -142,6 +142,7 @@ define( }); describe("the perform function", function () { + var promise = jasmine.createSpyObj("promise", ["then"]); beforeEach(function () { capabilities.action.getActions.andReturn([mockEditAction]); }); @@ -160,15 +161,16 @@ define( " available", function () { capabilities.action.getActions.andReturn([]); capabilities.action.perform.andReturn(mockPromise(undefined)); + capabilities.editor.save.andReturn(promise); action.perform(); expect(capabilities.action.perform).toHaveBeenCalledWith("save"); }); describe("uses to editor capability", function () { - var promise = jasmine.createSpyObj("promise", ["then"]); beforeEach(function () { capabilities.action.getActions.andReturn([]); capabilities.action.perform.andReturn(promise); + capabilities.editor.save.andReturn(promise); }); it("to save the edit if user saves dialog", function () { From c1afc34cfcd7a2753f9e70b9432e773d49577e50 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Wed, 14 Sep 2016 10:16:33 -0700 Subject: [PATCH 108/150] Revert "[Build] Check dependencies for vulnerabilities" --- gulpfile.js | 7 +------ package.json | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index bf52224863..ff994c6a2c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -103,11 +103,6 @@ gulp.task('stylesheets', function () { .pipe(gulp.dest(__dirname)); }); -gulp.task('nsp', function (done) { - var nsp = require('gulp-nsp'); - nsp({package: __dirname + '/package.json'}, done); -}); - gulp.task('lint', function () { var nonspecs = paths.specs.map(function (glob) { return "!" + glob; @@ -157,6 +152,6 @@ gulp.task('develop', ['serve', 'stylesheets', 'watch']); gulp.task('install', [ 'static', 'scripts' ]); -gulp.task('verify', [ 'lint', 'test', 'checkstyle', 'nsp' ]); +gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]); gulp.task('build', [ 'verify', 'install' ]); diff --git a/package.json b/package.json index 5563f65c82..555375007e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0", "gulp-jshint-html-reporter": "^0.1.3", - "gulp-nsp": "^2.4.2", "gulp-rename": "^1.2.2", "gulp-replace-task": "^0.11.0", "gulp-requirejs-optimize": "^0.3.1", From 49d2d5500fb6668ddafe49792b552c8873248a85 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Thu, 15 Sep 2016 09:37:11 -0700 Subject: [PATCH 109/150] Revert "[proxyUrl] pass URL parameters to proxied URL" --- app.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app.js b/app.js index 20429a3a5f..6b7b1bb635 100644 --- a/app.js +++ b/app.js @@ -67,14 +67,10 @@ }); app.use('/proxyUrl', function proxyRequest(req, res, next) { - var targetUrl = req.query.url; - var queryParameters = req.query; - console.log('Proxying request to: ', targetUrl); - delete queryParameters['url']; + console.log('Proxying request to: ', req.query.url); req.pipe(request({ - url: targetUrl, - strictSSL: false, - qs: queryParameters + url: req.query.url, + strictSSL: false }).on('error', next)).pipe(res); }); From 1ea7fa30842dcaa387c9263939d3f1408d23814a Mon Sep 17 00:00:00 2001 From: Alex M Date: Thu, 15 Sep 2016 20:28:29 +0300 Subject: [PATCH 110/150] [Edit] SaveAsAction tests cover save and finish --- .../edit/test/actions/SaveAsActionSpec.js | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js index 6bf631feed..a51e165688 100644 --- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js @@ -19,7 +19,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*global describe,it,expect,beforeEach,jasmine*/ +/*global describe,it,expect,beforeEach,jasmine,runs,waitsFor,spyOn*/ define( ["../../src/actions/SaveAsAction"], @@ -78,9 +78,10 @@ define( mockEditorCapability = jasmine.createSpyObj( "editor", - ["save", "isEditContextRoot"] + ["save", "finish", "isEditContextRoot"] ); mockEditorCapability.save.andReturn(mockPromise(true)); + mockEditorCapability.finish.andReturn(mockPromise(true)); mockEditorCapability.isEditContextRoot.andReturn(true); capabilities.editor = mockEditorCapability; @@ -154,6 +155,28 @@ define( mockDomainObject.getModel.andReturn({persisted: 0}); expect(SaveAsAction.appliesTo(actionContext)).toBe(false); }); + + it("uses the editor capability to save the object", function () { + mockEditorCapability.save.andReturn(new Promise(function () {})); + runs(function () { + action.perform(); + }); + waitsFor(function () { + return mockEditorCapability.save.calls.length > 0; + }, "perform() should call EditorCapability.save"); + runs(function () { + expect(mockEditorCapability.finish).not.toHaveBeenCalled(); + }); + }); + + it("uses the editor capability to finish editing the object", function () { + runs(function () { + action.perform(); + }); + waitsFor(function () { + return mockEditorCapability.finish.calls.length > 0; + }, "perform() should call EditorCapability.finish"); + }); it("returns to browse after save", function () { spyOn(action, "save"); From 31ee92b7110b52ce432994a3dcc126eef2daf844 Mon Sep 17 00:00:00 2001 From: Alex M Date: Thu, 15 Sep 2016 20:39:02 +0300 Subject: [PATCH 111/150] [Edit] Remove editor.cancel from SaveActionSpec --- platform/commonUI/edit/test/actions/SaveActionSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/edit/test/actions/SaveActionSpec.js b/platform/commonUI/edit/test/actions/SaveActionSpec.js index 7324b53085..7230c09448 100644 --- a/platform/commonUI/edit/test/actions/SaveActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveActionSpec.js @@ -56,7 +56,7 @@ define( ); mockEditorCapability = jasmine.createSpyObj( "editor", - ["save", "cancel", "isEditContextRoot"] + ["save", "isEditContextRoot"] ); mockActionCapability = jasmine.createSpyObj( "actionCapability", From d1f67fd8b9f8eaa82cc1c1b04504a2c4210e1cd8 Mon Sep 17 00:00:00 2001 From: Alex M Date: Thu, 15 Sep 2016 22:40:02 +0300 Subject: [PATCH 112/150] [Edit] Introduce dropdown Save menu And fix style issues in SaveAsActionSpec --- platform/commonUI/edit/bundle.js | 24 +++++-- .../res/templates/edit-action-buttons.html | 23 ++++++- .../src/controllers/EditActionController.js | 30 +++++++-- .../edit/test/actions/SaveAsActionSpec.js | 2 +- .../controllers/EditActionControllerSpec.js | 66 +++++++++++++++++-- 5 files changed, 124 insertions(+), 21 deletions(-) diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 787f02d9c4..b1af2f6f50 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -30,6 +30,7 @@ define([ "./src/actions/EditAction", "./src/actions/PropertiesAction", "./src/actions/RemoveAction", + "./src/actions/SaveAction", "./src/actions/SaveAndStopEditingAction", "./src/actions/SaveAsAction", "./src/actions/CancelAction", @@ -69,6 +70,7 @@ define([ EditAction, PropertiesAction, RemoveAction, + SaveAction, SaveAndStopEditingAction, SaveAsAction, CancelAction, @@ -203,20 +205,30 @@ define([ ] }, { - "key": "save", - "category": "conclude-editing", + "key": "save-and-stop-editing", + "category": "save", "implementation": SaveAndStopEditingAction, - "name": "Save", + "name": "Save and Done Editing", "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", "depends": [ "dialogService" - ], - "priority": "mandatory" + ] }, { "key": "save", - "category": "conclude-editing", + "category": "save", + "implementation": SaveAction, + "name": "Save and Continue Editing", + "cssclass": "icon-save labeled", + "description": "Save changes made to these objects.", + "depends": [ + "dialogService" + ] + }, + { + "key": "save-as", + "category": "save", "implementation": SaveAsAction, "name": "Save As...", "cssclass": "icon-save labeled", diff --git a/platform/commonUI/edit/res/templates/edit-action-buttons.html b/platform/commonUI/edit/res/templates/edit-action-buttons.html index fc46b31f57..7884373d18 100644 --- a/platform/commonUI/edit/res/templates/edit-action-buttons.html +++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html @@ -20,11 +20,30 @@ at runtime from the About dialog for additional information. --> - + + + + {{saveActions[0].getMetadata().name}} + + + + + + + + + + ng-class="{ major: $index === 0 && saveActions.length === 0 }"> {{currentAction.getMetadata().name}} diff --git a/platform/commonUI/edit/src/controllers/EditActionController.js b/platform/commonUI/edit/src/controllers/EditActionController.js index 19fddf931d..7c33799ebb 100644 --- a/platform/commonUI/edit/src/controllers/EditActionController.js +++ b/platform/commonUI/edit/src/controllers/EditActionController.js @@ -27,7 +27,8 @@ define( [], function () { - var ACTION_CONTEXT = { category: 'conclude-editing' }; + var SAVE_ACTION_CONTEXT = { category: 'save' }; + var OTHERS_ACTION_CONTEXT = { category: 'conclude-editing' }; /** * Controller which supplies action instances for Save/Cancel. @@ -35,11 +36,30 @@ define( * @constructor */ function EditActionController($scope) { - // Maintain all "conclude-editing" actions in the present - // context. + + function actionToMenuOption(action) { + return { + key: action, + name: action.getMetadata().name, + cssclass: action.getMetadata().cssclass + }; + } + + // Maintain all "conclude-editing" and "save" actions in the + // present context. function updateActions() { - $scope.editActions = $scope.action ? - $scope.action.getActions(ACTION_CONTEXT) : + $scope.saveActions = $scope.action ? + $scope.action.getActions(SAVE_ACTION_CONTEXT) : + []; + + $scope.saveActionsAsMenuOptions = $scope.saveActions.map(actionToMenuOption); + + $scope.saveActionMenuClickHandler = function (clickedAction) { + clickedAction.perform(); + }; + + $scope.otherEditActions = $scope.action ? + $scope.action.getActions(OTHERS_ACTION_CONTEXT) : []; } diff --git a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js index a51e165688..a175118f16 100644 --- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js @@ -155,7 +155,7 @@ define( mockDomainObject.getModel.andReturn({persisted: 0}); expect(SaveAsAction.appliesTo(actionContext)).toBe(false); }); - + it("uses the editor capability to save the object", function () { mockEditorCapability.save.andReturn(new Promise(function () {})); runs(function () { diff --git a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js index 36faf7beb8..7905368e05 100644 --- a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js +++ b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js @@ -19,22 +19,54 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/*global describe,it,expect,beforeEach,jasmine,spyOn*/ define( ["../../src/controllers/EditActionController"], function (EditActionController) { describe("The Edit Action controller", function () { + function FakeSaveAction() { + } + + var fakeSaveActionMetadata = { + name: "mocked-save-action", + cssclass: "mocked-save-action-css" + }; + + FakeSaveAction.prototype.getMetadata = function () { + return fakeSaveActionMetadata; + }; + + FakeSaveAction.prototype.perform = function () { + }; + + function fakeGetActions(actionContext) { + if (actionContext.category === "save") { + return [new FakeSaveAction(), new FakeSaveAction()]; + } else if (actionContext.category === "conclude-editing") { + return ["a", "b", "c"]; + } else { + throw "EditActionController uses a context that's not covered by tests."; + } + } + var mockScope, mockActions, controller; beforeEach(function () { mockActions = jasmine.createSpyObj("action", ["getActions"]); + mockActions.getActions.andCallFake(fakeGetActions); mockScope = jasmine.createSpyObj("$scope", ["$watch"]); + mockScope.action = mockActions; controller = new EditActionController(mockScope); }); + function makeControllerUpdateActions() { + mockScope.$watch.mostRecentCall.args[1](); + } + it("watches scope that may change applicable actions", function () { // The action capability expect(mockScope.$watch).toHaveBeenCalledWith( @@ -43,16 +75,36 @@ define( ); }); - it("populates the scope with grouped and ungrouped actions", function () { - mockScope.action = mockActions; + it("populates the scope with 'save' actions", function () { + makeControllerUpdateActions(); + expect(mockScope.saveActions.length).toEqual(2); + }); - mockActions.getActions.andReturn(["a", "b", "c"]); + it("converts 'save' actions to their menu counterparts", function () { + makeControllerUpdateActions(); + var menuOptions = mockScope.saveActionsAsMenuOptions; - // Call the watch - mockScope.$watch.mostRecentCall.args[1](); + expect(menuOptions.length).toEqual(2); + expect(menuOptions[0].key).toEqual(mockScope.saveActions[0]); + expect(menuOptions[1].key).toEqual(mockScope.saveActions[1]); + menuOptions.forEach(function (option) { + expect(option.name).toEqual(fakeSaveActionMetadata.name); + expect(option.cssclass).toEqual(fakeSaveActionMetadata.cssclass); + }); + }); - // Should have grouped and ungrouped actions in scope now - expect(mockScope.editActions.length).toEqual(3); + it("uses a click handler to perform the clicked action", function () { + makeControllerUpdateActions(); + var sampleSaveAction = mockScope.saveActions[0]; + + spyOn(sampleSaveAction, "perform"); + mockScope.saveActionMenuClickHandler(sampleSaveAction); + expect(sampleSaveAction.perform).toHaveBeenCalled(); + }); + + it("populates the scope with other 'conclude-editing' actions", function () { + makeControllerUpdateActions(); + expect(mockScope.otherEditActions).toEqual(["a", "b", "c"]); }); }); } From d3db26499c6cc3c7e5ff67c0b490c55988b9de48 Mon Sep 17 00:00:00 2001 From: Alex M Date: Thu, 15 Sep 2016 23:14:12 +0300 Subject: [PATCH 113/150] [Edit] CreateAction needs to perform("save-as") --- platform/commonUI/edit/src/creation/CreateAction.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/edit/src/creation/CreateAction.js b/platform/commonUI/edit/src/creation/CreateAction.js index 711e4001a6..b83351544f 100644 --- a/platform/commonUI/edit/src/creation/CreateAction.js +++ b/platform/commonUI/edit/src/creation/CreateAction.js @@ -90,9 +90,9 @@ define( if (editAction) { return editAction.perform(); } else if (editorCapability) { - //otherwise, use the save action + //otherwise, use the save as action editorCapability.edit(); - return newObject.getCapability("action").perform("save").then(onSave, onCancel); + return newObject.getCapability("action").perform("save-as").then(onSave, onCancel); } }; From f03003b366c21c8e3aba882f7853c407deddd471 Mon Sep 17 00:00:00 2001 From: Alex M Date: Thu, 15 Sep 2016 23:18:53 +0300 Subject: [PATCH 114/150] [Edit] Fix CreateActionSpec --- platform/commonUI/edit/test/creation/CreateActionSpec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/edit/test/creation/CreateActionSpec.js b/platform/commonUI/edit/test/creation/CreateActionSpec.js index 60040b5410..cd3d3fbc91 100644 --- a/platform/commonUI/edit/test/creation/CreateActionSpec.js +++ b/platform/commonUI/edit/test/creation/CreateActionSpec.js @@ -157,13 +157,13 @@ define( expect(mockEditAction.perform).toHaveBeenCalled(); }); - it("uses the save action if object does not have an edit action" + + it("uses the save-as action if object does not have an edit action" + " available", function () { capabilities.action.getActions.andReturn([]); capabilities.action.perform.andReturn(mockPromise(undefined)); capabilities.editor.save.andReturn(promise); action.perform(); - expect(capabilities.action.perform).toHaveBeenCalledWith("save"); + expect(capabilities.action.perform).toHaveBeenCalledWith("save-as"); }); describe("uses to editor capability", function () { From 1446b16e77f1df668784e05c8047f591deba07c2 Mon Sep 17 00:00:00 2001 From: Alex M Date: Fri, 16 Sep 2016 03:15:10 +0300 Subject: [PATCH 115/150] [Edit] Using spy objects as save action mocks --- .../controllers/EditActionControllerSpec.js | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js index 7905368e05..6b7b52debc 100644 --- a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js +++ b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js @@ -26,24 +26,21 @@ define( function (EditActionController) { describe("The Edit Action controller", function () { - function FakeSaveAction() { - } - - var fakeSaveActionMetadata = { + var mockSaveActionMetadata = { name: "mocked-save-action", cssclass: "mocked-save-action-css" }; - FakeSaveAction.prototype.getMetadata = function () { - return fakeSaveActionMetadata; - }; - - FakeSaveAction.prototype.perform = function () { - }; - function fakeGetActions(actionContext) { if (actionContext.category === "save") { - return [new FakeSaveAction(), new FakeSaveAction()]; + var mockedSaveActions = [ + jasmine.createSpyObj("mockSaveAction", ["getMetadata", "perform"]), + jasmine.createSpyObj("mockSaveAction", ["getMetadata", "perform"]) + ]; + mockedSaveActions.forEach(function (action) { + action.getMetadata.andReturn(mockSaveActionMetadata); + }); + return mockedSaveActions; } else if (actionContext.category === "conclude-editing") { return ["a", "b", "c"]; } else { @@ -88,21 +85,19 @@ define( expect(menuOptions[0].key).toEqual(mockScope.saveActions[0]); expect(menuOptions[1].key).toEqual(mockScope.saveActions[1]); menuOptions.forEach(function (option) { - expect(option.name).toEqual(fakeSaveActionMetadata.name); - expect(option.cssclass).toEqual(fakeSaveActionMetadata.cssclass); + expect(option.name).toEqual(mockSaveActionMetadata.name); + expect(option.cssclass).toEqual(mockSaveActionMetadata.cssclass); }); }); it("uses a click handler to perform the clicked action", function () { makeControllerUpdateActions(); var sampleSaveAction = mockScope.saveActions[0]; - - spyOn(sampleSaveAction, "perform"); mockScope.saveActionMenuClickHandler(sampleSaveAction); expect(sampleSaveAction.perform).toHaveBeenCalled(); }); - it("populates the scope with other 'conclude-editing' actions", function () { + it("populates the scope with other editing actions", function () { makeControllerUpdateActions(); expect(mockScope.otherEditActions).toEqual(["a", "b", "c"]); }); From 2a2e9ef99df364a9b9c2780178caff40c174833f Mon Sep 17 00:00:00 2001 From: Alex M Date: Fri, 16 Sep 2016 03:24:00 +0300 Subject: [PATCH 116/150] [Edit] Make linter happy --- .../commonUI/edit/test/controllers/EditActionControllerSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js index 6b7b52debc..bd5c8a9524 100644 --- a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js +++ b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js @@ -19,7 +19,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*global describe,it,expect,beforeEach,jasmine,spyOn*/ +/*global describe,it,expect,beforeEach,jasmine*/ define( ["../../src/controllers/EditActionController"], From 0ec27350e09279de163d1c38a43a6882a1d415df Mon Sep 17 00:00:00 2001 From: smirecki Date: Fri, 16 Sep 2016 16:50:11 -0400 Subject: [PATCH 117/150] Update TimelineTickController.js One correction by @akhenry, "region, not reign". --- .../features/timeline/src/controllers/TimelineTickController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/features/timeline/src/controllers/TimelineTickController.js b/platform/features/timeline/src/controllers/TimelineTickController.js index fb1f2ad6b8..56275a6d16 100644 --- a/platform/features/timeline/src/controllers/TimelineTickController.js +++ b/platform/features/timeline/src/controllers/TimelineTickController.js @@ -28,7 +28,7 @@ define( /** * Provides labels for the tick mark area of a timeline view. - * Since the tick mark reign is potentially extremely large, + * Since the tick mark region is potentially extremely large, * only the subset of ticks which will actually be shown in * view are provided. * @constructor From ae89dcd62dd013db63dcda4e9a09ea1126003b5e Mon Sep 17 00:00:00 2001 From: Alex M Date: Sat, 17 Sep 2016 00:39:49 +0300 Subject: [PATCH 118/150] [Edit] Make single save button use mct-control --- .../edit/res/templates/edit-action-buttons.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/platform/commonUI/edit/res/templates/edit-action-buttons.html b/platform/commonUI/edit/res/templates/edit-action-buttons.html index 7884373d18..0cc21b02ca 100644 --- a/platform/commonUI/edit/res/templates/edit-action-buttons.html +++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html @@ -22,11 +22,13 @@ - - {{saveActions[0].getMetadata().name}} - + + @@ -39,7 +41,7 @@ - + Date: Sat, 17 Sep 2016 01:05:46 +0300 Subject: [PATCH 119/150] [Edit] Rename action to Save and Finish Editing --- platform/commonUI/edit/bundle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index b1af2f6f50..48f38d7ee9 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -208,7 +208,7 @@ define([ "key": "save-and-stop-editing", "category": "save", "implementation": SaveAndStopEditingAction, - "name": "Save and Done Editing", + "name": "Save and Finish Editing", "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", "depends": [ From 48b25fe842756f871395903fe52b9ccd4bfc804b Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sat, 17 Sep 2016 16:32:26 +0900 Subject: [PATCH 120/150] [Formatting] Remove double negative logic Issue #1168 --- platform/commonUI/dialog/res/templates/overlay.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html index dcc847029d..215fe97aac 100644 --- a/platform/commonUI/dialog/res/templates/overlay.html +++ b/platform/commonUI/dialog/res/templates/overlay.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
+
Date: Sat, 17 Sep 2016 16:36:55 +0900 Subject: [PATCH 121/150] [Frontend] Shorten overlay fade duration Issue #1168 --- platform/commonUI/general/res/sass/_constants.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 4cb240850b..1e609cc038 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -63,7 +63,7 @@ $ovrTopBarH: 45px; $ovrFooterH: 24px; $overlayMargin: 25px; /*************** Progress Overlay */ -$durEntryMs: 100ms; +$durEntryMs: 50ms; $delayEntryMs: 100ms; /*************** Items */ $ueBrowseGridItemLg: 200px; From 56e321f6d91c21d6bc2bbfc65b08455cbd12025f Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sun, 18 Sep 2016 01:18:02 +0900 Subject: [PATCH 122/150] [Forms] Add textarea template Issue #1184 --- platform/forms/bundle.js | 6 ++++ .../res/templates/controls/textarea.html | 31 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 platform/forms/res/templates/controls/textarea.html diff --git a/platform/forms/bundle.js b/platform/forms/bundle.js index daa7063ffe..d3ee14f440 100644 --- a/platform/forms/bundle.js +++ b/platform/forms/bundle.js @@ -32,6 +32,7 @@ define([ "text!./res/templates/controls/datetime.html", "text!./res/templates/controls/select.html", "text!./res/templates/controls/textfield.html", + "text!./res/templates/controls/textarea.html", "text!./res/templates/controls/button.html", "text!./res/templates/controls/color.html", "text!./res/templates/controls/composite.html", @@ -51,6 +52,7 @@ define([ datetimeTemplate, selectTemplate, textfieldTemplate, + textareaTemplate, buttonTemplate, colorTemplate, compositeTemplate, @@ -103,6 +105,10 @@ define([ "key": "textfield", "template": textfieldTemplate }, + { + "key": "textarea", + "template": textareaTemplate + }, { "key": "button", "template": buttonTemplate diff --git a/platform/forms/res/templates/controls/textarea.html b/platform/forms/res/templates/controls/textarea.html new file mode 100644 index 0000000000..45c4db4e1e --- /dev/null +++ b/platform/forms/res/templates/controls/textarea.html @@ -0,0 +1,31 @@ + + + + + + From 4429e847e8d148ef01d999e8aa9523b588cf4eed Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sun, 18 Sep 2016 01:18:26 +0900 Subject: [PATCH 123/150] [Properties] Add notes field to all item types Issue #1184 --- platform/core/bundle.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platform/core/bundle.js b/platform/core/bundle.js index 8b4baf83ff..8567d11fc3 100644 --- a/platform/core/bundle.js +++ b/platform/core/bundle.js @@ -252,6 +252,12 @@ define([ "pattern": "\\S+", "required": true, "cssclass": "l-input-lg" + }, + { + "name": "Notes", + "control": "textarea", + "required": false, + "cssclass": "field-notes" } ] }, From f9ce27def3a6625e9f531adc252484ef7cc8159a Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sun, 18 Sep 2016 01:27:12 +0900 Subject: [PATCH 124/150] [Frontend] Add attributes for storing notes Issue #1184 --- platform/core/bundle.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/core/bundle.js b/platform/core/bundle.js index 8567d11fc3..0f2ba311c3 100644 --- a/platform/core/bundle.js +++ b/platform/core/bundle.js @@ -255,6 +255,8 @@ define([ }, { "name": "Notes", + "key": "notes", + "property": "notes", "control": "textarea", "required": false, "cssclass": "field-notes" From 56267095cba4425ddb70e2b70ab692db05db0132 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sun, 18 Sep 2016 01:47:07 +0900 Subject: [PATCH 125/150] [Forms] Add style for small textareas Issue #1184. This allows for a generically sized text area in forms. I am anticipating some potential feedback on this given the approach and the sizing I chose may or may not be ideal for your requirements. --- platform/commonUI/general/res/sass/controls/_controls.scss | 1 + platform/core/bundle.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 7900739668..d1935d8ce0 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -216,6 +216,7 @@ input[type="search"] { .l-input-lg input[type="text"] { width: 100% !important; } .l-input-med input[type="text"] { width: 200px !important; } .l-input-sm input[type="text"] { width: 50px !important; } +.l-textarea-sm textarea { position: relative; height: 50px; } .l-numeric input[type="text"] { text-align: right; } .input-labeled { diff --git a/platform/core/bundle.js b/platform/core/bundle.js index 0f2ba311c3..4b9e2b9adb 100644 --- a/platform/core/bundle.js +++ b/platform/core/bundle.js @@ -259,7 +259,7 @@ define([ "property": "notes", "control": "textarea", "required": false, - "cssclass": "field-notes" + "cssclass": "l-textarea-sm" } ] }, From d913798d5b3c6a416a0a8857f4a6103f2155b6dd Mon Sep 17 00:00:00 2001 From: David Hudson Date: Sun, 18 Sep 2016 22:52:41 +0900 Subject: [PATCH 126/150] [Timeline] Add battery starting state-of-charge Issue #1185 --- platform/features/timeline/bundle.js | 10 ++++++++++ .../timeline/src/capabilities/GraphCapability.js | 2 +- .../timeline/test/capabilities/GraphCapabilitySpec.js | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js index 12effc50a3..145a496f08 100644 --- a/platform/features/timeline/bundle.js +++ b/platform/features/timeline/bundle.js @@ -182,6 +182,16 @@ define([ "capacity" ], "pattern": "^-?\\d+(\\.\\d*)?$" + }, + { + "name": "Battery Starting SOC", + "control": "textfield", + "required": false, + "conversion": "number", + "property": [ + "startingSOC" + ], + "pattern": "^-?\\d+(\\.\\d*)?$" } ], "model": { diff --git a/platform/features/timeline/src/capabilities/GraphCapability.js b/platform/features/timeline/src/capabilities/GraphCapability.js index d9810005a3..c4e5166f0e 100644 --- a/platform/features/timeline/src/capabilities/GraphCapability.js +++ b/platform/features/timeline/src/capabilities/GraphCapability.js @@ -60,7 +60,7 @@ define( result.power, 0, domainObject.getModel().capacity, // Watts - domainObject.getModel().capacity, + domainObject.getModel().startingSOC, 1 / 3600000 // millis-to-hour (since units are watt-hours) ); } diff --git a/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js b/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js index 71a6de2ade..e36724dbcb 100644 --- a/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js +++ b/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js @@ -101,6 +101,7 @@ define( it("provides a battery graph for timelines with capacity", function () { var mockCallback = jasmine.createSpy('callback'); testModel.capacity = 1000; + testModel.startingSOC = 1000; testModel.type = "timeline"; mockDomainObject.useCapability.andReturn(asPromise([ { key: "power", start: 0, end: 15 } From b50278e92fa6217bc4c890458b8f7a447045ed51 Mon Sep 17 00:00:00 2001 From: Alex M Date: Mon, 19 Sep 2016 20:22:46 +0300 Subject: [PATCH 127/150] [Edit] Remove mocked unused UrlService --- platform/commonUI/edit/test/actions/SaveAsActionSpec.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js index a175118f16..c1b0eee003 100644 --- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js @@ -33,7 +33,6 @@ define( mockDialogService, mockCopyService, mockParent, - mockUrlService, actionContext, capabilities = {}, action; @@ -112,12 +111,7 @@ define( "perform" ] ); - - mockUrlService = jasmine.createSpyObj( - "urlService", - ["urlForLocation"] - ); - + actionContext = { domainObject: mockDomainObject }; From f60fc2ebad09085fd71d80d1d900483c2999e025 Mon Sep 17 00:00:00 2001 From: Alex M Date: Mon, 19 Sep 2016 20:33:12 +0300 Subject: [PATCH 128/150] [Edit] EditorCapability.finish returns domainObj --- platform/commonUI/edit/src/capabilities/EditorCapability.js | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/commonUI/edit/src/capabilities/EditorCapability.js b/platform/commonUI/edit/src/capabilities/EditorCapability.js index 2ea532f6a6..1cbf239d7d 100644 --- a/platform/commonUI/edit/src/capabilities/EditorCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js @@ -103,6 +103,7 @@ define( var domainObject = this.domainObject; return this.transactionService.cancel().then(function () { domainObject.getCapability("status").set("editing", false); + return domainObject; }); }; From e08704e6d30413cf5533e62be68f003334a3ff1c Mon Sep 17 00:00:00 2001 From: Alex M Date: Mon, 19 Sep 2016 20:39:54 +0300 Subject: [PATCH 129/150] [Edit] Make checkstyle happy --- platform/commonUI/edit/test/actions/SaveAsActionSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js index c1b0eee003..95f0209800 100644 --- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js @@ -111,7 +111,7 @@ define( "perform" ] ); - + actionContext = { domainObject: mockDomainObject }; From abfabc85b56f7b335484b4f30249362179d93371 Mon Sep 17 00:00:00 2001 From: Alex M Date: Mon, 19 Sep 2016 20:41:50 +0300 Subject: [PATCH 130/150] [Edit] Fix edit-action-buttons indent --- platform/commonUI/edit/res/templates/edit-action-buttons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/commonUI/edit/res/templates/edit-action-buttons.html b/platform/commonUI/edit/res/templates/edit-action-buttons.html index 0cc21b02ca..4bc020612f 100644 --- a/platform/commonUI/edit/res/templates/edit-action-buttons.html +++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html @@ -41,7 +41,7 @@ - + Date: Mon, 19 Sep 2016 23:52:30 +0300 Subject: [PATCH 131/150] [Edit] Remove CreationService dep from SaveAs --- platform/commonUI/edit/bundle.js | 1 - platform/commonUI/edit/src/actions/SaveAsAction.js | 2 -- platform/commonUI/edit/test/actions/SaveAsActionSpec.js | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 48f38d7ee9..60da900176 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -237,7 +237,6 @@ define([ "$injector", "policyService", "dialogService", - "creationService", "copyService" ], "priority": "mandatory" diff --git a/platform/commonUI/edit/src/actions/SaveAsAction.js b/platform/commonUI/edit/src/actions/SaveAsAction.js index 402fccb86c..2befea07fd 100644 --- a/platform/commonUI/edit/src/actions/SaveAsAction.js +++ b/platform/commonUI/edit/src/actions/SaveAsAction.js @@ -42,7 +42,6 @@ define([ $injector, policyService, dialogService, - creationService, copyService, context ) { @@ -52,7 +51,6 @@ define([ }; this.policyService = policyService; this.dialogService = dialogService; - this.creationService = creationService; this.copyService = copyService; } diff --git a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js index 95f0209800..f87cf4766f 100644 --- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js @@ -116,7 +116,7 @@ define( domainObject: mockDomainObject }; - action = new SaveAsAction(undefined, undefined, mockDialogService, undefined, mockCopyService, actionContext); + action = new SaveAsAction(undefined, undefined, mockDialogService, mockCopyService, actionContext); spyOn(action, "getObjectService"); action.getObjectService.andReturn(mockObjectService); From 943e2ebe14fc076904ca2eb2832c08f8197efc1e Mon Sep 17 00:00:00 2001 From: David Hudson Date: Tue, 20 Sep 2016 17:40:08 +0900 Subject: [PATCH 132/150] [Timeline] Convert SOC to use percentages Also includes updated validation params which allow for floats to a maximum of 100 as well as a percentage sign which is later removed. --- platform/features/timeline/bundle.js | 4 ++-- .../features/timeline/src/capabilities/GraphCapability.js | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js index 145a496f08..42b3c948f9 100644 --- a/platform/features/timeline/bundle.js +++ b/platform/features/timeline/bundle.js @@ -184,14 +184,14 @@ define([ "pattern": "^-?\\d+(\\.\\d*)?$" }, { - "name": "Battery Starting SOC", + "name": "Battery starting SOC (%)", "control": "textfield", "required": false, "conversion": "number", "property": [ "startingSOC" ], - "pattern": "^-?\\d+(\\.\\d*)?$" + "pattern": "^([0-9](\\.\\d*)?|[1-9][0-9](\\.\\d*)?|100)%?$" } ], "model": { diff --git a/platform/features/timeline/src/capabilities/GraphCapability.js b/platform/features/timeline/src/capabilities/GraphCapability.js index c4e5166f0e..86095b13ab 100644 --- a/platform/features/timeline/src/capabilities/GraphCapability.js +++ b/platform/features/timeline/src/capabilities/GraphCapability.js @@ -55,12 +55,14 @@ define( if (domainObject.getModel().type === 'timeline' && result.power && domainObject.getModel().capacity > 0) { + domainObject.getModel().startingSOC = + parseFloat(domainObject.getModel().startingSOC) || 100; result.battery = new CumulativeGraph( result.power, 0, domainObject.getModel().capacity, // Watts - domainObject.getModel().startingSOC, + (domainObject.getModel().startingSOC/100)*domainObject.getModel().capacity, 1 / 3600000 // millis-to-hour (since units are watt-hours) ); } From f1852541141857aafbb97b6bc02d168ede8067ee Mon Sep 17 00:00:00 2001 From: David Hudson Date: Tue, 20 Sep 2016 17:41:45 +0900 Subject: [PATCH 133/150] [Formatting] Fix missing spaces --- platform/features/timeline/src/capabilities/GraphCapability.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/features/timeline/src/capabilities/GraphCapability.js b/platform/features/timeline/src/capabilities/GraphCapability.js index 86095b13ab..4e9cce0c8c 100644 --- a/platform/features/timeline/src/capabilities/GraphCapability.js +++ b/platform/features/timeline/src/capabilities/GraphCapability.js @@ -62,7 +62,7 @@ define( result.power, 0, domainObject.getModel().capacity, // Watts - (domainObject.getModel().startingSOC/100)*domainObject.getModel().capacity, + (domainObject.getModel().startingSOC / 100) * domainObject.getModel().capacity, 1 / 3600000 // millis-to-hour (since units are watt-hours) ); } From 3d17435438c0d1c5e8c7647a0218b7e0718adc79 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Tue, 20 Sep 2016 17:42:34 +0900 Subject: [PATCH 134/150] [Test] Update spec to use SOC percentage --- .../features/timeline/test/capabilities/GraphCapabilitySpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js b/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js index e36724dbcb..e2ccd376e2 100644 --- a/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js +++ b/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js @@ -101,7 +101,7 @@ define( it("provides a battery graph for timelines with capacity", function () { var mockCallback = jasmine.createSpy('callback'); testModel.capacity = 1000; - testModel.startingSOC = 1000; + testModel.startingSOC = 100; testModel.type = "timeline"; mockDomainObject.useCapability.andReturn(asPromise([ { key: "power", start: 0, end: 15 } From 3548cde9c44076c687038f20ebeec77939fd91e7 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 21 Sep 2016 16:12:09 -0700 Subject: [PATCH 135/150] [Edit Mode] Fixed issue with save dialog not being displayed for new objects after mutation. Fixes 1080 --- .../browse/src/navigation/NavigateAction.js | 26 +++++++--- .../test/navigation/NavigateActionSpec.js | 49 +++++++++++++++++-- .../commonUI/edit/src/actions/EditAction.js | 8 +-- .../edit/src/services/TransactionService.js | 2 +- .../edit/test/actions/EditActionSpec.js | 7 --- 5 files changed, 69 insertions(+), 23 deletions(-) diff --git a/platform/commonUI/browse/src/navigation/NavigateAction.js b/platform/commonUI/browse/src/navigation/NavigateAction.js index b3d935812a..efdfb270f4 100644 --- a/platform/commonUI/browse/src/navigation/NavigateAction.js +++ b/platform/commonUI/browse/src/navigation/NavigateAction.js @@ -48,20 +48,34 @@ define( */ NavigateAction.prototype.perform = function () { var self = this, - navigationAllowed = true; + navigateTo = this.domainObject, + currentObject = self.navigationService.getNavigation(), + editing = currentObject.hasCapability('editor') && + currentObject.getCapability('editor').isEditContextRoot(); function allow() { - self.policyService.allow("navigation", self.navigationService.getNavigation(), self.domainObject, function (message) { + var navigationAllowed = true; + self.policyService.allow("navigation", currentObject, navigateTo, function (message) { navigationAllowed = self.$window.confirm(message + "\r\n\r\n" + " Are you sure you want to continue?"); }); return navigationAllowed; } - // Set navigation, and wrap like a promise - return this.$q.when( - allow() && this.navigationService.setNavigation(this.domainObject) - ); + function cancelIfEditing() { + return self.$q.when(editing && currentObject.getCapability("editor").cancel()); + } + + function navigate() { + return self.navigationService.setNavigation(navigateTo); + } + + if (allow()) { + return cancelIfEditing().then(navigate); + } else { + return this.$q.when(false); + } + }; /** diff --git a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js index 003012372b..b769d7dce1 100644 --- a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js +++ b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js @@ -32,7 +32,9 @@ define( mockQ, mockDomainObject, mockPolicyService, + mockNavigatedObject, mockWindow, + capabilities, action; function mockPromise(value) { @@ -44,6 +46,29 @@ define( } beforeEach(function () { + capabilities = {}; + + mockQ = { when: mockPromise }; + mockNavigatedObject = jasmine.createSpyObj( + "domainObject", + [ + "getId", + "getModel", + "hasCapability", + "getCapability" + ] + ); + + capabilities.editor = jasmine.createSpyObj("editorCapability", [ + "isEditContextRoot", + "cancel" + ]); + + mockNavigatedObject.getCapability.andCallFake(function (capability) { + return capabilities[capability]; + }); + mockNavigatedObject.hasCapability.andReturn(false); + mockNavigationService = jasmine.createSpyObj( "navigationService", [ @@ -51,11 +76,14 @@ define( "getNavigation" ] ); - mockNavigationService.getNavigation.andReturn({}); - mockQ = { when: mockPromise }; + mockNavigationService.getNavigation.andReturn(mockNavigatedObject); + mockDomainObject = jasmine.createSpyObj( "domainObject", - ["getId", "getModel", "getCapability"] + [ + "getId", + "getModel" + ] ); mockPolicyService = jasmine.createSpyObj("policyService", @@ -112,6 +140,21 @@ define( }); }); + describe("in edit more", function () { + beforeEach(function () { + mockNavigatedObject.hasCapability.andCallFake(function (capability) { + return capability === "editor"; + }); + capabilities.editor.isEditContextRoot.andReturn(true); + }); + + it("cancels editing if in edit mode", function () { + action.perform(); + expect(capabilities.editor.cancel) + .toHaveBeenCalled(); + }); + }); + it("is only applicable when a domain object is in context", function () { expect(NavigateAction.appliesTo({})).toBeFalsy(); expect(NavigateAction.appliesTo({ diff --git a/platform/commonUI/edit/src/actions/EditAction.js b/platform/commonUI/edit/src/actions/EditAction.js index bd30968289..9c1afd3e28 100644 --- a/platform/commonUI/edit/src/actions/EditAction.js +++ b/platform/commonUI/edit/src/actions/EditAction.js @@ -69,18 +69,14 @@ define( * Enter edit mode. */ EditAction.prototype.perform = function () { - var self = this; - function cancelEditing() { - self.domainObject.getCapability('editor').cancel(); - self.navigationService.removeListener(cancelEditing); - } + //If this is not the currently navigated object, then navigate // to it. if (this.navigationService.getNavigation() !== this.domainObject) { this.navigationService.setNavigation(this.domainObject); } - this.navigationService.addListener(cancelEditing); + //this.navigationService.addListener(cancelEditing); this.domainObject.useCapability("editor"); }; diff --git a/platform/commonUI/edit/src/services/TransactionService.js b/platform/commonUI/edit/src/services/TransactionService.js index 119e314b17..df0a051f0d 100644 --- a/platform/commonUI/edit/src/services/TransactionService.js +++ b/platform/commonUI/edit/src/services/TransactionService.js @@ -138,7 +138,7 @@ define( try { results.push(onCancel()); } catch (error) { - this.$log.error("Error committing transaction."); + this.$log.error("Error cancelling transaction."); } } return this.$q.all(results).then(function () { diff --git a/platform/commonUI/edit/test/actions/EditActionSpec.js b/platform/commonUI/edit/test/actions/EditActionSpec.js index c896e83dd1..0e70e571c3 100644 --- a/platform/commonUI/edit/test/actions/EditActionSpec.js +++ b/platform/commonUI/edit/test/actions/EditActionSpec.js @@ -98,13 +98,6 @@ define( expect(EditAction.appliesTo(actionContext)).toBe(false); }); - it ("cancels editing when user navigates away", function () { - action.perform(); - expect(mockNavigationService.addListener).toHaveBeenCalled(); - mockNavigationService.addListener.mostRecentCall.args[0](); - expect(mockEditor.cancel).toHaveBeenCalled(); - }); - it ("invokes the Edit capability on the object", function () { action.perform(); expect(mockDomainObject.useCapability).toHaveBeenCalledWith("editor"); From 3c72eea9ef345310ff36043671347bd46e076762 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 22 Sep 2016 10:41:14 -0700 Subject: [PATCH 136/150] [Frontend] Removed export buttons from objects when in layout Fixes #1202 CSS modded --- platform/commonUI/general/res/sass/_views.scss | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/platform/commonUI/general/res/sass/_views.scss b/platform/commonUI/general/res/sass/_views.scss index 357f9f3c7c..0a4cc651dd 100644 --- a/platform/commonUI/general/res/sass/_views.scss +++ b/platform/commonUI/general/res/sass/_views.scss @@ -31,23 +31,10 @@ .has-control-bar { $btnExportH: $btnFrameH; .l-control-bar { - @include trans-prop-nice(opacity, $dur: 50ms); - opacity: 0; + display: none; } .l-view-section { - @include trans-prop-nice(top, $dur: 150ms, $delay: 50ms); top: 0; } - &:hover { - .l-control-bar { - @include trans-prop-nice(opacity, 150ms, 100ms); - opacity: 1; - } - .l-view-section { - @include trans-prop-nice(top, $dur: 150ms); - top: $btnExportH + $interiorMargin; - } - } } - } \ No newline at end of file From 7a94efccbf2a35ef60f9fbf1f23acfc0287cfe46 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 22 Sep 2016 11:04:04 -0700 Subject: [PATCH 137/150] [Edit Mode] Fixed spelling mistake, moved variable declaration --- platform/commonUI/browse/src/navigation/NavigateAction.js | 7 ++++--- .../commonUI/browse/test/navigation/NavigateActionSpec.js | 2 +- platform/commonUI/edit/src/actions/EditAction.js | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/commonUI/browse/src/navigation/NavigateAction.js b/platform/commonUI/browse/src/navigation/NavigateAction.js index efdfb270f4..431ad8dadc 100644 --- a/platform/commonUI/browse/src/navigation/NavigateAction.js +++ b/platform/commonUI/browse/src/navigation/NavigateAction.js @@ -49,9 +49,7 @@ define( NavigateAction.prototype.perform = function () { var self = this, navigateTo = this.domainObject, - currentObject = self.navigationService.getNavigation(), - editing = currentObject.hasCapability('editor') && - currentObject.getCapability('editor').isEditContextRoot(); + currentObject = self.navigationService.getNavigation(); function allow() { var navigationAllowed = true; @@ -63,6 +61,9 @@ define( } function cancelIfEditing() { + var editing = currentObject.hasCapability('editor') && + currentObject.getCapability('editor').isEditContextRoot(); + return self.$q.when(editing && currentObject.getCapability("editor").cancel()); } diff --git a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js index b769d7dce1..509e7aef3d 100644 --- a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js +++ b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js @@ -140,7 +140,7 @@ define( }); }); - describe("in edit more", function () { + describe("in edit mode", function () { beforeEach(function () { mockNavigatedObject.hasCapability.andCallFake(function (capability) { return capability === "editor"; diff --git a/platform/commonUI/edit/src/actions/EditAction.js b/platform/commonUI/edit/src/actions/EditAction.js index 9c1afd3e28..e65f035edf 100644 --- a/platform/commonUI/edit/src/actions/EditAction.js +++ b/platform/commonUI/edit/src/actions/EditAction.js @@ -76,7 +76,6 @@ define( this.navigationService.setNavigation(this.domainObject); } - //this.navigationService.addListener(cancelEditing); this.domainObject.useCapability("editor"); }; From bad24d621361717e03de03d19670a480a3c83f9e Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Sep 2016 15:48:48 -0700 Subject: [PATCH 138/150] [Build] Remove SNAPSHOT status ...to close sprint Pratchett, https://github.com/nasa/openmct/milestone/17 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 555375007e..668b4de22b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "0.11.3-SNAPSHOT", + "version": "0.11.3", "description": "The Open MCT core platform", "dependencies": { "express": "^4.13.1", From 3f5388c2e893adc590d080dfaf11c0b6950b52e6 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 22 Sep 2016 16:20:18 -0700 Subject: [PATCH 139/150] [Build] Restore SNAPSHOT status ...and bump version number to open sprint Rajaniemi, https://github.com/nasa/openmct/milestone/18 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 668b4de22b..e47a64e50e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "0.11.3", + "version": "0.12.0-SNAPSHOT", "description": "The Open MCT core platform", "dependencies": { "express": "^4.13.1", From 98f387b605108d589a7b68ebac2632f1791302f9 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 22 Sep 2016 17:34:53 -0700 Subject: [PATCH 140/150] [Edit Mode] Renamed function from EditAction.cancel() to EditAction.finish() --- platform/commonUI/browse/src/navigation/NavigateAction.js | 2 +- .../commonUI/browse/test/navigation/NavigateActionSpec.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/commonUI/browse/src/navigation/NavigateAction.js b/platform/commonUI/browse/src/navigation/NavigateAction.js index 431ad8dadc..6121213a51 100644 --- a/platform/commonUI/browse/src/navigation/NavigateAction.js +++ b/platform/commonUI/browse/src/navigation/NavigateAction.js @@ -64,7 +64,7 @@ define( var editing = currentObject.hasCapability('editor') && currentObject.getCapability('editor').isEditContextRoot(); - return self.$q.when(editing && currentObject.getCapability("editor").cancel()); + return self.$q.when(editing && currentObject.getCapability("editor").finish()); } function navigate() { diff --git a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js index 509e7aef3d..f9b756eeaa 100644 --- a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js +++ b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js @@ -61,7 +61,7 @@ define( capabilities.editor = jasmine.createSpyObj("editorCapability", [ "isEditContextRoot", - "cancel" + "finish" ]); mockNavigatedObject.getCapability.andCallFake(function (capability) { @@ -148,9 +148,9 @@ define( capabilities.editor.isEditContextRoot.andReturn(true); }); - it("cancels editing if in edit mode", function () { + it("finishes editing if in edit mode", function () { action.perform(); - expect(capabilities.editor.cancel) + expect(capabilities.editor.finish) .toHaveBeenCalled(); }); }); From 4b51e604a75b167b0aa117095b5b9327d80d0ece Mon Sep 17 00:00:00 2001 From: Alex M Date: Sat, 24 Sep 2016 20:43:35 +0300 Subject: [PATCH 141/150] [Edit] Switch other edit actions to mct-control --- platform/commonUI/edit/bundle.js | 4 +++- .../edit/res/templates/edit-action-buttons.html | 13 +++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 60da900176..1094abb864 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -245,7 +245,9 @@ define([ "key": "cancel", "category": "conclude-editing", "implementation": CancelAction, - "name": "Cancel", + // Because we use the name as label for edit buttons and mct-control buttons need + // the label to be set to undefined in order to not apply the labeled CSS rule. + "name": undefined, "cssclass": "icon-x no-label", "description": "Discard changes made to these objects.", "depends": [] diff --git a/platform/commonUI/edit/res/templates/edit-action-buttons.html b/platform/commonUI/edit/res/templates/edit-action-buttons.html index 4bc020612f..7c1017992a 100644 --- a/platform/commonUI/edit/res/templates/edit-action-buttons.html +++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html @@ -42,11 +42,12 @@ - - {{currentAction.getMetadata().name}} - + + \ No newline at end of file From a34e89d56a8c33cde53bd37c59e25922e272e337 Mon Sep 17 00:00:00 2001 From: Alex M Date: Tue, 27 Sep 2016 21:19:25 +0300 Subject: [PATCH 142/150] [Edit] Bind action to .perform() inside mct-button --- .../commonUI/edit/res/templates/edit-action-buttons.html | 4 ++-- .../commonUI/edit/src/controllers/EditActionController.js | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/edit/res/templates/edit-action-buttons.html b/platform/commonUI/edit/res/templates/edit-action-buttons.html index 7c1017992a..2af47b6878 100644 --- a/platform/commonUI/edit/res/templates/edit-action-buttons.html +++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html @@ -25,7 +25,7 @@ @@ -45,7 +45,7 @@ diff --git a/platform/commonUI/edit/src/controllers/EditActionController.js b/platform/commonUI/edit/src/controllers/EditActionController.js index 7c33799ebb..ba91b63e9d 100644 --- a/platform/commonUI/edit/src/controllers/EditActionController.js +++ b/platform/commonUI/edit/src/controllers/EditActionController.js @@ -61,6 +61,12 @@ define( $scope.otherEditActions = $scope.action ? $scope.action.getActions(OTHERS_ACTION_CONTEXT) : []; + + // Required because Angular does not allow 'bind' + // in expressions. + $scope.actionPerformer = function (action) { + return action.perform.bind(action); + }; } // Update set of actions whenever the action capability From 754d7b3cd76e2ddd2163efc94a4090a47d4c6649 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 27 Sep 2016 16:47:35 -0700 Subject: [PATCH 143/150] [Build] Restore SNAPSHOT status ... for a patch build related to #1208 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 668b4de22b..fd45d23357 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "0.11.3", + "version": "0.11.4-SNAPSHOT", "description": "The Open MCT core platform", "dependencies": { "express": "^4.13.1", From 91b63f78eb9dd9882541b040092a62fa2b43fabc Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 27 Sep 2016 16:40:29 -0700 Subject: [PATCH 144/150] [Build] Depend on non-minified jsPDF Fixes #1208 (for some reason) --- main.js | 2 +- test-main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index 3fc2c4da36..34d1afeeeb 100644 --- a/main.js +++ b/main.js @@ -29,7 +29,7 @@ requirejs.config({ "csv": "bower_components/comma-separated-values/csv.min", "es6-promise": "bower_components/es6-promise/es6-promise.min", "html2canvas": "bower_components/html2canvas/build/html2canvas.min", - "jsPDF": "bower_components/jspdf/dist/jspdf.min", + "jsPDF": "bower_components/jspdf/dist/jspdf.debug", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", diff --git a/test-main.js b/test-main.js index 43142766b9..ff8a50ca6b 100644 --- a/test-main.js +++ b/test-main.js @@ -55,7 +55,7 @@ requirejs.config({ "csv": "bower_components/comma-separated-values/csv.min", "es6-promise": "bower_components/es6-promise/es6-promise.min", "html2canvas": "bower_components/html2canvas/build/html2canvas.min", - "jsPDF": "bower_components/jspdf/dist/jspdf.min", + "jsPDF": "bower_components/jspdf/dist/jspdf.debug", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", From d248dfe34674dc0a5e01631c5478aea36769711e Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 27 Sep 2016 16:48:38 -0700 Subject: [PATCH 145/150] [Build] Remove SNAPSHOT status ...to tag a build which addresses release blocker #1208 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd45d23357..333b4258eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "0.11.4-SNAPSHOT", + "version": "0.11.4", "description": "The Open MCT core platform", "dependencies": { "express": "^4.13.1", From e1276e464debed1ba0fdfbfc3bfba3b1c2078315 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 27 Sep 2016 16:49:09 -0700 Subject: [PATCH 146/150] [Build] Restore version identifier --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 333b4258eb..e47a64e50e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "0.11.4", + "version": "0.12.0-SNAPSHOT", "description": "The Open MCT core platform", "dependencies": { "express": "^4.13.1", From e077f9ee1845e1a551084e0239a65209ad395cae Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 30 Sep 2016 21:34:03 +0200 Subject: [PATCH 147/150] [Timeline] Fix logic error Issue #1185. Also removed direct modification of domain object. --- .../timeline/src/capabilities/GraphCapability.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/features/timeline/src/capabilities/GraphCapability.js b/platform/features/timeline/src/capabilities/GraphCapability.js index 4e9cce0c8c..181c909f79 100644 --- a/platform/features/timeline/src/capabilities/GraphCapability.js +++ b/platform/features/timeline/src/capabilities/GraphCapability.js @@ -37,7 +37,8 @@ define( // Build graphs for this group of utilizations function buildGraphs(utilizations) { var utilizationMap = {}, - result = {}; + result = {}, + startingSOC; // Bucket utilizations by type utilizations.forEach(function (u) { @@ -55,14 +56,14 @@ define( if (domainObject.getModel().type === 'timeline' && result.power && domainObject.getModel().capacity > 0) { - domainObject.getModel().startingSOC = - parseFloat(domainObject.getModel().startingSOC) || 100; + startingSOC = isNaN(parseFloat(domainObject.getModel().startingSOC)) ? + 100 : parseFloat(domainObject.getModel().startingSOC); result.battery = new CumulativeGraph( result.power, 0, domainObject.getModel().capacity, // Watts - (domainObject.getModel().startingSOC / 100) * domainObject.getModel().capacity, + (startingSOC / 100) * domainObject.getModel().capacity, 1 / 3600000 // millis-to-hour (since units are watt-hours) ); } From ed102492e5529c0d840f00f33121e0161fa7e4b9 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Fri, 30 Sep 2016 12:49:02 -0700 Subject: [PATCH 148/150] [Bower] specify jspdf minor version Specify jsPDF minor version to avoid updating to v1.3.0, which appears to have problems with requirejs bundling. Fixes https://github.com/nasa/openmct/issues/1214 --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 922eb905f3..7dbb8f9860 100644 --- a/bower.json +++ b/bower.json @@ -20,6 +20,6 @@ "FileSaver.js": "^0.0.2", "zepto": "^1.1.6", "html2canvas": "^0.4.1", - "jspdf": "^1.2.61" + "jspdf": "1.2.x" } } From ae6f6565fa61418406aafcad31d32e90c49fbb2f Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Fri, 30 Sep 2016 16:54:42 -0700 Subject: [PATCH 149/150] [export] remove pdf export Remove pdf export with extreme prejudice due to issues with build process. Fixes https://github.com/nasa/openmct/issues/1217 --- bower.json | 3 +-- main.js | 4 ---- platform/features/plot/bundle.js | 10 -------- .../features/plot/res/templates/plot.html | 5 ---- platform/features/plot/src/PlotController.js | 11 --------- .../plot/src/services/ExportImageService.js | 24 ++----------------- .../features/plot/test/PlotControllerSpec.js | 2 +- .../test/services/ExportImageServiceSpec.js | 21 ---------------- test-main.js | 1 - 9 files changed, 4 insertions(+), 77 deletions(-) diff --git a/bower.json b/bower.json index 7dbb8f9860..419871fe57 100644 --- a/bower.json +++ b/bower.json @@ -19,7 +19,6 @@ "comma-separated-values": "^3.6.4", "FileSaver.js": "^0.0.2", "zepto": "^1.1.6", - "html2canvas": "^0.4.1", - "jspdf": "1.2.x" + "html2canvas": "^0.4.1" } } diff --git a/main.js b/main.js index 34d1afeeeb..6968d8ff26 100644 --- a/main.js +++ b/main.js @@ -29,7 +29,6 @@ requirejs.config({ "csv": "bower_components/comma-separated-values/csv.min", "es6-promise": "bower_components/es6-promise/es6-promise.min", "html2canvas": "bower_components/html2canvas/build/html2canvas.min", - "jsPDF": "bower_components/jspdf/dist/jspdf.debug", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", @@ -48,9 +47,6 @@ requirejs.config({ "html2canvas": { "exports": "html2canvas" }, - "jsPDF": { - "exports": "jsPDF" - }, "moment-duration-format": { "deps": ["moment"] }, diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index 691e310791..ec4e6f375a 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -146,16 +146,6 @@ define([ "copyright": "Copyright © 2012 Niklas von Hertzen.", "license": "license-mit", "link": "https://github.com/niklasvh/html2canvas/blob/master/LICENSE" - }, - { - "name": "jsPDF", - "version": "1.2.61", - "author": "James Hall", - "description": "JavaScript HTML renderer", - "website": "https://github.com/MrRio/jsPDF", - "copyright": "Copyright © 2010-2016 James Hall", - "license": "license-mit", - "link": "https://github.com/MrRio/jsPDF/blob/master/MIT-LICENSE.txt" } ] } diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index e25b582044..461389e2c1 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -23,11 +23,6 @@ class="abs holder holder-plot has-control-bar">
- - PDF - diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 3b23bce34a..b5af440731 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -368,17 +368,6 @@ define( return this.pending; }; - /** - * Export the plot to PDF - */ - PlotController.prototype.exportPDF = function () { - var self = this; - self.hideExportButtons = true; - self.exportImageService.exportPDF(self.$element[0], "plot.pdf").finally(function () { - self.hideExportButtons = false; - }); - }; - /** * Export the plot to PNG */ diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index d49adc15ec..8fa02c8bf5 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -26,32 +26,29 @@ define( [ "html2canvas", - "jsPDF", "saveAs" ], function ( html2canvas, - jsPDF, saveAs ) { var self = this; /** * The export image service will export any HTML node to - * PDF, JPG, or PNG. + * JPG, or PNG. * @param {object} $q * @param {object} $timeout * @param {object} $log * @param {constant} EXPORT_IMAGE_TIMEOUT time in milliseconds before a timeout error is returned * @constructor */ - function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injJsPDF, injSaveAs, injFileReader) { + function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injSaveAs, injFileReader) { self.$q = $q; self.$timeout = $timeout; self.$log = $log; self.EXPORT_IMAGE_TIMEOUT = EXPORT_IMAGE_TIMEOUT; self.html2canvas = injHtml2Canvas || html2canvas; - self.jsPDF = injJsPDF || jsPDF; self.saveAs = injSaveAs || saveAs; self.reader = injFileReader || new FileReader(); } @@ -128,23 +125,6 @@ define( } } - /** - * Takes a screenshot of a DOM node and exports to PDF. - * @param {node} element to be exported - * @param {string} filename the exported image - * @returns {promise} - */ - ExportImageService.prototype.exportPDF = function (element, filename) { - return renderElement(element, "jpeg").then(function (img) { - self.reader.readAsDataURL(img); - self.reader.onloadend = function () { - var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]); - pdf.addImage(self.reader.result, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight); - pdf.save(filename); - }; - }); - }; - /** * Takes a screenshot of a DOM node and exports to JPG. * @param {node} element to be exported diff --git a/platform/features/plot/test/PlotControllerSpec.js b/platform/features/plot/test/PlotControllerSpec.js index 73a01d716a..482af047cb 100644 --- a/platform/features/plot/test/PlotControllerSpec.js +++ b/platform/features/plot/test/PlotControllerSpec.js @@ -72,7 +72,7 @@ define( mockElement = angular.element('
'); mockExportImageService = jasmine.createSpyObj( "ExportImageService", - ["exportJPG", "exportPNG", "exportPDF"] + ["exportJPG", "exportPNG"] ); mockFormatter = jasmine.createSpyObj( "formatter", diff --git a/platform/features/plot/test/services/ExportImageServiceSpec.js b/platform/features/plot/test/services/ExportImageServiceSpec.js index 111a8d3432..675429f4e2 100644 --- a/platform/features/plot/test/services/ExportImageServiceSpec.js +++ b/platform/features/plot/test/services/ExportImageServiceSpec.js @@ -33,8 +33,6 @@ define( mockLog, mockHtml2Canvas, mockCanvas, - mockJsPDF, - mockJsPDFSave, mockSaveAs, mockFileReader, mockExportTimeoutConstant, @@ -79,13 +77,6 @@ define( "canvas", ["toBlob"] ); - mockJsPDFSave = jasmine.createSpy("jsPDFSave"); - mockJsPDF = function () { - return { - "addImage": function () {}, - "save": mockJsPDFSave - }; - }; mockSaveAs = jasmine.createSpy("saveAs"); mockFileReader = jasmine.createSpyObj( "FileReader", @@ -100,23 +91,11 @@ define( mockLog, mockExportTimeoutConstant, mockHtml2Canvas, - mockJsPDF, mockSaveAs, mockFileReader ); }); - it("runs html2canvas and tries to save a pdf", function () { - exportImageService.exportPDF(testElement, "plot.pdf"); - mockFileReader.onloadend(); - - expect(mockHtml2Canvas).toHaveBeenCalledWith(testElement, { onrendered: jasmine.any(Function) }); - expect(mockCanvas.toBlob).toHaveBeenCalledWith(mockDeferred.resolve, "image/jpeg"); - expect(mockDeferred.reject).not.toHaveBeenCalled(); - expect(mockJsPDFSave).toHaveBeenCalled(); - expect(mockPromise.finally).toHaveBeenCalled(); - }); - it("runs html2canvas and tries to save a png", function () { exportImageService.exportPNG(testElement, "plot.png"); diff --git a/test-main.js b/test-main.js index ff8a50ca6b..e006094a24 100644 --- a/test-main.js +++ b/test-main.js @@ -55,7 +55,6 @@ requirejs.config({ "csv": "bower_components/comma-separated-values/csv.min", "es6-promise": "bower_components/es6-promise/es6-promise.min", "html2canvas": "bower_components/html2canvas/build/html2canvas.min", - "jsPDF": "bower_components/jspdf/dist/jspdf.debug", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", From bff4e120a7dfb6d5e1a76258360a31d5764ff818 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 4 Oct 2016 18:23:13 -0700 Subject: [PATCH 150/150] [Tables] Modified selection of scrollable element. Fixes #1216 --- .../src/controllers/MCTTableController.js | 16 ++++++------- .../controllers/MCTTableControllerSpec.js | 23 ++++++++----------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/platform/features/table/src/controllers/MCTTableController.js b/platform/features/table/src/controllers/MCTTableController.js index bf5ea9218c..d78140f67e 100644 --- a/platform/features/table/src/controllers/MCTTableController.js +++ b/platform/features/table/src/controllers/MCTTableController.js @@ -1,7 +1,7 @@ define( - [], - function () { + ['zepto'], + function ($) { /** * A controller for the MCTTable directive. Populates scope with @@ -16,13 +16,13 @@ define( var self = this; this.$scope = $scope; - this.element = element; + this.element = $(element[0]); this.$timeout = $timeout; this.maxDisplayRows = 50; - this.scrollable = element.find('div'); - this.thead = element.find('thead'); - this.tbody = element.find('tbody'); + this.scrollable = this.element.find('.l-view-section.scrolling').first(); + this.resultsHeader = this.element.find('.mct-table>thead').first(); + this.sizingTableBody = this.element.find('.sizing-table>tbody').first(); this.$scope.sizingRow = {}; this.scrollable.on('scroll', this.onScroll.bind(this)); @@ -261,8 +261,8 @@ define( * for individual rows. */ MCTTableController.prototype.setElementSizes = function () { - var thead = this.thead, - tbody = this.tbody, + var thead = this.resultsHeader, + tbody = this.sizingTableBody, firstRow = tbody.find('tr'), column = firstRow.find('td'), headerHeight = thead.prop('offsetHeight'), diff --git a/platform/features/table/test/controllers/MCTTableControllerSpec.js b/platform/features/table/test/controllers/MCTTableControllerSpec.js index 94ce7c71c2..285403423f 100644 --- a/platform/features/table/test/controllers/MCTTableControllerSpec.js +++ b/platform/features/table/test/controllers/MCTTableControllerSpec.js @@ -22,9 +22,16 @@ define( [ + "zepto", "../../src/controllers/MCTTableController" ], - function (MCTTableController) { + function ($, MCTTableController) { + + var MOCK_ELEMENT_TEMPLATE = + '
' + + '
' + + '
' + + '
'; describe('The MCTTable Controller', function () { @@ -55,19 +62,7 @@ define( watches[event] = callback; }); - mockElement = jasmine.createSpyObj('element', [ - 'find', - 'prop', - 'on' - ]); - mockElement.find.andReturn(mockElement); - mockElement.prop.andReturn(0); - mockElement[0] = { - scrollTop: 0, - scrollHeight: 500, - offsetHeight: 1000 - }; - + mockElement = $(MOCK_ELEMENT_TEMPLATE); mockExportService = jasmine.createSpyObj('exportService', [ 'exportCSV' ]);