From 0eecbb0d2095c0384989e8378a4a8d1b08a9d798 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Wed, 4 Dec 2013 14:47:04 +0100 Subject: [PATCH] add popover infos --- src/font/icons.eot | Bin 2928 -> 3080 bytes src/font/icons.svg | 3 ++- src/font/icons.ttf | Bin 2764 -> 2924 bytes src/font/icons.woff | Bin 2840 -> 3000 bytes src/js/controller/login-initial.js | 1 - src/js/controller/popover.js | 10 ++------- src/sass/components/_popover.scss | 6 ++++++ src/tpl/desktop.html | 11 +--------- src/tpl/login-existing.html | 14 +++++++++++- src/tpl/login-initial.html | 15 ++++++++++++- src/tpl/login-new-device.html | 33 ++++++++++++++++++++++++++--- src/tpl/read.html | 13 +++++++++--- 12 files changed, 78 insertions(+), 28 deletions(-) diff --git a/src/font/icons.eot b/src/font/icons.eot index 8909197ccba8340ba3ce6fdbb1e4c4d3349c0ce3..038851388220883c7c744a654ed628408833afa0 100755 GIT binary patch delta 1856 zcmZuyTWl0n7(VCB?ab`X%+Act>~_1mv%77#-KDgp-EG-g+AVU4h8PNnH6petwFP^% zEoo8N5_sTZ1u`#$2ju|?3Go&rJd}q@8lyx}6E!3ftfGktM0wEw=}tY=WdzNV*hWQbS~;T^={p1z4!U%RP~5Z(&_cc-_za|e3%#+v}}?L@Ed zB@Vuu86f-^;ibL(qvKV#!Rv&7N_eVou&dL3TD(g5AA|?{JI9AAfET)o9Eyye}E$ zBuV0oWu+nBjaf~SC8VjsvP^5#7c(#gO~{IFuB>5Q1*a87G<{hzskwcc%!ncsC5mGi zguSr{X&nN11#W;_-odNwzwF!J*!8F!p8g)%_w8BxKD>Uhx)lBhKLOSdo%ABZ7lvMz zgVG{uh7B-feMARxVfavpmsdeYKxdFt6f?q4HP-umQ5m^7O_8A866%^b^z@o?tuYLL z#fsu#InwM9T@_TD8i(2&SvZ5;62n5?t3+GUacsZLV#M*hsz?kh<5b1NV2;D~b-6N? zDGsWfU(Ue~s1OoW6=O;^{l5B@tHQpLVwtkD;f%Lp_1c3I9YN9^3o*-kG>NlKs^O*K zRgKIwW60bF8Llto^g-XOuuuCRHuM_sL2m z>v-Wy<_vYwy38ctW$QL`s+=q-LByhAD*4aUu#Z52;Y3B467`@5>W*t_JEE-fY!o8v z2ev8KE{Akc)I%~li+EASrl5#iMl}tQR8ceYw-80lnB8#ZYKP%&V8y6r(@)=BEW!#8^}XH02=s z-hmYtD&e{P_Lc+i`l>^#4#D+%?YBdzfenZ4p>#V zTpgnh@0s6CP0#P%Lmi&KN0`-v`*TJ`DjZH#7$>XS`kI^j+N$$gDUb&+k^B#Ho5Lj$gaH{f0LITfZ>QtPO*)ZN8$qII87FnwB)Q;rb`1`UJi70|CeRIfz!>NQo#Y;R6kg^^T5T@#U!59YaR2}S delta 1683 zcmZuyYitx%6uytSb7yAfJ-ajGKDxW5?e;~V+bvr*r6~n8Vg#h7n4r{BfrMonsHD|M zP3#YgqJc3{3>XqgG(j;$Nk}k3j3h(}#vkxQLQDRPaCwECpoWA@C}| zpySD>+Pl=xZg;cHm+aX#RvewU@OSDs05HyYVaMpc3AXBtkFZtPv3vT3;>dNI@ofOm zM|X~oZifpqCX+s9dTu96h~uQl_&noJ)a@)zPBs4u_5vVsEYY#MG&U-~BVJ}a%XqXn zIyC_-@B!l+7*FjPEshU4UtDLLHHP_#(!NRdLs>|lc$;D85m{g#3cvtJ&5PbK*qv-- zA`dtK0Sa>Ea^N!$%H{G;DFmSRC%lDFt@jJ+n=uV(&GwfE9(#LoJ&8zqChn|S)gv1g zG%YMpB09}!s;Vk=TIv&`EbykPtJpH6mi%DaskH?RQ;=6=THm|2ky?)=tw>8tlO@}h zMq~vlDyBR^Lbx_cBuOGhDsEGe=M+f}VOYF0dVu*5qfu4-J zqU=O0kw_v%Shj1U)UBzrYPy<|5-Si5S0A3XoY-d1OoUiTn{(DB@Fs^{M+CAIh27Xule`e^6cJ!m(e%J;xZBT{(75Z7Vca^hemf49yU(R(?Ito$CP>{bW@%&43 zLqi#>F9Cn1rlAwc!cTB*akH?pw55;0i-N2Yg2b?%9_VSH{#GI&UKCATC9wYAEjP5* zY(5qJ~th8dw z3A`lgj%KD)DLpN#QNr4(MmQw$NMP*<3u>As_2)H*7}4m8p5+?+(EEyX!;9Wsaw4Np zUQz_bNt%ln&7{Mi#8btP4k>nAhmjz4=vl;h=lL|m-c7zRvqg{FN}!^Tkf>-vQZf|U z7Ze6A`Gs2uvsZp-aUbF^$_8HW2T2d{RMrH)Jt)TYh~x74Kwr4=u!4u>*a-sV%iJmN zJ-Vhlp6FN>j?{I;(47N|=Ot4S1jUrln*s9g&32w`g{Nly;aPaIFjts^>kjyDc)AcV z?pJ;{GJCd@)x75Agp9c#ADmv;kIygcpT-9l{$k843B}b;rl+Q+C*!=|zOmTfU)bX)cl)Vj7N9&R%fk9}) z9Q+a9MPK76&f-CQk|}|e434pR69n>p4_R!+o?glaDmy?`j2K>5#hBr`D&`m-u3`dg z#sbe^f>F>_#S&;_gB%0Mi7XR%R&d3$f-9a3_pzdiX+@}*Rxr;t=c}75rVm^P-c%^D sqIz5G8Y>k`r9J< Generated by IcoMoon - + @@ -17,4 +17,5 @@ + \ No newline at end of file diff --git a/src/font/icons.ttf b/src/font/icons.ttf index b0a6b99d80792c9137fd98e53d2b6703c3b7ce13..2e45a9598fd830e5e0172d046de9f11ca252d664 100755 GIT binary patch delta 1836 zcmZuyTWl0%6#g%B-<_GAnVs2XySvlf-j~wrwq+}{TjZjKC^xZ2#WtlSUH3dLOwK#D5`sEb8Un2QN9(JYw&jU40I1omrtKY2uDF*y`y`02xI{CE|9{G z{sS+){EImZdLKgkUwysZ+sPBRUPDOi1bcHI5MnR88}xTTFYO!HJ5n=)UIG1M(9`{c zJ(+I*S@{MKzXK5+=pGqDLG(UC5(9ei?(Tu!Yfsw0fnEwlDuxD!_rgSB_|~8Nq&|dU zD*qo@R6HGc7dKYa0WZKqKo(Dn(}B6Ud4xPPce|L_v)-pWoA4cqlbq8|T63B%t=ax+ z_VE*Y*R!S+D36BP+tadUVBKH@o)tr>1g|IxZ!Im2iGG1I6jdRHE-lS;Btl6`pxDNo z?B~l`)>iVyl48SLno1e|kfE}&jAe!L97}{?GQvrckJXE#7B6s&BKdt(Rm4QDx*-yX zXab=tUdOuobpEnm;Ry_k31O?!&4!Y+EzGE~WeGl7UbCb;o32y{rNnR9MtD=_hESw5 zBs0{A6l?xOS(SM}^zn?BAYeyBqCaFBA}fg;VSH9H!iVh=Bi>MD`=EfJh1Jerc5T)$ zqlQR`VihSuIBKijBF$Z75uHK`LIyS&6v1YBHRhU3jPP~59&dSDSmpld&V1uGlL~zH zJM7+fC*Aw_=GEF#{5`&eoGF?L5-SwPL5|1DJZi%&IPLhDNG^^S4doRz*fWrGL|Kxw z;*Yd8heHXK_;^E8u-hK%IdJsR)fGl-9RDn6T7ctWxG|TKokgy2_L4vRr8 z(cV-pxG!)5;YCr`6c(59x)xvso)_GkYIQnO6xI2#n!_K`7?E{d5U6U0L(R)q#zQ4V zDs{8*Ot5m*nl}%0MWGyr1x^eY3h&yq<+(j8TZ7SR9#3LHw*p$yPN+%0T*SK1vuePE z-NhmlgqbirXJ`iJ{v?N4EwUt&u9fiza1!AZ&wa(7qgS0cTZKP!9%Ii`z>$(J^cFujtTySQ% zHP6Ok^~s=FT31B=IFuikbXgE&T_R&1a_=3fzfz4ayy0#+f^V)oy7DMqcgTG!)=*}e zWeqWM%R`4e|NLHGA<}pKnK!O9K+F;67+<09qsI=;?x*9k`w!A%v-d!AKIaE=R%JRK zPgh!}Yd7|{we@eT&2ObBk8nE7i83rb+!#g;hGjV%RAB`$W<^Ed!l%fIkrBJ8Dio?} zvPVYR2RGN%Z60jDod1E~ zfJRk?mZ27COi6{9!8mDbXd_MO8d9PqYXGzX5eI`pN@$~5VkDXxn@XA*wMK$=jUV5z z;rRHj2XgDFJsll;PHlZ4v!kOEb10jg$kK`b`g#7dT^)Pc{&n?2$eB@h6r8;l=UrIu zJ-qLSZ7-@T{zg8pl_GRw^6N$EObIPmb{Mg)u3!X zr<2iph?|clCvO`$1znt{y*d)mUPT0*RzaBsOo1<6zzpDZ3z$U~Xa#=`u_(2GB~*zv z!kxg32#lArfD1VbxR4WYGdLBJ77T@?1{Ls!6v&-DgS&^( fB8@hoUbF-4L;a{5eoc$Kb684Y>RghFydTa#{rgqe delta 1639 zcmZuxYiJx*6uytS^V)gO?#y&|C%c8991FI?{To$s9Q z%rJA$4eN5G0w4e&1YQ9cWFOty)2DoXv!6!3qV4U*8uHu1NdTNwU z(v#n{cj39x0_$rcGG|`LrRn{Q{K9}G&kRQ1MCMtU?|V- zEl=l*(mTQ>8W^B~XsI|q3rz4n<&ROG+*d5kOxUNdQcfGg{A~Ha9DPu_#82Kj+v`n* zB)VBL29nFd+ps^;P9+vF^rcV`s@DUTWl*oze@`L+y&dp6Le1VLG+Z%sasAF0#~yxj zZZnC9S|)Cfjt)w?2@MnT91-l!6sIT(XLqGtLE>3M(G+azVpo1VWj9+qhDpfE5|j4dNOWt0?Wvv6vCP!q_SQ8Q7x+T2p3+4 zhQFsY}UpM`S?=aZHe}CE|`C z*%4D9qQD_6S}^{O+1>~Q@Ef=pKJf-W?%(one(&c{2C65n__zIw{_SgLyIZcnFT9^{X9f0I zb`uP<98^$%M&J<4j-a6t*bOt?P=WUfBll*vQ8~y)A0lN{i{%!EbB>eLP>3^i8Tq5` zvo9=7Ok~Vq7yiK+x<)v2p|=DQHSEZ;6IKZ&kO(qQoOjWi^Ye*ZyKT4U z67%z;<*nK5*7E47+Mg)yw_NCCRU;f?c%Ek@Q{j2VlN>AfTjLCHHUWSj43A{d7j%)y`GU+8Nb#RGU8pP)+MC3&LQ zQK9$i4g+*BDPZFY#uT@%V20vtE0_R_vYGRuOBXC&ihnP2Riw1eN% zKe%rcA(^=-?OXL-^!mV1UvHL?J`wdTcwV_V*gMJwmb;i=xMX2;c2Do%4#xQtD)a5j zXA^(y9U9rk)-!o}KI1@$DgW29sBkXiZiM=>TE>g)hgn}ZC(VTx7ncz7(c-U#I5F>U zje8dE5J(B`3EVQS8}jQ+PNcl#R3@pas?=Ul9Fu~g zV5*vmO+#Lh=}0;$TO^PGK?%~5rp|I|<`tUOipoke=$IO>D4?i>3Op9WseD0}1H4ff zwW%m@svHauO_h@4RdxBHd|kw(^$-}|3k#nGRf<^yz?iQ{H=1fHVFRbdRwik*v^uXe zn=V%|AvkC!%*gXST~2zc_};oR7+#TNoqJiO0Ta*nafG9{IQ>9*lG;JAfYY9iI zD9nIp*daZYNNTB|QowsJ@mg`nV&5DjHXxe`M+H+i1@9Ln!t42YnRJZ;AF|W9jjxBV z-S_!(W$bv#im2ELec>x3?l36xRMF*=iWLoks7PAz^ifQ-) zmK04)$htx^M#5HD6(ci$2NQM{PA-gKj^MNy)MfZV4#@%yYNA&o>p_u}V4lll{P_IO zPZB(dLmWFG-*Ok-X1cyU7F(4HTg9~n_|L-&Q?j9mqGHJSq>sG&M^{~`f{RDI%|~Ij z?O59}*l^f;*S$n7J&;oduD^KXN*&W2b#Ku!V?Q~5aQ*<9nm=%m9G}0>JXaG3*V^Uj zcsyNhpQ+h2(B3|%`RVhkf_ta7V}RWOw)E z_8iDgOiVALY<4@>(uXO-9r)aYH^H?2W9DB?-`?K;)7DqC)_+id&6u^D zGdCXfZbWJV#qE-6YjZ&skWtK5vbqbd;$MA+_%p;q5IlX{*RJn|0RE{Xw^U8oNYp*?8C9hGAS>v#1H?HNJ;(U)b5_~9FJB@q7~(9Ht< E7bNOTP5=M^ delta 1663 zcmZuyTWl0n7(SOdb7p4eKD#sHcDK7*w%zT8($X7SHf2*v!AK$yYl?}NS}G;7ECIw; zBQ>!vMJv%E@e(i?8+|}gqa-AlC`J;ZMB)QHNK7y$z98WR6EN-6bJ!(H!k>JZ@Bhw! zzJJf|oPW=F@4C?!9~~YB5U_~&Ai|%@#o)t;_g1St^ZAXg@$%SS0N^CkiyYtnlRmz4 zY(Li)ST5CI?%X~79Me7pfNtU_k6v*nC&qTLl3T2%mjf=&*po~IKyG7smP4K(<;n7a zDW+{QaFO0dicnJ%_OFnxrDcFU5{!x&~~syiR`sxsIKeOYi&%*swCRFsbj}d zS_^|2ufdftOhZvqX=C4To;nYuoLFmXv!l9>K~xQDI;J8)QnVpX6h$FcI^j}T6f{MR zU{jYfGp${5Gj2%;7hi#PII{GWs!@y(f)F9n+}-Qw4fQUuDI<@wBC;8=GU(a)b)pz)U54S@mL$Oca?SthxepwT`qj-Tg%!w_ zZ;m*n;gS0hTc^u@B4x6#8Gz+e1mKH62f%@`G>F5_rZy;c#vp({!p-opH>JVw zW_aUL*o$&-;c|EX%j`LV`(T{mwfi6xuKz))1QQYP}?#IWf3NY_JmzrTiM=E z;5kXv2|;qy%#?bXX!sk8xqzj%47RZU5Mny%FG%sZ@owHLOql!p1OPSZ)gb8C@ zntuuj!SiAU;$U7Z&TKamuEtl zk*bCiuHwbG5eY(}z}FYAKB(Y98oNPY`GRmV*hDvUC6XO0qOoj89lCjF>8xUFlBC%R zdV{m@&TQxDHh6M29GQi`73Yd`aO0uy_24@iv+h;?G&*~_lhwQy{7G~6L40_6@gP3C zcyJmYUcAk+ASIR8d%2$a`ktKk{;I9zfr0YYRZEX!umoVYPb5ty>{38tM14*3qXuCK zB(f$E{~dH>YAV&6_q=>>a7l94+tG+1Ns^#Cx+Lk2dN+wgZ9{DNfz1N`esi3$-aGNM zQT!W3*hyLZeEj$$_nyH8xeuyuD;<24v0(!Sp$mKAukaT79>;Mv9>fbw=T0g(#>Nc~ z#3rjVqk~g-b-v2(PmLqSH`X|2JX_-e<0CarfXg!O$p;t(t7}{Vc`yzzfP%~v?pftk z&nmBaGTzUMs;1S2s%e#rY;&QuxoWzL8CO7=p#t^<`ABk2jqe(-lq;1z;JyN|4NQQY a;03T7jDdakuLYGz3ud2;|GTh}O#cOAk02ue diff --git a/src/js/controller/login-initial.js b/src/js/controller/login-initial.js index 800fcee..854cf1f 100644 --- a/src/js/controller/login-initial.js +++ b/src/js/controller/login-initial.js @@ -21,7 +21,6 @@ define(function(require) { }; $scope.state.ui = states.IDLE; // initial state - // // scope functions // diff --git a/src/js/controller/popover.js b/src/js/controller/popover.js index 4cb1299..32148eb 100644 --- a/src/js/controller/popover.js +++ b/src/js/controller/popover.js @@ -18,14 +18,8 @@ define(function(require) { var ngModule = angular.module('popover', []); ngModule.directive('popover', function() { return function(scope, elm, attrs) { - var popover = angular.element(document.querySelector('.popover')); - - var model = attrs.popover; - scope.$watch(model, function(value) { - // set popover title and content - scope.state.popover.title = attrs.popoverTitle; - scope.state.popover.content = value; - }); + var selector = attrs.popover; + var popover = angular.element(document.querySelector(selector)); elm.on('mouseover', function() { // set popover position diff --git a/src/sass/components/_popover.scss b/src/sass/components/_popover.scss index 30ca392..6a7525e 100644 --- a/src/sass/components/_popover.scss +++ b/src/sass/components/_popover.scss @@ -121,4 +121,10 @@ border-left-color: #ffffff; bottom: -10px; } +} + +.popover-info { + cursor: pointer; + color: $color-blue; + margin-left: 5px; } \ No newline at end of file diff --git a/src/tpl/desktop.html b/src/tpl/desktop.html index 566c9a0..2ab6f22 100644 --- a/src/tpl/desktop.html +++ b/src/tpl/desktop.html @@ -27,13 +27,4 @@
-
- - -
-
-
-
{{state.popover.title}}
-
-
{{state.popover.content}}
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/tpl/login-existing.html b/src/tpl/login-existing.html index f561b9a..bba0a46 100644 --- a/src/tpl/login-existing.html +++ b/src/tpl/login-existing.html @@ -11,6 +11,7 @@
+
@@ -22,4 +23,15 @@
-
\ No newline at end of file +
+ + +
+
+
What is this?
+
+

The passphrase protects your encrypted mailbox.

+

There is no way to access your messages without your passphrase.

+

If you have forgotten your passphrase, please request an account reset by sending an email to support@whiteout.io. You will not be able to read previous messages after a reset.

+
+
\ No newline at end of file diff --git a/src/tpl/login-initial.html b/src/tpl/login-initial.html index 6a67239..48f5edd 100644 --- a/src/tpl/login-initial.html +++ b/src/tpl/login-initial.html @@ -12,6 +12,7 @@
+
@@ -37,4 +38,16 @@
-
\ No newline at end of file +
+ + +
+
+
What is this?
+
+

A passphrase is like a password but longer.

+

If your device is lost or stolen the passphrase protects the contents of your mailbox.

+

The passphrase should consist of multiple words that are easy to remember.

+

You cannot change your passphrase at a later time.

+
+
\ No newline at end of file diff --git a/src/tpl/login-new-device.html b/src/tpl/login-new-device.html index 1a7ad92..ae8b01c 100644 --- a/src/tpl/login-new-device.html +++ b/src/tpl/login-new-device.html @@ -9,8 +9,14 @@

You are already registered on another device. To access your emails on this device, please import your key file.

-
-
+
+ + +
+
+ + +
@@ -19,4 +25,25 @@
-
\ No newline at end of file + + + +
+
+
What is this?
+
+

The keyfile contains your PGP keys.

+

It can be exported on your first computer under "Account".

+

You can import it from a USB flash drive. Never send the keyfile to yourself via email.

+
+
+ +
+
+
What is this?
+
+

The passphrase protects your encrypted mailbox.

+

There is no way to access your messages without your passphrase.

+

If you have forgotten your passphrase, please request an account reset by sending an email to support@whiteout.io. You will not be able to read previous messages after a reset.

+
+
\ No newline at end of file diff --git a/src/tpl/read.html b/src/tpl/read.html index 4a4b377..b76b26d 100644 --- a/src/tpl/read.html +++ b/src/tpl/read.html @@ -9,10 +9,10 @@

{{state.mailList.selected.subject || 'No subject'}}

{{state.mailList.selected.sentDate | date:'EEEE, MMM d, yyyy h:mm a'}}

- From: {{f.name || f.address}} + From: {{f.name || f.address}}

- To: {{t.address}} + To: {{t.address}}

@@ -29,4 +29,11 @@ {{line}}

- \ No newline at end of file + + +
+
+
Fingerprint
+
{{fingerprint}}
+
+