SHIMADA Koji
null+****@clear*****
Mon Oct 8 21:33:18 JST 2012
SHIMADA Koji 2012-10-08 21:33:18 +0900 (Mon, 08 Oct 2012) New Revision: 447303a5301b3374249993d5f0b5b85cf707b371 https://github.com/logaling/logaling-server/commit/447303a5301b3374249993d5f0b5b85cf707b371 Log: Add contents for lisence of user glossary Added files: app/assets/images/by-sa.png app/controllers/pages_controller.rb app/views/pages/lisence.html.haml Modified files: app/assets/stylesheets/common.css app/assets/stylesheets/common.sass app/views/layouts/application.html.haml app/views/user_glossaries/_form.html.haml config/routes.rb Added: app/assets/images/by-sa.png (+0 -0) 100644 =================================================================== (Binary files differ) Modified: app/assets/stylesheets/common.css (+5 -0) =================================================================== --- app/assets/stylesheets/common.css 2012-10-08 21:13:26 +0900 (749b4ea) +++ app/assets/stylesheets/common.css 2012-10-08 21:33:18 +0900 (8001b57) @@ -267,10 +267,15 @@ body > footer { background: #e8f0ed; margin-top: 20px; } body > footer nav { + float: left; margin-top: 10px; width: 200px; display: inline-block; } +.lisence { + margin-top: 10px; + margin-bottom: 10px; } + .copyright { text-align: right; } .copyright * { Modified: app/assets/stylesheets/common.sass (+5 -0) =================================================================== --- app/assets/stylesheets/common.sass 2012-10-08 21:13:26 +0900 (d9fcecc) +++ app/assets/stylesheets/common.sass 2012-10-08 21:33:18 +0900 (75088d9) @@ -265,10 +265,15 @@ body > footer background: $lightGray margin-top: 20px nav + float: left margin-top: 10px width: 200px display: inline-block +.lisence + margin-top: 10px + margin-bottom: 10px + .copyright text-align: right * Added: app/controllers/pages_controller.rb (+4 -0) 100644 =================================================================== --- /dev/null +++ app/controllers/pages_controller.rb 2012-10-08 21:33:18 +0900 (4b7f948) @@ -0,0 +1,4 @@ +#coding: utf-8 +class PagesController < ApplicationController + def lisence; end +end Modified: app/views/layouts/application.html.haml (+6 -3) =================================================================== --- app/views/layouts/application.html.haml 2012-10-08 21:13:26 +0900 (2d6dcf8) +++ app/views/layouts/application.html.haml 2012-10-08 21:33:18 +0900 (126329a) @@ -46,9 +46,12 @@ %ul %li = link_to "logaling-command", "http://logaling.github.com" - .copyright - %p - © 2012 logaling project + .pull-right + .lisence + = link_to image_tag('by-sa.png', width: '88', height: '31'), lisence_path + .copyright + %p + © 2012 logaling project / Le javascript \================================================== Added: app/views/pages/lisence.html.haml (+11 -0) 100644 =================================================================== --- /dev/null +++ app/views/pages/lisence.html.haml 2012-10-08 21:33:18 +0900 (9f745f3) @@ -0,0 +1,11 @@ +- @title = '用語集のライセンスについて' +.container + %h1 + = @title + %p + 本サイトでユーザが作成する用語集のライセンスは、 + = link_to 'クリエイティブ・コモンズ3.0 BY-SA', 'http://creativecommons.org/licenses/by-sa/3.0/' + に従うものとします。 + %p + 用語集のコピー、配布は自由ですが、用語集作成者の名称を原著作者表示のクレジットとして引用したページへ表示してください。 + できれば、引用元として「logalingけんさく」の名称とコンテンツへのリンクもお願いします。 Modified: app/views/user_glossaries/_form.html.haml (+5 -0) =================================================================== --- app/views/user_glossaries/_form.html.haml 2012-10-08 21:13:26 +0900 (bc6ac13) +++ app/views/user_glossaries/_form.html.haml 2012-10-08 21:33:18 +0900 (bb6d34c) @@ -35,3 +35,8 @@ .controls .btn-group.actions = f.submit '登録する', :class => 'btn btn-large' + %span.help-block + %b Note: + 本サイトでユーザが作成する用語集のライセンスは、 + = link_to 'クリエイティブ・コモンズ3.0 BY-SA', 'http://creativecommons.org/licenses/by-sa/3.0/' + に従うものとします。 Modified: config/routes.rb (+2 -0) =================================================================== --- config/routes.rb 2012-10-08 21:13:26 +0900 (9e64654) +++ config/routes.rb 2012-10-08 21:33:18 +0900 (f63223a) @@ -1,6 +1,8 @@ LogalingServer::Application.routes.draw do get "search", :as => :search, :controller => 'search', :action => :index + get "lisence", to: 'pages#lisence', as: :lisence + resources :github_projects, :path => 'github', :constraints => {:id => %r{[^/]+/[^/]+}}, -------------- next part -------------- An HTML attachment was scrubbed...ダウンロード
