• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ

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

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Web appl using RoR 3.2.14


コミットメタ情報

リビジョンaa830ce82360178b6e287923767df7abb2f327e9 (tree)
日時2013-09-07 05:04:44
作者unknown <Yoichi.K@VENU...>
コミッターunknown

ログメッセージ

after work on Sept. 6

変更サマリ

差分

--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -17,7 +17,7 @@ body {
1717
1818 img {border: 0;}
1919 h1 {
20- margin: 0 0 0.5em 0;
20+ margin: 0.2em 0 0.2em 0;
2121 padding: 6px;
2222 border-bottom: 2px solid #0089be;
2323 color: #0089be;
@@ -72,22 +72,31 @@ p#copyright {
7272 font-size: small;
7373 background-color: #fffff;
7474 }
75-p#logout {
75+div#logout {
7676 margin: 0;
77- padding: 10px;
77+ padding: 5px;
7878 color: #000000;
79- font-size: medium;
80- background-color: #ffff99;
79+ font-size: small;
80+ font-weight: bold;
81+ background-color: #ffffff;
8182 }
8283 div.header {
8384 margin: 0;
84- padding: 5px;
85+ padding: 0px;
8586 color: ivory;
8687 font-size: large;
8788 font-weight: bold;
8889 background-color: azure;
8990 }
90-div.navi {
91+div#navigator {
92+ margin: 5;
93+ padding: 5px;
94+ color: navy;
95+ font-size: medium;
96+ font-weight: bold;
97+ background-color: #FFF;
98+}
99+div.toolbar {
91100 margin: 0;
92101 padding: 5px;
93102 color: deepskyblue;
--- a/app/controllers/mountains_controller.rb
+++ b/app/controllers/mountains_controller.rb
@@ -4,7 +4,7 @@ class MountainsController < ApplicationController
44 def index
55 # @mountains = Mountain.all
66 @mountains = Mountain.order('id ASC').
7- paginate(:page => params[:page], :per_page => 20)
7+ paginate(:page => params[:page], :per_page => 10)
88
99 respond_to do |format|
1010 format.html # index.html.erb
--- /dev/null
+++ b/app/views/_side.html.erb
@@ -0,0 +1,8 @@
1+<strong><%= t 'side.title' %></strong>
2+<ul>
3+ <li><%= link_to "Home", root_path %></li>
4+ <li><%= link_to "Mountain", mountains_path %></li>
5+ <p id="logout">
6+ <%= link_to 'ログアウト', logout_path %>
7+ </p>
8+</ul>
--- /dev/null
+++ b/app/views/application/_side.html.erb
@@ -0,0 +1,29 @@
1+<img src="top_banner.jpg" width=640 border=0>
2+<div id="logout" align="right">
3+ <table width=640 border=0>
4+ <tr>
5+ <td width=560>
6+ </td>
7+ <td width=80>
8+ <%= link_to 'ログアウト', logout_path %>
9+ </td>
10+ </tr>
11+ </table>
12+</div>
13+<div id="navigator">
14+ <table width=640 border=0 bgcolor="yellowgreen">
15+ <tr>
16+ <td width="160">
17+ <b><%= link_to('ホーム', root_path) %></b>
18+ </td><td width="160">
19+ <b><%= link_to('山のリスト', mountains_path) %></b>
20+ </td><td width="160">
21+ <b><%= link_to('山行記録', records_path) %></b>
22+ </td><td width="160">
23+ <b><%= link_to('ブログ', blogs_path) %></b>
24+ </td><td>
25+ </td>
26+ </tr>
27+ </table>
28+</div>
29+</ul>
--- a/app/views/blogs/edit.html.erb
+++ b/app/views/blogs/edit.html.erb
@@ -1,6 +1,8 @@
11 <h1>Editing blog</h1>
2+Kdiv id="toolbar">
3+ <%= link_to 'Show', @blog %> |
4+ <%= link_to 'Back', blogs_path %>
5+</div>
26
37 <%= render 'form' %>
48
5-<%= link_to 'Show', @blog %> |
6-<%= link_to 'Back', blogs_path %>
--- a/app/views/blogs/index.html.erb
+++ b/app/views/blogs/index.html.erb
@@ -1,5 +1,7 @@
11 <h1>Listing blogs</h1>
2-<%= link_to 'New Blog', new_blog_path %>
2+<div id="toolbar">
3+ <%= link_to 'New Blog', new_blog_path %>
4+</div>
35 <hr />
46
57 <table>
--- a/app/views/blogs/new.html.erb
+++ b/app/views/blogs/new.html.erb
@@ -1,5 +1,7 @@
11 <h1>New blog</h1>
2+<div id="toolbar">
3+ <%= link_to 'Back', blogs_path %>
4+</div>
25
36 <%= render 'form' %>
47
5-<%= link_to 'Back', blogs_path %>
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,11 +1,16 @@
11 <h1>Kisuge's Top Page </h1>
22
3-<p>
3+<p align="right">
44 <%= link_to 'Log-in', login_path %>ログイン
55 </p>
6-
6+<p>このサイトには、次のメニューがあります。</p>
77 <ul>
8- <li><a href="users/"><b>メンバー</b></a></li>
98 <li><a href="mountains/"><b>山のリスト</b></a></li>
10- <li><a href="blogs/"><b>ブログのリスト</b></a></li>
9+ <li><a href="records/"><b>山行記録</b></a></li>
10+ <li><a href="blogs/"><b>ブログ</b></a></li>
11+ <li><a href="users/"><b>メンバー</b></a></li>
1112 </ul>
13+<p>《山のリスト》には、日本百名山、日本200名山、日本300名山、日本の山1000を網羅した山の情報が掲載されております。(全部で1,015座あります。)
14+<p>《山行記録》は、会員登録されたユーザーが、ご自身の山行記録を作成するページです。この機能をお使いになるには、あらかじめログインを行ってください。</p>
15+<p>《ブログ》では、山行記、山のよもやま話、エッセイなどお好きな記事を投稿できます。投稿するには、あらかじめログインを行ってください。閲覧はログインしていなくても可能です。</p>
16+
--- a/app/views/layouts/_navigater.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
1-<div class="header">
2-<table>
3- <tr>
4- <td>
5- <div>
6- </div>
7- <td>
8- <div>
9- <p id="logout"><%= link_to 'ログアウト', logout_path %></p>
10- </div>
11- </td>
12- </tr>
13-</table>
14-</div>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,8 +8,10 @@
88 <%= favicon_link_tag '/favicon.gif', :type => "image/gif" %>
99 </head>
1010 <body>
11-<%= render 'navigater' %>
12-<%= content_for?(:content) ? yield(:content) : yield %>
11+<div id="side">
12+ <%= render "side" %>
13+</div>
14+<%= yield %>
1315
1416 <hr />
1517 <table>
--- a/app/views/mountains/edit.html.erb
+++ b/app/views/mountains/edit.html.erb
@@ -1,5 +1,5 @@
11 <h1><%= t 'mountains.title.edit' %></h1>
2-<div class="navi">
2+<div class="toolbar">
33 <%= link_to 'Show', @mountain %> |
44 <%= link_to 'Back', mountains_path %>
55 </div>
--- a/app/views/mountains/index.html.erb
+++ b/app/views/mountains/index.html.erb
@@ -1,5 +1,5 @@
11 <h1><%= t 'mountains.title.list' %></h1>
2-<div class="navi">
2+<div class="toolbar">
33 <%= link_to '新規作成', new_mountain_path %>
44 </div>
55 <hr />
--- a/app/views/mountains/new.html.erb
+++ b/app/views/mountains/new.html.erb
@@ -1,5 +1,5 @@
11 <h1><%= t 'mountains.title.new' %></h1>
2-<div class="navi">
2+<div class="toolbar">
33 <%= link_to 'Back', mountains_path %>
44 </div>
55 <hr />
--- a/app/views/mountains/show.html.erb
+++ b/app/views/mountains/show.html.erb
@@ -1,5 +1,5 @@
11 <h1><%= t 'mountains.title.show' %></h1>
2-<div class="navi">
2+<div class="toolbar">
33 <%= link_to 'Edit', edit_mountain_path(@mountain) %> |
44 <%= link_to 'Back', mountains_path %>
55 </div>
--- a/app/views/records/edit.html.erb
+++ b/app/views/records/edit.html.erb
@@ -1,5 +1,5 @@
11 <h1><%= t 'records.title.edit' %></h1>
2-<div class="navi">
2+<div class="toolbar">
33 <%= link_to 'Show', @record %> |
44 <%= link_to 'Back', records_path %>
55 </div>
--- a/app/views/records/index.html.erb
+++ b/app/views/records/index.html.erb
@@ -1,5 +1,5 @@
11 <h1><%= t 'records.title.list' %></h1>
2-<div class="navi">
2+<div class="toolbar">
33 <%= link_to 'navi.new', new_record_path %>
44 <div align="right">
55 <%= link_to 'トップページへ', { :controller => 'top', :action => 'index' } %>
--- a/app/views/records/new.html.erb
+++ b/app/views/records/new.html.erb
@@ -1,5 +1,5 @@
11 <h1><%= t 'records.title.new' %></h1>
2-<div class="navi">
2+<div class="toolbar">
33 <%= link_to 'Back', records_path %>
44 </div>
55 <hr />
--- a/app/views/records/show.html.erb
+++ b/app/views/records/show.html.erb
@@ -1,5 +1,5 @@
11 <h1><%= t 'records.title.show' %></h1>
2-<div class="navi">
2+<div class="toolbar">
33 <%= link_to 'Edit', edit_record_path(@record) %> |
44 <%= link_to 'Back', records_path %>
55 </div>
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,6 +1,8 @@
11 <h1><%= t 'users.title.edit' %></h1>
2-<%= link_to 'Show', @user %> |
3-<%= link_to 'Back', users_path %>
2+<div id="toolbar">
3+ <%= link_to 'Show', @user %> |
4+ <%= link_to 'Back', users_path %>
5+</div>
46 <hr />
57
68 <%= render 'form' %>
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,6 +1,6 @@
11 <h1><%= t 'users.title.list' %></h1>
22
3-<div class="navi">
3+<div class="toolbar">
44 <%= link_to 'New User', new_user_path %>
55 </div>
66 <p id="notice"><%= notice %></p>
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,5 +1,7 @@
11 <h1><%= t 'users.title.new' %></h1>
2-<%= link_to 'Back', users_path %>
2+<div id="toolbar">
3+ <%= link_to 'Back', users_path %>
4+</div>
35 <hr />
46
57 <%= render 'form' %>
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,4 +1,4 @@
1-<div class="navi">
1+<div class="toolbar">
22 <%= link_to 'Edit', edit_user_path(@user) %> |
33 <%= link_to 'Back', users_path %>
44 </div>
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -281,6 +281,13 @@ ja:
281281 title: キスゲプロジェクト
282282 footer: Powered by Ruby on Rails
283283 copyright: (C)Yoichi Kanno, 2013
284+ side:
285+ title: メニュー
286+ label:
287+ top: ホーム
288+ mountains: 山の一覧
289+ records: 山行記録
290+ blogs: ブログ
284291 navi:
285292 back: 一覧表に戻る
286293 show: 表示
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,7 @@
11 Kisuge::Application.routes.draw do
22
33 root :to => 'home#index'
4+ get "top" => 'home#index'
45 get "admin/index" => 'admin#index'
56
67 post 'login/auth' => 'login#auth'
@@ -38,8 +39,9 @@ Kisuge::Application.routes.draw do
3839 resources :records do
3940 collection do
4041 get 'conquer' => 'records#conquer'
42+ get 'top' => 'records#index'
4143 end
42- get 'index'
44+ get 'index' => 'records#index'
4345 get 'show'
4446 post 'new'
4547 post 'edit'
Binary files /dev/null and b/public/CIMG1423.JPG differ
Binary files /dev/null and b/public/DSC_8102.JPG differ
Binary files /dev/null and b/public/top_banner.jpg differ