• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ

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

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

Web appl using RoR 3.2.14


コミットメタ情報

リビジョン583d0e13030796484ab31b1a6df10b047f1ee1d8 (tree)
日時2013-08-28 14:39:56
作者stellecadente <yoichi.k@stel...>
コミッターstellecadente

ログメッセージ

after makeing css

変更サマリ

差分

--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -11,3 +11,83 @@
1111 *= require_self
1212 *= require_tree .
1313 */
14+body {
15+ background-color: #FFffFF;
16+}
17+
18+img {border: 0;}
19+h1 {
20+ margin: 0 0 0.5em 0;
21+ padding: 6px;
22+ border-bottom: 2px solid #0089be;
23+ color: #0089be;
24+ background-image: url(bg5.gif);
25+ background-repeat: repeat-y;
26+ border-left: 10px solid #0089be;
27+}
28+.topic {
29+ color: #000000;
30+ border: 1px solid #c5003f;
31+}
32+h2 {
33+ margin: 0;
34+ padding: 5px 5px 5px 25px;
35+ color: #ffcccc;
36+ background-color: #c5003f;
37+ background-image: url(bg6.gif);
38+ background-repeat: no-repeat;
39+}
40+em {
41+ background-image: url(bg3.gif);
42+ font-style: normal;
43+}
44+h2 em {
45+ color: #dddddd;
46+ background-image: none;
47+}
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+}
75+div.navi {
76+ margin: 0;
77+ padding: 5px;
78+ color: deepskyblue;
79+ font-size: large;
80+ font-weight: bold;
81+ background-color: azure;
82+}
83+div.error_explanation {
84+ margin: 0;
85+ padding: 0;
86+ color: #000000;
87+ font-size: large;
88+ font-weight: bold;
89+ background-color: #990000;
90+}
91+
92+
93+
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,8 +13,8 @@
1313
1414 <hr />
1515 <div>
16- <p><%= t 'application.footer' %></p>
17- <p><%= t 'application.copyright' %></p>
16+ <p id="footer"><%= t 'application.footer' %></p>
17+ <p id="copyright"><%= t 'application.copyright' %></p>
1818 </div>
1919 </body>
2020 </html>
--- a/app/views/mountains/edit.html.erb
+++ b/app/views/mountains/edit.html.erb
@@ -1,6 +1,9 @@
1-<h1>Editing mountain</h1>
1+<h1><%= t 'mountains.title.edit' %></h1>
2+<div class="navi">
3+ <%= link_to 'Show', @mountain %> |
4+ <%= link_to 'Back', mountains_path %>
5+</div>
6+<hr />
27
38 <%= render 'form' %>
49
5-<%= link_to 'Show', @mountain %> |
6-<%= link_to 'Back', mountains_path %>
--- "a/app/views/mountains/index.html - \343\202\263\343\203\224\343\203\274.erb"
+++ /dev/null
@@ -1,89 +0,0 @@
1-<h1>Listing mountains</h1>
2-
3-<table>
4- <tr>
5- <th>Id</th>
6- <th>Uname</th>
7- <th>Kana</th>
8- <th>Name1</th>
9- <th>Name2</th>
10- <th>Name3</th>
11- <th>Elevation</th>
12- <th>Number 300meizan</th>
13- <th>District</th>
14- <th>Latitude</th>
15- <th>Longitude</th>
16- <th>Prefs</th>
17- <th>Map200</th>
18- <th>Map050</th>
19- <th>Map025</th>
20- <th>Fl yama1000</th>
21- <th>Fl 100meizan</th>
22- <th>Fl 200meizan</th>
23- <th>Fl 300meizan</th>
24- <th>Fl hana</th>
25- <th>Fl shinhana</th>
26- <th>Fl shinhyaku</th>
27- <th>Fl kanto</th>
28- <th>Fl kansai</th>
29- <th>Fl kyuushuu</th>
30- <th>Fl yamanashi</th>
31- <th>Fl tohoku</th>
32- <th>Fl niigata</th>
33- <th>Fl utsukushima</th>
34- <th>Fl aizu</th>
35- <th>Fl hokkaido</th>
36- <th>Fl shikoku</th>
37- <th>Fl tochigi</th>
38- <th>Fl gumma</th>
39- <th></th>
40- <th></th>
41- <th></th>
42- </tr>
43-
44-<% @mountains.each do |mountain| %>
45- <tr>
46- <td><%= mountain.id %></td>
47- <td><%= mountain.uname %></td>
48- <td><%= mountain.kana %></td>
49- <td><%= mountain.name1 %></td>
50- <td><%= mountain.name2 %></td>
51- <td><%= mountain.name3 %></td>
52- <td><%= mountain.elevation %></td>
53- <td><%= mountain.number_300meizan %></td>
54- <td><%= mountain.district %></td>
55- <td><%= mountain.latitude %></td>
56- <td><%= mountain.longitude %></td>
57- <td><%= mountain.prefs %></td>
58- <td><%= mountain.map200 %></td>
59- <td><%= mountain.map050 %></td>
60- <td><%= mountain.map025 %></td>
61- <td><%= mountain.fl_yama1000 %></td>
62- <td><%= mountain.fl_100meizan %></td>
63- <td><%= mountain.fl_200meizan %></td>
64- <td><%= mountain.fl_300meizan %></td>
65- <td><%= mountain.fl_hana %></td>
66- <td><%= mountain.fl_shinhana %></td>
67- <td><%= mountain.fl_shinhyaku %></td>
68- <td><%= mountain.fl_kanto %></td>
69- <td><%= mountain.fl_kansai %></td>
70- <td><%= mountain.fl_kyuushuu %></td>
71- <td><%= mountain.fl_yamanashi %></td>
72- <td><%= mountain.fl_tohoku %></td>
73- <td><%= mountain.fl_niigata %></td>
74- <td><%= mountain.fl_utsukushima %></td>
75- <td><%= mountain.fl_aizu %></td>
76- <td><%= mountain.fl_hokkaido %></td>
77- <td><%= mountain.fl_shikoku %></td>
78- <td><%= mountain.fl_tochigi %></td>
79- <td><%= mountain.fl_gumma %></td>
80- <td><%= link_to 'Show', mountain %></td>
81- <td><%= link_to 'Edit', edit_mountain_path(mountain) %></td>
82- <td><%= link_to 'Destroy', mountain, method: :delete, data: { confirm: 'Are you sure?' } %></td>
83- </tr>
84-<% end %>
85-</table>
86-
87-<br />
88-
89-<%= link_to 'New Mountain', new_mountain_path %>
--- a/app/views/mountains/index.html.erb
+++ b/app/views/mountains/index.html.erb
@@ -1,7 +1,7 @@
11 <h1><%= t 'mountains.title.list' %></h1>
2-<%= link_to '新規作成', new_mountain_path %>
2+<div class="navi">
3+ <%= link_to '新規作成', new_mountain_path %>
4+</div>
35 <hr />
46
57 <%= render 'form_index_short' %>
6-
7-
--- a/app/views/mountains/new.html.erb
+++ b/app/views/mountains/new.html.erb
@@ -1,5 +1,7 @@
1-<h1>New mountain</h1>
1+<h1><%= t 'mountains.title.new' %></h1>
2+<div class="navi">
3+ <%= link_to 'Back', mountains_path %>
4+</div>
5+<hr />
26
37 <%= render 'form' %>
4-
5-<%= link_to 'Back', mountains_path %>
--- a/app/views/mountains/show.html.erb
+++ b/app/views/mountains/show.html.erb
@@ -1,4 +1,10 @@
1+<h1><%= t 'mountains.title.show' %></h1>
2+<div class="navi">
3+ <%= link_to 'Edit', edit_mountain_path(@mountain) %> |
4+ <%= link_to 'Back', mountains_path %>
5+</div>
16 <p id="notice"><%= notice %></p>
7+<hr />
28
39 <p>
410 <b>Id:</b>
@@ -171,5 +177,3 @@
171177 </p>
172178
173179
174-<%= link_to 'Edit', edit_mountain_path(@mountain) %> |
175-<%= link_to 'Back', mountains_path %>
--- a/app/views/records/edit.html.erb
+++ b/app/views/records/edit.html.erb
@@ -1,6 +1,8 @@
1-<h1>Editing record</h1>
2-<%= link_to 'Show', @record %> |
3-<%= link_to 'Back', records_path %>
1+<h1><%= t 'records.title.edit' %></h1>
2+<div class="navi">
3+ <%= link_to 'Show', @record %> |
4+ <%= link_to 'Back', records_path %>
5+</div>
46 <hr />
57
68 <%= render 'form' %>
--- a/app/views/records/index.html.erb
+++ b/app/views/records/index.html.erb
@@ -1,5 +1,10 @@
1-<h1>Listing records</h1>
2-<%= link_to 'New Record', new_record_path %>
1+<h1><%= t 'records.title.list' %></h1>
2+<div class="navi">
3+ <%= link_to 'navi.new', new_record_path %>
4+ <div align="right">
5+ <%= link_to 'トップページへ', { :controller => 'top', :action => 'index' } %>
6+ </div>
7+</div>
38 <hr />
49
510 <table>
--- a/app/views/records/new.html.erb
+++ b/app/views/records/new.html.erb
@@ -1,5 +1,7 @@
1-<h1>New record</h1>
2-<%= link_to 'Back', records_path %>
1+<h1><%= t 'records.title.new' %></h1>
2+<div class="navi">
3+ <%= link_to 'Back', records_path %>
4+</div>
35 <hr />
46
57 <%= render 'form' %>
--- a/app/views/records/show.html.erb
+++ b/app/views/records/show.html.erb
@@ -1,5 +1,8 @@
1-<%= link_to 'Edit', edit_record_path(@record) %> |
2-<%= link_to 'Back', records_path %>
1+<h1><%= t 'records.title.show' %></h1>
2+<div class="navi">
3+ <%= link_to 'Edit', edit_record_path(@record) %> |
4+ <%= link_to 'Back', records_path %>
5+</div>
36 <p id="notice"><%= notice %></p>
47 <hr />
58
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -281,6 +281,12 @@ ja:
281281 title: キスゲプロジェクト
282282 footer: Powered by Ruby on Rails
283283 copyright: (C)Yoichi Kanno, 2013
284+ navi:
285+ back: 一覧表に戻る
286+ show: 表示
287+ edit: 編集
288+ new: 新規作成
289+ destroy: 削除
284290 users:
285291 title:
286292 list: 〈メンバー〉データ一覧表
@@ -295,10 +301,10 @@ ja:
295301 show: 〈山〉データ表示
296302 records:
297303 title:
298- list: 〈記録〉データ一覧表
299- edit: 〈記録〉データ編集
300- new: 〈記録〉データ新規作成
301- show: 〈記録〉データ表示
304+ list: 〈山行記録〉データ一覧表
305+ edit: 〈山行記録〉データ編集
306+ new: 〈山行記録〉データ新規作成
307+ show: 〈山行記録〉データ表示
302308 blogs:
303309 title:
304310 list: 〈ブログ〉データ一覧表
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,6 +31,7 @@ Kisuge::Application.routes.draw do
3131 post 'destroy'
3232 end
3333
34+ get 'top' => 'top#index'
3435
3536 # The priority is based upon order of creation:
3637 # first created -> highest priority.