Commit 69e41250 authored by randx's avatar randx

Styled New/Edit Project for admin area

parent 21781043
= form_for [:admin, @admin_project] do |f| = form_for [:admin, project] do |f|
-if @admin_project.errors.any? -if project.errors.any?
.alert-message.block-message.error .alert-message.block-message.error
%ul %ul
- @admin_project.errors.full_messages.each do |msg| - project.errors.full_messages.each do |msg|
%li= msg %li= msg
.clearfix .clearfix.project_name_holder
= f.label :name = f.label :name do
.input= f.text_field :name Project name is
.clearfix
= f.label :path do
Path
.input .input
.input-prepend = f.text_field :name, :placeholder => "Example Project", :class => "xxlarge"
%span.add-on= Gitlab.config.ssh_path = f.submit project.new_record? ? 'Create project' : 'Save Project', :class => "btn primary"
= f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record?
.clearfix
= f.label :code do
Code
.input
.input-prepend
%span.add-on= web_app_url
= f.text_field :code, :placeholder => "example"
- unless @admin_project.new_record? %hr
.alert.alert-info
%h5 Advanced settings:
.clearfix
= f.label :path do
Git Clone
.input
.input-prepend
%span.add-on= Gitlab.config.ssh_path
= f.text_field :path, :placeholder => "example_project", :disabled => !!project.id
%span.add-on= ".git"
.clearfix .clearfix
= f.label :owner_id = f.label :code do
.input= f.select :owner_id, User.all.map { |user| [user.name, user.id] } URL
.input
.input-prepend
%span.add-on= web_app_url
= f.text_field :code, :placeholder => "example"
- if @admin_project.repo_exists? - unless project.new_record?
.clearfix .clearfix
= f.label :default_branch, "Default Branch" = f.label :owner_id
.input= f.select(:default_branch, @admin_project.heads.map(&:name), {}, :style => "width:210px;") .input= f.select :owner_id, User.all.map { |user| [user.name, user.id] }
.well - if project.repo_exists?
%h5 Features .clearfix
= f.label :default_branch, "Default Branch"
.input= f.select(:default_branch, project.heads.map(&:name), {}, :style => "width:210px;")
- unless project.new_record?
.alert.alert-info
%h5 Features:
.clearfix .clearfix
= f.label :issues_enabled, "Issues" = f.label :issues_enabled, "Issues"
...@@ -48,19 +57,19 @@ ...@@ -48,19 +57,19 @@
= f.label :wall_enabled, "Wall" = f.label :wall_enabled, "Wall"
.input= f.check_box :wall_enabled .input= f.check_box :wall_enabled
.clearfix .clearfix
= f.label :description = f.label :wiki_enabled, "Wiki"
.input= f.text_area :description, :class => "xxlarge" .input= f.check_box :wiki_enabled
.clear
%br - unless project.new_record?
.actions .actions
= f.submit 'Save', :class => "btn primary" = f.submit 'Save Project', :class => "btn primary"
= link_to 'Cancel', [:admin, @admin_project], :class => "btn"
- unless @admin_project.new_record?
= link_to 'Destroy', [:admin, @admin_project], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger right"
:javascript :javascript
$(function(){ $(function(){
$('#project_owner_id').chosen(); $('#project_owner_id').chosen();
new Projects(); new Projects();
}) })
%h3= @admin_project.name %h3.page_title #{@admin_project.name} → Edit project
%hr %hr
= render 'form' = render 'form', :project => @admin_project
%h2 New project %h3.page_title New project
%hr %hr
= render 'form' = render 'form', :project => @admin_project
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
%tr %tr
%td %td
%b %b
Description: Owner:
%td %td
= @admin_project.description = @admin_project.owner.name
%tr %tr
%td %td
%b %b
......
...@@ -41,15 +41,15 @@ describe "Admin::Projects" do ...@@ -41,15 +41,15 @@ describe "Admin::Projects" do
end end
it "should have project edit page" do it "should have project edit page" do
page.should have_content("Name") page.should have_content("Project name")
page.should have_content("Code") page.should have_content("URL")
end end
describe "Update project" do describe "Update project" do
before do before do
fill_in "project_name", :with => "Big Bang" fill_in "project_name", :with => "Big Bang"
fill_in "project_code", :with => "BB1" fill_in "project_code", :with => "BB1"
click_button "Save" click_button "Save Project"
@project.reload @project.reload
end end
...@@ -76,20 +76,19 @@ describe "Admin::Projects" do ...@@ -76,20 +76,19 @@ describe "Admin::Projects" do
end end
it "should have labels for new project" do it "should have labels for new project" do
page.should have_content("Name") page.should have_content("Project name is")
page.should have_content("Path") page.should have_content("Git Clone")
page.should have_content("Description") page.should have_content("URL")
end end
end end
describe "POST /admin/projects" do describe "POST /admin/projects" do
before do before do
visit new_admin_project_path visit new_admin_project_path
fill_in 'Name', :with => 'NewProject' fill_in 'project_name', :with => 'NewProject'
fill_in 'Code', :with => 'NPR' fill_in 'project_code', :with => 'NPR'
fill_in 'Path', :with => 'gitlabhq_1' fill_in 'project_path', :with => 'gitlabhq_1'
fill_in 'Description', :with => 'New Project Description' expect { click_button "Create project" }.to change { Project.count }.by(1)
expect { click_button "Save" }.to change { Project.count }.by(1)
@project = Project.last @project = Project.last
end end
...@@ -100,7 +99,6 @@ describe "Admin::Projects" do ...@@ -100,7 +99,6 @@ describe "Admin::Projects" do
it "should show project" do it "should show project" do
page.should have_content(@project.name) page.should have_content(@project.name)
page.should have_content(@project.path) page.should have_content(@project.path)
page.should have_content(@project.description)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment