Skip to content

Commit

Permalink
Merge pull request mozilla#38 from rossbruniges/staging
Browse files Browse the repository at this point in the history 
Merge up staging to master - Popcorn Maker changes and some small lighthouse tickets
  • Loading branch information
@rossbruniges
rossbruniges committed Oct 19, 2012
2 parents 2fe3766 + 1c7cfe8 commit 901103d
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 20 deletions.
7 changes: 3 additions & 4 deletions make_mozilla/base/templates/splash.html
View file
Expand Up @@ -77,8 +77,8 @@ <h2 class="list-title">X-Ray Goggles</h2>
<p>Explore and remix any web page</p>
</li>
<li>
<a href="{{ url('tools') }}#popcorn">
<h2 class="list-title">Popcorn</h2>
<a href="{{ url('tools') }}#popcorn-maker">
<h2 class="list-title">Popcorn Maker</h2>
<img src="{{ MEDIA_URL }}img/tools/popcorn-icon.png" alt="" />
</a>
<p>Supercharge web video</p>
Expand Down Expand Up @@ -189,17 +189,16 @@ <h3>Other Mozilla Webmaker websites:</h3>
<ul class="maker_partners">
<li class="active item">
<ul>
<li><a href="http://mozillapopcorn.org/"><img src="{{ MEDIA_URL }}img/logos/webmaker/Popcorn.png" alt="Popcorn" /></a></li>
<li><a href="http://www.hackasaurus.org/"><img src="{{ MEDIA_URL }}img/logos/webmaker/Hackasaurus.png" alt="Hackasaurus" /></a></li>
<li><a href="http://www.mozillaopennews.org/"><img src="{{ MEDIA_URL }}img/logos/webmaker/Opennews.png" alt="Mozilla Opennews" /></a></li>
<li><a href="http://www.openbadges.org/"><img src="{{ MEDIA_URL }}img/logos/webmaker/OpenBadges.png" alt="Mozilla Openbadges" /></a></li>
<li><a href="https://mozillafestival.org/"><img src="{{ MEDIA_URL }}img/logos/webmaker/Festival.png" alt="Mozilla Festival" /></a></li>
</ul>
</li>
<li class="item">
<ul>
<li><a href="https://mozillaignite.org/"><img src="{{ MEDIA_URL }}img/logos/webmaker/Ignite.png" alt="Ignite" /></a></li>
<li><a href="http://explorecreateshare.org/"><img src="{{ MEDIA_URL }}img/logos/webmaker/Hive.png" alt="Hive NYC" /></a></li>
<li><a href="https://mozillafestival.org/"><img src="{{ MEDIA_URL }}img/logos/webmaker/Festival.png" alt="Mozilla Festival" /></a></li>
<li><a href="http://www.mozilla.org/en-US/collusion/"><img src="{{ MEDIA_URL }}img/logos/webmaker/Collusion.png" alt="Collusion" /></a></li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion make_mozilla/events/templates/events/campaign.html
View file
Expand Up @@ -74,7 +74,7 @@ <h4 class="icon become">Become a Partner Organization</h4>
<p>Add your name to the list!</p>
<p><a class="button create" href="https://donate.mozilla.org/page/s/Summer-Code-Partner?source=about">Sign us up</a></p>
<h5>Hosting an event?</h5>
<p>Interested in becoming a partner organization? Learn more with our Partner Kit, to see how you can get involved.</p>
<p>Interested in becoming a partner organization? Learn more with our <a href="https://wiki.mozilla.org/Mozparty/Partner_Kit">Partner Kit</a>, to see how you can get involved.</p>
</div>
</div>
</section>
Expand Down
8 changes: 4 additions & 4 deletions make_mozilla/events/templates/events/guides/kitchen-table.html
View file
Expand Up @@ -122,7 +122,7 @@ <h5 class="sub_head"><a href="/projects/make-your-own-meme/" class="external tex
<li> Replacing the link on line 32 with your new image URL.</li>
<li> Now edit the text between the h1 and the h2 tags to give your image a new caption.</li>
<li> If you want, you can keep adjusting the page by editing the other attributes, such as the background color. </li>
<li> Press "Publish" in the top left-hand corner. Share your work!</li>
<li> Press "Publish" in the top right-hand corner. Share your work!</li>
</ul>

<h5 class="sub_head"><a href="/projects/make-your-own-animal/" class="external text">Awesome Animal Builder</a> &mdash; 15min </h5>
Expand All @@ -137,7 +137,7 @@ <h5 class="sub_head"><a href="/projects/make-your-own-animal/" class="external t
<li> Modify the links on line 41 by copying parts from the animals at the bottom of the page.</li>
<li> For example, change unknown.png to solenodon-tail.png</li>
<li> Edit the text starting on line 53 to describe the new animal.</li>
<li> Press "Publish" in the top left-hand corner. Share your work!</li>
<li> Press "Publish" in the top right-hand corner. Share your work!</li>
</ul>

<h5 class="sub_head">Keep hacking</h5>
Expand All @@ -151,9 +151,9 @@ <h5 class="sub_head">Keep hacking</h5>
<h5 class="sub_head">Share your hacks</h5>

<ul>
<li> <b>Hit "Publish"</b> in the top left corner when you're finished.</li>
<li> <b>Hit "Publish"</b> in the top right corner when you're finished.</li>
<li> <b>Celebrate what you made.</b> Ask your friends to show their work.</li>
<li> If you like, please <b> share your hacks with the world!</b>. You can publish the links to a blog or the social network of your choice. </li>
<li> If you like, please <b> share your hacks with the world!</b> You can publish the links to a blog or the social network of your choice.</li>
<li><b>Please tag your work with #mozparty.</b></li>
</ul>
</section>
Expand Down
2 changes: 1 addition & 1 deletion make_mozilla/events/templates/events/guides/pop-up.html
View file
Expand Up @@ -118,7 +118,7 @@ <h5 class="sub_head">Example Station: <a class="external text" href="/projects/m
</li><li> Replacing the link on line 32 with your new image URL.
</li><li> Now edit the text between the h1 and the h2 tags to give your image a new caption.
</li><li> If you want, you can keep adjusting the page by editing the other attributes, such as the background color.
</li><li> Press "Publish" in the top left-hand corner. Share your work!
</li><li> Press "Publish" in the top right-hand corner. Share your work!
</li>
</ul>

Expand Down
2 changes: 1 addition & 1 deletion make_mozilla/events/templates/events/hoc_2012.html
View file
Expand Up @@ -22,7 +22,7 @@ <h2 class="announce">The Webmaker Hall of Fame wants YOUR Contribution!</h2>
<div class="project-flyer">
<a href="http://mozillawebmaker.tumblr.com/post/32320281043/best-webmaker-creations-of-the-summer-popcorn">
<img src="{{ MEDIA_URL }}assets/hoc_2012/icon_popcorn.jpg" alt="" >
<h3 class="title">Best Popcorn</h3>
<h3 class="title">Best Popcorn Maker</h3>
</a>
</div>
</li>
Expand Down
8 changes: 4 additions & 4 deletions make_mozilla/pages/fixtures/initial_data.json
View file
Expand Up @@ -46,7 +46,7 @@
"fields": {
"title": "Creating a generation of webmakers",
"poster": "/media/img/about/2.jpg",
"content": "<p>Mozilla Webmaker offers:</p>\r\n\r\n<ol>\r\n <li><strong><a href=\"http://webmaker.org/tools\">Tools</a></strong>. Authoring tools and software, designed and built with our community. From supercharging web video with <a href=\"http://mozillapopcorn.org\">Popcorn</a>, to exploring and remixing with the <a href=\"http://hackasaurus.org\">X-Ray Goggles</a>, to making your own web pages with <a href=\"http://thimble.webmaker.org\">Thimble</a>. Like a Swiss Army knife or \u201csuperhero utility belt\u201d for webmaking.</li>\r\n <li><strong><a href=\"http://webmaker.org/projects\">Projects</a></strong>. Practical starter projects, how-tos and recipes, designed to help people at all levels make something amazing. From tweaking your blog template to building apps that change the world.</li>\r\n <li><strong><a href=\"http://webmaker.org/events\">Community</a></strong>. Bringing people with diverse skills and backgrounds together. Teachers, filmmakers, journalists, youth. From web ninjas to newbies. Connecting at events, meet-ups and hack jams everywhere.</li>\r\n</ul>",
"content": "<p>Mozilla Webmaker offers:</p>\r\n\r\n<ol>\r\n <li><strong><a href=\"http://webmaker.org/tools\">Tools</a></strong>. Authoring tools and software, designed and built with our community. From supercharging web video with <a href=\"http://maker.mozillapopcorn.org/\">Popcorn Maker</a>, to exploring and remixing with the <a href=\"http://hackasaurus.org\">X-Ray Goggles</a>, to making your own web pages with <a href=\"http://thimble.webmaker.org\">Thimble</a>. Like a Swiss Army knife or \u201csuperhero utility belt\u201d for webmaking.</li>\r\n <li><strong><a href=\"http://webmaker.org/projects\">Projects</a></strong>. Practical starter projects, how-tos and recipes, designed to help people at all levels make something amazing. From tweaking your blog template to building apps that change the world.</li>\r\n <li><strong><a href=\"http://webmaker.org/events\">Community</a></strong>. Bringing people with diverse skills and backgrounds together. Teachers, filmmakers, journalists, youth. From web ninjas to newbies. Connecting at events, meet-ups and hack jams everywhere.</li>\r\n</ul>",
"quotes": [
3,
4,
Expand Down Expand Up @@ -90,7 +90,7 @@
"fields": {
"title": "Shaping the web\u2019s future. Together.",
"poster": "/media/img/about/5.jpg",
"content": "<p><strong>Together, we make technology that is changing the web. </strong>Mozilla Webmaker projects like <a href=\"http://mozillapopcorn.org/\">Popcorn</a> are changing the face of web video. <a href=\"http://thimble.webmaker.org\">Thimble</a> demystifies the web\u2019s language for beginners. <a href=\"http://hackasaurus.org/\">Hackasaurus</a> energizes digital literacy and learning.&nbsp; <a href=\"http://openbadges.org\">OpenBadges</a> unlocks&nbsp; skills and achievements. <a href=\"http://mozillaopennews.org/\">OpenNews</a> catalyzes web innovation in newsrooms. <a href=\"http://explorecreateshare.org/\">Hive NYC</a> empowers youth to co-design technology\u2019s future.</p>\r\n\r\n<p>That\u2019s what Webmaker is all about: <strong>bringing diverse people together to create dynamic new web projects, technology and approaches to learning</strong>. We\u2019re passionate about the public potential of the web, and want to empower people to design and build its future.</p>",
"content": "<p><strong>Together, we make technology that is changing the web. </strong>Mozilla Webmaker projects like <a href=\"http://maker.mozillapopcorn.org/\">Popcorn Maker</a> are changing the face of web video. <a href=\"http://thimble.webmaker.org\">Thimble</a> demystifies the web\u2019s language for beginners. <a href=\"http://hackasaurus.org/\">Hackasaurus</a> energizes digital literacy and learning.&nbsp; <a href=\"http://openbadges.org\">OpenBadges</a> unlocks&nbsp; skills and achievements. <a href=\"http://mozillaopennews.org/\">OpenNews</a> catalyzes web innovation in newsrooms. <a href=\"http://explorecreateshare.org/\">Hive NYC</a> empowers youth to co-design technology\u2019s future.</p>\r\n\r\n<p>That\u2019s what Webmaker is all about: <strong>bringing diverse people together to create dynamic new web projects, technology and approaches to learning</strong>. We\u2019re passionate about the public potential of the web, and want to empower people to design and build its future.</p>",
"quotes": [
8
],
Expand All @@ -104,7 +104,7 @@
"fields": {
"title": "Is this for me?",
"poster": "/media/img/about/6.jpg",
"content": "<p><strong>Yes!</strong> Mozilla Webmaker has tools and projects specifically for:</p>\r\n\r\n<dl>\r\n <dt>Educators</dt>\r\n\t\t<dd>Resources for digital literacy, teaching webmaking basics like HTML and CSS, and <a href=\"https://webmaker.org/en-US/events/guides/\">guides</a> for hosting your own learning jam.</dd>\r\n <dt>Filmmakers</dt>\r\n\t\t<dd><a href=\"http://mozillapopcorn.org/\">Mozilla Popcorn</a> helps filmmakers, documentarians and multimedia artists make their online videos pop.</dd>\r\n <dt>Journalists</dt>\r\n\t\t<dd><a href=\"http://mozillaopennews.org/\">Knight-Mozilla OpenNews</a> provides fellowships, software and learning for news hackers.</dd>\r\n <dt>Youth</dt>\r\n\t\t<dd><a href=\"http://explorecreateshare.org/\">Hive NYC</a> is a digital learning lab and community for youth and educators.</dd>\r\n <dt>Developers and designers</dt>\r\n\t\t<dd>From contributing to <a href=\"https://github.com/mozilla\">Mozilla tools and projects</a>, to designing and building your own <a href=\"https://mozillaignite.org/\">next-generation apps</a> to change the world.</dd>\r\n <dt>Beginners</dt>\r\n\t\t<dd>Our <a href=\"http://webmaker.org/projects\">projects</a> are sorted by difficulty, to help anyone get started making something quickly.</dd>\r\n <dt>Experts</dt>\r\n\t\t<dd>Creating experimental apps, demos and web experiences no one\u2019s seen before.</dd>\r\n</dl>",
"content": "<p><strong>Yes!</strong> Mozilla Webmaker has tools and projects specifically for:</p>\r\n\r\n<dl>\r\n <dt>Educators</dt>\r\n\t\t<dd>Resources for digital literacy, teaching webmaking basics like HTML and CSS, and <a href=\"https://webmaker.org/en-US/events/guides/\">guides</a> for hosting your own learning jam.</dd>\r\n <dt>Filmmakers</dt>\r\n\t\t<dd><a href=\"http://maker.mozillapopcorn.org/\">Mozilla Popcorn Maker</a> helps filmmakers, documentarians and multimedia artists make their online videos pop.</dd>\r\n <dt>Journalists</dt>\r\n\t\t<dd><a href=\"http://mozillaopennews.org/\">Knight-Mozilla OpenNews</a> provides fellowships, software and learning for news hackers.</dd>\r\n <dt>Youth</dt>\r\n\t\t<dd><a href=\"http://explorecreateshare.org/\">Hive NYC</a> is a digital learning lab and community for youth and educators.</dd>\r\n <dt>Developers and designers</dt>\r\n\t\t<dd>From contributing to <a href=\"https://github.com/mozilla\">Mozilla tools and projects</a>, to designing and building your own <a href=\"https://mozillaignite.org/\">next-generation apps</a> to change the world.</dd>\r\n <dt>Beginners</dt>\r\n\t\t<dd>Our <a href=\"http://webmaker.org/projects\">projects</a> are sorted by difficulty, to help anyone get started making something quickly.</dd>\r\n <dt>Experts</dt>\r\n\t\t<dd>Creating experimental apps, demos and web experiences no one\u2019s seen before.</dd>\r\n</dl>",
"quotes": [
9,
10
Expand Down Expand Up @@ -187,7 +187,7 @@
"model": "pages.quote",
"fields": {
"url": "",
"quote": "Popcorn could be the next big thing in internet video.",
"quote": "Popcorn Maker could be the next big thing in internet video.",
"show_source_image": false,
"source": 4
}
Expand Down
12 changes: 7 additions & 5 deletions make_mozilla/tools/templates/tools/index_static.html
View file
Expand Up @@ -71,7 +71,7 @@ <h4 class="title"><a href="#x-ray-goggles">X-Ray Goggles</a></h4>
<p>Explore and remix any web page</p>
</div></li>
<li><div class="tool-flyer featured">
<h4 class="title"><a href="#popcorn">Popcorn</a></h4>
<h4 class="title"><a href="#popcorn-maker">Popcorn Maker</a></h4>
<a href="#popcorn" class="logo"><img src="{{ MEDIA_URL }}img/tools/popcorn-icon.png" alt="Popcorn Maker" title=""></a>
<p>Supercharge web video</p>
</div></li>
Expand Down Expand Up @@ -146,12 +146,14 @@ <h3>See how the web works</h3>
</section>

<section id="popcorn" class="sidebar larger">
<header><h2><img src="{{ MEDIA_URL}}img/tools/popcorn-icon.png"> <strong>Popcorn</strong></h2></header>
<header id="popcorn-maker"><h2><img src="{{ MEDIA_URL}}img/tools/popcorn-icon.png"> <strong>Popcorn Maker</strong></h2></header>
<div class="poster"></div>
<div class="content">
<h3>Video beyond the box</h3>
<span class="feature app"><img src="{{ MEDIA_URL }}img/tools/popcorn-app.png" alt="A screenshot of the Popcorn application"></span>
<p><b>Mozilla Popcorn pulls the rest of the web into your video.</b> Popcorn is an interactive video tool that lets you link your video directly to popular web services like Twitter, Wikipedia, Google maps and more. The result is a new kind of multimedia experience that works more like the web itself: interactive, rich with context and constantly changing. Create your own newscasts, pop-up videos, multimedia reports, guided web tours and more. <b>Popcorn is still in development</b> -- but please take an advance look and play around with the preview version now. Let's make some Popcorn!</p>
<p>Popcorn Maker makes it easy to enhance, remix and share web video. Use your web browser to combine video and audio with content from the rest of the web — from text, links and maps to pictures and live feeds.</p>
<p>Use Popcorn Maker to create your own interactive newscasts, pop-up videos, multimedia reports, fan videos, guided web tours and more. Remix your favorite videos on YouTube or sounds on SoundCloud, add your own comments and links, or drag and drop in content from across the web.</p>
<p>The result is a whole new way to tell stories on the web, with videos that are dynamic, full of links, and unique each time you watch them. It's video beyond the box.</p>
<span class="feature sample"><img src="{{ MEDIA_URL }}img/tools/popcorn-sample.png" alt="A sample of the Popcorn application"></span>
<p class="buttons"><a href="http://maker.mozillapopcorn.org/" class="button more">Get started</a></p>
</div>
Expand All @@ -164,13 +166,13 @@ <h3>Video beyond the box</h3>
<strong>&ndash;&nbsp;Fast Company</strong>
</figcaption>
</figure>
<p>Make something with Popcorn</p>
<p>Make something with Popcorn Maker</p>
{% if projects.popcorn.count() != 0 %}
<ul>
{% for project in projects.popcorn %}
<li><a href="{{ project.get_absolute_url() }}">{{ project }}</a></li>
{% endfor %}
<li><em><a href="{{ url('projects') }}?tool=popcorn">More Popcorn projects</a></em></li>
<li><em><a href="{{ url('projects') }}?tool=popcorn">More Popcorn Maker projects</a></em></li>
</ul>
{% else %}
<p><b>Projects coming soon</b></p>
Expand Down

0 comments on commit 901103d

Please sign in to comment.