Merge pull request #1411 from mmmavis/issue-1407-Teach-site-redirects

Fixes #1407 - redirect a fews page to Teach site
This commit is contained in:
Mavis Ou 2015-05-26 01:18:37 -07:00
Родитель 38e3b2b90a 35ff562637
Коммит 3d2963497c
12 изменённых файлов: 12 добавлений и 534 удалений

14
app.js
Просмотреть файл

@ -348,16 +348,8 @@ app.get('/healthcheck', routes.api.healthcheck);
app.get('/signup/:auth?', routes.angular);
// Literacy content got moved again
var moreLiteracyRedirect = function (req, res) {
res.redirect(301, req.path.replace('resources', 'resources/literacy'));
};
app.get('/resources/weblit-*', moreLiteracyRedirect);
// Angular
app.get('/', middleware.homePageRedirect, routes.angular);
app.get('/resources/:section?/:competency?', routes.angular);
app.get('/tools', routes.angular);
app.get('/remix-your-school', routes.angular);
app.get('/music-video', routes.angular);
@ -426,7 +418,6 @@ app.delete('/api/badges/:badge/instance/email/:email',
app.post('/api/submit-resource', routes.api.submitResource);
app.get('/mentor', routes.angular);
app.get('/search', routes.search);
// MOI splash page
@ -441,11 +432,6 @@ var literacyRedirect = function (req, res) {
app.get('/standard', literacyRedirect);
app.get('/standard/*', literacyRedirect);
app.get('/literacy', routes.angular);
app.get('/literacy/exploring', routes.page('literacy-exploring'));
app.get('/literacy/building', routes.page('literacy-building'));
app.get('/literacy/connecting', routes.page('literacy-connecting'));
app.get('/style-guide', routes.page('style-guide'));
app.get('/details', middleware.removeXFrameOptions, routes.details);

Просмотреть файл

@ -1,50 +0,0 @@
{
"About Emma": {
"message": "Emma ran a <a href=\"/makerparty\">Maker Party</a> for 10-12 year-olds at her local university computer lab in Victoria, Canada. Now shes working with other mentors to run a Webmaker Club to continue teaching youth about the value of open practices.",
"description": ""
},
"About Jon": {
"message": "Jon organized a 48-hour <a href=\"/makerparty\">Maker Party</a> in Dundee, Scotland, inviting his students to explore everything from a “Twitter bird” made out of paper and wire to hooking Google Maps up to an arcade joystick.",
"description": ""
},
"About Unnati": {
"message": "Unnati participated in our <a href=\"/makerparty\">Maker Party</a> in 2012 where she learned to remix her own web pages using Thimble and Popcorn. She now shares her knowledge by teaching her friends, family and classmates basic HTML and how to participate online.",
"description": ""
},
"Amy Burvall": {
"message": "Amy Burvall, Webmaker Fellow, teacher and remix artist",
"description": ""
},
"Emma": {
"message": "Emma",
"description": "Emma"
},
"Jon": {
"message": "Jon",
"description": "Jon"
},
"Making the web physical": {
"message": "Making the web physical",
"description": "Making the web physical"
},
"Mentor": {
"message": "Mentor",
"description": "Mentor"
},
"mentor": {
"message": "mentor",
"description": "mentor"
},
"Unnati": {
"message": "Unnati",
"description": "Unnati"
},
"Video remixing and open source for youth": {
"message": "Video remixing and open source for youth",
"description": "Video remixing and open source for youth"
},
"Youth mentor": {
"message": "Youth mentor",
"description": "Youth mentor"
}
}

Просмотреть файл

@ -1,170 +0,0 @@
{
"Resources for teaching and learning": {
"message": "Resources for teaching and learning",
"description": "Headline for the Competencies/Resources home page"
},
"Teach and learn digital skills, web literacy, and making": {
"message": "<strong>Teach and learn digital skills and web literacy</strong>. The pages in this section are full of fun things to discover, make and teach. Our global community is continually adding new activities, lesson plans and tutorials from across the web that make it easy to learn by doing. Anyone can use these educational resources&mdash;they&rsquo;re free, open and backed by <a href=\"https://mozilla.org/{{ lang }}/mission/\">Mozilla&rsquo;s non-profit mission</a>.",
"description": "Copy for header section of Competencies/Resources home page"
},
"Webmaker educational resources backed by Web Literacy Map": {
"message": "Webmaker educational resources are backed by <a href=\"/{{ lang }}/literacy\">Mozilla&rsquo;s Web Literacy Map</a>, covering the complete set of skills people need to thrive in today&rsquo;s digital world.",
"description": "Caption for below the map graphic on resources home header section"
},
"Weblit map alt text": {
"message" : "The Web Literacy Map helps you build literacy in exploring, building, and sharing the web.",
"description": "Alt text for the graphic of the web literacy map on /resources"
},
"Web Literacy Map": {
"message": "Web Literacy Map",
"description": "The title of the competencies list"
},
"Exploring": {
"message": "Exploring",
"description": "Title of the first section of competencies"
},
"Navigating the Web": {
"message": "Navigating the Web",
"description": "Subtitle of the first section of competencies"
},
"Building": {
"message": "Building",
"description": "Title of the second section of competencies"
},
"Creating for the Web": {
"message": "Creating for the Web",
"description": "Subtitle of the second section of competencies"
},
"Connecting": {
"message": "Connecting",
"description": "Title of the third section of competencies"
},
"Participating on the Web": {
"message": "Participating on the Web",
"description": "Subtitle of the third section of competencies"
},
"Discover new skills": {
"message": "Discover new skills. Then share them with others.",
"description": "Headline for section below competencies"
},
"Learn through hands-on making": {
"message": "Learn through hands-on making and doing. Then share what you&rsquo;ve learned with others. Webmaker resources are designed to make it easy and fun to teach everything from searching and navigating to coding and scripting, digital citizenship and protecting online privacy. Try <a href=\"/make-your-own\">creating your own</a> teaching kits to share with other educators and mentors around the world.",
"description": "Main copy for section below competencies"
},
"Discover": {
"message": "Discover",
"description": "Headline for first column in Discover new skills"
},
"Get your feet wet": {
"message": "<strong>Get your feet wet.</strong> Introduce yourself to new digital skills quickly through fun things to read, watch, listen or share.",
"description": "Copy for first column in Discover new skills"
},
"Make": {
"message": "Make",
"description": "Headline for second column in Discover new skills"
},
"Get your hands dirty": {
"message": "<strong>Get your hands dirty.</strong> The best way to learn is through hands-on making and building! Create web pages, multimedia videos, or remixes that help you learn practical skills as you go.",
"description": "Copy for second column in Discover new skills"
},
"Teach": {
"message": "Teach",
"description": "Headline for third column in Discover new skills"
},
"Share what you know": {
"message": "<strong>Share what you know.</strong> Anyone can teach with Webmaker. Whether you&rsquo;re an educator in the classroom or an enthusiastic mentor, parent or friend, we&rsquo;ve got activities and teaching guides that can help.",
"description": "Copy for third column in Discover new skills"
},
"Our global community is here to help": {
"message": "Our global community is here to help",
"description": "Headline for the people section"
},
"Mozilla Webmaker is different": {
"message": "<strong>Mozilla Webmaker is different.</strong> We&rsquo;re an open source project built by and for a global community of educators, techies and people like you. We love the web and want to spread its creative potential to all. We&rsquo;d love to collaborate with you or have you <a href=\"/{{ lang }}/getinvolved\">get more involved</a>.",
"description": "Copy for the people section"
},
"Get Training": {
"message": "Get training",
"description": "Headline for the Get Training column"
},
"Join our free open online course": {
"message": "Join our free open online course on how to teach the web.",
"description": "Copy for the Get Training column"
},
"Explore the community gallery": {
"message": "Explore the community gallery and see what other webmakers are making.",
"description": "Copy for the Explore column"
},
"Get Involved": {
"message": "Get Involved",
"description": "Headline for the Get Involved column"
},
"Get more involved": {
"message": "Share your own teaching resources, help with translation, contribute code or more.",
"description": "Copy for the Get Involved column"
},
"We have re-organized Webmaker Resources": {
"message": "<strong>We&rsquo;ve changed!</strong> Looking for easy ways to get started? Try out our <a href=\"/{{ lang}}/tools\">Tools</a>. Or remix something in the <a href=\"/{{ lang }}/gallery\">Gallery</a>.",
"description": "Copy for the banner alerting users to the IA changes"
},
"Browse our teaching resources": {
"message": "Browse our <a href=\"https://webmaker.org/resources\">teaching resources</a> or participate in <a href=\"https://training.webmakerprototypes.org\">professional development</a>.",
"description": "first bullet point, mentor."
},
"Join or host local events": {
"message": "Join or host <a href=\"https://events.webmaker.org\">local events</a> to collaborate with peers and teach learners.",
"description": "second bullet point, mentor."
},
"Show others how to make the web": {
"message": "Show others how to make the web and collect the <a href=\"https://webmaker.org/badges/skill-sharer\">Webmaker Skill Sharer badge</a>. When you're ready, apply for the <a href=\"https://webmaker.org/badges/webmaker-mentor\">Webmaker Mentor Badge</a>.",
"description": "third bullet point, mentor."
},
"Connect with the Community": {
"message": "Connect with the global community",
"description": "Headline, third section on mentor."
},
"Join our online forum": {
"message": "Join our <a href=\"http://discourse.webmaker.org/category/meet\">online forum</a> to meet other mentors like you. Share your events, activities and teaching resources using the <a href=\"https://twitter.com/search?q=%23teachtheweb\">#teachtheweb</a> hashtag.",
"description": "Copy, third section on mentor."
},
"Introduce yourself": {
"message": "Introduce yourself",
"description": ""
},
"Build your mentorship skills": {
"message": "Build your mentorship skills",
"description": "Headline, second section on mentor."
},
"Create a more web literate world paragraph": {
"message": "We are techies, makers, educators, parents and others who want to teach digital skills and web literacy through making.",
"description": "first paragraph on mentor."
},
"Create a more web literate world": {
"message": "Create a more web-literate world",
"description": "Headline on mentor."
},
"What is web literacy paragraph": {
"message": "Mozilla defines web literacy as the skills and competencies needed for reading, writing and participating on the web. Read more about why Mozilla cares about web literacy in this Webmaker Whitepaper.",
"description": "Paragraph about web literacy on mentor."
},
"What is web literacy": {
"message": "What is web literacy?",
"description": "Headline for web literacy on mentor."
},
"What is web literacy button": {
"message": "Learn more",
"description": "Button for web literacy on mentor"
},
"Become a catalyst paragraph": {
"message": "Learn more about the Hive Learning Networks model and how cities around the globe are championing digital skills and web literacy through connected learning.",
"description": "Paragraph about hive on mentor."
},
"Become a catalyst": {
"message": "Become a local community catalyst",
"description": "Headline for hive on mentor."
},
"Become a catalyst button": {
"message": "Learn more",
"description": "Button for hive on mentor"
}
}

Просмотреть файл

@ -100,11 +100,6 @@
"StandardExploringWMPoint1": "Using and understanding the differences between URLs, IP addresses and search terms",
"StandardExploringWMPoint2": "Managing information from various sources on the web",
"StandardExploringWMPoint3": "Demonstrating the difference between the results of varying search strategies",
"StandardFooterButton": "Get involved!",
"StandardFooterTranslate": "Translate the Web Literacy Map into your language.",
"StandardMainDesc1": "Mozilla defines web literacy as the skills and competencies needed for reading, writing and participating on the web.",
"StandardMainDesc2": "To chart these skills and competencies, Mozilla worked alongside a <a href=\"https://wiki.mozilla.org/Learning/WebLiteracyMap/Contributors\">community of stakeholders</a> to create the Web Literacy Map.",
"StandardMainDesc3": "Read more about why Mozilla cares about web literacy in this <a href=\"https://mozilla.github.io/webmaker-whitepaper/\">Webmaker Whitepaper</a>.",
"StandardMainHeader": "The Web Literacy Map <span class='weblit-spec'>(specification)</span>",
"WebLiteracyMap": "Web Literacy Map"
}

Двоичные данные
public/img/home/resources.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 6.0 KiB

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 11 KiB

После

Ширина:  |  Высота:  |  Размер: 6.6 KiB

Двоичные данные
public/img/img-Mentor-feature-bobby.jpg

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 138 KiB

Двоичные данные
public/img/img-mentor-emma-erwin.jpg

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 8.9 KiB

Просмотреть файл

@ -1,49 +0,0 @@
<div id="literacy">
<div class="container map">
<h1>
{{ litMapTitle }}
</h1>
<p class="lead">{{ 'StandardMainDesc1' | i18n }}</p>
<p class="lead" bind-unsafe-html="'StandardMainDesc2'| i18n"></p>
<p class="lead" bind-unsafe-html="'StandardMainDesc3'| i18n"></p>
<ul class="list-unstyled">
<li class="strand-section" ng-repeat="(strand, literacies) in litMap">
<h2 class="strand" id="{{ strand }}">
<strong>
{{ strand }}
</strong>
</h2>
<ul class="list-unstyled">
<li class="competency-section" ng-repeat="literacy in literacies | filter: strand">
<h3 class="competency" id="{{ literacy.term }}">
{{ literacy.term }}
</h3>
<p>{{ literacy.description }}</p>
<ul>
<li ng-repeat="point in wlcPoints[literacy.tag]">
<p>{{ point | i18n }}</p>
</li>
</ul>
</li>
</ul>
</li>
</ul>
</div>
<div class="well well-web-literacy">
<div class="container">
<h3>{{ 'StandardFooterTranslate' | i18n }}</h3>
<a class="btn btn-primary btn-lg" href="https://support.mozilla.org/{{ lang }}/kb/translate-webmaker" target="_blank">
<span>
{{ 'StandardFooterButton' | i18n }}
<i class="fa fa-arrow-circle-right"></i>
</span>
</a>
</div>
</div>
</div>
<div ng-include="'/views/partials/footer.html'"></div>

Просмотреть файл

@ -1,98 +0,0 @@
<div id="mentor">
<img class="banner" src="/img/img-Mentor-feature-bobby.jpg" alt="{{ 'Mentor' | i18n }}"/>
<div class="container">
<div class="row">
<div class="col-xs-12 col-md-10 col-md-offset-1">
<h1>{{ 'Create a more web literate world' | i18n }}</h1>
<div class="lead">
<a class="btn btn-primary btn-lg pull-right" href="https://sendto.mozilla.org/page/s/mentor-signup">
{{ 'Become a Mentor' | i18n }}
</a>
<p bind-unsafe-html="'Create a more web literate world paragraph' | i18n"></p>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-10 col-md-offset-1">
<img src="/img/home/resources.png" class="resource-graphic">
<h2>{{ 'Build your mentorship skills' | i18n }}</h2>
<ol class="mentorship-skills">
<li bind-unsafe-html="'Browse our teaching resources' | i18n"></li>
<li bind-unsafe-html="'Join or host local events' | i18n"></li>
<li bind-unsafe-html="'Show others how to make the web' | i18n"></li>
</ol>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-10 col-md-offset-1">
<h1>{{ 'Connect with the Community' | i18n }}</h1>
<div>
<a class="btn btn-primary btn-lg pull-right" href="http://discourse.webmaker.org/category/meet">
{{ 'Introduce yourself' | i18n }}</a>
<p bind-unsafe-html="'Join our online forum' | i18n"></p>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-10 col-md-offset-1">
<h1>{{ 'What is web literacy' | i18n }}</h1>
<a class="btn btn-primary btn-lg pull-right" href="//mozilla.github.io/webmaker-whitepaper/">
{{ 'What is web literacy button' | i18n }}
</a>
<p bind-unsafe-html="'What is web literacy paragraph' | i18n"></p>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-10 col-md-offset-1">
<div class="row the-mentors">
<section class="col-xs-12 col-sm-4 mentor-profile">
<header class="mentor-header">
<img src="/img/img-mentor-emma-erwin.jpg" class="img-circle mentor-face" alt="{{ 'Emma' | i18n }}"/>
<h3>{{ 'Emma' | i18n }}</h3>
<h4>{{ 'Video remixing and open source for youth' | i18n }}</h4>
</header>
<p bind-unsafe-html="'About Emma' | i18n"></p>
</section>
<section class="col-xs-12 col-sm-4 mentor-profile">
<header class="mentor-header">
<img src="http://content-2011.mozillafestival.org/uploads/2011/09/jonrogers-sm.jpg" class="img-circle mentor-face" alt="{{ 'Jon' | i18n }}"/>
<h3>{{ 'Jon' | i18n }}</h3>
<h4>{{ 'Making the web physical' | i18n }}</h4>
</header>
<p bind-unsafe-html="'About Jon' | i18n"></p>
</section>
<section class="col-xs-12 col-sm-4 mentor-profile">
<header class="mentor-header">
<img src="http://content-2012.mozillafestival.org/uploads/2013/01/unnati.jpg" class="img-circle mentor-face" alt="{{ 'Unnati' | i18n }}"/>
<h3>{{ 'Unnati' | i18n }}</h3>
<h4>{{ 'Youth mentor' | i18n }}</h4>
</header>
<p bind-unsafe-html="'About Unnati' | i18n"></p>
</section>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-10 col-md-offset-1">
<h1>{{ 'Become a catalyst' | i18n }}</h1>
<a class="btn btn-primary btn-lg pull-right" href="//hivelearningnetworks.org/">
{{ 'Become a catalyst button' | i18n }}
</a>
<p bind-unsafe-html="'Become a catalyst paragraph' | i18n"></p>
</div>
</div>
</div>
</div>
<div ng-include="'/views/partials/footer.html'"></div>

Просмотреть файл

@ -1,147 +0,0 @@
<header id="resources-banner">
<div class="container">
<p class="col-xs-12" bind-unsafe-html="'We have re-organized Webmaker Resources' | i18n"></p>
</div>
</header>
<div class="container" ng-controller="resourcesHomeController">
<section id="resources-Resources" class="row">
<div class="col-xs-12 col-sm-7 col-md-8">
<h1>
{{ 'Resources for teaching and learning' | i18n }}
</h1>
<p bind-unsafe-html="'Teach and learn digital skills, web literacy, and making' | i18n"></p>
</div>
<div class="col-xs-12 col-sm-5 col-md-4">
<figure class="resources-map">
<img src="/img/explore-map.svg" alt="{{ 'Weblit map alt text' | i18n }}" />
<figcaption>
<p bind-unsafe-html="'Webmaker educational resources backed by Web Literacy Map' | i18n"></p>
</figcaption>
</figure>
</div>
</section>
<section id="resources-Web-Literacy-Map">
<div class="row">
<h2 class="col-sm-12">
{{ 'Web Literacy Map' | i18n }}
</h2>
</div>
<nav class="row">
<div class="col-sm-4 literacies-Exploring">
<hgroup>
<h3>{{ 'Exploring' | i18n }}</h3>
<h4>{{ 'Navigating the Web' | i18n }}</h4>
</hgroup>
<ul>
<li ng-repeat="skill in literacies" ng-if="skill.strand == 'Exploring'">
<a href="/{{ lang }}/resources/literacy/{{ skill.tag }}" push-state="true" class="competency-link bg-{{ skill.tag }}">
{{ skill.term }}
</a>
</li>
</ul>
</div>
<div class="col-sm-4 literacies-Building">
<hgroup>
<h3>{{ 'Building' | i18n }}</h3>
<h4>{{ 'Creating for the Web' | i18n }}</h4>
</hgroup>
<ul>
<li ng-repeat="skill in literacies" ng-if="skill.strand == 'Building'">
<a href="/{{ lang }}/resources/literacy/{{ skill.tag }}" push-state="true" class="competency-link bg-{{ skill.tag }}">
{{ skill.term }}
</a>
</li>
</ul>
</div>
<div class="col-sm-4 literacies-Connecting">
<hgroup>
<h3>{{ 'Connecting' | i18n }}</h3>
<h4>{{ 'Participating on the Web' | i18n }}</h4>
</hgroup>
<ul>
<li ng-repeat="skill in literacies" ng-if="skill.strand == 'Connecting'">
<a href="/{{ lang }}/resources/literacy/{{ skill.tag }}" push-state="true" class="competency-link bg-{{ skill.tag }}">
{{ skill.term }}
</a>
</ul>
</div>
</nav>
</section>
<section id="resources-Discover-new-skills">
<div class="row">
<div class="col-sm-12">
<h2>{{ 'Discover new skills' | i18n }}</h2>
<p ng-bind-html="'Learn through hands-on making' | i18n"></p>
</div>
</div>
<div class="row">
<aside class="col-sm-4">
<h3>
<span class="fa-stack">
<span class="fa fa-circle fa-stack-2x text-lightgrey"></span>
<span class="fa fa-random fa-stack-1x text-secondary"></span>
</span>
{{ 'Discover' | i18n }}
</h3>
<p ng-bind-html="'Get your feet wet' | i18n"></p>
</aside>
<aside class="col-sm-4">
<h3>
<span class="fa-stack">
<span class="fa fa-circle fa-stack-2x text-lightgrey"></span>
<span class="fa fa-hand-o-up fa-stack-1x text-secondary"></span>
</span>
{{ 'Make' | i18n }}
</h3>
<p ng-bind-html="'Get your hands dirty' | i18n"></p>
</aside>
<aside class="col-sm-4">
<h3>
<span class="fa-stack">
<span class="fa fa-circle fa-stack-2x text-lightgrey"></span>
<span class="fa fa-book fa-stack-1x text-secondary"></span>
</span>
{{ 'Teach' | i18n }}
</h3>
<p ng-bind-html="'Share what you know' | i18n "></p>
</aside>
</div>
</section>
<section id="resources-People-Resources" class="row">
<div class="col-sm-12">
<h2>{{ 'Our global community is here to help' | i18n }}</h2>
<p bind-unsafe-html="'Mozilla Webmaker is different' | i18n"></p>
</div>
<i>&nbsp;</i>
</section>
<section id="resources-Still-Reading" class="row">
<aside class="col-sm-4">
<a href="http://training.webmakerprototypes.org/">
<h2 class="web-lit-get-training">{{ 'Get Training' | i18n }}</h2>
<p>{{ 'Join our free open online course' | i18n }}</p>
</a>
</aside>
<aside class="col-sm-4">
<a href="/{{ lang }}/gallery">
<h2 class="web-lit-gallery">{{ 'Explore' | i18n }}</h2>
<p>{{ 'Explore the community gallery' | i18n }}</p>
</a>
</aside>
<aside class="col-sm-4">
<a href="/{{ lang }}/getinvolved">
<h2 class="web-lit-get-involved">{{ 'Get Involved' | i18n }}</h2>
<p>{{ 'Get more involved' | i18n }}</p>
</a>
</aside>
</section>
</div>
<div ng-include="'/views/partials/footer.html'"></div>

Просмотреть файл

@ -95,11 +95,22 @@ module.exports = function (app) {
'/_hive'
]
}, {
route: 'http://party.webmaker.org',
route: 'https://teach.mozilla.org/events',
paths: [
'/party',
'/makerparty'
]
}, {
route: 'https://teach.mozilla.org/teach-like-mozilla/web-literacy',
paths: [
'/resources/*',
'/literacy/*'
]
}, {
route: 'https://teach.mozilla.org',
paths: [
'/mentor'
]
}];
redirectMap.forEach(function (redirect) {