From 15c46555274a14f3a90f0c8139e59cf1e96eccfc Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 18 Jan 2012 22:15:45 +0200 Subject: [PATCH] UI: add new button, top panel restyle etc --- app/assets/images/Arrow-Left-UI.PNG | Bin 0 -> 568 bytes app/assets/images/Gear-UI.PNG | Bin 1019 -> 940 bytes app/assets/images/Home-UI.PNG | Bin 890 -> 782 bytes app/assets/images/Info-UI.PNG | Bin 0 -> 800 bytes app/assets/images/Rss-UI.PNG | Bin 0 -> 789 bytes app/assets/images/add_new.png | Bin 288 -> 333 bytes app/assets/images/rss_icon_gray.png | Bin 844 -> 0 bytes app/assets/stylesheets/projects.css.scss | 9 ++++++-- app/assets/stylesheets/style.scss | 2 +- app/assets/stylesheets/top_panel.scss | 21 +++++++++--------- app/assets/stylesheets/tree.scss | 6 +++++ app/controllers/help_controller.rb | 4 ++++ app/helpers/application_helper.rb | 4 ++++ app/views/commits/index.html.haml | 2 +- app/views/help/index.html.haml | 0 app/views/issues/_head.html.haml | 14 ++++++++++++ app/views/issues/index.html.haml | 18 ++------------- app/views/layouts/_head_panel.html.haml | 15 ++++++++----- app/views/merge_requests/_head.html.haml | 12 ++++++++++ app/views/merge_requests/index.html.haml | 12 ++++++---- app/views/projects/_project_head.html.haml | 4 ++-- .../projects/_projects_top_menu.html.haml | 17 -------------- app/views/repositories/_head.html.haml | 4 ++-- app/views/snippets/index.html.haml | 2 +- app/views/team_members/_form.html.haml | 4 ++-- app/views/team_members/new.html.haml | 1 + config/routes.rb | 1 + 27 files changed, 88 insertions(+), 64 deletions(-) create mode 100644 app/assets/images/Arrow-Left-UI.PNG create mode 100644 app/assets/images/Info-UI.PNG create mode 100644 app/assets/images/Rss-UI.PNG delete mode 100644 app/assets/images/rss_icon_gray.png create mode 100644 app/controllers/help_controller.rb create mode 100644 app/views/help/index.html.haml create mode 100644 app/views/issues/_head.html.haml create mode 100644 app/views/merge_requests/_head.html.haml delete mode 100644 app/views/projects/_projects_top_menu.html.haml diff --git a/app/assets/images/Arrow-Left-UI.PNG b/app/assets/images/Arrow-Left-UI.PNG new file mode 100644 index 0000000000000000000000000000000000000000..80a34b411f1ddc9ec58f0a6a3ef1e16950125eb9 GIT binary patch literal 568 zcmV-80>}M{P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS? z5;Gva|MIo~00Fp3L_t(Y$IX_#YE?lLg}-&~1&PK&u+@jK6|oX#TSN;X7IuPmVq;~k zg&=nR^jg>`1awa!K87z~S}{dLqL5`XM-TBP-g`Nb3=C83&8%5#{|y|a6%j} zrBceVW$x(a0m)1v;ymyMSRECpXVE~;0dIj-NlU3RJ%|NBDdi&YVL#uc84W=q;-;i` z4aCi5XHk$+3OYc#yTAk6$0Zql``!k&=T*%1$6D*=bT4wPm58_nJQ;7{5G|J=hzb`jCDSOFdbkNoG!8mktknMo<-WRv8EBpM5i zS@hFV%8I0yw%7KF$tbH&?_n%_7;UVpwSKp~4m=-7Hab|>QhEot1Kb}-=dl@4N+C0U z+J0#JdP}-d!8(9iYhOpyT3<^FVB5B46z31ybM5B8dti1&#AVR%0Z0U1u%-jH-HGrx}hXBZ5_Z<4Os-a6EuP@g16e*FUb&)g2E2AAXj0000V1E)4D+1|+D+>Ss11w2IK~zY`rPfcVRaF!Q@ZY&U6%Eq&f(Btk zgPS88M2*VG%=ezD?r~ ze2;^f`R6$Qp>;+9^?E%Ku`D8P$7}crI||4;Jc$?Z9`1*_u0_O(p?}*tZ6*y{g?)G! zlXxg1cH*Vh9!p{G-o1hS5wUs1UaEzT8xf!4wz6&>XR)OGANtN=7PnvuC$TFtcaH=r z8()p@upM7xKYy-kuWQ--i1{xv^XBG!-msH*BBxr&J83na;EY{ebTIy#I~W1Q~7o?fq~ zu4`3QHGk#mkxMA#pR0)IpkEYu{ZJ%Z%>Kr7X6|TR*{ygRYsS>mF|5Q5RYXi+7oJ`u zPN(s0(ZA!^P*QtxOr8Buh+l@IRbh4~>azH3c|H~^#3u7m#e5($w+shMpxf=vmE#{R z%5c+|G#?d*YD^+@yWMVe=+L3hp))fxBQuZT(SOX0%zS)|3@xT{^DP1$tSLo({)NrV zljRyGas7W#>cWh6{j(@{*a)U>i1P<}Y};$jQ*& z$5J{x+c@Q~Sl;fY#Pws$0%hh2ypG+t58DQV!L0vdrDt0i5vw9% jYM4nSc_tQU+0NNNC1WNj)&=D|00000NkvXXu0mjfnUtre delta 937 zcmV;a16KU32m1$*V1Ew}C?hyc*Y^Mb1A9qCK~zY`ot96CmQ@tSf6q5F##oeN5D|v7 zsg*6FT}~uZooi?r=B6x&3Zz;D5n&)2Xb8EpjS;Q-vmMFk-qHvc(IOXFK^tj`Y?V4; z&`hKAwCKL$J1^fmh6g^l?|1IK&pqcn_c>P#u~G^V0YJ`q6@M@e%%zm(tN#%2C-4Js zJR&akt#3^9SSe){uo2h^Y_okhrL?z{vH>^^U>ivD`_*8rc_lzq_b zy#hw#S8LpW?`+S>IbQ(+9s}+I+*<6F2-6cGz+@@qHrsbd$`SELyGG-{9$+`uZq32| zs=r%-CvAVc#JWn$6Dw@M|M1EG*$ov0;Avodw3ISpdw&YJ8F+bxQ=YZ`Ch&er>2l8b zUP*5OQ*B~(h~rw0F_lto1b()?wjocaE(T_SZ4q&@Q{*v8p8^jJsnuoRn50*LnSt$5 zU~M1eZ43CU0m(TpF)5|A0PO8t;D&*VlD>$DnTSB8lnLACuR`Tr5pkq$K1{CM!@yZd zCxAnPh<~_{Qj(;{t56QJiS9ufiOD%%*GCdbYk=*xA8g;FGq&e@qIwiK7!g$QT#_qE z&$Sd`sOm`iMWvJhkbqZ#$wnkQ5_1VS6cKN9$Z)@;4{fjO05z#R2doC}QOo zULs<*?H#taM8vPa;rcdcYH$?TV0%w1%HM!xD$&l?pqqw9G*e2Sq?Be_1^!0Th04gI z5phA%yTAe931A0sa-{-Z)hhVvsv0AbE+R(6LiLTNlrF9GngaM2rv|<)A<9f+00000 LNkvXXu0mjf04l!| diff --git a/app/assets/images/Home-UI.PNG b/app/assets/images/Home-UI.PNG index f57f8d09c8643a3b21d35932cf8c5f2f90786d71..f739af3c2acba143a008f5a007a29846d91afde9 100644 GIT binary patch delta 698 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 T>b+L%00000NkvXXu0mjfhV5mS literal 0 HcmV?d00001 diff --git a/app/assets/images/add_new.png b/app/assets/images/add_new.png index 12fa22c88c99e47fd38091667bac6277ad13a6cd..bf2fbec29649463a42d9b85fb449e9b369d79a6e 100644 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfhd8#PBY!?(ZfT+XF)%-a~B zbNky3XD`kA={I++d%5y^)HGLCpm{JLAiH4eGA0mD!Ryze^-PQSYUZVj7BFV4ZT+p_ zRhz8xTqdu5$+cNNj4&Nwx?{%UDK|`fk7usAr@K=--%|D4>g$H{^54n*xLqU{|6|#T oc?(YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_p*ho-U3d z6}R5pKFD=gfrsHj+K>2qe=_pxW-e}T$~o>U@To{^?-iRxSFRkJ^ZAs_dhN<7&li2) z_t|p)l*l(yA=$pHKr>)qf^0(1LM9MT!P}<0b|2S?SruzTS!)>Yd{(;69T@5L=!(9I z^>NWPx$R!~e-MTUlk|NsB6u&{i5e6g{yuCA_?m6fuxvaPMHudlDGtE;N2s->l+qN1X# ztgNZ2si>%^qobprpP#3vr>3T+oSdANmX@TXq@A6eprD|dnwp`Zp_!SPn3$N8larpF zo|2N1mzS53k&&C5n~;!@l$4Z%gM*8Ui;s_wiHV7ahlh=gjkB|}fq{X7f`W{UjEIPc zj*gCng@uHKgo=uadwY9;fPne=`P9_Z?(Xi-&(HSu_RP%8w6wIozP|JG^V-_lwY9a) z&CT50+gwv`E7Pn@9*!+%gegDy5Ha5-QC^L(9nN>f62+ozrVk^xw**5 z$iu_K$H&L?^z^~O!T0y~x3{;uySwM-=eD-C!otGF#>Tw7yyN5J+uPg9%F4jNz`eb_ z;^N}j+1a?bxZvR6#Kgqq<>l4Y)y2id=H}+p)6>}4*!cMP|NsA9GJwqh0004WQchC< zK<3zH00001VoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^RW3=4L_7@Lu}}v2a=Az#upfNy$H-R(Ig6@ 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 diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml new file mode 100644 index 00000000..e69de29b diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml new file mode 100644 index 00000000..7d44b875 --- /dev/null +++ b/app/views/issues/_head.html.haml @@ -0,0 +1,14 @@ +.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 + diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 4d9109aa..d55e07f1 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -1,23 +1,9 @@ -.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 diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index ac90dec0..101b4110 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -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" diff --git a/app/views/merge_requests/_head.html.haml b/app/views/merge_requests/_head.html.haml new file mode 100644 index 00000000..bbf54da2 --- /dev/null +++ b/app/views/merge_requests/_head.html.haml @@ -0,0 +1,12 @@ +.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 + + diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index edc223ba..dc8ddf07 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -1,7 +1,5 @@ -%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 + diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml index 6478853d..cbcd0660 100644 --- a/app/views/projects/_project_head.html.haml +++ b/app/views/projects/_project_head.html.haml @@ -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 diff --git a/app/views/projects/_projects_top_menu.html.haml b/app/views/projects/_projects_top_menu.html.haml deleted file mode 100644 index 9e199183..00000000 --- a/app/views/projects/_projects_top_menu.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -%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 }); - } - } diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml index 7b476362..0095098e 100644 --- a/app/views/repositories/_head.html.haml +++ b/app/views/repositories/_head.html.haml @@ -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 diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index c7c4c6b1..1021dd1f 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -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 diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml index e3ba64c5..2a299fd0 100644 --- a/app/views/team_members/_form.html.haml +++ b/app/views/team_members/_form.html.haml @@ -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 diff --git a/app/views/team_members/new.html.haml b/app/views/team_members/new.html.haml index 4f70fb4b..40eb4ceb 100644 --- a/app/views/team_members/new.html.haml +++ b/app/views/team_members/new.html.haml @@ -1 +1,2 @@ += render "projects/project_head" = render "team_members/form" diff --git a/config/routes.rb b/config/routes.rb index 3a4018d5..4f0e6fcb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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