Commit 5bc97fbd authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

middle panel

parent f34b1be2
...@@ -529,3 +529,41 @@ h4.dash-tabs { ...@@ -529,3 +529,41 @@ h4.dash-tabs {
background: #eaeaea; background: #eaeaea;
} }
} }
h4.middle-panel {
margin: 0;
border-bottom: 1px solid #ccc;
padding: 10px 10px;
font-size: 11px;
padding-left:20px;
background: #F7F7F7;
height:30px;
.project_name {
float:left;
width:160px;
margin-right:30px;
font-size:16px;
font-weight:bold;
padding:5px 7px;
color:#777;
}
.git_url_wrapper {
padding:0px;
margin:0px;
float:left;
.git-url {
padding:0px;
margin:0px;
font-size: 12px;
border-radius: 5px;
color: #666;
box-shadow: 0 1px 2px rgba(0,0,0,.2) inset;
padding: 7px 0 5px 30px;
background: white url('images.png') no-repeat 8px -40px;
width: 250px;
}
}
}
...@@ -606,7 +606,6 @@ body.project-page .project-container{ position: relative; float: left; width: 10 ...@@ -606,7 +606,6 @@ body.project-page .project-container{ position: relative; float: left; width: 10
body.project-page .page-title{margin-bottom: 0} body.project-page .page-title{margin-bottom: 0}
body.project-page .project-sidebar {width: 180px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; } body.project-page .project-sidebar {width: 180px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; }
body.project-page input.text.git-url,
body.projects-page input.text.git-url { font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 8px 0 8px 30px; margin-bottom: 20px; background: white url('images.png') no-repeat 8px -40px; width: 136px} body.projects-page input.text.git-url { font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 8px 0 8px 30px; margin-bottom: 20px; background: white url('images.png') no-repeat 8px -40px; width: 136px}
body.projects-page input.text.git-url {margin:10px 0 0 } body.projects-page input.text.git-url {margin:10px 0 0 }
.git_url_wrapper { margin-right:50px } .git_url_wrapper { margin-right:50px }
......
...@@ -48,7 +48,7 @@ module ApplicationHelper ...@@ -48,7 +48,7 @@ module ApplicationHelper
def grouped_options_refs(destination = :tree) def grouped_options_refs(destination = :tree)
options = [ options = [
["Branch", @repo.heads.map(&:name) ], ["Branch", @project.repo.heads.map(&:name) ],
[ "Tag", @project.tags ] [ "Tag", @project.tags ]
] ]
......
...@@ -3,17 +3,15 @@ ...@@ -3,17 +3,15 @@
-#%a.right.button{:href => "#"} Download -#%a.right.button{:href => "#"} Download
-#-if can? current_user, :admin_project, @project -#-if can? current_user, :admin_project, @project
%a.right.button.blue{:href => "#"} EDIT %a.right.button.blue{:href => "#"} EDIT
%h2.icon - if params[:path]
%h2.icon
%span %span
%d %d
= link_to project_commits_path(@project) do = link_to project_commits_path(@project) do
= @project.name = @project.code
- if params[:path]
\/ \/
%a{:href => "#"}= params[:path].split("/").join(" / ") %a{:href => "#"}= params[:path].split("/").join(" / ")
.right= render :partial => "projects/refs", :locals => { :destination => :commits }
%div{:id => dom_id(@project)} %div{:id => dom_id(@project)}
#commits_list= render "commits" #commits_list= render "commits"
.clear .clear
......
%h4.middle-panel
.project_name= truncate @project.name, :length => 20
.git_url_wrapper
%input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
- if @project.repo_exists?
.right= render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
...@@ -17,11 +17,10 @@ ...@@ -17,11 +17,10 @@
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
#container #container
= render :partial => "layouts/head_panel" = render :partial => "layouts/head_panel"
= render :partial => "layouts/middle_panel" if @project && !@project.new_record?
.project-container .project-container
.project-sidebar .project-sidebar
.fixed .fixed
.git_url_wrapper
%input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
%aside %aside
= link_to "Activities", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil = link_to "Activities", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
= link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => current_page?(:controller => "refs", :action => "tree", :project_id => @project, :id => @ref || @project.root_ref ) ? "current" : nil = link_to "Tree", tree_project_ref_path(@project, @project.root_ref), :class => current_page?(:controller => "refs", :action => "tree", :project_id => @project, :id => @ref || @project.root_ref ) ? "current" : nil
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
\/ \/
= link = link
   
.right= render :partial => "projects/refs", :locals => { :destination => :tree }
.clear .clear
#tree-content-holder #tree-content-holder
- if tree.is_blob? - if tree.is_blob?
......
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