Permalink
Browse files

Merge branch 'master' of git@github.com:lestrrat/pixis

Conflicts:

	plugins/Pixis-Plugin-JPA/root/jpa/index.tt
  • Loading branch information...
lestrrat committed Apr 20, 2009
2 parents eac0fd5 + 5e62b63 commit 41977171d1a1efe332802e3770ddc147fae17138
Showing with 1,097 additions and 335 deletions.
  1. +7 −4 core/root/auth/login.tt
  2. +3 −1 core/root/footer.tt
  3. +9 −4 core/root/forms/block
  4. +7 −8 core/root/forms/checkboxgroup_tag
  5. +1 −0 core/root/forms/end_form
  6. +14 −9 core/root/forms/field
  7. +1 −1 core/root/forms/form
  8. +1 −1 core/root/forms/input_tag
  9. +4 −0 core/root/forms/label
  10. +7 −8 core/root/forms/radiogroup_tag
  11. +1 −1 core/root/forms/select_tag
  12. +6 −2 core/root/forms/start_block
  13. +14 −7 core/root/forms/start_form
  14. +1 −1 core/root/forms/textarea_tag
  15. +7 −5 core/root/header.tt
  16. +12 −10 core/root/left.tt
  17. +14 −4 core/root/member/search.tt
  18. +10 −7 core/root/member/settings.tt
  19. +30 −17 core/root/member/view.tt
  20. +3 −6 core/root/navigation.tt
  21. +7 −4 core/root/signup/activate.tt
  22. +10 −6 core/root/signup/commit.tt
  23. +6 −3 core/root/signup/experience.tt
  24. +6 −2 core/root/signup/start.tt
  25. +92 −0 core/root/static/css/forms.css
  26. +4 −0 core/root/static/css/iepngfix.css
  27. +7 −0 core/root/static/css/import.css
  28. +22 −0 core/root/static/css/reset.css
  29. +436 −0 core/root/static/css/style.css
  30. BIN core/root/static/img/body_bg.jpg
  31. BIN core/root/static/img/copyright_bg.jpg
  32. BIN core/root/static/img/dotline.gif
  33. BIN core/root/static/img/footer_bg.jpg
  34. BIN core/root/static/img/h2_bg.gif
  35. BIN core/root/static/img/header_bg.jpg
  36. BIN core/root/static/img/hnav_bg.jpg
  37. BIN core/root/static/img/hnav_btn_bg.jpg
  38. BIN core/root/static/img/listmark_head.gif
  39. BIN core/root/static/img/listmark_link.gif
  40. BIN core/root/static/img/listmark_subnav.gif
  41. BIN core/root/static/img/lnav_bg.jpg
  42. BIN core/root/static/img/logo.jpg
  43. BIN core/root/static/img/main_bg.jpg
  44. BIN core/root/static/img/side_bg.jpg
  45. BIN core/root/static/img/side_line.jpg
  46. BIN core/root/static/img/title_bg.jpg
  47. +12 −14 core/root/wrapper.tt
  48. +1 −0 plugins/Pixis-Plugin-Event/root/event.tt
  49. +6 −2 plugins/Pixis-Plugin-Event/root/event/create.tt
  50. +19 −3 plugins/Pixis-Plugin-Event/root/event/edit.tt
  51. +8 −2 plugins/Pixis-Plugin-Event/root/event/index.tt
  52. +14 −4 plugins/Pixis-Plugin-Event/root/event/register.tt
  53. +10 −7 plugins/Pixis-Plugin-Event/root/event/register_confirm.tt
  54. +11 −7 plugins/Pixis-Plugin-Event/root/event/registered.tt
  55. +10 −2 plugins/Pixis-Plugin-Event/root/event/session/add.tt
  56. +15 −4 plugins/Pixis-Plugin-Event/root/event/session/view.tt
  57. +7 −0 plugins/Pixis-Plugin-Event/root/event/track/add.tt
  58. +14 −4 plugins/Pixis-Plugin-Event/root/event/track/view.tt
  59. +14 −4 plugins/Pixis-Plugin-Event/root/event/view.tt
  60. +4 −1 plugins/Pixis-Plugin-JPA/root/jpa.tt
  61. +55 −63 plugins/Pixis-Plugin-JPA/root/jpa/board.tt
  62. +27 −13 plugins/Pixis-Plugin-JPA/root/jpa/index.tt
  63. +7 −4 plugins/Pixis-Plugin-JPA/root/jpa/payment/bank.tt
  64. +14 −5 plugins/Pixis-Plugin-JPA/root/jpa/poweredby.tt
  65. +12 −3 plugins/Pixis-Plugin-JPA/root/jpa/service/index.tt
  66. +28 −54 plugins/Pixis-Plugin-JPA/root/jpa/service/training.tt
  67. +6 −2 plugins/Pixis-Plugin-JPA/root/jpa/signup/basic.tt
  68. +14 −5 plugins/Pixis-Plugin-JPA/root/jpa/signup/commit_basic.tt
  69. +10 −6 plugins/Pixis-Plugin-JPA/root/jpa/signup/confirm_basic.tt
  70. +7 −4 plugins/Pixis-Plugin-JPA/root/jpa/signup/contd.tt
  71. +21 −7 plugins/Pixis-Plugin-JPA/root/jpa/signup/index.tt
  72. +9 −4 plugins/Pixis-Plugin-JPA/root/jpa/sponsors.tt
View
@@ -1,9 +1,12 @@
[% WRAPPER wrapper.tt %]
-
+<div id="title">
<h1>[% loc("Login") %]</h1>
+</div><!-- title -->
- <div class="greenbox loginbox">
+<div id="content">
+<div id="login" class="form_full section">
[% form %]
- </div>
-<a href="[% c.uri_for('/signup') %]">[% loc("No Account? Sign up now!") %]</a>
+<p class="link"><a href="[% c.uri_for('/signup') %]">[% loc("No Account? Sign up now!") %]</a> </p>
+</div><!-- login -->
+</div><!-- content -->
[% END # WRAPPER %]
View
@@ -1,3 +1,5 @@
<!-- START footer -->
-<div id="footer">Pixis by <a href="http://www.endeworks.jp">Endeworks Inc.</a></div>
+<div id="footer">
+<address>Pixis by <a href="http://www.endeworks.jp">Endeworks Inc.</a></address>
+</div>
<!-- END footer -->
View
@@ -1,4 +1,9 @@
-[% INCLUDE start_block %]
-[% IF self.content.defined %][% self.content %]
-[% ELSE %][% FOREACH element = self.elements %][% INCLUDE $element.filename self = element %]
-[% END %][% END %][% INCLUDE end_block %]
+[%# INCLUDE start_block %]
+ [% IF self.content.defined %]
+ <tr class="message"><th></th><td>[% self.content %]</td></tr>
+ [% ELSE %]
+ [% FOREACH element = self.elements %]
+ [% INCLUDE $element.filename self = element %]
+ [% END %]
+ [% END %]
+[%# INCLUDE end_block %]
@@ -1,12 +1,11 @@
-<span[% process_attrs(self.attributes) %]>
-[% FOREACH option = self.options %][% IF option.group %]<span[% process_attrs(option.attributes) %]>
-[% FOREACH item = option.group %]<span>
+[% FOREACH option = self.options %]
+[% IF option.group %]
+[% FOREACH item = option.group %]
<input name="[% self.nested_name %]" type="[% self.input_type %]" value="[% item.value %]"[% process_attrs(item.attributes) %] />
<label[% process_attrs(item.label_attributes) %]>[% item.label %]</label>
-</span>
-[% END %]</span>
-[% ELSE %]<span>
+[% END %]
+[% ELSE %]
<input name="[% self.nested_name %]" type="[% self.input_type %]" value="[% option.value %]"[% process_attrs(option.attributes) %] />
<label[% process_attrs(option.label_attributes) %]>[% option.label %]</label>
-</span>
-[% END %][% END %]</span>
+[% END %]
+[% END %]
View
@@ -1 +1,2 @@
+</table>
</form>
View
@@ -1,19 +1,22 @@
-[% IF self.label.defined && self.label_tag == 'legend' %]
+<tr>
+<th>
+[% IF self.label.defined && self.label_tag == 'legend' -%]
[% INCLUDE $self.label_filename %]
-[% END %]
-[% IF self.label.defined && self.label_tag != 'legend' %]
+[%- END %]
+[% IF self.label.defined && self.label_tag != 'legend' -%]
[% INCLUDE $self.label_filename %]
-[% END %]
+[%- END %]
+</th>
+<td>
[% IF self.container_tag.defined %]
-<[% self.container_tag %]
-[% process_attrs(self.container_attributes) %]>
-[% END %]
-[% IF self.container_tag.defined %][% END %]
+<[% self.container_tag %] [% process_attrs(self.container_attributes) %]>
+[%- END %]
[% content %]
[% IF self.comment.defined %]
<span[% process_attrs(self.comment_attributes) %]>
[% self.comment %]
-</span>[% END %]
+</span>
+[% END %]
[% IF self.errors %]
[% FOREACH error = self.errors %]
<p class="error_message [% error.class %]">[% error.message %]</p>
@@ -27,3 +30,5 @@
[% self.javascript %]
</script>
[% END %]
+</td>
+</tr>
View
@@ -1,5 +1,5 @@
[% INCLUDE start_form %]
-[% SET elements = [ self.elements.0 ] %]
+ [% SET elements = [ self.elements.0 ] %]
[% FOREACH element IN elements %]
[% INCLUDE $element.filename self=element %]
[% END %]
@@ -1 +1 @@
-&nbsp;<input[% IF self.nested_name.defined %] name="[% self.nested_name %]"[% END %] type="[% self.field_type %]"[% IF self.value.defined %] value="[% self.value %]"[% END %][% process_attrs(self.attributes) %] />
+<input[% IF self.nested_name.defined %] name="[% self.nested_name %]"[% END %] type="[% self.field_type %]"[% IF self.value.defined %] value="[% self.value %]"[% END %][% process_attrs(self.attributes) %] />
View
@@ -1,3 +1,7 @@
+[% IF (!(self.label_tag == 'legend')) %]
<div class="label">
<[% self.label_tag %][% process_attrs(self.label_attributes) %]>[% self.label %]</[% self.label_tag %]>
</div>
+[% ELSE %]
+<[% self.label_tag %][% process_attrs(self.label_attributes) %]>[% self.label %]</[% self.label_tag %]>
+[% END %]
@@ -1,12 +1,11 @@
-<span[% process_attrs(self.attributes) %]>
-[% FOREACH option = self.options %][% IF option.group %]<span[% process_attrs(option.attributes) %]>
-[% FOREACH item = option.group %]<span>
+[% FOREACH option = self.options %]
+[% IF option.group %]
+[% FOREACH item = option.group %]
<input name="[% self.nested_name %]" type="radio" value="[% item.value %]"[% process_attrs(item.attributes) %] />
<label[% process_attrs(item.label_attributes) %]>[% item.label %]</label>
-</span>
-[% END %]</span>
-[% ELSE %]<span>
+[% END %]
+[% ELSE %]
<input name="[% self.nested_name %]" type="radio" value="[% option.value %]"[% process_attrs(option.attributes) %] />
<label[% process_attrs(option.label_attributes) %]>[% option.label %]</label>
-</span>
-[% END %][% END %]</span>
+[% END %]
+[% END %]
@@ -1,4 +1,4 @@
-&nbsp;<select name="[% self.nested_name %]"[% process_attrs(self.attributes) %]>
+<select name="[% self.nested_name %]"[% process_attrs(self.attributes) %]>
[% FOREACH option = self.options %][% IF option.group %]<optgroup[% IF option.label.defined %] label="[% option.label %]"[% END %][% process_attrs(option.attributes) %]>
[% FOREACH item = option.group %]<option value="[% item.value %]"[% process_attrs(item.attributes) %]>[% item.label %]</option>
[% END %]</optgroup>
@@ -1,2 +1,6 @@
-[% IF self.tag.defined %]<[% self.tag %][% process_attrs(self.attributes) %]>[% END %][% IF self.legend.defined %]
-<legend>[% self.legend %]</legend>[% END %]
+[% IF self.tag.defined %]
+<[% self.tag %][% process_attrs(self.attributes) %]>
+[% END %]
+[% IF self.legend.defined %]
+<legend>[% self.legend %]</legend>
+[% END %]
View
@@ -1,7 +1,14 @@
-<form[% process_attrs(self.attributes) %]>[% IF self.form_error_message.defined %]
-<div class="form_error_message">[% self.form_error_message %]</div>[% END %][% IF self.javascript_src.defined %][% FOREACH src = self.javascript_src.list %]
-<script type="text/javascript" src="[% src %]">
-</script>[% END %][% END %][% IF self.javascript.defined %]
-<script type="text/javascript">
-[% self.javascript %]
-</script>[% END %]
+<form[% process_attrs(self.attributes) %]>
+[% IF self.form_error_message.defined -%]
+<p class="form_error_message">[% self.form_error_message %]</p>
+[%- END %]
+[% IF self.javascript_src.defined -%]
+[% FOREACH src = self.javascript_src.list -%]
+<script type="text/javascript" src="[% src %]"></script>
+[%- END %]
+[%- END %]
+[% IF self.javascript.defined -%]
+<script type="text/javascript">[% self.javascript %]</script>
+[%- END %]
+
+<table>
@@ -1 +1 @@
-&nbsp;<textarea name="[% self.nested_name %]"[% process_attrs(self.attributes) %]>[% self.value IF self.value.defined %]</textarea>
+<textarea name="[% self.nested_name %]"[% process_attrs(self.attributes) %]>[% self.value IF self.value.defined %]</textarea>
View
@@ -1,9 +1,11 @@
-<!-- START header -->
<div id="header">
+<ul class="clearfix">
[% IF c.user_exists %]
-<a href="/member/home">ホーム</a> | <a href="/member/settings">[% loc("Member Settings") %]</a> | <a href="/auth/logout">[% loc("Logout") %]</a>
+<li id="hnav_logout"><a href="/auth/logout">[% loc("Logout") %]</a></li>
+<li id="hnav_settings"><a href="/member/settings">[% loc("Member Settings") %]</a></li>
+<li id="hnav_home"><a href="/member/home">ホーム</a></li>
[% ELSE %]
-<a href="/auth/login">[% loc("Login") %]</a>
+<li id="hnav_login"><a href="/auth/login">[% loc("Login") %]</a></li>
[% END %]
-</div>
-<!-- END header -->
+</ul>
+</div><!-- header -->
View
@@ -1,14 +1,16 @@
[% DEFAULT submenu = site_config.submenu %]
<!-- START left -->
-<div id="left">
- [% IF (site_config.logo) %]<img src="[% site_config.logo %]" border="0" alt="JPAlogo" />[% END %]
- <div id="menu">
+<div id="side">
+<div id="logo"><a href="/jpa"><img src="[% static_uri %]/logo.jpg" alt="Japan Perl Association" /></a></div>
+<div id="lnav_container">
[% PROCESS navigation.tt %]
- <div class="leftnews">
- [% FOREACH smenu IN submenu -%]
- <div><img src="/static/img/Bullet_green.gif" alt="right blue" width="19" height="16" /> <a href="[% smenu.link %]">[% smenu.text %]</a></div>
- [%- END %]
- </div>
- </div>
-</div>
+[% IF (site_config.submenu) -%]
+<ul id="subnav">
+ [% FOREACH smenu IN submenu -%]
+<li><a href="[% smenu.link %]">[% smenu.text %]</a></li>
+ [%- END %]
+</ul>
+[%- END %]
+</div><!-- lnav_container -->
+</div><!-- side -->
<!-- END left -->
View
@@ -1,12 +1,22 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
+<h1>メンバー検索</h1>
+</div>
+
+<div id="content">
+<div class="form_full section">
[% form %]
+</div><!-- section -->
+<div id="results" class="section">
[% IF (members) %]
-<div>[% loc("Found [_1] hits", members.size) %]</div>
+<h2>[% loc("Found [_1] hits", members.size) %]</h2>
+<ul>
[% FOREACH m IN members %]
-<div>
- <div><a href="[% c.uri_for(m.id) %]">[% m.nickname %]</a></div>
-</div>
+ <li><a href="[% c.uri_for(m.id) %]">[% m.nickname %]</a></li>
[% END %]
+</ul>
[% END # if members %]
+</div><!-- section -->
+</div><!-- content -->
[% END # wrapper %]
@@ -1,15 +1,18 @@
[% WRAPPER wrapper.tt %]
-
+<div id="title">
<h1>ユーザー設定</h1>
+</div>
-<h2><a href="/member/settings/basic">[% loc("Basic Settings") %]</a></h2>
-<div class="formbox">
+<div id="content">
+<div class="form_full section">
+[%#<h2><a href="/member/settings/basic">%][%# loc("Basic Settings") %][%#</a></h2>%]
+<h2>[% loc("Basic Settings") %]</h2>
[% form %]
-</div>
+</div><!-- section -->
+<div class="form_full section">
<h2>パスワード</h2>
-<div class="formbox">
[% form_password %]
-</div>
-
+</div><!-- section -->
+</div><!-- content -->
[% END %]
View
@@ -1,8 +1,9 @@
[% WRAPPER wrapper.tt %]
[% SET owner = (c.user.id == member.id) %]
-
+<div id="member_title" class="clearfix">
+<p id="gravatar"><img src="[% member.gravatar_url %]" width="80" /></p>
+<div id="info">
<p>[% loc('Welcome x', member.nickname) %]</p>
-
[% # ナビバーみたいなのがここに来る感じかなぁ %]
<!-- navbar? -->
<ul id="member_menu" class="clearfix">
@@ -20,25 +21,36 @@
[% END %]
<li><a href="/member/search">[% loc("Member Search") %]</a></li>
</ul>
+</div><!-- info -->
-<div class="clearfix">
-<p id="gravatar"><img src="[% member.gravatar_url %]" width="80" /></p>
-<div id="info">
-<dl id="following">
-<dt>[% loc("Following") %]</dt>
-[% FOREACH m IN following %]
-<dd><a href="[% c.uri_for(m.id) %]"><img src="[% m.gravatar_url(size => 20) %]"></a></dd>
+</div><!-- title -->
+<div id="content">
+
+<div id="following" class="section">
+<h2>[% loc("Following") %]</h2>
+<ul>
+[% IF (following.size > 0) %]
+[% FOREACH m IN following %]
+<li><a href="[% c.uri_for(m.id) %]"><img src="[% m.gravatar_url(size => 20) %]"></a></li>
+[% END %]
+[% ELSE %]
+<li class="no_follow">なし</li>
[% END %]
-</dl>
+</ul>
+</div><!-- following -->
-<dl id="followers">
-<dt>[% loc("Followers") %]</dt>
-[% FOREACH m IN followers %]
-<dd><a href="[% c.uri_for(m.id) %]"><img src="[% m.gravatar_url(size => 20) %]"></a></dd>
+<div id="followers" class="section">
+<h2>[% loc("Followers") %]</h2>
+<ul>
+[% IF (followers.size > 0) %]
+[% FOREACH m IN followers %]
+<li><a href="[% c.uri_for(m.id) %]"><img src="[% m.gravatar_url(size => 20) %]"></a></li>
+[% END %]
+[% ELSE %]
+<li class="no_follow">なし</li>
[% END %]
-</dl>
-</div><!-- info -->
-</div><!-- clearfix -->
+</ul>
+</div><!-- followers -->
<!--
<h2>[% loc("Recent Activity") %]
@@ -50,4 +62,5 @@
</ul>
[% END %]
-->
+</div><!-- content -->
[% END # WRAPPER %]
View
@@ -1,8 +1,5 @@
-<!-- START navigation -->
- <h2 class="hide">Menu:</h2>
- <ul>
+<ul id="lnav">
[% FOREACH nav IN site_config.navigation %]
- <li><a href="[% nav.url %]">[% loc(nav.text || 'Link') %]</a></li>
+<li id="lnav_[% nav.id %]"><a href="[% nav.url %]">[% loc(nav.text || 'Link') %]</a></li>
[% END %]
- </ul>
-<!-- END navigation -->
+</ul>
@@ -1,10 +1,13 @@
[% WRAPPER wrapper.tt %]
+<div id="title">
+<h1>登録アクティベーション</h1>
+</div><!-- title -->
-<h2>登録アクティベーション</h2>
-
+<div id="content">
+<div class="form_full section">
<p>仮登録を終了しました。登録されたメールアドレスに登録手続きを続けるための
情報を載せたメールをお送りしましたので、ご確認ください。</p>
-<div class="formbox">
[% form %]
-</div>
+</div><!-- section -->
+</div><!-- content -->
[% END %]
Oops, something went wrong.

0 comments on commit 4197717

Please sign in to comment.