diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 2c05abc9..46c5fc38 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -47,8 +47,7 @@
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 3f04f57d..ab8cae4e 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 4d9a70b2..6705a89e 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 b7e0ad2f..dd232576 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 59f356d9..cd9459ee 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 %>
+
+<%= 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 85d30c88..ef0f7f57 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 9627ebc6..cd804d09 100644
Binary files a/public/images/sidebar/add.png and b/public/images/sidebar/add.png differ
diff --git a/public/images/sidebar/minus.png b/public/images/sidebar/minus.png
index 71d0ae53..0e407615 100644
Binary files a/public/images/sidebar/minus.png and b/public/images/sidebar/minus.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 22d337d5..c16485a5 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -71,6 +71,11 @@ ul.tool li{list-style-type:none;
font-size:16px;
/*color:#00aaf8;*/
}
+.font_small_watch{
+ font-family:微软雅黑;
+ font-weight:bold;
+ color:#00aaf8;
+}
.left_wf{
padding-left:8px;
}
@@ -92,6 +97,7 @@ ul.tool li{list-style-type:none;
font-family:微软雅黑;
color:#919294;
font-size:13px;
+ padding-left: 8px;
}
.font_description{
@@ -116,7 +122,7 @@ ul.tool li{list-style-type:none;
.inf_user_motto{
padding-left:8px;
margin:5px 0px 0px 0px;
- padding-top:2px;
+ padding-top:1px;
background-color:#b8c1c8;
height: auto;
}
@@ -128,28 +134,28 @@ ul.tool li{list-style-type:none;
}*/
.inf_user_image{
padding-left:8px;
- margin:5px 0px 0px 0px;
+ margin:0px 0px 0px 0px;
background-color:#fff;
height: auto;
padding-bottom: 8px;
}
.user_fans{
padding-left:0px;
- margin:5px 0px 0px 0px;
+ margin:0px 0px 0px 0px;
height: auto;
background-color:#fff;
}
.inf_user_context{
- padding-left:8px;
- margin:5px 0px 0px 0px;
- padding-top:2px;
+ padding-left:0px;
+ margin:0px 0px 0px 0px;
+ padding-top:1px;
background-color:#fff;
height: auto;
/*color:#fff; */
}
.tool{
padding-left:0px;
- margin:5px 0px 0px 0px;
+ margin:0px 0px 0px 0px;
height: auto;
background-color:#fff;
padding-bottom:5px;
@@ -188,8 +194,8 @@ ul.tool li{list-style-type:none;
margin:1;
padding:1;
width:240px;
- height:2px;
- background-color:#ebebeb;
+ height:1px;
+ background-color:#c6e9fe;
overflow:hidden
}
.line_under{
@@ -796,10 +802,10 @@ margin-left:-10px;
margin:10px auto;
margin-top:100px;
- width:410px;
+ width:310px;
margin:10px auto;
- font-family:lucida grande,verdana;
+ font-family:微软雅黑,lucida grande,verdana;
font-size:12px;
-webkit-border-radius:10px;
-moz-border-radius:10px;
| | 
概述
<%= link_to l(:project_module_documents),project_documents_path(@project) %>