SHIMADA Koji
null+****@clear*****
Thu Sep 27 10:18:08 JST 2012
SHIMADA Koji 2012-09-27 10:18:08 +0900 (Thu, 27 Sep 2012) New Revision: 4dfd9b944dc7bdefb1f8b816748488ec44d87ae8 https://github.com/logaling/logaling-server/commit/4dfd9b944dc7bdefb1f8b816748488ec44d87ae8 Merged ef3396d: Merge pull request #17 from logaling/apply-design Log: Fix page titles Modified files: app/views/dashboard/show.html.haml app/views/github_project_memberships/new.html.haml app/views/github_projects/new.html.haml app/views/github_projects/show.html.haml app/views/glossaries/show.html.haml app/views/layouts/application.html.haml app/views/search/index.html.haml app/views/sessions/new.html.haml app/views/terms/edit.html.haml app/views/terms/new.html.haml app/views/top/index.html.haml app/views/user_glossaries/new.html.haml app/views/user_glossaries/show.html.haml Modified: app/views/dashboard/show.html.haml (+2 -1) =================================================================== --- app/views/dashboard/show.html.haml 2012-09-27 01:49:38 +0900 (1b914ea) +++ app/views/dashboard/show.html.haml 2012-09-27 10:18:08 +0900 (c680af0) @@ -1,6 +1,7 @@ +- @title = "マイページ" .container %h1 - マイページ + = @title %h2 わたしの用語集 %p Modified: app/views/github_project_memberships/new.html.haml (+3 -1) =================================================================== --- app/views/github_project_memberships/new.html.haml 2012-09-27 01:49:38 +0900 (ba83954) +++ app/views/github_project_memberships/new.html.haml 2012-09-27 10:18:08 +0900 (9e64bf9) @@ -1,4 +1,6 @@ +- @title = "プロジェクトの登録" .container - %h2 プロジェクトの登録 + %h2 + = @title .well = render 'form' Modified: app/views/github_projects/new.html.haml (+3 -1) =================================================================== --- app/views/github_projects/new.html.haml 2012-09-27 01:49:38 +0900 (ba83954) +++ app/views/github_projects/new.html.haml 2012-09-27 10:18:08 +0900 (9e64bf9) @@ -1,4 +1,6 @@ +- @title = "プロジェクトの登録" .container - %h2 プロジェクトの登録 + %h2 + = @title .well = render 'form' Modified: app/views/github_projects/show.html.haml (+9 -8) =================================================================== --- app/views/github_projects/show.html.haml 2012-09-27 01:49:38 +0900 (d9909a8) +++ app/views/github_projects/show.html.haml 2012-09-27 10:18:08 +0900 (fe93193) @@ -1,10 +1,11 @@ -%p#notice= notice - -.well - %h2= @github_project.full_name - %p= @github_project.remote_repository_url +- @title = "#{@github_project.full_name} の用語集一覧" +.container + %h1 + = @github_project.full_name %p + = @github_project.remote_repository_url + %ul.glossariesList - @github_project.glossaries.each do |glossary| - %i.icon-folder-close - - bilingual_pair = [glossary.source_language, glossary.target_language].join('-') - = link_to bilingual_pair, github_project_glossary_path(:id => bilingual_pair, :github_project_id => @github_project) + %li + - bilingual_pair = [glossary.source_language, glossary.target_language].join('-') + = link_to bilingual_pair, github_project_glossary_path(:id => bilingual_pair, :github_project_id => @github_project) Modified: app/views/glossaries/show.html.haml (+1 -0) =================================================================== --- app/views/glossaries/show.html.haml 2012-09-27 01:49:38 +0900 (e69d334) +++ app/views/glossaries/show.html.haml 2012-09-27 10:18:08 +0900 (352fb23) @@ -1,3 +1,4 @@ +- @title = "#{@github_project.full_name} #{@glossary.source_language} #{@glossary.target_language} の用語一覧" .container %h1 = @github_project.full_name Modified: app/views/layouts/application.html.haml (+1 -1) =================================================================== --- app/views/layouts/application.html.haml 2012-09-27 01:49:38 +0900 (46b29a8) +++ app/views/layouts/application.html.haml 2012-09-27 10:18:08 +0900 (7b10fe4) @@ -2,7 +2,7 @@ %html{:lang => "en"} %head %meta{:charset => "utf-8"}/ - %title= ['logaling', @title].flatten.compact.join(' | ') + %title= ['logalingけんさく', @title].flatten.compact.join(' | ') = csrf_meta_tags / Le HTML5 shim, for IE6-8 support of HTML elements /[if lt IE 9] Modified: app/views/search/index.html.haml (+2 -1) =================================================================== --- app/views/search/index.html.haml 2012-09-27 01:49:38 +0900 (deb16f1) +++ app/views/search/index.html.haml 2012-09-27 10:18:08 +0900 (b54fcb4) @@ -1,6 +1,7 @@ +- @title = "検索結果" %div.container %h1 - 検索結果 + = @title - if****@terms*****? %p 1- Modified: app/views/sessions/new.html.haml (+2 -1) =================================================================== --- app/views/sessions/new.html.haml 2012-09-27 01:49:38 +0900 (f89a5a4) +++ app/views/sessions/new.html.haml 2012-09-27 10:18:08 +0900 (20f5d92) @@ -1,6 +1,7 @@ +- @title = "サインイン" .container.signIn %h1 - サインイン + = @title - %w(GitHub Facebook Twitter).each do |provider| .span8.offset2 %section Modified: app/views/terms/edit.html.haml (+2 -1) =================================================================== --- app/views/terms/edit.html.haml 2012-09-27 01:49:38 +0900 (a68817b) +++ app/views/terms/edit.html.haml 2012-09-27 10:18:08 +0900 (ea1cc36) @@ -1,8 +1,9 @@ +- @title = "用語の編集" .container %h1 = @user_glossary.title_text %h2 - 用語の編集 + = @title .well = form_for @term, url: user_glossary_term_path(current_user, @user_glossary, @term.id), method: :put, :html => { :class => 'form-horizontal' } do |f| -if****@term*****? Modified: app/views/terms/new.html.haml (+3 -1) =================================================================== --- app/views/terms/new.html.haml 2012-09-27 01:49:38 +0900 (3620117) +++ app/views/terms/new.html.haml 2012-09-27 10:18:08 +0900 (3ab12b1) @@ -1,6 +1,8 @@ +- @title = "用語を登録" .container %h1 = @user_glossary.title_text - %h2 用語を登録 + %h2 + = @title .well = render 'form' Modified: app/views/top/index.html.haml (+1 -0) =================================================================== --- app/views/top/index.html.haml 2012-09-27 01:49:38 +0900 (b306962) +++ app/views/top/index.html.haml 2012-09-27 10:18:08 +0900 (3c81b1c) @@ -1,3 +1,4 @@ +- @title = "HOME" .catch .container %h1 Modified: app/views/user_glossaries/new.html.haml (+3 -1) =================================================================== --- app/views/user_glossaries/new.html.haml 2012-09-27 01:49:38 +0900 (448c531) +++ app/views/user_glossaries/new.html.haml 2012-09-27 10:18:08 +0900 (63b4a78) @@ -1,4 +1,6 @@ +- @title = "用語集の新規作成" .container - %h2 用語集の新規作成 + %h2 + = @title .well = render 'form' Modified: app/views/user_glossaries/show.html.haml (+1 -0) =================================================================== --- app/views/user_glossaries/show.html.haml 2012-09-27 01:49:38 +0900 (862b95b) +++ app/views/user_glossaries/show.html.haml 2012-09-27 10:18:08 +0900 (88c4841) @@ -1,3 +1,4 @@ +- @title = "#{@user_glossary.title_text} の用語一覧" .container %h1 = @user_glossary.title_text -------------- next part -------------- An HTML attachment was scrubbed...Download