Skip to content
Snippets Groups Projects
Commit 15c46555 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

UI: add new button, top panel restyle etc

parent 3b5a4fa2
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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 });
}
}
Loading
Loading
@@ -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
 
Loading
Loading
@@ -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
Loading
Loading
@@ -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
 
Loading
Loading
= render "projects/project_head"
= render "team_members/form"
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment