diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index f65a891fb..ce666940e 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -216,8 +216,9 @@

<%= l(:label_identity) %> * - <%= select_tag 'identity', " " - .html_safe %>

+ <%= select_tag 'identity', " + + ".html_safe %>

diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 889a0b0da..009cfbd38 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -16,6 +16,63 @@ <% end %>
<%= l(:label_gender) %>
+ +<% @bidding_project.each do |b_project|%> + + + + +
+ + + + + + +
+
+ <%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %> +
+ + + + + + + + + + + +
<%= link_to(b_project.project.name, project_path(b_project.project)) %><%= l(:label_jion_bidding_homework)%>
<%= b_project.project.description %>
<%=format_time(b_project.created_at) %>
 +
+ + + + + + + +
<%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.name, user_path(b_project.user)) %>
<%= l(:label_bidding_reason_homewrok) %> : <%= b_project.description %>
+
+<% end %> + + + + <% else %> + + + + <% if User.current.logged? %> + + <% end %> +
<%= l(:label_bidding_project) %>(<%= @bidding_project.count%>) + <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> +
+ <%= toggle_link l(:button_bidding_homework), 'put-bid-form' %> +
+ <% end %> +
<% end %> <%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%> diff --git a/db/schema.rb b/db/schema.rb index ad15a092d..f0e7566d5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -12,7 +12,7 @@ # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130922123849) do + create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -71,8 +71,10 @@ ActiveRecord::Schema.define(:version => 20130922123849) do t.datetime "created_at", :null => false t.datetime "updated_at", :null => false + t.string "reward" + end create_table "bids", :force => true do |t|