mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-03-13 22:49:51 -04:00
Merge branch 'master' into production
This commit is contained in:
Nick Winter
commit
0001bcf2b7
161 changed files with 2686 additions and 693 deletions
BIN
app/assets/fonts/glyphicons-halflings-regular.eot
Normal file
BIN
app/assets/fonts/glyphicons-halflings-regular.eot
Normal file
Binary file not shown.
229
app/assets/fonts/glyphicons-halflings-regular.svg
Normal file
229
app/assets/fonts/glyphicons-halflings-regular.svg
Normal file
|
|
@ -0,0 +1,229 @@
|
|||
<?xml version="1.0" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
|
||||
<svg xmlns="http://www.w3.org/2000/svg">
|
||||
<metadata></metadata>
|
||||
<defs>
|
||||
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
|
||||
<font-face units-per-em="1200" ascent="960" descent="-240" />
|
||||
<missing-glyph horiz-adv-x="500" />
|
||||
<glyph />
|
||||
<glyph />
|
||||
<glyph unicode="
" />
|
||||
<glyph unicode=" " />
|
||||
<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
|
||||
<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
|
||||
<glyph unicode=" " />
|
||||
<glyph unicode=" " horiz-adv-x="652" />
|
||||
<glyph unicode=" " horiz-adv-x="1304" />
|
||||
<glyph unicode=" " horiz-adv-x="652" />
|
||||
<glyph unicode=" " horiz-adv-x="1304" />
|
||||
<glyph unicode=" " horiz-adv-x="434" />
|
||||
<glyph unicode=" " horiz-adv-x="326" />
|
||||
<glyph unicode=" " horiz-adv-x="217" />
|
||||
<glyph unicode=" " horiz-adv-x="217" />
|
||||
<glyph unicode=" " horiz-adv-x="163" />
|
||||
<glyph unicode=" " horiz-adv-x="260" />
|
||||
<glyph unicode=" " horiz-adv-x="72" />
|
||||
<glyph unicode=" " horiz-adv-x="260" />
|
||||
<glyph unicode=" " horiz-adv-x="326" />
|
||||
<glyph unicode="€" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
|
||||
<glyph unicode="−" d="M200 400h900v300h-900v-300z" />
|
||||
<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
|
||||
<glyph unicode="☁" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
|
||||
<glyph unicode="✉" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
|
||||
<glyph unicode="✏" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
|
||||
<glyph unicode="" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
|
||||
<glyph unicode="" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
|
||||
<glyph unicode="" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
|
||||
<glyph unicode="" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
|
||||
<glyph unicode="" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
|
||||
<glyph unicode="" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
|
||||
<glyph unicode="" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
|
||||
<glyph unicode="" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
|
||||
<glyph unicode="" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
|
||||
<glyph unicode="" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
|
||||
<glyph unicode="" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
|
||||
<glyph unicode="" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
|
||||
<glyph unicode="" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
|
||||
<glyph unicode="" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
|
||||
<glyph unicode="" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
|
||||
<glyph unicode="" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
|
||||
<glyph unicode="" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
|
||||
<glyph unicode="" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
|
||||
<glyph unicode="" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
|
||||
<glyph unicode="" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
|
||||
<glyph unicode="" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
|
||||
<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
|
||||
<glyph unicode="" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
|
||||
<glyph unicode="" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
|
||||
<glyph unicode="" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
|
||||
<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
|
||||
<glyph unicode="" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
|
||||
<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
|
||||
<glyph unicode="" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
|
||||
<glyph unicode="" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
|
||||
<glyph unicode="" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
|
||||
<glyph unicode="" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
|
||||
<glyph unicode="" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
|
||||
<glyph unicode="" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
|
||||
<glyph unicode="" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
|
||||
<glyph unicode="" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
|
||||
<glyph unicode="" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
|
||||
<glyph unicode="" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
|
||||
<glyph unicode="" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
|
||||
<glyph unicode="" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
|
||||
<glyph unicode="" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
|
||||
<glyph unicode="" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
|
||||
<glyph unicode="" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
|
||||
<glyph unicode="" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
|
||||
<glyph unicode="" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
|
||||
<glyph unicode="" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
|
||||
<glyph unicode="" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
|
||||
<glyph unicode="" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
|
||||
<glyph unicode="" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
|
||||
<glyph unicode="" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
|
||||
<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
|
||||
<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
|
||||
<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
|
||||
<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
|
||||
<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
|
||||
<glyph unicode="" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
|
||||
<glyph unicode="" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
|
||||
<glyph unicode="" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
|
||||
<glyph unicode="" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
|
||||
<glyph unicode="" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
|
||||
<glyph unicode="" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
|
||||
<glyph unicode="" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
|
||||
<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
|
||||
<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
|
||||
<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
|
||||
<glyph unicode="" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
|
||||
<glyph unicode="" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
|
||||
<glyph unicode="" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
|
||||
<glyph unicode="" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
|
||||
<glyph unicode="" d="M200 0l900 550l-900 550v-1100z" />
|
||||
<glyph unicode="" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
|
||||
<glyph unicode="" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
|
||||
<glyph unicode="" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
|
||||
<glyph unicode="" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
|
||||
<glyph unicode="" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
|
||||
<glyph unicode="" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
|
||||
<glyph unicode="" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
|
||||
<glyph unicode="" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
|
||||
<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
|
||||
<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
|
||||
<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
|
||||
<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
|
||||
<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
|
||||
<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
|
||||
<glyph unicode="" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
|
||||
<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
|
||||
<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
|
||||
<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
|
||||
<glyph unicode="" d="M0 547l600 453v-300h600v-300h-600v-301z" />
|
||||
<glyph unicode="" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
|
||||
<glyph unicode="" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
|
||||
<glyph unicode="" d="M104 600h296v600h300v-600h298l-449 -600z" />
|
||||
<glyph unicode="" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
|
||||
<glyph unicode="" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
|
||||
<glyph unicode="" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
|
||||
<glyph unicode="" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
|
||||
<glyph unicode="" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
|
||||
<glyph unicode="" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
|
||||
<glyph unicode="" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
|
||||
<glyph unicode="" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
|
||||
<glyph unicode="" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
|
||||
<glyph unicode="" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
|
||||
<glyph unicode="" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
|
||||
<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
|
||||
<glyph unicode="" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
|
||||
<glyph unicode="" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
|
||||
<glyph unicode="" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
|
||||
<glyph unicode="" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
|
||||
<glyph unicode="" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
|
||||
<glyph unicode="" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
|
||||
<glyph unicode="" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
|
||||
<glyph unicode="" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
|
||||
<glyph unicode="" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
|
||||
<glyph unicode="" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
|
||||
<glyph unicode="" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
|
||||
<glyph unicode="" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
|
||||
<glyph unicode="" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
|
||||
<glyph unicode="" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
|
||||
<glyph unicode="" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
|
||||
<glyph unicode="" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
|
||||
<glyph unicode="" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
|
||||
<glyph unicode="" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
|
||||
<glyph unicode="" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
|
||||
<glyph unicode="" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
|
||||
<glyph unicode="" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
|
||||
<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
|
||||
<glyph unicode="" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
|
||||
<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
|
||||
<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
|
||||
<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
|
||||
<glyph unicode="" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
|
||||
<glyph unicode="" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
|
||||
<glyph unicode="" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
|
||||
<glyph unicode="" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
|
||||
<glyph unicode="" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
|
||||
<glyph unicode="" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
|
||||
<glyph unicode="" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
|
||||
<glyph unicode="" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
|
||||
<glyph unicode="" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
|
||||
<glyph unicode="" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
|
||||
<glyph unicode="" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
|
||||
<glyph unicode="" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
|
||||
<glyph unicode="" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
|
||||
<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
|
||||
<glyph unicode="" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
|
||||
<glyph unicode="" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
|
||||
<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
|
||||
<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
|
||||
<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
|
||||
<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
|
||||
<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
|
||||
<glyph unicode="" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
|
||||
<glyph unicode="" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
|
||||
<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
|
||||
<glyph unicode="" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
|
||||
<glyph unicode="" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
|
||||
<glyph unicode="" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
|
||||
<glyph unicode="" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
|
||||
<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
|
||||
<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
|
||||
<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
|
||||
<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
|
||||
<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
|
||||
<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
|
||||
<glyph unicode="" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
|
||||
<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
|
||||
<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
|
||||
<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
|
||||
<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
|
||||
<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
|
||||
<glyph unicode="" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
|
||||
<glyph unicode="" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
|
||||
<glyph unicode="" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
|
||||
<glyph unicode="" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
|
||||
<glyph unicode="" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
|
||||
<glyph unicode="" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
|
||||
<glyph unicode="" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
|
||||
<glyph unicode="" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
|
||||
<glyph unicode="" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
|
||||
<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
|
||||
<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
|
||||
<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
|
||||
<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
|
||||
<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
|
||||
<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
|
||||
<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
|
||||
<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
|
||||
<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
|
||||
<glyph unicode="" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
|
||||
<glyph unicode="" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
|
||||
<glyph unicode="" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
|
||||
<glyph unicode="" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
|
||||
<glyph unicode="" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
|
||||
</font>
|
||||
</defs></svg>
|
||||
|
After Width: | Height: | Size: 62 KiB |
BIN
app/assets/fonts/glyphicons-halflings-regular.ttf
Normal file
BIN
app/assets/fonts/glyphicons-halflings-regular.ttf
Normal file
Binary file not shown.
BIN
app/assets/fonts/glyphicons-halflings-regular.woff
Normal file
BIN
app/assets/fonts/glyphicons-halflings-regular.woff
Normal file
Binary file not shown.
10
app/collections/PatchesCollection.coffee
Normal file
10
app/collections/PatchesCollection.coffee
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
PatchModel = require 'models/Patch'
|
||||
CocoCollection = require 'models/CocoCollection'
|
||||
|
||||
module.exports = class PatchesCollection extends CocoCollection
|
||||
model: PatchModel
|
||||
|
||||
initialize: (models, options, forModel, @status='pending') ->
|
||||
super(arguments...)
|
||||
@url = "#{forModel.urlRoot}/#{forModel.get('original')}/patches?status=#{@status}"
|
||||
|
||||
17
app/lib/NameLoader.coffee
Normal file
17
app/lib/NameLoader.coffee
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
CocoClass = require 'lib/CocoClass'
|
||||
|
||||
namesCache = {}
|
||||
|
||||
class NameLoader extends CocoClass
|
||||
loadNames: (ids) ->
|
||||
toLoad = (id for id in ids when not namesCache[id])
|
||||
return false unless toLoad.length
|
||||
jqxhr = $.ajax('/db/user/x/names', {type:'POST', data:{ids:toLoad}})
|
||||
jqxhr.done @loadedNames
|
||||
|
||||
loadedNames: (newNames) =>
|
||||
_.extend namesCache, newNames
|
||||
|
||||
getName: (id) -> namesCache[id]
|
||||
|
||||
module.exports = new NameLoader()
|
||||
158
app/lib/deltas.coffee
Normal file
158
app/lib/deltas.coffee
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
###
|
||||
Good-to-knows:
|
||||
dataPath: an array of keys that walks you up a JSON object that's being patched
|
||||
ex: ['scripts', 0, 'description']
|
||||
deltaPath: an array of keys that walks you up a JSON Diff Patch object.
|
||||
ex: ['scripts', '_0', 'description']
|
||||
###
|
||||
|
||||
module.exports.expandDelta = (delta, left, schema) ->
|
||||
flattenedDeltas = flattenDelta(delta)
|
||||
(expandFlattenedDelta(fd, left, schema) for fd in flattenedDeltas)
|
||||
|
||||
|
||||
flattenDelta = (delta, dataPath=null, deltaPath=null) ->
|
||||
# takes a single jsondiffpatch delta and returns an array of objects with
|
||||
return [] unless delta
|
||||
dataPath ?= []
|
||||
deltaPath ?= []
|
||||
return [{dataPath:dataPath, deltaPath: deltaPath, o:delta}] if _.isArray delta
|
||||
|
||||
results = []
|
||||
affectingArray = delta._t is 'a'
|
||||
for deltaIndex, childDelta of delta
|
||||
continue if deltaIndex is '_t'
|
||||
dataIndex = if affectingArray then parseInt(deltaIndex.replace('_', '')) else deltaIndex
|
||||
results = results.concat flattenDelta(
|
||||
childDelta, dataPath.concat([dataIndex]), deltaPath.concat([deltaIndex]))
|
||||
results
|
||||
|
||||
|
||||
expandFlattenedDelta = (delta, left, schema) ->
|
||||
# takes a single flattened delta and converts into an object that can be
|
||||
# easily formatted into something human readable.
|
||||
|
||||
delta.action = '???'
|
||||
o = delta.o # the raw jsondiffpatch delta
|
||||
|
||||
if _.isArray(o) and o.length is 1
|
||||
delta.action = 'added'
|
||||
delta.newValue = o[0]
|
||||
|
||||
if _.isArray(o) and o.length is 2
|
||||
delta.action = 'modified'
|
||||
delta.oldValue = o[0]
|
||||
delta.newValue = o[1]
|
||||
|
||||
if _.isArray(o) and o.length is 3 and o[1] is 0 and o[2] is 0
|
||||
delta.action = 'deleted'
|
||||
delta.oldValue = o[0]
|
||||
|
||||
if _.isPlainObject(o) and o._t is 'a'
|
||||
delta.action = 'modified-array'
|
||||
|
||||
if _.isPlainObject(o) and o._t isnt 'a'
|
||||
delta.action = 'modified-object'
|
||||
|
||||
if _.isArray(o) and o.length is 3 and o[1] is 0 and o[2] is 3
|
||||
delta.action = 'moved-index'
|
||||
delta.destinationIndex = o[1]
|
||||
delta.originalIndex = delta.dataPath[delta.dataPath.length-1]
|
||||
|
||||
if _.isArray(o) and o.length is 3 and o[1] is 0 and o[2] is 2
|
||||
delta.action = 'text-diff'
|
||||
delta.unidiff = o[0]
|
||||
|
||||
humanPath = []
|
||||
parentLeft = left
|
||||
parentSchema = schema
|
||||
for key, i in delta.dataPath
|
||||
# TODO: A more comprehensive way of getting child schemas
|
||||
childSchema = parentSchema?.items or parentSchema?.properties?[key] or {}
|
||||
childLeft = parentLeft?[key]
|
||||
humanKey = null
|
||||
childData = if i is delta.dataPath.length-1 and delta.action is 'added' then o[0] else childLeft
|
||||
humanKey ?= childData.name or childData.id if childData
|
||||
humanKey ?= "#{childSchema.title} ##{key+1}" if childSchema.title and _.isNumber(key)
|
||||
humanKey ?= "#{childSchema.title}" if childSchema.title
|
||||
humanKey ?= _.string.titleize key
|
||||
humanPath.push humanKey
|
||||
parentLeft = childLeft
|
||||
parentSchema = childSchema
|
||||
|
||||
delta.humanPath = humanPath.join(' :: ')
|
||||
delta.schema = childSchema
|
||||
delta.left = childLeft
|
||||
delta.right = jsondiffpatch.patch childLeft, delta.o unless delta.action is 'moved-index'
|
||||
|
||||
delta
|
||||
|
||||
module.exports.makeJSONDiffer = ->
|
||||
hasher = (obj) -> obj.name || obj.id || obj._id || JSON.stringify(_.keys(obj))
|
||||
jsondiffpatch.create({objectHash:hasher})
|
||||
|
||||
module.exports.getConflicts = (headDeltas, pendingDeltas) ->
|
||||
# headDeltas and pendingDeltas should be lists of deltas returned by interpretDelta
|
||||
# Returns a list of conflict objects with properties:
|
||||
# headDelta
|
||||
# pendingDelta
|
||||
# The deltas that have conflicts also have conflict properties pointing to one another.
|
||||
|
||||
headPathMap = groupDeltasByAffectingPaths(headDeltas)
|
||||
pendingPathMap = groupDeltasByAffectingPaths(pendingDeltas)
|
||||
paths = _.keys(headPathMap).concat(_.keys(pendingPathMap))
|
||||
|
||||
# Here's my thinking:
|
||||
# A) Conflicts happen when one delta path is a substring of another delta path
|
||||
# B) A delta from one self-consistent group cannot conflict with another
|
||||
# So, sort the paths, which will naturally make conflicts adjacent,
|
||||
# and if one is identified, one path is from the headDeltas, the other is from pendingDeltas
|
||||
# This is all to avoid an O(nm) brute force search.
|
||||
|
||||
conflicts = []
|
||||
paths.sort()
|
||||
for path, i in paths
|
||||
continue if i + 1 is paths.length
|
||||
nextPath = paths[i+1]
|
||||
if nextPath.startsWith path
|
||||
headDelta = (headPathMap[path] or headPathMap[nextPath])[0].delta
|
||||
pendingDelta = (pendingPathMap[path] or pendingPathMap[nextPath])[0].delta
|
||||
conflicts.push({headDelta:headDelta, pendingDelta:pendingDelta})
|
||||
pendingDelta.conflict = headDelta
|
||||
headDelta.conflict = pendingDelta
|
||||
|
||||
return conflicts if conflicts.length
|
||||
|
||||
groupDeltasByAffectingPaths = (deltas) ->
|
||||
metaDeltas = []
|
||||
for delta in deltas
|
||||
conflictPaths = []
|
||||
if delta.action is 'moved-index'
|
||||
# every other action affects just the data path, but moved indexes affect a swath
|
||||
indices = [delta.originalIndex, delta.destinationIndex]
|
||||
indices.sort()
|
||||
for index in _.range(indices[0], indices[1]+1)
|
||||
conflictPaths.push delta.dataPath.slice(0, delta.dataPath.length-1).concat(index)
|
||||
else
|
||||
conflictPaths.push delta.dataPath
|
||||
for path in conflictPaths
|
||||
metaDeltas.push {
|
||||
delta: delta
|
||||
path: (item.toString() for item in path).join('/')
|
||||
}
|
||||
_.groupBy metaDeltas, 'path'
|
||||
|
||||
module.exports.pruneConflictsFromDelta = (delta, conflicts) ->
|
||||
# the jsondiffpatch delta mustn't include any dangling nodes,
|
||||
# or else things will get removed which shouldn't be, or errors will occur
|
||||
for conflict in conflicts
|
||||
prunePath delta, conflict.pendingDelta.deltaPath
|
||||
if _.isEmpty delta then undefined else delta
|
||||
|
||||
prunePath = (delta, path) ->
|
||||
if path.length is 1
|
||||
delete delta[path]
|
||||
else
|
||||
prunePath delta[path[0]], path.slice(1)
|
||||
keys = (k for k in _.keys(delta[path[0]]) when k isnt '_t')
|
||||
delete delta[path[0]] if keys.length is 0
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
module.exports = [
|
||||
{
|
||||
"id": "Add Default Goals",
|
||||
"channel": "god:new-world-created",
|
||||
"noteChain": [
|
||||
{
|
||||
"goals": {
|
||||
"add": [
|
||||
{
|
||||
"name": "Humans Survive",
|
||||
"id": "humans-survive",
|
||||
"saveThangs": [
|
||||
"humans"
|
||||
],
|
||||
"worldEndsAfter": 3,
|
||||
"howMany": 1,
|
||||
"hiddenGoal": true
|
||||
},
|
||||
{
|
||||
"name": "Ogres Die",
|
||||
"id": "ogres-die",
|
||||
"killThangs": [
|
||||
"ogres"
|
||||
],
|
||||
"worldEndsAfter": 3,
|
||||
"hiddenGoal": true
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
# Could add other default scripts, like not having to redo Victory Playback sequence from scratch every time.
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
send: "Send"
|
||||
cancel: "Cancel"
|
||||
save: "Save"
|
||||
publish: "Publish"
|
||||
create: "Create"
|
||||
delay_1_sec: "1 second"
|
||||
delay_3_sec: "3 seconds"
|
||||
|
|
@ -47,9 +48,6 @@
|
|||
versions:
|
||||
save_version_title: "Save New Version"
|
||||
new_major_version: "New Major Version"
|
||||
update_break_level: "(Could this update break old solutions of the level?)"
|
||||
update_break_component: "(Could this update break anything depending on this Component?)"
|
||||
update_break_system: "(Could this update break anything depending on this System?)"
|
||||
cla_prefix: "To save changes, first you must agree to our"
|
||||
cla_url: "CLA"
|
||||
cla_suffix: "."
|
||||
|
|
@ -326,7 +324,6 @@
|
|||
more: "More"
|
||||
wiki: "Wiki"
|
||||
live_chat: "Live Chat"
|
||||
level_publish: "Publish This Level (irreversible)?"
|
||||
level_some_options: "Some Options?"
|
||||
level_tab_thangs: "Thangs"
|
||||
level_tab_scripts: "Scripts"
|
||||
|
|
@ -361,7 +358,7 @@
|
|||
thang_search_title: "Search Thang Types Here"
|
||||
level_search_title: "Search Levels Here"
|
||||
signup_to_create: "Sign Up to Create a New Content"
|
||||
read_only_warning: "Note: you can't save any edits here, because you're not logged in as an admin."
|
||||
read_only_warning2: "Note: you can't save any edits here, because you're not logged in."
|
||||
|
||||
article:
|
||||
edit_btn_preview: "Preview"
|
||||
|
|
@ -663,3 +660,4 @@
|
|||
leaderboard: "Leaderboard"
|
||||
user_schema: "User Schema"
|
||||
user_profile: "User Profile"
|
||||
patches: "Patches"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
|
|||
loading: "Загрузка..."
|
||||
saving: "Сохранение..."
|
||||
sending: "Отправка..."
|
||||
# send: "Send"
|
||||
send: "Отправить"
|
||||
cancel: "Отмена"
|
||||
save: "Сохранить"
|
||||
create: "Создать"
|
||||
|
|
@ -115,8 +115,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
|
|||
forum_page: "наш форум"
|
||||
forum_suffix: "."
|
||||
send: "Отправить отзыв"
|
||||
# contact_candidate: "Contact Candidate"
|
||||
# recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 18% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns."
|
||||
contact_candidate: "Связаться с кандидатом"
|
||||
recruitment_reminder: "Используйте эту форму, чтобы обратиться к кандидатам, если вы заинтересованы в интервью. Помните, что CodeCombat взимает 18% от первого года зарплаты. Плата производится по найму сотрудника и подлежит возмещению в течение 90 дней, если работник не остаётся на рабочем месте. Работники с частичной занятостью, удалённые и работающие по контракту свободны, как стажёры."
|
||||
|
||||
diplomat_suggestion:
|
||||
title: "Помогите перевести CodeCombat!"
|
||||
|
|
@ -151,7 +151,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
|
|||
wizard_tab: "Волшебник"
|
||||
password_tab: "Пароль"
|
||||
emails_tab: "Email-адреса"
|
||||
# job_profile_tab: "Job Profile"
|
||||
job_profile_tab: "Профиль соискателя"
|
||||
admin: "Админ"
|
||||
wizard_color: "Цвет одежды волшебника"
|
||||
new_password: "Новый пароль"
|
||||
|
|
@ -169,37 +169,37 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
|
|||
error_saving: "Ошибка сохранения"
|
||||
saved: "Изменения сохранены"
|
||||
password_mismatch: "Пароли не совпадают."
|
||||
# job_profile: "Job Profile"
|
||||
# job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
|
||||
# job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
|
||||
job_profile: "Профиль соискателя"
|
||||
job_profile_approved: "Ваш профиль соискателя был одобрен CodeCombat. Работодатели смогут видеть его, пока вы не отметите его неактивным или он не будет изменен в течение четырёх недель."
|
||||
job_profile_explanation: "Привет! Заполните это, и мы свяжемся с вами при нахождении работы разработчика программного обеспечения для вас."
|
||||
|
||||
account_profile:
|
||||
edit_settings: "Изменить настройки"
|
||||
profile_for_prefix: "Профиль для "
|
||||
profile_for_suffix: ""
|
||||
# approved: "Approved"
|
||||
# not_approved: "Not Approved"
|
||||
# looking_for: "Looking for:"
|
||||
# last_updated: "Last updated:"
|
||||
# contact: "Contact"
|
||||
# work_experience: "Work Experience"
|
||||
# education: "Education"
|
||||
# our_notes: "Our Notes"
|
||||
# projects: "Projects"
|
||||
approved: "Одобрено"
|
||||
not_approved: "Не одобрено"
|
||||
looking_for: "Ищет:"
|
||||
last_updated: "Последнее обновление:"
|
||||
contact: "Контакты"
|
||||
work_experience: "Опыт работы"
|
||||
education: "Образование"
|
||||
our_notes: "Наши заметки"
|
||||
projects: "Проекты"
|
||||
|
||||
# employers:
|
||||
# want_to_hire_our_players: "Want to hire expert CodeCombat players?"
|
||||
# contact_george: "Contact George to see our candidates"
|
||||
# candidates_count_prefix: "We currently have "
|
||||
# candidates_count_many: "many"
|
||||
# candidates_count_suffix: "highly skilled and vetted developers looking for work."
|
||||
# candidate_name: "Name"
|
||||
# candidate_location: "Location"
|
||||
# candidate_looking_for: "Looking For"
|
||||
# candidate_role: "Role"
|
||||
# candidate_top_skills: "Top Skills"
|
||||
# candidate_years_experience: "Yrs Exp"
|
||||
# candidate_last_updated: "Last Updated"
|
||||
employers:
|
||||
want_to_hire_our_players: "Хотите нанимать игроков-экспертов CodeCombat?"
|
||||
contact_george: "Свяжитесь с Джорджем, чтобы посмотреть наших кандидатов"
|
||||
candidates_count_prefix: "Сейчас у нас есть "
|
||||
candidates_count_many: "много"
|
||||
candidates_count_suffix: "высококвалифицированных и проверенных разработчиков, ищущих работу."
|
||||
candidate_name: "Имя"
|
||||
candidate_location: "Местонахождение"
|
||||
candidate_looking_for: "Ищет"
|
||||
candidate_role: "Роль"
|
||||
candidate_top_skills: "Лучшие навыки"
|
||||
candidate_years_experience: "Лет опыта"
|
||||
candidate_last_updated: "Последнее обновление"
|
||||
|
||||
play_level:
|
||||
level_load_error: "Уровень не может быть загружен: "
|
||||
|
|
@ -379,7 +379,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
|
|||
results: "Результаты"
|
||||
description: "Описание"
|
||||
or: "или"
|
||||
# subject: "Subject"
|
||||
subject: "Тема"
|
||||
email: "Email"
|
||||
password: "Пароль"
|
||||
message: "Сообщение"
|
||||
|
|
@ -661,5 +661,5 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
|
|||
gplus_friends: "Друзья G+"
|
||||
gplus_friend_sessions: "Сессии друзей G+"
|
||||
leaderboard: "таблица лидеров"
|
||||
# user_schema: "User Schema"
|
||||
# user_profile: "User Profile"
|
||||
user_schema: "Пользовательская Schema"
|
||||
user_profile: "Пользовательский профиль"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
storage = require 'lib/storage'
|
||||
|
||||
class CocoSchema extends Backbone.Model
|
||||
constructor: (path, args...) ->
|
||||
super(args...)
|
||||
@urlRoot = path + '/schema'
|
||||
|
||||
window.CocoSchema = CocoSchema
|
||||
deltasLib = require 'lib/deltas'
|
||||
auth = require 'lib/auth'
|
||||
|
||||
class CocoModel extends Backbone.Model
|
||||
idAttribute: "_id"
|
||||
|
|
@ -16,26 +11,28 @@ class CocoModel extends Backbone.Model
|
|||
|
||||
initialize: ->
|
||||
super()
|
||||
@constructor.schema ?= new CocoSchema(@urlRoot)
|
||||
@constructor.schema ?= require "schemas/models/#{@urlRoot[4..].replace '.', '_'}"
|
||||
if not @constructor.className
|
||||
console.error("#{@} needs a className set.")
|
||||
@markToRevert()
|
||||
if @constructor.schema?.loaded
|
||||
@addSchemaDefaults()
|
||||
else
|
||||
@loadSchema()
|
||||
@addSchemaDefaults()
|
||||
@once 'sync', @onLoaded, @
|
||||
@saveBackup = _.debounce(@saveBackup, 500)
|
||||
|
||||
type: ->
|
||||
@constructor.className
|
||||
|
||||
clone: (withChanges=true) ->
|
||||
# Backbone does not support nested documents
|
||||
clone = super()
|
||||
clone.set($.extend(true, {}, if withChanges then @attributes else @_revertAttributes))
|
||||
clone
|
||||
|
||||
onLoaded: ->
|
||||
@loaded = true
|
||||
@loading = false
|
||||
if @constructor.schema?.loaded
|
||||
@markToRevert()
|
||||
@loadFromBackup()
|
||||
@markToRevert()
|
||||
@loadFromBackup()
|
||||
|
||||
set: ->
|
||||
res = super(arguments...)
|
||||
|
|
@ -54,22 +51,10 @@ class CocoModel extends Backbone.Model
|
|||
CocoModel.backedUp[@id] = @
|
||||
|
||||
@backedUp = {}
|
||||
|
||||
loadSchema: ->
|
||||
return if @constructor.schema.loading
|
||||
@constructor.schema.fetch()
|
||||
@listenToOnce(@constructor.schema, 'sync', @onConstructorSync)
|
||||
|
||||
onConstructorSync: ->
|
||||
@constructor.schema.loaded = true
|
||||
@addSchemaDefaults()
|
||||
@trigger 'schema-loaded'
|
||||
|
||||
@hasSchema: -> return @schema?.loaded
|
||||
schema: -> return @constructor.schema
|
||||
|
||||
validate: ->
|
||||
result = tv4.validateMultiple(@attributes, @constructor.schema?.attributes or {})
|
||||
result = tv4.validateMultiple(@attributes, @constructor.schema? or {})
|
||||
if result.errors?.length
|
||||
console.log @, "got validate result with errors:", result
|
||||
return result.errors unless result.valid
|
||||
|
|
@ -83,6 +68,7 @@ class CocoModel extends Backbone.Model
|
|||
@markToRevert()
|
||||
@clearBackup()
|
||||
@trigger "save", @
|
||||
patch.setStatus 'accepted' for patch in @acceptedPatches or []
|
||||
return super attrs, options
|
||||
|
||||
fetch: ->
|
||||
|
|
@ -108,7 +94,9 @@ class CocoModel extends Backbone.Model
|
|||
|
||||
cloneNewMinorVersion: ->
|
||||
newData = $.extend(null, {}, @attributes)
|
||||
new @constructor(newData)
|
||||
clone = new @constructor(newData)
|
||||
clone.acceptedPatches = @acceptedPatches
|
||||
clone
|
||||
|
||||
cloneNewMajorVersion: ->
|
||||
clone = @cloneNewMinorVersion()
|
||||
|
|
@ -125,13 +113,13 @@ class CocoModel extends Backbone.Model
|
|||
@set "permissions", (@get("permissions") or []).concat({access: 'read', target: 'public'})
|
||||
|
||||
addSchemaDefaults: ->
|
||||
return if @addedSchemaDefaults or not @constructor.hasSchema()
|
||||
return if @addedSchemaDefaults
|
||||
@addedSchemaDefaults = true
|
||||
for prop, defaultValue of @constructor.schema.attributes.default or {}
|
||||
for prop, defaultValue of @constructor.schema.default or {}
|
||||
continue if @get(prop)?
|
||||
#console.log "setting", prop, "to", defaultValue, "from attributes.default"
|
||||
@set prop, defaultValue
|
||||
for prop, sch of @constructor.schema.attributes.properties or {}
|
||||
for prop, sch of @constructor.schema.properties or {}
|
||||
continue if @get(prop)?
|
||||
#console.log "setting", prop, "to", sch.default, "from sch.default" if sch.default?
|
||||
@set prop, sch.default if sch.default?
|
||||
|
|
@ -143,7 +131,7 @@ class CocoModel extends Backbone.Model
|
|||
# returns unfetched model shells for every referenced doc in this model
|
||||
# OPTIMIZE so that when loading models, it doesn't cause the site to stutter
|
||||
data ?= @attributes
|
||||
schema ?= @schema().attributes
|
||||
schema ?= @schema()
|
||||
models = []
|
||||
|
||||
if $.isArray(data) and schema.items?
|
||||
|
|
@ -194,11 +182,13 @@ class CocoModel extends Backbone.Model
|
|||
return model
|
||||
|
||||
@isObjectID: (s) ->
|
||||
s.length is 24 and s.match(/[a-z0-9]/gi)?.length is 24
|
||||
s.length is 24 and s.match(/[a-f0-9]/gi)?.length is 24
|
||||
|
||||
hasReadAccess: (actor) ->
|
||||
# actor is a User object
|
||||
|
||||
actor ?= auth.me
|
||||
return true if actor.isAdmin()
|
||||
if @get('permissions')?
|
||||
for permission in @get('permissions')
|
||||
if permission.target is 'public' or actor.get('_id') is permission.target
|
||||
|
|
@ -209,12 +199,31 @@ class CocoModel extends Backbone.Model
|
|||
hasWriteAccess: (actor) ->
|
||||
# actor is a User object
|
||||
|
||||
actor ?= auth.me
|
||||
return true if actor.isAdmin()
|
||||
if @get('permissions')?
|
||||
for permission in @get('permissions')
|
||||
if permission.target is 'public' or actor.get('_id') is permission.target
|
||||
return true if permission.access in ['owner', 'write']
|
||||
|
||||
return false
|
||||
|
||||
|
||||
getDelta: ->
|
||||
differ = deltasLib.makeJSONDiffer()
|
||||
differ.diff @_revertAttributes, @attributes
|
||||
|
||||
applyDelta: (delta) ->
|
||||
newAttributes = $.extend(true, {}, @attributes)
|
||||
jsondiffpatch.patch newAttributes, delta
|
||||
@set newAttributes
|
||||
|
||||
getExpandedDelta: ->
|
||||
delta = @getDelta()
|
||||
deltasLib.expandDelta(delta, @_revertAttributes, @schema())
|
||||
|
||||
addPatchToAcceptOnSave: (patch) ->
|
||||
@acceptedPatches ?= []
|
||||
@acceptedPatches.push patch
|
||||
@acceptedPatches = _.uniq(@acceptedPatches, false, (p) -> p.id)
|
||||
|
||||
module.exports = CocoModel
|
||||
|
|
|
|||
8
app/models/Patch.coffee
Normal file
8
app/models/Patch.coffee
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
CocoModel = require('./CocoModel')
|
||||
|
||||
module.exports = class PatchModel extends CocoModel
|
||||
@className: "Patch"
|
||||
urlRoot: "/db/patch"
|
||||
|
||||
setStatus: (status) ->
|
||||
$.ajax("/db/patch/#{@id}/status", {type:"PUT", data: {status:status}})
|
||||
|
|
@ -2,7 +2,6 @@ class SuperModel
|
|||
constructor: ->
|
||||
@models = {}
|
||||
@collections = {}
|
||||
@schemas = {}
|
||||
_.extend(@, Backbone.Events)
|
||||
|
||||
populateModel: (model) ->
|
||||
|
|
@ -26,12 +25,8 @@ class SuperModel
|
|||
@removeEventsFromModel(model)
|
||||
|
||||
modelLoaded: (model) ->
|
||||
model.loadSchema()
|
||||
schema = model.schema()
|
||||
unless schema.loaded
|
||||
@schemas[schema.urlRoot] = schema
|
||||
return schema.once('sync', => @modelLoaded(model))
|
||||
refs = model.getReferencedModels(model.attributes, schema.attributes, '/', @shouldLoadProjection)
|
||||
refs = model.getReferencedModels(model.attributes, schema, '/', @shouldLoadProjection)
|
||||
refs = [] unless @mustPopulate is model or @shouldPopulate(model)
|
||||
# console.log 'Loaded', model.get('name')
|
||||
for ref, i in refs when @shouldLoadReference ref
|
||||
|
|
@ -103,9 +98,6 @@ class SuperModel
|
|||
for model in _.values @models
|
||||
total += 1
|
||||
loaded += 1 if model.loaded
|
||||
for schema in _.values @schemas
|
||||
total += 1
|
||||
loaded += 1 if schema.loaded
|
||||
|
||||
return 1.0 unless total
|
||||
return loaded / total
|
||||
|
|
|
|||
34
app/schemas/languages.coffee
Normal file
34
app/schemas/languages.coffee
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
locale = require '../locale/locale' # requiring from app; will break if we stop serving from where app lives
|
||||
|
||||
languages = []
|
||||
for code, localeInfo of locale
|
||||
languages.push code: code, nativeDescription: localeInfo.nativeDescription, englishDescription: localeInfo.englishDescription
|
||||
|
||||
module.exports.languages = languages
|
||||
module.exports.languageCodes = languageCodes = (language.code for language in languages)
|
||||
module.exports.languageCodesLower = languageCodesLower = (code.toLowerCase() for code in languageCodes)
|
||||
|
||||
# Keep keys lower-case for matching and values with second subtag uppercase like i18next expects
|
||||
languageAliases =
|
||||
'en': 'en-US'
|
||||
|
||||
'zh-cn': 'zh-HANS'
|
||||
'zh-hans-cn': 'zh-HANS'
|
||||
'zh-sg': 'zh-HANS'
|
||||
'zh-hans-sg': 'zh-HANS'
|
||||
|
||||
'zh-tw': 'zh-HANT'
|
||||
'zh-hant-tw': 'zh-HANT'
|
||||
'zh-hk': 'zh-HANT'
|
||||
'zh-hant-hk': 'zh-HANT'
|
||||
'zh-mo': 'zh-HANT'
|
||||
'zh-hant-mo': 'zh-HANT'
|
||||
|
||||
module.exports.languageCodeFromAcceptedLanguages = languageCodeFromAcceptedLanguages = (acceptedLanguages) ->
|
||||
for lang in acceptedLanguages ? []
|
||||
code = languageAliases[lang.toLowerCase()]
|
||||
return code if code
|
||||
codeIndex = _.indexOf languageCodesLower, lang
|
||||
if codeIndex isnt -1
|
||||
return languageCodes[codeIndex]
|
||||
return 'en-US'
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
c = require '../commons/schemas'
|
||||
c = require './../schemas'
|
||||
|
||||
ArticleSchema = c.object()
|
||||
c.extendNamedProperties ArticleSchema # name first
|
||||
|
|
@ -6,8 +6,9 @@ c.extendNamedProperties ArticleSchema # name first
|
|||
ArticleSchema.properties.body = { type: 'string', title: 'Content', format: 'markdown' }
|
||||
ArticleSchema.properties.i18n = { type: 'object', title: 'i18n', format: 'i18n', props: ['name', 'body'] }
|
||||
|
||||
c.extendBasicProperties(ArticleSchema, 'article')
|
||||
c.extendSearchableProperties(ArticleSchema)
|
||||
c.extendVersionedProperties(ArticleSchema, 'article')
|
||||
c.extendBasicProperties ArticleSchema, 'article'
|
||||
c.extendSearchableProperties ArticleSchema
|
||||
c.extendVersionedProperties ArticleSchema, 'article'
|
||||
c.extendPatchableProperties ArticleSchema
|
||||
|
||||
module.exports = ArticleSchema
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
c = require '../commons/schemas'
|
||||
ThangComponentSchema = require './thangs/thang_component_schema'
|
||||
c = require './../schemas'
|
||||
ThangComponentSchema = require './../models/thang_component'
|
||||
|
||||
SpecificArticleSchema = c.object()
|
||||
c.extendNamedProperties SpecificArticleSchema # name first
|
||||
|
|
@ -108,9 +108,9 @@ NoteGroupSchema = c.object {title: "Note Group", description: "A group of notes
|
|||
lock: {title: "Lock", description: "Whether the interface should be locked so that the player's focus is on the script, or specific areas to lock.", type: ['boolean', 'array'], items: {type: 'string', enum: ['surface', 'editor', 'palette', 'hud', 'playback', 'playback-hover', 'level', ]}}
|
||||
letterbox: {type: 'boolean', title: 'Letterbox', description:'Turn letterbox mode on or off. Disables surface and playback controls.'}
|
||||
|
||||
goals: c.object {title: "Goals", description: "Add or remove goals for the player to complete in the level."},
|
||||
add: c.array {title: "Add", description: "Add these goals."}, GoalSchema
|
||||
remove: c.array {title: "Remove", description: "Remove these goals."}, GoalSchema
|
||||
goals: c.object {title: "Goals (Old)", description: "Deprecated. Goals added here have no effect. Add goals in the level settings instead."},
|
||||
add: c.array {title: "Add", description: "Deprecated. Goals added here have no effect. Add goals in the level settings instead."}, GoalSchema
|
||||
remove: c.array {title: "Remove", description: "Deprecated. Goals removed here have no effect. Adjust goals in the level settings instead."}, GoalSchema
|
||||
|
||||
playback: c.object {title: "Playback", description: "Control the playback of the level."},
|
||||
playing: {type: 'boolean', title: "Set Playing", description: "Set whether playback is playing or paused."}
|
||||
|
|
@ -243,6 +243,7 @@ c.extendBasicProperties LevelSchema, 'level'
|
|||
c.extendSearchableProperties LevelSchema
|
||||
c.extendVersionedProperties LevelSchema, 'level'
|
||||
c.extendPermissionsProperties LevelSchema, 'level'
|
||||
c.extendPatchableProperties LevelSchema
|
||||
|
||||
module.exports = LevelSchema
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
c = require '../../commons/schemas'
|
||||
metaschema = require '../../commons/metaschema'
|
||||
c = require './../schemas'
|
||||
metaschema = require './../metaschema'
|
||||
|
||||
attackSelfCode = """
|
||||
class AttacksSelf extends Component
|
||||
|
|
@ -115,5 +115,6 @@ c.extendBasicProperties LevelComponentSchema, 'level.component'
|
|||
c.extendSearchableProperties LevelComponentSchema
|
||||
c.extendVersionedProperties LevelComponentSchema, 'level.component'
|
||||
c.extendPermissionsProperties LevelComponentSchema, 'level.component'
|
||||
c.extendPatchableProperties LevelComponentSchema
|
||||
|
||||
module.exports = LevelComponentSchema
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
c = require '../../commons/schemas'
|
||||
c = require './../schemas'
|
||||
|
||||
LevelFeedbackLevelSchema = c.object {required: ['original', 'majorVersion']}, {
|
||||
original: c.objectId({})
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
c = require '../../commons/schemas'
|
||||
c = require './../schemas'
|
||||
|
||||
LevelSessionPlayerSchema = c.object
|
||||
id: c.objectId
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
c = require '../../commons/schemas'
|
||||
metaschema = require '../../commons/metaschema'
|
||||
c = require './../schemas'
|
||||
metaschema = require './../metaschema'
|
||||
|
||||
jitterSystemCode = """
|
||||
class Jitter extends System
|
||||
|
|
@ -101,6 +101,7 @@ _.extend LevelSystemSchema.properties,
|
|||
c.extendBasicProperties LevelSystemSchema, 'level.system'
|
||||
c.extendSearchableProperties LevelSystemSchema
|
||||
c.extendVersionedProperties LevelSystemSchema, 'level.system'
|
||||
c.extendPermissionsProperties LevelSystemSchema, 'level.system'
|
||||
c.extendPermissionsProperties LevelSystemSchema
|
||||
c.extendPatchableProperties LevelSystemSchema
|
||||
|
||||
module.exports = LevelSystemSchema
|
||||
27
app/schemas/models/patch.coffee
Normal file
27
app/schemas/models/patch.coffee
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
c = require './../schemas'
|
||||
|
||||
patchables = ['level', 'thang_type', 'level_system', 'level_component', 'article']
|
||||
|
||||
PatchSchema = c.object({title:'Patch', required:['target', 'delta', 'commitMessage']}, {
|
||||
delta: { title: 'Delta', type:['array', 'object'] }
|
||||
commitMessage: c.shortString({maxLength: 500, minLength: 1})
|
||||
creator: c.objectId(links: [{rel: 'extra', href: "/db/user/{($)}"}])
|
||||
created: c.date( { title: 'Created', readOnly: true })
|
||||
status: { enum: ['pending', 'accepted', 'rejected', 'withdrawn']}
|
||||
|
||||
target: c.object({title: 'Target', required:['collection', 'id']}, {
|
||||
collection: { enum: patchables }
|
||||
id: c.objectId(title: 'Target ID') # search by this if not versioned
|
||||
|
||||
# if target is versioned, want to know that info too
|
||||
original: c.objectId(title: 'Target Original') # search by this if versioned
|
||||
version:
|
||||
properties:
|
||||
major: { type: 'number', minimum: 0 }
|
||||
minor: { type: 'number', minimum: 0 }
|
||||
})
|
||||
})
|
||||
|
||||
c.extendBasicProperties(PatchSchema, 'patch')
|
||||
|
||||
module.exports = PatchSchema
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
c = require '../../commons/schemas'
|
||||
c = require './../schemas'
|
||||
|
||||
module.exports = ThangComponentSchema = c.object {
|
||||
title: "Component"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
c = require '../../commons/schemas'
|
||||
ThangComponentSchema = require './thang_component_schema'
|
||||
c = require './../schemas'
|
||||
ThangComponentSchema = require './thang_component'
|
||||
|
||||
ThangTypeSchema = c.object()
|
||||
c.extendNamedProperties ThangTypeSchema # name first
|
||||
|
|
@ -146,8 +146,9 @@ ThangTypeSchema.definitions =
|
|||
action: ActionSchema
|
||||
sound: SoundSchema
|
||||
|
||||
c.extendBasicProperties(ThangTypeSchema, 'thang.type')
|
||||
c.extendSearchableProperties(ThangTypeSchema)
|
||||
c.extendVersionedProperties(ThangTypeSchema, 'thang.type')
|
||||
c.extendBasicProperties ThangTypeSchema, 'thang.type'
|
||||
c.extendSearchableProperties ThangTypeSchema
|
||||
c.extendVersionedProperties ThangTypeSchema, 'thang.type'
|
||||
c.extendPatchableProperties ThangTypeSchema
|
||||
|
||||
module.exports = ThangTypeSchema
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
c = require '../commons/schemas'
|
||||
c = require './../schemas'
|
||||
emailSubscriptions = ['announcement', 'tester', 'level_creator', 'developer', 'article_editor', 'translator', 'support', 'notification']
|
||||
|
||||
UserSchema = c.object {},
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#language imports
|
||||
Language = require '../routes/languages'
|
||||
Language = require './languages'
|
||||
# schema helper methods
|
||||
|
||||
me = module.exports
|
||||
|
|
@ -15,7 +15,7 @@ me.object = (ext, props) -> combine {type: 'object', additionalProperties: false
|
|||
me.array = (ext, items) -> combine {type: 'array', items: items or {}}, ext
|
||||
me.shortString = (ext) -> combine({type: 'string', maxLength: 100}, ext)
|
||||
me.pct = (ext) -> combine({type: 'number', maximum: 1.0, minimum: 0.0}, ext)
|
||||
me.date = (ext) -> combine({type: 'string', format: 'date-time'}, ext)
|
||||
me.date = (ext) -> combine({type: ['object', 'string'], format: 'date-time'}, ext)
|
||||
# should just be string (Mongo ID), but sometimes mongoose turns them into objects representing those, so we are lenient
|
||||
me.objectId = (ext) -> schema = combine({type: ['object', 'string'] }, ext)
|
||||
me.url = (ext) -> combine({type: 'string', format: 'url', pattern: urlPattern}, ext)
|
||||
|
|
@ -54,7 +54,21 @@ basicProps = (linkFragment) ->
|
|||
me.extendBasicProperties = (schema, linkFragment) ->
|
||||
schema.properties = {} unless schema.properties?
|
||||
_.extend(schema.properties, basicProps(linkFragment))
|
||||
|
||||
# PATCHABLE
|
||||
|
||||
patchableProps = ->
|
||||
patches: me.array({title:'Patches'}, {
|
||||
_id: me.objectId(links: [{rel: "db", href: "/db/patch/{($)}"}], title: "Patch ID", description: "A reference to the patch.")
|
||||
status: { enum: ['pending', 'accepted', 'rejected', 'cancelled']}
|
||||
})
|
||||
allowPatches: { type: 'boolean' }
|
||||
listeners: me.array({title:'Listeners'},
|
||||
me.objectId(links: [{rel: 'extra', href: "/db/user/{($)}"}]))
|
||||
|
||||
me.extendPatchableProperties = (schema) ->
|
||||
schema.properties = {} unless schema.properties?
|
||||
_.extend(schema.properties, patchableProps())
|
||||
|
||||
# NAMED
|
||||
|
||||
|
|
@ -111,6 +111,9 @@ a[data-toggle="modal"]
|
|||
@include box-shadow(0 0 0 #000)
|
||||
//position: absolute
|
||||
width: 99%
|
||||
|
||||
.background-wrapper.plain
|
||||
background: white
|
||||
|
||||
.modal-content
|
||||
@include box-shadow(none)
|
||||
|
|
@ -212,7 +215,7 @@ table.table
|
|||
.header-font
|
||||
font-family: $headings-font-family
|
||||
|
||||
body[lang='ru'], body[lang|='zh'], body[lang='ja'], body[lang='pl'], body[lang='tr'], body[lang='cs'], body[lang='el'], body[lang='ro'], body[lang='vi'], body[lang='th'], body[lang='ko'], body[lang='sk'], body[lang='sl'], body[lang='bg'], body[lang='he'], body[lang='lt'], body[lang='sr'], body[lang='uk'], body[lang='hi'], body[lang='ur'],
|
||||
body[lang='ru'], body[lang|='zh'], body[lang='pl'], body[lang='tr'], body[lang='cs'], body[lang='el'], body[lang='ro'], body[lang='vi'], body[lang='th'], body[lang='ko'], body[lang='sk'], body[lang='sl'], body[lang='bg'], body[lang='he'], body[lang='lt'], body[lang='sr'], body[lang='uk'], body[lang='hi'], body[lang='ur'], body[lang='hu']
|
||||
h1, h2, h3, h4, h5, h6
|
||||
font-family: 'Open Sans Condensed', Impact, "Arial Narrow", "Arial", sans-serif
|
||||
text-transform: uppercase
|
||||
|
|
@ -222,6 +225,23 @@ body[lang='ru'], body[lang|='zh'], body[lang='ja'], body[lang='pl'], body[lang='
|
|||
font-family: 'Open Sans Condensed', Impact, "Arial Narrow", "Arial", sans-serif !important
|
||||
text-transform: uppercase
|
||||
letter-spacing: -1px !important
|
||||
|
||||
body[lang='ja']
|
||||
h1, h2, h3, h4, h5, h6
|
||||
font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", 'Open Sans Condensed', sans-serif
|
||||
text-transform: uppercase
|
||||
letter-spacing: -1px !important
|
||||
|
||||
.header-font
|
||||
font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", Osaka, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", 'Open Sans Condensed', sans-serif
|
||||
text-transform: uppercase
|
||||
letter-spacing: -1px !important
|
||||
|
||||
#top-nav
|
||||
.navbar-nav
|
||||
li
|
||||
a.header-font
|
||||
font-size: 16px
|
||||
|
||||
@media only screen and (max-width: 800px)
|
||||
.main-content-area
|
||||
|
|
@ -238,3 +258,10 @@ body[lang='ru'], body[lang|='zh'], body[lang='ja'], body[lang='pl'], body[lang='
|
|||
margin-bottom: 20px
|
||||
.partner-badges
|
||||
display: none
|
||||
|
||||
// point the new glyphicons to the fonts in public
|
||||
|
||||
@font-face
|
||||
font-family: 'Glyphicons Halflings'
|
||||
src: url("/fonts/glyphicons-halflings-regular.eot")
|
||||
src: url("/fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("/fonts/glyphicons-halflings-regular.woff") format("woff"), url("/fonts/glyphicons-halflings-regular.ttf") format("truetype"), url("/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular") format("svg")
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
letter-spacing: 1px
|
||||
|
||||
.navbuttontext-user-name
|
||||
max-width: 125px
|
||||
max-width: 110px
|
||||
overflow: hidden
|
||||
text-overflow: ellipsis
|
||||
white-space: nowrap
|
||||
|
|
|
|||
|
|
@ -49,9 +49,15 @@
|
|||
&:hover
|
||||
background-color: rgba(200, 244, 255, 0.2)
|
||||
|
||||
h4
|
||||
text-align: center
|
||||
a:not(.has-github)
|
||||
cursor: default
|
||||
text-decoration: none
|
||||
|
||||
img
|
||||
max-width: 100px
|
||||
max-height: 100px
|
||||
.caption
|
||||
background-color: transparent
|
||||
h4
|
||||
text-align: center
|
||||
|
||||
|
|
|
|||
43
app/styles/editor/delta.sass
Normal file
43
app/styles/editor/delta.sass
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
.delta-view
|
||||
.panel-heading
|
||||
font-size: 13px
|
||||
padding: 4px
|
||||
.row
|
||||
padding: 5px 10px
|
||||
|
||||
.delta-added
|
||||
border-color: green
|
||||
> .panel-heading
|
||||
background-color: lighten(green, 70%)
|
||||
strong
|
||||
color: green
|
||||
|
||||
.delta-modified
|
||||
border-color: darkgoldenrod
|
||||
> .panel-heading
|
||||
background-color: lighten(darkgoldenrod, 40%)
|
||||
strong
|
||||
color: darkgoldenrod
|
||||
|
||||
.delta-text-diff
|
||||
border-color: blue
|
||||
> .panel-heading
|
||||
background-color: lighten(blue, 45%)
|
||||
strong
|
||||
color: blue
|
||||
table
|
||||
width: 100%
|
||||
|
||||
.delta-deleted
|
||||
border-color: red
|
||||
> .panel-heading
|
||||
background-color: lighten(red, 42%)
|
||||
strong
|
||||
color: red
|
||||
|
||||
.delta-moved-index
|
||||
border-color: darkslategray
|
||||
> .panel-heading
|
||||
background-color: lighten(darkslategray, 60%)
|
||||
strong
|
||||
color: darkslategray
|
||||
3
app/styles/editor/patch.sass
Normal file
3
app/styles/editor/patch.sass
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
#patch-modal
|
||||
.modal-body
|
||||
padding: 10px
|
||||
3
app/styles/editor/patches.sass
Normal file
3
app/styles/editor/patches.sass
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
.patches-view
|
||||
.status-buttons
|
||||
margin: 10px 0
|
||||
|
|
@ -1,4 +1,12 @@
|
|||
#save-version-modal
|
||||
.modal-body
|
||||
padding: 10px 50px 30px 20px
|
||||
|
||||
.modal-footer
|
||||
text-align: left
|
||||
.buttons
|
||||
text-align: right
|
||||
|
||||
#cla-link
|
||||
cursor: pointer
|
||||
text-decoration: underline
|
||||
|
|
@ -25,3 +33,23 @@
|
|||
font-size: 0.9em
|
||||
font-style: italic
|
||||
|
||||
.delta-view
|
||||
overflow-y: auto
|
||||
padding: 10px
|
||||
border: 1px solid black
|
||||
background: lighten(#add8e6, 17%)
|
||||
margin-bottom: 10px
|
||||
ul
|
||||
padding-left: 20px
|
||||
|
||||
form
|
||||
width: 100%
|
||||
|
||||
.commit-message
|
||||
display: block
|
||||
width: 100%
|
||||
|
||||
.checkbox
|
||||
margin: 10px 10px 0
|
||||
input
|
||||
margin-right: 5px
|
||||
|
|
@ -51,12 +51,6 @@ body
|
|||
a.header-font(href='http://blog.codecombat.com/', data-i18n="nav.blog") Blog
|
||||
li.forum
|
||||
a.header-font(href='http://discourse.codecombat.com/', data-i18n="nav.forum") Forum
|
||||
if me.isAdmin()
|
||||
li.admin
|
||||
a.header-font(href='/admin', data-i18n="nav.admin") Admin
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
block outer_content
|
||||
|
|
@ -79,6 +73,8 @@ body
|
|||
a(href='/legal', title='Legal', tabindex=-1, data-i18n="nav.legal") Legal
|
||||
a(href='/about', title='About', tabindex=-1, data-i18n="nav.about") About
|
||||
a(title='Contact', tabindex=-1, data-toggle="coco-modal", data-target="modal/contact", data-i18n="nav.contact") Contact
|
||||
if me.isAdmin()
|
||||
a(href='/admin', data-i18n="nav.admin") Admin
|
||||
|
||||
.share-buttons
|
||||
.g-plusone(data-href="http://codecombat.com", data-size="medium")
|
||||
|
|
|
|||
|
|
@ -53,30 +53,12 @@ block content
|
|||
span(data-i18n="contribute.adventurer_join_suf")
|
||||
| so if you prefer to be notified those ways, sign up there!
|
||||
|
||||
if me.attributes.anonymous
|
||||
div#sign-up.alert.alert-info
|
||||
strong(data-i18n="contribute.alert_account_message_intro")
|
||||
| Hey there!
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_pref")
|
||||
| To subscribe for class emails, you'll need to
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="contribute.alert_account_message_create_url")
|
||||
| create an account
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_suf")
|
||||
| first.
|
||||
.contributor-signup-anonymous
|
||||
.contributor-signup(data-contributor-class-id="tester", data-contributor-class-name="adventurer")
|
||||
|
||||
label.checkbox(for="tester").well
|
||||
input(type='checkbox', name="tester", id="tester")
|
||||
span(data-i18n="contribute.adventurer_subscribe_desc")
|
||||
| Get emails when there are new levels to test.
|
||||
.saved-notification ✓ Saved
|
||||
|
||||
//#Contributors
|
||||
// h3(data-i18n="contribute.brave_adventurers")
|
||||
// | Our Brave Adventurers:
|
||||
// ul.adventurers
|
||||
// li Kieizroe
|
||||
// li ... many, many more
|
||||
//h3(data-i18n="contribute.brave_adventurers")
|
||||
// | Our Brave Adventurers:
|
||||
//
|
||||
//#contributor-list
|
||||
|
||||
div.clearfix
|
||||
|
|
|
|||
|
|
@ -47,29 +47,12 @@ block content
|
|||
| solving levels can summon higher level wizards to help them.
|
||||
| This will be a great way for ambassadors to do their thing. We'll keep you posted!
|
||||
|
||||
if me.attributes.anonymous
|
||||
div#sign-up.alert.alert-info
|
||||
strong(data-i18n="contribute.alert_account_message_intro")
|
||||
| Hey there!
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_pref")
|
||||
| To subscribe for class emails, you'll need to
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="contribute.alert_account_message_create_url")
|
||||
| create an account
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_suf")
|
||||
| first.
|
||||
.contributor-signup-anonymous
|
||||
.contributor-signup(data-contributor-class-id="support", data-contributor-class-name="ambassador")
|
||||
|
||||
label.checkbox(for="support").well
|
||||
input(type='checkbox', name="support", id="support")
|
||||
span(data-i18n="contribute.ambassador_subscribe_desc")
|
||||
| Get emails on support updates and multiplayer developments.
|
||||
.saved-notification ✓ Saved
|
||||
|
||||
//#Contributors
|
||||
// h3(data-i18n="contribute.helpful_ambassadors")
|
||||
// | Our Helpful Ambassadorsd:
|
||||
// ul.ambassadors
|
||||
// li
|
||||
//h3(data-i18n="contribute.helpful_ambassadors")
|
||||
// | Our Helpful Ambassadorsd:
|
||||
//
|
||||
//#contributor-list
|
||||
|
||||
div.clearfix
|
||||
|
|
|
|||
|
|
@ -57,37 +57,12 @@ block content
|
|||
span(data-i18n="contribute.join_desc_4")
|
||||
| and we'll go from there!
|
||||
|
||||
if me.attributes.anonymous
|
||||
div#sign-up.alert.alert-info
|
||||
strong(data-i18n="contribute.alert_account_message_intro")
|
||||
| Hey there!
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_pref")
|
||||
| To subscribe for class emails, you'll need to
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="contribute.alert_account_message_create_url")
|
||||
| create an account
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_suf")
|
||||
| first.
|
||||
.contributor-signup-anonymous
|
||||
.contributor-signup(data-contributor-class-id="developer", data-contributor-class-name="archmage")
|
||||
|
||||
label.checkbox(for="developer").well
|
||||
input(type='checkbox', name="developer", id="developer")
|
||||
span(data-i18n="contribute.archmage_subscribe_desc")
|
||||
| Get emails on new coding opportunities and announcements.
|
||||
.saved-notification ✓ Saved
|
||||
h3(data-i18n="contribute.powerful_archmages")
|
||||
| Our Powerful Archmages:
|
||||
|
||||
#Contributors
|
||||
h3(data-i18n="contribute.powerful_archmages")
|
||||
| Our Powerful Archmages:
|
||||
.row
|
||||
for contributor in contributors
|
||||
.col-xs-6.col-md-3
|
||||
.thumbnail
|
||||
if contributor.avatar
|
||||
img.img-responsive(src="/images/pages/contribute/archmage/" + contributor.avatar + "_small.png", alt="")
|
||||
else
|
||||
img.img-responsive(src="/images/pages/contribute/archmage.png", alt="")
|
||||
.caption
|
||||
h4= contributor.name
|
||||
#contributor-list
|
||||
|
||||
div.clearfix
|
||||
|
|
|
|||
|
|
@ -54,38 +54,13 @@ block content
|
|||
li
|
||||
a(href="http://discourse.codecombat.com", data-i18n="contribute.artisan_join_step4") Post your levels on the forum for feedback.
|
||||
|
||||
if me.attributes.anonymous
|
||||
div#sign-up.alert.alert-info
|
||||
strong(data-i18n="contribute.alert_account_message_intro")
|
||||
| Hey there!
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_pref")
|
||||
| To subscribe for class emails, you'll need to
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="contribute.alert_account_message_create_url")
|
||||
| create an account
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_suf")
|
||||
| first.
|
||||
.contributor-signup-anonymous
|
||||
.contributor-signup(data-contributor-class-id="level_creator", data-contributor-class-name="artisan")
|
||||
|
||||
label.checkbox(for="level_creator").well
|
||||
input(type='checkbox', name="level_creator", id="level_creator")
|
||||
span(data-i18n="contribute.artisan_subscribe_desc")
|
||||
| Get emails on level editor updates and announcements.
|
||||
.saved-notification ✓ Saved
|
||||
h3(data-i18n="contribute.creative_artisans")
|
||||
| Our Creative Artisans:
|
||||
|
||||
#Contributors
|
||||
h3(data-i18n="contribute.creative_artisans")
|
||||
| Our Creative Artisans:
|
||||
.row
|
||||
for contributor in contributors
|
||||
.col-xs-6.col-md-3
|
||||
.thumbnail
|
||||
if contributor.avatar
|
||||
img.img-responsive(src="/images/pages/contribute/artisan/" + contributor.avatar + "_small.png", alt="")
|
||||
else
|
||||
img.img-responsive(src="/images/pages/contribute/artisan.png", alt="")
|
||||
.caption
|
||||
h4= contributor.name
|
||||
#contributor-list
|
||||
|
||||
div.clearfix
|
||||
|
||||
|
|
|
|||
|
|
@ -37,18 +37,7 @@ block content
|
|||
| - Nick, George, Scott, Michael, Jeremy and Glen
|
||||
hr
|
||||
|
||||
if me.attributes.anonymous
|
||||
div#sign-up.alert.alert-info
|
||||
strong(data-i18n="contribute.alert_account_message_intro")
|
||||
| Hey there!
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_pref")
|
||||
| To subscribe for class emails, you'll need to
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="contribute.alert_account_message_create_url")
|
||||
| create an account
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_suf")
|
||||
| first.
|
||||
.contributor-signup-anonymous
|
||||
|
||||
#archmage.header-scrolling-fix
|
||||
.class_image
|
||||
|
|
@ -69,13 +58,7 @@ block content
|
|||
p.lead(data-i18n="contribute.more_about_archmage")
|
||||
| Learn More About Becoming an Archmage
|
||||
|
||||
label.checkbox(for="developer").well
|
||||
input(type='checkbox', name="developer", id="developer")
|
||||
span(data-i18n="contribute.archmage_subscribe_desc")
|
||||
| Get emails on new coding opportunities and announcements.
|
||||
.saved-notification
|
||||
| ✓
|
||||
span(data-i18n="contribute.saved") Saved
|
||||
.contributor-signup(data-contributor-class-id="developer", data-contributor-class-name="archmage")
|
||||
|
||||
#artisan.header-scrolling-fix
|
||||
|
||||
|
|
@ -102,13 +85,7 @@ block content
|
|||
p.lead(data-i18n="contribute.more_about_artisan")
|
||||
| Learn More About Becoming An Artisan
|
||||
|
||||
label.checkbox(for="level_creator").well
|
||||
input(type='checkbox', name="level_creator", id="level_creator")
|
||||
span(data-i18n="contribute.artisan_subscribe_desc")
|
||||
| Get emails on level editor updates and announcements.
|
||||
.saved-notification
|
||||
| ✓
|
||||
span(data-i18n="contribute.saved") Saved
|
||||
.contributor-signup(data-contributor-class-id="level_creator", data-contributor-class-name="artisan")
|
||||
|
||||
#adventurer.header-scrolling-fix
|
||||
|
||||
|
|
@ -130,13 +107,7 @@ block content
|
|||
p.lead(data-i18n="contribute.more_about_adventurer")
|
||||
| Learn More About Becoming an Adventurer
|
||||
|
||||
label.checkbox(for="tester").well
|
||||
input(type='checkbox', name="tester", id="tester")
|
||||
span(data-i18n="contribute.adventurer_subscribe_desc")
|
||||
| Get emails when there are new levels to test.
|
||||
.saved-notification
|
||||
| ✓
|
||||
span(data-i18n="contribute.saved") Saved
|
||||
.contributor-signup(data-contributor-class-id="tester", data-contributor-class-name="adventurer")
|
||||
|
||||
#scribe.header-scrolling-fix
|
||||
|
||||
|
|
@ -162,13 +133,7 @@ block content
|
|||
p.lead(data-i18n="contribute.more_about_scribe")
|
||||
| Learn More About Becoming a Scribe
|
||||
|
||||
label.checkbox(for="article_editor").well
|
||||
input(type='checkbox', name="article_editor", id="article_editor")
|
||||
span(data-i18n="contribute.scribe_subscribe_desc")
|
||||
| Get emails about article writing announcements.
|
||||
.saved-notification
|
||||
| ✓
|
||||
span(data-i18n="contribute.saved") Saved
|
||||
.contributor-signup(data-contributor-class-id="article_editor", data-contributor-class-name="scribe")
|
||||
|
||||
#diplomat.header-scrolling-fix
|
||||
|
||||
|
|
@ -191,14 +156,8 @@ block content
|
|||
p.lead(data-i18n="contribute.more_about_diplomat")
|
||||
| Learn More About Becoming a Diplomat
|
||||
|
||||
label.checkbox(for="translator").well
|
||||
input(type='checkbox', name="translator", id="translator")
|
||||
span(data-i18n="contribute.diplomat_subscribe_desc")
|
||||
| Get emails about i18n developments and levels to translate.
|
||||
.saved-notification
|
||||
| ✓
|
||||
span(data-i18n="contribute.saved") Saved
|
||||
|
||||
.contributor-signup(data-contributor-class-id="translator", data-contributor-class-name="diplomat")
|
||||
|
||||
#ambassador.header-scrolling-fix
|
||||
|
||||
.class_image
|
||||
|
|
@ -218,13 +177,7 @@ block content
|
|||
p.lead(data-i18n="contribute.more_about_ambassador")
|
||||
| Learn More About Becoming an Ambassador
|
||||
|
||||
label.checkbox(for="support").well
|
||||
input(type='checkbox', name="support", id="support")
|
||||
span(data-i18n="contribute.ambassador_subscribe_desc")
|
||||
| Get emails on support updates and multiplayer developments.
|
||||
.saved-notification
|
||||
| ✓
|
||||
span(data-i18n="contribute.saved") Saved
|
||||
.contributor-signup(data-contributor-class-id="support", data-contributor-class-name="ambassador")
|
||||
|
||||
#counselor.header-scrolling-fix
|
||||
|
||||
|
|
|
|||
13
app/templates/contribute/contributor_list.jade
Normal file
13
app/templates/contribute/contributor_list.jade
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
.row
|
||||
for contributor in contributors
|
||||
.col-xs-6.col-md-3
|
||||
.thumbnail
|
||||
- var src = "/images/pages/contribute/" + contributorClassName + ".png";
|
||||
- if(contributor.avatar)
|
||||
- src = src.replace(contributorClassName, contributorClassName + "/" + contributor.avatar + "_small");
|
||||
- if(contributor.id)
|
||||
- src = "/db/user/" + contributor.id + "/avatar?s=100&fallback=" + src;
|
||||
a(href=contributor.github ? "https://github.com/codecombat/codecombat/commits?author=" + contributor.github : null, class=contributor.github ? 'has-github' : '')
|
||||
img.img-responsive(src=src, alt=contributor.name)
|
||||
.caption
|
||||
h4= contributor.name
|
||||
5
app/templates/contribute/contributor_signup.jade
Normal file
5
app/templates/contribute/contributor_signup.jade
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
label.checkbox(for=contributorClassID).well
|
||||
input(type='checkbox', name=contributorClassID, id=contributorClassID)
|
||||
span(data-i18n="contribute.#{contributorClassName}_subscribe_desc")
|
||||
.saved-notification ✓ Saved
|
||||
|
||||
12
app/templates/contribute/contributor_signup_anonymous.jade
Normal file
12
app/templates/contribute/contributor_signup_anonymous.jade
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
if me.attributes.anonymous
|
||||
div#sign-up.alert.alert-info
|
||||
strong(data-i18n="contribute.alert_account_message_intro")
|
||||
| Hey there!
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_pref")
|
||||
| To subscribe for class emails, you'll need to
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="contribute.alert_account_message_create_url")
|
||||
| create an account
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_suf")
|
||||
| first.
|
||||
|
|
@ -44,51 +44,37 @@ block content
|
|||
| , edit it online, and submit a pull request. Also, check this box below to
|
||||
| keep up-to-date on new internationalization developments!
|
||||
|
||||
if me.attributes.anonymous
|
||||
div#sign-up.alert.alert-info
|
||||
strong(data-i18n="contribute.alert_account_message_intro")
|
||||
| Hey there!
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_pref")
|
||||
| To subscribe for class emails, you'll need to
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="contribute.alert_account_message_create_url")
|
||||
| create an account
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_suf")
|
||||
| first.
|
||||
.contributor-signup-anonymous
|
||||
.contributor-signup(data-contributor-class-id="translator", data-contributor-class-name="diplomat")
|
||||
|
||||
label.checkbox(for="translator").well
|
||||
input(type='checkbox', name="translator", id="translator")
|
||||
span(data-i18n="contribute.diplomat_subscribe_desc")
|
||||
| Get emails about i18n developments and levels to translate.
|
||||
.saved-notification ✓ Saved
|
||||
h3(data-i18n="contribute.translating_diplomats")
|
||||
| Our Translating Diplomats:
|
||||
|
||||
#Contributors
|
||||
h3(data-i18n="contribute.translating_diplomats")
|
||||
| Our Translating Diplomats:
|
||||
ul.diplomats
|
||||
li Turkish - Nazım Gediz Aydındoğmuş, cobaimelan, wakeup
|
||||
li Brazilian Portuguese - Gutenberg Barros, Kieizroe, Matthew Burt, brunoporto, cassiocardoso
|
||||
li Portugal Portuguese - Matthew Burt, ReiDuKuduro
|
||||
li German - Dirk, faabsen, HiroP0, Anon, bkimminich
|
||||
li Thai - Kamolchanok Jittrepit
|
||||
li Vietnamese - An Nguyen Hoang Thien
|
||||
li Dutch - Glen De Cauwsemaecker, Guido Zuidhof, Ruben Vereecken, Jasper D'haene
|
||||
li Greek - Stergios
|
||||
li Latin American Spanish - Jesús Ruppel, Matthew Burt, Mariano Luzza
|
||||
li Spain Spanish - Matthew Burt, DanielRodriguezRivero, Anon, Pouyio
|
||||
li French - Xeonarno, Elfisen, Armaldio, MartinDelille, pstweb, veritable, jaybi, xavismeh, Anon, Feugy
|
||||
li Hungarian - ferpeter, csuvsaregal, atlantisguru, Anon
|
||||
li Japanese - g1itch, kengos
|
||||
li Chinese - Adam23, spacepope, yangxuan8282, Cheng Zheng
|
||||
li Polish - Anon, Kacper Ciepielewski
|
||||
li Danish - Einar Rasmussen, sorsjen, Randi Hillerøe, Anon
|
||||
li Slovak - Anon
|
||||
li Persian - Reza Habibi (Rehb)
|
||||
li Czech - vanous
|
||||
li Russian - fess89, ser-storchak, Mr A
|
||||
li Ukrainian - fess89
|
||||
li Italian - flauta
|
||||
li Norwegian - bardeh
|
||||
//#contributor-list
|
||||
// TODO: collect CodeCombat userids for these guys so we can include a tiled list
|
||||
ul.diplomats
|
||||
li Turkish - Nazım Gediz Aydındoğmuş, cobaimelan, wakeup
|
||||
li Brazilian Portuguese - Gutenberg Barros, Kieizroe, Matthew Burt, brunoporto, cassiocardoso
|
||||
li Portugal Portuguese - Matthew Burt, ReiDuKuduro
|
||||
li German - Dirk, faabsen, HiroP0, Anon, bkimminich
|
||||
li Thai - Kamolchanok Jittrepit
|
||||
li Vietnamese - An Nguyen Hoang Thien
|
||||
li Dutch - Glen De Cauwsemaecker, Guido Zuidhof, Ruben Vereecken, Jasper D'haene
|
||||
li Greek - Stergios
|
||||
li Latin American Spanish - Jesús Ruppel, Matthew Burt, Mariano Luzza
|
||||
li Spain Spanish - Matthew Burt, DanielRodriguezRivero, Anon, Pouyio
|
||||
li French - Xeonarno, Elfisen, Armaldio, MartinDelille, pstweb, veritable, jaybi, xavismeh, Anon, Feugy
|
||||
li Hungarian - ferpeter, csuvsaregal, atlantisguru, Anon
|
||||
li Japanese - g1itch, kengos
|
||||
li Chinese - Adam23, spacepope, yangxuan8282, Cheng Zheng
|
||||
li Polish - Anon, Kacper Ciepielewski
|
||||
li Danish - Einar Rasmussen, sorsjen, Randi Hillerøe, Anon
|
||||
li Slovak - Anon
|
||||
li Persian - Reza Habibi (Rehb)
|
||||
li Czech - vanous
|
||||
li Russian - fess89, ser-storchak, Mr A
|
||||
li Ukrainian - fess89
|
||||
li Italian - flauta
|
||||
li Norwegian - bardeh
|
||||
|
||||
div.clearfix
|
||||
|
|
|
|||
|
|
@ -44,37 +44,12 @@ block content
|
|||
| tell us a little about yourself, your experience with programming and
|
||||
| what sort of things you'd like to write about. We'll go from there!
|
||||
|
||||
if me.attributes.anonymous
|
||||
div#sign-up.alert.alert-info
|
||||
strong(data-i18n="contribute.alert_account_message_intro")
|
||||
| Hey there!
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_pref")
|
||||
| To subscribe for class emails, you'll need to
|
||||
a(data-toggle="coco-modal", data-target="modal/signup", data-i18n="contribute.alert_account_message_create_url")
|
||||
| create an account
|
||||
span
|
||||
span(data-i18n="contribute.alert_account_message_suf")
|
||||
| first.
|
||||
.contributor-signup-anonymous
|
||||
.contributor-signup(data-contributor-class-id="article_editor", data-contributor-class-name="scribe")
|
||||
|
||||
label.checkbox(for="article_editor").well
|
||||
input(type='checkbox', name="article_editor", id="article_editor")
|
||||
span(data-i18n="contribute.scribe_subscribe_desc")
|
||||
| Get emails about article writing announcements.
|
||||
.saved-notification ✓ Saved
|
||||
|
||||
#Contributors
|
||||
h3(data-i18n="contribute.diligent_scribes")
|
||||
| Our Diligent Scribes:
|
||||
ul.scribes
|
||||
li Ryan Faidley
|
||||
li Glen De Cauwsemaecker
|
||||
li Mischa Lewis-Norelle
|
||||
li Tavio
|
||||
li Ronnie Cheng
|
||||
li engstrom
|
||||
li Dman19993
|
||||
li mattinsler
|
||||
|
||||
h3(data-i18n="contribute.diligent_scribes")
|
||||
| Our Diligent Scribes:
|
||||
|
||||
#contributor-list(data-contributor-class-name="scribe")
|
||||
|
||||
div.clearfix
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ block content
|
|||
button(data-i18n="general.version_history").btn.btn-primary#history-button Version History
|
||||
button(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert", disabled=authorized === true ? undefined : "true").btn.btn-primary#revert-button Revert
|
||||
button(data-i18n="article.edit_btn_preview", disabled=authorized === true ? undefined : "true").btn.btn-primary#preview-button Preview
|
||||
button(data-toggle="coco-modal", data-target="modal/save_version", data-i18n="common.save", disabled=authorized === true ? undefined : "true").btn.btn-primary#save-button Save
|
||||
button(data-i18n="common.save", disabled=authorized === true ? undefined : "true").btn.btn-primary#save-button Save
|
||||
|
||||
h3(data-i18n="article.edit_article_title") Edit Article
|
||||
span
|
||||
|
|
|
|||
46
app/templates/editor/delta.jade
Normal file
46
app/templates/editor/delta.jade
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
- var i = 0
|
||||
|
||||
mixin deltaPanel(delta, conflict)
|
||||
- delta.index = i++
|
||||
.delta.panel.panel-default(class='delta-'+delta.action, data-index=i)
|
||||
.panel-heading
|
||||
if delta.action === 'added'
|
||||
strong(data-i18n="delta.added") Added
|
||||
if delta.action === 'modified'
|
||||
strong(data-i18n="delta.modified") Modified
|
||||
if delta.action === 'deleted'
|
||||
strong(data-i18n="delta.deleted") Deleted
|
||||
if delta.action === 'moved-index'
|
||||
strong(data-i18n="delta.modified_array") Moved Index
|
||||
if delta.action === 'text-diff'
|
||||
strong(data-i18n="delta.text_diff") Text Diff
|
||||
span
|
||||
a(data-toggle="collapse" data-parent="#delta-accordion"+(counter) href="#collapse-"+(i+counter))
|
||||
span= delta.humanPath
|
||||
|
||||
.panel-collapse.collapse(id="collapse-"+(i+counter))
|
||||
.panel-body.row(class=conflict ? "conflict-details" : "details")
|
||||
if delta.action === 'added'
|
||||
.new-value.col-md-12= delta.right
|
||||
if delta.action === 'modified'
|
||||
.old-value.col-md-6= delta.left
|
||||
.new-value.col-md-6= delta.right
|
||||
if delta.action === 'deleted'
|
||||
.col-md-12
|
||||
div.old-value= delta.left
|
||||
if delta.action === 'text-diff'
|
||||
.col-md-12
|
||||
div.text-diff
|
||||
if delta.action === 'moved-index'
|
||||
.col-md-12
|
||||
span Moved array value #{JSON.stringify(delta.left)} to index #{delta.destinationIndex}
|
||||
|
||||
if delta.conflict && !conflict
|
||||
.panel-body
|
||||
strong MERGE CONFLICT WITH
|
||||
+deltaPanel(delta.conflict, true)
|
||||
|
||||
.panel-group(id='delta-accordion-'+(counter))
|
||||
for delta in deltas
|
||||
+deltaPanel(delta)
|
||||
|
||||
|
|
@ -26,11 +26,16 @@ block outer_content
|
|||
a(href="#editor-level-components-tab-view", data-toggle="tab", data-i18n="editor.level_tab_components") Components
|
||||
li
|
||||
a(href="#editor-level-systems-tab-view", data-toggle="tab", data-i18n="editor.level_tab_systems") Systems
|
||||
|
||||
|
||||
li
|
||||
a(href="#editor-level-patches", data-toggle="tab", data-i18n="resources.patches")#patches-tab Patches
|
||||
|
||||
|
||||
ul.nav.navbar-nav.navbar-right
|
||||
li(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert", disabled=authorized === true ? undefined : "true").btn.btn-primary.navbar-btn#revert-button Revert
|
||||
li(data-i18n="common.save", disabled=authorized === true ? undefined : "true").btn.btn-primary.navbar-btn#commit-level-start-button Save
|
||||
if authorized
|
||||
li(data-i18n="common.save").btn.btn-primary.navbar-btn#commit-level-start-button Save
|
||||
else
|
||||
li(data-i18n="common.patch").btn.btn-primary.navbar-btn#commit-level-patch-button Patch
|
||||
li(data-i18n="common.fork", disabled=anonymous ? "true": undefined).btn.btn-primary.navbar-btn#fork-level-start-button Fork
|
||||
li(title="⌃↩ or ⌘↩: Play preview of current level", data-i18n="common.play")#play-button.btn.btn-inverse.banner.navbar-btn Play!
|
||||
|
||||
|
|
@ -74,6 +79,9 @@ block outer_content
|
|||
div.tab-pane#editor-level-components-tab-view
|
||||
|
||||
div.tab-pane#editor-level-systems-tab-view
|
||||
|
||||
div.tab-pane#editor-level-patches
|
||||
.patches-view
|
||||
|
||||
div#error-view
|
||||
|
||||
|
|
|
|||
|
|
@ -3,19 +3,20 @@ extends /templates/modal/save_version
|
|||
block modal-body-content
|
||||
h3= "Level: " + level.get('name') + " - " + (levelNeedsSave ? "Modified" : "Not Modified")
|
||||
if levelNeedsSave
|
||||
form#save-level-form.form
|
||||
.form-group
|
||||
label.control-label(for="level-commit-message", data-i18n="general.commit_msg") Commit Message
|
||||
textarea.form-control#level-commit-message(name="commit-message", type="text")
|
||||
.changes-stub
|
||||
form#save-level-form.form-inline
|
||||
.form-group.commit-message
|
||||
input.form-control#level-commit-message(name="commit-message", type="text")
|
||||
if level.isPublished()
|
||||
.form-group.checkbox
|
||||
label.control-label(for="level-version-is-major", data-i18n="versions.new_major_version") New Major Version
|
||||
input#level-version-is-major(name="version-is-major", type="checkbox")
|
||||
span.help-block(data-i18n="versions.update_break_level") (Could this update break old solutions of the level?)
|
||||
.checkbox
|
||||
label
|
||||
input#level-version-is-major(name="version-is-major", type="checkbox")
|
||||
span(data-i18n="versions.new_major_version") New Major Version
|
||||
if !level.isPublished()
|
||||
.form-group.checkbox
|
||||
label.control-label(for="level-publish", data-i18n="editor.level_publish") Publish This Level (irreversible)?
|
||||
input#level-publish(name="publish", type="checkbox")
|
||||
.checkbox
|
||||
label
|
||||
input#level-publish(name="publish", type="checkbox")
|
||||
span(data-i18n="common.publish") Publish
|
||||
|
||||
if modifiedComponents.length
|
||||
hr
|
||||
|
|
@ -23,17 +24,17 @@ block modal-body-content
|
|||
each component in modifiedComponents
|
||||
- var id = component.get('_id')
|
||||
h4= "Component: " + component.get('system') + '.' + component.get('name')
|
||||
form.component-form(id="save-component-" + id + "-form")
|
||||
.changes-stub
|
||||
form.form-inline.component-form(id="save-component-" + id + "-form")
|
||||
input(name="component-original", type="hidden", value=component.get('original'))
|
||||
input(name="component-parent-major-version", type="hidden", value=component.get('version').major)
|
||||
.form-group
|
||||
label.control-label(for=id + "-commit-message", data-i18n="general.commit_msg") Commit Message
|
||||
textarea.form-control(id=id + "-commit-message", name="commit-message", type="text")
|
||||
.form-group.commit-message
|
||||
input.form-control(id=id + "-commit-message", name="commit-message", type="text")
|
||||
if component.isPublished()
|
||||
.form-group.checkbox
|
||||
label.control-label(for=id + "-version-is-major", data-i18n="versions.new_major_version") New Major Version
|
||||
input(id=id + "-version-is-major", name="version-is-major", type="checkbox")
|
||||
span.help-block(data-i18n="versions.update_break_component") (Could this update break anything depending on this Component?)
|
||||
.checkbox
|
||||
label
|
||||
input(id=id + "-version-is-major", name="version-is-major", type="checkbox")
|
||||
span(data-i18n="versions.new_major_version") New Major Version
|
||||
|
||||
if modifiedSystems.length
|
||||
hr
|
||||
|
|
@ -41,14 +42,14 @@ block modal-body-content
|
|||
each system in modifiedSystems
|
||||
- var id = system.get('_id')
|
||||
h4= "System: " + system.get('name')
|
||||
form.system-form(id="save-system-" + id + "-form")
|
||||
.changes-stub
|
||||
form.form-inline.system-form(id="save-system-" + id + "-form")
|
||||
input(name="system-original", type="hidden", value=system.get('original'))
|
||||
input(name="system-parent-major-version", type="hidden", value=system.get('version').major)
|
||||
.form-group
|
||||
label.control-label(for=id + "-commit-message", data-i18n="general.commit_msg") Commit Message
|
||||
textarea.form-control(id=id + "-commit-message", name="commit-message", type="text")
|
||||
.form-group.commit-message
|
||||
input.form-control(id=id + "-commit-message", name="commit-message", type="text", placeholder="Commit Message")
|
||||
if system.isPublished()
|
||||
.form-group.checkbox
|
||||
label.control-label(for=id + "-version-is-major", data-i18n="versions.new_major_version") New Major Version
|
||||
input(id=id + "-version-is-major", name="version-is-major", type="checkbox")
|
||||
span.help-block(data-i18n="versions.update_break_system") (Could this update break anything depending on this System?)
|
||||
.checkbox
|
||||
label
|
||||
input(id=id + "-version-is-major", name="version-is-major", type="checkbox")
|
||||
span(data-i18n="versions.new_major_version") New Major Version
|
||||
|
|
|
|||
23
app/templates/editor/patch_modal.jade
Normal file
23
app/templates/editor/patch_modal.jade
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
extends /templates/modal/modal_base
|
||||
|
||||
block modal-header-content
|
||||
.modal-header-content
|
||||
h3 Patch
|
||||
|
||||
block modal-body-content
|
||||
.modal-body
|
||||
.changes-stub
|
||||
|
||||
|
||||
block modal-footer
|
||||
.modal-footer
|
||||
button(data-dismiss="modal", data-i18n="common.cancel").btn Cancel
|
||||
if isPatchCreator
|
||||
if status != 'withdrawn'
|
||||
button.btn.btn-danger#withdraw-button Withdraw
|
||||
if isPatchRecipient
|
||||
if status != 'accepted'
|
||||
button.btn.btn-primary#accept-button Accept
|
||||
if status != 'rejected'
|
||||
button.btn.btn-danger#reject-button Reject
|
||||
|
||||
30
app/templates/editor/patches.jade
Normal file
30
app/templates/editor/patches.jade
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
.btn-group(data-toggle="buttons").status-buttons
|
||||
label.btn.btn-default.pending
|
||||
input(type="radio", name="status", value="pending")
|
||||
| Pending
|
||||
label.btn.btn-default.accepted
|
||||
input(type="radio", name="status", value="accepted")
|
||||
| Accepted
|
||||
label.btn.btn-default.rejected
|
||||
input(type="radio", name="status", value="rejected")
|
||||
| Rejected
|
||||
label.btn.btn-default.withdrawn
|
||||
input(type="radio", name="status", value="withdrawn")
|
||||
| Withdrawn
|
||||
|
||||
if patches.loading
|
||||
p Loading
|
||||
else
|
||||
table.table.table-condensed.table-bordered
|
||||
tr
|
||||
th Submitter
|
||||
th Submitted
|
||||
th Commit Message
|
||||
th Review
|
||||
for patch in patches
|
||||
tr
|
||||
td= patch.userName
|
||||
td= moment(patch.get('created')).format('llll')
|
||||
td= patch.get('commitMessage')
|
||||
td
|
||||
span.glyphicon.glyphicon-wrench(data-patch-id=patch.id).patch-icon
|
||||
|
|
@ -13,7 +13,7 @@ block content
|
|||
img#portrait.img-thumbnail
|
||||
|
||||
button.btn.btn-secondary#history-button(data-i18n="general.version_history") Version History
|
||||
button.btn.btn-primary#save-button(data-toggle="coco-modal", data-target="modal/save_version", data-i18n="common.save", disabled=authorized === true ? undefined : "true") Save
|
||||
button.btn.btn-primary#save-button(data-i18n="common.save", disabled=authorized === true ? undefined : "true") Save
|
||||
button.btn.btn-primary#revert-button(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert", disabled=authorized === true ? undefined : "true") Revert
|
||||
|
||||
h3 Edit Thang Type: "#{thangType.attributes.name}"
|
||||
|
|
@ -27,11 +27,13 @@ block content
|
|||
a(href="#editor-thang-spritesheets-view", data-toggle="tab") Spritesheets
|
||||
li
|
||||
a(href="#editor-thang-colors-tab-view", data-toggle="tab")#color-tab Colors
|
||||
li
|
||||
a(href="#editor-thang-patches-view", data-toggle="tab")#patches-tab Patches
|
||||
|
||||
div.tab-content
|
||||
div.tab-pane#editor-thang-colors-tab-view
|
||||
|
||||
div.tab-pane.active#editor-thang-main-tab-view
|
||||
div.tab-pane#editor-thang-main-tab-view.active
|
||||
|
||||
div.main-area.well
|
||||
div.file-controls
|
||||
|
|
@ -83,6 +85,10 @@ block content
|
|||
div.tab-pane#editor-thang-spritesheets-view
|
||||
|
||||
div#spritesheets
|
||||
|
||||
div.tab-pane#editor-thang-patches-view
|
||||
|
||||
div.patches-view
|
||||
|
||||
div#error-view
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,3 @@ block modal-body-content
|
|||
| #{model.type()}: #{model.get('name')}
|
||||
td
|
||||
button(value=model.id, data-i18n="editor.revert") Revert
|
||||
|
||||
block modal-footer-content
|
||||
button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel
|
||||
|
|
@ -1,30 +1,46 @@
|
|||
extends /templates/modal/modal_base
|
||||
|
||||
block modal-header-content
|
||||
h3(data-i18n="versions.save_version_title") Save New Version
|
||||
if isPatch
|
||||
h3(data-i18n="versions.submit_patch_title") Submit Patch
|
||||
else
|
||||
h3(data-i18n="versions.save_version_title") Save New Version
|
||||
|
||||
block modal-body-content
|
||||
form.form
|
||||
.form-group
|
||||
label.control-label(for="commitMessage", data-i18n="general.commit_msg") Commit Message
|
||||
textarea#commit-message.input-large.form-control(name="commitMessage", type="text")
|
||||
.form-group
|
||||
label.control-label(for="level-version-is-major", data-i18n="versions.new_major_version") New Major Version
|
||||
input#major-version.input-large.form-control(name="version-is-major", type="checkbox")
|
||||
span.help-block
|
||||
if hasChanges
|
||||
.changes-stub
|
||||
form.form-inline
|
||||
.form-group.commit-message
|
||||
input.form-control#commit-message(name="commitMessage", type="text")
|
||||
if !isPatch
|
||||
.checkbox
|
||||
label
|
||||
input#major-version(name="version-is-major", type="checkbox")
|
||||
span(data-i18n="versions.new_major_version") New Major Version
|
||||
else
|
||||
.alert.alert-danger No changes
|
||||
|
||||
block modal-body-wait-content
|
||||
h3(data-i18n="common.saving") Saving...
|
||||
if hasChanges
|
||||
if isPatch
|
||||
h3(data-i18n="versions.submitting_patch") Submitting Patch...
|
||||
else
|
||||
h3(data-i18n="common.saving") Saving...
|
||||
|
||||
block modal-footer-content
|
||||
if !noSaveButton
|
||||
if hasChanges
|
||||
#accept-cla-wrapper.alert.alert-info
|
||||
span(data-i18n="versions.cla_prefix") To save changes, first you must agree to our
|
||||
|
|
||||
strong#cla-link(data-i18n="versions.cla_url") CLA
|
||||
span(data-i18n="versions.cla_suffix") .
|
||||
button.btn#agreement-button(data-i18n="versions.cla_agree") I AGREE
|
||||
button.btn.btn-sm#agreement-button(data-i18n="versions.cla_agree") I AGREE
|
||||
if isPatch
|
||||
.alert.alert-info An owner will need to approve it before your changes will become visible.
|
||||
|
||||
button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel
|
||||
if !noSaveButton
|
||||
button.btn.btn-primary#save-version-button(data-i18n="common.save") Save
|
||||
.buttons
|
||||
button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel
|
||||
if hasChanges && !isPatch
|
||||
button.btn.btn-primary#save-version-button(data-i18n="common.save") Save
|
||||
if hasChanges && isPatch
|
||||
button.btn.btn-primary#submit-patch-button(data-i18n="versions.submit_patch") Submit Patch
|
||||
|
|
@ -14,12 +14,6 @@ module.exports = class JobProfileView extends CocoView
|
|||
'updated'
|
||||
]
|
||||
|
||||
constructor: (options) ->
|
||||
super options
|
||||
unless me.schema().loaded
|
||||
@addSomethingToLoad("user_schema")
|
||||
@listenToOnce me, 'schema-loaded', => @somethingLoaded 'user_schema'
|
||||
|
||||
afterRender: ->
|
||||
super()
|
||||
return if @loading()
|
||||
|
|
@ -29,7 +23,8 @@ module.exports = class JobProfileView extends CocoView
|
|||
visibleSettings = @editableSettings.concat @readOnlySettings
|
||||
data = _.pick (me.get('jobProfile') ? {}), (value, key) => key in visibleSettings
|
||||
data.name ?= (me.get('firstName') + ' ' + me.get('lastName')).trim() if me.get('firstName')
|
||||
schema = _.cloneDeep me.schema().get('properties').jobProfile
|
||||
console.log 'schema?', me.schema()
|
||||
schema = _.cloneDeep me.schema().properties.jobProfile
|
||||
schema.properties = _.pick schema.properties, (value, key) => key in visibleSettings
|
||||
schema.required = _.intersection schema.required, visibleSettings
|
||||
for prop in @readOnlySettings
|
||||
|
|
|
|||
|
|
@ -43,11 +43,7 @@ module.exports = class SettingsView extends View
|
|||
@jobProfileView = new JobProfileView()
|
||||
@listenTo @jobProfileView, 'change', @save
|
||||
@insertSubView @jobProfileView
|
||||
|
||||
if me.schema().loaded
|
||||
@buildPictureTreema()
|
||||
else
|
||||
@listenToOnce me, 'schema-loaded', @buildPictureTreema
|
||||
@buildPictureTreema()
|
||||
|
||||
chooseTab: (category) ->
|
||||
id = "##{category}-pane"
|
||||
|
|
@ -82,9 +78,10 @@ module.exports = class SettingsView extends View
|
|||
buildPictureTreema: ->
|
||||
data = photoURL: me.get('photoURL')
|
||||
data.photoURL = null if data.photoURL?.search('gravatar') isnt -1 # Old style
|
||||
schema = _.cloneDeep me.schema().attributes
|
||||
schema.properties = _.pick me.schema().get('properties'), 'photoURL'
|
||||
schema = _.cloneDeep me.schema()
|
||||
schema.properties = _.pick me.schema().properties, 'photoURL'
|
||||
schema.required = ['photoURL']
|
||||
console.log 'have data', data, 'schema', schema
|
||||
treemaOptions =
|
||||
filePath: "db/user/#{me.id}"
|
||||
schema: schema
|
||||
|
|
@ -92,8 +89,8 @@ module.exports = class SettingsView extends View
|
|||
callbacks: {change: @onPictureChanged}
|
||||
|
||||
@pictureTreema = @$el.find('#picture-treema').treema treemaOptions
|
||||
@pictureTreema.build()
|
||||
@pictureTreema.open()
|
||||
@pictureTreema?.build()
|
||||
@pictureTreema?.open()
|
||||
@$el.find('.gravatar-fallback').toggle not me.get 'photoURL'
|
||||
|
||||
onPictureChanged: (e) =>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
View = require 'views/kinds/RootView'
|
||||
RootView = require 'views/kinds/RootView'
|
||||
template = require 'templates/base'
|
||||
|
||||
module.exports = class BaseView extends View
|
||||
module.exports = class BaseView extends RootView
|
||||
id: "base-view"
|
||||
template: template
|
||||
|
|
|
|||
|
|
@ -38,8 +38,7 @@ module.exports = class UsersView extends View
|
|||
@users.fetch()
|
||||
@listenTo(@users, 'all', @render)
|
||||
|
||||
getRenderData: =>
|
||||
getRenderData: ->
|
||||
c = super()
|
||||
c.users = (user.attributes for user in @users.models)
|
||||
console.log('our render data', c)
|
||||
c
|
||||
|
|
@ -4,4 +4,5 @@ template = require 'templates/contribute/adventurer'
|
|||
|
||||
module.exports = class AdventurerView extends ContributeClassView
|
||||
id: "adventurer-view"
|
||||
template: template
|
||||
template: template
|
||||
contributorClassName: 'adventurer'
|
||||
|
|
|
|||
|
|
@ -5,3 +5,4 @@ template = require 'templates/contribute/ambassador'
|
|||
module.exports = class AmbassadorView extends ContributeClassView
|
||||
id: "ambassador-view"
|
||||
template: template
|
||||
contributorClassName: 'ambassador'
|
||||
|
|
|
|||
|
|
@ -4,28 +4,30 @@ template = require 'templates/contribute/archmage'
|
|||
module.exports = class ArchmageView extends ContributeClassView
|
||||
id: "archmage-view"
|
||||
template: template
|
||||
contributorClassName: 'archmage'
|
||||
|
||||
contributors: [
|
||||
{name: "Tom Steinbrecher", avatar: "tom"}
|
||||
{name: "Sébastien Moratinos", avatar: "sebastien"}
|
||||
{name: "deepak1556", avatar: "deepak"}
|
||||
{name: "Ronnie Cheng", avatar: "ronald"}
|
||||
{name: "Chloe Fan", avatar: "chloe"}
|
||||
{name: "Rachel Xiang", avatar: "rachel"}
|
||||
{name: "Dan Ristic", avatar: "dan"}
|
||||
{name: "Brad Dickason", avatar: "brad"}
|
||||
{id: "52bfc3ecb7ec628868001297", name: "Tom Steinbrecher", github: "TomSteinbrecher"}
|
||||
{id: "5272806093680c5817033f73", name: "Sébastien Moratinos", github: "smoratinos"}
|
||||
{name: "deepak1556", avatar: "deepak", github: "deepak1556"}
|
||||
{name: "Ronnie Cheng", avatar: "ronald", github: "rhc2104"}
|
||||
{name: "Chloe Fan", avatar: "chloe", github: "chloester"}
|
||||
{name: "Rachel Xiang", avatar: "rachel", github: "rdxiang"}
|
||||
{name: "Dan Ristic", avatar: "dan", github: "dristic"}
|
||||
{name: "Brad Dickason", avatar: "brad", github: "bdickason"}
|
||||
{name: "Rebecca Saines", avatar: "becca"}
|
||||
{name: "Laura Watiker", avatar: "laura"}
|
||||
{name: "Shiying Zheng", avatar: "shiying"}
|
||||
{name: "Mischa Lewis-Norelle", avatar: "mischa"}
|
||||
{name: "Laura Watiker", avatar: "laura", github: "lwatiker"}
|
||||
{name: "Shiying Zheng", avatar: "shiying", github: "shiyingzheng"}
|
||||
{name: "Mischa Lewis-Norelle", avatar: "mischa", github: "mlewisno"}
|
||||
{name: "Paul Buser", avatar: "paul"}
|
||||
{name: "Benjamin Stern", avatar: "ben"}
|
||||
{name: "Alex Cotsarelis", avatar: "alex"}
|
||||
{name: "Ken Stanley", avatar: "ken"}
|
||||
{name: "devast8a", avatar: ""}
|
||||
{name: "phansch", avatar: ""}
|
||||
{name: "Zach Martin", avatar: ""}
|
||||
{name: "devast8a", avatar: "", github: "devast8a"}
|
||||
{name: "phansch", avatar: "", github: "phansch"}
|
||||
{name: "Zach Martin", avatar: "", github: "zachster01"}
|
||||
{name: "David Golds", avatar: ""}
|
||||
{name: "gabceb", avatar: ""}
|
||||
{name: "MDP66", avatar: ""}
|
||||
{name: "gabceb", avatar: "", github: "gabceb"}
|
||||
{name: "MDP66", avatar: "", github: "MDP66"}
|
||||
{name: "Alexandru Caciulescu", avatar: "", github: "Darredevil"}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@ template = require 'templates/contribute/artisan'
|
|||
module.exports = class ArtisanView extends ContributeClassView
|
||||
id: "artisan-view"
|
||||
template: template
|
||||
contributorClassName: 'artisan'
|
||||
|
||||
contributors: [
|
||||
{name: "Sootn", avatar: ""}
|
||||
{name: "Zach Martin", avatar: ""}
|
||||
{name: "Zach Martin", avatar: "", github: "zachster01"}
|
||||
{name: "Aftermath", avatar: ""}
|
||||
{name: "mcdavid1991", avatar: ""}
|
||||
{name: "dwhittaker", avatar: ""}
|
||||
|
|
@ -19,6 +20,6 @@ module.exports = class ArtisanView extends ContributeClassView
|
|||
{name: "Axandre Oge", avatar: "axandre"}
|
||||
{name: "Katharine Chan", avatar: "katharine"}
|
||||
{name: "Derek Wong", avatar: "derek"}
|
||||
{name: "Alexandru Caciulescu", avatar: ""}
|
||||
{name: "Prabh Simran Singh Baweja", avatar: ""}
|
||||
{name: "Alexandru Caciulescu", avatar: "", github: "Darredevil"}
|
||||
{name: "Prabh Simran Singh Baweja", avatar: "", github: "prabh27"}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
SignupModalView = require 'views/modal/signup_modal'
|
||||
View = require 'views/kinds/RootView'
|
||||
{me} = require('lib/auth')
|
||||
contributorSignupAnonymousTemplate = require 'templates/contribute/contributor_signup_anonymous'
|
||||
contributorSignupTemplate = require 'templates/contribute/contributor_signup'
|
||||
contributorListTemplate = require 'templates/contribute/contributor_list'
|
||||
|
||||
module.exports = class ContributeClassView extends View
|
||||
navPrefix: '/contribute'
|
||||
|
|
@ -16,6 +19,12 @@ module.exports = class ContributeClassView extends View
|
|||
|
||||
afterRender: ->
|
||||
super()
|
||||
@$el.find('.contributor-signup-anonymous').replaceWith(contributorSignupAnonymousTemplate(me: me))
|
||||
@$el.find('.contributor-signup').each ->
|
||||
context = me: me, contributorClassID: $(@).data('contributor-class-id'), contributorClassName: $(@).data('contributor-class-name')
|
||||
$(@).replaceWith(contributorSignupTemplate(context))
|
||||
@$el.find('#contributor-list').replaceWith(contributorListTemplate(contributors: @contributors, contributorClassName: @contributorClassName))
|
||||
|
||||
checkboxes = @$el.find('input[type="checkbox"]').toArray()
|
||||
_.forEach checkboxes, (el) ->
|
||||
el = $(el)
|
||||
|
|
|
|||
|
|
@ -5,3 +5,4 @@ template = require 'templates/contribute/counselor'
|
|||
module.exports = class CounselorView extends ContributeClassView
|
||||
id: "counselor-view"
|
||||
template: template
|
||||
contributorClassName: 'counselor'
|
||||
|
|
|
|||
|
|
@ -5,3 +5,4 @@ template = require 'templates/contribute/diplomat'
|
|||
module.exports = class DiplomatView extends ContributeClassView
|
||||
id: "diplomat-view"
|
||||
template: template
|
||||
contributorClassName: 'diplomat'
|
||||
|
|
|
|||
|
|
@ -5,3 +5,14 @@ template = require 'templates/contribute/scribe'
|
|||
module.exports = class ScribeView extends ContributeClassView
|
||||
id: "scribe-view"
|
||||
template: template
|
||||
contributorClassName: 'scribe'
|
||||
|
||||
contributors: [
|
||||
{name: "Ryan Faidley"}
|
||||
{name: "Mischa Lewis-Norelle", github: "mlewisno"}
|
||||
{name: "Tavio"}
|
||||
{name: "Ronnie Cheng", github: "rhc2104"}
|
||||
{name: "engstrom"}
|
||||
{name: "Dman19993"}
|
||||
{name: "mattinsler"}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ VersionHistoryView = require './versions_view'
|
|||
ErrorView = require '../../error_view'
|
||||
template = require 'templates/editor/article/edit'
|
||||
Article = require 'models/Article'
|
||||
SaveVersionModal = require 'views/modal/save_version_modal'
|
||||
|
||||
module.exports = class ArticleEditView extends View
|
||||
id: "editor-article-edit-view"
|
||||
|
|
@ -12,6 +13,7 @@ module.exports = class ArticleEditView extends View
|
|||
events:
|
||||
'click #preview-button': 'openPreview'
|
||||
'click #history-button': 'showVersionHistory'
|
||||
'click #save-button': 'openSaveModal'
|
||||
|
||||
subscriptions:
|
||||
'save-new-version': 'saveNewArticle'
|
||||
|
|
@ -33,17 +35,11 @@ module.exports = class ArticleEditView extends View
|
|||
)
|
||||
|
||||
@article.fetch()
|
||||
@article.loadSchema()
|
||||
@listenToOnce(@article, 'sync', @onArticleSync)
|
||||
@listenToOnce(@article, 'schema-loaded', @buildTreema)
|
||||
@listenToOnce(@article, 'sync', @buildTreema)
|
||||
@pushChangesToPreview = _.throttle(@pushChangesToPreview, 500)
|
||||
|
||||
onArticleSync: ->
|
||||
@article.loaded = true
|
||||
@buildTreema()
|
||||
|
||||
buildTreema: ->
|
||||
return if @treema? or (not @article.loaded) or (not Article.hasSchema())
|
||||
return if @treema? or (not @article.loaded)
|
||||
unless @article.attributes.body
|
||||
@article.set('body', '')
|
||||
@startsLoading = false
|
||||
|
|
@ -52,7 +48,7 @@ module.exports = class ArticleEditView extends View
|
|||
options =
|
||||
data: data
|
||||
filePath: "db/thang.type/#{@article.get('original')}"
|
||||
schema: Article.schema.attributes
|
||||
schema: Article.schema
|
||||
readOnly: true unless me.isAdmin() or @article.hasWriteAccess(me)
|
||||
callbacks:
|
||||
change: @pushChangesToPreview
|
||||
|
|
@ -78,13 +74,16 @@ module.exports = class ArticleEditView extends View
|
|||
afterRender: ->
|
||||
super()
|
||||
return if @startsLoading
|
||||
@showReadOnly() unless me.isAdmin() or @article.hasWriteAccess(me)
|
||||
@showReadOnly() if me.get('anonymous')
|
||||
|
||||
openPreview: =>
|
||||
openPreview: ->
|
||||
@preview = window.open('/editor/article/x/preview', 'preview', 'height=800,width=600')
|
||||
@preview.focus() if window.focus
|
||||
@preview.onload = => @pushChangesToPreview()
|
||||
return false
|
||||
|
||||
openSaveModal: ->
|
||||
@openModalView(new SaveVersionModal({model: @article}))
|
||||
|
||||
saveNewArticle: (e) ->
|
||||
@treema.endExistingEdits()
|
||||
|
|
|
|||
|
|
@ -20,9 +20,6 @@ module.exports = class ThangComponentEditView extends CocoView
|
|||
|
||||
render: =>
|
||||
return if @destroyed
|
||||
for model in [Level, LevelComponent]
|
||||
temp = new model()
|
||||
@listenToOnce temp, 'schema-loaded', @render unless model.schema?.loaded
|
||||
if not @componentCollection
|
||||
@componentCollection = @supermodel.getCollection new ComponentsCollection()
|
||||
unless @componentCollection.loaded
|
||||
|
|
@ -32,7 +29,7 @@ module.exports = class ThangComponentEditView extends CocoView
|
|||
|
||||
afterRender: ->
|
||||
super()
|
||||
return @showLoading() unless @componentCollection?.loaded and Level.schema.loaded and LevelComponent.schema.loaded
|
||||
return @showLoading() unless @componentCollection?.loaded
|
||||
@hideLoading()
|
||||
@buildExtantComponentTreema()
|
||||
@buildAddComponentTreema()
|
||||
|
|
@ -45,7 +42,7 @@ module.exports = class ThangComponentEditView extends CocoView
|
|||
buildExtantComponentTreema: ->
|
||||
treemaOptions =
|
||||
supermodel: @supermodel
|
||||
schema: Level.schema.get('properties').thangs.items.properties.components
|
||||
schema: Level.schema.properties.thangs.items.properties.components
|
||||
data: _.cloneDeep @components
|
||||
callbacks: {select: @onSelectExtantComponent, change:@onChangeExtantComponents}
|
||||
noSortable: true
|
||||
|
|
@ -69,7 +66,7 @@ module.exports = class ThangComponentEditView extends CocoView
|
|||
|
||||
treemaOptions =
|
||||
supermodel: @supermodel
|
||||
schema: { type: 'array', items: LevelComponent.schema.attributes }
|
||||
schema: { type: 'array', items: LevelComponent.schema }
|
||||
data: ($.extend(true, {}, c) for c in components)
|
||||
callbacks: {select: @onSelectAddableComponent, enter: @onAddComponentEnterPressed }
|
||||
readOnly: true
|
||||
|
|
|
|||
70
app/views/editor/delta.coffee
Normal file
70
app/views/editor/delta.coffee
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
CocoView = require 'views/kinds/CocoView'
|
||||
template = require 'templates/editor/delta'
|
||||
deltasLib = require 'lib/deltas'
|
||||
|
||||
TEXTDIFF_OPTIONS =
|
||||
baseTextName: "Old"
|
||||
newTextName: "New"
|
||||
contextSize: 5
|
||||
viewType: 1
|
||||
|
||||
module.exports = class DeltaView extends CocoView
|
||||
@deltaCounter: 0
|
||||
className: "delta-view"
|
||||
template: template
|
||||
|
||||
constructor: (options) ->
|
||||
super(options)
|
||||
@model = options.model
|
||||
@headModel = options.headModel
|
||||
@expandedDeltas = @model.getExpandedDelta()
|
||||
if @headModel
|
||||
@headDeltas = @headModel.getExpandedDelta()
|
||||
@conflicts = deltasLib.getConflicts(@headDeltas, @expandedDeltas)
|
||||
DeltaView.deltaCounter += @expandedDeltas.length
|
||||
|
||||
getRenderData: ->
|
||||
c = super()
|
||||
c.deltas = @expandedDeltas
|
||||
c.counter = DeltaView.deltaCounter
|
||||
c
|
||||
|
||||
afterRender: ->
|
||||
deltas = @$el.find('.details')
|
||||
for delta, i in deltas
|
||||
deltaEl = $(delta)
|
||||
deltaData = @expandedDeltas[i]
|
||||
@expandDetails(deltaEl, deltaData)
|
||||
|
||||
conflictDeltas = @$el.find('.conflict-details')
|
||||
conflicts = (delta.conflict for delta in @expandedDeltas when delta.conflict)
|
||||
for delta, i in conflictDeltas
|
||||
deltaEl = $(delta)
|
||||
deltaData = conflicts[i]
|
||||
@expandDetails(deltaEl, deltaData)
|
||||
|
||||
expandDetails: (deltaEl, deltaData) ->
|
||||
treemaOptions = { schema: deltaData.schema, readOnly: true }
|
||||
|
||||
if _.isObject(deltaData.left) and leftEl = deltaEl.find('.old-value')
|
||||
options = _.defaults {data: deltaData.left}, treemaOptions
|
||||
TreemaNode.make(leftEl, options).build()
|
||||
|
||||
if _.isObject(deltaData.right) and rightEl = deltaEl.find('.new-value')
|
||||
options = _.defaults {data: deltaData.right}, treemaOptions
|
||||
TreemaNode.make(rightEl, options).build()
|
||||
|
||||
if deltaData.action is 'text-diff'
|
||||
left = difflib.stringAsLines deltaData.left
|
||||
right = difflib.stringAsLines deltaData.right
|
||||
sm = new difflib.SequenceMatcher(left, right)
|
||||
opcodes = sm.get_opcodes()
|
||||
el = deltaEl.find('.text-diff')
|
||||
options = {baseTextLines: left, newTextLines: right, opcodes: opcodes}
|
||||
args = _.defaults options, TEXTDIFF_OPTIONS
|
||||
el.append(diffview.buildView(args))
|
||||
|
||||
getApplicableDelta: ->
|
||||
delta = @model.getDelta()
|
||||
delta = deltasLib.pruneConflictsFromDelta delta, @conflicts if @conflicts
|
||||
delta
|
||||
|
|
@ -31,7 +31,7 @@ module.exports = class LevelComponentEditView extends View
|
|||
|
||||
buildSettingsTreema: ->
|
||||
data = _.pick @levelComponent.attributes, (value, key) => key in @editableSettings
|
||||
schema = _.cloneDeep LevelComponent.schema.attributes
|
||||
schema = _.cloneDeep LevelComponent.schema
|
||||
schema.properties = _.pick schema.properties, (value, key) => key in @editableSettings
|
||||
schema.required = _.intersection schema.required, @editableSettings
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ module.exports = class LevelComponentEditView extends View
|
|||
buildConfigSchemaTreema: ->
|
||||
treemaOptions =
|
||||
supermodel: @supermodel
|
||||
schema: LevelComponent.schema.get('properties').configSchema
|
||||
schema: LevelComponent.schema.properties.configSchema
|
||||
data: @levelComponent.get 'configSchema'
|
||||
callbacks: {change: @onConfigSchemaEdited}
|
||||
treemaOptions.readOnly = true unless me.isAdmin()
|
||||
|
|
@ -63,7 +63,7 @@ module.exports = class LevelComponentEditView extends View
|
|||
@configSchemaTreema.build()
|
||||
@configSchemaTreema.open()
|
||||
# TODO: schema is not loaded for the first one here?
|
||||
@configSchemaTreema.tv4.addSchema('metaschema', LevelComponent.schema.get('properties').configSchema)
|
||||
@configSchemaTreema.tv4.addSchema('metaschema', LevelComponent.schema.properties.configSchema)
|
||||
|
||||
onConfigSchemaEdited: =>
|
||||
@levelComponent.set 'configSchema', @configSchemaTreema.data
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ ComponentsTabView = require './components_tab_view'
|
|||
SystemsTabView = require './systems_tab_view'
|
||||
LevelSaveView = require './save_view'
|
||||
LevelForkView = require './fork_view'
|
||||
SaveVersionModal = require 'views/modal/save_version_modal'
|
||||
PatchesView = require 'views/editor/patches_view'
|
||||
VersionHistoryView = require './versions_view'
|
||||
ErrorView = require '../../error_view'
|
||||
|
||||
|
|
@ -26,6 +28,8 @@ module.exports = class EditorLevelView extends View
|
|||
'click #commit-level-start-button': 'startCommittingLevel'
|
||||
'click #fork-level-start-button': 'startForkingLevel'
|
||||
'click #history-button': 'showVersionHistory'
|
||||
'click #patches-tab': -> @patchesView.load()
|
||||
'click #commit-level-patch-button': 'startPatchingLevel'
|
||||
|
||||
constructor: (options, @levelID) ->
|
||||
super options
|
||||
|
|
@ -88,7 +92,8 @@ module.exports = class EditorLevelView extends View
|
|||
@componentsTab = @insertSubView new ComponentsTabView supermodel: @supermodel
|
||||
@systemsTab = @insertSubView new SystemsTabView supermodel: @supermodel
|
||||
Backbone.Mediator.publish 'level-loaded', level: @level
|
||||
@showReadOnly() unless me.isAdmin() or @level.hasWriteAccess(me)
|
||||
@showReadOnly() if me.get('anonymous')
|
||||
@patchesView = @insertSubView(new PatchesView(@level), @$el.find('.patches-view'))
|
||||
|
||||
onPlayLevel: (e) ->
|
||||
sendLevel = =>
|
||||
|
|
@ -103,9 +108,12 @@ module.exports = class EditorLevelView extends View
|
|||
@childWindow.onPlayLevelViewLoaded = (e) => sendLevel() # still a hack
|
||||
@childWindow.focus()
|
||||
|
||||
startPatchingLevel: (e) ->
|
||||
@openModalView new SaveVersionModal({model:@level})
|
||||
Backbone.Mediator.publish 'level:view-switched', e
|
||||
|
||||
startCommittingLevel: (e) ->
|
||||
levelSaveView = new LevelSaveView level: @level, supermodel: @supermodel
|
||||
@openModalView levelSaveView
|
||||
@openModalView new LevelSaveView level: @level, supermodel: @supermodel
|
||||
Backbone.Mediator.publish 'level:view-switched', e
|
||||
|
||||
startForkingLevel: (e) ->
|
||||
|
|
|
|||
|
|
@ -3,11 +3,13 @@ template = require 'templates/editor/level/save'
|
|||
forms = require 'lib/forms'
|
||||
LevelComponent = require 'models/LevelComponent'
|
||||
LevelSystem = require 'models/LevelSystem'
|
||||
DeltaView = require 'views/editor/delta'
|
||||
|
||||
module.exports = class LevelSaveView extends SaveVersionModal
|
||||
template: template
|
||||
instant: false
|
||||
modalWidthPercent: 60
|
||||
plain: true
|
||||
|
||||
events:
|
||||
'click #save-version-button': 'commitLevel'
|
||||
|
|
@ -23,8 +25,20 @@ module.exports = class LevelSaveView extends SaveVersionModal
|
|||
context.levelNeedsSave = @level.hasLocalChanges()
|
||||
context.modifiedComponents = _.filter @supermodel.getModels(LevelComponent), @shouldSaveEntity
|
||||
context.modifiedSystems = _.filter @supermodel.getModels(LevelSystem), @shouldSaveEntity
|
||||
context.noSaveButton = not (context.levelNeedsSave or context.modifiedComponents.length or context.modifiedSystems.length)
|
||||
context.hasChanges = (context.levelNeedsSave or context.modifiedComponents.length or context.modifiedSystems.length)
|
||||
@lastContext = context
|
||||
context
|
||||
|
||||
afterRender: ->
|
||||
super()
|
||||
changeEls = @$el.find('.changes-stub')
|
||||
models = if @lastContext.levelNeedsSave then [@level] else []
|
||||
models = models.concat @lastContext.modifiedComponents
|
||||
models = models.concat @lastContext.modifiedSystems
|
||||
for changeEl, i in changeEls
|
||||
model = models[i]
|
||||
deltaView = new DeltaView({model:model})
|
||||
@insertSubView(deltaView, $(changeEl))
|
||||
|
||||
shouldSaveEntity: (m) ->
|
||||
return true if m.hasLocalChanges()
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ template = require 'templates/editor/level/scripts_tab'
|
|||
Level = require 'models/Level'
|
||||
Surface = require 'lib/surface/Surface'
|
||||
nodes = require './treema_nodes'
|
||||
defaultScripts = require 'lib/scripts/defaultScripts'
|
||||
|
||||
module.exports = class ScriptsTabView extends View
|
||||
id: "editor-level-scripts-tab-view"
|
||||
|
|
@ -22,9 +21,8 @@ module.exports = class ScriptsTabView extends View
|
|||
@level = e.level
|
||||
@dimensions = @level.dimensions()
|
||||
scripts = $.extend(true, [], @level.get('scripts') ? [])
|
||||
scripts = _.cloneDeep defaultScripts unless scripts.length
|
||||
treemaOptions =
|
||||
schema: Level.schema.get('properties').scripts
|
||||
schema: Level.schema.properties.scripts
|
||||
data: scripts
|
||||
callbacks:
|
||||
change: @onScriptsChanged
|
||||
|
|
@ -54,7 +52,7 @@ module.exports = class ScriptsTabView extends View
|
|||
filePath: "db/level/#{@level.get('original')}"
|
||||
files: @files
|
||||
view: @
|
||||
schema: Level.schema.get('properties').scripts.items
|
||||
schema: Level.schema.properties.scripts.items
|
||||
data: selected.data
|
||||
thangIDs: thangIDs
|
||||
dimensions: @dimensions
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ module.exports = class SettingsTabView extends View
|
|||
onLevelLoaded: (e) ->
|
||||
@level = e.level
|
||||
data = _.pick @level.attributes, (value, key) => key in @editableSettings
|
||||
schema = _.cloneDeep Level.schema.attributes
|
||||
schema = _.cloneDeep Level.schema
|
||||
schema.properties = _.pick schema.properties, (value, key) => key in @editableSettings
|
||||
schema.required = _.intersection schema.required, @editableSettings
|
||||
thangIDs = @getThangIDs()
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ module.exports = class LevelSystemEditView extends View
|
|||
|
||||
buildSettingsTreema: ->
|
||||
data = _.pick @levelSystem.attributes, (value, key) => key in @editableSettings
|
||||
schema = _.cloneDeep LevelSystem.schema.attributes
|
||||
schema = _.cloneDeep LevelSystem.schema
|
||||
schema.properties = _.pick schema.properties, (value, key) => key in @editableSettings
|
||||
schema.required = _.intersection schema.required, @editableSettings
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ module.exports = class LevelSystemEditView extends View
|
|||
buildConfigSchemaTreema: ->
|
||||
treemaOptions =
|
||||
supermodel: @supermodel
|
||||
schema: LevelSystem.schema.get('properties').configSchema
|
||||
schema: LevelSystem.schema.properties.configSchema
|
||||
data: @levelSystem.get 'configSchema'
|
||||
callbacks: {change: @onConfigSchemaEdited}
|
||||
treemaOptions.readOnly = true unless me.isAdmin()
|
||||
|
|
@ -61,7 +61,7 @@ module.exports = class LevelSystemEditView extends View
|
|||
@configSchemaTreema.build()
|
||||
@configSchemaTreema.open()
|
||||
# TODO: schema is not loaded for the first one here?
|
||||
@configSchemaTreema.tv4.addSchema('metaschema', LevelSystem.schema.get('properties').configSchema)
|
||||
@configSchemaTreema.tv4.addSchema('metaschema', LevelSystem.schema.properties.configSchema)
|
||||
|
||||
onConfigSchemaEdited: =>
|
||||
@levelSystem.set 'configSchema', @configSchemaTreema.data
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ module.exports = class SystemsTabView extends View
|
|||
treemaOptions =
|
||||
# TODO: somehow get rid of the + button, or repurpose it to open the LevelSystemAddView instead
|
||||
supermodel: @supermodel
|
||||
schema: Level.schema.get('properties').systems
|
||||
schema: Level.schema.properties.systems
|
||||
data: systems
|
||||
readOnly: true unless me.isAdmin() or @level.hasWriteAccess(me)
|
||||
callbacks:
|
||||
|
|
@ -159,11 +159,12 @@ class LevelSystemNode extends TreemaObjectNode
|
|||
name = "#{@system.get('name')} v#{@system.get('version').major}"
|
||||
@buildValueForDisplaySimply valEl, "#{name}"
|
||||
|
||||
onEnterPressed: ->
|
||||
onEnterPressed: (e) ->
|
||||
super e
|
||||
Backbone.Mediator.publish 'edit-level-system', original: @data.original, majorVersion: @data.majorVersion
|
||||
|
||||
open: ->
|
||||
super()
|
||||
open: (depth) ->
|
||||
super depth
|
||||
cTreema = @childrenTreemas.config
|
||||
if cTreema? and (cTreema.getChildren().length or cTreema.canAddChild())
|
||||
cTreema.open()
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ module.exports = class ThangsTabView extends View
|
|||
return if @startsLoading
|
||||
data = $.extend(true, {}, @level.attributes)
|
||||
treemaOptions =
|
||||
schema: Level.schema.get('properties').thangs
|
||||
schema: Level.schema.properties.thangs
|
||||
data: data.thangs
|
||||
supermodel: @supermodel
|
||||
callbacks:
|
||||
|
|
|
|||
60
app/views/editor/patch_modal.coffee
Normal file
60
app/views/editor/patch_modal.coffee
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
ModalView = require 'views/kinds/ModalView'
|
||||
template = require 'templates/editor/patch_modal'
|
||||
DeltaView = require 'views/editor/delta'
|
||||
auth = require 'lib/auth'
|
||||
|
||||
module.exports = class PatchModal extends ModalView
|
||||
id: "patch-modal"
|
||||
template: template
|
||||
plain: true
|
||||
|
||||
events:
|
||||
'click #withdraw-button': 'withdrawPatch'
|
||||
'click #reject-button': 'rejectPatch'
|
||||
'click #accept-button': 'acceptPatch'
|
||||
|
||||
constructor: (@patch, @targetModel, options) ->
|
||||
super(options)
|
||||
targetID = @patch.get('target').id
|
||||
if false
|
||||
@originalSource = targetModel.clone(false)
|
||||
@onOriginalLoaded()
|
||||
else
|
||||
@originalSource = new targetModel.constructor({_id:targetID})
|
||||
@originalSource.fetch()
|
||||
@listenToOnce @originalSource, 'sync', @onOriginalLoaded
|
||||
@addResourceToLoad(@originalSource)
|
||||
|
||||
getRenderData: ->
|
||||
c = super()
|
||||
c.isPatchCreator = @patch.get('creator') is auth.me.id
|
||||
c.isPatchRecipient = @targetModel.hasWriteAccess()
|
||||
c.status = @patch.get 'status'
|
||||
c
|
||||
|
||||
afterRender: ->
|
||||
return if @originalSource.loading
|
||||
headModel = @originalSource.clone(false)
|
||||
headModel.set(@targetModel.attributes)
|
||||
|
||||
pendingModel = @originalSource.clone(false)
|
||||
pendingModel.applyDelta(@patch.get('delta'))
|
||||
|
||||
@deltaView = new DeltaView({model:pendingModel, headModel:headModel})
|
||||
changeEl = @$el.find('.changes-stub')
|
||||
@insertSubView(@deltaView, changeEl)
|
||||
super()
|
||||
|
||||
acceptPatch: ->
|
||||
delta = @deltaView.getApplicableDelta()
|
||||
@targetModel.applyDelta(delta)
|
||||
@targetModel.addPatchToAcceptOnSave(@patch)
|
||||
@hide()
|
||||
|
||||
rejectPatch: ->
|
||||
@patch.setStatus('rejected')
|
||||
@hide()
|
||||
|
||||
withdrawPatch: ->
|
||||
@patch.setStatus('withdrawn')
|
||||
@hide()
|
||||
56
app/views/editor/patches_view.coffee
Normal file
56
app/views/editor/patches_view.coffee
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
CocoView = require 'views/kinds/CocoView'
|
||||
template = require 'templates/editor/patches'
|
||||
PatchesCollection = require 'collections/PatchesCollection'
|
||||
nameLoader = require 'lib/NameLoader'
|
||||
PatchModal = require './patch_modal'
|
||||
|
||||
module.exports = class PatchesView extends CocoView
|
||||
template: template
|
||||
className: 'patches-view'
|
||||
status: 'pending'
|
||||
|
||||
events:
|
||||
'change .status-buttons': 'onStatusButtonsChanged'
|
||||
'click .patch-icon': 'openPatchModal'
|
||||
|
||||
constructor: (@model, options) ->
|
||||
super(options)
|
||||
@initPatches()
|
||||
|
||||
initPatches: ->
|
||||
@startedLoading = false
|
||||
@patches = new PatchesCollection([], {}, @model, @status)
|
||||
@listenToOnce @patches, 'sync', @gotPatches
|
||||
@addResourceToLoad @patches, 'patches'
|
||||
|
||||
gotPatches: ->
|
||||
ids = (p.get('creator') for p in @patches.models)
|
||||
jqxhr = nameLoader.loadNames ids
|
||||
if jqxhr then @addRequestToLoad(jqxhr, 'user_names', 'gotPatches') else @render()
|
||||
|
||||
load: ->
|
||||
return if @startedLoading
|
||||
@patches.fetch()
|
||||
@startedLoading = true
|
||||
|
||||
getRenderData: ->
|
||||
c = super()
|
||||
patch.userName = nameLoader.getName(patch.get('creator')) for patch in @patches.models
|
||||
c.patches = @patches.models
|
||||
c.status
|
||||
c
|
||||
|
||||
afterRender: ->
|
||||
@$el.find(".#{@status}").addClass 'active'
|
||||
|
||||
onStatusButtonsChanged: (e) ->
|
||||
@loaded = false
|
||||
@status = $(e.target).val()
|
||||
@initPatches()
|
||||
@load()
|
||||
@render()
|
||||
|
||||
openPatchModal: (e) ->
|
||||
patch = _.find @patches.models, {id:$(e.target).data('patch-id')}
|
||||
modal = new PatchModal(patch, @model)
|
||||
@openModalView(modal)
|
||||
|
|
@ -12,7 +12,7 @@ module.exports = class ColorsTabView extends CocoView
|
|||
|
||||
constructor: (@thangType, options) ->
|
||||
@listenToOnce(@thangType, 'sync', @tryToBuild)
|
||||
@listenToOnce(@thangType.schema(), 'sync', @tryToBuild)
|
||||
# @listenToOnce(@thangType.schema(), 'sync', @tryToBuild)
|
||||
@colorConfig = { hue: 0, saturation: 0.5, lightness: 0.5 }
|
||||
@spriteBuilder = new SpriteBuilder(@thangType)
|
||||
f = =>
|
||||
|
|
@ -115,7 +115,7 @@ module.exports = class ColorsTabView extends CocoView
|
|||
return unless @thangType.loaded and @thangType.schema().loaded
|
||||
data = @thangType.get('colorGroups')
|
||||
data ?= {}
|
||||
schema = @thangType.schema().attributes.properties?.colorGroups
|
||||
schema = @thangType.schema().properties?.colorGroups
|
||||
treemaOptions =
|
||||
data: data
|
||||
schema: schema
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ View = require 'views/kinds/RootView'
|
|||
ThangComponentEditView = require 'views/editor/components/main'
|
||||
VersionHistoryView = require './versions_view'
|
||||
ColorsTabView = require './colors_tab_view'
|
||||
PatchesView = require 'views/editor/patches_view'
|
||||
SaveVersionModal = require 'views/modal/save_version_modal'
|
||||
ErrorView = require '../../error_view'
|
||||
template = require 'templates/editor/thang/edit'
|
||||
|
||||
|
|
@ -33,6 +35,8 @@ module.exports = class ThangTypeEditView extends View
|
|||
'click #marker-button': 'toggleDots'
|
||||
'click #end-button': 'endAnimation'
|
||||
'click #history-button': 'showVersionHistory'
|
||||
'click #save-button': 'openSaveModal'
|
||||
'click #patches-tab': -> @patchesView.load()
|
||||
|
||||
subscriptions:
|
||||
'save-new-version': 'saveNewThangType'
|
||||
|
|
@ -57,13 +61,11 @@ module.exports = class ThangTypeEditView extends View
|
|||
)
|
||||
|
||||
@thangType.fetch()
|
||||
@thangType.loadSchema()
|
||||
@listenToOnce(@thangType.schema(), 'sync', @onThangTypeSync)
|
||||
@listenToOnce(@thangType, 'sync', @onThangTypeSync)
|
||||
@refreshAnimation = _.debounce @refreshAnimation, 500
|
||||
|
||||
onThangTypeSync: ->
|
||||
return unless @thangType.loaded and ThangType.hasSchema()
|
||||
return unless @thangType.loaded
|
||||
@startsLoading = false
|
||||
@files = new DocumentFiles(@thangType)
|
||||
@files.fetch()
|
||||
|
|
@ -90,7 +92,8 @@ module.exports = class ThangTypeEditView extends View
|
|||
@initSliders()
|
||||
@initComponents()
|
||||
@insertSubView(new ColorsTabView(@thangType))
|
||||
@showReadOnly() unless me.isAdmin() or @thangType.hasWriteAccess(me)
|
||||
@patchesView = @insertSubView(new PatchesView(@thangType), @$el.find('.patches-view'))
|
||||
@showReadOnly() if me.get('anonymous')
|
||||
|
||||
initComponents: =>
|
||||
options =
|
||||
|
|
@ -339,7 +342,7 @@ module.exports = class ThangTypeEditView extends View
|
|||
|
||||
buildTreema: ->
|
||||
data = @getThangData()
|
||||
schema = _.cloneDeep ThangType.schema.attributes
|
||||
schema = _.cloneDeep ThangType.schema
|
||||
schema.properties = _.pick schema.properties, (value, key) => not (key in ['components'])
|
||||
options =
|
||||
data: data
|
||||
|
|
@ -396,11 +399,14 @@ module.exports = class ThangTypeEditView extends View
|
|||
@showAnimation()
|
||||
@showingSelectedNode = false
|
||||
|
||||
destroy: ->
|
||||
@camera?.destroy()
|
||||
super()
|
||||
|
||||
showVersionHistory: (e) ->
|
||||
versionHistoryView = new VersionHistoryView thangType:@thangType, @thangTypeID
|
||||
@openModalView versionHistoryView
|
||||
Backbone.Mediator.publish 'level:view-switched', e
|
||||
|
||||
openSaveModal: ->
|
||||
@openModalView(new SaveVersionModal({model: @thangType}))
|
||||
|
||||
destroy: ->
|
||||
@camera?.destroy()
|
||||
super()
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ classCount = 0
|
|||
makeScopeName = -> "view-scope-#{classCount++}"
|
||||
doNothing = ->
|
||||
|
||||
module.exports = class CocoView extends Backbone.View
|
||||
class CocoView extends Backbone.View
|
||||
startsLoading: false
|
||||
cache: false # signals to the router to keep this view around
|
||||
template: -> ''
|
||||
|
|
@ -101,6 +101,7 @@ module.exports = class CocoView extends Backbone.View
|
|||
context.fbRef = context.pathname.replace(/[^a-zA-Z0-9+/=\-.:_]/g, '').slice(0, 40) or 'home'
|
||||
context.isMobile = @isMobile()
|
||||
context.isIE = @isIE()
|
||||
context.moment = moment
|
||||
context
|
||||
|
||||
afterRender: ->
|
||||
|
|
@ -210,7 +211,6 @@ module.exports = class CocoView extends Backbone.View
|
|||
return unless elem.data('toggle') is 'coco-modal'
|
||||
target = elem.data('target')
|
||||
view = application.router.getView(target, '_modal') # could set up a system for loading cached modals, if told to
|
||||
console.log "got target", target, "which gave view", view
|
||||
@openModalView(view)
|
||||
|
||||
openModalView: (modalView, softly=false) ->
|
||||
|
|
@ -261,7 +261,7 @@ module.exports = class CocoView extends Backbone.View
|
|||
|
||||
showReadOnly: ->
|
||||
return if me.isAdmin()
|
||||
warning = $.i18n.t 'editor.read_only_warning', defaultValue: "Note: you can't save any edits here, because you're not logged in as an admin."
|
||||
warning = $.i18n.t 'editor.read_only_warning2', defaultValue: "Note: you can't save any edits here, because you're not logged in."
|
||||
noty text: warning, layout: 'center', type: 'information', killer: true, timeout: 5000
|
||||
|
||||
# Loading ModalViews
|
||||
|
|
@ -300,18 +300,23 @@ module.exports = class CocoView extends Backbone.View
|
|||
|
||||
# Subviews
|
||||
|
||||
insertSubView: (view) ->
|
||||
@subviews[view.id].destroy() if view.id of @subviews
|
||||
@$el.find('#'+view.id).after(view.el).remove()
|
||||
insertSubView: (view, elToReplace=null) ->
|
||||
key = view.id or (view.constructor.name+classCount++)
|
||||
key = _.string.underscored(key)
|
||||
@subviews[key].destroy() if key of @subviews
|
||||
elToReplace ?= @$el.find('#'+view.id)
|
||||
elToReplace.after(view.el).remove()
|
||||
view.parent = @
|
||||
view.render()
|
||||
view.afterInsert()
|
||||
@subviews[view.id] = view
|
||||
view.parentKey = key
|
||||
@subviews[key] = view
|
||||
view
|
||||
|
||||
removeSubView: (view) ->
|
||||
view.$el.empty()
|
||||
delete @subviews[view.parentKey]
|
||||
view.destroy()
|
||||
delete @subviews[view.id]
|
||||
|
||||
# Utilities
|
||||
|
||||
|
|
@ -343,6 +348,7 @@ module.exports = class CocoView extends Backbone.View
|
|||
slider
|
||||
|
||||
|
||||
|
||||
mobileRELong = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i
|
||||
mobileRELong = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i
|
||||
mobileREShort = /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i
|
||||
|
||||
module.exports = CocoView
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ module.exports = class ModalView extends CocoView
|
|||
closeButton: true
|
||||
closesOnClickOutside: true
|
||||
modalWidthPercent: null
|
||||
plain: false
|
||||
|
||||
shortcuts:
|
||||
'esc': 'hide'
|
||||
|
|
@ -31,6 +32,7 @@ module.exports = class ModalView extends CocoView
|
|||
@$el.on 'hide.bs.modal', =>
|
||||
@onHidden() unless @hidden
|
||||
@hidden = true
|
||||
@$el.find('.background-wrapper').addClass('plain') if @plain
|
||||
|
||||
afterInsert: ->
|
||||
super()
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@ module.exports = class RootView extends CocoView
|
|||
hash = location.hash
|
||||
location.hash = ''
|
||||
location.hash = hash
|
||||
@buildLanguages()
|
||||
@renderScrollbar()
|
||||
#@$('.antiscroll-wrap').antiscroll() # not yet, buggy
|
||||
|
||||
afterRender: ->
|
||||
super(arguments...)
|
||||
@chooseTab(location.hash.replace('#','')) if location.hash
|
||||
@buildLanguages()
|
||||
$('body').removeClass('is-playing')
|
||||
|
||||
chooseTab: (category) ->
|
||||
|
|
@ -58,7 +58,7 @@ module.exports = class RootView extends CocoView
|
|||
buildLanguages: ->
|
||||
$select = @$el.find(".language-dropdown").empty()
|
||||
if $select.hasClass("fancified")
|
||||
$select.parent().find('.options,.trigger').remove()
|
||||
$select.parent().find('.options, .trigger').remove()
|
||||
$select.unwrap().removeClass("fancified")
|
||||
preferred = me.lang()
|
||||
codes = _.keys(locale)
|
||||
|
|
@ -76,10 +76,8 @@ module.exports = class RootView extends CocoView
|
|||
$.i18n.setLng(newLang, {})
|
||||
@saveLanguage(newLang)
|
||||
@render()
|
||||
@buildLanguages()
|
||||
unless newLang.split('-')[0] is "en"
|
||||
@openModalView(application.router.getView("modal/diplomat_suggestion", "_modal"))
|
||||
$('body').attr('lang', newLang)
|
||||
|
||||
saveLanguage: (newLang) ->
|
||||
me.set('preferredLanguage', newLang)
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ module.exports = class SearchView extends View
|
|||
name = @$el.find('#name').val()
|
||||
model = new @model()
|
||||
model.set('name', name)
|
||||
if @model.schema.get('properties').permissions
|
||||
if @model.schema.properties.permissions
|
||||
model.set 'permissions', [{access: 'owner', target: me.id}]
|
||||
res = model.save()
|
||||
return unless res
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ module.exports = class LoginModalView extends View
|
|||
loginAccount: (e) =>
|
||||
forms.clearFormAlerts(@$el)
|
||||
userObject = forms.formToObject @$el
|
||||
res = tv4.validateMultiple userObject, User.schema.attributes
|
||||
res = tv4.validateMultiple userObject, User.schema
|
||||
return forms.applyErrorsToForm(@$el, res.errors) unless res.valid
|
||||
@enableModalInProgress(@$el) # TODO: part of forms
|
||||
loginUser(userObject)
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@ CocoModel = require 'models/CocoModel'
|
|||
module.exports = class RevertModal extends ModalView
|
||||
id: 'revert-modal'
|
||||
template: template
|
||||
|
||||
|
||||
events:
|
||||
'click #changed-models button': 'onRevertModel'
|
||||
|
||||
|
||||
onRevertModel: (e) ->
|
||||
id = $(e.target).val()
|
||||
CocoModel.backedUp[id].revert()
|
||||
$(e.target).closest('tr').remove()
|
||||
@reloadOnClose = true
|
||||
|
||||
|
||||
getRenderData: ->
|
||||
c = super()
|
||||
models = _.values CocoModel.backedUp
|
||||
|
|
@ -23,5 +23,4 @@ module.exports = class RevertModal extends ModalView
|
|||
c
|
||||
|
||||
onHidden: ->
|
||||
console.log 'reload?', @reloadOnClose
|
||||
location.reload() if @reloadOnClose
|
||||
|
|
|
|||
|
|
@ -1,18 +1,39 @@
|
|||
ModalView = require 'views/kinds/ModalView'
|
||||
template = require 'templates/modal/save_version'
|
||||
DeltaView = require 'views/editor/delta'
|
||||
Patch = require 'models/Patch'
|
||||
forms = require 'lib/forms'
|
||||
|
||||
module.exports = class SaveVersionModal extends ModalView
|
||||
id: 'save-version-modal'
|
||||
template: template
|
||||
plain: true
|
||||
|
||||
events:
|
||||
'click #save-version-button': 'onClickSaveButton'
|
||||
'click #cla-link': 'onClickCLALink'
|
||||
'click #agreement-button': 'onAgreedToCLA'
|
||||
|
||||
'click #submit-patch-button': 'onClickPatchButton'
|
||||
|
||||
constructor: (options) ->
|
||||
super options
|
||||
@model = options.model or options.level
|
||||
new Patch() # hack to get the schema to load, delete this later
|
||||
@isPatch = not @model.hasWriteAccess()
|
||||
|
||||
getRenderData: ->
|
||||
c = super()
|
||||
c.isPatch = @isPatch
|
||||
c.hasChanges = @model.hasLocalChanges()
|
||||
c
|
||||
|
||||
afterRender: ->
|
||||
super()
|
||||
@$el.find(if me.get('signedCLA') then '#accept-cla-wrapper' else '#save-version-button').hide()
|
||||
changeEl = @$el.find('.changes-stub')
|
||||
deltaView = new DeltaView({model:@model})
|
||||
@insertSubView(deltaView, changeEl)
|
||||
@$el.find('.commit-message input').attr('placeholder', $.i18n.t('general.commit_msg'))
|
||||
|
||||
onClickSaveButton: ->
|
||||
Backbone.Mediator.publish 'save-new-version', {
|
||||
|
|
@ -20,6 +41,27 @@ module.exports = class SaveVersionModal extends ModalView
|
|||
commitMessage: @$el.find('#commit-message').val()
|
||||
}
|
||||
|
||||
onClickPatchButton: ->
|
||||
forms.clearFormAlerts @$el
|
||||
patch = new Patch()
|
||||
patch.set 'delta', @model.getDelta()
|
||||
patch.set 'commitMessage', @$el.find('#commit-message').val()
|
||||
patch.set 'target', {
|
||||
'collection': _.string.underscored @model.constructor.className
|
||||
'id': @model.id
|
||||
}
|
||||
errors = patch.validate()
|
||||
forms.applyErrorsToForm(@$el, errors) if errors
|
||||
res = patch.save()
|
||||
return unless res
|
||||
@enableModalInProgress(@$el)
|
||||
|
||||
res.error =>
|
||||
@disableModalInProgress(@$el)
|
||||
|
||||
res.success =>
|
||||
@hide()
|
||||
|
||||
onClickCLALink: ->
|
||||
window.open('/cla', 'cla', 'height=800,width=900')
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ module.exports = class SignupModalView extends View
|
|||
userObject.emailSubscriptions.push 'notification' unless 'notification' in userObject.emailSubscriptions
|
||||
else
|
||||
userObject.emailSubscriptions = _.without (userObject.emailSubscriptions ? []), 'announcement', 'notification'
|
||||
res = tv4.validateMultiple userObject, User.schema.attributes
|
||||
res = tv4.validateMultiple userObject, User.schema
|
||||
return forms.applyErrorsToForm(@$el, res.errors) unless res.valid
|
||||
window.tracker?.trackEvent 'Finished Signup'
|
||||
@enableModalInProgress(@$el)
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ module.exports = class WizardSettingsModal extends View
|
|||
WizardSettingsView = require 'views/account/wizard_settings_view'
|
||||
view = new WizardSettingsView()
|
||||
@insertSubView view
|
||||
super()
|
||||
|
||||
checkNameExists: =>
|
||||
forms.clearFormAlerts(@$el)
|
||||
|
|
@ -31,7 +32,7 @@ module.exports = class WizardSettingsModal extends View
|
|||
forms.applyErrorsToForm(@$el, {property:'name', message:'is already taken'}) if id and id isnt me.id
|
||||
$.ajax("/db/user/#{name}/nameToID", {success: success})
|
||||
|
||||
onWizardSettingsDone: =>
|
||||
onWizardSettingsDone: ->
|
||||
me.set('name', $('#wizard-settings-name').val())
|
||||
forms.clearFormAlerts(@$el)
|
||||
res = me.validate()
|
||||
|
|
@ -42,10 +43,11 @@ module.exports = class WizardSettingsModal extends View
|
|||
res = me.save()
|
||||
return unless res
|
||||
save = $('#save-button', @$el).text($.i18n.t('common.saving', defaultValue: 'Saving...'))
|
||||
.addClass('btn-info').show().removeClass('btn-danger')
|
||||
.addClass('btn-info').show().removeClass('btn-danger')
|
||||
|
||||
res.error =>
|
||||
errors = JSON.parse(res.responseText)
|
||||
console.warn "Got errors saving user:", errors
|
||||
forms.applyErrorsToForm(@$el, errors)
|
||||
@disableModalInProgress(@$el)
|
||||
|
||||
|
|
@ -53,4 +55,3 @@ module.exports = class WizardSettingsModal extends View
|
|||
@hide()
|
||||
|
||||
@enableModalInProgress(@$el)
|
||||
me.save()
|
||||
|
|
|
|||
|
|
@ -107,6 +107,9 @@ module.exports = class PlaybackView extends View
|
|||
@hookUpScrubber()
|
||||
@updateMusicButton()
|
||||
$(window).on('resize', @onWindowResize)
|
||||
ua = navigator.userAgent.toLowerCase()
|
||||
if /safari/.test(ua) and not /chrome/.test(ua)
|
||||
@$el.find('.toggle-fullscreen').hide()
|
||||
|
||||
updatePopupContent: ->
|
||||
@timePopup.updateContent "<h2>#{@timeToString @newTime}</h2>#{@formatTime(@current, @currentTime)}<br/>#{@formatTime(@total, @totalTime)}"
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ module.exports = class PlayLevelView extends View
|
|||
return if @alreadyLoadedState
|
||||
@alreadyLoadedState = true
|
||||
state = @originalSessionState
|
||||
if state.frame
|
||||
if state.frame and @level.get('type') isnt 'ladder' # https://github.com/codecombat/codecombat/issues/714
|
||||
Backbone.Mediator.publish 'level-set-time', { time: 0, frameOffset: state.frame }
|
||||
if state.selected
|
||||
# TODO: Should also restore selected spell here by saving spellName
|
||||
|
|
|
|||
|
|
@ -227,4 +227,3 @@ module.exports = class PlayView extends View
|
|||
super()
|
||||
@$el.find('.modal').on 'shown.bs.modal', ->
|
||||
$('input:visible:first', @).focus()
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
"firebase": "~1.0.2",
|
||||
"catiline": "~2.9.3",
|
||||
"d3": "~3.4.4",
|
||||
"jsondiffpatch": "~0.1.5",
|
||||
"nanoscroller": "~0.8.0",
|
||||
"jquery.tablesorter": "~2.15.13",
|
||||
"treema": ">=0.0.1",
|
||||
|
|
@ -56,6 +57,9 @@
|
|||
"underscore.string": {
|
||||
"main": "lib/underscore.string.js"
|
||||
},
|
||||
"jsondiffpatch": {
|
||||
"main": ["build/bundle-full.js", "build/formatters.js", "src/formatters/html.css"]
|
||||
},
|
||||
"jquery.tablesorter": {
|
||||
"main": [
|
||||
"js/jquery.tablesorter.js",
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
"mongoose": "3.8.x",
|
||||
"mongoose-text-search": "~0.0.2",
|
||||
"request": "2.12.x",
|
||||
"tv4": "1.0.11",
|
||||
"tv4": "1.0.x",
|
||||
"lodash": "~2.0.0",
|
||||
"underscore.string": "2.3.x",
|
||||
"async": "0.2.x",
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
"graceful-fs": "~2.0.1",
|
||||
"node-force-domain": "~0.1.0",
|
||||
"mailchimp-api": "2.0.x",
|
||||
"express-useragent": "~0.0.9",
|
||||
"express-useragent": "~0.0.9",
|
||||
"gridfs-stream": "0.4.x",
|
||||
"stream-buffers": "0.2.x",
|
||||
"sendwithus": "2.0.x",
|
||||
|
|
|
|||
|
|
@ -20,23 +20,30 @@ class DirectoryController(object):
|
|||
def bin_directory(self):
|
||||
return self.root_install_directory
|
||||
|
||||
def mkdir(self, path):
|
||||
if os.path.exists(path):
|
||||
print(u"Skipping creation of " + path + " because it exists.")
|
||||
else:
|
||||
os.mkdir(path)
|
||||
|
||||
def create_directory_in_tmp(self,subdirectory):
|
||||
os.mkdir(self.generate_path_for_directory_in_tmp(subdirectory))
|
||||
path = self.generate_path_for_directory_in_tmp(subdirectory)
|
||||
self.mkdir(path)
|
||||
|
||||
def generate_path_for_directory_in_tmp(self,subdirectory):
|
||||
return self.tmp_directory + os.sep + subdirectory
|
||||
def create_directory_in_bin(self,subdirectory):
|
||||
full_path = self.bin_directory + os.sep + subdirectory
|
||||
os.mkdir(full_path)
|
||||
self.mkdir(full_path)
|
||||
|
||||
def create_base_directories(self):
|
||||
shutil.rmtree(self.root_dir + os.sep + "coco" + os.sep + "node_modules",ignore_errors=True) #just in case
|
||||
try:
|
||||
if os.path.exists(self.tmp_directory):
|
||||
self.remove_tmp_directory()
|
||||
os.mkdir(self.tmp_directory)
|
||||
if os.path.exists(self.tmp_directory):
|
||||
self.remove_tmp_directory()
|
||||
os.mkdir(self.tmp_directory)
|
||||
except:
|
||||
raise errors.CoCoError(u"There was an error creating the directory structure, do you have correct permissions? Please remove all and start over.")
|
||||
raise errors.CoCoError(u"There was an error creating the directory structure, do you have correct permissions? Please remove all and start over.")
|
||||
|
||||
def remove_directories(self):
|
||||
shutil.rmtree(self.bin_directory + os.sep + "node",ignore_errors=True)
|
||||
|
|
|
|||
|
|
@ -37,10 +37,12 @@ class SetupFactory(object):
|
|||
try:
|
||||
mongo_version_string = subprocess.check_output("mongod --version",shell=True)
|
||||
mongo_version_string = mongo_version_string.decode(encoding='UTF-8')
|
||||
except:
|
||||
print("Mongod not found.")
|
||||
except Exception as e:
|
||||
print("Mongod not found: %s"%e)
|
||||
if "v2.6." not in mongo_version_string:
|
||||
print("MongoDB not found, so installing...")
|
||||
if mongo_version_string:
|
||||
print("Had MongoDB version: %s"%mongo_version_string)
|
||||
print("MongoDB not found, so installing a local copy...")
|
||||
self.mongo.download_dependencies()
|
||||
self.mongo.install_dependencies()
|
||||
self.node.download_dependencies()
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import os
|
|||
from configuration import Configuration
|
||||
from dependency import Dependency
|
||||
import sys
|
||||
|
||||
import shutil
|
||||
|
||||
class MongoDB(Dependency):
|
||||
def __init__(self,configuration):
|
||||
|
|
@ -32,13 +32,20 @@ class MongoDB(Dependency):
|
|||
def bashrc_string(self):
|
||||
return "COCO_MONGOD_PATH=" + self.config.directory.bin_directory + os.sep + u"mongo" + os.sep +"bin" + os.sep + "mongod"
|
||||
|
||||
|
||||
def download_dependencies(self):
|
||||
self.downloader.download()
|
||||
self.downloader.decompress()
|
||||
install_directory = self.config.directory.bin_directory + os.sep + u"mongo"
|
||||
if os.path.exists(install_directory):
|
||||
print(u"Skipping MongoDB download because " + install_directory + " exists.")
|
||||
else:
|
||||
self.downloader.download()
|
||||
self.downloader.decompress()
|
||||
def install_dependencies(self):
|
||||
install_directory = self.config.directory.bin_directory + os.sep + u"mongo"
|
||||
import shutil
|
||||
shutil.copytree(self.findUnzippedMongoBinPath(),install_directory)
|
||||
if os.path.exists(install_directory):
|
||||
print(u"Skipping creation of " + install_directory + " because it exists.")
|
||||
else:
|
||||
shutil.copytree(self.findUnzippedMongoBinPath(),install_directory)
|
||||
|
||||
def findUnzippedMongoBinPath(self):
|
||||
return self.downloader.download_directory + os.sep + \
|
||||
|
|
|
|||
|
|
@ -37,19 +37,27 @@ class Node(Dependency):
|
|||
return self.config.directory.bin_directory
|
||||
|
||||
def download_dependencies(self):
|
||||
self.downloader.download()
|
||||
self.downloader.decompress()
|
||||
install_directory = self.config.directory.bin_directory + os.sep + u"node"
|
||||
if os.path.exists(install_directory):
|
||||
print(u"Skipping Node download because " + install_directory + " exists.")
|
||||
else:
|
||||
self.downloader.download()
|
||||
self.downloader.decompress()
|
||||
def bashrc_string(self):
|
||||
return "COCO_NODE_PATH=" + self.config.directory.bin_directory + os.sep + u"node" + os.sep + "bin" + os.sep +"node"
|
||||
def install_dependencies(self):
|
||||
install_directory = self.config.directory.bin_directory + os.sep + u"node"
|
||||
#check for node here
|
||||
unzipped_node_path = self.findUnzippedNodePath()
|
||||
if self.config.system.operating_system in ["mac","linux"] and not which("node"):
|
||||
unzipped_node_path = self.findUnzippedNodePath()
|
||||
print("Copying node into /usr/local/bin/...")
|
||||
shutil.copy(unzipped_node_path + os.sep + "bin" + os.sep + "node","/usr/local/bin/")
|
||||
os.chmod("/usr/local/bin/node",S_IRWXG|S_IRWXO|S_IRWXU)
|
||||
shutil.copytree(self.findUnzippedNodePath(),install_directory)
|
||||
if os.path.exists(install_directory):
|
||||
print(u"Skipping creation of " + install_directory + " because it exists.")
|
||||
else:
|
||||
unzipped_node_path = self.findUnzippedNodePath()
|
||||
shutil.copytree(self.findUnzippedNodePath(),install_directory)
|
||||
wants_to_upgrade = True
|
||||
if self.check_if_executable_installed(u"npm"):
|
||||
warning_string = u"A previous version of npm has been found. \nYou may experience problems if you have a version of npm that's too old.Would you like to upgrade?(y/n) "
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1" ?>
|
||||
<variables>
|
||||
<version>3.4</version>
|
||||
<version>3.5</version>
|
||||
<author>GlenDC</author>
|
||||
<copyright>CodeCombat.com © 2013-2014</copyright>
|
||||
<github_url>https://github.com/codecombat/codecombat.git</github_url>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue