diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/profile.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/user.html.haml | 31 | ||||
| -rw-r--r-- | app/views/profile/design.html.haml | 22 | ||||
| -rw-r--r-- | app/views/profile/show.html.haml | 57 | ||||
| -rw-r--r-- | app/views/refs/_tree_file.html.haml | 4 |
5 files changed, 56 insertions, 59 deletions
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml index c8c48138775..5c4f59dd20f 100644 --- a/app/views/layouts/profile.html.haml +++ b/app/views/layouts/profile.html.haml @@ -19,6 +19,7 @@ %aside = link_to "Profile", profile_path, :class => 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 "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 Keys - unless current_user.keys.empty? diff --git a/app/views/layouts/user.html.haml b/app/views/layouts/user.html.haml deleted file mode 100644 index 5a936450800..00000000000 --- a/app/views/layouts/user.html.haml +++ /dev/null @@ -1,31 +0,0 @@ -!!! -%html - %head - %title - GitLab #{" - #{current_user.name}"} - = stylesheet_link_tag "application" - = javascript_include_tag "application" - = csrf_meta_tags - = javascript_tag do - REQ_URI = "#{request.env["REQUEST_URI"]}"; - REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; - %body{ :class => body_class('project-page'), :id => yield(:boyd_id)} - = render :partial => "layouts/flash" - #container - = render :partial => "layouts/head_panel" - .project-container - .project-sidebar - .fixed - %aside - = link_to issues_path, :class => current_page?(issues_path) ? "current" : nil do - Issues - - unless current_user.assigned_issues.empty? - %span{ :class => "number" }= current_user.assigned_issues.count - = link_to merge_requests_path, :class => current_page?(merge_requests_path) ? "current" : nil do - Merge Requests - - unless current_user.assigned_merge_requests.empty? - %span{ :class => "number" }= current_user.assigned_merge_requests.count - - .project-content - = yield - diff --git a/app/views/profile/design.html.haml b/app/views/profile/design.html.haml new file mode 100644 index 00000000000..4a0f758d31f --- /dev/null +++ b/app/views/profile/design.html.haml @@ -0,0 +1,22 @@ +.ui-box.width-100p + %h3 Design + = form_for @user, :url => profile_update_path, :method => :put do |f| + .data + .left.dark_scheme_box + %label{:for => "user_dark_scheme_false"} + = image_tag "white.png", :width => 310, :height => 212 + %center + %h4 + = f.radio_button :dark_scheme, false + White code preview + .right.dark_scheme_box + %label{:for => "user_dark_scheme_true"} + = image_tag "dark.png", :width => 310, :height => 212 + %center + %h4 + = f.radio_button :dark_scheme, true + Dark code preview + .clear + .buttons + = f.submit 'Save', :class => "grey-button" + diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml index 15233f70eee..8ebb4dcb713 100644 --- a/app/views/profile/show.html.haml +++ b/app/views/profile/show.html.haml @@ -1,33 +1,38 @@ .ui-box.width-100p %h3= @user.name - = form_for @user, :url => profile_edit_path, :method => :put do |f| + = form_for @user, :url => profile_update_path, :method => :put do |f| .data - -if @user.errors.any? - #error_explanation - %ul - - @user.errors.full_messages.each do |msg| - %li= msg + .left + -if @user.errors.any? + #error_explanation + %ul + - @user.errors.full_messages.each do |msg| + %li= msg - .form-row - = f.label :name - %br - = f.text_field :name - .form-row - = f.label :email - %br - = f.text_field :email - .form-row - = f.label :skype - %br - = f.text_field :skype - .form-row - = f.label :linkedin - %br - = f.text_field :linkedin - .form-row - = f.label :twitter - %br - = f.text_field :twitter + .form-row + = f.label :name + %br + = f.text_field :name + .form-row + = f.label :email + %br + = f.text_field :email + .form-row + = f.label :skype + %br + = f.text_field :skype + .form-row + = f.label :linkedin + %br + = f.text_field :linkedin + .form-row + = f.label :twitter + %br + = f.text_field :twitter + + .right + = image_tag gravatar_icon(current_user.email,64), :width => 64, :style => "margin:5px; border:5px solid #eee;" + .clear .buttons = f.submit 'Save', :class => "grey-button" diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml index fdc2469d971..b32134b0fd5 100644 --- a/app/views/refs/_tree_file.html.haml +++ b/app/views/refs/_tree_file.html.haml @@ -5,12 +5,12 @@ = name = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path] ), :class => "right", :target => "_blank" = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref ), :class => "right", :style => "margin-right:10px;" - = switch_colorscheme_link(:class => "right", :style => "margin-right:10px;color:orange") + -#= switch_colorscheme_link(:class => "right", :style => "margin-right:10px;color:orange") %br/ - if file.text? .view_file_content - unless file.empty? - %div{:class => cookies[:colorschema]} + %div{:class => current_user.dark_scheme ? "black" : ""} :erb <%= raw file.colorize %> - else |