Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

design renewal - Event

  • Loading branch information...
commit 5e62b6379368337109446256653beced8e51df72 1 parent 9d27c77
User authored
View
1  plugins/Pixis-Plugin-Event/root/event.tt
@@ -4,6 +4,7 @@ CALL site_config.navigation.push(
{
text => loc("Event"),
url => '/event'
+ id => "events"
}
);
View
8 plugins/Pixis-Plugin-Event/root/event/create.tt
@@ -1,7 +1,11 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
<h1>[% loc("Event Details") %]</h1>
+</div><!-- title -->
-<div class="greenbox">
+<div id="content">
+<div class="section form_full">
[% form %]
-</div>
+</div><!-- section -->
+</div><!-- content -->
[% END # WRAPPER %]
View
22 plugins/Pixis-Plugin-Event/root/event/edit.tt
@@ -1,18 +1,34 @@
[% WRAPPER wrapper.tt %]
-<h1><a href="[% c.uri_for('/event', event.id) %]">[% event.title | html %]</a> - 編集</h1>
+<div id="title">
+<p>イベント編集</p>
+</div><!-- title -->
+<div id="content">
+<div class="section">
+<h1 id="h1_event">[% event.title | html %]</h1>
+</div><!-- section -->
+
+<div class="form_full section">
<h2>基本情報</h2>
-<div class="formbox">
[% form %]
-</div>
+</div><!-- section -->
+<div class="form_full section">
<h2>参加費設定</h2>
[% f_ticket %]
+</div><!-- section -->
[%# XXX 未実装 %]
+<div class="form_full section">
<h2>日程毎の調整</h2>
[% FOREACH f_date IN dates %]
<h3>[% f_date.0 %]</h3>
[% f_date.1 %]
[% END %]
+</div><!-- section -->
+
+<div class="section">
+<p><a href="[% c.uri_for('/event', event.id) %]">&lt;&lt;&nbsp;イベントへ戻る</a></p>
+</div><!-- section -->
+</div><!-- content -->
[% END # WRAPPER %]
View
10 plugins/Pixis-Plugin-Event/root/event/index.tt
@@ -1,7 +1,10 @@
[% WRAPPER wrapper.tt %]
-
+<div id="title">
<h1>[% loc("Event") %]</h1>
+</div><!-- title -->
+<div id="content">
+<div class="section">
[% IF (c.check_user_roles('admin')) %]
<ul>
<li><a href="/event/create">[% loc('Organize an event') %]</a></li>
@@ -15,6 +18,9 @@
<li><a href="[% c.uri_for("/event", event.id) %]">[% event.title | html %]</a></li>
[% END %]
</ul>
+[% ELSE %]
+<p>まだイベントが登録されていません。</p>
[% END %]
-
+</div><!-- section -->
+</div><!-- content -->
[% END # WRAPPER %]
View
18 plugins/Pixis-Plugin-Event/root/event/register.tt
@@ -1,17 +1,24 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
+<p>イベント参加申し込み</p>
+</div>
-<h1>[% event.title %] - 参加申し込み</h1>
+<div id="content">
+<div class="section">
+<h1 id="h1_event">[% event.title %]</h1>
+</div><!-- section -->
+<div class="section">
[% IF (! c.registry('api', 'Event').is_registration_open({ event_id => event.id })) %]
-<div>このイベントへの参加は締め切られました。また次回のお越しをお待ちしております</div>
+<p>このイベントへの参加は締め切られました。また次回のお越しをお待ちしております。</p>
[% ELSE %]
<h2> 参加 </h2>
[% IF (c.registry('api', 'event').is_registered({ event_id => event.id, member_id => c.user.id })) %]
-すでに登録されています
+<p>すでに登録されています。</p>
[% ELSE %]
-
+<div class="table_container">
<table>
<tr>
<th>イベント名</th>
@@ -26,7 +33,10 @@
</tr>
[% END # FOREACH %]
</table>
+</div><!-- table_container -->
[% END %]
[% END # IF open %]
+</div><!-- section -->
+</div><!-- content -->
[% END # WRAPPER %]
View
17 plugins/Pixis-Plugin-Event/root/event/register_confirm.tt
@@ -1,14 +1,17 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
+<p>イベント参加確認</p>
+</div>
-<h1>[% event.title %] - 参加確認</h1>
-
+<div id="content">
+<div class="section">
+<h1 id="h1_event">[% event.title %]</h1>
[% IF (ticket.price == 0) %]
-<p>参加費は無料ですので、下記ボタンをクリックするとイベントに参加確定となります</p>
+<p>参加費は無料ですので、下記ボタンをクリックするとイベントに参加確定となります</p>
[% ELSE %]
-<p>参加費用[% ticket.price %]円が必要となります。下記ボタンをクリックした後
-、Paypalか銀行振り込みでの入金が確認された後参加確定となります。</p>
+<p>参加費用[% ticket.price %]円が必要となります。下記ボタンをクリックした後、Paypalか銀行振り込みでの入金が確認された後参加確定となります。</p>
[% END %]
-
[% form %]
-
+</div><!-- section -->
+</div><!-- content -->
[% END %]
View
18 plugins/Pixis-Plugin-Event/root/event/registered.tt
@@ -1,18 +1,21 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
+<p>イベント参加申し込み</p>
+</div>
-<h2>[% event.title %] - 参加申し込み</h2>
-
-<div style="border: 3px solid #f30; text-align: center; font-size: 1.5em; padding: 1em">
-あなたのオーダー番号は<strong>[% order.id %]</strong>です
+<div id="content">
+<div class="section">
+<div id="registered">
+<p>あなたのオーダー番号は<strong>[% order.id %]</strong>です。</p>
</div>
+</div><!-- section -->
+<div class="section">
[% IF order.amount > 0 %]
<p>参加申し込みが登録されました。申し込みを完了するためには参加費用をお支払いしていただく必要があります。</p>
-
<p>年会費のお支払い方法は以下からお選びください:</p>
<ul>
<li><a href="[% c.uri_for('/event', 'payment', 'paypal', { order => order.id }) %]">Paypalでのお支払い</a></li>
-
[%# XXX This is JPA specific! This needs to be configurable %]
<li><a href="[% c.uri_for('/jpa', 'payment', 'bank', { order => order.id }) %]">銀行振り込みでのお支払い</a> (確認に少々時間がかかります)</li>
</li>
@@ -20,5 +23,6 @@
[% ELSE %]
<p>本イベントは参加費無料ですので、参加申し込み手続きは以上で完了いたしました。</p>
[% END %]
-
+</div><!-- section -->
+</div><!-- content -->
[% END %]
View
12 plugins/Pixis-Plugin-Event/root/event/session/add.tt
@@ -1,13 +1,21 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
+<h1>[% loc("Add new session") %]</h1>
+</div><!-- title -->
-<h2>[% loc("Add new session") %]</h2>
-<div>[% event.title %] - [% loc("Track [_1]", track.title) %]</div>
+<div id="content">
+<div class="section clearfix">
+<h2>[% event.title %] - [% loc("Track [_1]", track.title) %]</h2>
+<div id="session_timeline">
[% PROCESS event/track_timeline.tt, editable => 1 %]
+</div><!-- session_timeline -->
<div id="sessionbox">
<div>[% loc("Click on the timeline to select the time/date") %]</div>
[% form %]
</div><!-- sessionbox -->
+</div><!-- section -->
+</div><!-- content -->
[% END # WRAPPER %]
View
19 plugins/Pixis-Plugin-Event/root/event/session/view.tt
@@ -1,7 +1,13 @@
[% WRAPPER wrapper.tt %]
-<h1>[% event.title %]</h1>
-<h2>[% session.title %]</h2>
+<div id="title">
+<h1>セッション情報</h1>
+</div><!-- title -->
+<div id="content">
+<div class="section">
+<h1 id="h1_event">[% event.title %]</h1>
+<h2>[% session.title %]</h2>
+<div class="table_container">
<table>
<tr>
<th>時間</th><td>[% session.start_on.strftime('%H:%M') %] - [% session.end_on.strftime('%H:%M') %]</th>
@@ -9,7 +15,12 @@
<tr>
<th>講師</th><td>[% session.presenter %] 氏</td>
</tr>
+<tr>
+<th>内容</th><td>[% session.description.replace("\n", "<br />") %]</td>
+</tr>
</table>
-<p>[% session.description.replace("\n", "<br />") %]</p>
-<p><a href="[% c.uri_for( "/event", event.id ) %]">&lt;&lt;&nbsp;イベントに戻る</a></p>
+</div><!-- table_container -->
+<p class="clear"><a href="[% c.uri_for( "/event", event.id ) %]">&lt;&lt;&nbsp;イベントに戻る</a></p>
+</div><!-- section -->
+</div><!-- content -->
[% END %]
View
7 plugins/Pixis-Plugin-Event/root/event/track/add.tt
@@ -1,3 +1,10 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
+<h1>Track作成</h1>
+</div><!-- title -->
+<div id="content">
+<div class="form_full section">
[% form %]
+</div><!-- section -->
+</div><!-- content -->
[% END # WRAPPER %]
View
18 plugins/Pixis-Plugin-Event/root/event/track/view.tt
@@ -1,13 +1,23 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
+<p>Track情報</p>
+</div>
-<h1><a href="[% c.uri_for('/event', event.id) %]">[% event.title %]</a> - [% track.title %]</h1>
+<div id="content">
+<div class="section">
+<h1>[% event.title %] - [% track.title %]</h1>
+</div><!-- section -->
+<div class="section">
<div>
[% PROCESS event/track_timeline.tt %]
</div>
+</div><!-- section -->
-<div>
-<a href="[% c.uri_for( '/event', event.id, 'track', track.id, 'session', 'add' ) %]">[% loc("Add session") %]</a>
-</div>
+<div class="section">
+<p><a href="[% c.uri_for( '/event', event.id, 'track', track.id, 'session', 'add' ) %]">[% loc("Add session") %]</a></p>
+<p><a href="[% c.uri_for('/event', event.id) %]">&lt;&lt;&nbsp;イベントへ戻る</a></p>
+</div><!-- section -->
+</div><!-- content -->
[% END # WRAPPER %]
View
18 plugins/Pixis-Plugin-Event/root/event/view.tt
@@ -4,13 +4,20 @@
SET start_on = event.start_on;
SET end_on = event.end_on;
%]
+<div id="title">
+<p>イベント情報</p>
+</div>
-<h1>[% event.title %]
+<div id="content">
+<div class="section">
+<h1 id="h1_event">[% event.title %]
<span>[% IF can_edit %][<a href="[% c.uri_for( event.id, 'edit') %]">[% loc("Edit") %]</a>]</span>[% END %]
</h1>
+</div><!-- section -->
-[%# Safariだと異様にでかいぞw %]
+<div class="section clearfix">
<h2>[% loc("Basic Event Information") %]</h2>
+<div class="table_container">
<table>
<tr>
<th>[% loc("Event Description") %]</th>
@@ -59,8 +66,10 @@ ELSE %][% start_on_str %] - [% end_on_str %][% END %]
</td>
</tr>
</table>
+</div><!-- table_container -->
+</div><!-- section -->
-<div id="sessions">
+<div id="sessions" class="section">
<h2>[% loc("Event Sessions") %]</h2>
[%
SET cur = event.start_on;
@@ -87,7 +96,7 @@ ELSE %][% start_on_str %] - [% end_on_str %][% END %]
</div><!-- sessions -->
[% IF (can_edit || tracks.size > 1) %]
-<div id="tracks">
+<div id="tracks" class="section">
<h2>[% loc("Event Tracks") %]</h2>
[% IF (can_edit) %]
<div>[<a href="[% c.uri_for( "/event", event.id, "track", "add" ) %]">[% loc("Add track") %]</a>]</div>
@@ -102,4 +111,5 @@ ELSE %][% start_on_str %] - [% end_on_str %][% END %]
</ul>
</div><!-- tracks -->
[% END %]
+</div><!-- content -->
[% END # WRAPPER %]
Please sign in to comment.
Something went wrong with that request. Please try again.