Commit 1ffb4b98 authored by gitlabhq's avatar gitlabhq

new design/layout started. projects page

parent 3fa770dd
8-5-nxd 8-2-nxd 8-2-stable 8-4-nxd 8-4-stable 8-5-stable 8-6-nxd 8-6-stable 8-7-nxd 8-8-nxd 8-9-nxd master v8.11.0.pre v8.10.3 v8.10.2 v8.10.1 v8.10.0 v8.10.0.pre v8.10.0-rc13 v8.10.0-rc12 v8.10.0-rc11 v8.10.0-rc10 v8.10.0-rc9 v8.10.0-rc8 v8.10.0-rc7 v8.10.0-rc6 v8.10.0-rc5 v8.10.0-rc4 v8.10.0-rc3 v8.10.0-rc2 v8.10.0-rc1 v8.9.6 v8.9.5 v8.9.4 v8.9.3 v8.9.2 v8.9.1 v8.9.0 v8.9.0-rc8 v8.9.0-rc7 v8.9.0-rc6 v8.9.0-rc5 v8.9.0-rc4 v8.9.0-rc3 v8.9.0-rc2 v8.9.0-rc1 v8.8.7 v8.8.6 v8.8.5 v8.8.4 v8.8.3 v8.8.2 v8.8.1 v8.8.0 v8.8.0-rc2 v8.8.0-rc1 v8.7.9 v8.7.8 v8.7.7 v8.7.6 v8.7.5 v8.7.4 v8.7.3 v8.7.2 v8.7.1 v8.7.0 v8.7.0-rc7 v8.7.0-rc6 v8.7.0-rc5 v8.7.0-rc4 v8.7.0-rc3 v8.7.0-rc2 v8.7.0-rc1 v8.6.9 v8.6.8 v8.6.7 v8.6.6 v8.6.5 v8.6.4 v8.6.3 v8.6.2 v8.6.1 v8.6.0 v8.6.0-rc5 v8.6.0-rc4 v8.6.0-rc3 v8.6.0-rc2 v8.6.0-rc1 v8.5.13 v8.5.12 v8.5.11 v8.5.10 v8.5.9 v8.5.8 v8.5.7 v8.5.6 v8.5.5 v8.5.5-rc1 v8.5.4 v8.5.3 v8.5.2 v8.5.1 v8.5.1.TR v8.5.1.RD2 v8.5.1.RD1 v8.5.1.DB2 v8.5.1.DB v8.5.0 v8.5.0-rc4 v8.5.0-rc3 v8.5.0-rc2 v8.5.0-rc1 v8.4.11 v8.4.10 v8.4.9 v8.4.8 v8.4.7 v8.4.6 v8.4.5 v8.4.4 v8.4.3 v8.4.2 v8.4.1 v8.4.0 v8.4.0.rc1 v8.4.0-rc3 v8.4.0-rc2 v8.3.10 v8.3.9 v8.3.8 v8.3.7 v8.3.6 v8.3.5 v8.3.4 v8.3.3 v8.3.2 v8.3.1 v8.3.0 v8.3.0.rc3 v8.3.0.rc2 v8.3.0.rc1 v8.2.6 v8.2.5 v8.2.4 v8.2.3 v8.2.2 v8.2.1 v8.2.0 v8.2.0.rc2 v8.2.0.rc1 v8.1.4 v8.1.3 v8.1.2 v8.1.1 v8.1.0 v8.1.0.rc2 v8.1.0.rc1 v8.0.5 v8.0.4 v8.0.3 v8.0.2 v8.0.1 v8.0.0 v8.0.0.rc4 v8.0.0.rc3 v8.0.0.rc2 v8.0.0.rc1 v7.14.3 v7.14.2 v7.14.1 v7.14.0 v7.14.0.rc3 v7.14.0.rc2 v7.14.0.rc1 v7.13.5 v7.13.4 v7.13.3 v7.13.2 v7.13.1 v7.13.0 v7.13.0.rc4 v7.13.0.rc3 v7.13.0.rc2 v7.13.0.rc1 v7.12.2 v7.12.1 v7.12.0 v7.12.0.rc3 v7.12.0.rc2 v7.12.0.rc1 v7.11.4 v7.11.3 v7.11.2 v7.11.1 v7.11.0 v7.11.0.rc2 v7.11.0.rc1 v7.10.5 v7.10.4 v7.10.3 v7.10.2 v7.10.1 v7.10.0 v7.10.0.rc8 v7.10.0.rc7 v7.10.0.rc6 v7.10.0.rc5 v7.10.0.rc4 v7.10.0.rc3 v7.10.0.rc2 v7.10.0.rc1 v7.9.4 v7.9.3 v7.9.2 v7.9.1 v7.9.0 v7.9.0.rc3 v7.9.0.rc2 v7.9.0.rc1 v7.8.4 v7.8.3 v7.8.2 v7.8.1 v7.8.0 v7.8.0.rc6 v7.8.0.rc5 v7.8.0.rc4 v7.8.0.rc3 v7.8.0.rc2 v7.8.0.rc1 v7.7.2 v7.7.1 v7.7.0 v7.7.0.rc4 v7.7.0.rc3 v7.7.0.rc2 v7.7.0.rc1 v7.6.2 v7.6.1 v7.6.1-rtl v7.6.0 v7.6.0.rc1 v7.5.3 v7.5.2 v7.5.1 v7.5.0 v7.5.0.rc1 v7.4.5 v7.4.4 v7.4.3 v7.4.2 v7.4.1 v7.4.0 v7.4.0.rc1 v7.3.3 v7.3.2 v7.3.1 v7.3.0 v7.3.0.rc1 v7.2.3 v7.2.2 v7.2.1 v7.2.0 v7.2.0.rc5 v7.2.0.rc4 v7.2.0.rc3 v7.2.0.rc2 v7.2.0.rc1 v7.1.1 v7.1.0 v7.1.0.rc1 v7.0.0 v7.0.0.rc1 v6.9.2 v6.9.1 v6.9.0 v6.9.0.rc1 v6.8.2 v6.8.1 v6.8.0 v6.8.0.rc1 v6.7.5 v6.7.4 v6.7.3 v6.7.2 v6.7.1 v6.7.0 v6.7.0.rc1 v6.6.5 v6.6.4 v6.6.3 v6.6.2 v6.6.1 v6.6.0 v6.6.0.rc1 v6.6.0.pre1 v6.5.1 v6.5.0 v6.5.0.rc1 v6.4.3 v6.4.2 v6.4.1 v6.4.0 v6.4.0.pre3 v6.4.0.pre2 v6.4.0.pre1 v6.3.1 v6.3.0 v6.2.4 v6.2.3 v6.2.2 v6.2.1 v6.2.0 v6.1.0 v6.0.2 v6.0.1 v6.0.0 v5.4.2 v5.4.1 v5.4.0 v5.3.0 v5.2.1 v5.2.0 v5.1.0 v5.0.1 v5.0.0 v4.2.0 v4.1.0 v4.0.0 v4.0.0rc2 v4.0.0rc1 v3.1.0 v3.0.3 v3.0.2 v3.0.1 v3.0.0 v2.9.1 v2.9.0 v2.8.2 v2.8.1 v2.8.0 v2.8.0pre v2.7.0 v2.7.0pre v2.6.3 v2.6.2 v2.6.1 v2.6.0 v2.6.0pre v2.5.0 v2.4.2 v2.4.1 v2.4.0 v2.4.0pre v2.3.1 v2.3.0 v2.3.0pre v2.2.0 v2.2.0pre v2.1.0 v2.0.0 v1.2.2 v1.2.1 v1.2.0 v1.2.0pre test-fix show rtl-7.6.1 rtl-7.5.1 rtl-7.4.2.1 rtl-7.4.2 fondev TR.8.4.4
No related merge requests found
[Dolphin] [Dolphin]
ShowPreview=true ShowPreview=true
Timestamp=2011,9,14,20,34,18 Timestamp=2011,10,28,13,16,25
Version=2 Version=2
app/assets/images/bg-header.png

212 Bytes

app/assets/images/images.png

6.32 KB

app/assets/images/login-logo.png

1.4 KB

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
= render :partial => "layouts/flash" #container
- if user_signed_in? = render :partial => "layouts/flash"
= render :partial => "layouts/head_panel"
.top_bar.container - if user_signed_in?
= render :partial => "projects/top_menu" if @project && !@project.new_record? = render :partial => "layouts/head_panel"
= render :partial => "projects/projects_top_menu" if (controller.controller_name == "projects" && ["index", "new", "create"].include?(controller.action_name)) && !admin_namespace? = render :partial => "layouts/page_title"
= render :partial => "profile/top_menu" if ["keys", "profile"].include?(controller.controller_name) - if @project && !@project.new_record?
= render :partial => "admin/top_menu" if admin_namespace? .top_bar.container= render :partial => "projects/top_menu"
#content-container.container - if ["keys", "profile"].include?(controller.controller_name)
.span-24 .top_bar.container= render :partial => "profile/top_menu"
= yield - if admin_namespace?
.top_bar.container= render :partial => "admin/top_menu"
%div{ :id => "main", :role => "main", :class => "container_3" }
#content-container
= 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