Commit 1ffb4b98 authored by gitlabhq's avatar gitlabhq

new design/layout started. projects page

parent 3fa770dd
[Dolphin] [Dolphin]
ShowPreview=true ShowPreview=true
Timestamp=2011,9,14,20,34,18 Timestamp=2011,10,28,13,16,25
Version=2 Version=2
This diff is collapsed.
...@@ -210,9 +210,9 @@ table.round-borders { ...@@ -210,9 +210,9 @@ table.round-borders {
padding:20px; padding:20px;
} }
body { //body {
background: #eaeaea; //background: #eaeaea;
} //}
a { a {
color: #111; color: #111;
......
This diff is collapsed.
<div id="header-panel"> <!-- Page Header -->
<header>
<h1 class="logo">
<a href="/">GITLAB</a></h1>
<div class="login-top">
<%= link_to profile_path, :class => "pic" do %>
<%= image_tag gravatar_icon(current_user.email) %>
<% end %>
<%= link_to profile_path, :class => "username" do %>
<%= current_user.name %>
<% end %>
<%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %>
</div>
<!-- .login-top -->
<nav>
<%= link_to root_path, :class => current_page?(root_path) ? "current dashboard" : "dashboard" do %>
<span></span>Dashboard
<% end %>
<%= link_to projects_path, :class => current_page?(projects_path) ? "current project" : "project" do %>
<span></span>Projects
<% end %>
<%= link_to( admin_root_path, :class => admin_namespace? ? "current admin" : "admin" ) do %>
<span></span>Admin
<% end if current_user.is_admin? %>
</nav>
</header>
<!-- eo Page Header -->
<div id="header-panel" style="display:none">
<div class="container"> <div class="container">
<div class="span-24"> <div class="span-24">
<div class="span-10"> <div class="span-10">
<%#= image_tag "git.png", :height => 40, :class => "left" %>
<%#= link_to "gitlab", root_path, :id => "logo" %>
<span class="search-holder"> <span class="search-holder">
<%= text_field_tag "search", nil, :placeholder => "Search" %> <%= text_field_tag "search", nil, :placeholder => "Search" %>
</span> </span>
</div> </div>
<div class="right"> <div class="right">
<%= link_to truncate(@project.name, :length => 20), project_path(@project), :class => "current button" if @project && !@project.new_record? %> <%= link_to truncate(@project.name, :length => 20), project_path(@project), :class => "current button" if @project && !@project.new_record? %>
<%= link_to 'Projects', projects_path, :class => current_page?(projects_path) ? "current button" : "button" %>
<%= link_to('Admin', admin_root_path, :class => admin_namespace? ? "current button" : "button" ) if current_user.is_admin? %>
<%= link_to profile_path, :class => ((controller.controller_name == "keys" || controller.controller_name == "profile") ? "current button" : "button") do %>
<%= image_tag gravatar_icon(current_user.email) %>
<%= current_user.name.split(" ").first %>
<% end %>
<%= link_to 'Logout', destroy_user_session_path, :style => "border-left: 1px solid #666;", :class => "button", :method => :delete %>
</div> </div>
</div> </div>
</div> </div>
......
- if content_for?(:page_title)
= yield :page_title
- else
.page-title
.container_3
%h1= controller.controller_name.capitalize
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
%head %head
%title %title
GitLab #{" - #{@project.name}" if @project && !@project.new_record?} GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
= stylesheet_link_tag 'blueprint/screen', :media => "screen, projection" -#= stylesheet_link_tag 'blueprint/screen', :media => "screen, projection"
= stylesheet_link_tag 'blueprint/print', :media => "print" -#= stylesheet_link_tag 'blueprint/print', :media => "print"
= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection" -#= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
= stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection" -#= stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection"
= stylesheet_link_tag "application" = stylesheet_link_tag "application"
= javascript_include_tag "application" = javascript_include_tag "application"
= csrf_meta_tags = csrf_meta_tags
...@@ -15,14 +15,18 @@ ...@@ -15,14 +15,18 @@
REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_URI = "#{request.env["REQUEST_URI"]}";
REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
%body#thebody %body#thebody
#container
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
- if user_signed_in? - if user_signed_in?
= render :partial => "layouts/head_panel" = render :partial => "layouts/head_panel"
.top_bar.container = render :partial => "layouts/page_title"
= render :partial => "projects/top_menu" if @project && !@project.new_record? - if @project && !@project.new_record?
= render :partial => "projects/projects_top_menu" if (controller.controller_name == "projects" && ["index", "new", "create"].include?(controller.action_name)) && !admin_namespace? .top_bar.container= render :partial => "projects/top_menu"
= render :partial => "profile/top_menu" if ["keys", "profile"].include?(controller.controller_name) - if ["keys", "profile"].include?(controller.controller_name)
= render :partial => "admin/top_menu" if admin_namespace? .top_bar.container= render :partial => "profile/top_menu"
#content-container.container - if admin_namespace?
.span-24 .top_bar.container= render :partial => "admin/top_menu"
%div{ :id => "main", :role => "main", :class => "container_3" }
#content-container
= yield = yield
- @projects.in_groups_of(3, false) do |projects| - @projects.in_groups_of(3, false) do |projects|
- projects.each_with_index do |project, i| - projects.each_with_index do |project, i|
%div{ :class => "project_thumb round-borders", :style => i == 2 ? "" : "margin-right:30px;" } %div.grid_1
%div{ :class => "project", :url => project_path(project) } %div{ :class => "project-box ui-box ui-box-big", :style => i == 2 ? "" : "margin-right:30px;" }
%h2 = link_to project_path(project) do
= image_tag gravatar_icon(project.name), :class => "left", :width => 40, :style => "padding-right:5px;" %h3= project.name
= link_to ("/" + project.code), project_path(project), :style => "text-decoration:none" .data
%p= project.name %p.title.repository
%p= project.url_to_repo %span Repository:
-#%p = project.url_to_repo
Commit &ndash; %p.title.activity
= last_commit(project) %span Last Activity:
%hr - last_note = project.notes.last
= link_to "Browse Code", tree_project_path(project), :class => "lbutton" = last_note ? last_note.created_at.stamp("24 Aug, 2011") : "Never"
= link_to "Commits", project_commits_path(project), :class => "lbutton", :style => "float:right;width:80px;" .buttons
.clear %a.browse-code.button.yellow{:href => tree_project_path(project)} Browse code
%a.commits.button.green{:href => project_commits_path(project)} Commits
- content_for(:page_title) do
.page-title
.container_3
- if current_user.can_create_project?
%a.grey-button{:href => new_project_path} Create new project
%h1 Projects
- unless @projects.empty? - unless @projects.empty?
%div{:class => "tile", :style => view_mode_style("tile")} %div{:class => "tile", :style => view_mode_style("tile")}
= render "tile" = render "tile"
......
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