From 2392d88950cf8c1be5c351ed65174d718f21404a Mon Sep 17 00:00:00 2001
From: Vlad Chernushevich <mailbox@happytodesign.com>
Date: Fri, 14 Jun 2013 19:37:36 +0200
Subject: [PATCH] * Updated options page styling * Refined options handling

---
 client/assets/css/style.css           |   3 +-
 client/assets/img/themes/basic.jpg    | Bin 0 -> 1407 bytes
 client/assets/img/themes/cli.jpg      | Bin 0 -> 1407 bytes
 client/assets/img/themes/mini.jpg     | Bin 0 -> 1407 bytes
 client/assets/img/themes/relaxed.jpg  | Bin 0 -> 1407 bytes
 client/assets/src/applets/settings.js |  47 +++++++++++---------------
 client/assets/src/index.html.tmpl     |  10 +++---
 7 files changed, 26 insertions(+), 34 deletions(-)
 create mode 100644 client/assets/img/themes/basic.jpg
 create mode 100644 client/assets/img/themes/cli.jpg
 create mode 100644 client/assets/img/themes/mini.jpg
 create mode 100644 client/assets/img/themes/relaxed.jpg

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index e91c28e..fad8c24 100644
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -219,7 +219,8 @@ html, body { height:100%; }
 
 
 /* Settings applet */
-#kiwi .settings{padding:50px}#kiwi .settings article,#kiwi .settings aside,#kiwi .settings details,#kiwi .settings figcaption,#kiwi .settings figure,#kiwi .settings footer,#kiwi .settings header,#kiwi .settings hgroup,#kiwi .settings main,#kiwi .settings nav,#kiwi .settings section,#kiwi .settings summary{display:block}#kiwi .settings audio,#kiwi .settings canvas,#kiwi .settings video{display:inline-block}#kiwi .settings audio:not([controls]){display:none;height:0}#kiwi .settings [hidden]{display:none}#kiwi .settings html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}#kiwi .settings body{margin:0}#kiwi .settings a:focus{outline:thin dotted}#kiwi .settings a:active,#kiwi .settings a:hover{outline:0}#kiwi .settings h1{font-size:2em}#kiwi .settings abbr[title]{border-bottom:1px dotted}#kiwi .settings b,#kiwi .settings strong{font-weight:bold}#kiwi .settings dfn{font-style:italic}#kiwi .settings hr{height:0}#kiwi .settings mark{background:#ff0;color:#000}#kiwi .settings code,#kiwi .settings kbd,#kiwi .settings pre,#kiwi .settings samp{font-family:monospace, serif;font-size:1em}#kiwi .settings pre{white-space:pre-wrap}#kiwi .settings q{quotes:"\201C" "\201D" "\2018" "\2019"}#kiwi .settings small{font-size:85%}#kiwi .settings sub,#kiwi .settings sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}#kiwi .settings sup{top:-0.5em}#kiwi .settings sub{bottom:-0.25em}#kiwi .settings img{border:0;max-width:100%;vertical-align:bottom}#kiwi .settings .map img{max-width:none}#kiwi .settings svg:not(:root){overflow:hidden}#kiwi .settings figure{margin:0}#kiwi .settings fieldset{border:1px solid #c0c0c0;margin:0;padding:0}#kiwi .settings legend{border:0;padding:0}#kiwi .settings button,#kiwi .settings input,#kiwi .settings select,#kiwi .settings textarea{font-family:inherit;font-size:100%;margin:0}#kiwi .settings button,#kiwi .settings input{line-height:normal}#kiwi .settings button,#kiwi .settings select{text-transform:none}#kiwi .settings button,#kiwi .settings html input[type="button"],#kiwi .settings input[type="reset"],#kiwi .settings input[type="submit"]{-webkit-appearance:button;cursor:pointer}#kiwi .settings button[disabled],#kiwi .settings html input[disabled]{cursor:default}#kiwi .settings input[type="checkbox"],#kiwi .settings input[type="radio"]{padding:0}#kiwi .settings input[type="search"]{-webkit-appearance:textfield}#kiwi .settings input[type="search"]::-webkit-search-cancel-button,#kiwi .settings input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}#kiwi .settings button::-moz-focus-inner,#kiwi .settings input::-moz-focus-inner{border:0;padding:0}#kiwi .settings textarea{overflow:auto;vertical-align:top}#kiwi .settings table{border-collapse:collapse;border-spacing:0}#kiwi .settings .clearfix:before,#kiwi .settings .list-inline:before,#kiwi .settings .thumbnails:before,#kiwi .settings .clearfix:after,#kiwi .settings .list-inline:after,#kiwi .settings .thumbnails:after{content:' ';display:table}#kiwi .settings .clearfix:after,#kiwi .settings .list-inline:after,#kiwi .settings .thumbnails:after{clear:both}#kiwi .settings .list-unstyled,#kiwi .settings .list-inline,#kiwi .settings .thumbnails{list-style-type:none;margin:0;padding:0}#kiwi .settings .list-inline>li,#kiwi .settings .thumbnails>li{display:inline-block}#kiwi .settings *,#kiwi .settings *:after,#kiwi .settings *:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#kiwi .settings label{cursor:pointer}#kiwi .settings input,#kiwi .settings select,#kiwi .settings textarea{width:100%}#kiwi .settings input[size],#kiwi .settings select[size],#kiwi .settings textarea[size]{width:auto}#kiwi .settings input[type="file"],#kiwi .settings input[type="image"],#kiwi .settings input[type="submit"],#kiwi .settings input[type="reset"],#kiwi .settings input[type="button"],#kiwi .settings input[type="radio"],#kiwi .settings input[type="checkbox"]{width:auto}#kiwi .settings input[type="radio"],#kiwi .settings input[type="checkbox"]{cursor:pointer}#kiwi .settings .radio label,#kiwi .settings .checkbox label{cursor:pointer}#kiwi .settings .radio input[type="radio"],#kiwi .settings .checkbox input[type="checkbox"]{float:left;margin-left:-20px}#kiwi .settings .thumbnail{float:left}@media screen and (max-width: 768px){#kiwi .settings{padding:25px}}
+#kiwi .settings{padding:50px}#kiwi .settings .clearfix:before,#kiwi .settings .list-inline:before,#kiwi .settings .thumbnails:before,#kiwi .settings .clearfix:after,#kiwi .settings .list-inline:after,#kiwi .settings .thumbnails:after{content:' ';display:table}#kiwi .settings .clearfix:after,#kiwi .settings .list-inline:after,#kiwi .settings .thumbnails:after{clear:both}#kiwi .settings .list-unstyled,#kiwi .settings .list-inline,#kiwi .settings .thumbnails{list-style-type:none;margin:0;padding:0}#kiwi .settings .list-inline>li,#kiwi .settings .thumbnails>li{display:inline-block}#kiwi .settings h1,#kiwi .settings h2,#kiwi .settings h3{margin-top:22px;margin-bottom:11px}#kiwi .settings h4,#kiwi .settings h5,#kiwi .settings h6{margin-top:11px;margin-bottom:11px}#kiwi .settings h1{font-size:46px}#kiwi .settings h2{font-size:40px}#kiwi .settings h3{font-size:34px}#kiwi .settings h4{font-size:28px}#kiwi .settings h5{font-size:22px}#kiwi .settings h6{font-size:16px}#kiwi .settings label{cursor:pointer}#kiwi .settings input,#kiwi .settings select,#kiwi .settings textarea{width:100%}#kiwi .settings input[size],#kiwi .settings select[size],#kiwi .settings textarea[size]{width:auto}#kiwi .settings input[type="file"],#kiwi .settings input[type="image"],#kiwi .settings input[type="submit"],#kiwi .settings input[type="reset"],#kiwi .settings input[type="button"],#kiwi .settings input[type="radio"],#kiwi .settings input[type="checkbox"]{width:auto}#kiwi .settings input[type="radio"],#kiwi .settings input[type="checkbox"]{cursor:pointer;margin-top:2px}#kiwi .settings input[type="checkbox"]{margin-top:3px}#kiwi .settings .radio,#kiwi .settings .checkbox{margin-bottom:10px;padding-left:20px}#kiwi .settings .radio label,#kiwi .settings .checkbox label{cursor:pointer}#kiwi .settings .radio:last-child,#kiwi .settings .checkbox:last-child{margin-bottom:0}#kiwi .settings .radio input[type="radio"],#kiwi .settings .checkbox input[type="checkbox"]{float:left;margin-left:-20px}#kiwi .settings .radio+.radio,#kiwi .settings .checkbox+.checkbox{margin-top:-7px}#kiwi .settings .thumbnail{float:left;margin-right:15px;text-align:center}#kiwi .settings .thumbnail>img,#kiwi .settings .thumbnail>.img{border-radius:3px;padding:3px}#kiwi .settings .thumbnail.active>img,#kiwi .settings .thumbnail.active>.img{background-color:#a6c42c;background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #a6c42c),color-stop(100%, #76bd2b));background-image:-webkit-linear-gradient(#a6c42c,#76bd2b);background-image:linear-gradient(#a6c42c,#76bd2b)}#kiwi .settings .input-group{margin:0 0 40px 20px}@media screen and (max-width: 768px){#kiwi .settings{padding:25px}}
+
 
 
 
diff --git a/client/assets/img/themes/basic.jpg b/client/assets/img/themes/basic.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2d2fac08430fcccf24b8b9448c38dd5ee70b02df
GIT binary patch
literal 1407
zcma)6%Wl&^6dlKj6VjC0q?M|+62?Uc5b-0g600F<?NmgSp=v9^f(5QUZLHJ}*$#0l
zvEvK)1b%}B2=Ng-R^6~d@Cjz@CUMm?z-UG~b9~RacgEKazl3LCu^kwP0CYO{K@KD%
z{0S(zuk}s<2GWRL2OvDdOI_c0M2@pOR@LnT$ZEF91**ddEYE@UR^X^w5Bl^0JTj~%
z^ZWe=hBovj^Q@-uiX*|U@%Yq*d#6wKwbP!~(3#dFdOZ*W(=nm1(t&wwd1BCHVsjDU
zh~^kN4)J?UW+Tc<KUa2W$#x-KV=E<%7X-RqXN795UKbwFWnL(AJeu{AP!(%+vAjkP
z2ZOS?`k}ZhZw+&yU6UCeYA_hEg9>ZAN1V`TG$N03xr8E0-ihU_LCNw~M-DRdG}mx^
z!?x(iQ9ZExev?6!o*%(<#<o}9)rCMs`Fp5oMi&s<dj2j<>b=s~+dpw2w+lVH?`jZ*
zuSQ}=lw7F#w!3fJ$D>=^>Ds>Sb!~^1_UiOqMb!)|BJRZsMG-re=c|?mJ93jj9;{*L
zqQq~u<=R?Bk}HxRw96Zfy3}rLw%ZT+MzvDqM_Sp|`X;pekycN%)v4O38B7OdmZ59B
zg8G(gn{<3=(U@L~Fx79U)u-1|o~q?gF<kU&FTCmzh59Fg<HkjsaqB}1^}CB2JNyOi
z#O(_7kLUx!aIlcZiTo@8=^p@OvS__P>vi}Yya7ZyozA3*Ooq5dpf!^th}=vepP$L+
z3uGZ4Wa0W8Id{EKEY8mtiz~~^%PTj>1IuQ!vxV73l3ZL`pca<K5B?W~p8%Bu+h7~V
zD3GEsoWjD-zy=tW{1al7onQcYIp!rb!Q7Z&iW5xu4HR$;WydLWU+*p@zIr={L^)Iv
zmPvJDm`Wg?z*LH84Fm85V%V6)aIAG}=#W5s1e3bRx1HPno=?xqLUJ-O9m2>I!LNS+
Dx}#M0

literal 0
HcmV?d00001

diff --git a/client/assets/img/themes/cli.jpg b/client/assets/img/themes/cli.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fea4d213b74003c2c0f34e733e9cb095b88da7b4
GIT binary patch
literal 1407
zcma)6T~E_c7(QLMZjJ%1gM<JHwHTwu^<y8!HOvLt5f@S=K%y63SlR<?MnBSaGDu9k
z@E7=ZywDhbgdbPjcxCh_)YG!9gbnrNoa8xA-{*PXbNaU7m+%}cwEE^D0PXgDkORpG
ze*#MB>D^O+fi$Am0SM3WQYQ#piQ{aa)ePqVvbtk&ea+<rmgm5Fv+rtp7Y6hJJTmPD
z^ZWe=hBl1`^Q@-wsw=~e`S{F(duLDf^|P*CH<;!ldc808E!Tp9M)$2_+n4$cCN`H4
zj%bdd<B*`+U^b$x^mBEGmK_h$HMUaHc|o8>krk>nQ4}7~WnL(AJep!js7f_aDzDLl
z!JurOaVYI7TZ3F^*I)*RIypIEPb#eA9dSavUXMJ=<r0c0`KNZE^-H$DI&@H=uY0B&
zn2t?Hj@p6K3mOcn^x_DXJF=a4SC;}+_3xpU6<t7V>j%3qsdu8WzkljNZWsDa&(k3a
zUya1BBzsT`9B<!oj)%9n({TdF?>H_k?}_wXRntv7BJRZsRh8PdA857?+e(8$9;|5^
zlHA%<1YQ(nr6LPLtGrPc<yL*O)q2R+tCcE0)GChNv!ERewML>{yH*=DgXN;k3iQlZ
z(Ae@Ei;fR1nUiYaH(N?=t#+;7Kx<5@<wAS?IXF}d7roj`uX;$K{)ynIanWYf`p`!G
z?xDsGe}Ox3y8`1Q`hYMT%%^c8KMg?o2LPEYS})Lg9exLI0g+CpGif4|A#M<8P2~t8
zH&w{zr}Fs%S%?Q&n3*MKX9~sQ++4A^ytK5myfPYCHk+L;OfQh+!s0wNzc_mEzaabs
zs2tb^+c-vn6ougw7Jdc}z_8?>5F=uY0p!(~m(&<@bBrmDG2u5*z%i5^r_g=9xsrJD
zb_I!Ys3a_tYR52@Ks<q|6ww?6;0eUA5sTqi^VYy2f%p(6b&>DdxBoq#UX+F8WMVpi
Jktu>-{{XMcROkQz

literal 0
HcmV?d00001

diff --git a/client/assets/img/themes/mini.jpg b/client/assets/img/themes/mini.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..348b2c72847c58b6c80a46a6938c3e8f1a52b69a
GIT binary patch
literal 1407
zcma)6%Wl&^6dlKTk*3rptyHy@FfKxXh#z^F+G>beClyf@sM<=fV1a8-8!NTPvK^9E
zV#gQo8T<kZ5aJ_vth!-^;1kT)P2#F)fYFR}=J=j-?~Jb<d<o9LVsl^~0?=yR2U!r0
z;3uFPJ-vGZ2$00|Ism~LS?u_}qwu`#ahib+Ag3dXA7~CQasm(5>jOvAyU=G2;E`$9
z*x&Czu#9Qc*k{$Y&~{YVF(040aPRcVzJA)(WrM9hV%7)Bz;Z0;Ys|npwmoG~V<U3~
z<B;ZACJOPpHFhJ+$~<rHFe-8(Q{~D<T@Xb^k~pzal_c>2Qxe1yFW@N^#fnmul+r_H
zI9Qy`H4c^C#?~+w-qqOQq5Azk*DrI(J>o@KmP3zHsfZ(r-ihsNgQD%NjvN}$(_Pc?
zO=L5nqjrFLevQSIo*%(-#<o}9)rG)z`|qKa6<$DO>-oDduJ=k~Z~w%B{4VrR&($Fg
zUk$~MqPkG?k-Lx3@#q$JI><*}2RV$oCoy;1nr_-5aW7J|+e*v!e9hKjt5IXI2WOgw
zqBb`hq9ARkjj}3=&C-S}sZDva*<2IkO1UD8v<;;9ENJ^9tr2TCr)tAyupFGZ0bTPI
zG`3u1G0~wFb9yanQ~icoV|p#}R4tE-;lo#Z;Z=_)+&>{4H!j|cTOZoE-(B3;!7p$p
zYFA)<#2*krf`ufR&dmal`~g5JgVzhZUI*X78<0*Wlc{7nl}cYr<292_r?WHpTy7?p
z%TxJiQ2Fa~)ZF!ap)fyRD6A|mFR$Dj4<eJv%;skoDQa<PfnHb|Klon|d;)Y9Y=do*
zph1ErNSX*f0|W>n{wG8zGr<7ra?DG5g1Irl6egJ98_1Ic&Q8+!zTRC*eD!t?i?X;R
zB9&-GFcCvChKWSFJ`5mZNDyO|Ac^{|p+gMG5sd4i-nMT4dp<oc3(Kk4bO=LJ48Q&X
D1*TOM

literal 0
HcmV?d00001

diff --git a/client/assets/img/themes/relaxed.jpg b/client/assets/img/themes/relaxed.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2bf4ce55f9c8fce13aa0da151e47d6a9456b7bff
GIT binary patch
literal 1407
zcma)6%Wl&^6dlKj6VjC0q?M|+62?Uc5b+}qmskx^Yo{Wr0##cH7A$b>X=9~+$aaWZ
zi5*|SC-56AK!}gvvFe5uf=@7GH;JpJ0Y)>@nd5uTy)(Xc_$538i><&o1fbo%4{{(G
z;ZHy*eXVx_Fpx&{IsoArUh4Y3BXOMNv8rw#KvuI&E>Im#V0jL#Hv>o2deEm2;E`c9
znBVU|FtnjJm}j*P-*IHvH6EY3aPRcVzINKv>N?YWM6U-@U^*uBRXQ+_El&y>Ol&S8
z9MK#@$02^N!E8iX>F1ptTDDzC*Vsx);{|~hMOLWRL{WG^mwBPg@o0)Ap(@oxsk}xH
z2ZOS?`k}O|Yz=dvU4t1OYA_hEg9>ZAN1RZv*CUT|xr8E0-ihU_LCNw~M-B?~G}mx^
z!?x(iQ9ZExeuF`ko*%(<#<o}9)rG)L=kKAW8C^hZ>-oDdsrO1_Z~w%B+%EL&zN<kL
zz8Z-gNp_*?+wQ(?ACGQvr)&GR*R>s5-V^D&9aS@|h`1LkIvuHPdA@3Cu&p#0<iQ$-
zF3J36OR0%lvQm)+p;g|fi*l>J*=jxH>(xq?A88d^>zmN>M_PTXUE`-}qh>H2lv#nU
z@e1l&u5Hrsp(SH_Ey`5Cp;n(-i`bf~<xnwP^lC4>>Jf$dCxYX~MVoQ!Lkso0iyAxp
z1@6S{3iOZY1Hy2ykj9DpECA^r0A#Xgy+G@A_#M0fL^_?$q=`(1xJIBglOu@SOd+42
z$>$4XAs%Gm`W!iTy-+O9&lig;%gf6vH^&3ZX0x+}*+r6ETw0(Omc|eM7lfYxl>^&g
z8^<V+qA;Ao!q3147?%7KVw9a=0C_p)B{jj^m|%(%O!y5Ha13R~DRf`&E+xKtJBLI$
zR1%g+wPTn{AfCWfif9f4@C0Jmn8k3cd28s9Kzsy~y2!Wf+y9<V&&xt`GBF*($P~e^
Fe*i}RRVe@f

literal 0
HcmV?d00001

diff --git a/client/assets/src/applets/settings.js b/client/assets/src/applets/settings.js
index ac461a1..f5956ef 100644
--- a/client/assets/src/applets/settings.js
+++ b/client/assets/src/applets/settings.js
@@ -18,34 +18,25 @@
 
 		loadSettings: function () {
 
-			var	settings = _kiwi.global.settings,
-				theme = settings.get('theme') || 'relaxed',
-				channel_style = settings.get('channel_list_style') || 'tabs',
-				scrollback = settings.get('scrollback') || '250';
-
-			$('[data-setting="theme"][data-value="' + theme + '"]', this.$el).addClass('active');
-
-			$('[data-setting="channel_list_style"][value="' + channel_style + '"]', this.$el).prop('checked', true);
-
-			if (typeof settings.get('show_joins_parts') === 'undefined' || settings.get('show_joins_parts')) {
-				$('[data-setting="show_joins_parts"]', this.$el).prop('checked', true);
-			} else {
-				$('[data-setting="show_joins_parts"]', this.$el).prop('checked', false);
-			}
-
-			if (typeof settings.get('show_timestamps') === 'undefined' || settings.get('show_timestamps')) {
-				$('[data-setting="show_timestamps"]', this.$el).prop('checked', true);
-			} else {
-				$('[data-setting="show_timestamps"]', this.$el).prop('checked', false);
-			}
-
-			if (typeof settings.get('mute_sounds') === 'undefined' || settings.get('mute_sounds')) {
-				$('[data-setting="mute_sounds"]', this.$el).prop('checked', true);
-			} else {
-				$('[data-setting="mute_sounds"]', this.$el).prop('checked', false);
-			}
-
-			$('[data-setting="scrollback"]', this.$el).val(scrollback);
+			var	that = this;
+
+			$.each(_kiwi.global.settings.attributes, function(key, value) {
+
+				switch ($('[data-setting="' + key + '"]', that.$el).prop('type')) {
+					case 'checkbox':
+						$('[data-setting="' + key + '"]', that.$el).prop('checked', value);
+						break;
+					case 'radio':
+						$('[data-setting="' + key + '"][value="' + value + '"]', that.$el).prop('checked', true);
+						break;
+					case 'text':
+						$('[data-setting="' + key + '"]', that.$el).val(value);
+						break;
+					default:
+						$('[data-setting="' + key + '"][data-value="' + value + '"]', that.$el).addClass('active');
+						break;
+				}
+			});
 		},
 
 		saveSettings: function (event) {
diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl
index c8f9012..ddab3fb 100644
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -178,19 +178,19 @@
                 <div class="input-group">
                     <div class="thumbnails">
                         <a class="thumbnail" data-setting="theme" data-value="relaxed" href="#">
-                            <img src="http://placehold.it/100x100/fff">
+                            <img src="<%base_path%>/assets/img/themes/relaxed.jpg">
                             <div class="caption"><u>Relaxed</u></div>
                         </a>
                         <a class="thumbnail" data-setting="theme" data-value="mini" href="#">
-                            <img src="http://placehold.it/100x100/fff">
+                            <img src="<%base_path%>/assets/img/themes/mini.jpg">
                             <div class="caption"><u>Mini</u></div>
                         </a>
                         <a class="thumbnail" data-setting="theme" data-value="cli" href="#">
-                            <img src="http://placehold.it/100x100/fff">
+                            <img src="<%base_path%>/assets/img/themes/cli.jpg">
                             <div class="caption"><u>CLI</u></div>
                         </a>
                         <a class="thumbnail" data-setting="theme" data-value="basic" href="#">
-                            <img src="http://placehold.it/100x100/fff">
+                            <img src="<%base_path%>/assets/img/themes/basic.jpg">
                             <div class="caption"><u>Basic</u></div>
                         </a>
                     </div>
@@ -233,7 +233,7 @@
                     <div class="checkbox">
                         <label>
                             <input data-setting="mute_sounds" type="checkbox">
-                            Mute sounds
+                            Mute sound notifications
                         </label>
                     </div>
                     <label>
-- 
2.25.1