Commit 9f73388f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge pull request #6002 from jhollingsworth/feature/clone-panel-twbs3

Update clone panel to use input group.
......@@ -35,7 +35,7 @@ $ ->
$('a, button', scope).removeClass 'active'
$(@).addClass 'active'
$('#project_clone', scope).val $(@).data 'clone'
$(".clone").text("").append 'git remote add origin ' + $(@).data 'clone'
$(".clone").text("").append $(@).data 'clone'
# Ref switcher
$('.project-refs-select').on 'change', ->
......
......@@ -72,45 +72,33 @@
}
.git-clone-holder {
margin-right: 45px;
border: 1px solid #E1E1E1;
@include border-radius(4px);
input[type="text"],
.btn {
border: none;
@include border-radius(0px);
border-left: 1px solid #E1E1E1;
.project-home-dropdown + & {
margin-right: 45px;
}
.btn,
.form-control {
border: 1px solid #E1E1E1;
box-shadow: none;
padding: 6px 9px;
}
.btn {
float: left;
background: none;
color: #29b;
&:first-child {
@include border-radius-left(4px);
border-left: 0px;
}
&.active {
color: #333;
font-weight: bold;
}
}
input[type="text"] {
.form-control {
cursor: auto;
@extend .monospace;
background: #FAFAFA;
width: 100%;
}
.protocol-clone {
overflow: hidden;
}
}
.project-visibility-level-holder {
......
......@@ -180,8 +180,9 @@ def project_head_title
title
end
def default_url_to_repo
current_user ? @project.url_to_repo : @project.http_url_to_repo
def default_url_to_repo(project = nil)
project = project || @project
current_user ? project.url_to_repo : project.http_url_to_repo
end
def default_clone_protocol
......
......@@ -11,8 +11,7 @@
- unless empty_repo
.project-home-dropdown
= render "dropdown"
.form-horizontal
= render "shared/clone_panel"
= render "shared/clone_panel"
.project-home-extra.row
.col-md-8
......
......@@ -29,8 +29,7 @@
touch README
git add README
git commit -m 'first commit'
%span.clone= "git remote add origin #{default_url_to_repo}"
:preserve
git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
git push -u origin master
%fieldset
......@@ -38,8 +37,7 @@
%pre.dark
:preserve
cd existing_git_repo
%span.clone= "git remote add origin #{default_url_to_repo}"
:preserve
git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
git push -u origin master
- if can? current_user, :remove_project, @project
......
= render 'nav'
%h3.page-title
Git access for
%strong= @gollum_wiki.path_with_namespace
.row
.col-sm-6
%h3.page-title
Git access for
%strong= @gollum_wiki.path_with_namespace
.form-horizontal.pull-right
.git-clone-holder
%button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH
%button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= gitlab_config.protocol.upcase
= text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select form-control", readonly: true
.col-sm-6
= render "shared/clone_panel", project: @gollum_wiki
.git-empty
%fieldset
......@@ -19,7 +18,7 @@
%legend Clone Your Wiki:
%pre.dark
:preserve
git clone #{@gollum_wiki.ssh_url_to_repo}
git clone #{ content_tag(:span, default_url_to_repo(@gollum_wiki), class: 'clone')}
cd #{@gollum_wiki.path}
%legend Start Gollum And Edit Locally:
......
.git-clone-holder
.protocol-btns
%button{class: "btn #{ 'active' if default_clone_protocol == 'ssh' }", :"data-clone" => @project.ssh_url_to_repo} SSH
%button{class: "btn #{ 'active' if default_clone_protocol == 'http' }", :"data-clone" => @project.http_url_to_repo}= gitlab_config.protocol.upcase
.protocol-clone
= text_field_tag :project_clone, default_url_to_repo, class: "one_click_select span4", readonly: true
- project = project || @project
.git-clone-holder.input-group
.input-group-btn
%button{class: "btn #{ 'active' if default_clone_protocol == 'ssh' }", :"data-clone" => project.ssh_url_to_repo} SSH
%button{class: "btn #{ 'active' if default_clone_protocol == 'http' }", :"data-clone" => project.http_url_to_repo}= gitlab_config.protocol.upcase
= text_field_tag :project_clone, default_url_to_repo(project), class: "one_click_select form-control", readonly: true
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