mozilla
/
webmaker.org
зеркало из https://github.com/mozilla/webmaker.org.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

removing event guides and forwarding to event guides in events2

This commit is contained in:
Gvn Lazar Suntop 2014-03-24 15:25:22 -07:00
Родитель 38706c847f
Коммит 79672b1fc5
7 изменённых файлов: 4 добавлений и 241 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -333,7 +333,6 @@ app.get("/tools", routes.page("tools"));
app.get("/teach-templates", routes.page("teach-templates"));
app.get("/mentor", routes.page("mentor"));
app.get("/getinvolved", routes.page("getinvolved"));
app.get("/event-guides", routes.page("event-guides"));
app.get("/search", routes.search);
app.get("/feedback", routes.page("feedback"));

65
less/style.less
Просмотреть файл

@ -1206,71 +1206,6 @@ img {
}
}
/*********************************************************
* EVENT GUIDES
*/
#event-guides {
.ui-row {
padding-left: 1px;
}
.ui-body {
h1.planning-an-event {
margin-top: 20px;
}
}
.guide-columns {
.border-top-radius;
position: relative;
width: 326px;
height: 610px;
box-shadow: 0 35px 20px -40px rgba(0, 0, 0, 0.9);
a {
font-weight: 300;
i {
display: inline-block;
position: relative;
margin-left: 10px;
font-size: 28px;
top: 2px;
}
}
p {
margin: 0 auto;
}
h2 {
display: inline-block;
position: relative;
bottom: 15px;
}
h3 {
font-size: 18px;
}
.logo {
padding-left: 10px;
width: 44px;
}
a, h2, h3, p {
padding: 0 10px;
}
ul {
padding: 0 25px;
}
> img {
margin-bottom: 5px;
.border-top-radius;
}
}
}
/*********************************************************
* ERROR
*/

5
routes/redirect.js
Просмотреть файл

@ -49,9 +49,10 @@ module.exports = function (app) {
"/connect"
]
}, {
route: "/event-guides",
route: app.locals.EVENTS_URL + '/#!/event-guides',
paths: [
"/guides"
"/guides",
"/event-guides"
]
}, {
route: "https://support.mozilla.org/kb/translate-webmaker",

1
test/casperjs/js-smoketest.js
Просмотреть файл

@ -5,7 +5,6 @@ var baseURL = 'http://localhost:7777';
var routes = [
'/',
'/about',
'/event-guides',
'/feedback',
'/gallery',
'/getinvolved',

1
test/phantomjs/psmoke.js
Просмотреть файл

@ -7,7 +7,6 @@ var baseURL = 'http://localhost:7777';
var routes = [
'/',
'/about',
'/event-guides',
'/events',
'/feedback',
'/gallery',

153
views/event-guides.html
Просмотреть файл

@ -1,153 +0,0 @@
{% extends "layout.html" %}
{% include 'macros.html' %}
{% block title %}{{ gettext("Event Guides") }}{% endblock %}
{% block midbar %}
{% set header = gettext("eventHeader") + "<br>" %}
{% set desc = gettext("eventDesc") %}
<!-- check for search right when page loads -->
{{ galleryHeader( header, desc, []) }}
{% endblock %}
{% block body %}
<div class="ui-wrapper ui-body-nobg">
<div>
<div class="ui-row">
<div class="guide-columns ui-bg-column">
<img src="/img/img-Guides-Kitchen-Party.jpg" alt="{{ gettext("Kitchen Party") }}" />
<img src="/img/icon-Guides-Kitchen-Party.png" class="logo" alt="{{ gettext("Kitchen Party Logo") }}" />
<h2>{{ gettext("Kitchen Party") }}</h2>
<p>{{ gettext("A Kitchen Party is a fun way to") }}
<ul>
<li>{{ gettext("Spend an hour on a rainy day") }}</li>
<li>{{ gettext("Hang out as a family on the computer") }}</li>
<li>{{ gettext("Learn to hack with a friend") }}</li>
<li>{{ gettext("Make cool things on the web") }}</li>
</ul>
<h3>{{ gettext("Start Planning") }}</h3>
<ul>
<li>{{ gettext("1-5 friends or family members") }}</li>
<li>{{ gettext("15 minutes - 1 hour") }}</li>
<li>{{ gettext("Home, cafe, library") }}</li>
</ul>
<a class="ui-blue-btn" href="https://mozteach.makes.org/thimble/how-to-host-a-kitchen-party">{{ gettext("Kitchen Party Planning Guide") }}<i class="icon-angle-{{direction}}"></i></a></p>
</div>
<div class="guide-columns ui-bg-column">
<img src="/img/img-Guides-Hack-Jam.jpg" alt="{{ gettext("Hack Jam") }}" />
<img src="/img/icon-Guides-Hack-Jam.png" class="logo" alt="{{ gettext("Hack Jam Logo") }}" />
<h2>{{ gettext("Hack Jam") }}</h2>
<p>{{ gettext("A Hack Jam is a great way to") }}
<ul>
<li>{{ gettext("Team up to explore") }}</li>
<li>{{ gettext("Collaboratively build or improve") }}</li>
<li>{{ gettext("Learn and teach new hacking skills") }}</li>
</ul>
<h3>{{ gettext("Start Planning") }}</h3>
<ul>
<li>{{ gettext("10 - 50 participants") }}</li>
<li>{{ gettext("4 hours, 2 weeks") }}</li>
<li>{{ gettext("School, library") }}</li>
</ul>
<a class="ui-blue-btn" href="https://mozteach.makes.org/thimble/how-to-host-a-hack-jam">{{ gettext("Hack Jam Planning Guide") }}<i class="icon-angle-{{direction}}"></i></a></p>
</div>
<div class="guide-columns ui-bg-column">
<img src="/img/img-Guides-Hive-Pop-up.jpg" alt="{{ gettext("Hive Pop up") }}" />
<img src="/img/icon-Guides-Hive-Pop-up.png" class="logo" alt="{{ gettext("Hive Pop up Logo") }}" />
<h2>{{ gettext("Hive Pop-Up") }}</h2>
<p>{{ gettext("A Hive Pop-Up is fantastic way to:") }}
<ul>
<li>{{ gettext("Bring together local organizations") }}</li>
<li>{{ gettext("Demonstrate cool web ideas") }}</li>
<li>{{ gettext("Provide fun hands-on activities") }}</li>
<li>{{ gettext("Introduce your community to hacking") }}</li>
</ul>
<h3>{{ gettext("Start Planning") }}</h3>
<ul>
<li>{{ gettext("2-10 participating organizations") }}</li>
<li>{{ gettext("4 hours, 2-4 weeks") }}</li>
<li>{{ gettext("Community center, library, school") }}</li>
</ul>
<a class="ui-blue-btn" href="https://mozteach.makes.org/thimble/how-to-host-a-hive-pop-up">{{ gettext("Hive Pop-Up Planning Guide") }}<i class="icon-angle-{{direction}}"></i></a></p>
</div>
</div>
</div>
</div>
<div class="ui-wrapper ui-body">
<div class="ui-row">
<div class="ui-section">
<h1 class="planning-an-event style-guide">{{ gettext("PlanningAnEvent") }}</h1>
<p>{{ gettext("PlanningAnEventDesc") | safe }}</p>
<h2>{{ gettext("OverviewForOrganizers") }}</h2>
<ul class="angle-list">
<li>
<i class="icon-angle-{{direction}}"></i>
<h3>
<a href="https://wiki.mozilla.org/Maker_Party/Get_involved">{{ gettext("OFOStartHere") }}</a>
</h3>
<p>{{ gettext("OFOStartHereDesc") | safe }}</p>
</li>
<li>
<i class="icon-angle-{{direction}}"></i>
<h3>
<a href="/{{localeInfo.lang}}/events">{{ gettext("OFOAddEvent") }}</a>
</h3>
<p>{{ gettext("OFOAddEventDesc") | instantiate | safe }}</p>
</li>
<li>
<i class="icon-angle-{{direction}}"></i>
<h3>
<a href="https://intlstore.mozilla.org/makerparty/">{{ gettext("OFOOrder") }}</a>
</h3>
<p>{{ gettext("OFOOrderDesc") | safe }}</p>
</li>
<li>
<i class="icon-angle-{{direction}}"></i>
<h3>
<a href="https://mozteach.makes.org/thimble/what-i-made-maker-party">{{ gettext("OFOShare") }}</a>
</h3>
<p>{{ gettext("OFOShareDesc") | safe }}</p>
</li>
<li>
<i class="icon-angle-{{direction}}"></i>
<h3>
<a href="mailto:makerparty@mozilla.org">{{ gettext("OFOPhoto") }}</a>
</h3>
<p>{{ gettext("OFOPhotoDesc") | safe }}</p>
</li>
<li>
<i class="icon-angle-{{direction}}"></i>
<h3>
<a href="https://mozteach.makes.org/thimble/maker-party-report">{{ gettext("OFOReport") }}</a>
</h3>
<p>{{ gettext("OFOReportDesc") | safe }}</p>
</li>
<li>
<i class="icon-angle-{{direction}}"></i>
<h3>
<a href="https://wiki.mozilla.org/Maker_Party/FAQs">{{ gettext("OFOFAQ") }}</a>
</h3>
<p>{{ gettext("OFOFAQDesc") | safe }}</p>
</li>
<li>
<i class="icon-angle-{{direction}}"></i>
<h3>
<a href="mailto:makerparty@mozilla.org">{{ gettext("OFOContact") }}</a>
</h3>
<p>{{ gettext("OFOContactDesc") | safe }}</p>
</li>
</ul>
</div>
</div>
</div>
{% endblock %}

19
views/sitemap.xml
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
xmlns:xhtml="http://www.w3.org/1999/xhtml">
<url>
<loc>https://webmaker.org/</loc>
@ -28,15 +28,6 @@
<changefreq>weekly</changefreq>
<priority>1</priority>
</url>
<url>
<loc>https://webmaker.org/event-guides</loc>
<xhtml:link rel="alternate" hreflang="en-US" href="https://webmaker.org/event-guides"/>
{% for locale in supportedLanguages %}
<xhtml:link rel="alternate" hreflang="{{locale}}" href="https://webmaker.org/{{locale}}/event-guides"/>
{% endfor %}
<changefreq>weekly</changefreq>
<priority>1</priority>
</url>
<url>
<loc>https://webmaker.org/mentor</loc>
<xhtml:link rel="alternate" hreflang="en-US" href="https://webmaker.org/mentor"/>
@ -134,14 +125,6 @@
<changefreq>weekly</changefreq>
<priority>1</priority>
</url>
<url>
<loc>https://webmaker.org/{{locale}}/event-guides</loc>
{% for locale in supportedLanguages %}
<xhtml:link rel="alternate" hreflang="{{locale}}" href="https://webmaker.org/{{locale}}/event-guides"/>
{% endfor %}
<changefreq>weekly</changefreq>
<priority>1</priority>
</url>
<url>
<loc>https://webmaker.org/{{locale}}/mentor</loc>
{% for locale in supportedLanguages %}