Skip to content
This repository has been archived by the owner on Mar 22, 2018. It is now read-only.

Commit

Permalink
Update to 0.4
Browse files Browse the repository at this point in the history
Update includes refinement of particular headers, consistency with a
break at the end of all pages, and new Carousel for featured progress!
There are currently two different Carousels on the front page, one
contains converted BYOB3 projects, and the other contains converted
Scratch projects. Each contain 5 unique projects, each repeated 4 times
in order to demonstrate functionality. Readme has also been updated to
reflect changes.
  • Loading branch information
khotchkiss13 committed Dec 4, 2014
1 parent 00c3557 commit 14f12e7
Show file tree
Hide file tree
Showing 12 changed files with 10,064 additions and 12 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,21 @@ August 1 2015 - Publish finalized website and back end in time for school to
This will include the full launch of all of the new features that
have been implemented with Snap! and the website.

Current Progress (December 2 2014)
Current Progress (December 3 2014)
===================================
Base state of website complete including:
Top Navigation Bar
Carousel for featured projects finished with basic funtionality
Bottom Footer (with some links working)
Updated information pages, including pages for parents, teachers, and about us
Updated information pages, including pages for parents, teachers, and about us
Basic Layout
Main CSS

Planned Features (Static Page)
==============================
Modern Redesign of the current Snap! landing page
Highlight the uses of Snap!
Begin showing featured projects
Begin showing featured projects (CURRENTLY IN PROGRESS)

Planned Features (Dynamic Page)
===============================
Expand Down
3 changes: 1 addition & 2 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ <h2>Snap! (formerly BYOB) is a visual, drag-and-drop programming language. It is
<h2>Snap! runs in your browser. It is implemented using Javascript, which is designed to limit the ability of browser-based software to affect your computer, so it's safe to run even other people's projects, even if you don't trust our competence or good intentions.</h2>
<h2>Snap! is presented by the University of California at Berkeley. It was developed by Jens M&ouml;nig at MioSoft Corporation, with design input and documentation by Brian Harvey at Berkeley, and contributions by students at Berkeley and elsewhere.</h2>
<h2>This material is based partly upon work supported by the National Science Foundation under Grant No. 1138596. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the National Science Foundation.</h2>

<body>
<br>
</body>
</html>
1 change: 1 addition & 0 deletions aboutus.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ <h2>Jens learned to program in the Smalltalk community, and Brian in the Lisp co
<h2>Snap! is the programming language used in _The Beauty and Joy of Computing_, the introductory computer science course for non-CS majors at Berkeley. Brian is co-developer, with Dan Garcia, of the BJC curriculum. We are actively spreading this course to high schools, and BJC students and teachers are the primary users of Snap!.</h2>
<h2>The design of Snap! is obviously based on that of Scratch, the pioneering visual programming language for kids 8 and up from the Lifelong Kindergarten Group at the MIT Media Lab. BYOB (Build Your Own Blocks), the previous version of Snap!, was in fact based on the Scratch 1.4 code base. (Snap! is a completely new implementation using Javascript and HTML5 Canvas.) We gratefully acknowledge the generous support we've been given by the MIT Scratch Team.</h2>
<h2>Our contribution was to extend the visual metaphors of Scratch for older learners (high school and up) to include first class procedures, first class lists, first class sprite objects with inheritance, and first class continuations.</h2>
<br>
</body>
</html>
122 changes: 122 additions & 0 deletions css/carousel.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
.jcarousel-wrapper {
margin: 10px auto;
position: relative;
border: 10px solid #fff;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
}

.jcarousel {
position: relative;
overflow: hidden;
width: 100%;
}

.jcarousel ul {
width: 20000em;
position: relative;
list-style: none;
margin: 0;
padding: 0;
}

.jcarousel li {
width: 193px;
margin-right: 15px;
float: left;
border: 1px solid #ffffff;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}

.jcarousel img {
display: block;
max-width: 100%;
height: auto !important;
border: 5px solid #ffffff;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
-webkit-box-shadow: 0 0 2px #999;
-moz-box-shadow: 0 0 2px #999;
box-shadow: 0 0 2px #999;
}

.jcarousel img:hover{
-moz-box-shadow: 0 0 5px #000000;
-webkit-box-shadow: 0 0 5px #000000;
box-shadow: 0 0 5px #000000;
}

.jcarousel-control-prev,
.jcarousel-control-next {
position: absolute;
top: 50%;
margin-top: -15px;
width: 30px;
height: 30px;
text-align: center;
background: #2196F3;
color: #fff;
text-decoration: none;
text-shadow: 0 0 1px #000;
font: 24px/27px Arial, sans-serif;
-webkit-border-radius: 30px;
-moz-border-radius: 30px;
border-radius: 30px;
-webkit-box-shadow: 0 0 4px #F0EFE7;
-moz-box-shadow: 0 0 4px #F0EFE7;
box-shadow: 0 0 4px #F0EFE7;
}

.jcarousel-control-prev {
left: -35px;
}

.jcarousel-control-next {
right: -35px;
}

.jcarousel-pagination {
position: absolute;
bottom: -40px;
left: 50%;
-webkit-transform: translate(-50%, 0);
-ms-transform: translate(-50%, 0);
transform: translate(-50%, 0);
margin: 0;
}

.jcarousel-pagination a {
text-decoration: none;
display: inline-block;

font-size: 11px;
height: 10px;
width: 10px;
line-height: 10px;

background: #ffffff;
color: #2196F3;
border-radius: 10px;
text-indent: -9999px;

margin-right: 7px;


-webkit-box-shadow: 0 0 2px #4E443C;
-moz-box-shadow: 0 0 2px #4E443C;
box-shadow: 0 0 2px #4E443C;
}

.jcarousel-pagination a.active {
background: #2196F3;
color: #ffffff;
opacity: 1;

-webkit-box-shadow: 0 0 2px #F0EFE7;
-moz-box-shadow: 0 0 2px #F0EFE7;
box-shadow: 0 0 2px #F0EFE7;
}
10 changes: 6 additions & 4 deletions css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ body {
-webkit-box-shadow: 0px 2px 2px #424242;
margin: 0;
padding: 0;
background: #2196F3;;
background: #2196F3;
height: 42px;
}

Expand Down Expand Up @@ -199,9 +199,11 @@ h4 {
color: #000000;
text-decoration: none;
font-family: 'Open Sans', sans-serif;
font-weight: 700;
font-weight: normal;
font-size: 32px;
position: relative;
-webkit-margin-before: 1.8em;
-webkit-margin-after: .5em;

}

Expand All @@ -219,8 +221,8 @@ hr {
height: 2px;
width: 100%;
background: #2196F3;
margin-top: 40px;
margin-bottom: 40px;
margin-top: 50px;
margin-bottom: 25px;
}

table#featured {
Expand Down
1 change: 1 addition & 0 deletions forparents.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@ <h2>Snap! is used in high school and college computer science classes; your chil
<h2><a href="privacy.html">Privacy Policy</a></h2>
<h2><a href="tos.html">Terms of Service</a></h2>
<h2>If your child has created a Snap! account without your permission and you would like us to delete it, please <a href="contact.html">contact us</a> and provide the account login name and/or the email address used to create the account. Please also give us a phone number where we can call you to confirm that you are the child's parent.</h2>
<br>
</body>
</html>
1 change: 1 addition & 0 deletions forteachers.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ <h2>We are part of a national movement to change this situation by creating comp
<h2>Still, we want to do this without losing the computer science. There are a lot of computer-related jobs that don't require CS education. Web page design, data mining, accounting, digital media: for all of these, there is software available for non-programmers. But we're not satisfied if we get kids to love computing without really engaging with the skill that's at the heart of CS: programming.</h2>
<h2>We wanted a programming language that would be non-intimidating, would instantly attract non-programmers, but that would support the deep ideas of computer science that are included in the BJC curriculum, especially recursion and higher order procedures. The obvious choice for the first part of this goal is <a href="https://scratch.mit.edu">Scratch</a>, from the Lifelong Kindergarten Group at the MIT Media Lab. But Scratch, aimed at elementary school-aged kids, deliberately leaves out the tools we need for the big ideas. Then we discovered that Jens Monig, earlier a member of the Scratch Team, had solved the first part of our problem by writing BYOB (Build Your Own Blocks), a Scratch extension that allowed recursion. We worked with Jens on expanding the design to include first class procedures and first class lists, with which we could program everything else we needed in BYOB itself.</h2>
<h2>Snap! is a complete rewrite, much faster and more stable, and browser-based because high school teachers told us they weren't allowed to install software on the school network. We (reluctantly) asked Jens to change the name from BYOB because the pun made a few teachers uncomfortable.</h2>
<br>
</body>
</html>
91 changes: 89 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
<link rel="stylesheet" href="css/styles.css">
<link rel="shortcut icon" href="images/Alonzo-favicon.ico">
<script type='text/javascript', scr='https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js'></script>
<link rel="stylesheet" type="text/css" href="css/carousel.css">

<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/jquery.jcarousel.min.js"></script>

<script type="text/javascript" src="js/jcarousel.js"></script>
</head>

<body>
Expand All @@ -32,7 +38,88 @@
</div>
<div id="wrapper">
<div id="mainContent">
<h4>Converted from BYOB3:</h4>
<div class="wrapper">
<h4>Converted from BYOB3</h4>

<div class="jcarousel-wrapper">
<div class="jcarousel">
<ul>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=vee" target="_blank"><img src="featured/byob1.png" alt="Byob 1"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/Double%20Jurassic%20Park.xml" target="_blank"><img src="featured/byob2.png" alt="Byob 2"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/math%20trainer.xml" target="_blank"><img src="featured/byob3.png" alt="Byob 3"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=Tree" target="_blank"><img src="featured/byob4.png" alt="Byob 4"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/fractal_fruit_tree.xml" target="_blank"><img src="featured/byob5.png" alt="Byob 5"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=vee" target="_blank"><img src="featured/byob1.png" alt="Byob 1"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/Double%20Jurassic%20Park.xml" target="_blank"><img src="featured/byob2.png" alt="Byob 2"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/math%20trainer.xml" target="_blank"><img src="featured/byob3.png" alt="Byob 3"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=Tree" target="_blank"><img src="featured/byob4.png" alt="Byob 4"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/fractal_fruit_tree.xml" target="_blank"><img src="featured/byob5.png" alt="Byob 5"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=vee" target="_blank"><img src="featured/byob1.png" alt="Byob 1"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/Double%20Jurassic%20Park.xml" target="_blank"><img src="featured/byob2.png" alt="Byob 2"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/math%20trainer.xml" target="_blank"><img src="featured/byob3.png" alt="Byob 3"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=Tree" target="_blank"><img src="featured/byob4.png" alt="Byob 4"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/fractal_fruit_tree.xml" target="_blank"><img src="featured/byob5.png" alt="Byob 5"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=vee" target="_blank"><img src="featured/byob1.png" alt="Byob 1"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/Double%20Jurassic%20Park.xml" target="_blank"><img src="featured/byob2.png" alt="Byob 2"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/math%20trainer.xml" target="_blank"><img src="featured/byob3.png" alt="Byob 3"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=Tree" target="_blank"><img src="featured/byob4.png" alt="Byob 4"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/fractal_fruit_tree.xml" target="_blank"><img src="featured/byob5.png" alt="Byob 5"></a></li>
</ul>
</div>

<a href="#" class="jcarousel-control-prev">&lsaquo;</a>
<a href="#" class="jcarousel-control-next">&rsaquo;</a>

<p class="jcarousel-pagination"></p>
</div>
</div>

<div class="wrapper">
<h4>Converted from Scratch</h4>

<div class="jcarousel-wrapper">
<div class="jcarousel">
<ul>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/star%20wars.xml" target="_blank"><img src="featured/featured1.png" alt="Featured 1"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/funny%20face.xml" target="_blank"><img src="featured/featured2.png" alt="Featured 2"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/splotch%20paint.xml" target="_blank"><img src="featured/featured3.png" alt="Featured 3"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/kanon.xml" target="_blank"><img src="featured/featured4.png" alt="Featured 4"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/flashlight.xml" target="_blank"><img src="featured/featured5.png" alt="Featured 5"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/star%20wars.xml" target="_blank"><img src="featured/featured1.png" alt="Featured 1"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/funny%20face.xml" target="_blank"><img src="featured/featured2.png" alt="Featured 2"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/splotch%20paint.xml" target="_blank"><img src="featured/featured3.png" alt="Featured 3"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/kanon.xml" target="_blank"><img src="featured/featured4.png" alt="Featured 4"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/flashlight.xml" target="_blank"><img src="featured/featured5.png" alt="Featured 5"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/star%20wars.xml" target="_blank"><img src="featured/featured1.png" alt="Featured 1"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/funny%20face.xml" target="_blank"><img src="featured/featured2.png" alt="Featured 2"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/splotch%20paint.xml" target="_blank"><img src="featured/featured3.png" alt="Featured 3"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/kanon.xml" target="_blank"><img src="featured/featured4.png" alt="Featured 4"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/flashlight.xml" target="_blank"><img src="featured/featured5.png" alt="Featured 5"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/star%20wars.xml" target="_blank"><img src="featured/featured1.png" alt="Featured 1"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/funny%20face.xml" target="_blank"><img src="featured/featured2.png" alt="Featured 2"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/splotch%20paint.xml" target="_blank"><img src="featured/featured3.png" alt="Featured 3"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/kanon.xml" target="_blank"><img src="featured/featured4.png" alt="Featured 4"></a></li>
<li><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/flashlight.xml" target="_blank"><img src="featured/featured5.png" alt="Featured 5"></a></li>
</ul>
</div>

<a href="#" class="jcarousel-control-prev">&lsaquo;</a>
<a href="#" class="jcarousel-control-next">&rsaquo;</a>

<p class="jcarousel-pagination"></p>
</div>
</div>










<!-- <h4>Converted from BYOB3:</h4>
<table id="featured">
<tr>
<td rowspan="1" class="thumbnail"><a href="http://snap.berkeley.edu/snapsource/snap.html#present:Username=bh&ProjectName=vee" target="_blank"><img src="featured/byob1.png" alt="featured 1" style="width: 150px; height: auto; display: inline-block; horizontal-align: middle; border: 2px; border-radius:20px; box-shadow: 2px 2px 8px #000000"></a></td>
Expand Down Expand Up @@ -65,7 +152,7 @@ <h4>Converted Scratch Projects:</h4>
<td class="title"><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/splotch%20paint.xml" target="_blank">Splotches</a></td>
<td class="title"><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/kanon.xml" target="_blank">Kanon</a></td>
<td class="title"><a href="http://snap.berkeley.edu/snapsource/snap.html#open:http://snap.berkeley.edu/snapsource/demo/flashlight.xml" target="_blank">Flashlight</a></td>
</table>
</table> -->
<hr>
</div>
</div>
Expand Down
Loading

0 comments on commit 14f12e7

Please sign in to comment.