rewrite: use vanilla bootstrap tabs for now, keep an eye on https://github.com/angular-ui/bootstrap/issues/783

This commit is contained in:
Tyler Renelle 2013-08-31 14:52:13 -04:00
parent 79d3e82248
commit 10ff61be91
3 changed files with 29 additions and 11 deletions

View file

@ -18,7 +18,7 @@
"angular": "1.2.0-rc.1",
"angular-resource": "1.2.0-rc.1",
"angular-ui": "~0.4.0",
"angular-bootstrap": "0.4.0",
"angular-bootstrap": "~0.5.0",
"habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#rewrite",
"lodash": "~1.3.1",
"moment": "~2.1.0",

View file

@ -29,6 +29,8 @@ html
script(type='text/javascript', src='/bower_components/angular-route/angular-route.js')
script(type='text/javascript', src='/bower_components/angular-resource/angular-resource.js')
script(type='text/javascript', src='/bower_components/angular-ui/build/angular-ui.js')
// we'll remove this once angular-bootstrap is fixed
script(type='text/javascript', src='/bower_components/bootstrap/docs/assets/js/bootstrap.min.js')
script(type='text/javascript', src='/bower_components/angular-bootstrap/ui-bootstrap.js')
script(type='text/javascript', src='/bower_components/angular-bootstrap/ui-bootstrap-tpls.js')

View file

@ -1,7 +1,17 @@
div(ng-controller='GroupsCtrl')
h4.alert.alert-warning Coming Soon! (Presently Incomplete & Read-Only)
tabset
tab(heading='Party')
// FIXME note, due to https://github.com/angular-ui/bootstrap/issues/783 we can't use nested angular-bootstrap tabs
// Subscribe to that ticket & change this when they fix
ul.nav.nav-tabs
li.active
a(data-target='#groups-party', data-toggle='tab') Party
li
a(data-target='#groups-guilds', data-toggle='tab') Guilds
.tab-content
#groups-party.tab-pane.active Party
div(ng-show='groups.party.id', ng-controller='PartyCtrl')
app:groups:group(group='{groups[_party.id]}')
div(ng-hide='groups.party.id')
@ -20,9 +30,16 @@ div(ng-controller='GroupsCtrl')
{{user.id}}
include ./create-group
tab(heading='Guilds')
tabset
tab(heading='Public Guilds')
#groups-guilds.tab-pane Guilds
ul.nav.nav-tabs
li.active
a(data-target='#groups-public-guilds', data-toggle='tab') Public Guilds
li(ng-repeat='group in groups.guilds')
a(data-target='#groups-guild-{{group._id}}', data-toggle='tab') {{group.name}}
li
a(data-target='#groups-create-guild', data-toggle='tab') Create Guild
.tab-content
.tab-pane.active#groups-public-guilds
div(ng-repeat='invitation in user.invitations.guilds')
h3 You're Invited To {{invitation.name}}
a.btn.btn-success(data-type='guild', x-bind='click:acceptInvitation') Accept
@ -43,10 +60,9 @@ div(ng-controller='GroupsCtrl')
| Join
h4 {{group.name}}
p {{group.description}}
tab(ng-repeat='group in groups.guilds', heading='{{group.name}}')
.tab-pane(id='groups-guild-{{group._id}}', ng-repeat='group in groups.guilds')
include ./group
tab(heading='Create Guild')
div(ng-controller='GuildCtrl')
.tab-pane#groups-create-guild
div(ng-controller='GuildsCtrl')
include ./group