Permalink
Browse files

Merge in from staging

  • Loading branch information...
2 parents d473980 + 712e558 commit 846c115f549782bea00b43b9cdedd9e26c5bec19 @rossbruniges rossbruniges committed Dec 7, 2012
@@ -9,15 +9,22 @@
def object_list(request, template='ignite_resources/object_list.html'):
"""Lists the current resources"""
+ sticky = Resource.objects.filter(
+ status=Resource.PUBLISHED,
+ resource_type=2,
+ is_featured=True
+ ).order_by('title')
labs = Resource.objects.filter(
status=Resource.PUBLISHED,
- resource_type=2
+ resource_type=2,
+ is_featured=False
).order_by('-created')
links = Resource.objects.filter(
status=Resource.PUBLISHED,
resource_type=1
).order_by('title')
context = {
+ 'sticky': sticky,
'labs': labs,
'links': links
}
@@ -4,11 +4,11 @@
}
@font-face{
font-family: league_gothic_ie;
- src: url(../fonts/league_gothic.eot);
+ src: url(../fonts/league_gothic.eot);
}
body{
background: #2e3132;
- font-family: "League Gothic", league_gothic, league_gothic_ie, sans-serif;
+ font-family: "League Gothic", league_gothic, monospace, league_gothic_ie, sans-serif;
}
#support_message, #support_none, #support_limited{
display: none;
@@ -41,7 +41,7 @@ body{
color: black;
text-decoration: none;
}
-#webgl_lab{
+#lab_video, #webgl_lab{
position:absolute;
width:100%;
height:100%;
@@ -67,14 +67,12 @@ body{
background: rgb( 255, 255, 255);
background: rgba( 232, 242, 248, 1);
}
-#credits_link{
+#credits_link, #demo_link{
display: none;
background: rgb( 232, 242, 248);
background: rgba( 232, 242, 248, 0.5);
border-radius: 2% 2% 2% 2% / 12% 12% 12% 12%;
position: absolute;
- left: 35%;
- top: 75%;
width: 30%;
height: 9%;
opacity: 0;
@@ -84,10 +82,18 @@ body{
-o-transition: opacity 1s;
text-align: center;
}
-#credits_link:hover{
+#credits_link:hover, #demo_link:hover{
background: rgb( 255, 255, 255);
background: rgba( 232, 242, 248, 1);
}
+#credits_link{
+ left: 35%;
+ top: 75%;
+}
+#demo_link{
+ left: 35%;
+ top: 65%;
+}
#logo1{
/* Native size: 209 x 91 */
display: none;
@@ -234,7 +240,7 @@ div.icon img{
#resources ul{
list-style-type: none;
}
-.logo_background{
+.logo_background, #logo_background{
position: absolute;
top: 30%;
left: 25%;
@@ -0,0 +1,261 @@
+ignite.link_node_manager.content[0] = {
+ notes: "This is the global group of non-link_node objects.",
+ content: [
+ {notes: "The Ignite logo", time_in: 1, time_out: 3,
+ start: function (){
+ var logo1 = document.getElementById("logo1");
+ logo1.className = "centered_logo";
+ logo1.style.display = "block";
+ logo1.style.opacity = "0"
+ logo1.transition = "left 2s, top 1s, opacity 1s, height 1s, width 1s";
+ logo1.MozTransition = "left 2s, top 1s, opacity 1s, height 1s, width 1s";
+ logo1.WebkitTransition = "left 2s, top 1s, opacity 1s, height 1s, width 1s";
+ logo1.OTransition = "left 2s, top 1s, opacity 1s, height 1s, width 1s";
+ setTimeout(function (){
+ logo1.style.opacity = "1";
+ }, 100);
+ if(!this.setup){
+ this.setup = true;
+ ignite.popcorn.cue(this.time_in+1, function (){
+ logo1.className = "positioned_logo";
+ })
+ }
+ },
+ end: function (){
+ var logo1 = document.getElementById("logo1");
+ logo1.transition = " ";
+ logo1.MozTransition = " ";
+ logo1.WebkitTransition = " ";
+ logo1.OTransition = " ";
+ logo1.style.display = "block";
+ logo1.style.opacity = "1";
+ logo1.className = "positioned_logo";
+ },
+ check: function (time_code){
+ var logo1 = document.getElementById("logo1");
+ if(time_code < this.time_in){
+ logo1.className = "centered_logo";
+ logo1.style.display = "none";
+ logo1.style.opacity = "0";
+ } else if(time_code > this.time_out){
+ this.end();
+ }
+ }
+ },
+ {notes: "The WebGL logo", time_in: 3, time_out: 4,
+ start: function (){
+ var logo2 = document.getElementById("logo2");
+ logo2.className = "centered_logo";
+ logo2.style.display = "block";
+ logo2.transition = "right 2s, top 1s, opacity 1s, height 1s, width 1s";
+ logo2.MozTransition = "right 2s, top 1s, opacity 1s, height 1s, width 1s";
+ logo2.WebkitTransition = "right 2s, top 1s, opacity 1s, height 1s, width 1s";
+ logo2.OTransition = "right 2s, top 1s, opacity 1s, height 1s, width 1s";
+ setTimeout(function (){
+ logo2.style.opacity = "1";
+ }, 100);
+ if(!this.setup){
+ this.setup = true;
+ ignite.popcorn.cue(this.time_in+1, function (){
+ logo2.className = "positioned_logo";
+ })
+ }
+ },
+ end: function (){
+ var logo2 = document.getElementById("logo2");
+ logo2.transition = " ";
+ logo2.MozTransition = " ";
+ logo2.WebkitTransition = " ";
+ logo2.OTransition = " ";
+ logo2.style.display = "block";
+ logo2.style.opacity = "1";
+ logo2.className = "positioned_logo";
+ },
+ check: function (time_code){
+ var logo2 = document.getElementById("logo2");
+ if(time_code < this.time_in){
+ logo2.className = "centered_logo";
+ logo2.style.display = "none";
+ logo2.style.opacity = "0";
+ } else if(time_code > this.time_out){
+ this.end();
+ }
+ }
+ },
+ {notes: "Walkthrough", time_in: 5, time_out: 10,
+ displayed: undefined, // Needed for unexpected behavior in Chrome.
+ start: function (){
+ if(this.displayed){ return;}
+ this.displayed = true;
+ var walkthrough_button = document.getElementById("walkthrough_link");
+ walkthrough_button.style.display = "block";
+ if(!this.setup){
+ this.setup = true;
+ var passed_event = this;
+ walkthrough_button.addEventListener("click", function (){
+ ignite.start_walkthrough();
+ passed_event.end();
+ });
+ }
+ /* The following setTimeout call is necessary to prevent
+ * block and opacity from being set simultaneously, which would
+ * result in a spontaneous appearance instead of a fade-in.
+ */
+ if(this.timeout_id){
+ clearTimeout(this.timeout_id);
+ }
+ this.timeout_id = setTimeout((function (passed_button){
+ return function (){
+ passed_button.style.opacity = "1";
+ }
+ })(walkthrough_button), 1000);
+ },
+ end: function (){
+ if(!this.displayed){ return;}
+ this.displayed = false;
+ var walkthrough_button = document.getElementById("walkthrough_link");
+ walkthrough_button.style.opacity = "0";
+ if(this.timeout_id){
+ clearTimeout(this.timeout_id);
+ }
+ this.timeout_id = setTimeout((function (passed_button){
+ return function (){
+ passed_button.style.display = "none";
+ }
+ })(walkthrough_button), 1000);
+ },
+ check: function (time_code){
+ if(time_code > this.time_in && time_code < this.time_out){
+ this.start();
+ } else{
+ this.end();
+ }
+ }
+ },
+ {notes: "Add Arrows", time_in: 10, time_out: 11,
+ started: undefined, // Needed for unexpected behavior in Chrome.
+ start: function (){
+ if(this.started){ return;}
+ this.started = true;
+ setTimeout(function (){
+ ignite.arrow_left.style.opacity = "1";
+ ignite.arrow_right.style.opacity = "0";
+ }, 100);
+ },
+ end: function (){},
+ check: function (time_code){
+ if(time_code >= this.time_in){
+ this.start();
+ }
+ }
+ },
+ {notes: "Excercise", time_in: 543, time_out: 600,
+ displayed: undefined, // Needed for unexpected behavior in Chrome.
+ start: function (){
+ if(this.displayed){ return;}
+ this.displayed = true;
+ var demo_button = document.getElementById("demo_link");
+ demo_button.style.display = "block";
+ if(!this.setup){
+ this.setup = true;
+ }
+ /* The following setTimeout call is necessary to prevent
+ * block and opacity from being set simultaneously, which would
+ * result in a spontaneous appearance instead of a fade-in.
+ */
+ if(this.timeout_id){
+ clearTimeout(this.timeout_id);
+ }
+ this.timeout_id = setTimeout((function (passed_button){
+ return function (){
+ passed_button.style.opacity = "1";
+ }
+ })(demo_button), 1000);
+ },
+ end: function (){
+ if(!this.displayed){ return;}
+ this.displayed = false;
+ var credits_button = document.getElementById("credits_link");
+ credits_button.style.opacity = "0";
+ if(this.timeout_id){
+ clearTimeout(this.timeout_id);
+ }
+ this.timeout_id = setTimeout((function (passed_button){
+ return function (){
+ passed_button.style.display = "none";
+ }
+ })(credits_button), 1000);
+ },
+ check: function (time_code){
+ if(time_code > this.time_in && time_code < this.time_out){
+ this.start();
+ } else{
+ this.end();
+ }
+ }
+ },
+ {notes: "Credits", time_in: 549, time_out: 600,
+ displayed: undefined, // Needed for unexpected behavior in Chrome.
+ start: function (){
+ if(this.displayed){ return;}
+ this.displayed = true;
+ var credits_button = document.getElementById("credits_link");
+ credits_button.style.display = "block";
+ if(!this.setup){
+ this.setup = true;
+ var passed_event = this;
+ credits_button.addEventListener("click", function (){
+ ignite.transition("right", true);
+ passed_event.end();
+ });
+ }
+ /* The following setTimeout call is necessary to prevent
+ * block and opacity from being set simultaneously, which would
+ * result in a spontaneous appearance instead of a fade-in.
+ */
+ if(this.timeout_id){
+ clearTimeout(this.timeout_id);
+ }
+ this.timeout_id = setTimeout((function (passed_button){
+ return function (){
+ passed_button.style.opacity = "1";
+ }
+ })(credits_button), 1000);
+ },
+ end: function (){
+ if(!this.displayed){ return;}
+ this.displayed = false;
+ var credits_button = document.getElementById("credits_link");
+ credits_button.style.opacity = "0";
+ if(this.timeout_id){
+ clearTimeout(this.timeout_id);
+ }
+ this.timeout_id = setTimeout((function (passed_button){
+ return function (){
+ passed_button.style.display = "none";
+ }
+ })(credits_button), 1000);
+ },
+ check: function (time_code){
+ if(time_code > this.time_in && time_code < this.time_out){
+ this.start();
+ } else{
+ this.end();
+ }
+ }
+ }
+ ]
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,9 +130,9 @@ ignite.resources.content = [
{id: "3dfx_ad", title: "3DFX Ad", content: "http://www.youtube.com/watch?v=ooLO2xeyJZA"}
]},
{title: 'Video Features 1', content: [
- {title: 'One Millionth Tower', content: 'http://highrise.nfb.ca/onemillionthtower/'},
- {title: 'Turbulent Point Cloud', content: 'http://www.ro.me/tech/turbulent-point-cloud'},
- {title: 'Hatching Glow Shader', content: 'http://www.ro.me/tech/hatching-glow-shader'},
+ {title: 'One Millionth T.', content: 'http://highrise.nfb.ca/onemillionthtower/'},
+ {title: 'Turbulent Point C.', content: 'http://www.ro.me/tech/turbulent-point-cloud'},
+ {title: 'Hatching Glow S.', content: 'http://www.ro.me/tech/hatching-glow-shader'},
{title: 'Kai &apos;Opua', content: 'http://www.webgl.com/2012/05/webgl-game-kai-opua/'},
{title: 'ro.me', content: 'http://www.ro.me/'},
{title: 'Shiny Knot', content: 'http://www.chromeexperiments.com/detail/floating-shiny-knot/'},
@@ -157,12 +157,12 @@ ignite.resources.content = [
{title: 'Codecademy', content: 'http://www.codecademy.com/#!/exercises/0'},
{title: 'Khan Academy', content: 'http://www.khanacademy.org/'},
{title: 'Radiohead Video', content: 'http://www.youtube.com/watch?v=oLrsguw1Zac'}
- ]} // TODO: Remember to ask Mike about "grey link" attributions.
+ ]}
]},
{id: "assorted", display: "none", content: [
{id: "java_&_opengl", title: "Java & OpenGL", content: "http://www.opengl.org/resources/bindings/"},
{id: "dependencies", title: "Dependencies", content: "http://en.wikipedia.org/wiki/Dependency_hell"},
- {id: "coupling", title: "Coupling", content: "TODO"},
+ {id: "coupling", title: "Coupling", content: "http://en.wikipedia.org/wiki/Coupling_%28computer_programming%29"},
{id: "teamup", title: "TeamUp", content: "http://www.getteamup.com"},
{id: "boot_to_gecko", title: "Boot to Gecko", content: "http://www.mozilla.org/en-US/b2g/"},
{id: "firefox_os", title: "Firefox OS", content: "http://www.digitaltrends.com/mobile/firefox-os-can-mozilla-move-to-mobile-phones/For"},
@@ -179,7 +179,7 @@ ignite.resources.content = [
{id: "p2pu", title: "Peer 2 Peer U", content: "https://p2pu.org/en/"},
{id: "khan_academy", title: "Khan Academy", content: "http://www.khanacademy.org/"},
{id: "the_gig", title: "&quot;The Gig&quot;", content: "http://chattanoogagig.com/"},
- {id: "webgl_exercise", title: "WebGL Exercise", content: "TODO"},
+ {id: "webgl_exercise", title: "WebGL Exercise", content: "https://github.com/mozilla/mozilla-ignite-learning-lab-demos/tree/master/lab-1-webgl"},
{id: "andors_submission", title: "Andor's Entry", content: "https://mozillaignite.org/ideas/323/"}
]}
];
Oops, something went wrong.

0 comments on commit 846c115

Please sign in to comment.