SHIMADA Koji
null+****@clear*****
Wed Sep 26 16:44:40 JST 2012
SHIMADA Koji 2012-09-26 16:44:40 +0900 (Wed, 26 Sep 2012) New Revision: db40101d941faac63ebdfaa25f1aa34018f15a92 https://github.com/logaling/logaling-server/commit/db40101d941faac63ebdfaa25f1aa34018f15a92 Merged bf95d1c: Merge branch 'apply-design' of github.com:logaling/logaling-server into apply-design Log: Apply design to github_project_memberships#new Modified files: app/views/github_project_memberships/_form.html.haml app/views/github_project_memberships/new.html.haml app/views/github_projects/_form.html.haml app/views/github_projects/new.html.haml Modified: app/views/github_project_memberships/_form.html.haml (+6 -5) =================================================================== --- app/views/github_project_memberships/_form.html.haml 2012-09-26 16:28:07 +0900 (13b52f5) +++ app/views/github_project_memberships/_form.html.haml 2012-09-26 16:44:40 +0900 (1e23b63) @@ -1,4 +1,4 @@ -= form_for [current_user, @github_project_membership] do |f| += form_for [current_user, @github_project_membership], :html => { :class => "form-horizontal" } do |f| -if @github_project_membership.errors.any? #error_explanation %h2= "#{pluralize(@github_project_membership.errors.count, "error")} prohibited this membership from being saved:" @@ -6,12 +6,13 @@ - @github_project_membership.errors.full_messages.each do |msg| %li= msg - .well + .control-group http://github.com/ - = f.text_field :project_owner + = f.text_field :project_owner#, :class => 'conrols' \/ = f.text_field :project_name = f.hidden_field :user_id, value: current_user.id - .actions - = f.submit 'Save', :class => 'btn btn-primary' + .control-group + .btn-group.actions + = f.submit '登録する', :class => 'btn btn-large' Modified: app/views/github_project_memberships/new.html.haml (+4 -3) =================================================================== --- app/views/github_project_memberships/new.html.haml 2012-09-26 16:28:07 +0900 (11a484a) +++ app/views/github_project_memberships/new.html.haml 2012-09-26 16:44:40 +0900 (ba83954) @@ -1,3 +1,4 @@ -%h1 New github project membership - -= render 'form' +.container + %h2 プロジェクトの登録 + .well + = render 'form' Modified: app/views/github_projects/_form.html.haml (+5 -4) =================================================================== --- app/views/github_projects/_form.html.haml 2012-09-26 16:28:07 +0900 (1cf0a43) +++ app/views/github_projects/_form.html.haml 2012-09-26 16:44:40 +0900 (dbfcc5e) @@ -1,4 +1,4 @@ -= form_for @github_project do |f| += form_for @github_project, :html => { :class => "form-horizontal" } do |f| -if @github_project.errors.any? #error_explanation %h2= "#{pluralize(@github_project.errors.count, "error")} prohibited this github_project from being saved:" @@ -7,11 +7,12 @@ %li= msg -# TODO should be just one text field - .well + .control-group http://github.com/ = f.text_field :owner \/ = f.text_field :name - .actions - = f.submit 'Save', :class => 'btn btn-primary' + .control-group + .btn-group.actions + = f.submit '登録する', :class => 'btn btn-large' Modified: app/views/github_projects/new.html.haml (+4 -3) =================================================================== --- app/views/github_projects/new.html.haml 2012-09-26 16:28:07 +0900 (756f469) +++ app/views/github_projects/new.html.haml 2012-09-26 16:44:40 +0900 (ba83954) @@ -1,3 +1,4 @@ -%h1 New Project - -= render 'form' +.container + %h2 プロジェクトの登録 + .well + = render 'form' -------------- next part -------------- An HTML attachment was scrubbed...Download