From 15c46555274a14f3a90f0c8139e59cf1e96eccfc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00001b5ch_0Itp)
z=>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<l{{d>}
zrBceVW$x(a0m)1v;ymyMSRECpXVE~;0dIj-NlU3RJ%|NBDdi&YVL#uc84W=q;-;i`
z4aCi5XHk$+3OYc#yTAk6$0Zql``!k&=T*%1$6D*=bT4wPm58_nJQ<jV4|-~QE)+=<
zNmqc)t_SE15pfTA(WLT>;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&#AV<aaJDh)eJ7c@yXZXY
zW;MVz9^M1%z^6Sjo?3KZX69^05rJ)5{LV;v1zc$6)0z2Yl);yoNTRi;&%he6VVijy
z>R%0Z0U1u%-jH-HGrx}hXBZ5_Z<4Os-a6EuP@g16e*FUb&)g2E2AAXj0000<MNUMn
GLSTXw@9_fw
literal 0
HcmV?d00001
diff --git a/app/assets/images/Gear-UI.PNG b/app/assets/images/Gear-UI.PNG
index c1d84e06da6f50f656780aaa2750950fcf0cf1f0..7720f0eb21a3688ff8341a2e9d5d691b624c7566 100644
GIT binary patch
delta 857
zcmV-f1E&1@2doE>V1E)4D+1|+D+>Ss11w2IK~zY`rPfcVRaF!Q@ZY&U6%Eq&f(Btk
zgPS88M2*VG%<f&F{lTO`5kw6l8(fHpgvdfe=uM=8Y|x~dM1+yC&MS+0gJ@8L{y_sJ
zi*l6uqKRhun(V8`<Gt@$t;xOn?7jB)?Y-9e_Nt7qnVA{AUVjfn#4@bF$;>=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<i3Z4Od{nONEthViNIcja)OCFx2zO&`i{bnt
zrx|DKBjPGti@M+M|K3c7cd)0m@xKL`FTbziUA&1+bzNT+qm4LtiE$V=*B&RfPDI2K
zY{V6KVu6i*!}E9}GtWfCjd-#6Hc#IMU5lkvL|k49a(`+8hI6<lGiO^juoNF+(+GlR
zZ~%kBU~r^UGH+^uxKzj?NL|<GGAT1p<GC?cdKMpN=8;~nr;3P49A6~Jk7ee*x~}#6
z{fj0eVt$O@96rHxCo@lEW`%o;P>!-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#><VAuvoih$Pi5xmx~_FbyzdX-$`-?ROh$qHh%K49q15Eo%$$RMzkgxR
zP-Nwm@?88?GUpoXEaPE3P8E@Dc0a4jTA8^&GY>cWh6{j(@{*a)U>i1P<}Y};$jQ*&
z$5J{x+c@Q~Sl;fY#<p8S(ag*bGV@4d>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>iv<M8tbJXC#eB#NWgA8+1?7vYTul
z0iFdWfM-f6`+&D?x95!kNZJfcmr}M2+3QL~!@@14d};duNdgQk0wZ<Ytev%eQqo3X
zt?fBU`y=8&Z-44aDYpaP11|xmfN9%zR-mC~+l{}b65#8IxUW5Lv>D`_*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}QO<c((tg{o
zUqx;fY@e1i4V<^VNz#<<2}#SCTFLPvFe&MJ+kd~S=KEnF*U5{v2i?Uza^xPSBI#H}
zZ0+`=Q@}?+wtb{VroNna{?ia@+x8=+l)XzpwGW-M{d`1hPAR<z9KQyQb1Q9<GyvA+
zoX3`R*p$*-P2&V`_caKrfNv#zRl&Zq{aQ+CA?M7X+f{+5fLnTmwC`fd_D{CAM#QFi
zCx5r6lxAxX%ijz+XCmSq;2`i%WzKqFU;S?CF%O&tE;big(i%zYYbThFh%@bX!!n>o
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
zcmV;r0!97$295@hV1E)4D-V}7SGE8E0**;UK~zY`?bb_(TtyTH;O};lF(!fd3W6wz
zYemHfV%+(-a~6V$MiF%|gn<a6Z4h*!pbK9}L=eRYf~dP7qKMU_W)TrLicj3Ci!9uX
z3l(JOiS6cGDLdVr84yA6hYR=CJ$3%7|37so)`-Di@Yj1p^nYM!X~{o|F_K*o@nA%3
z8UHs6&3XtU;tm|bxp*B1ODW3{(O@60#vJyQQcl!!d#6g?$rBOx;*}(U1-ugxXXW<|
z*pIs=<?T&N-VuyOBN6ckUceT-gv+puUHBH~VRc>74F&^E(`egPL~Ku~_TyJPixIBD
zb9fS0;CFnDtA8@hTq$L^CXXWGA{@qb_!*Dma@?IEpC<7FcIVhAbI$eq{bAd-lclTt
zxESvx$ue%oo{B^o|2$sC({-Lw%CK$Qzg1*YOEy10FCup0So-lD?!>#epj!2~8hdee
zlET}ils(<z+qTu~cF{DAh}etIlH?;igpZS?CTJ?s5r2;4oO@E{-4XFgMC|C~Yf`Gs
zcmPl2*sJ&wkKvq3`%~c=e3N-D#OGM-_xoQp5wQu6<^%U-^82y9O7dfpZ>V;&13R&)
zTF6^jB!{y6-@xKVY^=)i#?*UZf*(h*h|_ay71!fUoKfxiW?X{X@D$ERuNf=pBe-RX
zREJ9`2Y)(G^PF9q{+wCGb#ss7%2LWtC!M2+_&&9r<j042F?$)D$PRH3TgPHY_yxC?
zQa+Hf)mWWj`lWcdI(wt^@U$r%=Z{>BNkp^oJ`PkK4f8<1mLAQ-dWcp^DJxj1r2efc
zn3?GLm+(K)e~)PEjM&W+#x`Kvl=y8`Up%S27c-_zZ1BT`@h@;wHq~(q^Z)d_+pHT=
g*X!1LdF<l;1X5?jIYnzr6#xJL07*qoM6N<$f;in^kpKVy
delta 807
zcmV+?1K9kI2Kok&V1Ew}C<W?3QVIY70{TfrK~zY`)s|0)mQ@tSf6wPQ+Bl+4!GIKm
zt%Ck27KpZM>fTM1))4(0ln`8m(BL9MqCZGU1VRuR1rb4zizq_wfg)Pes(%zg;i48n
zLX4Y&7-puYh4&ra`FOvN&yb+Ac`x_gbDnda^W6Jh7|}{8?SF9(AR@S;)&_})eWjFR
z5i!xfHq3N6fD!SC?N@+lNpA!5DW!!{iX<HZ_5$O!59OR!+P=LJf;ZnMY`-pPS`xq<
z@IgdO)vb2}j{}c&#qA9W-T>GpB97aBRni3T8n6>s0QLdjOWF=B+a8#3Z%{u{N<_pK
zNpAoz0Dl0_0Dr#$CxM57uYm2qdEkbB)uV{mVfzd)16%~219nL|SS$TP(#w^?{ngF3
z1&m8tN-1?$)X-H*xe544(u|}9Ne@XnAn9O3kEFf8Dd4p2m)dc1&Pyq!HHuW5vYa!e
zl-q#MBu&`<LDHkPKLoC;0Je>)BC5^Wz8W|!3ES`IoPQ5A$)}W1Gl&Rm&q{i)I)7~Y
zl%#iUZ<gc^s@+O>9{9`l2}x7H=fM7y((kJkMZ`wnN#I1CdlUEucow*(22`WMTG^^9
zTg9COzN>Mr2fnm@SkkxaB4Ryo-1hUA{B_j!ilnE3sTNJY*#1<~c}YJ3KLQseP1jxv
zxT6Bj1AjLHdn9eLeQwP57_g^ic@HovX|AEBaxO`qNIGo$s=Br;=`P?MU~5yg?fZe7
zB|QkdX!}}8J@u*XEbu^^sun$GQc6b}W!Apl37iGC_4Q4_ueNW`IbQ%6>uc`revp>!
zD5cyBjMt=AfStC-*9s8T^R!vgEkGyGau-OY?|)WFPc>)Hm-yTwX~Tev;BVWj7wg!l
zH@Bp7wvPZ!kCuQL+iywQIv_bN8wgm;IWGc>t)BkbI!kL0Sl<QP<3F<h2hgzpPoEM;
z2O1XiidNL0;h?!u#jt4z*2a#xb-?6+{gZXQQ{Hp7Cp$71@N-AjUjz5qUf<!fRM!W;
l-5`d&h+40rQJ-i4`~x;7W1)&v=r{lX002ovPDHLkV1iK`hIjw~
diff --git a/app/assets/images/Info-UI.PNG b/app/assets/images/Info-UI.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..92795486913988cb56cc2596769ac6c397d0bd1d
GIT binary patch
literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS?
z6AUSyKMEND00N*%L_t(Y$E}vZOI1-2#((Gf6s=WBQBZ^s1W79)H@!_no>@c^gh2#u
z`~zA<5VUP+MB7l>2(@crb8q0LL=b}3iW$)&h!%o`JbiduIOlb}-h1D*8W4P!ne)w=
z`R1GB$XSvkjE#)}AR-Yk0GtG_02hE>bKL+w0-u0QRc(cMpmRnrM~R8Z8DJc^2VADy
zwtzRl46vxGTSZP$_9k&02avnKTi|&HBrS+f?Z$V2d0<vVhJeml2Y}Kv#e0v4Oj~xB
zDgcVU_W~2Zl86j@@ArYZTu-Kf`*uiCS-%4c3<5Vxz#XsyTvXMy13j{G%~)ndAgjQ2
zRsCxIlfY~R*g7zxsvB_}@0HFP{}AY_AjpRRVzvmZ6!<v<8v-5!c<+gf!sD5ql-Zz&
zG%~-B0w+p*o&DVwk>Nmw0i$qL;{k2}53B;GfoH(+F3Ft*nj+$y(Q&;?z%QU>N%aG}
zz_$JGy2Qr7t%glJ6-)zo4a^yv8s<9+JfXXd0(}jW6}n`06=(yGRQ0Eo??{aV0geGZ
zQAWF{7|e6P6flzc-cuvN&~q2nxVp;(^m90KSqa)WOu%2-Ze&v5joSZWYd|})eX{i*
zvM%e-0?>+pP1`5bROz}tA@O-t-HvQC&e)8U^=B1$2Yk+aU$GsuTBVP`atBpJ226=3
zO6KAf@ZM%3=v~{0)U>$#4cow^s?P1(M<zu}z^NQqTBCnO{x4K@Ds0;*P4~*Hs$YO>
zR>JJ;xI@rCfXoMwBuVhz|2ZU%<FLxl1BvYuSCa_AZwGj(s#E#bP)8ZO_asSzt=|#g
zDe$cZ!(68Eli?=$Cs$?0wzQh|J{UDJ<cD#=*te{zKk{$GN}$|>#hJ$SnUIE<U1L^D
eRk!mk$lGroNACx`l(ZHA0000<MNUMnLSTZHu3-uQ
literal 0
HcmV?d00001
diff --git a/app/assets/images/Rss-UI.PNG b/app/assets/images/Rss-UI.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..2116571ebbc705820beed79c20e6232ceebc6b11
GIT binary patch
literal 789
zcmV+w1M2*VP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS?
z6FMaxmDfiA00NasL_t(Y$Gz4+h+I_^2Jqi|nN3up#<(V}LK?xsLKG2EP}n_!pdm#R
z1shQtXAqVMijXP_g1beqj9`&U5Sz0jSSV;?qX}XViCQQqAyEl}>+X()_l4(UX7`D!
z2L|q(d*Au)cmCdLJRVzKUfzwpsO+pvaCtNutyK}R8?RyHzma7es|%A+>jpc?MzOuO
zZn<l+jq4`=@FG>~d^PB7zy_9ZO<5npowyZs$4J!!3=F1hZe->gU1daEk0<dMZo_pw
zJ@FS}MBIoAE!{evEsWOj6V7Gk7cJ1kcpmrlbmROqpmr=K_zjovEly?TTLo-CUcw7K
zSWN}mDj6z#jU$=)c>#P8C$<5buV)xMhp&p!@9}HP$RT_d5zj?LotdxVcqe;%#b_-v
z_q5`15O?D+9xZj($jdm9nVS*uHlCQlY$~I_NoM|-neXB$JX}~davYD8^(*+YQ$JfW
z+QdiLhaWJ;$;{j+4EN#F;zIZx2Q%}Rh*&D^tQVsi_v3avgcV$hh$DsJ&$z2~xjlHZ
ztlz<TGmQ4hwrg=ZBA#AdT{RpIFJjm_b2K7u$;|UOGtG7N7R|8Rvj#Z1va)i=;^HE_
zkB?j5JX6;1758ro)cE%UobG_lm9{T4FW{4+uW@fV`(a<8O)O>RgPHj_Ztj5H6A?ER
z-I>xkV1Gm$$jop0x^6u)Ux)E{EHl6BFjJC2Ddx3SQrs{r(DjTWz8V%578>1w&Y7#a
zV_>_%ISpulQw>-|4Dmqc%-L3_Z@~U2oxb;&n6!*cu&ewg9ivSW>}thty_Ga=w)2B2
zqrCY)H)~o>*=zRaW_0{3H!`b7{maM66%sWrHnp+C@4Bk>+`3%-9}mdkaJcp-*Q((Q
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|YuPgf<Mj;_RLv7`K5kR4{o-U3d6}R5r
zHsoqC5MT}1T%qWnkUsHp#gsW}t+9U3!UPYl6=O}jw|>hd8#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?(<xP;`Jf4ri9U*nhsBas3Oepe3)r%m)d2y85}Sb4q9e0CqlX?f?J)
delta 260
zcmX@hw18=XO1)%>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^>NW<FbxnorDxL@rlgxv^S3Phds}nk`MBe?UTfBvo2k@=togY#zv~re6bmD&77*`A
g&xwD(|3o)1GW4e_O$%Of?j}go)78&qol`;+0I}O*0{{R3
diff --git a/app/assets/images/rss_icon_gray.png b/app/assets/images/rss_icon_gray.png
deleted file mode 100644
index 90e509aa4bd1feadf19b1603495b9f8dd1e5bbca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q00001b5ch_0Itp)
z=>Px$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+<tz3>gwv`<mBn;>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=<SD
zAOS2uH2?qsVo5|nR4C6~lG{#$KomuXfx-YoOQFz~f`DAAC03%=sELVbqKz+pfN%c)
zPq@#N+Qjp4Cag8tb72@`Oy}n^3^bilwfwS)voy+=-hAdy95J#D-a_!YFta3DfQJJ&
zERLMIXv(yr`O<ftF}P)o9G&sT%rsRqa4~S7Gj5itHq^jvCzKFbTAhUU#RtBEp#14v
z?vIN2M0x>4L_7@Lu}}v2a=Az#upfNy$H-R(Ig6@<Sb9?h4#=nR)ytDIhCsgdmrp|;
zW$^_B?!g^@pYmzQ%%X-k-VgsE<V#vFF6s`#pSVKMxqx0)0s4F0ts&?h_yPIPU_teX
z-mQBGN2mh`l|Rc&^oM=}f%zn!eEFvG(fZ9j#K=~{pL;omqDI@?wGdpb`y*FD1Xg!w
zZM!v?4la)OQ#RP=`Wo}MH#_`V%XTRzDb0(k?zSiX$kk(Tzyt8}eDxR@+wp%z&*vA!
WtsrxP_ie-g0000<MNUMnLSTZcAj{7H
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index d6aaec73e6e..eae9383a02e 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -556,8 +556,13 @@ a.project-update.titled {
}
.add_new {
- float:right;
- padding: 6px 12px;
+ float: right;
+ background: #A6B807;
+ color: white;
+ padding: 4px 10px;
+ @include round-borders-all(4px);
+ font-size:11px;
+ margin: 10px 0;
}
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss
index 01ef6c345d0..a360b21aea4 100644
--- a/app/assets/stylesheets/style.scss
+++ b/app/assets/stylesheets/style.scss
@@ -125,7 +125,7 @@ table thead th{
td, th{ padding: .9em 1em; vertical-align: middle; }
table thead .image{width:100px}
-table tr:hover, .listed_items tr.odd:hover{background-color:#FFFFCF}
+.listed_items tr.odd:hover{background-color:#FFFFCF}
/* eo Tables */
/* Buttons */
diff --git a/app/assets/stylesheets/top_panel.scss b/app/assets/stylesheets/top_panel.scss
index 98f5ab4c454..2490aa9226a 100644
--- a/app/assets/stylesheets/top_panel.scss
+++ b/app/assets/stylesheets/top_panel.scss
@@ -1,18 +1,18 @@
.main_links {
- width:124px;
+ width:90px;
+ margin-right:40px;
float:left;
+ background:#ddd;
+ @include round-borders-all(8px);
+ border-color:#ccc;
+
a {
position: relative;
float:left;
- padding: 4px;
-
- &.home {
- margin-right:15px;
- width: 26px;
- }
+ padding: 3px 10px;
- &.admin {
- width: 21px;
+ img {
+ width: 22px;
}
}
}
@@ -147,8 +147,9 @@ body header {
.rss-icon {
margin:0 15px;
- padding:5px;
+ padding:3px;
border:1px solid #ccc;
border-radius:3px;
float:left;
+ background:#DDD;
}
diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss
index 42eb060f8fd..57070871680 100644
--- a/app/assets/stylesheets/tree.scss
+++ b/app/assets/stylesheets/tree.scss
@@ -113,3 +113,9 @@ table.highlighttable .linenodiv pre {
padding-right: 4px;
color:#888;
}
+
+.tree-item {
+ &:hover {
+ background: #FFFFCF;
+ }
+}
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
new file mode 100644
index 00000000000..b22280d2fd2
--- /dev/null
+++ b/app/controllers/help_controller.rb
@@ -0,0 +1,4 @@
+class HelpController < ApplicationController
+ def index
+ end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0e4ad533ad7..9f0f1e68954 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -89,4 +89,8 @@ module ApplicationHelper
def profile_layout
controller.controller_name == "dashboard" || current_page?(projects_path) || controller.controller_name == "profile" || controller.controller_name == "keys"
end
+
+ def help_layout
+ controller.controller_name == "help"
+ end
end
diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml
index 0c93f163787..5a760b3a2dc 100644
--- a/app/views/commits/index.html.haml
+++ b/app/views/commits/index.html.haml
@@ -3,7 +3,7 @@
= content_for :rss_icon do
.rss-icon
= link_to project_commits_path(@project, :atom, { :private_token => 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 00000000000..e69de29bb2d
diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml
new file mode 100644
index 00000000000..7d44b87564f
--- /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 4d9109aac19..d55e07f1adb 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 ac90dec00a1..101b411072f 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 00000000000..bbf54da2725
--- /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 edc223ba684..dc8ddf07511 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 6478853d77d..cbcd0660e10 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 9e199183b15..00000000000
--- 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 7b476362bed..0095098e894 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 c7c4c6b1324..1021dd1f597 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 e3ba64c5fad..2a299fd0ba3 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 4f70fb4b046..40eb4cebf08 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 3a4018d5cff..4f0e6fcbeae 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
--
GitLab