From d29ec9d7730ea2cf07ccc2e9dc07dd20df5c391c Mon Sep 17 00:00:00 2001 From: randx Date: Sun, 27 May 2012 01:09:44 +0300 Subject: [PATCH] Images refactored, Feed icon replaced, Fixed comment form focus --- app/assets/images/Info-UI.PNG | Bin 801 -> 0 bytes app/assets/images/Rss-UI.PNG | Bin 789 -> 0 bytes app/assets/images/add_comment.png | Bin 823 -> 0 bytes app/assets/images/admin.PNG | Bin 556 -> 0 bytes app/assets/images/comment_add.png | Bin 778 -> 781 bytes app/assets/images/download.png | Bin 599 -> 674 bytes app/assets/images/new_project.png | Bin 257 -> 0 bytes app/assets/images/rss_ui.png | Bin 0 -> 812 bytes app/assets/javascripts/note.js | 4 ++-- app/assets/stylesheets/common.scss | 9 +++++++++ app/controllers/projects_controller.rb | 1 - app/views/commits/_head.html.haml | 7 +++---- app/views/issues/_head.html.haml | 4 ++++ app/views/issues/index.html.haml | 5 +---- app/views/notes/_form.html.haml | 2 +- app/views/projects/graph.html.haml | 3 +-- app/views/refs/_tree_file.html.haml | 2 +- lib/assets/javascripts/branch-graph.js | 8 ++++---- 18 files changed, 26 insertions(+), 19 deletions(-) delete mode 100644 app/assets/images/Info-UI.PNG delete mode 100644 app/assets/images/Rss-UI.PNG delete mode 100644 app/assets/images/add_comment.png delete mode 100644 app/assets/images/admin.PNG delete mode 100644 app/assets/images/new_project.png create mode 100644 app/assets/images/rss_ui.png diff --git a/app/assets/images/Info-UI.PNG b/app/assets/images/Info-UI.PNG deleted file mode 100644 index 7f48ed8d3f16541788d6d2c2117b6ac4afa7bb37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 801 zcmV++1K#|JP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyV@ z3=|IO^trYG00N;&L_t(Y$E}vZOI1-2#((Gf6s=WBQBZ^s1S744-1IgPc{Y&*VGw~E z|9}<|1Z`Uy(KeJeLhV{u_XciC1R-cQpqLRYf@mQ~$kT_ng>zol>%I3~s{z4xnK|E_ znQy*1j+`Y)!r0gt0IC`R1Heh(GH?OtHP;Q`Bk&2>6p>bl2Rdg2bCj5>o&m;zyTB#N zZ3}n}%m9lbvQ^|1Wp5J4aR9jkyaAqNK+=Nv)NXtmma=Bd zu>zpzdoM5nEUD_S_kJIk%k^X$xMznHmGwLD78nF>lz=;62M`fiJJ2I5*NkOW1hNWT z6OpgxKMBlMfUN@~BC-+3@m}ey@ehE$3W9tHAZCleN`apeEpsA|P86DTV1pES8mQ+8m z3vAo}u1jnT+-%syQ^7QVSHPUHsbRjOz+<}GDA3n1S)og2SAaI~P(*%O`Hs{`5a1Zl z6J@lEiorYwOaUXA?>#jV3_W*IjjOv%KtG2wmzAK6!vy@L?M5c`-KhO9wg$8#+b3K9 zA?vdKEC8(t*tC5@O_i?e6B3^nk?qJf!0`F}mg5I@_NKK2&->?l#ipbo)ePmL!1f0r&r8W9jPx#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~d^PB7zy_9ZO<5npowyZs$4J!!3=F1hZe->gU1daEk0#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 ztlzRgPHj_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 diff --git a/app/assets/images/add_comment.png b/app/assets/images/add_comment.png deleted file mode 100644 index 1992303e7697ab615f6e21adb07a4dbe16ee2820..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 823 zcmV-71IYY|P)eIzihB zNMCqPCjcgBIsq^NumMa^c;%&Gg3=9O1DJsNq(gG4^Fe(6N;v6Mq$E!MKi{2W$8DU? zXI5u>U^Tbe1881;Y&IL&@ql~GJ>uT+NY|eGiu;WF;rd{&*UOE77WXMO6niF~;q%7$ z{8Q9ZI0fM31RJP=#i*xM1i(f7bH!5q8Fl3X7*|ld2w{{3AgEB-r`Z^F{vQQ2i$7ur zg72_6iPiaudz*WRJr!wu7HE4e1E3@HcQ_O+bI$w0zgwXeMc88V6YkU^K0X+FN22tbBMChB`9D9;7sA?+sJJSpWkuw=~&=x>!>I zn3c@+GB(FFa|QqmZ6Aim^C6BfP5>B`xaKVJGWEtffQ4+jX~?z|sh|pA%BN6c9(ppsrKYkVX7A)s0Htadw)b#geezA`-a5#8R0?<<*V?*0E9jxToKkW7g#XK zCuky@Qj5O^K()XD;rY$IOVnN$+oSp*lB5BkT;jUy$oNzM0oQ#o`W-8ObT+RJ%!nf_ zLf>QiASP`w6=roEtnRvYr5&%+NCa@e@EvQoaR)=#_6`*2;8Ru+oG_wKP7Ydv`f^8s zu!0bhv{|DJ0EEa3roz#4;YZZ*%2F0_v)%(HLhdFW_V{Io>m=*Myzc@)ZO-HyA8!4k z3p2N+YotuA3Ogy@6aZ(%n*iXnc-;V;7q1h57vgmR@J7520A7iw2H>4|N&sGprvl)u zcnSbsi!U-4$TFB-u9@f7xc~2P&Fv1L?f`xT7y##pj_88rk2e4S002ovPDHLkV1gbD BYHPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyW2 z6gUC0kV^^B(!#}) zGEFM65pDbj25w=Km^6VDNs&rOy2!=XgrJ~B#3X_kzX&OU*JiG4HgBq(ojEge&dwHO zW@dxHDDXwnCo@|H-T^Np?E}OZsj3QqA_d172_dWicYsY`6?p97E^r$tCC#;%GRD|; zeh@0W_AJ?0KNg26YwE03mgFVfRQA2%?pioT(G5V%mNsb)N_B*%yxm{BxeSAQv#>6 z5gXvGq+X1XR%Bo?)8P^@R!W)&u6wXeIMs*$VAf;;m@Lff4DbrLn*pXJz4TYQ1+2UJ zZIj=?RAFZ4fSpX`R)_b%A0T8jze_rs?!hxx{V7oPdCL3@@LbZ9BKrqFfg$=^1N`-k zya8O4v{feH^UkXQ780>iN^6pC0$oX4F-HCusO$Q(FVYoB_kleJO#u%*ZO_b3O4zs#%)Y)d+_;{O1SBa|Z}{tOcU0000}bk6j&80F%4WV6T7h}SyX&TdKR6MQ@}XT z9cgLPdQp=~4(`*v!Uq)xNa=v8x>N zAG-UV+N0|$YV1qmy2MuBZ+_NC@2kaPp+0=CZq zyajkLhk8{Db9VvXC7p_gozqIxWZ z&;>jOnldHcnA!TekKsbi%!YxTz{g05KLe0KJTnLOy8Cq5cjRvcs6a^C1fvAeS~-~M)X-yW>k|8A-`7(!?PI)4FQM*Iac`_?o-2%#4k z0JZ{)O9W^EJ_8TU>_%yTG);RXjREVIBd>dvaOaaGx!e#SgdpI$yC0LPhCTClcb@^K zBs~RYfo@iyrfh0-BYDsQpX$av7@K(}>0)@R^qAJIn{K|g!;^ZNO zku*(5LkL|th((|)N-j#Qv~Dq(*^z>wLz0dI>mnuQftzJww-zOfiVsQ8qEm7Pm|iL12x$-%gTbB8t;r2B4+P7G%jz6m-7> zrfbMNyqqFb)aR0}gb>EfY${jnI}1SDfCt$%?2SHnMaR&ApOGqZ_f_uxB2ClY21oX> zyYI{0f`9o7NM%1pLy|5Qtf11K0EV)PcVIPe7&u*!urg;7*kxv48lD14w}3uicMaej zz@r-KRV~cj1$>uuDo)<$J=$Q@0Zk?G7F+-T002ovPDHLkV1n}GG0Ok| diff --git a/app/assets/images/download.png b/app/assets/images/download.png index d718e07dea3ea6645a3375291f27446661eeb331..5791e723de9063bc7f28764d14c987c2cd277188 100644 GIT binary patch delta 650 zcmV;50(Je@1fm6yB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru+yxpH3>5P2w3Pq=0wPI7K~#9!?VG`E!!Qg*e+mzx z0di<3h)+Fx0Rip?x#!XzGC((QkpIv!s8o(ns6QmcRFn@yBkz`SlZSs`BfWZGm zQlt!TE|&||Y!6tutsX!&^x$wfV7J==0P4E_|2<}>c1xa5QmD}7)$0J7o z1F%hjTcLH!Oj3i&hJ5k@pf4<@$T7R;mxzyA#eeddKqyVcTOETlflx}JKFIn2 z4WUd_d}S-%sS%PweI*E?l0v-%>jX9FR3Lo2il5X9YY6)U8l58AEFgt?2T(;4-LQ9}EET1o`S)JVgXh zO^}ro>VJ(Qq)4vBJWr6HQyQHp06Y#)4Ryy!dMP>)LgS;+i3(uC1lj3|f2Q^?$hElT z1nITWNdkc71X+X<9~6M$1X)US;F1=j?SB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0005` zNklToQ5QR;}z37THM<_R7&!$~)fZiavLAzyDP7t_3jsPd1aqCu5gu#C^ zHh7+dM1yuVK$+p3^ZB5$qz6LBQ&vQxvV*q@b-A}d0&%R~bzjQ0V z9=8;qIls0Bnf5m|X*e_pHUmYAAT5Ga2&okrA?7{W3^;1=lmaRMjy(D_1GWGhee_oW z#1K5C00AHX1b=`45C8%|00;m9AOMTHu-`*YoeM*{eY%(ec)nfz&Ih;`aTo!Zb`D__ z{hw^sfIkS=BL=U!2=Yb>(db^pgCAV(0)uFD4-j5dgV)^#_W*$he}=3B2Js^y>ZBXI zX(99(AOs$KiCGDr1A_2n8oX^O%pp_(6gq`ZFYqp=pMMWsRrh*mGgNwjFp80%Y#Var z1~DOwI)x6V9WIf4L**)Xi1Pqw^Q2wqU;}`3kgu+ThX4TOAo=?81~H|ej>KF#$Pb%B z#}@!s=BbCSIH3`o&W#< M07*qoM6N<$f@g2-M*si- diff --git a/app/assets/images/new_project.png b/app/assets/images/new_project.png deleted file mode 100644 index 045dc705ba3da4d6e970e363e97402a99d78ee07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<770!<#4mM2_X zbNax61KlcRQyLo^C4KK&ie-dE3M9@n727Bu!pY31bmi}H#dC){)K%pi%gRbhOq5q{ uJYe%hSSXMoKF{X(fde0y#cu5oVPs(H7SYPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyf3 z6&nTw)Im!C00OK@L_t(Y$Gz51h*eb_2k_6mzR?ORv$?u0&>(2hB8rG8D3~EmP~xIO zp-p6qn-UBOM&L?=pyDDe4JL3EMBK%^phZD#+LRHAh1H@UuV{q?jc?|)=v+Bn-kZ76 z*bg3@_dDnQzUTYJjzkA2ba#mFJX1s<&u8q8jm-EQvP;!Hf zWFy+%nkViWuj9J$zr0A6oX-ZG4OqbfZiwq$xEFUK?-m(|-lhy+M!>^3whq{AKE>b}oQ+0*!taTZUHGD?>KBTt&YLnE z$I(vq_KMMRQ-&=`Ja*!K?7@?T$C@&%7FE57eN&iCWb_Yd%J555hWGI-9*-sh>3&t>P1G!_OGvL{o;9$Z#7zk1m8iv9l?|Z$(uv#CFz;QI3akHy*=V zxKvd2-pKG*+?QN#3*L_F_i)Y>qkXdNMw}|D`njd0C5yWU7jZB-^HfpQw>M=thtrc> zm#@(byFF`w6Z^j%-7`Nw4MO7D3cRF?s*j`lij;0LX_jTQ current_user.private_token, :ref => @ref }), :class => "btn" do - feed - = image_tag "Rss-UI.PNG", :width => 14, :title => "feed" + %span.rss-icon + = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do + = image_tag "rss_ui.png", :title => "feed" :javascript diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml index 99c61d75528..157741dda04 100644 --- a/app/views/issues/_head.html.haml +++ b/app/views/issues/_head.html.haml @@ -5,3 +5,7 @@ %li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"} = link_to project_milestones_path(@project), :class => "tab" do Milestones + %li.right + %span.rss-icon + = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do + = image_tag "rss_ui.png", :title => "feed" diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 1d71e3926f9..86fd6a4add2 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -2,10 +2,7 @@ .issues_content %h3 Issues - %span.rss-icon - = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do - = image_tag "Rss-UI.PNG", :width => 16, :title => "feed" - + %small (#{@issues.total_count}) .right .span5 - if can? current_user, :write_issue, @project diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml index ec07411a28a..74ffbecbee5 100644 --- a/app/views/notes/_form.html.haml +++ b/app/views/notes/_form.html.haml @@ -10,7 +10,7 @@ = f.text_area :note, :size => 255 %p.hint Markdown is enabled. - .row.note_advanced_opts + .row.note_advanced_opts.hide .span4 %h5 Notify via email: .clearfix diff --git a/app/views/projects/graph.html.haml b/app/views/projects/graph.html.haml index 394a11fdc47..799b4e4e369 100644 --- a/app/views/projects/graph.html.haml +++ b/app/views/projects/graph.html.haml @@ -1,7 +1,6 @@ %h3 Network Graph %br -#holder.graph.well - +#holder.graph :javascript var chunk1={commits:#{@commits_json}}; var days=#{@days_json}; diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml index 3fcc37331e7..686ad41b38b 100644 --- a/app/views/refs/_tree_file.html.haml +++ b/app/views/refs/_tree_file.html.haml @@ -29,7 +29,7 @@ - else %center = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do - %div + %div.padded %br = image_tag "download.png", :width => 64 %h3 diff --git a/lib/assets/javascripts/branch-graph.js b/lib/assets/javascripts/branch-graph.js index f46dbd17754..3276886e77d 100644 --- a/lib/assets/javascripts/branch-graph.js +++ b/lib/assets/javascripts/branch-graph.js @@ -37,17 +37,17 @@ function branchGraph(holder) { r = Raphael("holder", cw, ch), top = r.set(); var cuday = 0, cumonth = ""; - r.rect(0, 0, days.length * 20 + 20, 20).attr({fill: "#474D57"}); - r.rect(0, 20, days.length * 20 + 20, 20).attr({fill: "#f7f7f7"}); + r.rect(0, 0, days.length * 20 + 80, 30).attr({fill: "#FFF"}); + r.rect(0, 30, days.length * 20 + 80, 20).attr({fill: "#f1f1f1"}); for (mm = 0; mm < days.length; mm++) { if(days[mm] != null){ if(cuday != days[mm][0]){ - r.text(10 + mm * 20, 30, days[mm][0]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"}); + r.text(10 + mm * 20, 40, days[mm][0]).attr({font: "14px Fontin-Sans, Arial", fill: "#444"}); cuday = days[mm][0] } if(cumonth != days[mm][1]){ - r.text(10 + mm * 20, 10, days[mm][1]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"}); + r.text(10 + mm * 20, 15, days[mm][1]).attr({font: "14px Fontin-Sans, Arial", fill: "#474D57"}); cumonth = days[mm][1] }