deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Password & token split up, icon to button for top panel

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-05-19 12:00:46 +03:00
parent eb25bfe2b2
commit 1e4d15b406
13 changed files with 108 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/views/layouts/_head_panel.html.haml
View file

@ -11,12 +11,15 @@
.search
= form_tag search_path, :method => :get do |f|
= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
- if current_user.can_create_project?
= link_to new_project_path, :class => "top_panel_ico", :title => "Create New Project" do
= image_tag "new_project.png", :width => 16
- if current_user.is_admin?
= link_to admin_root_path, :class => "top_panel_ico", :title => "Admin area" do
= image_tag "admin.PNG", :width => 16
.fbtn
- if current_user.is_admin?
= link_to admin_root_path, :class => "btn small", :title => "Admin area" do
%i.icon-cog
Admin
- if current_user.can_create_project?
= link_to new_project_path, :class => "btn small", :title => "Create New Project" do
%i.icon-plus
Project
.account-box
= link_to profile_path, :class => "pic" do
= image_tag gravatar_icon(current_user.email)

3
app/views/layouts/profile.html.haml
View file

@ -7,7 +7,8 @@
.container
%nav.main_menu
= link_to "Profile", profile_path, :class => "home #{current_page?(:controller => "profile", :action => :show) ? "current" : nil}"
= link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
= link_to "Password", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
= link_to "Token", profile_token_path, :class => current_page?(:controller => "profile", :action => :token) ? "current" : nil
= link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
= link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
SSH Keys