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

Bug 994720 - Added web literacy skills to explore

This commit is contained in:
Kate Hudson 2014-04-10 11:30:55 -04:00
Родитель a9d28c5bd6
Коммит 059e445a31
7 изменённых файлов: 127 добавлений и 110 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -250,6 +250,7 @@ app.locals({
app.use(function (req, res, next) {
var user = req.session.user;
res.locals({
wlcPoints: require("./lib/web-literacy-points.json"),
currentPath: req.path,
returnPath: req.param('page'),
email: user ? user.email : '',
@ -408,6 +409,7 @@ app.get('/angular-config.js', function (req, res) {
angularConfig.defaultLang = 'en-US';
angularConfig.supported_languages = i18n.getSupportLanguages();
angularConfig.csrf = req.csrfToken();
angularConfig.wlcPoints = res.locals.wlcPoints;
res.setHeader('Content-type', 'text/javascript');
res.send('window.angularConfig = ' + JSON.stringify(angularConfig));

5
less/explore/main.less
Просмотреть файл

@ -329,6 +329,11 @@ img {
margin: 30px 0;
}
// The skills for each competency
.list-web-literacy-points {
line-height: 1.8;
}
// Tabs
.tab-pane .row {
margin-top: @grid-gutter-width;

105
lib/web-literacy-points.json Normal file
Просмотреть файл

@ -0,0 +1,105 @@
{
"weblit-Navigation": [
"StandardExploringNavPoint1",
"StandardExploringNavPoint2",
"StandardExploringNavPoint3",
"StandardExploringNavPoint4",
"StandardExploringNavPoint5"
],
"weblit-WebMechanics": [
"StandardExploringWMPoint1",
"StandardExploringWMPoint2",
"StandardExploringWMPoint3"
],
"weblit-Search": [
"StandardExploringSearchPoint1",
"StandardExploringSearchPoint2",
"StandardExploringSearchPoint3",
"StandardExploringSearchPoint4",
"StandardExploringSecurityPoint1",
"StandardExploringSecurityPoint2",
"StandardExploringSecurityPoint3"
],
"weblit-Credibility": [
"StandardExploringCredibilityPoint1",
"StandardExploringCredibilityPoint2",
"StandardExploringCredibilityPoint3",
"StandardExploringCredibilityPoint4"
],
"weblit-Security": [
"StandardExploringSecurityPoint1",
"StandardExploringSecurityPoint2",
"StandardExploringSecurityPoint3"
],
"weblit-Composing": [
"StandardBuildingComposingPoint1",
"StandardBuildingComposingPoint2",
"StandardBuildingComposingPoint3",
"StandardBuildingComposingPoint4",
"StandardBuildingComposingPoint5"
],
"weblit-Remix": [
"StandardBuildingRemixingPoint1",
"StandardBuildingRemixingPoint2",
"StandardBuildingRemixingPoint3"
],
"weblit-DesignAccessibility": [
"StandardBuildingDesignPoint1",
"StandardBuildingDesignPoint2",
"StandardBuildingDesignPoint3",
"StandardBuildingDesignPoint4",
"StandardBuildingDesignPoint5",
"StandardBuildingDesignPoint6"
],
"weblit-CodingScripting": [
"StandardBuildingCodingPoint1",
"StandardBuildingCodingPoint2",
"StandardBuildingCodingPoint3",
"StandardBuildingCodingPoint4",
"StandardBuildingCodingPoint5"
],
"weblit-Infrastructure": [
"StandardBuildingInfraPoint1",
"StandardBuildingInfraPoint2",
"StandardBuildingInfraPoint3",
"StandardBuildingInfraPoint4",
"StandardBuildingInfraPoint5"
],
"weblit-Sharing": [
"StandardConnectingSharingPoint1",
"StandardConnectingSharingPoint2",
"StandardConnectingSharingPoint3",
"StandardConnectingSharingPoint4",
"StandardConnectingSharingPoint5",
"StandardConnectingSharingPoint6"
],
"weblit-Collaborating": [
"StandardConnectingCommunityPoint1",
"StandardConnectingCommunityPoint2",
"StandardConnectingCommunityPoint3",
"StandardConnectingCommunityPoint4",
"StandardConnectingCommunityPoint5",
"StandardConnectingCommunityPoint6"
],
"weblit-Community": [
"StandardConnectingCommunityPoint1",
"StandardConnectingCommunityPoint2",
"StandardConnectingCommunityPoint3",
"StandardConnectingCommunityPoint4",
"StandardConnectingCommunityPoint5",
"StandardConnectingCommunityPoint6"
],
"weblit-Privacy": [
"StandardConnectingPrivacyPoint1",
"StandardConnectingPrivacyPoint2",
"StandardConnectingPrivacyPoint3",
"StandardConnectingPrivacyPoint4",
"StandardConnectingPrivacyPoint5"
],
"weblit-OpenPractices": [
"StandardConnectingOpenPoint1",
"StandardConnectingOpenPoint2",
"StandardConnectingOpenPoint3",
"StandardConnectingOpenPoint4"
]
}

4
locale/en_US/explore.json
Просмотреть файл

@ -62,5 +62,9 @@
"Code dude": {
"message": "Code dude",
"description": "Title for Gavin Suntop"
},
"Skills": {
"message": "Skills",
"description": "Title for list of web literacy skills"
}
}

6
public_angular/js/controllers.js
Просмотреть файл

@ -23,8 +23,8 @@ angular
};
}
])
.controller('competencyController', ['$rootScope', '$scope', '$location', '$routeParams', 'weblit', 'makeapi', 'SITE',
function ($rootScope, $scope, $location, $routeParams, weblit, makeapi, SITE) {
.controller('competencyController', ['$rootScope', '$scope', '$location', '$routeParams', 'weblit', 'makeapi', 'SITE', 'CONFIG',
function ($rootScope, $scope, $location, $routeParams, weblit, makeapi, SITE, CONFIG) {
$scope.tag = $routeParams.id;
@ -36,6 +36,8 @@ angular
$scope.mentors = SITE.mentors;
$scope.wlcPoints = CONFIG.wlcPoints;
makeapi
.tags($scope.skill.tag)
.then(function(data) {

7
public_angular/views/competency.html
Просмотреть файл

@ -9,6 +9,11 @@
<div class="container">
<h2 class="page-header">{{ 'Skills' | i18n }}</h2>
<ul class="list list-web-literacy-points">
<li ng-repeat="point in wlcPoints[skill.tag]">{{point | i18n }}</li>
</ul>
<h2 class="page-header">{{ 'Kits' | i18n }}</h2>
<tabset>
@ -29,7 +34,7 @@
</a>
</div>
</div>
<!--
<!--
<a target="_blank" href="{{kit.url}}" ng-repeat="kit in kits" class="thumbnail thumbnail-horizonal">
<div class="icon">
<span class="fa fa-sitemap"></span>

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

@ -5,112 +5,6 @@ module.exports = function (req, res) {
wlc.lang(req.localeInfo.lang);
return res.render('literacy.html', {
page: 'literacy',
wlc: wlc,
wlcPoints: {
"weblit-Navigation": [
"StandardExploringNavPoint1",
"StandardExploringNavPoint2",
"StandardExploringNavPoint3",
"StandardExploringNavPoint4",
"StandardExploringNavPoint5"
],
"weblit-WebMechanics": [
"StandardExploringWMPoint1",
"StandardExploringWMPoint2",
"StandardExploringWMPoint3"
],
"weblit-Search": [
"StandardExploringSearchPoint1",
"StandardExploringSearchPoint2",
"StandardExploringSearchPoint3",
"StandardExploringSearchPoint4",
"StandardExploringSecurityPoint1",
"StandardExploringSecurityPoint2",
"StandardExploringSecurityPoint3"
],
"weblit-Credibility": [
"StandardExploringCredibilityPoint1",
"StandardExploringCredibilityPoint2",
"StandardExploringCredibilityPoint3",
"StandardExploringCredibilityPoint4"
],
"weblit-Security": [
"StandardExploringSecurityPoint1",
"StandardExploringSecurityPoint2",
"StandardExploringSecurityPoint3"
],
"weblit-Composing": [
"StandardBuildingComposingPoint1",
"StandardBuildingComposingPoint2",
"StandardBuildingComposingPoint3",
"StandardBuildingComposingPoint4",
"StandardBuildingComposingPoint5"
],
"weblit-Remix": [
"StandardBuildingRemixingPoint1",
"StandardBuildingRemixingPoint2",
"StandardBuildingRemixingPoint3"
],
"weblit-DesignAccessibility": [
"StandardBuildingDesignPoint1",
"StandardBuildingDesignPoint2",
"StandardBuildingDesignPoint3",
"StandardBuildingDesignPoint4",
"StandardBuildingDesignPoint5",
"StandardBuildingDesignPoint6"
],
"weblit-CodingScripting": [
"StandardBuildingCodingPoint1",
"StandardBuildingCodingPoint2",
"StandardBuildingCodingPoint3",
"StandardBuildingCodingPoint4",
"StandardBuildingCodingPoint5",
],
"weblit-Infrastructure": [
"StandardBuildingInfraPoint1",
"StandardBuildingInfraPoint2",
"StandardBuildingInfraPoint3",
"StandardBuildingInfraPoint4",
"StandardBuildingInfraPoint5"
],
"weblit-Sharing": [
"StandardConnectingSharingPoint1",
"StandardConnectingSharingPoint2",
"StandardConnectingSharingPoint3",
"StandardConnectingSharingPoint4",
"StandardConnectingSharingPoint5",
"StandardConnectingSharingPoint6"
],
"weblit-Collaborating": [
"StandardConnectingCommunityPoint1",
"StandardConnectingCommunityPoint2",
"StandardConnectingCommunityPoint3",
"StandardConnectingCommunityPoint4",
"StandardConnectingCommunityPoint5",
"StandardConnectingCommunityPoint6"
],
"weblit-Community": [
"StandardConnectingCommunityPoint1",
"StandardConnectingCommunityPoint2",
"StandardConnectingCommunityPoint3",
"StandardConnectingCommunityPoint4",
"StandardConnectingCommunityPoint5",
"StandardConnectingCommunityPoint6"
],
"weblit-Privacy": [
"StandardConnectingPrivacyPoint1",
"StandardConnectingPrivacyPoint2",
"StandardConnectingPrivacyPoint3",
"StandardConnectingPrivacyPoint4",
"StandardConnectingPrivacyPoint5"
],
"weblit-OpenPractices": [
"StandardConnectingOpenPoint1",
"StandardConnectingOpenPoint2",
"StandardConnectingOpenPoint3",
"StandardConnectingOpenPoint4"
]
}
wlc: wlc
});
};