From 9f1c284408e1ab724111830ba0d96f874725991a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 21 Mar 2015 17:41:58 -0700 Subject: [PATCH 1/2] Remove 32px oauth images --- .../images/authbuttons/bitbucket_32.png | Bin 2713 -> 0 bytes app/assets/images/authbuttons/github_32.png | Bin 1822 -> 0 bytes app/assets/images/authbuttons/gitlab_32.png | Bin 1039 -> 0 bytes app/assets/images/authbuttons/gitlab_64.png | Bin 3013 -> 6559 bytes .../images/authbuttons/gitlab_64.png_old | Bin 0 -> 2878 bytes app/assets/images/authbuttons/google_32.png | Bin 1501 -> 0 bytes app/assets/images/authbuttons/twitter_32.png | Bin 1311 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/assets/images/authbuttons/bitbucket_32.png delete mode 100644 app/assets/images/authbuttons/github_32.png delete mode 100644 app/assets/images/authbuttons/gitlab_32.png create mode 100644 app/assets/images/authbuttons/gitlab_64.png_old delete mode 100644 app/assets/images/authbuttons/google_32.png delete mode 100644 app/assets/images/authbuttons/twitter_32.png diff --git a/app/assets/images/authbuttons/bitbucket_32.png b/app/assets/images/authbuttons/bitbucket_32.png deleted file mode 100644 index 27702eb973d1c3c0b9a39eee082ca72d38339cc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2713 zcmZ`*3p~^78y~tb)c!~k#|$NxjV;v7!WfgG5i4^UCKKD*9CHv4hY%>T%6zJQtvd&<}w?H)3 zN>;-BU|cc-W(YNa{Yb>7`hQ>E|ENTkpUNm)>Q7`M%U9WQF}|)5C9EhCPxqtxhgy-@ z6g1qx&`93^u5W1KVu(N*z>&LmqhM<|-!oiRW0({&o6dBh(}U1XR4yebSTqGApm3<+ zSM6%XDzPXJq$86`5f)ffMzoOrf7n_+h91mdQdlez-)M!u8e7XJP+0UJj>!E%8kPMm z#2R?5>d<#P+62B5W;M80K>U$lHMmM3+6d%wrHEG4UC7Pe zQbfrtOIAT^*~?)L{VdEX!-^0E6P@K%XZ!2LSw@972MrYN=)boR4V?6NKMeqEIEAya za3M;iyHSH&tW}m;!fReeSH{}}mI6~jcys)iB0=5BGF}sl`3n+YZ;O$J@IZ?nes^n& zVMxiPE5+>C5hK?=kso^kSgz2{+>*@LD!t`J?5}4`hUotDW^;O+)GEYu?$U29S8D?< z&^S^XE;#2|fhsd3Vs*^%8y;{|c`}5CvW+J=>n%AJr!;a*o!-?%&EW@RNc8OHb%h>o zF-;RBIoOUa75KSzwkaCpU9?ze^Y-rg-dD zdg^!*2o}?-_JX99D2`I3ROIS!vhg)dzustZps>=aIeNjk7FO-#(sOdosaH#d^M@i3 z%(x?7xusy-$fcl_oAgLhtDb*Wt+A%^eTUrftQ1d_8z?}sF(-y`rY5kiS#3V_Wht~Z zW^^0L$cr;%)yi4Wj*aWNE2sO5SG3vem(qeBLtqA`$=1i=pDd!g*M;h$Ka!2Z1{L&P z$u@NZf_5eq0f1l&S{OV&mPl?C(mI7m8cL$%eTDg+^U9PnzA3Ov%|6d%0Te zS`g9Ebc(KeWu~qhn80iD`wLe%tnqNS4AuJ37Q^mnLuQ@?+4*KJ3&7V?|8P_DC_b$< z)l}<&HKw6rB+^z7o3{z8gEn~)+z)CXDQ-szq7~_J4>^Lc6gxr8-#mEC)9O*nUX|p# zwgm!cSI^}R}dZwyi z#iBa|exJX#W= zLLDN=Kk`Mj1-!TVKv|et&L`n#Zn}Gx#C>?x3=Az0H(Q^Gwah`NHwnB5Q#a~Huv|`u zo=y!vPMb(PGn9>V>bS{&iFvSV|CYhxUF(vNBkylbFlzz&mjxaW{;Ai+_+#<+x*Nm0 zb95wMS+D2c2;irTLG8T`B+0*Y=qPQRQcQgt+~X+~*gpo;Ucw(fTO-F7x9ESfSzpn4 zuVdVBXC6#9c9(YL`OSHFsKk$JY9IL3bz!MWY=XoF^(CCcN0_I=@Gf_-u4~C1jW(~8ArF3J!^MM7`oRR z?RXrp&BGCP9J5u=V*YK!vCxHVy|T=)zK%DSPWwo=ayN5vqvzYA%8pCl&i(Tw;%!4Y zO(RNHZLr(*T#FZ%-HE@(ypyuW`WCf9{N2@)xgTc(5OTQjLU<8u-9Gb#A z4a$S!Qja;_`E37OgJ@^{=J0>gyas2C&zVv+s>GpoEssJ9AMEsl3-Xw03~Y)D&Oe~Z zLAt9`tN}|=9jv$`-&j?CQx7rH3v?-#X`iBw_AZpEbAPke0*>q0K3in!#2R!oI4ck` zytT2Px~ex*`oQCIL1<6NuUj4HxU;>92OmdrO&n++RkFo9@oJ^y1-r-YV?7@a{1Q+f zDSMkuzWLUw)J*Auw;Ks5i4)@nR46UA2 zmwM&%krW?sUNxhQeWFV(Zm8x&$|(57B*?obtFGUmCSPH|eB1aZ-I-RD%%KGDB5+zJ z@3l-Df*N8T1$_f&iZy>$j_z@Upo;^dL5P;d$2s(SrrMKzma{Ei%zdX$N7R5c?nwXWa;9p*_m)j*51XX05;U$nbepp!G-TG;r^8FVk9I3cu(*80QB)VcObzvy~ zft2JC1X3qrqa`mXGxAE6qZ1gHe-wRu(deHgt{}OJ`kdWr-RvBqd?~f>w(eZo-=6l$ gqZTZLJY{B5E#UAGZ=PVPRP?`yvv#m5vGk7mFT{djfB*mh diff --git a/app/assets/images/authbuttons/github_32.png b/app/assets/images/authbuttons/github_32.png deleted file mode 100644 index 0445b567bbce28e7983ac5c89c041e0e90bc9007..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1822 zcmV+(2jTdMP)Kis**NR|3TuX zd+vAdx$-$bpYNRW9sJ+Jw(M{B53wvK2Y&pNFBqzN+~Lp*wr>cdZvATY?X{Ejn3$f0 zO|vO;LI|YNX;@G?1;LkKUA(95#v3P&y*R?!MG5Rb_zPcEczwOcowdQ~bRfs$#(_t6 z!0FJzsK4BTo4o_lffTl63ZzX_>P%t6G==p{E9q%f?S-#)q`9p`7e;n3~U_-K3ziFrd3 zF)c}_O{B~;uhx4SDO$%zhJShV$oHQGV1S^LV?{>Ov_hxDA)RMAozU$Xx}&2ASCo)5 z9XakS`RsN%v3_M47BFw5@X5^xI&MdmbKVx6ou<-ii%bD{Jf2Me918?AWI(goY#eTf z-430EBOrtgk-<^rY-_m6a;_k^XvYJqu`=M3QK9^iqU$Vn*zFqV&#`?>PfZT0t-q51 zt8H{sce)kixG_09huOqDGBKY@VIUUgRq5*1Rm0_QNJn;dsF5A%SUP8W3X2mE@={4! zl$V1qtgXhn${@N1N05oe)(9@$=*0QY+L(lj1aDDhC9qGStV+$&1eoFG+7R|^+lX)M z+=A`vYh*}0Sx#xfNU3sz$K{kJ<5ZR%{ZXZV`tU)#{_>0H?r7uBiip7C(2;@f?%Rcx z@_R8o8OLA$@-7%>|M7QheRvmwp;hRQ z+(K+5%9S7qEd?zWi#;z0$$3Mx^$m)oVTc7#{fpC=n#FvE?rc-5IB~X7yxnj~T)f^P zT3cJ$`n}{8l5FJ^i{Ns57n*MM%6%rNeBg4sH88AnYbr|ttMT-Wj3H1Or0jQKnOK?t z*E|~?iBDzbr|f1uLouZ*F35woAXn;>^C|r1=rI_EasLE1Qs*o67Gm3)Dy5rEBqgco zM1uET>DPsVQg5UTy!`7IK)8PbTuxu4#u6kFR?SnQ4R8cxug@$=e_=j%Mw#`K@$t;2 zMhP3hgEbYX4i=*@H(R!EZ+_0wRq+1BYuLGE6UzNXN;i{8;={`=lEgv+N5>~HJ~e|e zlIG4{OwA?`9~*-O>G0HZKSC|{ggdgnt#1h7{YMs$KucF2PBdJ^na1YKJ}skKU24XKmJW6{ImhHE$Q$1@+HCps#_%y2n%$nFN9pvZ^Ep7@@8K7RT&^neL70W6+wV?5Kv<<_qNJ!m>17$^cvvU<1B2Q%dYP0pc3o>cj}_hk z)^2_X6*X&c?p!_IIQ$y?P7{HAHy!I9E={hSyCb|@eO&_1fiQ`Av?y{0l&2K$a30K;>kO7{E zsYIJ_{JjPY#>RQnQsOTu!7aORyiakJ$zdL!*@#%_&dT>mbo1I2}TV91aQl`CqMV(Cu4{yVgMdI2j+{TLgFB1zNKrX62G z)4%_Pjdc&B`Qvjukp7BfP7%;FO{dIu)ol1&c;9!PeB15GuI6!y_Y5oycCzT~pGk%U z0=@0680_hS!|B4Qw|<{9 M07*qoM6N<$f&ey+yZ`_I diff --git a/app/assets/images/authbuttons/gitlab_32.png b/app/assets/images/authbuttons/gitlab_32.png deleted file mode 100644 index f3b78cb6efba1e8cff625fd262b36705dd707c93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1039 zcmV+q1n~QbP)EQifbY9QLt7U<=f>{Lx+?d## z@lqC9861)n%?jGJFn$+&8VP2DCC3qXxth*=AM72Q?~oM# z7F3jYW!l$5TaCs)f}=U{e2wG5D+6UZ{2Cm?YuJ(JOKU`L!c(;t*c6;R%|A85$Ey_8 zl;M644itq0!P=Ud(21RxRHX~MgMAo|UutxIfq50i^Z~UE`wOPmeyU(ja3WX}VNMYi zR$7h3>ENPLa@mF>Gv29Vsn+0QZ0}<{So+cMItO|sf3A=4Wb~VPIkY7s z91H#qj$%vjBVMfMs!9q_!QNIXij=L^2P^W%#RCLc4=xG1@olgyzc_-wg8PCAxzdeN z3#UYrGyi@m@hvV3ZN#F^6s0}qK-!9ei6s}TY5<+xxj5aK3tinvKAgwyp<=)OhtE(~ z!9?lNy9YWQ!8H9T_zH|^8Thuv!K(cGse@cT8dsL8YkS8zezH6=P75x_=&1jIZNaHX zi0G|nj+PV)GxGXv%x=`2>mwJ8f@=q{_4V1e>h%ke_65)4k)b;DJuJw}1%@6Fx8?B( zjRk2wW+L diff --git a/app/assets/images/authbuttons/gitlab_64.png b/app/assets/images/authbuttons/gitlab_64.png index ff2945fe89eddf03e2e1fc8deb39a6a7bc5bc088..31281a194441d4e23bb691de89110c6097021ac9 100644 GIT binary patch delta 6548 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 VuAoD%djJ3m002ovPDHLkV1g>9pO63m diff --git a/app/assets/images/authbuttons/gitlab_64.png_old b/app/assets/images/authbuttons/gitlab_64.png_old new file mode 100644 index 0000000000000000000000000000000000000000..8390c81a08b310df07fe53a487368f6716745be7 GIT binary patch literal 2878 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/authbuttons/google_32.png b/app/assets/images/authbuttons/google_32.png deleted file mode 100644 index b03c3ec5207bede7130537935da81b310baac4ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1501 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 Date: Sat, 21 Mar 2015 17:44:40 -0700 Subject: [PATCH 2/2] Restyle oauth accounts at profile page and add ability to unlink account --- CHANGELOG | 2 + app/assets/stylesheets/generic/forms.scss | 4 -- app/assets/stylesheets/pages/login.scss | 9 +++++ app/assets/stylesheets/pages/profile.scss | 40 ++++++++----------- .../profiles/accounts_controller.rb | 6 +++ app/helpers/application_helper.rb | 6 --- app/helpers/oauth_helper.rb | 11 ++++- app/helpers/profile_helper.rb | 6 --- .../devise/shared/_omniauth_box.html.haml | 2 +- app/views/profiles/accounts/show.html.haml | 21 +++++----- config/routes.rb | 6 ++- 11 files changed, 59 insertions(+), 54 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6e40fa9aef..cf00780d33 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,8 @@ v 7.10.0 (unreleased) - Improve GitLab performance when working with git repositories - Add tag message and last commit to tag hook (Kamil Trzciński) - Restrict permissions on backup files + - Improve oauth accounts UI in profile page + - Add ability to unlink connected accounts v 7.9.0 (unreleased) - Add HipChat integration documentation (Stan Hu) diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss index 31fe5a03f3..266041403e 100644 --- a/app/assets/stylesheets/generic/forms.scss +++ b/app/assets/stylesheets/generic/forms.scss @@ -15,10 +15,6 @@ input[type='text'].danger { text-shadow: 0 1px 1px #fff } -fieldset legend { - font-size: 16px; -} - .datetime-controls { select { width: 100px; diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss index d366300511..83b866c3a6 100644 --- a/app/assets/stylesheets/pages/login.scss +++ b/app/assets/stylesheets/pages/login.scss @@ -113,3 +113,12 @@ } } } + +.oauth-image-link { + margin-right: 10px; + + img { + width: 32px; + height: 32px; + } +} diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index fbe71a5b5a..65655d4bfa 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -1,31 +1,7 @@ .account-page { fieldset { margin-bottom: 15px; - border-bottom: 1px dashed #ddd; padding-bottom: 15px; - - &:last-child { - border: none; - } - - legend { - border: none; - margin-bottom: 10px; - } - } -} - -.oauth_select_holder { - img { - padding: 2px; - margin-right: 10px; - } - .active { - img { - border: 1px solid #4BD; - background: $hover; - @include border-radius(5px); - } } } @@ -101,3 +77,19 @@ } } } + +.oauth-buttons { + .btn-group { + margin-right: 10px; + } + + .btn { + line-height: 36px; + height: 56px; + + img { + width: 32px; + height: 32px; + } + } +} diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb index fe121691a1..9bd34fe226 100644 --- a/app/controllers/profiles/accounts_controller.rb +++ b/app/controllers/profiles/accounts_controller.rb @@ -4,4 +4,10 @@ class Profiles::AccountsController < ApplicationController def show @user = current_user end + + def unlink + provider = params[:provider] + current_user.identities.find_by(provider: provider).destroy + redirect_to profile_account_path + end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8ed6d59c20..38b5fc4a01 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -174,16 +174,10 @@ module ApplicationHelper Digest::SHA1.hexdigest string end - def authbutton(provider, size = 64) - file_name = "#{provider.to_s.split('_').first}_#{size}.png" - image_tag(image_path("authbuttons/#{file_name}"), alt: "Sign in with #{provider.to_s.titleize}") - end - def simple_sanitize(str) sanitize(str, tags: %w(a span)) end - def body_data_page path = controller.controller_path.split('/') namespace = path.first if path.second diff --git a/app/helpers/oauth_helper.rb b/app/helpers/oauth_helper.rb index 1a0ad17b60..997b91de07 100644 --- a/app/helpers/oauth_helper.rb +++ b/app/helpers/oauth_helper.rb @@ -20,6 +20,15 @@ module OauthHelper def additional_providers enabled_oauth_providers.reject{|provider| provider.to_s.starts_with?('ldap')} end - + + def oauth_image_tag(provider, size = 64) + file_name = "#{provider.to_s.split('_').first}_#{size}.png" + image_tag(image_path("authbuttons/#{file_name}"), alt: "Sign in with #{provider.to_s.titleize}") + end + + def oauth_active?(provider) + current_user.identities.exists?(provider: provider.to_s) + end + extend self end diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index 9e37e44732..780c7cd513 100644 --- a/app/helpers/profile_helper.rb +++ b/app/helpers/profile_helper.rb @@ -1,10 +1,4 @@ module ProfileHelper - def oauth_active_class(provider) - if current_user.identities.exists?(provider: provider.to_s) - 'active' - end - end - def show_profile_username_tab? current_user.can_change_username? end diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index 4cd1c303b2..b647b906b7 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -5,6 +5,6 @@ - providers.each do |provider| %span.light - if default_providers.include?(provider) - = link_to authbutton(provider, 32), omniauth_authorize_path(resource_name, provider) + = link_to oauth_image_tag(provider), omniauth_authorize_path(resource_name, provider), class: 'oauth-image-link' - else = link_to provider.to_s.titleize, omniauth_authorize_path(resource_name, provider), class: "btn" diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index 6bafcb5655..5bffb4acc1 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -1,11 +1,6 @@ -%h3.page-title - Account Settings -%p.light - You can change your username and private token here. - - if current_user.ldap_user? +- if current_user.ldap_user? + .alert.alert-info Some options are unavailable for LDAP accounts -%hr - .account-page %fieldset.update-token @@ -33,12 +28,16 @@ - if show_profile_social_tab? %fieldset - %legend Social Accounts - .oauth_select_holder.append-bottom-10 + %legend Connected Accounts + .oauth-buttons.append-bottom-10 %p Click on icon to activate signin with one of the following services - enabled_social_providers.each do |provider| - %span{class: oauth_active_class(provider) } - = link_to authbutton(provider, 32), omniauth_authorize_path(User, provider) + .btn-group + = link_to oauth_image_tag(provider), omniauth_authorize_path(User, provider), + class: "btn btn-lg #{'active' if oauth_active?(provider)}" + - if oauth_active?(provider) + = link_to unlink_profile_account_path(provider: provider), method: :delete, class: 'btn btn-lg' do + %i.fa.fa-close - if show_profile_username_tab? %fieldset.update-username diff --git a/config/routes.rb b/config/routes.rb index 03b4a32a9d..c30cd76857 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -184,7 +184,11 @@ Gitlab::Application.routes.draw do end scope module: :profiles do - resource :account, only: [:show, :update] + resource :account, only: [:show, :update] do + member do + delete :unlink + end + end resource :notifications, only: [:show, :update] resource :password, only: [:new, :create, :edit, :update] do member do