Commit 15c46555 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

UI: add new button, top panel restyle etc

parent 3b5a4fa2
app/assets/images/Gear-UI.PNG

1019 Bytes | W: | H:

app/assets/images/Gear-UI.PNG

940 Bytes | W: | H:

app/assets/images/Gear-UI.PNG
app/assets/images/Gear-UI.PNG
app/assets/images/Gear-UI.PNG
app/assets/images/Gear-UI.PNG
  • 2-up
  • Swipe
  • Onion skin
app/assets/images/Home-UI.PNG

890 Bytes | W: | H:

app/assets/images/Home-UI.PNG

782 Bytes | W: | H:

app/assets/images/Home-UI.PNG
app/assets/images/Home-UI.PNG
app/assets/images/Home-UI.PNG
app/assets/images/Home-UI.PNG
  • 2-up
  • Swipe
  • Onion skin
app/assets/images/add_new.png

288 Bytes | W: | H:

app/assets/images/add_new.png

333 Bytes | W: | H:

app/assets/images/add_new.png
app/assets/images/add_new.png
app/assets/images/add_new.png
app/assets/images/add_new.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -556,8 +556,13 @@ a.project-update.titled {
}
.add_new {
float:right;
padding: 6px 12px;
float: right;
background: #A6B807;
color: white;
padding: 4px 10px;
@include round-borders-all(4px);
font-size:11px;
margin: 10px 0;
}
......
......@@ -125,7 +125,7 @@ table thead th{
td, th{ padding: .9em 1em; vertical-align: middle; }
table thead .image{width:100px}
table tr:hover, .listed_items tr.odd:hover{background-color:#FFFFCF}
.listed_items tr.odd:hover{background-color:#FFFFCF}
/* eo Tables */
/* Buttons */
......
.main_links {
width:124px;
width:90px;
margin-right:40px;
float:left;
background:#ddd;
@include round-borders-all(8px);
border-color:#ccc;
a {
position: relative;
float:left;
padding: 4px;
&.home {
margin-right:15px;
width: 26px;
}
padding: 3px 10px;
&.admin {
width: 21px;
img {
width: 22px;
}
}
}
......@@ -147,8 +147,9 @@ body header {
.rss-icon {
margin:0 15px;
padding:5px;
padding:3px;
border:1px solid #ccc;
border-radius:3px;
float:left;
background:#DDD;
}
......@@ -113,3 +113,9 @@ table.highlighttable .linenodiv pre {
padding-right: 4px;
color:#888;
}
.tree-item {
&:hover {
background: #FFFFCF;
}
}
class HelpController < ApplicationController
def index
end
end
......@@ -89,4 +89,8 @@ module ApplicationHelper
def profile_layout
controller.controller_name == "dashboard" || current_page?(projects_path) || controller.controller_name == "profile" || controller.controller_name == "keys"
end
def help_layout
controller.controller_name == "help"
end
end
......@@ -3,7 +3,7 @@
= content_for :rss_icon do
.rss-icon
= link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }) do
= image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
= image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
- if params[:path]
%h2
......
.top-tabs
= link_to project_issues_path(@project), :class => "tab #{'active' if current_page?(project_issues_path(@project)) }" do
%span
Issues
-#= link_to project_issues_path(@project), :class => "tab" do
%span
Milestones
- if current_page?(project_issues_path(@project))
- if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project), :class => "add_new", :title => "New Issue", :remote => true do
Add new
.top-tabs
= link_to project_issues_path(@project), :class => "tab #{'active' if current_page?(project_issues_path(@project)) }" do
%span
Issues
-#= link_to project_issues_path(@project), :class => "tab" do
%span
Milestones
- if current_page?(project_issues_path(@project))
- if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project), :class => "add_new", :title => "New Issue", :remote => true do
= image_tag "add_new.png", :width => 14
= render "issues/head"
- if current_user.private_token
= content_for :rss_icon do
.rss-icon
= link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do
= image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
= image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
%div#issues-table-holder
.top_panel_issues
......
......@@ -4,10 +4,9 @@
.top_panel_content
%div.main_links
= link_to root_path, :class => "home", :title => "Home" do
= image_tag "Home-UI.PNG", :width => 26
- if current_user.is_admin?
= link_to admin_root_path, :class => "admin", :title => "Admin" do
= image_tag "Gear-UI.PNG", :width => 20
= image_tag "Home-UI.PNG"
= link_to :back, :title => "Back" do
= image_tag "Arrow-Left-UI.PNG"
- if project_layout
.project_name
......@@ -19,12 +18,16 @@
= render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
= yield :rss_icon
- elsif profile_layout
- else
.dashboard_links
= link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
-#= link_to "Projects", projects_path, :class => "#{"active" if current_page?(projects_path)}"
= link_to "Issues", dashboard_issues_path, :class => "#{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
= link_to "Merge Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
= link_to "Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
- if current_user.is_admin?
= link_to admin_root_path, :class => "admin", :title => "Admin" do
Admin
= link_to "Help", help_path, :class => "#{"active" if controller.controller_name == "help"}"
.search
= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
......
.top-tabs
= link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
%span
Merge Requests
- if current_page?(project_merge_requests_path(@project))
- if can? current_user, :write_merge_request, @project
= link_to new_project_merge_request_path(@project), :class => "add_new", :title => "New Merge request", :remote => true do
Add new
%h2.icon
%span>
Merge Requests
.right= link_to 'New Merge request', new_project_merge_request_path(@project), :class => "grey-button"
= render "merge_requests/head"
- if @merge_requests.opened.count > 0
%div{ :class => "update-data ui-box ui-box-small ui-box-big" }
%h3
......@@ -21,3 +19,9 @@
.clear
%br
- unless @merge_requests.count > 0
.notice_holder
%li Merge Requests do not exist yet.
- if can? current_user, :write_merge_request, @project
%li You can add a new one by clicking on "Add New" button
......@@ -18,10 +18,10 @@
- if current_page?(project_snippets_path(@project))
- if can? current_user, :write_snippet, @project
= link_to new_project_snippet_path(@project), :class => "add_new", :title => "New Snippet" do
= image_tag "add_new.png", :width => 14
Add new
- if current_page?(team_project_path(@project))
- if can? current_user, :admin_team_member, @project
= link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member" do
= image_tag "add_new.png", :width => 14
Add New
%div.top_project_menu
%span= link_to 'All', projects_path, :class => current_page?(projects_path) ? "current" : nil
- if current_user.can_create_project?
%span= link_to "New Project", new_project_path, :class => current_page?(:controller => "projects", :action => "new") ? "current" : nil
%span.right
= link_to_function(image_tag("list_view_icon.jpg"), "switchProjectView()", :style => "border:none;box-shadow:none;")
:javascript
function switchProjectView(){
$(".tile").toggle();
$(".list").toggle();
if($(".tile").is(":visible")){
$.cookie('project_view', 'tile', { expires: 14 });
} else {
$.cookie('project_view', 'list', { expires: 14 });
}
}
......@@ -19,10 +19,10 @@
- if current_page?(project_hooks_path(@project))
- if can? current_user, :admin_project, @project
= link_to new_project_hook_path(@project), :class => "add_new", :title => "New Web Hook" do
= image_tag "add_new.png", :width => 14
Add new
- if current_page?(project_deploy_keys_path(@project))
- if can? current_user, :admin_project, @project
= link_to new_project_deploy_key_path(@project), :class => "add_new", :title => "New Deploy Key" do
= image_tag "add_new.png", :width => 14
Add new
......@@ -8,5 +8,5 @@
.notice_holder
%li Snippets do not exist yet.
- if can? current_user, :write_snippet, @project
%li You can add a new one by clicking on plus icon
%li You can add a new one by clicking on "Add New" button
......@@ -6,11 +6,11 @@
.entity-button
Team List
%i
%h2= "New Team member"
%h3= "New Team member"
%hr
-if @team_member.errors.any?
%ul
%ul.errors_holder
- @team_member.errors.full_messages.each do |msg|
%li= msg
......
= render "projects/project_head"
= render "team_members/form"
......@@ -6,6 +6,7 @@ Gitlab::Application.routes.draw do
get 'tags'=> 'tags#index'
get 'tags/:tag' => 'projects#index'
get 'help' => 'help#index'
namespace :admin do
resources :users
......
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