From d1e1ba1c66fbb17474023e938e18f498118baf67 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 1 Aug 2016 14:33:25 -0700 Subject: [PATCH] [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 @@ \ 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