From 582a236d8ac487b3dbe534394682a9fd38ce7d43 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Tue, 28 Apr 2015 14:28:17 -0700
Subject: [PATCH] [Frontend] Fixes, glyph and description updates

WTD-1150
WTD-1145
Fixed incorrect references to iFrameController to EmbeddedPageController;
Added new glyph for Page;
Renamed Page to Web Page;
---
 bundles.json                                  |   2 +-
 .../general/res/fonts/symbols/wtdsymbols.eot  | Bin 9880 -> 9952 bytes
 .../general/res/fonts/symbols/wtdsymbols.svg  |  12 +++++++-----
 .../general/res/fonts/symbols/wtdsymbols.ttf  | Bin 9716 -> 9788 bytes
 .../general/res/fonts/symbols/wtdsymbols.woff | Bin 6892 -> 6948 bytes
 platform/features/layout/bundle.json          |   4 ++--
 platform/features/pages/bundle.json           |   8 +++++---
 platform/features/pages/res/iframe.html       |   2 +-
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/bundles.json b/bundles.json
index 04515b1897..26e684cdef 100644
--- a/bundles.json
+++ b/bundles.json
@@ -15,7 +15,7 @@
     "platform/features/scrolling",
     "platform/forms",
     "platform/persistence/queue",
-    "platform/persistence/elastic",
+    "platform/persistence/couch",
     "platform/policy",
 
     "example/generator"
diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
index f704abcc2a3b8a339305331787fd94fea9164c29..6caed6eec3d0a1b06ed8d53b74d0b8b90e5064cc 100644
GIT binary patch
delta 650
zcmXw1Ur3Wt6hG(Q@0+vl+icF(B&mI?tp}sFX>&}2DJu&!Xl5=9a@BMX>V}Tem-MBg
z@<r~8)kA?1%Y14N_8<j8JxBzCB}l~}!KhHFEFt*pe1o{$bMEi_xxaJnxf890R#U+X
z(BK_61tncL-Q$t0b2&G12EgkAfU4%`(PMB8OoU<ljdNtr^LiTqcLLy2Phv2$wFMl&
zvq`b$p5EbZ=&X1IAm=FcKq{HIWQyFbCEo|y!4w%vn%NTNRuJBo>dOvo{Dd*W&uDk`
zrY|Nup51W(=@<E*_9ccg@BrG$7b5KHPxLh=b1pUmpe;}lO_}syHhrXjkqU59z$ZYG
z2#s#1(9f4OY=FYQkOk(GlQ;fr@eu1u<Hg80#KbcG#cokxhfovS`F^YvAzp`Ok>Pcv
zKDG+L)&Rvc@5HadEOnqwbV)DqwD8OIVpOtXJDmdJzI?U%hZ0aOC=<$*GOKQ*<yE8V
zIdx2(QWw-s%YbFt^46kT9aaZGK5BYWg5CLb%O6SBh~t&`UOvj~j(orU4#&#8d1slt
zi&0ys;Vu0#x6k2lu{AT8*?YE_4_C>O#YdShs74J!a7whenz2R**GaC}%Ef0_i|}jN
zCT4WX)+ovfG&r<rJ1R_jHMjS$tu|Pr(fvbsr7f&ihhwoYp1?|dg{|s0zZK!TaGSo8
zpVWSHjElRT$7cs%78!E+_(7j9P?Ub-T><GE6q$$xz?cP*5;KPml2Q>FHe){UIyp0E
P=$4Py?-_bN8Cm}a1O%WF

delta 552
zcmaFhJHwZ4h8hFI7uAVuW-K<|zp5uXlt?_E9?8YPpn8LWfkDRI#np|Wg@Fyo-!buw
zM7`YJ=ll!|%pwd7jJMJgiwpk$XJ7`(Z2+p}NYANEd)!^1&cMLBfPq2!Lq=+13hTA=
zvw?DVfY>YpD8TN{bQ7o-sGmV4Be$gDGxPt8K>iLOj>*YSP88Rb%VA((`2dvPkegUh
zz%ZX71Sn?#<SXPQ<~pXXP+;25z@Rt*=m@8R{Nj?lhI~b!SyzAx?l3R{Ng%HN<!uws
zZ}XLboB0J$gyEvW(c3V3@)AaK&Tz2GaE8FiPZ)nQ@=t!iq|eAUS%6s`NLnzPGcrvs
zU^ZuEWO~QIFnI%WG~>(3JS^eN0t}3k4Ow+2Phyz@r0pj+uy8YmOfF>Ip#F{9j602c
z4);3l13Y{{sKw*KlfW~9XC2QCo<F>0yc>8Q@c!WavDt@hH9I5!<{!M@Sy+KV%JgXR
z7oi3w5z)<M!ZVo}*)|J^^Rp_m0K=0}k&T71>t7kOu>HTErx+`3|A5@j$iT$F#B_)0
z?q(|)Ru*2MPnq5U-KfZ5!4NRnN5Osa6a_yfE|tko6?`V^E0%43srZGNF?{kp)s=#K
x7?~KESv~X&42-~};p91Lvg%<#BZ1ZdjfEHwBu{qc8-h4KciTV_2MoJpTL904lU)D+

diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
index 256d5b9276..47dc61951f 100644
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg>
 <metadata>
-Created by FontForge 20110222 at Thu Mar 19 18:28:43 2015
+Created by FontForge 20090622 at Tue Apr 28 20:52:23 2015
  By deploy user
 Copyright 2015 Adobe Systems Incorporated. All rights reserved.
 </metadata>
@@ -21,7 +21,7 @@ Copyright 2015 Adobe Systems Incorporated. All rights reserved.
     bbox="-33 -19 1143 787"
     underline-thickness="50"
     underline-position="-50"
-    unicode-range="U+0020-2044"
+    unicode-range="U+0020-U+2044"
   />
 <missing-glyph horiz-adv-x="500" 
  />
@@ -129,7 +129,7 @@ v-356zM635 88v356h-83v-356h83z" />
     <glyph glyph-name="bracketleft" unicode="[" horiz-adv-x="742" 
 d="M373 602l-238 -237l237 -237l236 238zM373 731q39 0 66 -28l270 -270q29 -28 29 -67.5t-29 -67.5l-271 -271q-26 -27 -66 -27q-41 0 -68 27l-271 271q-27 27 -27 67t27 67l271 271q28 28 69 28z" />
     <glyph glyph-name="backslash" unicode="\" horiz-adv-x="810" 
-d="M806 0h-178l-228 265q-20 -6 -41 -6q-65 0 -111 47t-46 112q0 34 12 63l-214 251h178l139 -162q23 5 42 5q65 0 112 -46t47 -111q0 -30 -14 -65zM286 418q0 -31 21 -53t52 -22t53 22t22 53t-22 52t-53 21t-52 -21t-21 -52z" />
+d="M806 0h-178l-228 265q-19 -6 -41 -6q-65 0 -111 47t-46 112q0 34 12 63l-214 251h178l139 -162q23 5 42 5q65 0 112 -46t47 -111q0 -30 -14 -65zM286 418q0 -31 21 -53t52 -22t53 22t22 53t-22 52t-53 21t-52 -21t-21 -52z" />
     <glyph glyph-name="bracketright" unicode="]" horiz-adv-x="807" 
 d="M128 237l-61 61q-27 27 -27 67t27 67l271 271q28 28 69 28q39 0 67 -28l61 -60l-85 -85l-43 44l-238 -237l44 -44zM683 494l61 -61q28 -28 28 -67.5t-28 -67.5l-271 -271q-27 -27 -67 -27q-41 0 -68 27l-61 62l84 84l45 -45l237 238l-44 44zM697 731h149l-731 -731h-148z
 " />
@@ -185,7 +185,7 @@ v-170z" />
     <glyph glyph-name="u" unicode="u" horiz-adv-x="809" 
 d="M405 396l-397 -396h794zM740 732q29 0 49 -20t20 -49v-122q0 -29 -20 -49.5t-49 -20.5h-671q-29 0 -49 20.5t-20 49.5v122q0 29 20 49t49 20h671z" />
     <glyph glyph-name="v" unicode="v" horiz-adv-x="787" 
-d="M394 202l-394 377h787q-63 -61 -194.5 -187t-198.5 -190z" />
+d="M394 202l-394 377h787z" />
     <glyph glyph-name="x" unicode="x" horiz-adv-x="726" 
 d="M726 110q6 -6 6 -15t-6 -14l-72 -73q-6 -6 -15 -6t-14 6l-258 258l-257 -258q-6 -6 -15 -6t-15 6l-72 73q-6 5 -6 14t6 15l257 257l-257 258q-14 15 0 29l72 73q6 6 15 6t15 -6l257 -258l258 258q5 6 14 6t15 -6l72 -73q14 -14 0 -29l-257 -258z" />
     <glyph glyph-name="y" unicode="y" horiz-adv-x="806" 
@@ -218,10 +218,12 @@ d="M656 750q39 0 66.5 -27.5t27.5 -66.5v-562q0 -39 -27.5 -66.5t-66.5 -27.5h-562q-
     <glyph glyph-name="egrave" unicode="&#xe8;" horiz-adv-x="754" 
 d="M703 703q47 -48 47 -116t-47 -117l-94 -94q-48 -48 -117 -48q-41 0 -84 24l-8 -9q28 -47 21.5 -104t-46.5 -97l-94 -94q-48 -48 -117 -48q-68 0 -116 48q-47 49 -47 117t47 116l94 94q47 47 115 47q47 0 85 -22l9 9q-28 47 -21.5 103.5t46.5 96.5l94 94q47 47 116 47
 q70 0 117 -47zM307 209q26 25 21 62l-41 -41q-14 -12 -30 -12q-15 0 -27 12q-12 10 -12 28t12 29l41 41h-14q-28 0 -48 -20l-94 -94q-20 -20 -20 -49t20 -49q21 -22 49 -22q29 0 50 22zM635 538q21 20 21 49t-21 49q-20 20 -49 20t-49 -20l-94 -94q-25 -24 -20 -62l41 41
-q10 12 28 12t29 -12q12 -12 12 -29q0 -14 -12 -28l-41 -41q3 0 7 -0.5t5 -0.5q29 0 50 22z" />
+q11 12 28 12q18 0 29 -12q12 -12 12 -29q0 -14 -12 -28l-41 -41q3 0 7 -0.5t5 -0.5q29 0 50 22z" />
     <glyph glyph-name="eacute" unicode="&#xe9;" 
 d="M188 235h-160q-28 67 -28 140q0 156 110 265.5t265 109.5q88 0 164 -37t129 -103h-105q-39 0 -66.5 -27.5t-27.5 -66.5v-92v-2h-188q-39 0 -66 -27t-27 -67v-92v-1zM564 516h160q26 -62 26 -141q0 -155 -109.5 -265t-265.5 -110q-86 0 -162.5 38t-128.5 103h104
 q39 0 66 27.5t27 66.5v93h2h186q39 0 66.5 27.5t27.5 66.5v94h1z" />
+    <glyph glyph-name="ecircumflex" unicode="&#xea;" horiz-adv-x="751" 
+d="M376 750v-375h375v-235q0 -58 -41.5 -99t-99.5 -41h-469q-58 0 -99 41t-41 99v469q0 58 41 99.5t99 41.5h235zM470 750l281 -281h-281v281z" />
     <glyph glyph-name="fraction" unicode="&#x2044;" horiz-adv-x="761" 
 d="M380 751q158 0 269.5 -111.5t111.5 -268.5q0 -133 -82.5 -236.5t-209.5 -134.5l-4 491l-176 -490q-126 31 -207.5 134.5t-81.5 235.5q0 157 111.5 268.5t268.5 111.5zM168 488l55 20l-34 94l-56 -20zM410 530v100h-59v-100h59zM593 488l34 94l-55 20l-34 -94z" />
     <glyph glyph-name="H.002" horiz-adv-x="803" 
diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
index 73468b933fb3fbb85c236355ad0c2ff9e5b2ced9..c9e46ada37c0fa5afc3d3ba4c77a002739aafede 100644
GIT binary patch
delta 648
zcmX9*Ur19?82`R=H=W&kC(}6`mfmYlACz3voGhaywi&H|PIF+8H@&(Cr$eRmCH0}C
zvX_oT(TgC&vL2#6*n`wlJ&XthOOWa*FbrIjnjl>Jwm6*go!|HS&iDO(oUOA<p$R|$
zkYN%8xEKhupZlJexC~IKQ1)Q3<#YgUK@MSppj-&odZzT!Gyp~jclX4!c-fodHUOcR
za%=tCNPK^vI)Q7KcuW7lcpr4xp8}W@)UGC~YrQ%Cd-cS9q1_OT>JwUSkgd^UJ0&Wj
zvC*;ZKQKf1HSO+!p&rfUDy3njE#hCrw6QqMK?iY-gq1-prY97(2%xTzi01gv$mr0C
z!BrAaO#HX3IfPT?#oV}>-?R;)@PqQOtj|yXk8FPW0ebTy*~$pCaX;>1A8%r{sPX|;
zg-$-pylCMcm^aVOHUU@~kXwW<+~B=Jr(h#AWvbyD!YsDaElBP=D0=vw>1OqB(IZ|H
zABhX%l5~JprPLx_k!GX?X+_$VhvgUYN7=ACtPX(WocVb!_9a8|Uz1s-Iq!ID!6Ykm
zBvS>C1#~8R9r@-GM%GZpyT)~)Fook}0>J_n_L;3FAC{O+vYTGMC7miX!X=(43t}Bl
zmz@_xTLC|*g!p}Bw3%hxvNTm$fj$pyYLPwXuv%Vu%vRq}r&9khyb<;p)xNeiAD%&{
zvCcM)J3q7VlP_$nC-;>d0V8~;;#tu!EFnX|+<L_A_GHha0Q{xvP*o?*F_A<PofS&Q
TdwnsL0imzApJd{)?*H`<Wsjl=

delta 568
zcmX9*Ur19?82`R=?w#emw_9fQV9kvjgP@#ya8i^0kelGDg`*V(d0Er@u(=D$P=Z_#
zLHS~xD54-A7l91!Lp>Ns;DZr_Az?Wo>cM)kK~}58^=)!E-#NeUch2woHyv5)83P0W
z4RXLC8Vbcutvt9;58zoO@80mqt`OV+2jLflU1xe*{nwMu?*Mq7a9<*ASk9L#Isk7Z
z-^T%C$f{IG2|NYjw+y64`@f7^UI2L#ps8dgjVto|w~vS`(r!1+<d{(xW*_J?2|$aP
z9v=C@EAxaYAYMvk62_i`&J=)DBEFC|Ml5&&G2%K1y9SMPGVfx~0o)Um#0e`iG(4Eg
zxJhb(_+qU%D)8#xp5SFY_!AWVmHaU8n_b#G+3eC?3~Y_pUdG|9IEMdF7eUsF4v}JB
zviDd3nRvqjGO|?wq4JCPO_)56+r<ojCGJQ^#H6HSjBb8Wk*;}vDeX$X@>rQtX4Gx8
z4yfH~pE{vVsf+5mmemT{C#|fN?Y#V~4s|=G{gz~EGW#r|4LR1h%YN7JkfXy+?bhY}
z5_J>Z4he5>Wckjc8-HHoXy<x0djtlI71^?Vze$!fs*|l!hHmJ9sK_^mMXC8Tt8Wp<
zT@f+v%GzD-HI8v{*z<J9G&1CJ_aUFpU$bqZ?Ahl%N0JndWH;r>&fUtiRY7F=W_4`T
HxkTrGdE1lf

diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
index 767f990e67a9bf0124d6ce0f28f022fb57ec4dd4..8a4b634718466824d978e61081578be443e76c7d 100644
GIT binary patch
delta 6337
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
M(*BDRW};{R1LausXaE2J

delta 6293
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
Vk<J|d<<A>o|NrE3hTUBF{{bc-=ePg>

diff --git a/platform/features/layout/bundle.json b/platform/features/layout/bundle.json
index 0df6413ed0..6f8630c07f 100644
--- a/platform/features/layout/bundle.json
+++ b/platform/features/layout/bundle.json
@@ -5,7 +5,7 @@
         "views": [
             {
                 "key": "layout",
-                "name": "Layout",
+                "name": "Display Layout",
                 "glyph": "L",
                 "type": "layout",
                 "templateUrl": "templates/layout.html",
@@ -197,7 +197,7 @@
         "types": [
             {
                 "key": "layout",
-                "name": "Layout",
+                "name": "Display Layout",
                 "glyph": "L",
                 "description": "A layout in which multiple telemetry panels may be displayed.",
                 "features": "creation",
diff --git a/platform/features/pages/bundle.json b/platform/features/pages/bundle.json
index f1d559dde7..099b96415b 100644
--- a/platform/features/pages/bundle.json
+++ b/platform/features/pages/bundle.json
@@ -3,7 +3,9 @@
         "types": [
             {
                 "key": "example.page",
-                "name": "Page",
+                "name": "Web Page",
+                "glyph": "\u00EA",
+                "description": "A component to display a web page or image with a valid URL. Can be added to a Display Layout.",
                 "features": [ "creation" ],
                 "properties": [
                     {
@@ -26,8 +28,8 @@
         ],
         "controllers": [
             {
-                "key": "IFrameController",
-                "implementation": "IFrameController.js",
+                "key": "EmbeddedPageController",
+                "implementation": "EmbeddedPageController.js",
                 "depends": ["$sce"]
             }
         ]
diff --git a/platform/features/pages/res/iframe.html b/platform/features/pages/res/iframe.html
index ee2d985948..e23e073555 100644
--- a/platform/features/pages/res/iframe.html
+++ b/platform/features/pages/res/iframe.html
@@ -1,4 +1,4 @@
-<iframe ng-controller="IFrameController as ctl"
+<iframe ng-controller="EmbeddedPageController as ctl"
         style="width: 100%; height: 100%;"
         ng-src="{{ctl.trust(model.url)}}">
 </iframe>
\ No newline at end of file