mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-07-16 17:02:18 +00:00
Merge pull request #4322 from HabitRPG/old-news
feat(news): move old news to /static/old-news
This commit is contained in:
commit
fc3272ddc8
6 changed files with 1346 additions and 1337 deletions
|
|
@ -170,6 +170,6 @@ habitrpg.controller('NotificationCtrl',
|
|||
|
||||
// Show new-stuff modal on load
|
||||
if (User.user.flags.newStuff)
|
||||
$rootScope.openModal('newStuff');
|
||||
$rootScope.openModal('newStuff', {size:'lg'});
|
||||
}
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -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', 'community-guidelines'];
|
||||
var pages = ['front', 'privacy', 'terms', 'api', 'features', 'videos', 'contact', 'plans', 'new-stuff', 'community-guidelines', 'old-news'];
|
||||
|
||||
_.each(pages, function(name){
|
||||
router.get('/static/' + name, i18n.getUserLanguage, middleware.locals, function(req, res) {
|
||||
|
|
|
|||
|
|
@ -254,4 +254,4 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
|
|||
span {{Shared.silver(user.stats.gp)}}
|
||||
ul.toolbar-bailey(ng-class='{inactive: !_expandedMenu}')
|
||||
li.toolbar-bailey-container(ng-if='user.flags.newStuff')
|
||||
.npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")')
|
||||
.npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff",{size:"lg"})')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
script(type='text/ng-template', id='modals/newStuff.html')
|
||||
.modal-header
|
||||
h4=env.t('newStuff')
|
||||
| #{env.t('newStuff')} by
|
||||
a(target='_blank', href='https://twitter.com/Mihakuu') Bailey
|
||||
.modal-body.new-stuff-modal.modal-fixed-height
|
||||
.npc_bailey
|
||||
br
|
||||
br
|
||||
include ../new-stuff
|
||||
.modal-footer
|
||||
button.btn.btn-default(ng-click='$close()')=env.t('cool')
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
12
views/static/old-news.jade
Normal file
12
views/static/old-news.jade
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
extends ./layout
|
||||
|
||||
block vars
|
||||
- var layoutEnv = env
|
||||
- var menuItem = 'oldNews'
|
||||
|
||||
block title
|
||||
title Old News
|
||||
|
||||
block content
|
||||
include ../shared/new-stuff
|
||||
+oldNews()
|
||||
Loading…
Reference in a new issue