From 2af4feeef77eabe18b29590e5d79334e5128478a Mon Sep 17 00:00:00 2001 From: jordan Date: Fri, 24 Feb 2012 21:05:50 -0500 Subject: [PATCH] completed live courses overlay with static data --- bc | 2 +- etherpad-lite | 2 +- public/assets/css/screen.css | 191 ++++++++++++++++-- public/assets/css/scss/partials/_modules.scss | 172 ++++++++++++++++ public/assets/css/scss/partials/_sprites.scss | 24 +++ public/assets/css/scss/screen.scss | 35 ++-- public/assets/img/finalsclub-sprite-icons.png | Bin 2669 -> 3174 bytes public/assets/js/init.js | 96 ++++++++- public/index.html | 146 ++++++++++++- public/javascripts/main.js | 2 - 10 files changed, 631 insertions(+), 39 deletions(-) diff --git a/bc b/bc index 1553834..3ee3af3 160000 --- a/bc +++ b/bc @@ -1 +1 @@ -Subproject commit 155383492f576d1e0875f67a5228d680345fdcb5 +Subproject commit 3ee3af3ffc3d0cca4453bf3a4c79e399a803fa51 diff --git a/etherpad-lite b/etherpad-lite index 1bb6216..9534f9f 160000 --- a/etherpad-lite +++ b/etherpad-lite @@ -1 +1 @@ -Subproject commit 1bb6216617bd659391702d7ac88ecb5ffaa3b8f4 +Subproject commit 9534f9f1a1bf7b232231b3889e6030218704751d diff --git a/public/assets/css/screen.css b/public/assets/css/screen.css index ec7346f..1ab6b33 100755 --- a/public/assets/css/screen.css +++ b/public/assets/css/screen.css @@ -181,7 +181,7 @@ body { .tiny-line-height { line-height: 0.5em; } -.tight-line-height, #g-nav-user ul, .subheader h1, .subheader h3 { +.tight-line-height, #g-nav-user > ul, .subheader h1, .subheader h3 { line-height: 1em; } /* a.`elements @@ -340,15 +340,21 @@ body { display: block; } #g-nav-user { - padding: 0.375em 0.75em 0.75em; + padding: 0 0 0.75em; text-align: right; } - #g-nav-user li { - display: inline; } - #g-nav-user li.first, #g-nav-user li.first a { + #g-nav-user > ul > li { + float: right; } + #g-nav-user > ul > li.first, #g-nav-user > ul > li.first a { border: 0; } - #g-nav-user a { - padding: 0 0.75em; - color: #ffcd58; } + #g-nav-user > ul > li > a { + display: block; + padding: 0.375em 0.75em; + color: #ffcd58; } + #g-nav-user > ul > li > a#live-courses-link { + padding-right: 1.5em; + color: #fff; } + #g-nav-user > ul > li > a#live-courses-link.s-active { + background-color: #333333; } #g-nav-main ul { float: right; @@ -366,17 +372,17 @@ body { color: #fff; } #g-nav-main a:hover { color: #ffcd58; } - #g-nav-main a .icon { + #g-nav-main a .icon, #g-nav-main a #live-courses-link .indicator, #live-courses-link #g-nav-main a .indicator { position: absolute; left: 0; } #g-nav-main #school_link { padding-left: 1.65em; } - #g-nav-main #school_link .icon { + #g-nav-main #school_link .icon, #g-nav-main #school_link #live-courses-link .indicator, #live-courses-link #g-nav-main #school_link .indicator { top: 50%; margin-top: -10px; } #g-nav-main #blog_link { padding-left: 1.8em; } - #g-nav-main #blog_link .icon { + #g-nav-main #blog_link .icon, #g-nav-main #blog_link #live-courses-link .indicator, #live-courses-link #g-nav-main #blog_link .indicator { top: 50%; margin-top: -9px; } #g-nav-main #archive_link { @@ -384,6 +390,7 @@ body { #g-masthead-hr { position: absolute; + z-index: 10; margin-top: 0; margin-bottom: 0; top: 100%; @@ -520,7 +527,8 @@ form .row { /* 3.`Extensible Classes ---------------------------------------------- */ -.group:after, .wrapper:after, #g-nav-main:after, .page:after, .breadcrumb:after, #schools li:after, .schools ul:after { +.group:after, .wrapper:after, #g-nav-main:after, .page:after, .breadcrumb:after, #schools li:after, .schools ul:after, #g-nav-user .live-course:after, +.live-course > a:after { content: "."; display: block; height: 0; @@ -566,7 +574,7 @@ form .row { ---------------------------------------------------------------- */ /* A1.`Setup ---------------------------------------------- */ -.icon, +.icon, #live-courses-link .indicator, .sprite { text-indent: -9999px; line-height: 0; @@ -577,35 +585,55 @@ form .row { .sprite { background-image: url("../img/finalsclub-sprite-images.png"); } -.icon { +.icon, #live-courses-link .indicator { background-image: url("../img/finalsclub-sprite-icons.png"); } /* A2.`Sprites ---------------------------------------------- */ -.paperclip, #g-nav-main #school_link .icon, .paperclip-active, #g-nav-main #school_link:hover .icon { +.paperclip, #g-nav-main #school_link .icon, #g-nav-main #school_link #live-courses-link .indicator, #live-courses-link #g-nav-main #school_link .indicator, .paperclip-active, #g-nav-main #school_link:hover .icon, #g-nav-main #school_link:hover #live-courses-link .indicator, #live-courses-link #g-nav-main #school_link:hover .indicator { background-position: 0 0; width: 22px; height: 20px; } -.paperclip-active, #g-nav-main #school_link:hover .icon { +.paperclip-active, #g-nav-main #school_link:hover .icon, #g-nav-main #school_link:hover #live-courses-link .indicator, #live-courses-link #g-nav-main #school_link:hover .indicator { background-position: -24px 0; } -.align-lines, #g-nav-main #blog_link .icon { +.align-lines, #g-nav-main #blog_link .icon, #g-nav-main #blog_link #live-courses-link .indicator, #live-courses-link #g-nav-main #blog_link .indicator { background-position: 0 -25px; width: 24px; height: 17px; } -.align-lines-active, #g-nav-main #blog_link:hover .icon { +.align-lines-active, #g-nav-main #blog_link:hover .icon, #g-nav-main #blog_link:hover #live-courses-link .indicator, #live-courses-link #g-nav-main #blog_link:hover .indicator { background-position: -27px -25px; } -.book, #g-nav-main #archive_link .icon, .book-active, #g-nav-main #archive_link:hover .icon { +.book, #g-nav-main #archive_link .icon, #g-nav-main #archive_link #live-courses-link .indicator, #live-courses-link #g-nav-main #archive_link .indicator, .book-active, #g-nav-main #archive_link:hover .icon, #g-nav-main #archive_link:hover #live-courses-link .indicator, #live-courses-link #g-nav-main #archive_link:hover .indicator { background-position: 0 -46px; width: 19px; height: 26px; } -.book-active, #g-nav-main #archive_link:hover .icon { +.book-active, #g-nav-main #archive_link:hover .icon, #g-nav-main #archive_link:hover #live-courses-link .indicator, #live-courses-link #g-nav-main #archive_link:hover .indicator { background-position: -24px -46px; } +.larrow-circle { + background-position: 0px -78px; + width: 24px; + height: 24px; } + +.rarrow-circle { + background-position: -26px -78px; + width: 24px; + height: 24px; } + +.dtriangle-small-white, #live-courses-link.s-active .indicator { + background-position: -2px -129px; + width: 8px; + height: 6px; } + +.rtriangle-small-white, #live-courses-link .indicator { + background-position: -12px -129px; + width: 6px; + height: 8px; } + .logo-brown { display: block; background: url(../img/sprite-schools.png) no-repeat -117px -78px; @@ -804,6 +832,16 @@ form .row { /* 5.`Notes ---------------------------------------------- */ +/* ---------------------------------------------------------------- + +[Table of contents] - modules. + + 0.General + 1.Overlays + +---------------------------------------------------------------- */ +/* 0.`General +---------------------------------------------- */ .link-bar { margin-left: -0.375em; } .link-bar li { @@ -832,5 +870,118 @@ form .row { .schools em { margin: 0 auto; } +/* 1.`Overlays +---------------------------------------------- */ +.live-course-slide { + width: 450px; + float: left; } + +#live-courses { + position: relative; + z-index: 20; } + +#live-courses-link { + display: block; + position: relative; + z-index: 50; } + #live-courses-link.s-active .indicator { + margin-top: -2px; } + #live-courses-link .indicator { + position: absolute; + right: 5px; + top: 50%; + margin-top: -2px; } + +#live-courses-overlay { + position: absolute; + right: 0; + top: 100%; + padding: 25px 75px 10px; + background-color: #323232; + -moz-box-shadow: 0 1px 4px black; + -webkit-box-shadow: 0 1px 4px black; + box-shadow: 0 1px 4px black; } + +#g-nav-user .live-course, +.live-course > a { + position: relative; + z-index: 30; + display: block; } + +.live-course > a p { + color: #aaa; + -webkit-transition: color 0.25s ease-in-out; + -moz-transition: color 0.25s ease-in-out; + -o-transition: color 0.25s ease-in-out; + -ms-transition: color 0.25s ease-in-out; + transition: color 0.25s ease-in-out; } +.live-course > a:hover p { + color: #fff; } + +.live-course-info { + width: 30%; + margin-right: 3%; + float: left; + line-height: 1.28571428571429em; + /* 18 / 14 */ } + +.live-course-description { + width: 66.667%; + float: left; } + .live-course-description p { + text-align: left; + color: #fff; } + +.live-feed-hours, +.live-feed-days { + color: #666; } + +#live-feed-modal-pag-controls { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; } + #live-feed-modal-pag-controls .pag { + opacity: 0.4; } + #live-feed-modal-pag-controls .pag:hover { + opacity: 0.7; } + #live-feed-modal-pag-controls .pag.s-disabled { + opacity: 0.05; } + #live-feed-modal-pag-controls .pag-left, + #live-feed-modal-pag-controls .pag-right { + position: absolute; + top: 50%; + margin-top: -12px; } + #live-feed-modal-pag-controls .pag-left { + left: 20px; } + #live-feed-modal-pag-controls .pag-right { + right: 20px; } + +.modal-footer-controls { + position: absolute; + z-index: 10; + left: 0; + right: 0; + bottom: 0; + padding: 6px 20px; + background-color: #2a2a2a; } + .modal-footer-controls li { + float: left; } + +.modal-carousel-wrapper { + position: relative; + overflow: hidden; + width: 100%; + height: 100%; + width: 450px; + height: 240px; } + +.modal-carousel { + width: 10000px; + height: 100%; } + .modal-carousel li { + width: 450px; } + /* media queries ============================================== */ diff --git a/public/assets/css/scss/partials/_modules.scss b/public/assets/css/scss/partials/_modules.scss index 90d876b..5b778d0 100644 --- a/public/assets/css/scss/partials/_modules.scss +++ b/public/assets/css/scss/partials/_modules.scss @@ -1,3 +1,16 @@ +/* ---------------------------------------------------------------- + +[Table of contents] - modules. + + 0.General + 1.Overlays + +---------------------------------------------------------------- */ + + +/* 0.`General +---------------------------------------------- */ + .link-bar { margin-left: $base/-4; @@ -44,3 +57,162 @@ margin: 0 auto; } } + + +/* 1.`Overlays +---------------------------------------------- */ + +.live-course-slide { + width: 450px; + float: left; + +} + +#live-courses { + position: relative; + z-index: 20; +} + +#live-courses-link { + display: block; + position: relative; + z-index: 50; + + &.s-active { + + .indicator { + margin-top: -2px; + @extend .dtriangle-small-white; + } + } + + .indicator { + position: absolute; + right: 5px; + top: 50%; + margin-top: -2px; + @extend .icon; + @extend .rtriangle-small-white; + } +} + +#live-courses-overlay { + position: absolute; + right: 0; + top: 100%; + padding: 25px 75px 10px; + background-color: #323232; + @include box-shadow(0, 1px, 4px, #000); +} + +#g-nav-user .live-course, +.live-course > a { + position: relative; + z-index: 30; + display: block; + @extend .group; +} + +.live-course > a { + + p { + color: #aaa; + @include transition( color ); + } + + &:hover { + + p { + color: #fff; + } + } +} + +.live-course-info { + width: 30%; + margin-right: 3%; + float: left; + line-height: 1.28571428571429em; /* 18 / 14 */ +} + +.live-course-description { + width: 100 - (100/3)*1%; + float: left; + + p { + text-align: left; + color: #fff; + } +} + +.live-feed-hours, +.live-feed-days { + color: #666; +} + +#live-feed-modal-pag-controls { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + + .pag { + opacity: 0.4; + + &:hover { + opacity: 0.7; + } + + &.s-disabled { + opacity: 0.05; + } + } + + .pag-left, + .pag-right { + position: absolute; + top: 50%; + margin-top: -12px; + } + + .pag-left { + left: 20px; + } + + .pag-right { + right: 20px; + } +} + +.modal-footer-controls { + position: absolute; + z-index: 10; + left: 0; + right: 0; + bottom: 0; + padding: 6px 20px; + background-color: #2a2a2a; + + li { + float: left; + } +} + +.modal-carousel-wrapper { + position: relative; + overflow: hidden; + width: 100%; + height: 100%; + width: 450px; + height: 240px; +} + +.modal-carousel { + width: 10000px; + height: 100%; + + li { + width: 450px; + } +} diff --git a/public/assets/css/scss/partials/_sprites.scss b/public/assets/css/scss/partials/_sprites.scss index 4515fd1..967915d 100644 --- a/public/assets/css/scss/partials/_sprites.scss +++ b/public/assets/css/scss/partials/_sprites.scss @@ -62,6 +62,30 @@ background-position: -24px -46px; } +.larrow-circle { + background-position: -0px -78px; + width: 24px; + height: 24px; +} + +.rarrow-circle { + background-position: -26px -78px; + width: 24px; + height: 24px; +} + +.dtriangle-small-white { + background-position: -2px -129px; + width: 8px; + height: 6px; +} + +.rtriangle-small-white { + background-position: -12px -129px; + width: 6px; + height: 8px; +} + .logo-brown { display: block; background: url(../img/sprite-schools.png) no-repeat -117px -78px; diff --git a/public/assets/css/scss/screen.scss b/public/assets/css/scss/screen.scss index c0d32ce..6f9ee23 100755 --- a/public/assets/css/scss/screen.scss +++ b/public/assets/css/scss/screen.scss @@ -169,25 +169,35 @@ body { #g-nav-user { @extend .grid-8; - padding: $base/4 $base/2 $base/2; + padding: 0 0 $base/2; text-align: right; @extend .small; - ul { + > ul { @extend .tight-line-height; - } - li { - display: inline; + > li { + float: right; - &.first, &.first a { - border: 0; - } - } + &.first, &.first a { + border: 0; + } - a { - padding: 0 $base/2; - color: $gold; + > a { + display: block; + padding: $base/4 $base/2; + color: $gold; + + &#live-courses-link { + padding-right: $base; + color: #fff; + + &.s-active { + background-color: #333333; + } + } + } + } } } @@ -258,6 +268,7 @@ body { #g-masthead-hr { position: absolute; + z-index: 10; margin-top: 0; margin-bottom: 0; @extend .grid-8; diff --git a/public/assets/img/finalsclub-sprite-icons.png b/public/assets/img/finalsclub-sprite-icons.png index 61395a6b2d8ae5dfcc8615f20cb6ca91afc22672..cb64f13875a136fca826c0510df3a2831784fb7a 100644 GIT binary patch delta 2548 zcmbW3dpr{g8^_7zY!Rjr$~_iN*oJKqHrvE7V>zkS5XxolBxyU?%q?Vc3kyd?xm2#X zoaWj&%akP5Q6u+DE(wv2^M2kx-}n9F{pk*1Gebh5NCXs*#v9{tHc-3`0*TVn*i-J+_)qMf1dT97nV2FFW>6>& ziZ;XHa7bgQsR`WJ7>_~kv7F=klr{dXga0=j=bI>$Q?}2DVhr1(p$HRW1kCuKX3!|O znGFgBMVaD|SW^U6OCvnO#mCp&`~Mh(V4k?67EZ^xFlBRMKgjQt^}H zghWqS@#mMDW_l#^ZR~I*qhf!A4L`KNJofj)H|Xd9M8K18c>cd2_4Sg_Yu#4~&j{#%?|eK0>kN9)d11 zVtLxk5~lvXgA3Yi*3qfU>|=d_26@yf=Us{esS6M+*D6of-N9FC6ryJ^n^_?cVFfe3 zbcLYMPX%@PhzZa0?3lTL+=GUilvB;DJic`8om;I5_6EcvW1bDzI4CK1 zL6eWZG3KzD9-=Dj$cwk%D%Vf7V%TriCrvwxE(98SDte|>^MiN?nBf3*xv%muSa5b4 zwMxzI+#H%0p(x9))iik{#Pa|Q!qIrYl8VpJBGE8Om60~q_KbNvtAB6L${ zIpE^Rb;wd>tvtS@Ohz-XM~sh0$>bLGUkD6NJj(K*-)nSf@!nA($^Pysab$osM7o^+ zlu488&Yu!utJ?pzZ)P>8sI!qRPr~dkc0n$e$otq1L6QA=Xd`4h&t1I}Na0euz zfGvtgP8%cd>%mo23slGA&Qe9#Cp7wHmPwy-=j!h2bZwPCoZz=M6BmCHUM<*WDg8Js zlY8+hRJd+?i_`tDATl|x_$?(N0lWbq;Ls@p&-tyj^U#{Cl?mQ+hG1hcXI}OF$ zCFWyqKAd!M0@ugpV?E_rc3@QmiOCL)N!GeTY0S0*>ynP>Ok4rGcmCGzV^Mbb&{$Dp zxdRtgnpPR{(}(z#tK50k+T7LlQ>z^o(JACVs8idk$CAgP!oVADElV^-#z6Y!yw>c! zy3#uyyP2+@cG%Fx>-J}C@{SfditMIkG)LOD2$edz?$RW0Z)u@_T$gLBA#tZk2TF`AJFW0yY}uih9@G}p~2%M zx+h0c#=Dwa2b(q*x*)t!=no2VI#ER~kq4J9oS#cTH`XqCBr*2ZnHJ#s4yq23=B%=1 zI{y6Ftb!RGm41AoEaWTA{V3N+rP#x)J?+kP(*rz)TIgfnt!`HKCN6UpxN4fT-k@}) z=0>5!`goL_%k)TcL83}kdk6prHW-GofvJG<9hV0LmtV|D z3u#1~)i~a1#;HeR`M<}(dV94xX%Dp0ey_O>C1v;3D)iKk{p6P`U>R9cRk$zb$b!#> zZ}@>ZbhBQF<@WWvAx;5HUH#nN?$^Rx{loMUE1M^ZqnDxn;fk3#sGY{iWx_49&c^aY zPw{D}x5PI^E^#g=OW;C(H{M~IK6so!D#QeLE5Q^Pa6ik)HuG}JhOA80PU2=uUuE(c zL+OO7{_2Mg~_PC2Z9P{V*?9e5KqzI8qvWLZ{uEfyao&75+ z{WYVpRkH0qa7s3MW!zM4wol{86VLqf(ZDXLhQ*nH(|IrYzJv0ttc=8I)!84ED{(EQ z`(H~;0M#FL?B_n{o68NzWi&xc(nfK}PICR$L>r-&wHCuic4$$G#;-m7y5piVPJD=V zW;I#AM-;dc&pSm$Y+l^)ze6FZj`1bqKn$O~`}0Yy>cZv@T^UPId|yovqF%0d>77rY zGjn1i0-j#MI(U!UZV11`hTT@ParULRshdpw+0+Y&hpltmp7-2)#{b@Y@dRytdWa3% zaLwBeO}uB9*)SyxZlAhfa3QVrxqv7~%xhS4jU&5rtQ`)x@gG?F_*?iP`-uk441dbL zvVsxf?aHUXp1=%edYzzwOCuf&s{4ifL%JJ$zf%zTcKq8l+_1Msuc}Jx{NtWsY`*R- z16^9`a9H0kvr$bs8Im=u`Vm#V^78}IOFGWl-pPhiy@z?7Z7+4hY7q5#VZ$m61z*%y9?l8d5HAN;6o%_O#O&`RiF60FqWx4FKB z7$p)u8}yG&|0^gbkN@CWd`{3Mwv4Hsy*1wx^ZD1m631%7ByMN(daZSr>Be^2{oBhy z0jq$e%u;c+SKkMtjeRegIGp&%g_4k j3CS1hBj11Jiin9Yun~XJylnOMzB>^+oD;SN;}QQi`cS4Y delta 2017 zcmZ`)dpy$%AO3A)l}wU|B=-$(GBJl1nT_1STuYkVJ4|j12b)`I6ftDB7^3SG;#JA! zq?FupTQ09TysV^#IdU1!-p}X!`JVs2e>~6g`F@|z^Lf5=hrTP`R+e$v4Fv$8zqhZw zKobGds&|BgXcHhU+OMDp+Dq^;S~B>shMk?UDbfyyGr^i6kw_d8V{T$$heDa1K$@8v zn_w_BE3le|xs9pWFSbaO1cds(pgFMdg};?-|4B(pBQ72v5^5QIC5S`}iHdi?p3+Jr zMjHiR4z~Q8i~T1qEf#{IX!S1;0RZ}k1J=efacsda;)a)(;$(vAb=f!SyMyfTD}fpB zT^w**@73K(YD1E;&U6mk{MFG>Ap_CS@!(%B5x@C9B*MO4qPwriJ9(7OoDOd5QiUB% zuDZ03v{AD8Y9dZ}N|+o~Rt`Iw_j6%=WNY?oIastYNNavD6!C*51RnVN|o;ljln*Jwn2>`QLcywOah~9 zZKkE-Mq&npqVaAlU4`rGTEXTXe>nWw}r?n0xaN5DJ~^mEVlEpe5b{f)55?~ zI8j7nK}MlyvxRW@WWwN7e13kelWZl+8~VKCcNlk*t7gUT7K}sYDx=AU|6AaD43^?A z?F`ul=?(BhsIjK7E@zJVA)L=Tq(#LSlQ~_;kGtGBY42viK@E$?p4fB3$zPR&=k#gfSO*@97&l zb&qR3(L3~(Yjt>53r;3lqF$5@18sU*3FoM zI%05%RyyDJY5xvcF_A_HlwUMngd58xGPHlmvPn*rwOM{UD7r8IU;loJ+)UwpYH}s` zr}3+_CGG`iUAG5+VAdP%t8h(ngK}!udeb>J9wju`!c3t8fLm>y@natxq7U{n>Izb% z{5vZM3TfYpME6r{ZT$ABe9*oe59fux9m$?<9(v|=T)+#h5YT6Np}CLh58|2bYAbA; zBN@k(i*qg0*ac3do)iZ?-0H{45>$2{!$2H1@?3wd^)T1UYO#aR`(D?NjUe}$?OG2SCD~3xa;cjG1SAKFD{H$ z3*?IDTG1&~&tAezQW6sz!)frTb}0}0R`hy5#i52RW4MPRBglUsEvEF4`+G4jskLWLk9LlN#Jc4a;kg zxZ<^@ugfXwlB^D#$DXqLxrrUcXX323@;sW?9HK$i;~k%139dYSi5~^7717&SKfWIH zio_V_QV3TWeL`mCg8wtt=!_LDh34eoX~sc~r)=yJbvheO7Lkn>(;CcI@)5}|P=wJy zjMx4ttly@6PyTv417===)@!_;T0~>}foi;Eqo@Nw3#!+IJL@9JF2EK(Zyq z+j=2k%z0}2v*sYmr5lng*EL?H(DO-eo>RmHG-06X5Bti%NLBu1WQdT6yEmkK>r8#w zMcFmctKP@}AcBrxvS%Y+elbZs)0WZJRw(MNsc&R)T8uQ}$ky&27MNq@eL8YV{Wm<1 z?qCRn;y|r(8RuQ+(bKEoy=k#zqIZpop|yLU^CQg~R3Nx+kpFc-9PO7XigPMV*T`ZwME#?nYkyo z&RwzK1=>)g2k-cisM%(k-%e7Sso+$cPO6S0l 0) { + slidePos--; + carouselBack(); + $next.removeClass('s-disabled'); + if (slidePos === 0) { + $(this).addClass('s-disabled'); + } + else { + $(this).removeClass('s-disabled'); + } + } + + }); + + $next.click(function(e) { + e.preventDefault(); + + if (slidePos < slides - 1) { + slidePos++; + carouselForward(); + $prev.removeClass('s-disabled'); + if (slidePos == slides - 1) { + $(this).addClass('s-disabled'); + } + else { + $(this).removeClass('s-disabled'); + } + } + }); + + + function carouselForward() { + console.log($carousel); + $carousel.animate( + { marginLeft: '-=' + carouselWidth }, + { easing: 'linear', duration: 'fast' } + ); + } + + function carouselBack() { + $carousel.animate( + { marginLeft: '+=' + carouselWidth }, + { easing: 'linear', duration: 'fast' } + ); + } }); diff --git a/public/index.html b/public/index.html index d950c62..3b354df 100644 --- a/public/index.html +++ b/public/index.html @@ -52,9 +52,151 @@ diff --git a/public/javascripts/main.js b/public/javascripts/main.js index efc41bd..26ea950 100644 --- a/public/javascripts/main.js +++ b/public/javascripts/main.js @@ -76,7 +76,6 @@ function tmpl_render() { }; function render(pageId, response) { - console.log(user); if (user.name) { $('.username').text(user.name).attr('href', '/profile'); $("#login_status").show(); @@ -115,7 +114,6 @@ function message(type, msg) { function checkUser(cb) { $.get('/checkuser', function(data) { - console.log(data); if (data.user) { user = data.user; } else { -- 2.25.1