From 94f559e7ba977e311e6d86262ec21366769f2bf3 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Thu, 1 Aug 2013 21:26:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86base=5Fuser=20ba?= =?UTF-8?q?se=5Fproject=20application.css=20=E6=95=B4=E7=90=86=E4=BA=86sid?= =?UTF-8?q?ebar=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 47 ++++++++++---------- app/views/layouts/base_users.html.erb | 48 ++++++++------------- files/2013/08/130801211050_L3.png | Bin 0 -> 7697 bytes files/2013/08/130801211151_L3.png | Bin 0 -> 7697 bytes lib/redmine.rb | 6 +-- public/images/sidebar/add.png | Bin 0 -> 3256 bytes public/images/sidebar/go.png | Bin 0 -> 4038 bytes public/images/sidebar/male.png | Bin 0 -> 3453 bytes public/images/sidebar/stop.png | Bin 0 -> 1025 bytes public/images/sidebar/tag_title_right.png | Bin 0 -> 2971 bytes public/images/sidebar/tags.png | Bin 0 -> 2903 bytes public/stylesheets/application.css | 50 +++++++++++++--------- 12 files changed, 74 insertions(+), 77 deletions(-) create mode 100644 files/2013/08/130801211050_L3.png create mode 100644 files/2013/08/130801211151_L3.png create mode 100644 public/images/sidebar/add.png create mode 100644 public/images/sidebar/go.png create mode 100644 public/images/sidebar/male.png create mode 100644 public/images/sidebar/stop.png create mode 100644 public/images/sidebar/tag_title_right.png create mode 100644 public/images/sidebar/tags.png diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index ca7c2ddf..de8427b0 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -38,7 +38,7 @@ - + <%=link_to "取消关注" %> @@ -48,7 +48,7 @@
- <%= tag('img', {:src => "../images/user.png"}, false, false) %> + <%= tag('img', {:src => "../images/sidebar/tags.png"}, false, false) %> <%= render :partial => 'layouts/tag', :locals => {:obj => @project,:object_flag => "2"}%>
@@ -74,40 +74,41 @@
- 概述 + 概述
-
+
+
<%= textilizable @project.description %>
- 创建时间:<%= @project.created_on %> + 创建时间:<%= @project.created_on %>
-
+
- +
- 工具 + 工具
-
    -
  • - <%= link_to l(:project_module_documents),project_documents_path(@project) %> -
  • -
  • - <%= link_to l(:project_module_wiki),project_wiki_path(@project) %> -
  • -
  • - <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> -
  • -
  • - <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> -
  • -
+ + + + + + +
+ <%= link_to l(:project_module_documents),project_documents_path(@project) %>
+ <%= link_to l(:project_module_wiki),project_wiki_path(@project) %> +
+ <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> +
+ <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> +
- +
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 5621f8d3..f7b0c415 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -19,14 +19,7 @@
-
-
-
- <%= render_menu :account_menu -%> -
- <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> - <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> -
+ <%=render :partial => 'layouts/base_header'%>
@@ -44,15 +37,15 @@ <%= h @user.name%> - <% unless User.current == @user %> + <% unless User.current == @user %> <%= watcher_link(@user, User.current) %> - <% else %><%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %> + <% else %><%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %>
- 关注 (<%= link_to User.watched_by(@user.id).count, home_path %>)  粉丝 (<%= link_to @user.watcher_users.count, home_path %>) + 关注 (<%= User.watched_by(@user.id).count %>)  粉丝 (<%= @user.watcher_users.count %>)
@@ -60,13 +53,13 @@
- + - + - +
加入时间:<%= format_date(@user.created_on) %>加入时间:<%= format_date(@user.created_on) %>
最近登录:<%= format_date(@user.last_login_on) %>最近登录:<%= format_date(@user.last_login_on) %>
邮件地址:<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>邮件地址:<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>
@@ -82,20 +75,20 @@
- 关注(<%= link_to User.watched_by(@user.id).count, home_path %>) + 关注(<%= User.watched_by(@user.id).count %>)
- - - + +
+ <% for user in User.watched_by(@user.id)%> <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %> <% end%>
...
@@ -104,31 +97,28 @@
- 粉丝(<%= link_to @user.watcher_users.count, home_path %>) + 粉丝(<%= @user.watcher_users.count %>)
- - - - + + +
+ <% for user in @user.watcher_users %> <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %> <% end%>
...
- - +
-
-
@@ -145,9 +135,7 @@ - - - +
<%= call_hook :view_layouts_base_body_bottom %> diff --git a/files/2013/08/130801211050_L3.png b/files/2013/08/130801211050_L3.png new file mode 100644 index 0000000000000000000000000000000000000000..6cf2afb172a634dd6652167f5996ebf7d2bdc0c2 GIT binary patch literal 7697 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 literal 0 HcmV?d00001 diff --git a/files/2013/08/130801211151_L3.png b/files/2013/08/130801211151_L3.png new file mode 100644 index 0000000000000000000000000000000000000000..6cf2afb172a634dd6652167f5996ebf7d2bdc0c2 GIT binary patch literal 7697 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 literal 0 HcmV?d00001 diff --git a/lib/redmine.rb b/lib/redmine.rb index 3ff39067..6784225b 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -201,9 +201,9 @@ Redmine::MenuManager.map :top_menu do |menu| menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural menu.push :requirement, {:controller => 'bids', :action => 'index'} menu.push :developer, {:controller => 'users', :action => 'index'} - # menu.push :investor, :home_path - # menu.push :theme, :home_path - # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + menu.push :investor, :home_path + menu.push :theme, :home_path + menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true # menu.push :help, Redmine::Info.help_url, :last => true end diff --git a/public/images/sidebar/add.png b/public/images/sidebar/add.png new file mode 100644 index 0000000000000000000000000000000000000000..71d0ae53f8651ca3d28e231cae2f0327c4a77928 GIT binary patch literal 3256 zcmV;p3`g^cP)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z0p&?VK~#9!Y?D7v6k!m?fAjv?J??J#Cz1eKpoI-4#%NEd2{FJ2G2wHN_!aDt!cbWd zY}FVNuCkBw9IeC7Wnan)$>isuvXR}^(5Dsh#-h8x2CxrchK85Gw!l)q2-K-x1_YLX z?V%q7OaPk#^8$d@!l)vEz&x-COgMq%3R%1g3aaFlk|p=qyi$x&5TRjZ(V@#O!g^9( zF*jnc*3AVTyQaJduD2!*~zimRgDoIX01E5nW>z3)NeZ@k{_RTr%!s5_#`F7 zh&P5Tv50^w^ol?kBi0zoV!-if7bB9pmbabHzs{fh{Pcq)ZIBO2{#+FICYWs{v{O$p zxZ>zy#cJrR!fmMawW@2m6=5^OyV0Gxf6O4Ue q&7uEO6{2R=NU!PbfvZW?zX1TK@WXZTnqrp#0000|COP)002t}1^@s6I8J)%00009a7bBm000ie z000ie0hKEb8vpKLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z1oKHmK~#9!?A+^5990+w@aM3z!)+;k;3~T)mqHOz{G#DvwTVEv7>#}~#Ms!{7z44j zG1dMHnnEhn0Me$>Xw}xJG?muSVkiQxp^K#yTH7GBMFL*JePOS!A9gV77j}SUcV_my zf56P-2j_Wq&zvkHBJhznVVrK8Z~+L{ zp{8RL!buBtPc9J0@`V@{3EZ1ofvM#hO55)c$MQ8gPYGNZp9QP$qeH#wD}lgn(Rh`>i2+Xu ze01|q;#e|E;9%$PU>{rPvIB%hP38> zlqj?Wl(ns_3j<;!&^bN}R{t~A^xPwk+^-ux+W zC7|Ayta=>~Bck>C6j+0q>ISEYW63Fj2m$YQje)gXqxSn-R|492eZN`)0G|711WBI_ z(w(^#;#j^)AX>!qq8-^M2k_K+|CWF@4~9r3&^zHNfdf~^iDStufzw0NV8_jLY?CFR z{Ub+=0ipmz33#t-46M1I+Qw&zW63E2#_-~Iw-Ep7b-F#fz7hz%!)#Is{B3n0=hOfS z+inxbl34=g$$7B4KHA^qy9D?#Nx@SBpI9crKIkQmwbnRXz@iv&`@Mzo4uqqv0QFo$$^rbI9#sEV*a|U zwy>n|ek93&p1t`nt|Pod2TKZXCWUv&2EtqWSYF}XRGNXB$Ku&m-cC?0lG6>WIB~GR zh{obn7Kq!b56kHWtPYgt#^X}Ob{5E6s|QO8@3dqCx?jtOFOAazIEDr5Q3ORJ*3CLAv`F{M13vaqD^uFOk7dwC{P+TT$b zSW6sFfK?wSiTXsS)i0G`&!_z?wZ{=cng?H~9M}=3dL;j25djW2V0Yn2Q7VoVq-X}ozgSMsp7--R6LEe| zhUSp`gXJb*$&M^zEP7tgMtp>zS*VR;N#QLTM0CBHkHW-gO(Sg#%PYK3S7c&;c3emx ztq*H8ylpNV-Ia>>pG*lUB>7lUc)yUJh_KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z0;)+wK~#9!l$2dalVKFcf9HL-w!O}_X>Nt9Ff{{9BZ3P0qA0K~6!a$QLV_Z?n0H+S z)s0qAp>S-RTX$NO$i7iMH6*>ib#&X4my|363c z_9*}J)Xg(H3CwT7;qp-6@uF$EZOYGAj@6*sXOp+$SZ230hAaTG=?D1yN2F}A7l2rw zISHaV!hZa7k21Gvv(zB6BeZ(@YUpmUcW0Vw{9RloKyENt&;jZ5de*%K&u2R4TgF%yy#js6#zh1Zr!L}MF#N9 z(g{|an5b*aSx^t4db+PjV<`4dkKaDukIEzEHMOcE><7>!Fwc+5Lwxw`w1SdKwDY;& z#Ov2_8mq@Aak_P~X|S@>N}V)@vMMu{8P{Pe9*3m9=a}IH`;3LtN^D2iDK57IfV}k? zKvP4#F+>AzN%OSi7==41o?~ZZ$Ra)VaD0-%w-*7VYI(i7+&2H8kn-AAL_nQWEsxG<3{tUVRx%(jV<4*1Jy{ f_CEbn=8pjY{>T)dSFFH|00000NkvXXu0mjf3P+se literal 0 HcmV?d00001 diff --git a/public/images/sidebar/stop.png b/public/images/sidebar/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..175eafd0a5fbb6bc69d2fb6d174d07cc79a4759c GIT binary patch literal 1025 zcmV+c1pfPpP)002t}1^@s6I8J)%0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#qe(o&{;nIut-r z)@MA$H%3ro%>i2iJl)I#n}Q&Vzp+Lc-&~GU=l9N+A!{p`t-xY70vsu%tTAG)QY9O~ zfFtqm!U4SF%=sl^Qh?CWD$>$Qmf_stDi`%R zB3b%me>)^tktrA_QBokfDvQ%h$u}o-&mC|xTQ%(@++Ka9v8W$lFG$Fc<>+Dx z$I;CYb$OfK(ohsnGiRLqq1%&x+)ZuQNR+jJ{mg}|j7zJ6akVw_ascKZ#mlP272wd@V0a@=0@`>h_0E_C9F#=@CY7?tt zP;-GK98Zw>CMxf{VgVG@LXyt%7sq=NxJi3t6{UP|m(O7arIo`kFTE6{jsJ^%?&vbV va^zH&`GLg3%vna3iIHVw8Ce0!9{~mceV(JS&1KsW00000NkvXXu0mjf_@dzO literal 0 HcmV?d00001 diff --git a/public/images/sidebar/tag_title_right.png b/public/images/sidebar/tag_title_right.png new file mode 100644 index 0000000000000000000000000000000000000000..5ce6d6bb28ebc43be900cecf0f7a73569e2594ec GIT binary patch literal 2971 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 Date: Thu, 1 Aug 2013 22:25:30 +0800 Subject: [PATCH 2/3] add some images and let the tag function more userful. --- app/views/layouts/_tag.html.erb | 11 ++++++----- app/views/layouts/_tag_name.html.erb | 2 +- app/views/projects/show_new.html.erb | 1 - app/views/tags/_related_tags.html.erb | 2 +- app/views/tags/_selected_tags.html.erb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/layouts/_tag.html.erb b/app/views/layouts/_tag.html.erb index 65d6c55c..4a0fe78c 100644 --- a/app/views/layouts/_tag.html.erb +++ b/app/views/layouts/_tag.html.erb @@ -1,9 +1,10 @@ -
+
+ <%= tag('img', {:src => "/images/sidebar/tags.png"}, false, false) %> - <% if object_flag == '3' %> - <%= toggle_link (image_tag "/images/add.png"), 'put-tag-form-issue', {:focus => 'name'} %> + <% if object_flag == '3' %> + <%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form-issue', {:focus => 'name'} %>
<%= render :partial => "layouts/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
@@ -15,13 +16,13 @@ <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> <%= f.submit "add"%> - <%= link_to_function l(:button_cancel), '$("#put-tag-form").hide();'%> + <%= link_to_function l(:button_cancel), '$("#put-tag-form-issue").hide();'%> <% end %>
<% else %> -<%= toggle_link (image_tag "/images/add.png"), 'put-tag-form', {:focus => 'name'} %> +<%= toggle_link (image_tag "/images/sidebar/add.png"), 'put-tag-form', {:focus => 'name'} %>
<%= render :partial => "layouts/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
diff --git a/app/views/layouts/_tag_name.html.erb b/app/views/layouts/_tag_name.html.erb index d510e003..b1670d2d 100644 --- a/app/views/layouts/_tag_name.html.erb +++ b/app/views/layouts/_tag_name.html.erb @@ -17,7 +17,7 @@ cursor: pointer; } - + <% @tags = obj.reload.tag_list %> <% if non_list_all and (@tags.size > 0) %> diff --git a/app/views/projects/show_new.html.erb b/app/views/projects/show_new.html.erb index 8ab657b0..25ee6e70 100644 --- a/app/views/projects/show_new.html.erb +++ b/app/views/projects/show_new.html.erb @@ -10,7 +10,6 @@ <% end %> <% end %>
-

<%=l(:label_overview)%>

<% unless @project.active? %> diff --git a/app/views/tags/_related_tags.html.erb b/app/views/tags/_related_tags.html.erb index 08c588a1..b7ebd589 100644 --- a/app/views/tags/_related_tags.html.erb +++ b/app/views/tags/_related_tags.html.erb @@ -2,7 +2,7 @@
    <% for rt in related_tags %>
  • - <%= link_to image_tag("/images/add.png"),:action => "add_tag",:remote => true,:tag => rt %> + <%= link_to image_tag("/images/sidebar/add.png"),:action => "add_tag",:remote => true,:tag => rt %> <%= rt %> <% @issue_size = Issue.tagged_with("#{rt}").size %> <% @project_size = Project.tagged_with(rt).size %> diff --git a/app/views/tags/_selected_tags.html.erb b/app/views/tags/_selected_tags.html.erb index 0eacecd3..51ba6c87 100644 --- a/app/views/tags/_selected_tags.html.erb +++ b/app/views/tags/_selected_tags.html.erb @@ -2,7 +2,7 @@
      <% for sg in selected_tags %>
    • - <%= link_to image_tag("/images/delete.png"),:action => "delete_tag",:remote=>true,:tag => sg %> + <%= link_to image_tag("/images/sidebar/minus.png"),:action => "delete_tag",:remote=>true,:tag => sg %> <%= sg %> <% @issue_size = Issue.tagged_with("#{sg}").size %> <% @project_size = Project.tagged_with(sg).size %> From 4163cd03327e47292a84d1eab1f106b82cee1a70 Mon Sep 17 00:00:00 2001 From: william Date: Thu, 1 Aug 2013 22:25:54 +0800 Subject: [PATCH 3/3] add some images. --- public/images/sidebar/add.png | Bin 0 -> 3360 bytes public/images/sidebar/minus.png | Bin 0 -> 3256 bytes public/images/sidebar/tags.png | Bin 0 -> 2903 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/images/sidebar/add.png create mode 100644 public/images/sidebar/minus.png create mode 100644 public/images/sidebar/tags.png diff --git a/public/images/sidebar/add.png b/public/images/sidebar/add.png new file mode 100644 index 0000000000000000000000000000000000000000..9627ebc630179b436b22ec59da566d5b828b53a7 GIT binary patch literal 3360 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