+ <%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %> |
-
+
- <%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author)) %>
- <%= l(:label_user_create_project_homework) %>:
+ | <%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author)) %>
+ <%= l(:label_user_create_project_homework) %>
<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
- <%= l(:field_deadline) %> : <%=bid.deadline %>
-
- <% if (User.current.admin?||User.current.id==bid.author_id)%>
+
+ <% if (User.current.admin?||User.current.id==bid.author_id) %>
<%= link_to(
l(:button_edit),
{:action => 'edit', :controller=>'bids', :project_id =>@project.id, :bid_id => bid.id},
@@ -25,12 +22,19 @@
:method => :post,
:data => {:confirm => l(:text_are_you_sure)},
:class => 'icon icon-del'
- ) %> |
+ ) %>
<% end %>
-
+
+
-
-
+ |
+
+ <% if bid.homework_type == 1%>
+ <%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %>)
+ <% else %>
+ <%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %>)
+ <% end %>
+ <%= l(:label_x_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>)
<% if betweentime(bid.deadline) < 0 %>
<%= l(:label_commit_limit)%>
@@ -40,44 +44,28 @@
<% else %>
<% end %>
<% end %>
- |
+
+
-
-
-
- <% if bid.reward_type.nil? or bid.reward_type == 1 %> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %>
+ <% if bid.reward_type.nil? or bid.reward_type == 1 %> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %>
<%= bid.budget%> <% elsif bid.reward_type == 2 %> <%= l(:label_bids_reward_method) %><%= bid.budget%>
<% else %>
<% end %> |
|
-
- <% if bid.homework_type == 1%>
-
- <%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %>)
- <% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %>
- )<% end %>
-
- <%= l(:label_x_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) |
+ <%= bid.description %> |
- |
- <%= l(:label_create_time) %> : <%=format_time bid.created_on %> |
-
-
-
-
-
- <%= bid.description%> |
+ <%= l(:label_create_time) %> : <%=format_time bid.created_on %> <%= l(:field_deadline) %> : <%=bid.deadline %> |
+ |
-
- |
-
+
<% end %>
+
|
-
-
+
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
- <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-
-
+ <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
|
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 3b6d201c0..a363854e2 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -55,7 +55,7 @@
<% else %>
<% @newss.each do |news| %>
-
+
<%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %> |
diff --git a/app/views/projects/homework.html.erb b/app/views/projects/homework.html.erb
index 37c4d71bd..06d25e41f 100644
--- a/app/views/projects/homework.html.erb
+++ b/app/views/projects/homework.html.erb
@@ -13,8 +13,6 @@
<% end %>
-
-
<%= render :partial => 'bids/bid_homework_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 795109983..1a3782139 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -76,12 +76,9 @@
|
|
-
-
-
+
<%= text_field_tag 'name', params[:name], :size => 30 %>
- <%= submit_tag l(:label_search), :class => "small", :name => nil %>
-
+ <%= submit_tag l(:label_search), :class => "small", :name => nil %>
|
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c90e8bed4..563022763 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -11,6 +11,11 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/
/**/
+.content-text-list{
+ border-bottom: 1px dashed rgb(204, 204, 204);
+ width: 580px;
+}
+
.location-list{
width: 180px;
color: #15bccf;
|