From 304838e4206fe2a79ed6e36f561b60aedec6558e Mon Sep 17 00:00:00 2001 From: TanveerAhmed Date: Mon, 20 Nov 2023 17:41:16 +0500 Subject: [PATCH 01/17] style footer and header --- .DS_Store | Bin 0 -> 8196 bytes tutorindigo/.DS_Store | Bin 0 -> 6148 bytes tutorindigo/plugin.py | 9 +- tutorindigo/templates/.DS_Store | Bin 0 -> 6148 bytes tutorindigo/templates/indigo/.DS_Store | Bin 0 -> 6148 bytes tutorindigo/templates/indigo/lms/.DS_Store | Bin 0 -> 6148 bytes .../templates/indigo/lms/static/.DS_Store | Bin 0 -> 6148 bytes .../indigo/lms/static/images/logo.png | Bin 1681 -> 2244 bytes .../indigo/lms/static/images/profile.svg | 27 ++ .../indigo/lms/static/sass/.DS_Store | Bin 0 -> 6148 bytes .../lms/static/sass/courseware/_discover.scss | 17 + .../lms/static/sass/dashbord/_dashbord.scss | 15 + .../indigo/lms/static/sass/extra/_footer.scss | 99 +++++ .../indigo/lms/static/sass/extra/_header.scss | 124 ++++++ .../indigo/lms/static/sass/partials/.DS_Store | Bin 0 -> 6148 bytes .../lms/static/sass/partials/lms/.DS_Store | Bin 0 -> 6148 bytes .../sass/partials/lms/theme/_extras.scss | 19 + .../sass/partials/lms/theme/_variables.scss | 9 +- .../templates/indigo/lms/static/templates | 1 - .../templates/indigo/lms/templates/.DS_Store | Bin 0 -> 6148 bytes .../indigo/lms/templates/course.html | 49 +++ .../lms/templates/courseware/courses.html | 80 ++++ .../indigo/lms/templates/dashboard.html | 403 ++++++++++++++++++ .../indigo/lms/templates/footer.html | 92 ++-- .../indigo/lms/templates/header/brand.html | 37 ++ .../indigo/lms/templates/header/header.html | 110 +++++ .../header/navbar-authenticated.html | 59 +++ .../templates/header/navbar-logo-header.html | 61 +++ .../header/navbar-not-authenticated.html | 73 ++++ .../lms/templates/header/user_dropdown.html | 48 +++ .../lms/templates/static_templates/blog.html | 16 + .../templates/static_templates/donate.html | 16 + .../lms/templates/static_templates/help.html | 16 + .../templates/static_templates/privacy.html | 17 + 34 files changed, 1336 insertions(+), 61 deletions(-) create mode 100644 .DS_Store create mode 100644 tutorindigo/.DS_Store create mode 100644 tutorindigo/templates/.DS_Store create mode 100644 tutorindigo/templates/indigo/.DS_Store create mode 100644 tutorindigo/templates/indigo/lms/.DS_Store create mode 100644 tutorindigo/templates/indigo/lms/static/.DS_Store create mode 100644 tutorindigo/templates/indigo/lms/static/images/profile.svg create mode 100644 tutorindigo/templates/indigo/lms/static/sass/.DS_Store create mode 100644 tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss create mode 100644 tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss create mode 100644 tutorindigo/templates/indigo/lms/static/sass/extra/_footer.scss create mode 100644 tutorindigo/templates/indigo/lms/static/sass/extra/_header.scss create mode 100644 tutorindigo/templates/indigo/lms/static/sass/partials/.DS_Store create mode 100644 tutorindigo/templates/indigo/lms/static/sass/partials/lms/.DS_Store delete mode 120000 tutorindigo/templates/indigo/lms/static/templates create mode 100644 tutorindigo/templates/indigo/lms/templates/.DS_Store create mode 100644 tutorindigo/templates/indigo/lms/templates/course.html create mode 100644 tutorindigo/templates/indigo/lms/templates/courseware/courses.html create mode 100644 tutorindigo/templates/indigo/lms/templates/dashboard.html create mode 100644 tutorindigo/templates/indigo/lms/templates/header/brand.html create mode 100644 tutorindigo/templates/indigo/lms/templates/header/header.html create mode 100644 tutorindigo/templates/indigo/lms/templates/header/navbar-authenticated.html create mode 100644 tutorindigo/templates/indigo/lms/templates/header/navbar-logo-header.html create mode 100644 tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html create mode 100644 tutorindigo/templates/indigo/lms/templates/header/user_dropdown.html create mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/blog.html create mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/donate.html create mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/help.html create mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/privacy.html diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..e0736f608a5522a56c5c6c83c0747ab8b320053f GIT binary patch literal 8196 zcmeHMU60a06uq;HZV}z^;3mA7H1QP?#q}e;uq>z~t|r@!KBz&y7OLG2fg&10(r5h- z{smwCCH@zm^xT=*4HS9MMAztCGWSfU_spH1Lfc!2NL0q1YeYFBa?lvF8Mq%9@8`B; zYi48m1*`&A0jq#j;BQa>_iQ$2#eHAzwcaXV75Fa|;Om2n z##lBOYgCsGI8_1wQy5l;KI#C)aSfIY#u^nBbL#3r7^*NOhR}5EcR3tbHW+KvbP}3Q z!ekbvLJ=xEc&-X3QPya^Rlq8+tN_>U8ER9XniMY7@11%e+pR#h5WzpH9kjwXW#|!| zr(Jr0(MNQjYV?pE0}FISN#3UfFN4@RxHT|6_yR@rmZHUM;?fdpPvxr9J#aia0MDl| z!TOM3ZPI|=p$+j);uYRaw2_PRNvtzSaK9$F=V%|9cBo2wYL!D8C0DuDOK>uXX(L+~ zpAh{%GDS36%%qh3IH#n8$S&f>SZRS*oQP)y=i|3jEFZ;?8mt0!;Ct9EV4fa6SJdbs z$;Fuj>+_2AG z9rv59Cw_O*$X?u)Vbt`)?obi@P8T81pZZ}(PAYO7c1DWp=^akmNjI{&>2$kvEAN(W zZ_o1X^v?BS-n~(}Ih&=Ot;<*M?l)csN1=R=qk{=^i=Yd7`^59n|AcmLykQu~kk2vC zn3+?3PVQyU9bNt|x%*eI2i}n(YjpJgCiUOy~aiA*4fhT_$qVFP62WMj7(xLYK%&J zX)sER<3#hgpOiNHIR8B(Srk*N*Vkm4XGJ*}oQc*}`^wdh*YUdEyXaUgqB1V$#VDS= z;kTDc<;gl9C$F+}G49>mSF(&Vna(sJo1_SN`#O^owHT?noD`ZHnF`PM{Bdu4x!fJ@ z^@HJ~-BmwWKE6Nb2M>l1S1aGUb?5Gr7vm54iBz943z)!ut?h=zHLxzeo_|e?kI_u# zO7d4(GuI4p-Hf0KhhiwIR>H3d{*C zh88P>sDTMX1sbZbR}5k3C=YC0Xt6SA=p^jrL)e~$y`c!*JK7I)IEm1pOPvBvfw}@) z=C#M?|Fd7;|LY|8<`i%W{8tKy_Ca(o!j$aU+L#=lwE_G+oQ>lugPMZG9>+SvNAWgX a8|nhi07HwFL6pGUkARlJB~F3As=#-*KcENz literal 0 HcmV?d00001 diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py index ec754aab6..7c324fa1a 100644 --- a/tutorindigo/plugin.py +++ b/tutorindigo/plugin.py @@ -25,8 +25,13 @@ # To remove all links, run: # tutor config save --set INDIGO_FOOTER_NAV_LINKS=[] --set INDIGO_FOOTER_LEGAL_LINKS=[] "FOOTER_NAV_LINKS": [ - {"title": "About", "url": "/about"}, - {"title": "Contact", "url": "/contact"}, + {"title": "About Us", "url": "/about"}, + {"title": "Blog", "url": "/blog"}, + {"title": "Donate", "url": "/donate"}, + {"title": "Terms of Sevice", "url": "/tos"}, + {"title": "Privacy Policy", "url": "/privacy"}, + {"title": "Help", "url": "/help"}, + {"title": "Contact Us", "url": "/contact"}, ], "FOOTER_LEGAL_LINKS": [ {"title": "Terms of service", "url": "/tos"}, diff --git a/tutorindigo/templates/.DS_Store b/tutorindigo/templates/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9204272a209e99e80be1ce0135d9ed36246e2dc6 GIT binary patch literal 6148 zcmeHK%}T>S5Z-NTn^J@v6nb3nTC`g04_;!d2d_r-pi&!CYA|L?o0>x@`apVHtb{=W89qt+l<+aF$)y2PzCdi;5_Pr6pW_`$kjatOrAyZ z-jAfe5KWH%$N=tLnT0H70oeTh;YV={y7{3*y?!p%Psc;E*KhtX3dc#a`OXW)(n`5v zRjitI>pjTSOM1yJ$LJ}RFY2ushwoF# zs=+zD!XUS%XKxfoG9G|`o->anBnF59VqjSqFz1_9Tb2dUI*0*c;MW+y^Fe?jItDY1 z>gWKYS^&TjxRt;de;YAJ7<3F~8es;6>r_CU%1w*GbvpQkiE|8Q8g)A3rupFJ$=q}( zTsiI-aO;ME#Es6h%u8%vkaVh@C*XMGs2K8dfR zGrNlk0gswsW|G-&cXnpm{o3s8Fvhq$>h3UBW{g>&h&daY1%mUabCNTb0wBjVWXBJs z4g$umi7JK<=JTU*lyFUnnIH}b>crIU9 zSuI*ct7P4Ik23X=b~1|H_V5Nrmr{oQwBPoxf?nDxub;{&X$Mhnr~-m+4_t1qgQzQ0 zSB|1?tYSSqVcC}5Dp$tiM*W~F>W7U_gX3x*wFbZY#0G6ru)QgZ9AO?tmWn{pdWmah!U!LBX7$63Il>s~-1Sq0o zFw>}x4ro*f0EpK}CD2!we?Wl-K*wOF5iB5FhXU$QZb}SpY6q^vVcs$RnMNJXxOy_I zW1h@Sg~Cng!G&^X+|fuaF+dE=GLYB9GUorYpX>kGAQ}+^#K6B|fESux(}gXW+&Z^8 v%(Vja9ux)rGL7FM&{3%vd@&VQK$U=9UjzL(ffvM&Yz(d@NX0jdDtpc9s6uo+`CPCjB2CQ?Qe{Ei5&k79Kl z#3~rcwgIbvRp7TNKzp|gDP-WI7xyn63VZ0wZ)`mELT=DcJ7%xH1f4iavwHniOiY%h z%G1uYGwWP>x2o@De%4Eye)pW7PLzs+kG>zAMq$5Io!?hU=0{1`WkS>rG3DYcO4_R5 zRK28~GS|}sPQ|ITs*8icMq{fc8`~ShnjGw`)oXISu{j)8oQ0*8-Q(6>e4nUCo;3(O zpV;OMe!vrU3Tt}sx=E~(8;ldDf~tgY4;_eEp%BtfCmbpCjQ&}nF^qqr)0mZgQ46K8 z_Gc6@d%~IhGc&dmwF+1Teo6s4A0#@VYcSWyM+Y{11wbrem<{_>6p14Zx(0KNID#fL z6;V@#xnc-S$G9|kuEAWRrh_n-4`IG6%ne2G*YW+5(?PfzZEF><3KSKX)Q?rF|A*h- z|BEF1WEHRq{3``S>A*W^;*v~l9a$XJT8VyzPDXjTMy6n6$}xAS6fdH);h3ZjqH8eM Sh!HgVBfv7)#wzfm3cLdt0H$96 literal 0 HcmV?d00001 diff --git a/tutorindigo/templates/indigo/lms/static/.DS_Store b/tutorindigo/templates/indigo/lms/static/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..edf114388acef0f68375d58e7ae3e6c3f383e63a GIT binary patch literal 6148 zcmeHKPfx-y6o175Lt?@~6D}rAyb?uF6XRtf9=tlE2Q|0};^JHh8*(5dJL`w>>L>B* z=zDE7BI;3z=}TUJ?fbL!{j#WdUP^&A9n3m$Z#GZp*zQ>;IXdwO4Z z@_S(rC)MgR%gkBXT;9&xMf=>n7DG4jl0n??`lmEH5+d~9`ksFrbcU_c;+}{SFNivQ znGm!)7;<(JL~Su_h(XkjWv;6ncEK*RO6Ae0UfZnj`bKqJ;iK(ZwZb>*TjO!TURqh( zIc(j8w~@G)6#~PZOv-}BH+aC#ME!SeKMF2`6ZXK5y97%&X{1p~A{a8yD^W2#VY9oWb#0HTFvDcGkU2g>0Z9gV3% z^q?@6il|bVzG5(yj&`o&9F3_$l@3f_KA3(p(>D|*-;U4cG8~wr(6ojD!@wj1b81+k z^MC*Q`~PH;85sr)1OJKvW;NYr1546p>r`=c)^gMfR1%6y70MKB^l>aZbQG6SrJ#>f X2hq`(Dntv4`4Nybn8q;hs|>sX$8xI^ literal 0 HcmV?d00001 diff --git a/tutorindigo/templates/indigo/lms/static/images/logo.png b/tutorindigo/templates/indigo/lms/static/images/logo.png index dc473a8375cfe5b8821350e11f043204393a3b42..f6e37b5d430941b32f3ccd0c167a59a46ef52f53 100644 GIT binary patch literal 2244 zcmXw4dpy(YA2&sED3{3fyRZ8;xB0OxruuHfD7Fy^#gyA2HrH~>X%dc9lS^(Za|k6- z<|LQs;!>0qVT%Y!$&@2HshqD)zt`(|KF|B}`Mf{3=lSEwV9==pzQc{X8&JG^% zxd?AFxplA%<^`XF4@9g7m5dNQG&=z+8`;i2u~Jg%Mr#}4;$ip!CX_Q=Jsn{u1d2#V zF&Q}sfn#K(2wo7_2Z2LmKuiIKDd3ug0gkO%{`2Y#!59LEA#j9*6j1;%EFo}BQglTm zUq4| zAsATLkwLgI_#OsfCWyhoDrjO$f{Oy;9muC3b{pI z>=?M2ZSd?QK!p5}86Fb`a7EA*x3*vaPoX=cPdCeg-|0-82W^iOqs?7uwN?o%$zt>= zF~{a1h#t_#n#YbY_#ni@DlxK30w5NrZGN@(L|^UL%jm#6eZqNm0Av0;0>LM7*=$aL z9+oX>=O8$o>$N3)S#5|Ch{+&9!Yp@Xh|fh>U5ZAOAh=A15|+tsXJ$}#W`kR z+6;9;b#9$}cw|^aikFMKpI^iCy)~@k1Gm2Szl=B%GM}();ptFF@0E;5zAsr3iOEW( z3c+<3Yz_aiV`M)L^W8MSs|a3LArzgU%3EBnP)z5E0_i=v?000RzhB>g%w@&hlPkol zt$9yxa6C+Pmj+@ouF~HxcQ4U8(dEsJk_%60*oL^EwywXt|Mx@#*E*q=YqHrc{(IJ@ zUTVtC2@S^9&3s}Hx7`j|T{m%vVYh%R!(YXDU)>XbnN((H6q$UeQ*E7x_O!r~{za^? zmwZJgxZ+hregD4R5Cc1hm%K-3MB#p(;@EnpDbs^GR9SkV*VBFVn#`V$UM75F$AV|2 zx{0G2`%0Ary-R}1ngYQat*X`>!BIdB2>2uE`Gj#og<8$6+rI^*T?%COSvZ+)y;~X4 zXN0wOt$rI`S#{GhRNdG-cI0{D4t!&`Tz&v^`daE%;skd%e2AX;?u|k7D+PwzUT0U# z_!B{W3RLgaFkK+S=q?RBB|Q_HP3PqanO^qj3rPTX(ah|1kk2WPr~TI(6vV#T3Psob zbbLE|_xg4o_L+qabQ@YV4_G2T^;}IcPxb$^*wjc6Jd`T*2x$`5Iv4(03|OB!AWl7* zJMC4cmE-rYv}TYa9CTD(#DqS38)ZXi%9jRJO7aqhY?_a%Sjgg^Rb%u;J%J z`5zEl@V~X2DL3`?vK&eSkGz%*$g zD?F}I-=JF`QhT1yR-99jIG2T(kr_;tM86Ef4TGvGIfgSv2FgV?Ii+)`U2>R|H2i@X z`#%BNLBOf^Cc{&9yW48moSxv~rlKiJ%J}vK&(t&4)cM`_S(ZX>9N>(4l@6 zdDl*9bIce;;tE}C+x%&Hhr3lZ-(^Y@o$@``rr%I zg{u79L}N5{+H#i-HI44PQY;E@5Er~AtB)M)x<=Ei@?X?9_fM`iWrvDbud4F5=(*?% zRLPTUeZ+5FN~G!#G<3RgH;w0i{K2r>u>sy5`tk&g)2Y2*aqh5+vOvE&(r4@+^|2ns z-<1??R}E5H#@}Wwx0Wny?J*1!+|3gbUll#b`6mBPJ2}+`XA$HSQ60Ly0h=-Stt8p$ zEk32L z_fL>X_L7dycD8i)hRD`iID3-(i+`t&w$UWot>Kf-a=W5l=G%Xai zvKCg5kIzO`KOe=eUfUQuE{h90J)4MLO>KAt&VJnq|1a}0lX`}Kj8wv(n3Rhn&EYzk GdGcS7vC#7X literal 1681 zcmV;C25$L@P)1C!e^)mpmco@LLaP({!dhzAO zXAc1IaJaOyc#$D}N+;`sI1WDduU#hr=Zz zrQ%q5F4@Jf<;uh15`z^(EeQRNxffE;vl2oyjZ~4!_<>Q&e5zuo^dOvk;Z3 zV9F@#I3EsmM0Tr}4YF5wnQzr388@$1p09(+Z3UNFl}&jv*9Gr);*k z8>IA-D=9GLqSSkyHZXfn(0{#;?X3pgkXvlpw=5n z?7T?a%WWuXTOJdr3RhBsa{^hT43*2!Z}*3fSs-k!jM?@4xes>hz!NII zOSA$=&N98n>p#Cd#_Dtflsl;>t(yw-Oo3_uYQB}4$VhbrwggB`q@{q_Ksn&9Ztk89 z!|=ht2E2Fkav?NjkU~C-a06v;1>xn%IP$_8FGsu!{ z!rp9>$|%=n#gR%a(3B~8O8eL|bF~3;0|`+^+8S_4*=QkD8Xe`b8BOP6>z>vI_S6gp zTdP)?%mo49IUxLf-xBY8{`oO$P{X?15Uxxg1Bdvs7E@WP9nc*jd^o)ssr=RR=}TT@8RCXTotVTA;G^>w>{GHzC*$@JI(Y$Us^I>=u*LQ;@DTKyJe& z>g##{Xbsf$0?-nu>j|J0(5}}}x>-Z90yuiz+W~f;KD_#0(-!QFy;!QHnYMJj0@T>) z9EV#1KrK+W6o49_xWq*vlVG3+1~rVjB?9EO>pav|yM47q;f|S(%TQ~elAypzRIwFM zY1HGSHdh;Hv9PXJpxWhj^?8ZdA*&MQc7WZg_Y+j#OHdnVX?fU6a7{TTv8&WZt#(4Q z=3Om;S^;E(v;ryx=;1A?j@WietcP&fPTx9kdhoc|ff}i!uvE`ENcH+8RehyPcT#{V zo0I^J{Z6S@;$VHTJp&pbx#wD-MR$KlRgzNg7f@^uQWNcjZmBs1x+k)V0PvT72x(C) zH#EiMT;1ILF$}}^;4rE%qhgnMl!ymf5ZF4yqa5np$Se@%*GlrHvNke}l2R$58hQ6$ zUpT;9zmZv}L#3pamdQ;jEXdrgiNuy=euZU=f@>nNwwtw1|GAcpYp}u+5$!MxtnFZ} ziETn=Pga;Kk~nsRr|t#8l-B7H6wG0R>&cR2nc&UnY~A)waK?4RdQ(uo~souDPSsgL&`>CKLL|yFCKTh%ej$A9b;>giZ!fI zb7|9($^8A|zKU_6C5daYLT&V0!&=dT$hDKGA=8r7-9}=Y!nusC37OPCCbt!vp=}#8 z*ED8sIb|I(YosYy%LS}4Mahy`DJ4mgxlJDE$n0tcsHU}UbF=08sGC)jC6a2r&4k-0 z)pmiejab9DB6_yPjLdVj)}FEAxd1%}Y$lzw^o?Ch9ZI%+vlZJc`LiQkk+~#NYadl8 zO=$J8s5jTu{#ZhIr(HTFdJhP%+mqRgwVGL>;>;$`3Qw)N>5)E*HN95l$qE~qM^|}V z2~um{Wmw`!d@0M^?lcg{ip|n^_y+*KZ)8e4y5(&n@c`vt0QhesliJZW^GuB_|8x_T bHz)HaUU*Z|_Aqjq00000NkvXXu0mjfM92*} diff --git a/tutorindigo/templates/indigo/lms/static/images/profile.svg b/tutorindigo/templates/indigo/lms/static/images/profile.svg new file mode 100644 index 000000000..c4e2dcc41 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/static/images/profile.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tutorindigo/templates/indigo/lms/static/sass/.DS_Store b/tutorindigo/templates/indigo/lms/static/sass/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..28d706365e7c9801776c904ca1af840718fafa44 GIT binary patch literal 6148 zcmeHK%}N6?5T4YkDI)Zs&||=B!D>|yJ*-s^UR}|HO5L?Z7uQYcZmm!Xd)Aln=#%(5 zI+LWLR6S~u8JK*N$;@u@CFBPHM5EVQ0Vo52L?tYgu=ql#opekJ&QnAb<{QC5tS`e@ zhhwqqm`ny}?xvv)_mDvsKF%L4i6_+US0kqT5;_oITm}(h4C#mYruZGyt)JqSr=uGXq*t-diFmgM5n z^44MVCcaJdgBd9ZT+v469gg4;jWHhX{B9EKT zh#6o8{+I#U9~3H~=Ptg?nNMn~r|v z;yj1BMVk)7JwAl{vv4mIVg8QaS0)^UXOT;0fEoDAz?7|)>HOdS{{8&gP1{N8>-VemY`hWU!|1X_rAO?tm)ntIz`d;6K+;nYS$`Wg>1$qaHf_{a< luMn8XQVhOWid&#kz;59L(9u{Z1PciL2uK=eAO`-Fflp{sQtki% literal 0 HcmV?d00001 diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/.DS_Store b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4f2a2c882164ae97832161148bed92305e1acf2c GIT binary patch literal 6148 zcmeHK%}T>S5Z>*NO({YT3Oz1(En3?uh?f}a!K)EHsMN*;8%(p(rshxzIqM7gB)*Q$ z>~5q|y@^PffthbJJCkI-4Z9h}7drZoey0ufGuKrISaq(y!iQ6i$*>>x~zRrSe+E zs#rDa#vRJkO$Nzy;ta-Dcy%siM599t+J>ZVt^R<1qN_`5TJ;*!Azst zI>4wF0I&pZB{0SxN6ZlhZG)Lcm;vEB6;P*g(_(O)4t`WP%{7iv?I*K6{kKzWX67UNg0NMsKjo<;H9|1)J8Dij18TbIMMOIS) literal 0 HcmV?d00001 diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss index 4ed1ca8c1..70cabf89c 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss @@ -212,3 +212,22 @@ nav.wrapper-preview-menu { } } } +.container, .main-container, .find-courses { + max-width: 1090px; + padding-left: 15px !important; + padding-right: 15px !important; + margin: 0 auto; +} +.window-wrap { + position: relative; + overflow: hidden; + width: 100%; +} + +@import '../../../extra/footer'; +@import '../../../extra/header'; +@import '../../../dashbord/dashbord'; +@import '../../../courseware/discover'; + + + diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss index 15ef4d6e8..d5171a785 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss @@ -1,9 +1,12 @@ -$primary: {{ INDIGO_PRIMARY_COLOR }}; +$primary: #4B0082; // Theme fonts -$font-family-title: Plex; +$font-family-title: 'Inter', sans-serif;; $serif: Crimson; $f-sans-serif: Crimson, 'Open Sans','Helvetica Neue', Helvetica, Arial, sans-serif; - +@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap'); // Initialize the Open edX Bootstrap theme @import 'edx-bootstrap/sass/open-edx/theme'; + +$drak: #111827; +$light-drak: #374151; diff --git a/tutorindigo/templates/indigo/lms/static/templates b/tutorindigo/templates/indigo/lms/static/templates deleted file mode 120000 index 564a409d4..000000000 --- a/tutorindigo/templates/indigo/lms/static/templates +++ /dev/null @@ -1 +0,0 @@ -../templates \ No newline at end of file diff --git a/tutorindigo/templates/indigo/lms/templates/.DS_Store b/tutorindigo/templates/indigo/lms/templates/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7f7c5193ebb8138123b70cd4d6dd0eb5af684e3f GIT binary patch literal 6148 zcmeHKO^?$s5FPK9-INL`LLlu0$r9IUDU{_yTtZn6TnT~$pprC!jY#9FNw>SID&-76 zhAY2>zXNY`dwcDY$r0}cg^!m-8DuxGd4-cWcU$vk{w1st^ zQbY+yHGRd$U-`!Ka$?8*98dDBta`mKVq>#)VQbsl_B!6{@IcMODynAXAez49)-$E@ z_@o}i&$Dzs^shWpMHOX5I@JMLlEUTHi>yf0e4u7UQtH^yba-vAJ@j`Li@pBcuI%62 zTXyB*{;ghD-tOO7F5BMK>o*=e9lp=Uh5Dc~B!OK`%O#5^!1*=uPs&jq<3F-PqvJ4~ z7P%_k!OnwSri=X$e#_I!+<>O@CHC$1I_E2Gm#t&KG4KZr@ctm7jDf}4px!!A=qmuQ1+x~^ z`D1}&q{YBuZ4f;WVM2i>RM;zqFyXLE>law84VrKg_VOX@lZCyZ2>o=7FSR>~z@RG~ z1CD_v1DmGl^ZEby=lB0+kZU;x90O;H0nyqI_XkMHo~>)i@mVXOZ=fvfR~ytJDC}{p gD|{61K((Mxas?PztPR2faUTMj23I%+{wV|B0Bcs#KmY&$ literal 0 HcmV?d00001 diff --git a/tutorindigo/templates/indigo/lms/templates/course.html b/tutorindigo/templates/indigo/lms/templates/course.html new file mode 100644 index 000000000..bdc9c54ea --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/course.html @@ -0,0 +1,49 @@ +<%def name="online_help_token()"><% return "course" %> +<%namespace name='static' file='static_content.html'/> +<%! +from django.utils.translation import gettext as _ +from django.urls import reverse +%> +<%page args="course" expression_filter="h"/> +
+ +
+
+ ${course.display_name_with_default} ${course.display_number_with_default} + +
+
+ +
+
    +
  • ${course.display_org_with_default}
    • +
  • ${course.display_number_with_default}
    • + % if course.advertised_start is not None: +
  • ${_("Starts")}:
    • + % else: +
  • ${_("Starts")}:
    • + % endif +
+
+ +
+<%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory"> + DateUtilFactory.transform(iterationKey=".localized_datetime"); + diff --git a/tutorindigo/templates/indigo/lms/templates/courseware/courses.html b/tutorindigo/templates/indigo/lms/templates/courseware/courses.html new file mode 100644 index 000000000..a3ecb7c58 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/courseware/courses.html @@ -0,0 +1,80 @@ +<%page expression_filter="h"/> +<%! + import json + from django.utils.translation import gettext as _ + from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json +%> +<%inherit file="../main.html" /> +<% + course_discovery_enabled = settings.FEATURES.get('ENABLE_COURSE_DISCOVERY') +%> + +<%namespace name='static' file='../static_content.html'/> + +% if course_discovery_enabled: +<%block name="header_extras"> + % for template_name in ["course_card", "filter_bar", "filter", "facet", "facet_option"]: + + % endfor + <%static:require_module module_name="js/discovery/discovery_factory" class_name="DiscoveryFactory"> + DiscoveryFactory( + ${course_discovery_meanings | n, dump_js_escaped_json}, + getParameterByName('search_query'), + "${user_language | n, js_escaped_string}", + "${user_timezone | n, js_escaped_string}" + ); + + +% endif + +<%block name="pagetitle">${_("Courses")} + +
+
+
+ % if course_discovery_enabled: + + + + % endif + +
+
    + %for course in courses: +
  • + <%include file="../course.html" args="course=course" /> +
    • + %endfor +
+
+ + + % if course_discovery_enabled: + + % endif + +
+
+
diff --git a/tutorindigo/templates/indigo/lms/templates/dashboard.html b/tutorindigo/templates/indigo/lms/templates/dashboard.html new file mode 100644 index 000000000..d44cdefc6 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/dashboard.html @@ -0,0 +1,403 @@ +<%page expression_filter="h"/> +<%inherit file="main.html" /> +<%def name="online_help_token()"><% return "learnerdashboard" %> +<%namespace name='static' file='static_content.html'/> +<%! +import pytz +from datetime import datetime, timedelta +from django.urls import reverse +from django.utils.translation import gettext as _ +from django.template import RequestContext +from common.djangoapps.entitlements.models import CourseEntitlement +from common.djangoapps.third_party_auth import pipeline +from common.djangoapps.util.date_utils import strftime_localized +from opaque_keys.edx.keys import CourseKey +from openedx.core.djangoapps.content.course_overviews.models import CourseOverview +from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers +from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string +from openedx.core.djangolib.markup import HTML, Text + +from common.djangoapps.student.models import CourseEnrollment +%> + +<% + cert_name_short = settings.CERT_NAME_SHORT + cert_name_long = settings.CERT_NAME_LONG +%> + + +<%block name="pagetitle">${_("Dashboard")} +<%block name="bodyclass">view-dashboard is-authenticated + +<%block name="header_extras"> +% for template_name in ["donation"]: + +% endfor + + +<%block name="js_extra"> + + + <%static:js group='dashboard'/> + + <%static:webpack entry="UnenrollmentFactory"> + UnenrollmentFactory({ + urls: { + dashboard: "${reverse('dashboard') | n, js_escaped_string}", + signInUser: "${reverse('signin_user') | n, js_escaped_string}", + changeEmailSettings: "${reverse('change_email_settings') | n, js_escaped_string}", + browseCourses: "${marketing_link('COURSES') | n, js_escaped_string}" + }, + isEdx: false + }); + + <%static:webpack entry="EntitlementUnenrollmentFactory"> + ## Wait until the document is fully loaded before initializing the EntitlementUnenrollmentView + ## to ensure events are setup correctly. + $(document).ready(function() { + EntitlementUnenrollmentFactory({ + dashboardPath: "${reverse('dashboard') | n, js_escaped_string}", + signInPath: "${reverse('signin_user') | n, js_escaped_string}", + browseCourses: "${marketing_link('COURSES') | n, js_escaped_string}", + isEdx: false + }); + }); + + % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): + <%static:require_module module_name="course_search/js/dashboard_search_factory" class_name="DashboardSearchFactory"> + DashboardSearchFactory(); + + % endif + % if redirect_message: + <%static:require_module module_name="js/views/message_banner" class_name="MessageBannerView"> + var banner = new MessageBannerView({urgency: 'low', type: 'warning'}); + $('#content').prepend(banner.$el); + banner.showMessage(${redirect_message | n, dump_js_escaped_json}) + + % endif + % if recovery_email_message: + <%static:require_module module_name="js/views/message_banner" class_name="MessageBannerView"> + var banner = new MessageBannerView({urgency: 'low', type: 'warning', hideCloseBtn: false, isRecoveryEmailMsg: true}); + $('#content').prepend(banner.$el); + banner.showMessage(${recovery_email_message | n, dump_js_escaped_json}) + + % endif + % if recovery_email_activation_message: + <%static:require_module module_name="js/views/message_banner" class_name="MessageBannerView"> + var banner = new MessageBannerView({urgency: 'low', type: 'warning', isRecoveryEmailMsg: true}); + $('#content').prepend(banner.$el); + banner.showMessage(${recovery_email_activation_message | n, dump_js_escaped_json}) + + % endif + % if enterprise_learner_portal_enabled_message: + <%static:require_module module_name="js/views/message_banner" class_name="MessageBannerView"> + var banner = new MessageBannerView({urgency: 'low', type: 'warning', isLearnerPortalEnabled: true}); + $('#content').prepend(banner.$el); + banner.showMessage(${enterprise_learner_portal_enabled_message | n, dump_js_escaped_json}) + + % endif + + +
+ + %if banner_account_activation_message: +
+ ${banner_account_activation_message | n, decode.utf8} +
+ %endif + + %if enrollment_message: +
+ ${enrollment_message | n, decode.utf8} +
+ %endif + + %if enterprise_message: +
+ ${ enterprise_message | n, decode.utf8 } +
+ %endif + + %if account_activation_messages: +
+ % for account_activation_message in account_activation_messages: + + % endfor +
+ %endif + +
+ +
+
+
+
+ % if display_dashboard_courses: + <%include file="learner_dashboard/_dashboard_navigation_courses.html"/> + % endif + + % if len(course_entitlements + course_enrollments) > 0: +
    + <% + share_settings = configuration_helpers.get_value( + 'SOCIAL_SHARING_SETTINGS', + getattr(settings, 'SOCIAL_SHARING_SETTINGS', {}) + ) + %> + % for dashboard_index, enrollment in enumerate(course_entitlements + course_enrollments): + <% + # Check if the course run is an entitlement and if it has an associated session + entitlement = enrollment if isinstance(enrollment, CourseEntitlement) else None + entitlement_session = entitlement.enrollment_course_run if entitlement else None + entitlement_days_until_expiration = entitlement.get_days_until_expiration() if entitlement else None + entitlement_expiration = datetime.now(tz=pytz.UTC) + timedelta(days=entitlement_days_until_expiration) if (entitlement and entitlement_days_until_expiration < settings.ENTITLEMENT_EXPIRED_ALERT_PERIOD) else None + entitlement_expiration_date = strftime_localized(entitlement_expiration, 'SHORT_DATE') if entitlement and entitlement_expiration else None + entitlement_expired_at = strftime_localized(entitlement.expired_at_datetime, 'SHORT_DATE') if entitlement and entitlement.expired_at_datetime else None + + is_fulfilled_entitlement = True if entitlement and entitlement_session else False + is_unfulfilled_entitlement = True if entitlement and not entitlement_session else False + + entitlement_available_sessions = [] + if entitlement: + # Grab the available, enrollable sessions for a given entitlement and scrape them for relevant attributes + entitlement_available_sessions = [{ + 'session_id': course['key'], + 'enrollment_end': course['enrollment_end'], + 'pacing_type': course['pacing_type'], + 'advertised_start': CourseOverview.get_from_id(CourseKey.from_string(course['key'])).advertised_start, + 'start': CourseOverview.get_from_id(CourseKey.from_string(course['key'])).start, + 'end': CourseOverview.get_from_id(CourseKey.from_string(course['key'])).end, + } for course in course_entitlement_available_sessions[str(entitlement.uuid)]] + if is_fulfilled_entitlement: + # If the user has a fulfilled entitlement, pass through the entitlements CourseEnrollment object + enrollment = entitlement_session + else: + # If the user has an unfulfilled entitlement, pass through a bare CourseEnrollment object to populate card with metadata + pseudo_session = unfulfilled_entitlement_pseudo_sessions[str(entitlement.uuid)] + if not pseudo_session: + continue + pseudo_key = pseudo_session['key'] + if not isinstance(pseudo_key, CourseKey): + pseudo_key = CourseKey.from_string(pseudo_session['key']) + enrollment = CourseEnrollment(user=user, course=CourseOverview.get_from_id(pseudo_key), mode=pseudo_session['type']) + # We only show email settings for entitlement cards if the entitlement has an associated enrollment + show_email_settings = is_fulfilled_entitlement and (entitlement_session.course_id in show_email_settings_for) + course_overview = enrollment.course_overview + else: + show_email_settings = (enrollment.course_id in show_email_settings_for) + course_overview = CourseOverview.get_from_id(enrollment.course_id) + + session_id = enrollment.course_id + show_courseware_link = show_courseware_links_for.get(session_id, False) + cert_status = cert_statuses.get(session_id) + can_refund_entitlement = entitlement and entitlement.is_entitlement_refundable() + partner_managed_enrollment = enrollment.mode == 'masters' + # checks if we can unenroll based on the value of partner_managed_enrollment + can_unenroll_partner_managed_enrollment = False if partner_managed_enrollment else (not cert_status) + # checks if we can unenroll based on the value of unfulfilled_entitlement + can_unenroll_unfulfilled_entitlement = cert_status.get('can_unenroll') if cert_status and not unfulfilled_entitlement else False + # compares the three different parameters by which we can unenroll + can_unenroll = (can_unenroll_partner_managed_enrollment or can_unenroll_unfulfilled_entitlement) and not disable_unenrollment + credit_status = credit_statuses.get(session_id) + course_mode_info = all_course_modes.get(session_id) + is_paid_course = True if entitlement else (session_id in enrolled_courses_either_paid) + is_course_voucher_refundable = (session_id in enrolled_courses_voucher_refundable) + course_requirements = courses_requirements_not_met.get(session_id) + related_programs = inverted_programs.get(str(entitlement.course_uuid if is_unfulfilled_entitlement else session_id)) + show_consent_link = (session_id in consent_required_courses) + resume_button_url = resume_button_urls[dashboard_index] + %> + <%include file='dashboard/_dashboard_course_listing.html' args='course_overview=course_overview, course_card_index=dashboard_index, enrollment=enrollment, enrollments_fbe_is_on=enrollments_fbe_is_on, is_unfulfilled_entitlement=is_unfulfilled_entitlement, is_fulfilled_entitlement=is_fulfilled_entitlement, entitlement=entitlement, entitlement_session=entitlement_session, entitlement_available_sessions=entitlement_available_sessions, entitlement_expiration_date=entitlement_expiration_date, entitlement_expired_at=entitlement_expired_at, show_courseware_link=show_courseware_link, cert_status=cert_status, can_refund_entitlement=can_refund_entitlement, can_unenroll=can_unenroll, credit_status=credit_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info, is_paid_course=is_paid_course, is_course_voucher_refundable=is_course_voucher_refundable, course_requirements=course_requirements, dashboard_index=dashboard_index, share_settings=share_settings, user=user, related_programs=related_programs, display_course_modes_on_dashboard=display_course_modes_on_dashboard, show_consent_link=show_consent_link, enterprise_customer_name=enterprise_customer_name, resume_button_url=resume_button_url, partner_managed_enrollment=partner_managed_enrollment' /> + % endfor + % if show_load_all_courses_link: +
    + ${len(course_enrollments)} ${_("results successfully populated,")} + + ${_("Click to load all enrolled courses")} + + % endif +
+ % else: +
+ % if display_dashboard_courses: +

${_("You are not enrolled in any courses yet.")}

+ % if empty_dashboard_message: +

${empty_dashboard_message | n, decode.utf8}

+ %endif + % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'): + + ${_("Explore courses")} + + %endif + % else: +

${_("Activate your account!")}

+

${ activate_account_message | n, decode.utf8 }

+ % endif +
+ % endif + + % if staff_access and len(errored_courses) > 0: +
+

${_("Course-loading errors")}

+ + % for course_dir, errors in errored_courses.items(): +

${course_dir}

+
    + % for (msg, err) in errors: +
  • ${msg} + 
    • ${err}
    +
    • + % endfor +
+ % endfor +
+ % endif +
+
+ +
+
+ +%if show_account_activation_popup: + +%endif + + + + + +<%include file="dashboard/_dashboard_entitlement_unenrollment_modal.html"/> diff --git a/tutorindigo/templates/indigo/lms/templates/footer.html b/tutorindigo/templates/indigo/lms/templates/footer.html index 00d64658d..2032192ff 100644 --- a/tutorindigo/templates/indigo/lms/templates/footer.html +++ b/tutorindigo/templates/indigo/lms/templates/footer.html @@ -11,6 +11,7 @@ <%namespace name='static' file='static_content.html'/> % if uses_bootstrap: +profile icon
@@ -72,7 +73,7 @@
% else:
-
% endif diff --git a/tutorindigo/templates/indigo/lms/templates/header/brand.html b/tutorindigo/templates/indigo/lms/templates/header/brand.html new file mode 100644 index 000000000..6b310be6c --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/header/brand.html @@ -0,0 +1,37 @@ +## mako + +<%page expression_filter="h"/> + +<%namespace name='static' file='/static_content.html'/> + +<%! +from django.urls import reverse +from django.utils.translation import gettext as _ +from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers + +# App that handles subdomain specific branding +from lms.djangoapps.branding import api as branding_api +%> + +

+ + % if course and not disable_courseware_header: +
+ ${course.display_org_with_default}: + ${course.display_number_with_default} + ${course.display_name_with_default} +
+ % endif +

+% if enable_enterprise_sidebar: +
+ <% tagline = configuration_helpers.get_value('ENTERPRISE_TAGLINE', settings.ENTERPRISE_TAGLINE) %> + % if tagline: + ${tagline} + % endif +
+% endif diff --git a/tutorindigo/templates/indigo/lms/templates/header/header.html b/tutorindigo/templates/indigo/lms/templates/header/header.html new file mode 100644 index 000000000..4a066563b --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/header/header.html @@ -0,0 +1,110 @@ +## mako + +<%page expression_filter="h" args="online_help_token, use_cookie_banner=False"/> + +<%namespace name='static' file='../static_content.html'/> +<%namespace file='../main.html' import="login_query"/> +<%! +from django.urls import reverse +from django.utils.translation import gettext as _ +import waffle + +from lms.djangoapps.ccx.overrides import get_current_ccx +from openedx.core.djangolib.markup import HTML, Text + +# App that handles subdomain specific branding +from lms.djangoapps.branding import api as branding_api +from openedx.core.djangoapps.lang_pref.api import header_language_selector_is_enabled, released_languages +from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers + +%> + +## Provide a hook for themes to inject branding on top. +<%block name="navigation_top" /> + +<% + unsupported_browser_alert_versions = configuration_helpers.get_value('UNSUPPORTED_BROWSER_ALERT_VERSIONS', settings.FEATURES.get('UNSUPPORTED_BROWSER_ALERT_VERSIONS')) +%> +% if waffle.switch_is_active('enable_unsupported_browser_alert'): + +% endif + +
+
+ % if settings.FEATURES.get('ENABLE_COOKIE_POLICY_BANNER', use_cookie_banner): + ${static.renderReact( + component="CookiePolicyBanner", + id="frontend-component-cookie-policy-banner", + props={} + )} + % endif +
+ <%include file="navbar-logo-header.html" args="online_help_token=online_help_token"/> + + % if user.is_authenticated: + <%include file="navbar-authenticated.html" args="online_help_token=online_help_token"/> + % else: + <%include file="navbar-not-authenticated.html" args="online_help_token=online_help_token"/> + % endif +
+ +
+
+ +% if course: + +% endif + +% if settings.FEATURES.get('ENABLE_COOKIE_CONSENT', False): + <%include file="../widgets/cookie-consent.html" /> +% endif + +% if header_language_selector_is_enabled(): + <% languages = released_languages() %> + % if len(languages) > 1: +
+ + % if user.is_authenticated: + + % else: + + % endif + +
+ % endif +% endif diff --git a/tutorindigo/templates/indigo/lms/templates/header/navbar-authenticated.html b/tutorindigo/templates/indigo/lms/templates/header/navbar-authenticated.html new file mode 100644 index 000000000..43a180de8 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/header/navbar-authenticated.html @@ -0,0 +1,59 @@ +## mako + +<%page expression_filter="h" args="online_help_token"/> + +<%namespace name='static' file='../static_content.html'/> +<%namespace file='../main.html' import="login_query"/> +<%! +from django.urls import reverse +from django.utils.translation import gettext as _ +from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers +%> + +<% + show_explore_courses = settings.FEATURES.get('COURSES_ARE_BROWSABLE') + self.real_user = getattr(user, 'real_user', user) + enable_help_link = settings.FEATURES.get('ENABLE_HELP_LINK') + + support_link = configuration_helpers.get_value('SUPPORT_SITE_LINK', settings.SUPPORT_SITE_LINK) + doc_link = get_online_help_info(online_help_token)['doc_url'] + + if online_help_token == "instructor": + help_link = doc_link + elif support_link: + help_link = support_link + else: + help_link = doc_link +%> + +
+
+ % if show_dashboard_tabs: +
+ + ${_("My Courses")} + +
+ % if show_program_listing: +
+ + ${_("Programs")} + +
+ % endif + % endif + % if show_explore_courses: +
+ + ${_('Discover')} + +
+ % endif +
+
+ <%include file="user_dropdown.html"/> +
+
diff --git a/tutorindigo/templates/indigo/lms/templates/header/navbar-logo-header.html b/tutorindigo/templates/indigo/lms/templates/header/navbar-logo-header.html new file mode 100644 index 000000000..adb12deec --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/header/navbar-logo-header.html @@ -0,0 +1,61 @@ +## mako + +<%page expression_filter="h" args="online_help_token"/> + +<%namespace name='static' file='../static_content.html'/> +<%! +from django.urls import reverse +from django.utils.translation import gettext as _ +from lms.djangoapps.ccx.overrides import get_current_ccx +from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers +from openedx.features.enterprise_support.utils import get_enterprise_learner_generic_name, get_enterprise_learner_portal + +# App that handles subdomain specific branding +from lms.djangoapps.branding import api as branding_api +%> + +<% +enterprise_customer_link = get_enterprise_learner_portal(request) +%> + +

+ % if enterprise_customer_link: + + + % if settings.LOGO_IMAGE_EXTRA_TEXT == 'edge': + | EDGE + % endif + + % else: + + <%block name="navigation_logo"> + + + % if settings.LOGO_IMAGE_EXTRA_TEXT == 'edge': + | EDGE + % endif + + % endif + % if course: +
+ ${course.display_org_with_default}: + ${course.display_number_with_default} + <% + display_name = course.display_name_with_default + if settings.FEATURES.get('CUSTOM_COURSES_EDX', False): + ccx = get_current_ccx(course.id) + if ccx: + display_name = ccx.display_name + %> + ${display_name} +
+ % endif +

+% if enable_enterprise_sidebar: +
+ <% tagline = configuration_helpers.get_value('ENTERPRISE_TAGLINE', settings.ENTERPRISE_TAGLINE) %> + % if tagline: + ${tagline} + % endif +
+% endif diff --git a/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html b/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html new file mode 100644 index 000000000..61448b73b --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html @@ -0,0 +1,73 @@ +## mako + +<%page expression_filter="h"/> + +<%namespace name='static' file='../static_content.html'/> +<%namespace file='../main.html' import="login_query"/> + +<%! +from django.conf import settings +from django.urls import reverse +from django.utils.translation import gettext as _ + +from openedx.core.djangoapps.user_authn.toggles import should_redirect_to_authn_microfrontend +%> + +<% + mktg_site_enabled = static.get_value('ENABLE_MKTG_SITE', settings.FEATURES.get('ENABLE_MKTG_SITE', False)) + courses_are_browsable = settings.FEATURES.get('COURSES_ARE_BROWSABLE') + allows_login = not settings.FEATURES['DISABLE_LOGIN_BUTTON'] and not combined_login_and_register + can_discover_courses = settings.FEATURES.get('ENABLE_COURSE_DISCOVERY') + allow_public_account_creation = static.get_value('ALLOW_PUBLIC_ACCOUNT_CREATION', settings.FEATURES.get('ALLOW_PUBLIC_ACCOUNT_CREATION')) and settings.FEATURES.get('SHOW_REGISTRATION_LINKS', True) + should_redirect_to_authn_mfe = should_redirect_to_authn_microfrontend() +%> + diff --git a/tutorindigo/templates/indigo/lms/templates/header/user_dropdown.html b/tutorindigo/templates/indigo/lms/templates/header/user_dropdown.html new file mode 100644 index 000000000..b83a24a64 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/header/user_dropdown.html @@ -0,0 +1,48 @@ +## mako +<%page expression_filter="h"/> +<%namespace name='static' file='../static_content.html'/> + +<%! +import json + +from django.conf import settings +from django.urls import reverse +from django.utils.translation import gettext as _ + +from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_image_urls_for_user +from openedx.core.djangoapps.user_api.accounts.toggles import should_redirect_to_order_history_microfrontend +from openedx.features.enterprise_support.utils import get_enterprise_learner_generic_name, get_enterprise_learner_portal +%> + +<% +## This template should not use the target student's details when masquerading, see TNL-4895 +self.real_user = getattr(user, 'real_user', user) +profile_image_url = get_profile_image_urls_for_user(self.real_user)['medium'] +username = self.real_user.username +displayname = get_enterprise_learner_generic_name(request) or username +enterprise_customer_portal = get_enterprise_learner_portal(request) +## Enterprises with the learner portal enabled should not show order history, as it does +## not apply to the learner's method of purchasing content. +should_show_order_history = should_redirect_to_order_history_microfrontend() and not enterprise_customer_portal +%> + + +
+ + +
diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/blog.html b/tutorindigo/templates/indigo/lms/templates/static_templates/blog.html new file mode 100644 index 000000000..ba4d1ebae --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/static_templates/blog.html @@ -0,0 +1,16 @@ +<%page expression_filter="h"/> +<%! from django.utils.translation import gettext as _ %> +<%inherit file="../main.html" /> + +<%block name="pagetitle">${_("Blog")} + +
+
+

+ <%block name="pageheader">${page_header or _("Blog")} +

+

+ <%block name="pagecontent">${page_content or _("This page left intentionally blank. Feel free to add your own content.")} +

+
+
diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/donate.html b/tutorindigo/templates/indigo/lms/templates/static_templates/donate.html new file mode 100644 index 000000000..22f7a80df --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/static_templates/donate.html @@ -0,0 +1,16 @@ +<%page expression_filter="h"/> +<%! from django.utils.translation import gettext as _ %> +<%inherit file="../main.html" /> + +<%block name="pagetitle">${_("Donate")} + +
+
+

+ <%block name="pageheader">${page_header or _("Donate")} +

+

+ <%block name="pagecontent">${page_content or _("This page left intentionally blank. Feel free to add your own content.")} +

+
+
diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/help.html b/tutorindigo/templates/indigo/lms/templates/static_templates/help.html new file mode 100644 index 000000000..054187b85 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/static_templates/help.html @@ -0,0 +1,16 @@ +<%page expression_filter="h"/> +<%! from django.utils.translation import gettext as _ %> +<%inherit file="../main.html" /> + +<%block name="pagetitle">${_("Help")} + +
+
+

+ <%block name="pageheader">${page_header or _("Help")} +

+

+ <%block name="pagecontent">${page_content or _("This page left intentionally blank. Feel free to add your own content.")} +

+
+
diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/privacy.html b/tutorindigo/templates/indigo/lms/templates/static_templates/privacy.html new file mode 100644 index 000000000..2ed74c748 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/static_templates/privacy.html @@ -0,0 +1,17 @@ +<%page expression_filter="h"/> +<%! from django.utils.translation import gettext as _ %> + +<%inherit file="../main.html" /> + +<%block name="pagetitle">${_("Privacy Policy")} + +
+
+

+ <%block name="pageheader">${page_header or _("Privacy Policy")} +

+

+ <%block name="pagecontent">${page_content or _("This page left intentionally blank. Feel free to add your own content.")} +

+
+
From 273562fb257cec192425298d8a32e47a312456c8 Mon Sep 17 00:00:00 2001 From: TanveerAhmed Date: Tue, 21 Nov 2023 15:52:59 +0500 Subject: [PATCH 02/17] feat: style indigo theme --- .../templates/indigo/lms/static/.DS_Store | Bin 6148 -> 6148 bytes .../indigo/lms/static/images/emptystate.png | Bin 0 -> 3445 bytes .../lms/static/sass/courseware/_discover.scss | 28 ++++ .../lms/static/sass/dashbord/_dashbord.scss | 154 +++++++++++++++++- .../templates/indigo/lms/templates/.DS_Store | Bin 6148 -> 8196 bytes .../lms/templates/courseware/courses.html | 22 ++- .../indigo/lms/templates/dashboard.html | 78 ++++----- .../lms/templates/registration/.DS_Store | Bin 0 -> 6148 bytes .../account_activation_sidebar_notice.html | 27 +++ 9 files changed, 268 insertions(+), 41 deletions(-) create mode 100644 tutorindigo/templates/indigo/lms/static/images/emptystate.png create mode 100644 tutorindigo/templates/indigo/lms/templates/registration/.DS_Store create mode 100644 tutorindigo/templates/indigo/lms/templates/registration/account_activation_sidebar_notice.html diff --git a/tutorindigo/templates/indigo/lms/static/.DS_Store b/tutorindigo/templates/indigo/lms/static/.DS_Store index edf114388acef0f68375d58e7ae3e6c3f383e63a..36c03108520c1739866db3c8476165a942528b89 100644 GIT binary patch delta 25 gcmZoMXffFEiG{<|*jz`!*ur!&ADjJVOV-mu0A<<-RsaA1 delta 16 XcmZoMXffFEiDfbyoBL)<*3&`&G~Wfo diff --git a/tutorindigo/templates/indigo/lms/static/images/emptystate.png b/tutorindigo/templates/indigo/lms/static/images/emptystate.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c3439ff1971a4f3f71c6e8951b22eb7ce5ba33 GIT binary patch literal 3445 zcmV-*4T|!KP))V z+|K8NP^td?|NZ>`&b;9K`~Qw$u=x1@_Vxeu^#8S&&|n{u-_`H*^Z$!nu=e)<`S}0$ z_y6_t|DbxoVIPv}<@fpd|7#+xPVQm`}+TDE}81&_h289;MMQ?`Tuo3p~<%3 zVIPr|Y`Lq5$koQ@tBJ_{{r~s&|M>U+`uhK{kjP>ol7msH#;@2+0fN%M-@BgBgHNgc z{QsJ9xoa+(>f`s%yx_W>(Ea=Wm~Obhr`XWG-_^$Gm1?*YCHR z(A&=E`uP9x?Dtg=iqO5_ns2%A>-W*V--1r5xt!3@zu(2L*v`A)id(Sc+V8iT(9F2t z@9Ov0$miqO@6x{CR+jgj000Y2Nkl`F|Tn8OG&y^+t)DqB>6FHlz(wV>^k3 zv%7?1IY4nmOxh3%6cJ)>DR#hVDL1r`a+V`p;rM@__ES2wrwOO_A!t0UTPCNm7648ys()P*&K$sL?IJlH>KTBO>U8wr z2sUSy49etmpxUzl&nefS7M!yHAJ%A76A8moQ*U|H>}>TsG>Xsno*$!VL;emwVE zFI|OCWPG&IIppIepHtP|)FLBv?UMkX`m_ZcA%BF&O+KgUWnDA}bUtGTCk(bKZt|I< zjsY7%=M{ig?BIl9cR03ilg~_!%xfW}Q5IG=ZHrpmnGM09RJ;|u0+uDuTMMK8aMGb@XRBlIPJFHf27Oowyr z4S=tNJ?nv8xk6V7$`R@P_VhSrdcgOe$HIAM76JDDHd`R?u9pE)>L zvh8yU5O)=nSAA|Y;efjeN-Vp1P66t0*FcG7wj^DkT$htA+gYfseC`S;wTc+8S;#e< zY4SEW+3axNe#vFCY2eski;s?DqadDsXBgk%lq;`8-g*YTBR>}K*1J2!=q@FmAm|iS zY#nvmlxVuz!GNo>I zzWpw0e;VN43i(QZXKDFjl}s1+aPJUxX@b1r1ktfgO5Iz+oF<^gW05zU_45GpSI88d z*WSXsAIy~_>d9x|wcvY*_Y;>l52uzeyB*BUal~S$%Ktv`F`5O~zmI7Th#RovU5;?I zQ+T(NqIwICVfq?kr$Y@Vay8X_H^r!S1=rV(5FGza^2341zJ?hsN4(^@{uZ&T4Snr- zL|?;%Lpxdv>grj%iW0J~Va`H(Xr)e*aJBvWh%^_Q?j+l_yy&u7>Gr$U6oV!riu@ znc`|*yIZglkr!ybhR;UOA#%1fSHrk=VsBsg+8%#tS|Y29r_wu#4$~1XsT2jPl~G{ zjzePWkx1h;MbQlF(xq0%DXvDh2gd1ZAuAmvXG?K4)Y-2*B;fV6Fx()-5tGUsBE{8E zD=Ri6;Po}ubCC+woOCs0n~?`e%)Z8HZ23(m#nq6PC1TI&9Ivl&Hl5sFrz>3TNzLEb zDfX;#`x;{&#oShqbT#zFa5*8XSLO9J#tb8Qp$L(yy)FL)eK9XKB;fWnzT^0L%^>M& z1o_$I>WF-eHk?Hk!5PI2<-tk18o@4w9AnPyYkY8W9?7JuQB+fGNWkoCe72U;4!URK zu12yqE)QQ90G1hjjc;)}r+4pPh`Soe&bS;K!|Q8&L+PA*7OvLVlYW4<%O*><65(r$ zeESBJJR~W&+M>=6ijq8+cYO{Sz5T-Y54~<6%wlwZ=P{KloZIMa@s-C)yURS zGxyBeXj z$U_3*Yxn7WjV;TiLaMgj@tCWTKD^T0kHgpKB10v4?Om15L%5p!HgD3bA<~dQ_}V?v zMh`2l@SLSMMr38@^UWst{7XAAMQV9@Iq+Z>3Z)e}m%8gYU*Y0s@Le9iXy z2tGx1&Lg3Os}UDO8WIeB&8`3&#djg5?~S%r!qv#%f+UTVtbMIhJR80|p1t!iSEJ9q zH+gkiUqgrvWX$6kcQyJ+pfn_iQhZtX8p1LR`J&A z!*e3-xd~r;+xP*&*fHa4IKc<5_ChPlxLF;&e>!^AcZPm=Q|k&p+P5A zwqu$$e+-SEv?KlWXTyqV{CxQTFHNh_ZH)`O`kF2pfc;;X`WnJQ3}+PTP1yhC=wG+D zBaNHIo$U<0a|8C5lzpfB48Xfte=1#XKtr!>ejto|9gJPh#;;)i*S?k>h!KP`oZWdi zqxa|i_n`3`!?(*}z+nv5+Icg+&z37sXC|^+g=3nv(KOG5gR$3q*Q_W-$ic}Iqpe}X z>9r`~VAvXCn4<|C(HNB1-@1aNW^Gu&!I7{O&ezFv8Cm-+XHTCtCed^tFCf z|E(1^a8Q~KTd!jRCtB54o0|z&i-jjB$O;ZhgM&kdC&0r9PGt@nd-?rjv>jpa$1UODydBirVZdVsr@jiO7IVWM zdUN_S(26}AtT!KT?c5y{Bh}zUGdR)l&FAt~ojOf0%2I6)N3@>KdV5l9)4a}GoBDCF z@_L)fZO{--?Ob&FdTO^bXd0PXF>sRFNN-N#x(a-fg9e^beDqj`a4OyfVOgG^{fB+Q z#>CXH;0SFd+J{tE1aGqT^!BMt;Z&NdQQOIMwvI6yJUC&vD_^M}dyKJjed?|?7{eLT zd15hrj2ZM+TBd9;;mCC2Y)~S3C#1a&WDcj&6wX%NOAEjE>zBcp4Jw>TI%#!m=1MtI)8)E%dO z5Bxv<`EnHh_LrvdAH{`pxF44>O~W%b{aLIXoQn6?8&RNH_44w{!-o(5w)g)0Ff#Go zzgyfRE}U?EdR?LABQOX~w1gAkxgHA%y!DRc@4nsNLxyu;T$y#Xo>M$i8N|O807t0b?Y#Hk(WC$Tx6`$M@UY>GnssIm zfb|x5gN4&#;1nusIHQGt%#X1;9fOk2Ae_+w;mnV*-jC>7j*4QJG^4f5!4uZnv_V+!?7=x$BFL;Ota*+>_}lEkIf!h_3cSO6U$Xu^%^sX_%gE>h z@OIqvo6gL^ISdI+uPe+1#@fr$vj%5k!zOK68aLIa?p@6o9I5h?7YQtv1@okNTeAfx zwhbM>3N{X;FMSnPKo83@a?;*O$*M+HhI)59Z2Pqk;cS;TdYyGqKW#iv)wq$Te9aB^~TI-2@F XOGSO`a6ZFo00000NkvXXu0mjfzGetB literal 0 HcmV?d00001 diff --git a/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss b/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss index 23859d165..b850be833 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/courseware/_discover.scss @@ -1,4 +1,10 @@ // Include custom discover +.find-courses { + padding-bottom: 0 !important; + .courses-container { + padding: 100px 0; + } +} .courses-container { .courses { .courses-listing { @@ -11,7 +17,29 @@ vertical-align: top; width: 28.33% !important; margin: 0 2.5% 25px !important; + max-height: unset !important; + .course { + margin: 0; + border: none; + box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.06), 0px 1px 3px rgba(0, 0, 0, 0.10); + border-radius: 8px; + overflow: hidden; + background: #fff; + } } } } +} +.filter-block { + display: none; + position: relative; + z-index: 9999; + &.open { + .dropdown-menu { + display: block; + } + } + .dropdown-menu { + display: none; + } } \ No newline at end of file diff --git a/tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss b/tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss index aaf758486..8603faaf2 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/dashbord/_dashbord.scss @@ -7,9 +7,159 @@ margin-top: 64px !important; } } +.sidebar-notification.add { + background: #FFFBEB; + padding: 15px; + margin: 0 0 -50px; + ul { + margin: 0; + padding: 0; + li.status-verification.warning { + border: none !important; + padding: 0 0 0 32px; + position: relative; + svg { + position: absolute; + left: 0; + top: 0; + } + .status-title { + color: #92400E; + font-size: 14px; + font-weight: 500; + margin: 0 0 8px; + } + p.status-note{ + color: #92400E; + font-size: 14px; + margin: 0; + strong { + font-weight: normal; + text-decoration: underline; + } + a { + color: #92400E; + text-decoration: none; + } + } + } + } +} .dashboard { display: block; .main-container { - padding: 20px 0; + padding: 100px 0; + } + .wrapper-header-courses { display: none; } +} +.course-heading-area { + margin: 0 0 75px; + font-size: 16px; + line-height: 20px; + color: #6B7280; + h2 { + color: #111827; + font-size: 24px; + font-weight: 700; + line-height: 30px; + margin: 0 0 12px; + } + p { + margin: 0; + } +} +.empty-dashboard-message { + border: none; + margin: 0 auto; + max-width: 560px; + text-align: center; + background: none; + h2 { + color: #111827; + font-size: 18px; + font-weight: 700; + line-height: 30px; + margin: 0 0 19px; } -} \ No newline at end of file + p { + margin: 0 0 50px; + font-size: 18px; + line-height: 24px; + color: #111827; + text-shadow: none; + } + .image-placeholder { + max-width: 412px; + margin: 0 auto; + img { + display: block; + width: 100%; + } + } +} +.search-area{ + margin: 0 0 70px; + .dashboard-search-bar { + margin: 0 !important; + } + .dashboard-search-results { + padding: 10px 0 0; + margin: 0; + .search-info { + display: none; + } + } + .search-field-wrapper { + &:after { + clear: both; + content: ""; + display: block; + } + .button-holder { + float: right; + button { + position: static; + margin: 0 0 0 16px; + min-width: 164px; + color: #fff; + font-size: 16px; + font-weight: 500; + line-height: 26px; + text-align: center; + padding: 6px; + height: 38px; + border-radius: 6px; + background: $primary; + font-family: $font-family-title; + &:hover { + background: $primary; + opacity: .8; + } + } + } + .input-holder { + overflow: hidden; + border-radius: 6px; + background: #F5F4FF; + padding: 0 0 0 33px; + position: relative; + svg { + position: absolute; + left: 12px; + font-size: 20px; + top: 10px; + } + input { + border: none; + box-shadow: none; + height: 38px; + width: 100%; + background: none; + outline: none; + font-size: 14px; + line-height: 20px; + padding: 9px 10px; + } + } + } +} diff --git a/tutorindigo/templates/indigo/lms/templates/.DS_Store b/tutorindigo/templates/indigo/lms/templates/.DS_Store index 7f7c5193ebb8138123b70cd4d6dd0eb5af684e3f..5ea19056299996943a6555751470a31ed672a71a 100644 GIT binary patch delta 373 zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMA%MX$V@);P48B#aKtY_Y=!10H9 zF*^sx#0C~YkSsStGDAK?DMJxR#bg;4i3p~2ps?P5FaWX`7`Tv?FqAVS0u`rv=Hw?Q z<>V&;<$cpqJjl3tH>(fR#s(=SL1rKq m2qd_HgexfUHVblmXP(S2;yKx$hl2wcexPt=*c{I@hZz7t(^<3t delta 117 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jb?m2aBaL6m5)I&&b8rYU162Tl05_0u1?k*a_?>w&zl_ diff --git a/tutorindigo/templates/indigo/lms/templates/courseware/courses.html b/tutorindigo/templates/indigo/lms/templates/courseware/courses.html index a3ecb7c58..9488284f8 100644 --- a/tutorindigo/templates/indigo/lms/templates/courseware/courses.html +++ b/tutorindigo/templates/indigo/lms/templates/courseware/courses.html @@ -10,7 +10,9 @@ %> <%namespace name='static' file='../static_content.html'/> - +<%block name="js_extra"> + + % if course_discovery_enabled: <%block name="header_extras"> % for template_name in ["course_card", "filter_bar", "filter", "facet", "facet_option"]: @@ -34,6 +36,24 @@
+
+

Unlock Your Potential: Discover New Courses Today!

+

Explore a world of knowledge and enhance your skills with our diverse range of courses

+
+
+ +
+ % if course_discovery_enabled: + + % endif +
+
% if course_discovery_enabled: -
- -
- % if course_discovery_enabled: - - % endif +
+
+ +
+ % if course_discovery_enabled: + + % endif +
-
- % if course_discovery_enabled: - - - -
- - + + % endif
- % endif +
+ -
+
    %for course in courses:
  • @@ -87,13 +98,7 @@

    ${_('Refine Your Search')}

- % if course_discovery_enabled: - - % endif + diff --git a/tutorindigo/templates/indigo/lms/templates/dashboard.html b/tutorindigo/templates/indigo/lms/templates/dashboard.html index 6736dd711..0473289ee 100644 --- a/tutorindigo/templates/indigo/lms/templates/dashboard.html +++ b/tutorindigo/templates/indigo/lms/templates/dashboard.html @@ -153,33 +153,33 @@ %endif
-

Hi Jake, Good Afternoon !

-

Lets learn something today

+

Hello there!

+

Let's learn something today

% if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): - % endif
+ % endif
% if display_dashboard_courses: @@ -372,33 +372,29 @@

diff --git a/tutorindigo/templates/indigo/lms/templates/dashboard/_dashboard_course_listing.html b/tutorindigo/templates/indigo/lms/templates/dashboard/_dashboard_course_listing.html new file mode 100644 index 000000000..a72699053 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/dashboard/_dashboard_course_listing.html @@ -0,0 +1,473 @@ +<%page args="course_overview, enrollment, entitlement, entitlement_session, course_card_index, enrollments_fbe_is_on, is_unfulfilled_entitlement, is_fulfilled_entitlement, entitlement_available_sessions, entitlement_expiration_date, entitlement_expired_at, show_courseware_link, cert_status, can_refund_entitlement, can_unenroll, credit_status, show_email_settings, course_mode_info, is_paid_course, is_course_voucher_refundable, course_requirements, dashboard_index, share_settings, related_programs, display_course_modes_on_dashboard, show_consent_link, enterprise_customer_name, resume_button_url, partner_managed_enrollment" expression_filter="h"/> + +<%! +import datetime + +from django.conf import settings +from django.utils.http import urlencode +from urllib.parse import quote_plus +from django.utils.translation import gettext as _ +from django.utils.translation import ngettext +from django.urls import reverse +from common.djangoapps.course_modes.models import CourseMode +from common.djangoapps.course_modes.helpers import enrollment_mode_display +from common.djangoapps.student.helpers import user_has_passing_grade_in_course +from lms.djangoapps.verify_student.services import IDVerificationService +from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_string +from openedx.core.djangolib.markup import HTML, Text +from openedx.features.course_experience import course_home_url +from common.djangoapps.student.helpers import ( + VERIFY_STATUS_NEED_TO_VERIFY, + VERIFY_STATUS_SUBMITTED, + VERIFY_STATUS_RESUBMITTED, + VERIFY_STATUS_APPROVED, + VERIFY_STATUS_MISSED_DEADLINE, + VERIFY_STATUS_NEED_TO_REVERIFY, + DISABLE_UNENROLL_CERT_STATES, +) +from common.djangoapps.util.course import get_link_for_about_page, get_encoded_course_sharing_utm_params +from lms.djangoapps.experiments.utils import UPSELL_TRACKING_FLAG +%> + +<% + reverify_link = IDVerificationService.get_verify_location() + cert_name_short = course_overview.cert_name_short + if cert_name_short == "": + cert_name_short = settings.CERT_NAME_SHORT + + cert_name_long = course_overview.cert_name_long + if cert_name_long == "": + cert_name_long = settings.CERT_NAME_LONG + + is_course_expired = hasattr(show_courseware_link, 'error_code') and show_courseware_link.error_code == 'audit_expired' + + display_course_upgrade = ( + use_ecommerce_payment_flow + and course_mode_info + and course_mode_info['show_upsell'] + and not entitlement + and course_mode_info['verified_sku'] + ) +%> + +<% + is_non_certificate_enrollment = enrollment.mode == "audit" or enrollment.mode == "honor" + is_passing_course = user_has_passing_grade_in_course(enrollment) + course_ended_not_passing = course_overview.has_ended() and is_passing_course == False and is_non_certificate_enrollment == False +%> + +<%namespace name='static' file='../static_content.html'/> + +
  • + % if display_course_modes_on_dashboard: + <% + course_verified_certs = enrollment_mode_display( + enrollment.mode, + course_overview.id + ) + %> + <% + mode_class = course_verified_certs.get('display_mode', '') + if mode_class: + mode_class = ' ' + mode_class ; + %> + % else: + <% mode_class = '' %> + % endif +
    +
    + <% course_target = course_home_url(course_overview.id) %> +
    +

    ${_('Course details')}

    + +
    +

    + + % if show_courseware_link and not is_unfulfilled_entitlement: + % if not is_course_expired: + ${course_overview.display_name_with_default} + % else: + ${course_overview.display_name_with_default} + % endif + % else: + ${course_overview.display_name_with_default} + % endif + + ${course_overview.display_org_with_default} +

    +
    +
    + % if (show_courseware_link or is_unfulfilled_entitlement) and not is_course_expired: + % if course_overview.has_ended(): + % if not is_unfulfilled_entitlement: + ${_('View Archived Course')} ${course_overview.display_name_with_default} + % endif + + % else: + <%include file="_dashboard_course_resume.html" args="resume_button_url=resume_button_url, course_overview=course_overview, enrollment=enrollment, is_unfulfilled_entitlement=is_unfulfilled_entitlement, course_target=course_target, related_programs=related_programs"/> + % endif + % endif +
    +
    +
    + + + + <% + enrollment_date = course_overview.self_paced and enrollment and enrollment.created + if course_overview.start_date_is_still_default: + container_string = _("Coming Soon") + course_date = None + else: + format = 'shortDate' + dashboard_start_display = course_overview.dashboard_start_display + if course_overview.has_ended(): + container_string = _("Ended - {date}") + course_date = course_overview.end + elif course_overview.has_started(): + container_string = _("Started - {date}") + if enrollment_date and isinstance(dashboard_start_display, datetime.datetime): + course_date = max(enrollment_date, dashboard_start_display) + else: + course_date = enrollment_date or dashboard_start_display + elif course_overview.starts_within(days=5): + container_string = _("Starts - {date}") + course_date = dashboard_start_display + format = 'defaultFormat' + else: ## hasn't started yet + container_string = _("Starts - {date}") + course_date = dashboard_start_display + endif + endif + %> + + + % if not is_unfulfilled_entitlement and is_course_expired: + + ${show_courseware_link.user_message} + +  ${_('for {course_display_name}').format(course_display_name=course_overview.display_name_with_default)} + + + % elif is_unfulfilled_entitlement: + + + % if not entitlement_expired_at: + % if entitlement_expiration_date: + ${_('You must select a session by {expiration_date} to access the course.').format(expiration_date=entitlement_expiration_date)} + % else: + ${_('You must select a session to access the course.')} + % endif + % endif + + % else: + % if isinstance(course_date, str): + ${container_string.format(date=course_date)} + % elif course_date is not None: + + % endif + % endif + % if entitlement: + % if not entitlement_expired_at: + + % endif + % endif + + % if entitlement and not is_unfulfilled_entitlement and entitlement_expiration_date: +
    + + % if entitlement_expired_at: + ${_('You can no longer change sessions.')} + % else: + ${_('You can change sessions until {entitlement_expiration_date}.').format(entitlement_expiration_date=entitlement_expiration_date)} + % endif +
    + % endif +
    +
    + + +
    +
    +
    +
    +
    + + % if entitlement and not entitlement_expired_at: +
    + <%static:webpack entry="EntitlementFactory"> + EntitlementFactory({ + el: '${ '#course-card-' + str(course_card_index) + ' .course-entitlement-selection-container' | n, js_escaped_string }', + triggerOpenBtn: '${ '#course-card-' + str(course_card_index) + ' .change-session' | n, js_escaped_string }', + courseCardMessages: '${ '#course-card-' + str(course_card_index) + ' .messages-list > .message' | n, js_escaped_string }', + courseTitleLink: '${ '#course-card-' + str(course_card_index) + ' .course-title a' | n, js_escaped_string }', + courseImageLink: '${ '#course-card-' + str(course_card_index) + ' .wrapper-course-image > a' | n, js_escaped_string }', + dateDisplayField: '${ '#course-card-' + str(course_card_index) + ' .info-date-block' | n, js_escaped_string }', + policyMsg: '${ '#course-card-' + str(course_card_index) + ' .info-expires-at' | n, js_escaped_string }', + enterCourseBtn: '${ '#course-card-' + str(course_card_index) + ' .enter-course' | n, js_escaped_string }', + availableSessions: '${ entitlement_available_sessions | n, dump_js_escaped_json }', + entitlementUUID: '${ entitlement.course_uuid | n, js_escaped_string }', + currentSessionId: '${ entitlement_session.course_id if entitlement_session else "" | n, js_escaped_string }', + enrollUrl: '${ reverse('entitlements_api:v1:enrollments', args=[str(entitlement.uuid)]) | n, js_escaped_string }', + courseHomeUrl: '${ course_target | n, js_escaped_string }', + expiredAt: '${ entitlement.expired_at_datetime | n, js_escaped_string }', + daysUntilExpiration: '${ entitlement.get_days_until_expiration() | n, js_escaped_string }' + }); + + %endif + + % if related_programs: +
    + ${_('Related Programs')}: + +
    + % endif + + % if cert_status: + <%include file='_dashboard_certificate_information.html' args='cert_status=cert_status, course_ended_not_passing=course_ended_not_passing, course_overview=course_overview, enrollment=enrollment, reverify_link=reverify_link'/> + % endif + + % if credit_status is not None: + <%include file="_dashboard_credit_info.html" args="credit_status=credit_status"/> + % endif + + % if show_consent_link: + <%include file="_dashboard_show_consent.html" args="course_overview=course_overview, course_target=course_target, enrollment=enrollment, enterprise_customer_name=enterprise_customer_name"/> + %endif + + % if display_course_upgrade: +
    +
    +
    + +
    + % if enrollment.course_id in enrollments_fbe_is_on: + ${Text(_("{start_bold}Get the most out of your course!{end_bold} Upgrade to get full access to the course material, unlock both graded and non-graded assignments, and earn a {link_start}verified certificate{link_end} to showcase on your resumé.")).format( + start_bold=HTML(''), + end_bold=HTML(''), + link_start=HTML('').format( + marketing_link('WHAT_IS_VERIFIED_CERT'), + enrollment.course_id + ), + link_end=HTML('') + )} + % else: + ${Text(_("{start_bold}Get the most out of your course!{end_bold} Upgrade to earn a {link_start}verified certificate{link_end} to showcase on your resumé.")).format( + start_bold=HTML(''), + end_bold=HTML(''), + link_start=HTML('').format( + marketing_link('WHAT_IS_VERIFIED_CERT'), + enrollment.course_id + ), + link_end=HTML('') + )} + % endif +
    +
    +
    + + + ${_("Upgrade")} +  ${_(course_overview.display_name_with_default)} + + +
    +
    +
    + % endif + + % if course_requirements: + ## Multiple pre-requisite courses are not supported on frontend that's why we are pulling first element + <% prc_target = reverse('about_course', args=[str(course_requirements['courses'][0]['key'])]) %> +
    +

    + ${Text(_("You must successfully complete {link_start}{prc_display}{link_end} before you begin this course.")).format( + link_start=HTML('').format(prc_target), + link_end=HTML(''), + prc_display=course_requirements['courses'][0]['display'], + )} +

    +
    + % endif +
    +
    +
    +
    +
    • + +% if share_settings.get('DASHBOARD_FACEBOOK', False) and share_settings.get('DASHBOARD_TWITTER', False): + <%static:require_module_async module_name="js/course_sharing/course_sharing_events" class_name="CourseSharingEvents"> + CourseSharingEvents("${course_overview.id | n, js_escaped_string}"); + +%endif + +<%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory"> + DateUtilFactory.transform(iterationKey=".localized-datetime"); + + +% if UPSELL_TRACKING_FLAG.is_enabled(): + <%static:require_module_async module_name="js/commerce/track_ecommerce_events" class_name="TrackECommerceEvents"> + if (window.loadedECommerceEvents === undefined) { + window.loadedECommerceEvents = true; + + TrackECommerceEvents.trackUpsellClick($(".track_course_dashboard_green_button"), 'course_dashboard_green', { + pageName: "course_dashboard", + linkType: "button", + linkCategory: "green_upgrade" + }); + } + + +%endif diff --git a/tutorindigo/templates/indigo/lms/templates/dashboard/_dashboard_course_resume.html b/tutorindigo/templates/indigo/lms/templates/dashboard/_dashboard_course_resume.html new file mode 100644 index 000000000..c2b6365c8 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/dashboard/_dashboard_course_resume.html @@ -0,0 +1,26 @@ +<%page args="resume_button_url, course_overview, enrollment, is_unfulfilled_entitlement, course_target, related_programs" expression_filter="h"/> + +<%! +import six +from django.utils.translation import gettext as _ +%> + +% if resume_button_url != '': + + ${_('Resume Course')} + +  ${course_overview.display_name_with_default} + + +% else: + + ${_('Start Course')} + +  ${course_overview.display_name_with_default} + + +% endif diff --git a/tutorindigo/templates/indigo/lms/templates/footer.html b/tutorindigo/templates/indigo/lms/templates/footer.html index 2032192ff..e325767d4 100644 --- a/tutorindigo/templates/indigo/lms/templates/footer.html +++ b/tutorindigo/templates/indigo/lms/templates/footer.html @@ -11,66 +11,68 @@ <%namespace name='static' file='static_content.html'/> % if uses_bootstrap: -profile icon -
    -
    -
    -
    - {% if INDIGO_FOOTER_NAV_LINKS %} - - {% endif %} - - ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear. -

    ${footer['copyright']} - % if icp_license_info.get('icp_license'): - ${u" | {text}".format(text=icp_license_info.get('text'))} - - ${u" {icp}".format(icp=icp_license_info.get('icp_license'))} - - % endif -

    - - {% if INDIGO_FOOTER_LEGAL_LINKS %} - - {% endif %} -
    -
    - ## Please leave this link and use one of the logos provided - ## The OpenEdX link may be hidden when this view is served - ## through an API to partner sites (such as marketing sites or blogs), - ## which are not technically powered by Open edX. - % if not hide_openedx_link: -
    -

    - - Runs on Tutor - - - ${footer['openedx_link']['title']} - -

    -
    - % endif -
    -
    -
    +
    +
    +
    +
    + ## Please leave this link and use one of the logos provided + ## The OpenEdX link may be hidden when this view is served + ## through an API to partner sites (such as marketing sites or blogs), + ## which are not technically powered by OpenEdX. + % if not hide_openedx_link: + +
    + {% if INDIGO_FOOTER_NAV_LINKS %} +
    + Copyrights ©2023. All Rights Reserved. + % endif +
    + + {% endif %} + % if context.get('include_language_selector', footer_language_selector_is_enabled()): + <%include file="${static.get_template_path('widgets/footer-language-selector.html')}"/> + % endif + + ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear. +

    ${footer['copyright']} + % if icp_license_info.get('icp_license'): + ${u" | {text}".format(text=icp_license_info.get('text'))} + + ${u" {icp}".format(icp=icp_license_info.get('icp_license'))} + + % endif +

    +
    +
    +
    % else:
    Date: Fri, 1 Dec 2023 12:47:42 +0500 Subject: [PATCH 04/17] style site --- .../lms/static/sass/courseware/_about.scss | 40 +++++++--- .../sass/partials/lms/theme/_variables.scss | 4 +- .../lms/templates/courseware/courses.html | 78 +++++++++---------- 3 files changed, 68 insertions(+), 54 deletions(-) diff --git a/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss b/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss index e87f81300..95b3af290 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss @@ -153,6 +153,10 @@ border-left: 14px solid $primary-light; padding: 24px 16px 10px 16px; margin: 0 0 20px; + .responses { + float: none; + width: 100%; + } p { margin: 0 0 14px; } @@ -184,30 +188,42 @@ &.update { position: relative; overflow: hidden; - &:after { - position: absolute; - width: 1px; - height: 100%; - content: ""; - top: 0; - left: 145px; - background: $primary-light; + @include media-breakpoint-up(md) { + &:after { + position: absolute; + width: 1px; + height: 100%; + content: ""; + top: 0; + left: 145px; + background: $primary-light; + } } .teacher-info { overflow: hidden; } .teacher-image { - width: 130px; - text-align: center; + text-align: left; border: none; height: auto; - margin: 0 30px 0 0; + margin: 0 0 5px; + float: none; + width: auto; + @include media-breakpoint-up(md) { + margin: 0 30px 0 0; + width: 130px; + float: left; + text-align: center; + } img { width: 60px; border-radius: 50%; display: block; - margin: 0 auto 12px; + margin: 0 0 12px; float: none; + @include media-breakpoint-up(md) { + margin: 0 auto 12px; + } } h3 { margin: 0; diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss index 273c3f661..ccea1a037 100644 --- a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss +++ b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss @@ -1,5 +1,5 @@ -$primary: #4B0082; -$primary-light: #F5F4FF; +$primary: #15376D; +$primary-light: #F2F7F8; // Theme fonts $font-family-title: 'Inter', sans-serif;; diff --git a/tutorindigo/templates/indigo/lms/templates/courseware/courses.html b/tutorindigo/templates/indigo/lms/templates/courseware/courses.html index 732389aec..557fc2c2a 100644 --- a/tutorindigo/templates/indigo/lms/templates/courseware/courses.html +++ b/tutorindigo/templates/indigo/lms/templates/courseware/courses.html @@ -40,51 +40,49 @@

    Unlock Your Potential: Discover New Courses Today!

    Explore a world of knowledge and enhance your skills with our diverse range of courses

    -
    -
    -
    -
    - % if course_discovery_enabled: - - % endif -
    -
    -
    - % if course_discovery_enabled: - -
    + % endif
    From df39b92b184dba314f0ce93a1c13ce08418f4a2e Mon Sep 17 00:00:00 2001 From: TanveerAhmed Date: Tue, 5 Dec 2023 10:10:53 +0500 Subject: [PATCH 05/17] update card --- .../indigo/lms/static/images/profile.svg | 38 +++++++++---------- .../discovery/course_card.underscore | 31 +++++++++++++++ 2 files changed, 50 insertions(+), 19 deletions(-) create mode 100644 tutorindigo/templates/indigo/lms/templates/discovery/course_card.underscore diff --git a/tutorindigo/templates/indigo/lms/static/images/profile.svg b/tutorindigo/templates/indigo/lms/static/images/profile.svg index c4e2dcc41..5f4befb56 100644 --- a/tutorindigo/templates/indigo/lms/static/images/profile.svg +++ b/tutorindigo/templates/indigo/lms/static/images/profile.svg @@ -1,26 +1,26 @@ - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + diff --git a/tutorindigo/templates/indigo/lms/templates/discovery/course_card.underscore b/tutorindigo/templates/indigo/lms/templates/discovery/course_card.underscore new file mode 100644 index 000000000..9aa395c09 --- /dev/null +++ b/tutorindigo/templates/indigo/lms/templates/discovery/course_card.underscore @@ -0,0 +1,31 @@ +
    +
    +
    + <%- content.display_name %> <%- content.number %> +
    + + +
    +
      +
    • <%- org %>
      • +
    • <%- content.number %>
      • +
    • <%- gettext("Starts") %>
      • +
    +
    + From 6de17003059a307ce3860a5bf0e0a5700f0f9965 Mon Sep 17 00:00:00 2001 From: TanveerAhmed Date: Wed, 6 Dec 2023 16:14:23 +0500 Subject: [PATCH 06/17] update logo --- .../indigo/lms/static/images/favicon.ico | Bin 12206 -> 4286 bytes .../indigo/lms/static/images/tutor-logo.png | Bin 14135 -> 37976 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tutorindigo/templates/indigo/lms/static/images/favicon.ico b/tutorindigo/templates/indigo/lms/static/images/favicon.ico index 5bc7c23de6143c2fb83b76060cce2632319fe12c..f455454c554a2c74c64f4708539a1fc26b1f7e12 100644 GIT binary patch literal 4286 zcmeHL$xo9(9R2(cJb4k7O%|7+xBvkWgCbFgf}j$;X%umb2M!veCZ3H(qcL$K#5Kma z#CUK=WALI;ahH~^P}y3FE#05#>&%r31o4-gtnpL3 zI#JUmX_}TLni$ebMB})8#N5bd`ZOI9Eulfe0|^hr^FaDk9oS;cr%llzHK|=Tg&7SW zE5>MJj6Zi~2lD3`z;}fuM|Qd%<)tQUT;GYh8mq(+lb35i?(B{zyjnM&J~c^)!UYE0 zxiyGqEp8O$8Kn;7o-?BZP3Iiw=?TE&3Bhg;Vr`Wb`GWh&BNy)7{eeaKMxo1a&g11S zFE!)Eb2s?tbv~?GVU~NM-aG1T@OndX&gToE`+ER2t1MWt%nV(-PmaHAbz^0jdE7Zr z!@624K7R1ZIB#BiP+e*H?E&uT)Cs$sb2@|A+t`iDaQWf&VT;o#fEjA zW2%Mn&(3W&SS^0J{?P*$N{dZVdmzX8vkp0LH26?3-++|K!yaXRONxwmc>jmQbXxt` z)nJp}Q5>;qF>|^ehY$9`A!->2gmCS$6M1u^eaCep`HL0`Ux=I{V-mA)jsaIL4#4jZ z!Qlwv@S$FiBNC_HS<~IyZPH6jn%_jmrx@cs)I7-Qm?1Njt|KBW%iQoO1s zcKsSFOvbQx==ZWE(Yh0xnJQw6yqcTB{KS_Q8|7GLO0)*dbJ=1OTAsLM9f&0dxfE|? z&)U?kw&2}ckHo)k^I%=|FrM-Fz4e6~wyv;0JVPPSpU*|UmCM8DgE7fbE6!uvyKpS_ z{61R!xlZO>V#3qM;hfDTKN_~!qyMAlg^3;Vg z5tFea_Z#m$P2hOnUBBiOJ_P#v130+92ia+QRERxZY97EBajy6b4hC`i<{+9cIIvV` zP0WFPJ?QHTAQ%L0Tz8^?cjp+nRZi3|CtHt`$L$yr8Z#cX=N{OUr+EI9|2WS2_5QjO zPoK0SN8FR~>aDoq_0%ydRgXhr@5hh!V|J!qYRh78ksSV=sS@`h^NPf)a}bGF^MA8v{IPoKZ}KK$jqMyKbV}&- Nzk6Wh{{#N@_n*j*OK<=H literal 12206 zcmd6tTZmOv7{~W;7c++^;DYHTp_0(BE`!jl!oT%_g{N`htqbQIcv{3( zYn^>NCrJwYtzVV!zm$BiI!SI#lH@M19`pn0-G21VVuAW>5`@qdcT4V4j(6L&5tJW)5$Jp%~f}bUeJDZaH>AaVEv>sz?R}JUEi{Lur zr?J;%&l%McwSXctx*U2a3_mP4NWc>pZ2}FMuqE(7x=x0!u+O zCE0o(`R2*>9`>uee{{ZjhCbeE>Tkl=sb>wqkGoK31L{i0c~8rNXA$x(5PP2c7uylA1;nJuWuus21NaOmSE%N! zZWy}(pjx8x$qs1V-vqJuV^^^K2)OecGAdUdBgGV0)9py*QqF9>p?&pAwWy|PQ|dUl z5y<`$2*nHO_F}7RgX1`Dk_HdzGwpLJXNXHkr&?_+SS`i?G2U|?M}|> z9>jhYRFi5`jg@(_F>)jL6@>a1(v4x;2i&|zlW&qCdD9-090zd;aSZ8HqiS_M@Uj>A z8wlBlbfeg=8(%(m&tGbzk^llp8w>lYr!ud_MTGb!ChcZuKl*)$S>~VuoH+=%)F~c)oRy2H;?S! z3H1IT_S~uat`EVS^nkopyEw$&1FE)nfogSitCu!L>fZlta0$fraxb>72S}TmS(W-O z%;!|@*fpz~RGVt7)Lu>0>u37>Gwatz<4yhQw`z}>BiU%)_59;%udX>e#zwud=ik_C zgMFr+^#0kf4ewiA;raX|5Xo|lk6fLM-tH?a!@ zdw^bX3%uX#MjiyQam7JgX1#XnAGy*sIj8`5UdH z5r5-=>;&(CGhn(pbnp7V`vUgWN9jHX(_QNnTRD`=^}Z4A&Ga=s$Q|G;2=(AJ`fhMl zYU##0dews;LC9AzcT7IEtEK9$F2vQ4&PzYz?6Z^RZW}06`&5rPpXl1K6=c_tV)c)4 zZ5&^*soJIG#_+UrLLcK{py#wxKy^(!cXr&{%16G6p;*)Uwo)TJSIuP+><4;36~*7| zywCoT&fXH^;5|b#YA%;A7cX{|*-TEgPqk}*vTbOgPH-Gb_FPGDloN2{p#(RMVRKOuALolBD#cugTUo|wuEByr zD45LUs1$OnNYi_}!9>TCg2l18mdE9tOp2bzp0X0at1QO^uEyKym`d7RT{zsT&=IE{12Z?r`iAj diff --git a/tutorindigo/templates/indigo/lms/static/images/tutor-logo.png b/tutorindigo/templates/indigo/lms/static/images/tutor-logo.png index 093ebedf98001924f1c6fcc49f4ac3b0172d7fed..33a146ebf2be9856d64649841f02e7c95589cdc1 100644 GIT binary patch literal 37976 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 z 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 Date: Thu, 7 Dec 2023 12:21:50 +0500 Subject: [PATCH 07/17] remove static pages --- .../indigo/cms/static/images/favicon.ico | Bin 12206 -> 4286 bytes .../lms/templates/static_templates/about.html | 16 ---------------- 2 files changed, 16 deletions(-) delete mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/about.html diff --git a/tutorindigo/templates/indigo/cms/static/images/favicon.ico b/tutorindigo/templates/indigo/cms/static/images/favicon.ico index 5bc7c23de6143c2fb83b76060cce2632319fe12c..f455454c554a2c74c64f4708539a1fc26b1f7e12 100644 GIT binary patch literal 4286 zcmeHL$xo9(9R2(cJb4k7O%|7+xBvkWgCbFgf}j$;X%umb2M!veCZ3H(qcL$K#5Kma z#CUK=WALI;ahH~^P}y3FE#05#>&%r31o4-gtnpL3 zI#JUmX_}TLni$ebMB})8#N5bd`ZOI9Eulfe0|^hr^FaDk9oS;cr%llzHK|=Tg&7SW zE5>MJj6Zi~2lD3`z;}fuM|Qd%<)tQUT;GYh8mq(+lb35i?(B{zyjnM&J~c^)!UYE0 zxiyGqEp8O$8Kn;7o-?BZP3Iiw=?TE&3Bhg;Vr`Wb`GWh&BNy)7{eeaKMxo1a&g11S zFE!)Eb2s?tbv~?GVU~NM-aG1T@OndX&gToE`+ER2t1MWt%nV(-PmaHAbz^0jdE7Zr z!@624K7R1ZIB#BiP+e*H?E&uT)Cs$sb2@|A+t`iDaQWf&VT;o#fEjA zW2%Mn&(3W&SS^0J{?P*$N{dZVdmzX8vkp0LH26?3-++|K!yaXRONxwmc>jmQbXxt` z)nJp}Q5>;qF>|^ehY$9`A!->2gmCS$6M1u^eaCep`HL0`Ux=I{V-mA)jsaIL4#4jZ z!Qlwv@S$FiBNC_HS<~IyZPH6jn%_jmrx@cs)I7-Qm?1Njt|KBW%iQoO1s zcKsSFOvbQx==ZWE(Yh0xnJQw6yqcTB{KS_Q8|7GLO0)*dbJ=1OTAsLM9f&0dxfE|? z&)U?kw&2}ckHo)k^I%=|FrM-Fz4e6~wyv;0JVPPSpU*|UmCM8DgE7fbE6!uvyKpS_ z{61R!xlZO>V#3qM;hfDTKN_~!qyMAlg^3;Vg z5tFea_Z#m$P2hOnUBBiOJ_P#v130+92ia+QRERxZY97EBajy6b4hC`i<{+9cIIvV` zP0WFPJ?QHTAQ%L0Tz8^?cjp+nRZi3|CtHt`$L$yr8Z#cX=N{OUr+EI9|2WS2_5QjO zPoK0SN8FR~>aDoq_0%ydRgXhr@5hh!V|J!qYRh78ksSV=sS@`h^NPf)a}bGF^MA8v{IPoKZ}KK$jqMyKbV}&- Nzk6Wh{{#N@_n*j*OK<=H literal 12206 zcmd6tTZmOv7{~W;7c++^;DYHTp_0(BE`!jl!oT%_g{N`htqbQIcv{3( zYn^>NCrJwYtzVV!zm$BiI!SI#lH@M19`pn0-G21VVuAW>5`@qdcT4V4j(6L&5tJW)5$Jp%~f}bUeJDZaH>AaVEv>sz?R}JUEi{Lur zr?J;%&l%McwSXctx*U2a3_mP4NWc>pZ2}FMuqE(7x=x0!u+O zCE0o(`R2*>9`>uee{{ZjhCbeE>Tkl=sb>wqkGoK31L{i0c~8rNXA$x(5PP2c7uylA1;nJuWuus21NaOmSE%N! zZWy}(pjx8x$qs1V-vqJuV^^^K2)OecGAdUdBgGV0)9py*QqF9>p?&pAwWy|PQ|dUl z5y<`$2*nHO_F}7RgX1`Dk_HdzGwpLJXNXHkr&?_+SS`i?G2U|?M}|> z9>jhYRFi5`jg@(_F>)jL6@>a1(v4x;2i&|zlW&qCdD9-090zd;aSZ8HqiS_M@Uj>A z8wlBlbfeg=8(%(m&tGbzk^llp8w>lYr!ud_MTGb!ChcZuKl*)$S>~VuoH+=%)F~c)oRy2H;?S! z3H1IT_S~uat`EVS^nkopyEw$&1FE)nfogSitCu!L>fZlta0$fraxb>72S}TmS(W-O z%;!|@*fpz~RGVt7)Lu>0>u37>Gwatz<4yhQw`z}>BiU%)_59;%udX>e#zwud=ik_C zgMFr+^#0kf4ewiA;raX|5Xo|lk6fLM-tH?a!@ zdw^bX3%uX#MjiyQam7JgX1#XnAGy*sIj8`5UdH z5r5-=>;&(CGhn(pbnp7V`vUgWN9jHX(_QNnTRD`=^}Z4A&Ga=s$Q|G;2=(AJ`fhMl zYU##0dews;LC9AzcT7IEtEK9$F2vQ4&PzYz?6Z^RZW}06`&5rPpXl1K6=c_tV)c)4 zZ5&^*soJIG#_+UrLLcK{py#wxKy^(!cXr&{%16G6p;*)Uwo)TJSIuP+><4;36~*7| zywCoT&fXH^;5|b#YA%;A7cX{|*-TEgPqk}*vTbOgPH-Gb_FPGDloN2{p#(RMVRKOuALolBD#cugTUo|wuEByr zD45LUs1$OnNYi_}!9>TCg2l18mdE9tOp2bzp0X0at1QO^uEyKym`d7RT{zsT&=IE{12Z?r`iAj diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/about.html b/tutorindigo/templates/indigo/lms/templates/static_templates/about.html deleted file mode 100644 index 57d7b09db..000000000 --- a/tutorindigo/templates/indigo/lms/templates/static_templates/about.html +++ /dev/null @@ -1,16 +0,0 @@ -<%page expression_filter="h"/> -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="../main.html" /> - -<%block name="pagetitle">${_("About")} - -
    -
    -

    - <%block name="pageheader">${page_header or _("About")} -

    -

    - <%block name="pagecontent">{{ PLATFORM_NAME }} is an online learning platform powered by Open edX. It runs with Tutor, with the customized Indigo theme. -

    -
    -
    From 0d47fddc58f1ce53ac14b98fbd2bbb32d29c8175 Mon Sep 17 00:00:00 2001 From: TanveerAhmed Date: Thu, 7 Dec 2023 12:31:02 +0500 Subject: [PATCH 08/17] remove files --- .../lms/templates/static_templates/blog.html | 16 ---------------- .../lms/templates/static_templates/contact.html | 16 ---------------- .../lms/templates/static_templates/donate.html | 16 ---------------- .../lms/templates/static_templates/help.html | 16 ---------------- .../lms/templates/static_templates/privacy.html | 17 ----------------- .../lms/templates/static_templates/tos.html | 16 ---------------- 6 files changed, 97 deletions(-) delete mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/blog.html delete mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/contact.html delete mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/donate.html delete mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/help.html delete mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/privacy.html delete mode 100644 tutorindigo/templates/indigo/lms/templates/static_templates/tos.html diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/blog.html b/tutorindigo/templates/indigo/lms/templates/static_templates/blog.html deleted file mode 100644 index ba4d1ebae..000000000 --- a/tutorindigo/templates/indigo/lms/templates/static_templates/blog.html +++ /dev/null @@ -1,16 +0,0 @@ -<%page expression_filter="h"/> -<%! from django.utils.translation import gettext as _ %> -<%inherit file="../main.html" /> - -<%block name="pagetitle">${_("Blog")} - -
    -
    -

    - <%block name="pageheader">${page_header or _("Blog")} -

    -

    - <%block name="pagecontent">${page_content or _("This page left intentionally blank. Feel free to add your own content.")} -

    -
    -
    diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/contact.html b/tutorindigo/templates/indigo/lms/templates/static_templates/contact.html deleted file mode 100644 index f2ffd706d..000000000 --- a/tutorindigo/templates/indigo/lms/templates/static_templates/contact.html +++ /dev/null @@ -1,16 +0,0 @@ -<%page expression_filter="h"/> -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="../main.html" /> - -<%block name="pagetitle">${_("Contact")} - -
    -
    -

    - <%block name="pageheader">${page_header or _("Contact")} -

    -

    - <%block name="pagecontent">For any question regarding the usage of {{ PLATFORM_NAME }}, please get in touch with {{ CONTACT_EMAIL }}. -

    -
    -
    \ No newline at end of file diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/donate.html b/tutorindigo/templates/indigo/lms/templates/static_templates/donate.html deleted file mode 100644 index 22f7a80df..000000000 --- a/tutorindigo/templates/indigo/lms/templates/static_templates/donate.html +++ /dev/null @@ -1,16 +0,0 @@ -<%page expression_filter="h"/> -<%! from django.utils.translation import gettext as _ %> -<%inherit file="../main.html" /> - -<%block name="pagetitle">${_("Donate")} - -
    -
    -

    - <%block name="pageheader">${page_header or _("Donate")} -

    -

    - <%block name="pagecontent">${page_content or _("This page left intentionally blank. Feel free to add your own content.")} -

    -
    -
    diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/help.html b/tutorindigo/templates/indigo/lms/templates/static_templates/help.html deleted file mode 100644 index 054187b85..000000000 --- a/tutorindigo/templates/indigo/lms/templates/static_templates/help.html +++ /dev/null @@ -1,16 +0,0 @@ -<%page expression_filter="h"/> -<%! from django.utils.translation import gettext as _ %> -<%inherit file="../main.html" /> - -<%block name="pagetitle">${_("Help")} - -
    -
    -

    - <%block name="pageheader">${page_header or _("Help")} -

    -

    - <%block name="pagecontent">${page_content or _("This page left intentionally blank. Feel free to add your own content.")} -

    -
    -
    diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/privacy.html b/tutorindigo/templates/indigo/lms/templates/static_templates/privacy.html deleted file mode 100644 index 2ed74c748..000000000 --- a/tutorindigo/templates/indigo/lms/templates/static_templates/privacy.html +++ /dev/null @@ -1,17 +0,0 @@ -<%page expression_filter="h"/> -<%! from django.utils.translation import gettext as _ %> - -<%inherit file="../main.html" /> - -<%block name="pagetitle">${_("Privacy Policy")} - -
    -
    -

    - <%block name="pageheader">${page_header or _("Privacy Policy")} -

    -

    - <%block name="pagecontent">${page_content or _("This page left intentionally blank. Feel free to add your own content.")} -

    -
    -
    diff --git a/tutorindigo/templates/indigo/lms/templates/static_templates/tos.html b/tutorindigo/templates/indigo/lms/templates/static_templates/tos.html deleted file mode 100644 index 73300ae51..000000000 --- a/tutorindigo/templates/indigo/lms/templates/static_templates/tos.html +++ /dev/null @@ -1,16 +0,0 @@ -<%page expression_filter="h"/> -<%! from django.utils.translation import ugettext as _ %> -<%inherit file="../main.html" /> - -<%block name="pagetitle">${_("Terms of Service")} - -
    -
    -

    - <%block name="pageheader">${page_header or _("Terms of Service")} -

    -

    - <%block name="pagecontent">The terms of service of {{ PLATFORM_NAME }} can be obtained by getting in touch with our support at {{ CONTACT_EMAIL }}. -

    -
    -
    \ No newline at end of file From 4e0916a5b4f701a2035650d428d115f57d958e68 Mon Sep 17 00:00:00 2001 From: TanveerAhmed Date: Thu, 7 Dec 2023 13:30:56 +0500 Subject: [PATCH 09/17] add comments --- tutorindigo/templates/indigo/lms/templates/course.html | 9 +++++++-- .../indigo/lms/templates/courseware/course_about.html | 5 +++-- .../courseware/course_about_sidebar_header.html | 2 +- .../indigo/lms/templates/courseware/courses.html | 2 ++ .../templates/indigo/lms/templates/dashboard.html | 3 +++ .../templates/dashboard/_dashboard_course_listing.html | 1 + .../templates/dashboard/_dashboard_course_resume.html | 2 +- tutorindigo/templates/indigo/lms/templates/footer.html | 3 ++- .../templates/indigo/lms/templates/header/brand.html | 2 +- .../lms/templates/header/navbar-not-authenticated.html | 1 + .../indigo/lms/templates/header/user_dropdown.html | 1 + .../registration/account_activation_sidebar_notice.html | 1 + 12 files changed, 24 insertions(+), 8 deletions(-) diff --git a/tutorindigo/templates/indigo/lms/templates/course.html b/tutorindigo/templates/indigo/lms/templates/course.html index cce5423fc..b3b422a69 100644 --- a/tutorindigo/templates/indigo/lms/templates/course.html +++ b/tutorindigo/templates/indigo/lms/templates/course.html @@ -17,6 +17,7 @@

    ${course.display_name_with_default} ${course.display_org_with_default}

    + <% if course.start is not None: @@ -25,11 +26,15 @@

    course_date_string = '' %> % if course.advertised_start is not None: -