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

Commit

Permalink
[bug 914343] Web Literacy Standard, yo
Browse files Browse the repository at this point in the history
  • Loading branch information
Dale Karp committed Oct 16, 2013
1 parent 2476e77 commit 0a84599
Show file tree
Hide file tree
Showing 13 changed files with 542 additions and 3 deletions.
5 changes: 5 additions & 0 deletions app.js
Expand Up @@ -97,6 +97,7 @@ function reportError( error, isFatal ) {
console.error( "Internal Error: unable to report error to graylog, err=" + err );
}
}

app.use( function( req, res, next ) {
var guard = domain.create();
guard.add( req );
Expand Down Expand Up @@ -273,6 +274,10 @@ 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" ) );
app.get( "/standard", routes.page( "standard" ) );
app.get( "/standard/exploring", routes.page( "standard-exploring" ) );
app.get( "/standard/building", routes.page( "standard-building" ) );
app.get( "/standard/connecting", routes.page( "standard-connecting" ) );
app.get( "/style-guide", routes.page( "style-guide" ) );

app.get( "/details", routes.details );
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Expand Up @@ -9,7 +9,7 @@
"persona-btn": "~0.0.6",
"requirejs": "2.1.8",
"text": "2.0.9",
"webmaker-i18n": "https://github.com/mozilla/node-webmaker-i18n/archive/v0.2.4.tar.gz",
"webmaker-i18n": "https://github.com/mozilla/node-webmaker-i18n/archive/v0.2.5.tar.gz",
"webmaker-ui": "0.0.12"
}
}
3 changes: 3 additions & 0 deletions locale/en_US/weblitstandard.json
@@ -1,4 +1,7 @@
{
"WebLiteracyStandard": "Web Literacy Standard",
"StandardFooterTranslate": "Translate the Web Literacy Standard into your language.",
"StandardFooterButton": "Get involved!",
"StandardBuilding": "Building",
"StandardBuildingCoding": "Coding/scripting",
"StandardBuildingCodingDesc": "Creating interactive experiences on the web",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -33,8 +33,8 @@
"sequelize": "2.0.x",
"sqlite3": "2.1.17",
"uuid": "1.4.x",
"webmaker-i18n": "https://github.com/mozilla/node-webmaker-i18n/archive/v0.2.4.tar.gz",
"webmaker-loginapi": "https://github.com/mozilla/node-webmaker-loginapi/tarball/v0.1.15",
"webmaker-i18n": "https://github.com/mozilla/node-webmaker-i18n/archive/v0.2.5.tar.gz",
"webmaker-loginapi": "https://github.com/mozilla/node-webmaker-loginapi/tarball/v0.1.11",
"webmaker-postalservice": "https://github.com/mozilla/node-webmaker-postalservice/tarball/v0.2.5"
},
"devDependencies": {
Expand Down
249 changes: 249 additions & 0 deletions public/css/page-specific/standard.less
@@ -0,0 +1,249 @@
@lightblue: #4AAFBE;

body#standard-building,
body#standard-exploring,
body#standard-connecting {
font-family: 'Open Sans Light', sans-serif;

.ui-section {
padding-top: 110px;
}

a.literacy-button {
color: #FFF;
background-color: #187E9C;
padding: 15px 22px;
border-radius: 3px;
border-bottom: 3px solid #166D8F;
text-decoration: none;
&:hover {
background-color: lighten(#187E9C, 5%);
text-decoration: none;
}

}
.ui-body {
padding-bottom: 0;
}

.ui-poster img {
width: 100%;
height: 208px;
}

.breadcrumb {
display: block;
color: #C3C5C7;
margin: 0;

a {
color: @lightblue;
}
}

.ui-poster-footer {
height: 220px;
background-color: #7CD0DD;

.right-align {
text-align: right;
}

> div {
margin: 0 auto;
padding: 30px 0;

h2 {
color: #FFF;
margin-bottom: 25px;
}
}
}

.main-header {
color: @lightblue;
font-size: 40px;
}

.comp-description {
font-size: 14px;
margin: 0 0 30px;
color: #C3C5C7;
}

.standard-description {
font-size: 22px;
margin: 0 0 11px;
}

.standard-list {
margin-bottom: 30px;
width: 100%;

> ul {
list-style: none;
padding-left: 0;
&:first-of-type {
margin-top: 0;
}

> li {
padding: 15px 0;
width: 100%;

.comp-title {
font-weight: bold;
font-size: 18px;
padding-left: 2px;
}

.comp-desc {
display: block;
font-style: italic;
}

.hover-anchor {
position: relative;
left: -20px;
&:hover {
a:hover {
text-decoration: none;
}
i {
visibility: visible;
&:hover {
cursor: pointer;
}
}
}
i {
visibility: hidden;
}
}

ul {
padding-left: 0;
margin-top: 10px;
margin-left: -21px;
}

li {
list-style: none;
span {
position: relative;
left: 21px;
}
&:before {
content: '\2022';
color: #999;
margin-right: 15px;
position: absolute;
}
}
}
}

a {
color: @lightblue;
}
}

@media (max-width: @width-medium) {
.ui-poster-footer,
.ui-poster {
display: none;
}
}
}
body#standard {
font-family: 'Open Sans Light', sans-serif;
.ui-section {
padding-top: 110px;
}

.literacy-button {
color: #FFF;
background-color: #187E9C;
padding: 15px;
border-radius: 3px;
border-bottom: 3px solid #166D8F;
text-decoration: none;
&:hover {
background-color: lighten(#187E9C, 10%);
text-decoration: none;
}
span {
vertical-align: middle;
}

}
.ui-body {
padding-bottom: 0;
}

.ui-poster img {
width: 100%;
height: 208px;
}

.ui-poster-footer {
height: 220px;
background-color: #7CD0DD;

.right-align {
text-align: right;
}

> div {
margin: 0 auto;
padding: 30px 0;

h2 {
font-size: 1.5em;
margin-top: 13px;
margin-bottom: 25px;
color: #FFF;
}
}
}

.main-header {
color: @lightblue;
font-size: 40px;

.weblit-spec {
font-size: 20px;
}
}

.standard-description {
font-size: 19px;
}

.standard-list {
margin-bottom: 30px;

ul {
list-style: none;
padding-left: 0;

li {
padding: 15px 0;
&:not(:last-of-type) {
border-bottom: 1px solid @lightgrey;
}
}
}

a {
color: @lightblue;
}
}

@media (max-width: @width-medium) {
.ui-poster-footer,
.ui-poster {
display: none;
}
}
}
1 change: 1 addition & 0 deletions public/css/style.less
Expand Up @@ -16,6 +16,7 @@
@import "components/navigation";

@import "page-specific/feedback";
@import "page-specific/standard";

/*********************************************************
* BODY
Expand Down
Binary file added public/img/weblit-footer-graphic.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/weblit-header-graphic.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions views/macros.html
Expand Up @@ -22,3 +22,17 @@ <h1>{{ header | safe }}</h1>
</div>
</div>
{% endmacro %}

{% macro webLiteracyFooter() %}
<div class="ui-poster-footer">
<div class="ui-row">
<div class="g-4 right-align">
<img src="/img/weblit-footer-graphic.png" alt="" />
</div>
<div class="g-3">
<h2>{{ gettext('StandardFooterTranslate') }}</h2>
<a class="literacy-button" href="https://support.mozilla.org/en-US/kb/translate-webmaker" target="_blank"><span>{{ gettext('StandardFooterButton') }} <i class="icon-circle-arrow-right"></i></span></a>
</div>
</div>
</div>
{% endmacro %}
76 changes: 76 additions & 0 deletions views/standard-building.html
@@ -0,0 +1,76 @@
{% extends "layout.html" %}
{% include "macros.html" %}
{% block title %}{{ gettext('StandardBuilding') }}{% endblock %}
{% block body %}
<div class="ui-wrapper ui-body">
<div class="ui-section">
<span class="breadcrumb"><a href="/{{localeInfo.lang}}/standard">{{ gettext('WebLiteracyStandard') }}</a> / {{ gettext('StandardBuilding') }}</span>
<p class="comp-description">{{ gettext('StandardCompDescBuild') | instantiate | safe }}</p>
<h1 class="main-header">{{ gettext('StandardBuilding') }}</h1>
<p class="standard-description">{{ gettext('StandardBuildingDesc') }}</p>
<div class="standard-list">
<ul>
<li>
<a id="composing"></a>
<span class="hover-anchor"><a href="#composing"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingComposing') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingComposingDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingComposingPoint1')}}</span></li>
<li><span>{{ gettext('StandardBuildingComposingPoint2')}}</span></li>
<li><span>{{ gettext('StandardBuildingComposingPoint3')}}</span></li>
<li><span>{{ gettext('StandardBuildingComposingPoint4')}}</span></li>
<li><span>{{ gettext('StandardBuildingComposingPoint5')}}</span></li>
</ul>
</li>
<li>
<a id="remixing"></a>
<span class="hover-anchor"><a href="#remixing"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingRemixing') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingRemixingDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingRemixingPoint1')}}</span></li>
<li><span>{{ gettext('StandardBuildingRemixingPoint2')}}</span></li>
<li><span>{{ gettext('StandardBuildingRemixingPoint3')}}</span></li>
</ul>
</li>
<li>
<a id="design"></a>
<span class="hover-anchor"><a href="#design"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingDesign') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingDesignDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingDesignPoint1')}}</span></li>
<li><span>{{ gettext('StandardBuildingDesignPoint2')}}</span></li>
<li><span>{{ gettext('StandardBuildingDesignPoint3')}}</span></li>
<li><span>{{ gettext('StandardBuildingDesignPoint4')}}</span></li>
<li><span>{{ gettext('StandardBuildingDesignPoint5')}}</span></li>
</ul>
</li>
<li>
<a id="coding"></a>
<span class="hover-anchor"><a href="#coding"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingCoding') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingCodingDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingCodingPoint1')}}</span></li>
<li><span>{{ gettext('StandardBuildingCodingPoint2')}}</span></li>
<li><span>{{ gettext('StandardBuildingCodingPoint3')}}</span></li>
<li><span>{{ gettext('StandardBuildingCodingPoint4')}}</span></li>
<li><span>{{ gettext('StandardBuildingCodingPoint5')}}</span></li>
</ul>
</li>
<li>
<a id="infrastructure"></a>
<span class="hover-anchor"><a href="#infrastructure"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingInfra') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingInfraDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingInfraPoint1')}}</span></li>
<li><span>{{ gettext('StandardBuildingInfraPoint2')}}</span></li>
<li><span>{{ gettext('StandardBuildingInfraPoint3')}}</span></li>
<li><span>{{ gettext('StandardBuildingInfraPoint4')}}</span></li>
<li><span>{{ gettext('StandardBuildingInfraPoint5')}}</span></li>
</ul>
</li>
</ul>
</div>
</div>
{{ webLiteracyFooter() }}
</div>
{% endblock %}

0 comments on commit 0a84599

Please sign in to comment.