Skip to content

Commit 0000460

Browse files
nurdtechie98nurdtechie98
committed
merge conflict resolved
2 parents e3d4a63 + c697655 commit 0000460

9 files changed

Lines changed: 67 additions & 29 deletions

File tree

‎index.html‎

Lines changed: 46 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,53 +1213,74 @@ <h1>
12131213
<ul class="housing-list">
12141214

12151215

1216-
1217-
<li class="housing stl wow animated fadeInLeft" data-wow-delay=".1s" style="background-size: 55% auto; background-repeat: repeat;" >
1216+
<li class="housing panel wow animated fadeInLeft" data-wow-delay=".1s">
12181217
<div class="housing-holder">
1218+
12191219
<div class="description">
12201220
<div class="price-and-rating">
1221-
<div class="price">30<sup>th</sup>Jul</div>
1222-
<!--<<div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div>-->
1221+
<div class="price">14<sup>th</sup>Aug</div>
1222+
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
12231223
</div>
12241224
<div class="description-inner">
1225-
<h2>STL in X; X: Python, C++, Java</h2>
1226-
<p>Hands-on workshop on STL and it's functions in Python, Java and C++ based on students preference.<br>
1227-
<a href="static/reports/STLinX.pdf" target="_blank">&lt;Report&gt;</a>
1228-
<a href="http://www.kjscecodecell.com/standard-library-in-x/" target="_blank">&lt;Reference Material&gt;</a>
1225+
<h2>Panel session</h2>
1226+
<p>A panel session in which 3 reputed panelists convened to provide an insight to the current scenario in the CS industry.<br>
1227+
<a href="static/reports/Panel_session.pdf" target="_blank">&lt;Report&gt;</a>
1228+
<!-- <a href="static/reports/python.pdf" target="_blank">&lt;Reference Material&gt;</a>
1229+
<a>&lt;Reference Material&gt;</a> -->
12291230
</p>
12301231
</div>
12311232
</div>
12321233

12331234
</div>
12341235
</li>
12351236

1236-
1237-
<li class="housing handover wow animated fadeInLeft" data-wow-delay=".1s" style="background-size: 55% auto; background-repeat: repeat;" >
1237+
<li class="housing handover1 wow animated fadeInLeft" data-wow-delay=".1s" style="background-size: 55% auto; background-repeat: repeat;" >
12381238
<div class="housing-holder">
12391239

12401240
<div class="description">
12411241
<div class="price-and-rating">
1242-
<div class="price">26<sup>th</sup>Jul</div>
1242+
<div class="price">14<sup>th</sup>Aug</div>
12431243
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
12441244
</div>
12451245
<div class="description-inner">
12461246
<h2>Handover Ceremony</h2>
1247-
<p>The baton was passed from KJSCE Codecell 16-17 to 17-18<br>
1248-
<a href="#" target="_blank">&lt;Report&gt;</a>
1247+
<p>The baton was passed from KJSCE Codecell 17-18 to 18-19<br>
1248+
<a href="static/reports/Handover.pdf" target="_blank">&lt;Report&gt;</a>
1249+
</p>
1250+
</div>
1251+
</div>
1252+
1253+
</div>
1254+
</li>
1255+
1256+
<li class="housing stl wow animated fadeInLeft" data-wow-delay=".1s" style="background-size: 55% auto; background-repeat: repeat;" >
1257+
<div class="housing-holder">
1258+
<div class="description">
1259+
<div class="price-and-rating">
1260+
<div class="price">30<sup>th</sup>Jul</div>
1261+
<!--<<div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div>-->
1262+
</div>
1263+
<div class="description-inner">
1264+
<h2>STL in X; X: Python, C++, Java</h2>
1265+
<p>Hands-on workshop on STL and it's functions in Python, Java and C++ based on students preference.<br>
1266+
<a href="static/reports/STLinX.pdf" target="_blank">&lt;Report&gt;</a>
1267+
<a href="http://www.kjscecodecell.com/standard-library-in-x/" target="_blank">&lt;Reference Material&gt;</a>
12491268
</p>
12501269
</div>
12511270
</div>
12521271

12531272
</div>
12541273
</li>
12551274

1275+
<!--
1276+
12561277
<li class="housing wow animated fadeInLeft be-workshop" data-wow-delay=".1s">
12571278
<div class="housing-holder">
12581279
12591280
<div class="description">
12601281
<div class="price-and-rating">
1261-
<div class="price">8<sup>th</sup>Aug</div>
1262-
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
1282+
<div class="price">8<sup>th</sup>Aug,17</div>
1283+
div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div>
12631284
</div>
12641285
<div class="description-inner">
12651286
<h2>BE Workshop</h2>
@@ -1279,7 +1300,7 @@ <h2>BE Workshop</h2>
12791300
<div class="description">
12801301
<div class="price-and-rating">
12811302
<div class="price">11<sup>th</sup>Aug</div>
1282-
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
1303+
<-div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div
12831304
</div>
12841305
<div class="description-inner">
12851306
<h2>ICPC MeetUp</h2>
@@ -1298,14 +1319,14 @@ <h2>ICPC MeetUp</h2>
12981319
<div class="description">
12991320
<div class="price-and-rating">
13001321
<div class="price">7<sup>th</sup>Sep</div>
1301-
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
1322+
div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div>
13021323
</div>
13031324
<div class="description-inner">
13041325
<h2>Introduction to Python Workshop</h2>
13051326
<p>Hands-on Python, a high-level language which is easy to understand.<br>
13061327
<a href="static/reports/Python_Workshop_Report.pdf" target="_blank">&lt;Report&gt;</a>
1307-
<a href="static/reports/python.pdf" target="_blank">&lt;Reference Material&gt;</a><!--
1308-
<a>&lt;Reference Material&gt;</a> -->
1328+
<a href="static/reports/python.pdf" target="_blank">&lt;Reference Material&gt;</a>
1329+
<a>&lt;Reference Material&gt;</a>
13091330
</p>
13101331
</div>
13111332
</div>
@@ -1319,12 +1340,12 @@ <h2>Introduction to Python Workshop</h2>
13191340
<div class="description">
13201341
<div class="price-and-rating">
13211342
<div class="price">24<sup>th</sup>Jan</div>
1322-
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
1343+
div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div>
13231344
</div>
13241345
<div class="description-inner">
13251346
<h2>Google Summer of Code Meetup</h2>
13261347
<p>Meet-up and discussion for Google Summer of Code (GSoC) - 2018<br>
1327-
<!-- <a href="" target="_blank">&lt;Report&gt;</a> -->
1348+
<a href="" target="_blank">&lt;Report&gt;</a>
13281349
<a href="static/reports/GSoC_meetup_report.pdf" target="_blank">&lt;Report&gt;</a>
13291350
</p>
13301351
</div>
@@ -1339,7 +1360,7 @@ <h2>Google Summer of Code Meetup</h2>
13391360
<div class="description">
13401361
<div class="price-and-rating">
13411362
<div class="price">29<sup>th</sup>Jan</div>
1342-
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
1363+
div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div>
13431364
</div>
13441365
<div class="description-inner">
13451366
<h2>Workshop on Graph Algorithms</h2>
@@ -1360,7 +1381,7 @@ <h2>Workshop on Graph Algorithms</h2>
13601381
<div class="description">
13611382
<div class="price-and-rating">
13621383
<div class="price">14<sup>th</sup>Feb</div>
1363-
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
1384+
div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div>
13641385
</div>
13651386
<div class="description-inner">
13661387
<h2>Workshop on JavaScript</h2>
@@ -1380,7 +1401,7 @@ <h2>Workshop on JavaScript</h2>
13801401
<div class="description">
13811402
<div class="price-and-rating">
13821403
<div class="price">7<sup>th</sup>Mar</div>
1383-
<!--div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div-->
1404+
div class="rating"><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span><span class="icon icon-star"></span></div>
13841405
</div>
13851406
<div class="description-inner">
13861407
<h2>Workshop on Number Theory</h2>
@@ -1393,7 +1414,7 @@ <h2>Workshop on Number Theory</h2>
13931414
13941415
</div>
13951416
</li>
1396-
1417+
-->
13971418

13981419
</ul>
13991420

‎register/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<html lang="en-US">
33
<head>
44
<meta charset="UTF-8">
5-
<meta http-equiv="refresh" content="1; url=https://goo.gl/forms/dahLCqee8mpAv6cU2">
5+
<meta http-equiv="refresh" content="1; url=https://goo.gl/forms/cTKUit0lToJvEstE2">
66
<script type="text/javascript">
7-
window.location.href ="https://goo.gl/forms/dahLCqee8mpAv6cU2"
7+
window.location.href ="https://goo.gl/forms/cTKUit0lToJvEstE2"
88
</script>
9-
<title>Standard Conainer Library</title>
9+
<title>KJSCE CodeSpree 2018</title>
1010
</head>
1111
<body>
1212
<!-- Note: don't tell people to `click` the link, just tell them that it is a link. -->
13-
If you are not redirected automatically, follow this <a href="https://goo.gl/forms/dahLCqee8mpAv6cU2">link</a>.
13+
If you are not redirected automatically, follow this <a href="https://goo.gl/forms/cTKUit0lToJvEstE2">link</a>.
1414
</body>
1515
</html>

‎static/images/events/LR-2003.jpg‎

6.1 MB
Loading

‎static/images/events/LR-2006.jpg‎

6.83 MB
Loading

‎static/images/events/Panel.jpg‎

5.55 MB
Loading

‎static/js/terminal.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@
329329
response += ', <strong>shades()</strong>';
330330
response += ', <strong>twShare()</strong>';
331331
response += ', <strong>stl()</strong>';
332+
response += ', <strong>pyDocs()</strong>';
332333
response += ', <strong>newsletter()</strong>';
333334
response += ', <strong>feedback()</strong>';
334335
response += ', <strong>ieLove()</strong>';
@@ -352,6 +353,7 @@
352353
if (customFunctionName == 'shades') response = 'See the world through the eyes of a douchebag.';
353354
if (customFunctionName == 'twShare') response = 'Share Codecell with you friends on Twitter.';
354355
if (customFunctionName == 'stl') response = 'Opens STL Reference material by Codecell team';
356+
if (customFunctionName == 'pyDocs') response = 'Opens Python reference material by Codecell team';
355357
if (customFunctionName == 'newsletter') response = 'Opens our exquisitive newsletter, written only for you !';
356358
if (customFunctionName == 'feedback') response = 'Opens up the perfect place, to showcase your love for us !';
357359
//if (customFunctionName == 'weather') response = 'Shows the weather forecast for the two days of JSConf 2014. It will be available only 5 days before the event.';
@@ -512,6 +514,9 @@
512514
function stl(){
513515
window.open("http://www.kjscecodecell.com/standard-library-in-x/");
514516
}
517+
function pyDocs(){
518+
window.open("http://www.kjscecodecell.com/Introduction-to-programming/python/");
519+
}
515520
function newsletter(){
516521
window.open("https://www.kjscecodecell.com/newsletters/");
517522
}

‎static/reports/Handover.pdf‎

230 KB
Binary file not shown.

‎static/reports/Panel_session.pdf‎

281 KB
Binary file not shown.

‎static/styles/styles.css‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2750,9 +2750,21 @@ padding: 60px 0; }
27502750
.be-workshop{
27512751
background-image: url(../images/events/event2.jpg);
27522752
}
2753+
.panel{
2754+
background-image: url(../images/events/Panel.jpg);
2755+
background-size: 25% 100%;
2756+
background-position: 0px ,0px;
2757+
background-repeat: repeat;
2758+
}
27532759
.handover{
27542760
background-image: url(../images/events/handover.jpg);
27552761
}
2762+
.handover1{
2763+
background-image: url(../images/events/LR-2003.jpg);
2764+
background-size: 35% 100%;
2765+
background-position: 1000px ,0px;
2766+
background-repeat: repeat;
2767+
}
27562768
.numtheory{
27572769
background-image: url(../images/events/17-18/numtheory.jpg);
27582770
background-size: 35% 100%;

0 commit comments

Comments
 (0)