move Community Guidelines from an included html page in a modal to a static page with no modal

This commit is contained in:
Alice Harris
2014-08-16 10:24:41 +10:00
parent e8aab2daf1
commit 654ad71b17
20 changed files with 20 additions and 23 deletions

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -20,7 +20,7 @@ router.get('/', i18n.getUserLanguage, middleware.locals, function(req, res) {
// -------- Marketing --------
var pages = ['front', 'privacy', 'terms', 'api', 'features', 'videos', 'contact', 'plans', 'new-stuff'];
var pages = ['front', 'privacy', 'terms', 'api', 'features', 'videos', 'contact', 'plans', 'new-stuff', 'community-guidelines'];
_.each(pages, function(name){
router.get('/static/' + name, i18n.getUserLanguage, middleware.locals, function(req, res) {
@@ -34,4 +34,4 @@ router.get('/static/extensions', function(req, res) {
res.redirect('http://habitrpg.wikia.com/wiki/App_and_Extension_Integrations');
});
module.exports = router;
module.exports = router;
+2 -2
View File
@@ -31,7 +31,7 @@
table.table.table-striped
tr
td
a(ng-click='openModal("communityGuidelines")')=env.t('communityGuidelines')
a(target='_blank', href='/static/community-guidelines')=env.t('communityGuidelines')
tr
td
a(target='_blank', href='http://habitrpg.wikia.com/wiki/Board:The_Archery_-_LFG')=env.t('lfgPosts')
@@ -156,7 +156,7 @@
p
=env.t('communityGuidelinesRead1')
|  
a(ng-click='openModal("communityGuidelines")')=env.t('communityGuidelines')
a(target='_blank', href='/static/community-guidelines')=env.t('communityGuidelines')
|  
=env.t('communityGuidelinesRead2')
+1 -1
View File
@@ -37,7 +37,7 @@ footer.footer(ng-controller='FooterCtrl')
h4=env.t('footerCommunity')
ul.list-unstyled
li
a(ng-click='openModal("communityGuidelines")')=env.t('communityGuidelines')
a(target='_blank', href='/static/community-guidelines')=env.t('communityGuidelines')
li
a(target='_blank', href='https://github.com/HabitRPG/habitrpg/issues/2760')=env.t('communityBug')
li
+15
View File
@@ -0,0 +1,15 @@
extends ./layout
block vars
- var layoutEnv = env
block title
title HabitRPG | =env.t('communityGuidelines')
block content
.row
.col-md-12
.page-header
h1=env.t('communityGuidelines')
p.pagemeta
| Last updated August 20, 2014