• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ

よく使われているワード(クリックで追加)

javaandroidc++linuxc#windowsobjective-ccocoaqt誰得pythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Web appl using RoR 3.2.14


コミットメタ情報

リビジョン21ab12b2c9cf137cfc5ba2455b7518a6c0542605 (tree)
日時2013-09-07 23:42:00
作者unknown <Yoichi.K@VENU...>
コミッターunknown

ログメッセージ

show-mountain page has been improved

変更サマリ

差分

--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1,3 +1,8 @@
1+/*
2+ * Stylesheet for Kisuge
3+ *
4+ * create by Yoichi Kanno (yoichi.k@stellecadente.net)
5+ */
16 /*
27 * This is a manifest file that'll be compiled into application.css, which will include all the files
38 * listed below.
@@ -11,11 +16,29 @@
1116 *= require_self
1217 *= require_tree .
1318 */
19+
20+/*
21+/* Block group
22+ */
1423 body {
1524 background-color: #FFffFF;
1625 }
26+#footer {
27+ background-color: lightgrey;
28+ font-size: 8px;
29+ color: #000000;
30+ margin: 0;
31+ padding: 0;
32+}
1733
34+/*
35+/* img group
36+ */
1837 img {border: 0;}
38+
39+/*
40+/* h1 - h7 group
41+ */
1942 h1 {
2043 margin: 0.2em 0 0.2em 0;
2144 padding: 6px;
@@ -45,33 +68,10 @@ h2 em {
4568 color: #dddddd;
4669 background-image: none;
4770 }
48-p {
49- color: #000000;
50- margin: 0;
51- padding: 1em 2em 1em;
52- background-image: url(bg7.gif);
53- background-repeat: repeat-x;
54-}
55-p#notice {
56- margin: 0;
57- padding: 0;
58- color: #c500ef;
59- background-color: #eaeaea;
60-}
61-p#footer {
62- margin: 0;
63- padding: 6px;
64- color: #000000;
65- font-size: small;
66- background-color: #ffffff;
67-}
68-p#copyright {
69- margin: 0;
70- padding: 6px;
71- color: #000000;
72- font-size: small;
73- background-color: #fffff;
74-}
71+
72+/*
73+/* div group
74+ */
7575 div#logout {
7676 margin: 0;
7777 padding: 5px;
@@ -112,5 +112,124 @@ div.error_explanation {
112112 font-weight: bold;
113113 background-color: #990000;
114114 }
115+div.mountainDetail {
116+ margin: 0;
117+ padding: 0;
118+ color: #000000;
119+ font-size: 8px;
120+ background-color: #ffffff;
121+}
122+div.mountainMeizanSign {
123+ margin: 5px;
124+ padding: 0;
125+ color: #000000;
126+ font-size: 8px;
127+ background-color: #ddffdd;
128+}
129+
130+/*
131+/* a group
132+ */
133+a.menu {
134+ font-size: 16px
135+ font-weight: 900
136+ color: Red
137+}
138+
139+/*
140+/* p group
141+ */
142+p {
143+ color: #000000;
144+ margin: 0;
145+ padding: 1em 2em 1em;
146+ background-image: url(bg7.gif);
147+ background-repeat: repeat-x;
148+}
149+p#notice {
150+ margin: 0;
151+ padding: 0;
152+ color: #c500ef;
153+ background-color: #eaeaea;
154+}
155+p.menuItem {
156+ font-size: 16px
157+ font-weight: 900
158+ color: #F00
159+}
160+p#footerNavi {
161+ font-size: 9px;
162+ margin: 0;
163+ padding: 0px;
164+}
165+p#footerLeft {
166+ font-size: 9px;
167+ margin: 0;
168+ padding: 0px;
169+}
170+p#footerRight {
171+ font-size: 9px;
172+ margin: 0 0 0 0px;
173+ padding: 0px 0px 0px 0px;
174+}
175+p#copyright {
176+ margin: 0;
177+ padding: 6px;
178+ color: #000000;
179+ font-size: 12px;
180+}
181+p.head1 {
182+ margin: 0;
183+ padding: 6px;
184+ color: #000000;
185+ font-size: 18px;
186+ font-weight: 700;
187+}
188+p.head2 {
189+ margin: 0;
190+ padding: 2px;
191+ color: #000000;
192+ font-size: 16px;
193+ font-weight: 700;
194+}
195+p#mountainName {
196+ margin: 0;
197+ padding: 6px;
198+ color: brown;
199+ font-size: 24px;
200+ font-weight: 800;
201+}
202+p.mountainDetail {
203+ margin: 0;
204+ padding: 0px;
205+ color: #000000;
206+ font-size: 10px;
207+}
208+
209+/*
210+/* table group
211+ */
212+table.meizanSign {
213+ margin: 5px;
214+ padding: 0;
215+ color: #000000;
216+ font-size: 10px;
217+ background-color: #ddffdd;
218+}
115219
220+/*
221+/* td group
222+ */
223+td.value {
224+ margin: 0;
225+ padding: 0;
226+ color: #000000;
227+ background-color: #ffffff;
228+ font-size: 10px;
229+}
230+
231+
232+/*
233+/* other groups
234+ */
116235
--- a/app/controllers/records_controller.rb
+++ b/app/controllers/records_controller.rb
@@ -2,7 +2,6 @@ class RecordsController < ApplicationController
22 # GET /records
33 # GET /records.json
44 def index
5- @records = Record.all
65 @records = Record.order('id ASC').
76 paginate(:page => params[:page], :per_page => 10)
87
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -1,2 +1,14 @@
1-<h1>Admin#index</h1>
2-<p>Find me in app/views/admin/index.html.erb</p>
1+<h1><%= t 'admin.title.list' %></h1>
2+
3+<div class="toolbar">
4+  
5+</div>
6+<p id="notice"><%= notice %></p>
7+<hr />
8+
9+<p class="menuItem">
10+<%= link_to('「〈山〉データ」のメンテナンス', { :controller => 'mountains', :action => 'index' }, :class => 'menu' ) %>
11+</p>
12+<p class="menuItem">
13+<%= link_to('「〈メンバー〉データ」のメンテナンス', { :controller => 'users', :action => 'index' }, :class => 'menu' ) %>
14+</p>
\ No newline at end of file
--- a/app/views/application/_side.html.erb
+++ b/app/views/application/_side.html.erb
@@ -1,4 +1,4 @@
1-<img src="top_banner.jpg" width=640 border=0>
1+<img src="/top_banner.jpg" width=640 border=0>
22 <div id="logout" align="right">
33 <table width=640 border=0>
44 <tr>
@@ -18,7 +18,7 @@
1818 </td><td width="160">
1919 <b><%= link_to('山のリスト', mountains_path) %></b>
2020 </td><td width="160">
21- <b><%= link_to('山行記録', records_path) %></b>
21+ <b><%= link_to('山行記録', { :controller => 'records', :action =>'index' }) %></b>
2222 </td><td width="160">
2323 <b><%= link_to('ブログ', blogs_path) %></b>
2424 </td><td>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,19 +14,26 @@
1414 <%= yield %>
1515
1616 <hr />
17-<table>
18- <tr>
19- <td>
20- <div>
21- <p id="footer"><%= t 'application.footer' %></p>
22- <p id="copyright"><%= t 'application.copyright' %></p>
23- </div>
24- <td>
25- <div>
26-
27- </div>
28- </td>
29- </tr>
30-</table>
17+<div id="footer">
18+ <table width="640" height="10" border="0">
19+ <tr>
20+ <td colspan="2" align="right">
21+ <p id="footerNavi">| サイトマップ | 個人情報保護方針 | サイトポリシー | <%= link_to('管理者専用', { :controller => 'admin', :action => 'index' }, { :id => 'link', :class => 'menu' }) %>|</p>
22+ </td>
23+ <tr>
24+ <td align="right">
25+ <p id="footerLeft">
26+
27+ </p>
28+ </td>
29+ <td align="right">
30+ <p id="footerRight">
31+ <%= t 'application.copyright' %>  
32+ <%= t 'application.footer' %> 
33+ </p>
34+ </td>
35+ </tr>
36+ </table>
37+</div>
3138 </body>
3239 </html>
--- /dev/null
+++ b/app/views/mountains/_show_all.html.erb
@@ -0,0 +1,171 @@
1+<p>
2+ <b>Id:</b>
3+ <%= @mountain.id %>
4+</p>
5+
6+<p>
7+ <b>Uname:</b>
8+ <%= @mountain.uname %>
9+</p>
10+
11+<p>
12+ <b>Kana:</b>
13+ <%= @mountain.kana %>
14+</p>
15+
16+<p>
17+ <b>Name1:</b>
18+ <%= @mountain.name1 %>
19+</p>
20+
21+<p>
22+ <b>Name2:</b>
23+ <%= @mountain.name2 %>
24+</p>
25+
26+<p>
27+ <b>Name3:</b>
28+ <%= @mountain.name3 %>
29+</p>
30+
31+<p>
32+ <b>Elevation:</b>
33+ <%= @mountain.elevation %>
34+</p>
35+
36+<p>
37+ <b>Number 300meizan:</b>
38+ <%= @mountain.number_300meizan %>
39+</p>
40+
41+<p>
42+ <b>District:</b>
43+ <%= @mountain.district %>
44+</p>
45+
46+<p>
47+ <b>Latitude:</b>
48+ <%= @mountain.latitude %>
49+</p>
50+
51+<p>
52+ <b>Longitude:</b>
53+ <%= @mountain.longitude %>
54+</p>
55+
56+<p>
57+ <b>Prefs:</b>
58+ <%= @mountain.prefs %>
59+</p>
60+
61+<p>
62+ <b>Map200:</b>
63+ <%= @mountain.map200 %>
64+</p>
65+
66+<p>
67+ <b>Map050:</b>
68+ <%= @mountain.map050 %>
69+</p>
70+
71+<p>
72+ <b>Map025:</b>
73+ <%= @mountain.map025 %>
74+</p>
75+
76+<p>
77+ <b>Fl yama1000:</b>
78+ <%= @mountain.fl_yama1000 %>
79+</p>
80+
81+<p>
82+ <b>Fl 100meizan:</b>
83+ <%= @mountain.fl_100meizan %>
84+</p>
85+
86+<p>
87+ <b>Fl 200meizan:</b>
88+ <%= @mountain.fl_200meizan %>
89+</p>
90+
91+<p>
92+ <b>Fl 300meizan:</b>
93+ <%= @mountain.fl_300meizan %>
94+</p>
95+
96+<p>
97+ <b>Fl hana:</b>
98+ <%= @mountain.fl_hana %>
99+</p>
100+
101+<p>
102+ <b>Fl shinhana:</b>
103+ <%= @mountain.fl_shinhana %>
104+</p>
105+
106+<p>
107+ <b>Fl shinhyaku:</b>
108+ <%= @mountain.fl_shinhyaku %>
109+</p>
110+
111+<p>
112+ <b>Fl kanto:</b>
113+ <%= @mountain.fl_kanto %>
114+</p>
115+
116+<p>
117+ <b>Fl kansai:</b>
118+ <%= @mountain.fl_kansai %>
119+</p>
120+
121+<p>
122+ <b>Fl kyuushuu:</b>
123+ <%= @mountain.fl_kyuushuu %>
124+</p>
125+
126+<p>
127+ <b>Fl yamanashi:</b>
128+ <%= @mountain.fl_yamanashi %>
129+</p>
130+
131+<p>
132+ <b>Fl tohoku:</b>
133+ <%= @mountain.fl_tohoku %>
134+</p>
135+
136+<p>
137+ <b>Fl niigata:</b>
138+ <%= @mountain.fl_niigata %>
139+</p>
140+
141+<p>
142+ <b>Fl utsukushima:</b>
143+ <%= @mountain.fl_utsukushima %>
144+</p>
145+
146+<p>
147+ <b>Fl aizu:</b>
148+ <%= @mountain.fl_aizu %>
149+</p>
150+
151+<p>
152+ <b>Fl hokkaido:</b>
153+ <%= @mountain.fl_hokkaido %>
154+</p>
155+
156+<p>
157+ <b>Fl shikoku:</b>
158+ <%= @mountain.fl_shikoku %>
159+</p>
160+
161+<p>
162+ <b>Fl tochigi:</b>
163+ <%= @mountain.fl_tochigi %>
164+</p>
165+
166+<p>
167+ <b>Fl gumma:</b>
168+ <%= @mountain.fl_gumma %>
169+</p>
170+
171+
--- /dev/null
+++ b/app/views/mountains/_show_selected.html.erb
@@ -0,0 +1,192 @@
1+ <table width="640" height="24" border="0">
2+ <tr>
3+ <td width="320" height="24" rowspan="2" width="320">
4+ <p id="mountainName">
5+ <%= @mountain.uname %>
6+ </p>
7+ </td><td height="12">
8+ <strong><%= t 'attributes.elevation' %></strong>
9+ <%= @mountain.elevation %>m
10+ </td><td height="12">
11+ <strong>山域名</strong>
12+ <%= @mountain.district %>
13+ </td>
14+ </tr><tr>
15+ <td height="12">
16+ <strong><%= t 'attributes.kana' %></strong>
17+ <%= @mountain.kana %>
18+ </td><td height="12">
19+  
20+ </td>
21+ </tr>
22+ </table>
23+
24+ <div class="mountainDetail">
25+ <table width="320" border="0">
26+ <tr>
27+ <td>
28+ [山名呼称: <%= @mountain.name1 %>
29+ <%= @mountain.name2 %>
30+ <%= @mountain.name3 %>]
31+ </td>
32+ </tr>
33+ </table>
34+
35+ <table width="320" border="0">
36+ <tr>
37+ <td>
38+ 所属都道府県:
39+ <%= @mountain.prefs %>
40+ </td>
41+ </tr>
42+ </table>
43+
44+ <table width="320" border="0">
45+ <tr>
46+ <td>
47+ 北緯
48+ <%= @mountain.latitude %>
49+ </td><td>
50+ 東経
51+ <%= @mountain.longitude %>
52+ </td><td>
53+ <% uri = 'http://watchizu.gsi.go.jp/watchizu.html?b=LATITUDE&l=LONGITUDE' %>
54+ <% uri.sub!(/LATITUDE/, (@mountain.latitude.to_f * 10000).to_s) %>
55+ <% uri.sub!(/LONGITUDE/,(@mountain.longitude.to_f * 10000).to_s) %>
56+ <strong><%= link_to('ウォッちず', uri, :target => :new ) %></strong>
57+ </td>
58+ </tr>
59+ </table>
60+
61+ <table width="320" border="0">
62+ <tr>
63+ <td>
64+ 地勢図「
65+ <%= @mountain.map200 %>」
66+ 五万図「
67+ <%= @mountain.map050 %>」
68+ 二万五千図「
69+ <%= @mountain.map025 %>」
70+ </td>
71+ </tr>
72+ </table>
73+ </div>
74+
75+ <table width="320" border="0">
76+ <tr>
77+ <td>
78+ <p class="mountainDetail">
79+ <strong>ID</strong>
80+ <%= @mountain.id %>
81+ </p>
82+ </td><td>
83+ <p class="mountainDetail">
84+ <strong>300名山通番</strong>
85+ <%= @mountain.number_300meizan %>
86+ </p>
87+ </td>
88+ </tr>
89+ </table>
90+
91+ <p class="head2">■名山該当サイン</p>
92+ <div>
93+ <table class="meizanSign" width="640" border="0" bordercolor="white">
94+ <tr>
95+ <td width="120">
96+ <strong><%= t 'attributes.100meizan' %></strong>
97+ </td><td class="value" width="40" align="center">
98+ <% if @mountain.fl_100meizan %><%= "〇" %><% else %><%= "-" %><% end %>
99+ </td><td width="120">
100+ <strong><%= t 'attributes.200meizan' %></strong>
101+ </td><td class="value" width="40" align="center">
102+ <% if @mountain.fl_200meizan %><%= "〇" %><% else %><%= "-" %><% end %>
103+ </td><td width="120">
104+ <strong><%= t 'attributes.300meizan' %></strong>
105+ </td><td class="value" width="40" align="center">
106+ <% if @mountain.fl_300meizan %><%= "〇" %><% else %><%= "-" %><% end %>
107+ </td><td width="120">
108+ <strong><%= t 'attributes.fl_yama1000' %></strong>
109+ </td><td class="value" width="40" align="center">
110+ <% if @mountain.fl_yama1000 %><%= "〇" %><% else %><%= "-" %><% end %>
111+ </td>
112+ </tr>
113+ <tr>
114+ <td>
115+ <strong><%= t 'attributes.fl_hana' %></strong>
116+ </td><td class="value" width="40" align="center">
117+ <% if @mountain.fl_hana %><%= "〇" %><% else %><%= "-" %><% end %>
118+ </td><td>
119+ <strong><%= t 'attributes.fl_shinhana' %></strong>
120+ </td><td class="value" width="40" align="center">
121+ <% if @mountain.fl_shinhana %><%= "〇" %><% else %><%= "-" %><% end %>
122+ </td><td>
123+ <strong><%= t 'attributes.fl_shinhyaku' %></strong>
124+ </td><td class="value" width="40" align="center">
125+ <% if @mountain.fl_shinhyaku %><%= "〇" %><% else %><%= "-" %><% end %>
126+ </td><td>
127+ <strong><%= t 'attributes.fl_kanto' %></strong>
128+ </td><td class="value" width="40" align="center">
129+ <% if @mountain.fl_kanto %><%= "〇" %><% else %><%= "-" %><% end %>
130+ </td>
131+ </tr>
132+ <tr>
133+ <td>
134+ <strong><%= t 'attributes.fl_kansai' %></strong>
135+ </td><td class="value" width="40" align="center">
136+ <% if @mountain.fl_kansai %><%= "〇" %><% else %><%= "-" %><% end %>
137+ </td><td>
138+ <strong><%= t 'attributes.fl_kyuushuu' %></strong>
139+ </td><td class="value" width="40" align="center">
140+ <% if @mountain.fl_kyuushuu %><%= "〇" %><% else %><%= "-" %><% end %>
141+ </td><td>
142+ <strong><%= t 'attributes.fl_yamanashi' %></strong>
143+ </td><td class="value" width="40" align="center">
144+ <% if @mountain.fl_yamanashi %><%= "〇" %><% else %><%= "-" %><% end %>
145+ </td><td>
146+ <strong><%= t 'attributes.fl_tohoku' %></strong>
147+ </td><td class="value" width="40" align="center">
148+ <% if @mountain.fl_tohoku %><%= "〇" %><% else %><%= "-" %><% end %>
149+ </td>
150+ </tr>
151+ <tr>
152+ <td>
153+ <strong><%= t 'attributes.fl_niigata' %></strong>
154+ </td><td class="value" width="40" align="center">
155+ <% if @mountain.fl_niigata %><%= "〇" %><% else %><%= "-" %><% end %>
156+ </td><td>
157+ <strong><%= t 'attributes.fl_utsukushima' %></strong>
158+ </td><td class="value" width="40" align="center">
159+ <% if @mountain.fl_utsukushima %><%= "〇" %><% else %><%= "-" %><% end %>
160+ </td><td>
161+ <strong><%= t 'attributes.fl_aizu' %></strong>
162+ </td><td class="value" width="40" align="center">
163+ <% if @mountain.fl_aizu %><%= "〇" %><% else %><%= "-" %><% end %>
164+ </td><td>
165+ <strong><%= t 'attributes.fl_hokkaido' %></strong>
166+ </td><td class="value" width="40" align="center">
167+ <% if @mountain.fl_hokkaido %><%= "〇" %><% else %><%= "-" %><% end %>
168+ </td>
169+ </tr>
170+ <tr>
171+ <td>
172+ <strong><%= t 'attributes.fl_shikoku' %></strong>
173+ </td><td class="value" width="40" align="center">
174+ <% if @mountain.fl_shikoku %><%= "〇" %><% else %><%= "-" %><% end %>
175+ </td><td>
176+ <strong><%= t 'attributes.fl_tochigi' %></strong>
177+ </td><td class="value" width="40" align="center">
178+ <% if @mountain.fl_tochigi %><%= "〇" %><% else %><%= "-" %><% end %>
179+ </td><td>
180+ <strong><%= t 'attributes.fl_gumma' %></strong>
181+ </td><td class="value" width="40" align="center">
182+ <% if @mountain.fl_gumma %><%= "〇" %><% else %><%= "-" %><% end %>
183+ </td><td>
184+  
185+ </td><td class="value" width="40" align="center">
186+  
187+ </td>
188+ </tr>
189+ </table>
190+ </div>
191+
192+
--- a/app/views/mountains/show.html.erb
+++ b/app/views/mountains/show.html.erb
@@ -3,177 +3,7 @@
33 <%= link_to 'Edit', edit_mountain_path(@mountain) %> |
44 <%= link_to 'Back', mountains_path %>
55 </div>
6-<p id="notice"><%= notice %></p>
76 <hr />
7+<p id="notice"><%= notice %></p>
88
9-<p>
10- <b>Id:</b>
11- <%= @mountain.id %>
12-</p>
13-
14-<p>
15- <b>Uname:</b>
16- <%= @mountain.uname %>
17-</p>
18-
19-<p>
20- <b>Kana:</b>
21- <%= @mountain.kana %>
22-</p>
23-
24-<p>
25- <b>Name1:</b>
26- <%= @mountain.name1 %>
27-</p>
28-
29-<p>
30- <b>Name2:</b>
31- <%= @mountain.name2 %>
32-</p>
33-
34-<p>
35- <b>Name3:</b>
36- <%= @mountain.name3 %>
37-</p>
38-
39-<p>
40- <b>Elevation:</b>
41- <%= @mountain.elevation %>
42-</p>
43-
44-<p>
45- <b>Number 300meizan:</b>
46- <%= @mountain.number_300meizan %>
47-</p>
48-
49-<p>
50- <b>District:</b>
51- <%= @mountain.district %>
52-</p>
53-
54-<p>
55- <b>Latitude:</b>
56- <%= @mountain.latitude %>
57-</p>
58-
59-<p>
60- <b>Longitude:</b>
61- <%= @mountain.longitude %>
62-</p>
63-
64-<p>
65- <b>Prefs:</b>
66- <%= @mountain.prefs %>
67-</p>
68-
69-<p>
70- <b>Map200:</b>
71- <%= @mountain.map200 %>
72-</p>
73-
74-<p>
75- <b>Map050:</b>
76- <%= @mountain.map050 %>
77-</p>
78-
79-<p>
80- <b>Map025:</b>
81- <%= @mountain.map025 %>
82-</p>
83-
84-<p>
85- <b>Fl yama1000:</b>
86- <%= @mountain.fl_yama1000 %>
87-</p>
88-
89-<p>
90- <b>Fl 100meizan:</b>
91- <%= @mountain.fl_100meizan %>
92-</p>
93-
94-<p>
95- <b>Fl 200meizan:</b>
96- <%= @mountain.fl_200meizan %>
97-</p>
98-
99-<p>
100- <b>Fl 300meizan:</b>
101- <%= @mountain.fl_300meizan %>
102-</p>
103-
104-<p>
105- <b>Fl hana:</b>
106- <%= @mountain.fl_hana %>
107-</p>
108-
109-<p>
110- <b>Fl shinhana:</b>
111- <%= @mountain.fl_shinhana %>
112-</p>
113-
114-<p>
115- <b>Fl shinhyaku:</b>
116- <%= @mountain.fl_shinhyaku %>
117-</p>
118-
119-<p>
120- <b>Fl kanto:</b>
121- <%= @mountain.fl_kanto %>
122-</p>
123-
124-<p>
125- <b>Fl kansai:</b>
126- <%= @mountain.fl_kansai %>
127-</p>
128-
129-<p>
130- <b>Fl kyuushuu:</b>
131- <%= @mountain.fl_kyuushuu %>
132-</p>
133-
134-<p>
135- <b>Fl yamanashi:</b>
136- <%= @mountain.fl_yamanashi %>
137-</p>
138-
139-<p>
140- <b>Fl tohoku:</b>
141- <%= @mountain.fl_tohoku %>
142-</p>
143-
144-<p>
145- <b>Fl niigata:</b>
146- <%= @mountain.fl_niigata %>
147-</p>
148-
149-<p>
150- <b>Fl utsukushima:</b>
151- <%= @mountain.fl_utsukushima %>
152-</p>
153-
154-<p>
155- <b>Fl aizu:</b>
156- <%= @mountain.fl_aizu %>
157-</p>
158-
159-<p>
160- <b>Fl hokkaido:</b>
161- <%= @mountain.fl_hokkaido %>
162-</p>
163-
164-<p>
165- <b>Fl shikoku:</b>
166- <%= @mountain.fl_shikoku %>
167-</p>
168-
169-<p>
170- <b>Fl tochigi:</b>
171- <%= @mountain.fl_tochigi %>
172-</p>
173-
174-<p>
175- <b>Fl gumma:</b>
176- <%= @mountain.fl_gumma %>
177-</p>
178-
179-
9+<%= render 'show_selected' %>
--- /dev/null
+++ b/app/views/records/_list_long.html.erb
@@ -0,0 +1,36 @@
1+<table>
2+ <tr>
3+ <th>Id</th>
4+ <th>Mountain</th>
5+ <th>User</th>
6+ <th>Publish d</th>
7+ <th>Title</th>
8+ <th>Start d</th>
9+ <th>End d</th>
10+ <th>Body</th>
11+ <th></th>
12+ <th></th>
13+ <th></th>
14+ </tr>
15+
16+<% @records.each do |record| %>
17+ <tr style="background-color:<%= cycle('#DDddDD', '#99ffFF') %>">
18+ <td><%= record.id %></td>
19+ <td><%= record.mountain_id %></td>
20+ <td><%= record.user_id %></td>
21+ <td><%= record.publish_d %></td>
22+ <td><%= record.title %></td>
23+ <td><%= record.start_d %></td>
24+ <td><%= record.end_d %></td>
25+ <td><%= record.body %></td>
26+ <td><%= link_to 'Show', record %></td>
27+ <td><%= link_to 'Edit', edit_record_path(record) %></td>
28+ <td><%= link_to 'Destroy', record, method: :delete, data: { confirm: 'Are you sure?' } %></td>
29+ </tr>
30+<% end %>
31+<div class='digg_pagination'>
32+ <%= will_paginate @users %>
33+</div>
34+</table>
35+
36+<br />
--- /dev/null
+++ b/app/views/records/_list_short.html.erb
@@ -0,0 +1,34 @@
1+<table>
2+ <tr>
3+ <th>Id</th>
4+ <th>Mountain</th>
5+ <th>User</th>
6+ <th><%= t 'attributes.publish_d' %></th>
7+ <th><%= t 'attributes.title' %></th>
8+ <th><%= t 'attributes.start_d' %></th>
9+ <th><%= t 'attributes.end_d' %></th>
10+ <th></th>
11+ <th></th>
12+ <th></th>
13+ </tr>
14+
15+<% @records.each do |record| %>
16+ <tr style="background-color:<%= cycle('#DDddDD', '#99ffFF') %>">
17+ <td><%= record.id %></td>
18+ <td><%= record.mountain_id %></td>
19+ <td><%= record.user_id %></td>
20+ <td><%= record.publish_d %></td>
21+ <td><%= record.title %></td>
22+ <td><%= record.start_d %></td>
23+ <td><%= record.end_d %></td>
24+ <td><%= link_to 'Show', record %></td>
25+ <td><%= link_to 'Edit', edit_record_path(record) %></td>
26+ <td><%= link_to 'Destroy', record, method: :delete, data: { confirm: 'Are you sure?' } %></td>
27+ </tr>
28+<% end %>
29+<div class='digg_pagination'>
30+ <%= will_paginate @users %>
31+</div>
32+</table>
33+
34+<br />
--- a/app/views/records/index.html.erb
+++ b/app/views/records/index.html.erb
@@ -1,43 +1,8 @@
11 <h1><%= t 'records.title.list' %></h1>
22 <div class="toolbar">
33 <%= link_to 'navi.new', new_record_path %>
4- <div align="right">
5- <%= link_to 'トップページへ', { :controller => 'top', :action => 'index' } %>
64 </div>
75 </div>
86 <hr />
97
10-<table>
11- <tr>
12- <th>Id</th>
13- <th>Mountain</th>
14- <th>User</th>
15- <th>Publish d</th>
16- <th>Title</th>
17- <th>Start d</th>
18- <th>End d</th>
19- <th>Body</th>
20- <th></th>
21- <th></th>
22- <th></th>
23- </tr>
24-
25-<% @records.each do |record| %>
26- <tr style="background-color:<%= cycle('#DDddDD', '#99ffFF') %>">
27- <td><%= record.id %></td>
28- <td><%= record.mountain_id %></td>
29- <td><%= record.user_id %></td>
30- <td><%= record.publish_d %></td>
31- <td><%= record.title %></td>
32- <td><%= record.start_d %></td>
33- <td><%= record.end_d %></td>
34- <td><%= record.body %></td>
35- <td><%= link_to 'Show', record %></td>
36- <td><%= link_to 'Edit', edit_record_path(record) %></td>
37- <td><%= link_to 'Destroy', record, method: :delete, data: { confirm: 'Are you sure?' } %></td>
38- </tr>
39-<% end %>
40-<%= will_paginate @users %>
41-</table>
42-
43-<br />
8+<%= render 'list_short' %>
--- a/app/views/records/show.html.erb
+++ b/app/views/records/show.html.erb
@@ -3,8 +3,8 @@
33 <%= link_to 'Edit', edit_record_path(@record) %> |
44 <%= link_to 'Back', records_path %>
55 </div>
6-<p id="notice"><%= notice %></p>
76 <hr />
7+<p id="notice"><%= notice %></p>
88
99 <p>
1010 <b>Id:</b>
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -2,8 +2,8 @@
22 <%= link_to 'Edit', edit_user_path(@user) %> |
33 <%= link_to 'Back', users_path %>
44 </div>
5-<p id="notice"><%= notice %></p>
65 <hr />
6+<p id="notice"><%= notice %></p>
77
88 <p>
99 <b>Id:</b>
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1,3 +1,8 @@
1+# Locale Dictionary for Japanese
2+# quoted by Ruby and Rails
3+# arranged by Yoichi Kanno (yoichi.k@stellecadente.net)
4+
5+### Basic section
16 ja:
27 date:
38 abbr_day_names:
@@ -204,6 +209,14 @@ ja:
204209 activerecord:
205210 errors:
206211 <<: *errors
212+
213+### Plug-In's section
214+ will_paginate:
215+ previous_label: "&#8592; 前ページ"
216+ next_label: "次ページ &#8594;"
217+ page_gap: "&hellip;"
218+
219+### Application's section
207220 attributes:
208221 uname: 山名
209222 kana: よみがな
@@ -326,8 +339,11 @@ ja:
326339 edit: 〈ブログコメント〉データ編集
327340 new: 〈ブログコメント〉データ新規作成
328341 show: 〈ブログコメント〉データ表示
329- will_paginate:
330- previous_label: "&#8592; 前ページ"
331- next_label: "次ページ &#8594;"
332- page_gap: "&hellip;"
342+ admin:
343+ title:
344+ list: 管理者メニュー
345+ label:
346+ mountain:「〈山〉データ」のメンテナンス
347+ user:「〈メンバー〉データ」のメンテナンス
348+
333349
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,7 @@
11 Kisuge::Application.routes.draw do
22
33 root :to => 'home#index'
4- get "top" => 'home#index'
4+# get "top" => 'home#index'
55 get "admin/index" => 'admin#index'
66
77 post 'login/auth' => 'login#auth'
@@ -36,17 +36,17 @@ Kisuge::Application.routes.draw do
3636 post 'destroy'
3737 end
3838
39- resources :records do
40- collection do
41- get 'conquer' => 'records#conquer'
42- get 'top' => 'records#index'
43- end
44- get 'index' => 'records#index'
45- get 'show'
46- post 'new'
47- post 'edit'
48- post 'destroy'
49- end
39+ resources :records
40+# resources :records do
41+# # collection do
42+# # get 'conquer' => 'records#conquer'
43+# # end
44+# get 'index' => 'records#index'
45+# get 'show'
46+# post 'new'
47+# post 'edit'
48+# post 'destroy'
49+# end
5050
5151 # The priority is based upon order of creation:
5252 # first created -> highest priority.