fix some little bug!
This commit is contained in:
parent
88084990bf
commit
b7027405ce
|
@ -1,112 +1,112 @@
|
||||||
<!-- fq -->
|
<!-- fq -->
|
||||||
|
|
||||||
<% if @bid.homework_type == 1%>
|
<% if @bid.homework_type == 1%>
|
||||||
<%= render :partial => 'homework' %>
|
<%= render :partial => 'homework' %>
|
||||||
|
|
||||||
<% else %>
|
<% else %>
|
||||||
<style>
|
<style>
|
||||||
input[type="submit"].bid_btn {
|
input[type="submit"].bid_btn {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
width: 60px;
|
width: 60px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: rgb(0, 0, 0);
|
color: rgb(0, 0, 0);
|
||||||
background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
|
background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
|
||||||
padding: 0px 0px 4px 0px;
|
padding: 0px 0px 4px 0px;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
border: 1px solid rgb(148, 148, 148);
|
border: 1px solid rgb(148, 148, 148);
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
text-shadow: none;
|
text-shadow: none;
|
||||||
margin-top: -10px;
|
margin-top: -10px;
|
||||||
/*margin-right: -4px;*/
|
/*margin-right: -4px;*/
|
||||||
}
|
}
|
||||||
input[type="button"].bid_btn {
|
input[type="button"].bid_btn {
|
||||||
width: 60px;
|
width: 60px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: rgb(0, 0, 0);
|
color: rgb(0, 0, 0);
|
||||||
background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
|
background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
|
||||||
padding: 0px 0px 4px 0px;
|
padding: 0px 0px 4px 0px;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
border: 1px solid rgb(148, 148, 148);
|
border: 1px solid rgb(148, 148, 148);
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
text-shadow: none;
|
text-shadow: none;
|
||||||
margin-top: -10px;
|
margin-top: -10px;
|
||||||
margin-right: -2px;
|
margin-right: -2px;
|
||||||
}
|
}
|
||||||
textarea:focus {
|
textarea:focus {
|
||||||
border: #d5dee9 1px solid;
|
border: #d5dee9 1px solid;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script type="text/javascript" language="javascript">
|
<script type="text/javascript" language="javascript">
|
||||||
function clearInfo(id,content) {
|
function clearInfo(id,content) {
|
||||||
var text = $('#' + id);
|
var text = $('#' + id);
|
||||||
if (text.val() == content) {
|
if (text.val() == content) {
|
||||||
$('#' + id).val('');
|
$('#' + id).val('');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function showInfo(id,content) {
|
function showInfo(id,content) {
|
||||||
var text = $('#' + id);
|
var text = $('#' + id);
|
||||||
if (text.val() == '') {
|
if (text.val() == '') {
|
||||||
$('#' + id).val(content);
|
$('#' + id).val(content);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function cancel() {
|
function cancel() {
|
||||||
$("#put-bid-form").hide();
|
$("#put-bid-form").hide();
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<% if User.current.logged? %>
|
<% if User.current.logged? %>
|
||||||
<!--我要竞标弹出框-->
|
<!--我要竞标弹出框-->
|
||||||
<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
|
<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
|
||||||
<div id="put-bid-form" style="display: none">
|
<div id="put-bid-form" style="display: none">
|
||||||
<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add'},
|
<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add'},
|
||||||
:update => "bidding_project_list",
|
:update => "bidding_project_list",
|
||||||
:complete => '$("#put-bid-form").hide();' do |f| %>
|
:complete => '$("#put-bid-form").hide();' do |f| %>
|
||||||
<table id="bidding_table" border="0" width="100%" style="margin-left: 40px;">
|
<table id="bidding_table" border="0" width="100%" style="margin-left: 40px;">
|
||||||
<tr>
|
<tr>
|
||||||
<td><%= select_tag 'bid', options_for_select(@option), :name => 'bid', :class => 'grayline' %></td>
|
<td><%= select_tag 'bid', options_for_select(@option), :name => 'bid', :class => 'grayline' %></td>
|
||||||
<div id="prompt_create_pro"><!-- nyan -->
|
<div id="prompt_create_pro"><!-- nyan -->
|
||||||
<td>
|
<td>
|
||||||
<p>
|
<p>
|
||||||
<div class="font_lighter" style="font-size: 13px;">
|
<div class="font_lighter" style="font-size: 13px;">
|
||||||
<%= link_to '创建项目', new_project_path, :target=>'_blank'%>,以提交作业。
|
<%= link_to '创建项目', new_project_path, :target=>'_blank'%>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
</td>
|
</td>
|
||||||
</div>
|
</div>
|
||||||
</tr>
|
</tr>
|
||||||
<% if @bid.reward_type == 3 %>
|
<% if @bid.reward_type == 3 %>
|
||||||
<tr>
|
<tr>
|
||||||
<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline'%></td>
|
<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline'%></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% else %>
|
<% else %>
|
||||||
<tr>
|
<tr>
|
||||||
<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline'%></td>
|
<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline'%></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="right">
|
<td align="right">
|
||||||
<%= submit_tag l(:button_add), :name => nil , :class => "bid_btn",
|
<%= submit_tag l(:button_add), :name => nil , :class => "bid_btn",
|
||||||
:onmouseout => "this.style.backgroundPosition = 'left top'",
|
:onmouseout => "this.style.backgroundPosition = 'left top'",
|
||||||
:onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
|
:onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
|
||||||
<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
|
<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
|
||||||
:type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
|
:type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
|
||||||
:onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
|
:onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<div id='bidding_project_list'>
|
<div id='bidding_project_list'>
|
||||||
<%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project,:bid => @bid} %>
|
<%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project,:bid => @bid} %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|
|
@ -448,13 +448,13 @@ zh:
|
||||||
label_module_share: DTS测试工具
|
label_module_share: DTS测试工具
|
||||||
|
|
||||||
label_user: 用户
|
label_user: 用户
|
||||||
label_user_plural: 用户
|
label_user_plural: 用户列表
|
||||||
label_user_new: 新建用户
|
label_user_new: 新建用户
|
||||||
label_user_anonymous: 匿名用户
|
label_user_anonymous: 匿名用户
|
||||||
label_project: 项目
|
label_project: 项目
|
||||||
label_activity_project: '项目: ' #added by bai
|
label_activity_project: '项目: ' #added by bai
|
||||||
label_project_new: 新建项目
|
label_project_new: 新建项目
|
||||||
label_project_plural: 项目
|
label_project_plural: 项目列表
|
||||||
label_x_projects:
|
label_x_projects:
|
||||||
zero: 无项目
|
zero: 无项目
|
||||||
one: 1 个项目
|
one: 1 个项目
|
||||||
|
@ -503,7 +503,7 @@ zh:
|
||||||
label_home: 主页
|
label_home: 主页
|
||||||
#by young
|
#by young
|
||||||
label_requirement: 需求
|
label_requirement: 需求
|
||||||
label_new_course: 课程
|
label_new_course: 课程列表
|
||||||
label_course_practice: 实践课程
|
label_course_practice: 实践课程
|
||||||
label_project_deposit: 项目托管
|
label_project_deposit: 项目托管
|
||||||
label_software_user: 软件创客
|
label_software_user: 软件创客
|
||||||
|
|
Loading…
Reference in New Issue