Skip to content

Commit 1c616cf

Browse files
committed
Merge pull request #5 from osh-web/eiel
スタッフ紹介を追加
2 parents 6d14c8c + eadb68c commit 1c616cf

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

js/project.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ angular.module('project', []).
44
when('/', {controller: IndexCtrl, templateUrl: 'views/top.html'}).
55
when('/summary', {controller: IndexCtrl, templateUrl: 'views/summary.html'}).
66
when('/entry', {controller: IndexCtrl, templateUrl: 'views/entry.html'}).
7-
when('/inquiry', {controller: IndexCtrl, templateUrl: 'views/inquiry.html'});
7+
when('/inquiry', {controller: IndexCtrl, templateUrl: 'views/inquiry.html'}).
8+
when('/member', {controller: IndexCtrl, templateUrl: 'views/member.html'});
89
}).
910
directive('navigation', function() {
1011
return {

views/member.html

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<div class="hero-unit">
2+
<h1>実行委員紹介</h1>
3+
<p>
4+
OSH 2013のスタッフを紹介します
5+
</p>
6+
</div>
7+
8+
<div>
9+
<ul>
10+
<li>曽根 壮大 (実行委員長) - <a href="https://twitter.com/soudai1025">@soudai1025</a></li>
11+
<li>松原 和也 - <a href="https://twitter.com/Toro_kun">@Toro_kun</a></li>
12+
<li>逸見 誠 - <a href="https://twitter.com/mako_wis">@majo_wis</a></li>
13+
<li>火村 智彦 - <a href="https://twitter.com/eielh">@eielh</a></li>
14+
</ul>
15+
</div>

views/navigation.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<navlink title="概要" href="#/summary"></navlink>
1414
<navlink title="お申し込み" href="#/entry"></navlink>
1515
<navlink title="Q&A" href="#/inquiry"></navlink>
16+
<navlink title="実行委員紹介" href="#/member"></navlink>
1617
</ul>
1718
</div><!--/.nav-collapse -->
1819
</div>

0 commit comments

Comments
 (0)