From 408a626ddd27806e184199a469d25d11b0c0b7e5 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Sat, 3 Aug 2013 22:22:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=A1=B9=E7=9B=AE=E9=87=8C=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=20user=E5=92=8Cproject=E7=95=8C=E9=9D=A2=20?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 57 ++++++++--------- app/views/layouts/base_users.html.erb | 15 ++--- app/views/projects/show.html.erb | 4 +- app/views/users/user_projects.html.erb | 6 +- app/views/welcome/index.html.erb | 76 ++++++++++++++++++++++- app/views/words/_message.html.erb | 3 +- public/images/sidebar/add.png | Bin 3360 -> 3214 bytes public/images/sidebar/minus.png | Bin 3256 -> 3116 bytes public/stylesheets/application.css | 28 +++++---- 9 files changed, 131 insertions(+), 58 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 2c05abc94..46c5fc38b 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -47,8 +47,7 @@
-
- <%= tag('img', {:src => "../images/user.png"}, false, false) %> +
<%= render :partial => 'layouts/tag', :locals => {:obj => @project,:object_flag => "2"}%>
@@ -60,13 +59,13 @@ <%= @project.members.count %> - <%= session[:project_focus_num] %> - <%= session[:project_investor_num] %> + <%= @project.issues.count %> + <%= @project.attachments.count %> <%= link_to('成员 ', {:controller => 'projects', :action => 'member'}, :class => 'project_infor_tag') %> - <%= link_to('关注 ', {:controller => 'projects', :action => 'focus'}, :class => 'project_infor_tag') %> - <%= link_to('投资者 ',{:controller => 'projects', :action =>'investor'},:class => 'project_infor_tag') %> + <%= link_to('缺陷: ',project_issues_path(@project), :class => 'project_infor_tag') %> + <%= link_to('文件: ', project_files_path(@project), :class => 'project_infor_tag') %>
@@ -74,40 +73,42 @@
- 概述 + 概述
-
+
+
<%= 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) %>
<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
- +
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 3f04f57d0..ab8cae4e4 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -38,13 +38,13 @@ <% 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 %>)
@@ -61,6 +61,7 @@ 邮件地址：<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %> +
@@ -75,10 +76,7 @@ <%= show_watcher_profile(@user) %> - - - ... - + @@ -95,10 +93,7 @@ <%= show_fans_picture(@user) %> - - - ... - + diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 4d9a70b2f..6705a89ed 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -26,14 +26,14 @@ <%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%> - + - +
<%= h(e.project) if @project.nil? || @project != e.project %> 有了最新动态 <%= link_to format_activity_title(e.event_title), e.event_url %> <%= h(e.project) if @project.nil? || @project != e.project %> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> 有了最新动态 <%= link_to format_activity_title(e.event_title), e.event_url %>

<%= format_activity_description(e.event_description) %>
<%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index b7e0ad2f5..dd2325764 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -9,7 +9,7 @@ - +
<%= link_to_project(membership.project) %>创建了 <%= link_to_project(membership.project) %> <%= link_to_user(membership.user) if membership.respond_to?(:user) %> 创建了 <%= link_to_project(membership.project) %>
@@ -29,10 +29,6 @@ <% end %> - -
- <%= link_to"更多",:controller=>'projects',:action=>'index'%> -
<% else %> 暂无项目，赶快去<%= link_to"新建",:controller=>'projects',:action=>'new'%>吧 <% end %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 59f356d9b..cd9459ee2 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,4 +1,4 @@ -
+ +
+ + + + +
+ <%= call_hook :view_account_login_top %> +
+ <%= form_tag(signin_path) do %> + <%= back_url_hidden_field_tag %> + + + + + + + + + + <% if Setting.openid? %> + + + + + <% end %> + + + + + + + + +
<%= text_field_tag 'username', params[:username], :tabindex => '1' %>
<%= password_field_tag 'password', nil, :tabindex => '2' %>
<%= text_field_tag "openid_url", nil, :tabindex => '3' %>
+ <% if Setting.autologin? %> + + <% end %> +
+ <% if Setting.lost_password? %> + <%= link_to l(:label_password_lost), lost_password_path %> + <% end %> + + +
+<% end %>
+<%= call_hook :view_account_login_bottom %> + +<% if params[:username].present? %> +<%= javascript_tag "$('#password').focus();" %> +<% else %> +<%= javascript_tag "$('#username').focus();" %> +<% end %> + +
+ + + + + + +
+

<%=link_to "项目管理",:controller => 'projects', :action => 'new' %>

+ 		+

<%=link_to "项目需求",:controller => 'bids', :action => 'index' %>

+ 		+

<%=link_to "发现开源",:controller=>'projects',:action=>'index' %>

+
+ +
特性
+
+
+
+ diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 85d30c884..ef0f7f57b 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -1,6 +1,7 @@ <% if jour.size >0 %> <% remove_allowed = (User.current.id == jour.first.user_id) %> -<% for journal in jour%> +<% journals = jour.reverse%> +<% for journal in journals%> diff --git a/public/images/sidebar/add.png b/public/images/sidebar/add.png index 9627ebc630179b436b22ec59da566d5b828b53a7..cd804d090924af569cf89ac741159fc1703d76b9 100644 GIT binary patch delta 511 zcmV8jcwuiBL{Q4GJ0x0000DNk~Le0000C0000C2nGNE09JKe=dmH23V#8+ zNkl30NoGHRiwnlp zFj^d#OprtdFfo{RLED5>Y^!ho-1|7dz?pw1zvY;FZ}+(12C%LnR1?uMz(A#8L~6i0 z;2VGgFmNX*FZv;_+@4N~4;D%S%76Bc_WVJ6cq`{**}|s6z5|vb=4BSbT4xZsHZ#fE z(i{MXzk}>HTT?}NGUlu?=yQj%@i&C(SvI0G4E&1SyU?1391o*N-5#l;uNVEPCEVkad))pQfJFgZ(fo66D!8;1xk_w1|sFI3O@Klz9ccj+VfGr0cS;MQmw!yt=Ioy_ zXFrKyQ{l*5PD5ec#86GWD}#~^Lqo;Z%%wE`4*&)vuQ@-47_tBW002ovPDHLkV1oRu B=iBL{Q4GJ0x0000DNk~Le0000F0000F2nGNE06W%|O0glF3V#Ak zNklU)XwO>|1O^c`s3zuEq{#muh=xIitL`OkL1xiH&h3p~7^{V%H^gO=vHMj;w(VA@5W-s<;vzASuUBbqC)|6z!cr@vZq>Ml7r+$oP62(uv_L}u@R%ULbkzWj zt=0&_5WGhKfd()Q^cjJP0vX$P9=s&TtQ8;#UM_hQ6@*qM*%YT@`PnZ&> zf_$H&T?(x&Z3`zWpgU)vrNi4bhyua6f{i^#VZ$jC=WcZJSe^SEy!^g5YRb}g4-fV-(%-|spp$J)vPID|qteE1#OXbcdEK-Dhn(p=QHnqlKBwR3?|Va=cI3NgW<=rH6z1vAN6Q zdYgKv5m9v63I;!8Jj`nRd}P&_pa3DNSd3O33u;AFvD8CDPoVLD$7j!bm{mXvc;I2R zvrEX+6!N@dnLO)oTtOUBum1cmzBL4u2Gw1+teb(^aVe#IUf+m0XzyvIoqZh@Fd^H*u#q1#c3q8>?K%eaDqXIr?_ao6qOlZe|;g z@7-kU+GYNiTa%x>{j%8boXhFE#d320#+dJ2rqsYq$R#ipt|sT>*AsFnr*Lknhp!fA zck0m@zxslk5d?yeOJS`sRN#{7p(3*1nk^euS~o_?7$s+vjMj}tmDX&D$i4z|6?Pkw zCz+?ab delta 552 zcmV+@0@wYl7`PcBiBL{Q4GJ0x0000DNk~Le0000F0000F2nGNE06W%|O0glG3V-EE zL_t(|+H8|QPZVJg#((qv**)%V`6rS9TA+muCdOz_s0lH^2QlGukoXnsk-|_}5Ny>L z60Wk40yQLraB|DR?e6=I1&4vKPdRyhnVHNy^6LFJZfRU#Ilx-K49{cK%oyo4y*sez z2ZbG=dt-LDz!$(~g)CW=wzoI+X@AhC74pWSyTAsp4`7Cdm%z5bQojh)sb2;JmVoV{ z9|KGPn*#F!fY!pOB7nd=un9~!f#nKWyb21co_u0Hsj8PDwVP(;w%PzutQeH7P zVzAcJ^Kf3%{8+h=3~eia;47))>lS!0~ApBa*w8x1Gy#cJrR!fmMawW@2m6=5^OyV0Gxf6O4Ue q&7uEO6{2R=NU!PbfvZW?zX1TK@WXZTnqrp#0000