зеркало из https://github.com/mozilla/CSOL-site.git
changed organisation to organization. fixes #345
This commit is contained in:
Родитель
af501f44c1
Коммит
df4d0e3a03
|
@ -70,7 +70,7 @@ module.exports = function (app) {
|
|||
});
|
||||
|
||||
app.get('/mybadges', [
|
||||
loggedIn,
|
||||
loggedIn,
|
||||
openbadger.middleware('getUserBadges')
|
||||
], function (req, res, next) {
|
||||
var data = req.remote;
|
||||
|
@ -101,8 +101,8 @@ module.exports = function (app) {
|
|||
|
||||
var org = {
|
||||
thumbnail: '/media/images/org.png',
|
||||
description: 'Organisation blah irure...',
|
||||
url: '/orgs/some-organisation'
|
||||
description: 'Organization blah irure...',
|
||||
url: '/orgs/some-organization'
|
||||
};
|
||||
|
||||
var program = {
|
||||
|
|
|
@ -44,8 +44,8 @@ module.exports = function(app) {
|
|||
|
||||
var itemOptions = [{
|
||||
thumbnail: '/media/images/org.png',
|
||||
description: 'Organisation blah irure...',
|
||||
url: '/learn/orgs/some-organisation'
|
||||
description: 'Organization blah irure...',
|
||||
url: '/learn/orgs/some-organization'
|
||||
},{
|
||||
thumbnail: '/media/images/program.png',
|
||||
description: 'Program blah sed eiusmod...',
|
||||
|
|
|
@ -41,7 +41,7 @@ module.exports = function (app) {
|
|||
case 'org':
|
||||
filters.push({
|
||||
name: 'org',
|
||||
label: 'Organisation',
|
||||
label: 'Organization',
|
||||
options: {
|
||||
'org1': 'Org 1',
|
||||
'org2': 'Org 2',
|
||||
|
@ -414,8 +414,8 @@ module.exports = function (app) {
|
|||
for (var i = 0; i < 12; ++i) {
|
||||
orgs.push({
|
||||
thumbnail: '/media/images/org.png',
|
||||
description: 'Organisation blah irure...',
|
||||
url: '/orgs/some-organisation'
|
||||
description: 'Organization blah irure...',
|
||||
url: '/orgs/some-organization'
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% extends 'filter.html' %}
|
||||
{% set pageTitle = 'Organisations' %}
|
||||
{% set pageTitle = 'Organizations' %}
|
||||
{% set navItem = 'orgs' %}
|
||||
|
||||
{% block item_actions %}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% extends 'orgs/layout.html' %}
|
||||
{% set pageTitle = 'Some Organisation' %}
|
||||
{% set pageTitle = 'Some Organization' %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
|
@ -10,7 +10,7 @@
|
|||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
|
||||
|
||||
<p class="text-right">
|
||||
<a href="/orgs/some-organisation/favorite" class="btn show-tooltip" title="Add to your favorites"><i class="icon-heart"></i> Add to your favorites</a>
|
||||
<a href="/orgs/some-organization/favorite" class="btn show-tooltip" title="Add to your favorites"><i class="icon-heart"></i> Add to your favorites</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<img src="{{program.imageUrl}}">
|
||||
</div>
|
||||
<div class="span8">
|
||||
<p><strong>From <a href="/orgs/some-organisation">Some Organisation</a>.</strong></p>
|
||||
<p><strong>From <a href="/orgs/some-organization">Some Organization</a>.</strong></p>
|
||||
{% if program.description %}
|
||||
<p>{{program.description}}</p>
|
||||
{% endif %}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
<li{% if not view %} class="active"{% endif %}><a href="/favorites">All</a></li>
|
||||
<li{% if view == 'badges' %} class="active"{% endif %}><a href="/favorites/badges">Badges</a></li>
|
||||
<li{% if view == 'programs' %} class="active"{% endif %}><a href="/favorites/programs">Programs</a></li>
|
||||
<li{% if view == 'orgs' %} class="active"{% endif %}><a href="/favorites/orgs">Organisations</a></li>
|
||||
<li{% if view == 'orgs' %} class="active"{% endif %}><a href="/favorites/orgs">Organizations</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Загрузка…
Ссылка в новой задаче