From 326d21d1430778f29df36e692d804d140711f47d Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Wed, 19 Dec 2012 10:48:03 -0500 Subject: [PATCH 1/3] ie7 fixes: define indexOf, use charAt rather than [] to access string, put try/catch around fn that was throwing errors. --- lms/static/coffee/src/main.coffee | 8 ++++++++ lms/static/sass/bourbon/css3/_box-sizing.scss | 1 - lms/static/scripts/boxsizing.htc | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lms/static/coffee/src/main.coffee b/lms/static/coffee/src/main.coffee index ec5cbdec5b..3b000ba4f3 100644 --- a/lms/static/coffee/src/main.coffee +++ b/lms/static/coffee/src/main.coffee @@ -37,3 +37,11 @@ $ -> $('#signup').click -> $('#signup-modal input[name="email"]').focus() false + + # fix for ie + if !Array::indexOf + Array::indexOf = (obj, start = 0) -> + for ele, i in this[start..] + if ele is obj + return i + start + return -1 diff --git a/lms/static/sass/bourbon/css3/_box-sizing.scss b/lms/static/sass/bourbon/css3/_box-sizing.scss index 42aaaf6fc7..d61523b5f1 100644 --- a/lms/static/sass/bourbon/css3/_box-sizing.scss +++ b/lms/static/sass/bourbon/css3/_box-sizing.scss @@ -2,6 +2,5 @@ // content-box | border-box | inherit -webkit-box-sizing: $box; -moz-box-sizing: $box; - box-sizing: $box; box-sizing: $box; *behavior: url(/static/scripts/boxsizing.htc); } diff --git a/lms/static/scripts/boxsizing.htc b/lms/static/scripts/boxsizing.htc index 43bd86fae1..40f5ab4e12 100644 --- a/lms/static/scripts/boxsizing.htc +++ b/lms/static/scripts/boxsizing.htc @@ -85,7 +85,10 @@ function update(){ } resizetimeout = window.setTimeout(function(){ restore(); - init(); + try { + init(); + } + catch (err) {} resizetimeout = null; },100); } From 4bcfa84519cc7d61034f8cd6ae88fd82259a1e1c Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 19 Dec 2012 14:25:59 -0500 Subject: [PATCH 2/3] adding zendesk logo for styling purposes --- lms/static/images/logo-edx-support.png | Bin 0 -> 3288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lms/static/images/logo-edx-support.png diff --git a/lms/static/images/logo-edx-support.png b/lms/static/images/logo-edx-support.png new file mode 100644 index 0000000000000000000000000000000000000000..054647c99f1273f485e5e30031f954735c889753 GIT binary patch literal 3288 zcmXX|c|2787rqrjsmPm}EHR9|>_sKn_ccppN%ox(vSphw!w_S#&e(@3`T9qtLzn>oVA0Z4H3pv};4RL03XG@j zmqmgRFw}jZhKP*=yxv^$%#O;$hL++IeIgRIY|*|i6F3#?Va{+~g>a*XG0%fPUUW!O zwsuCQH$q(yK`+_y|Oa63Ho{Vh^w-cKOt`+71 z&rFN=46NgKsN;96fjR&VIkBnOBs3aG@5@F-(m>8y5(-(%=kSi#9?LlT4#2j1!$eaPPWK_j}Hg-%nF8w8dF&Y*3*E5hhPD^G^0~r(=I9>$wMw3mSKF)ygSR5>6 z&C&?R99rq`%CyX}jr3!aSu~wWs6BvR02@!DhFMH;Y~bg|&jQ(?Pq1tLuRU59XghqA zCPiBioB}#Iwt=6gEl3+NPvd|9OFEu=jMM+Wb!2!LCBjEKm03w8pe-)pZ<$I3P=L%n9LPDE> zryq|nV2_JKCjw4|0O31_XSUZhf#ie)@XrDAm*Z2@19-#$*L-jhRD5DR%n8U@5U2a2 z1bXf9GuAgbTwEM6N|~ylZc(Y!Wb#JASS6X-M5P{52cFt)h!B1{-pf^3{I<;8zD1ps zo)$6jx}`ZLPyJI|{b-Vee#V#3Sba~=yMBS4)%mHAtN;1Sou{Za==Llw1SC}~7%yVj zeL74+bLz}L^n#npy#MAeX@^G+t}Hw(rcRn!HxB3UId`!oal_F1al;3YEdG84JDCuF z>}dL->b(+Vd_13i9a)21e)nwI;J-^JNF}8hO^;cKIYBV5zU1&TS$xPq z!tOufwy2!Dg`}5N%admf6sn}FfHF&`%y<6Yi>l^jXGue5-b*x6C!mgJsbPwk9$cMiSogR)JNBB69 z=YP9j-&CrOE6r1u${i3S-W3mszDis zawYwdK7(B1ke-^rdLeSloeLqE9RGRSwCv}%OP5;)_n20Ou|{)m{*t&NE@G^s*meIP zu?`6fS}e`Vw=8~c6XN0R{BK_`M?!hjRNj>mrYm|-eiO+qm2G;~JeP#Pw5nyL6-xFY z_U7H4-fKc!aZmMx>U0Vw7B**PSgfq#z@f zvJZZUj}P(wC*Pdxle`qCB3scLB5Y=gg&;*XDDR9dNmV+Q4zQ}#!MhSd9gO*1czU5 zX=K%vwlG<&$m$pDQ5HC8uQxSNYt;))ImxmjO0R{&&bK=)>N-|+kDm!%H(-6moS$)F z(_y`UVbVUAZqs!8pPSzt+@~K|%GzSyd0T9kyzvS<99Txc8Eg)s5Gj%ZXGKdR0)n;V zdr88+?3jjF$AtI>h>wAR-|{~u@{4>#J*u#yP_xG@GvVE9UCk>PzK_3F6zk2+Z?sO_ z>rAKY(x;6P^w1UZc5l?wVAEDtK7I#+63!2>z!5KS`)`jayF5mEVbG9tWXIB?-Xra&V;%az zcMTmx?c{2^8DU&q&MzvD{_IhyMtY=gT3>bX`=^04ae zaH^a_#v9I|RyaKztU1Czc~&P8yDV?M>G`E%Tl%LtfYH71_wV=#z6yEcpbE@Nf9>sGbUuW)PpY3#R_XHTaobL0`vX@Q#l9IL9D>Gu4YJev^+#k}N;LqcR z4^P!*-}7G`^}S*9_lQTlag_wp15= zNost^n=IZQ1BVvGH20gjG(tA0%RjfNWs+Z4 zUnX}Lo=(Hg)JRr7mM}_Em+dDES-Y^f5$L{bbnxNbUIZ&H8W*!z6O>V$lD1Us^TS&o z-&eAf6wmKkRjo{I>k09P2YDTcjb2Nrzw<-r(m_Cm%iAZBcvpYZvqU97DE3Cw(@@1aiNuM0tGr*Mf+(_c4Adj9!LolDJhdATi^2LoNnK;hQ~=yr4lWqESe%dLc5NTL~;@FZqX7< lE~Zm Date: Wed, 19 Dec 2012 16:13:17 -0500 Subject: [PATCH 3/3] Fix links for Software as a Service courses --- .../press_releases/Spring_2013_course_announcements.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/static_templates/press_releases/Spring_2013_course_announcements.html b/lms/templates/static_templates/press_releases/Spring_2013_course_announcements.html index 7c1b82727b..19efa21dba 100644 --- a/lms/templates/static_templates/press_releases/Spring_2013_course_announcements.html +++ b/lms/templates/static_templates/press_releases/Spring_2013_course_announcements.html @@ -38,7 +38,7 @@

“I'm delighted to have my Justice course on edX,” said Michael Sandel, Ann T. and Robert M. Bass Professor of Government at Harvard University, “where students everywhere will be able to engage in a global dialogue about the big moral and civic questions of our time.”

-

In addition to these new courses, edX is bringing back several courses from the popular fall 2012 semester: Introduction to Computer Science and Programming; Introduction to Solid State Chemistry; Introduction to Artificial Intelligence; Software as a Service I; Software as a Service II; Foundations of Computer Graphics.

+

In addition to these new courses, edX is bringing back several courses from the popular fall 2012 semester: Introduction to Computer Science and Programming; Introduction to Solid State Chemistry; Introduction to Artificial Intelligence; Software as a Service I; Software as a Service II; Foundations of Computer Graphics.

This spring also features Harvard's Copyright, taught by Harvard Law School professor William Fisher III, former law clerk to Justice Thurgood Marshall and expert on the hotly debated U.S. copyright system, which will explore the current law of copyright and the ongoing debates concerning how that law should be reformed. Copyright will be offered as an experimental course, taking advantage of different combinations and uses of teaching materials, educational technologies, and the edX platform. 500 learners will be selected through an open application process that begins in late January 2013.