jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

This commit is contained in:
alan 2014-12-19 23:12:46 +08:00
parent 815d2ceb3d d6d7331ec6
commit 49cb52146f
13 changed files with 83 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/bids/_homework_form.html.erb
View File

@ -22,7 +22,7 @@
<%= error_messages_for 'bid' %> <%= error_messages_for 'bid' %>
<p> <p>
<%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :onblur => "regexName();" %> <%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :onkeyup => "regexName();" %>
</p> </p>
<p> <p>
<span id="bid_name_span"></span> <span id="bid_name_span"></span>
@ -48,7 +48,7 @@
<span id='open_anonymous_evaluation_span' style="display: none">未开启匿评作业将直接进入众评点赞阶段</span> <span id='open_anonymous_evaluation_span' style="display: none">未开启匿评作业将直接进入众评点赞阶段</span>
</p> </p>
<p id="evaluation_num_p"> <p id="evaluation_num_p">
<%= f.text_field :evaluation_num, :required => true, :size => 60, :style => "width:150px;", :onblur => "regexEvaluationNum();" , :maxlength => 4%> <%= f.text_field :evaluation_num, :required => true, :size => 60, :style => "width:150px;", :onkeyup => "regexEvaluationNum();" , :maxlength => 4%>
<span id="bid_evaluation_num_span">即每份作业被允许匿评的人数</span> <span id="bid_evaluation_num_span">即每份作业被允许匿评的人数</span>
</p> </p>
<p> <p>

4
app/views/contestnotifications/_form.html.erb
View File

@ -60,7 +60,7 @@
:size => 60, :size => 60,
:maxlength => 60, :maxlength => 60,
:style => "width:488px;", :style => "width:488px;",
:onblur => "regexTitle();" :onkeyup => "regexTitle();"
%> %>
</p> </p>
<span id="title_span" style="padding-left: 100px;"></span> <span id="title_span" style="padding-left: 100px;"></span>
@ -71,7 +71,7 @@
:rows => 11, :rows => 11,
:class => 'wiki-edit', :class => 'wiki-edit',
:style => "width:490px;", :style => "width:490px;",
:onblur => "regexDescription();" :onkeyup => "regexDescription();"
%> %>
</p> </p>
<span id="description_span" style="padding-left: 100px;"></span> <span id="description_span" style="padding-left: 100px;"></span>

6
app/views/contests/_new_softapplication.html.erb
View File

@ -121,7 +121,7 @@
:required => true, :required => true,
:size => 60, :size => 60,
:style => "width:320px;", :style => "width:320px;",
:onblur => "regexName();" :onkeyup => "regexName();"
%> %>
<span style="font-size: 10px;" id="spane_name_notice">(<%= l(:label_workname_lengthlimit) %>)</span> <span style="font-size: 10px;" id="spane_name_notice">(<%= l(:label_workname_lengthlimit) %>)</span>
@ -143,7 +143,7 @@
:required => true, :required => true,
:size => 60, :size => 60,
:rows => 3, :rows => 3,
:onblur => 'regexDescription();', :onkeyup => 'regexDescription();',
:style => "width:320px; " :style => "width:320px; "
%> %>
<span style="font-size: 10px;" id="span_sofapplication_description">(<%= l(:label_work_description_lengthlimit) %>)</span> <span style="font-size: 10px;" id="span_sofapplication_description">(<%= l(:label_work_description_lengthlimit) %>)</span>
@ -162,7 +162,7 @@
:required => true, :required => true,
:size => 60, :size => 60,
:style => "width:320px;", :style => "width:320px;",
:onblur => 'regexDevelopers();' :onkeyup => 'regexDevelopers();'
%> %>
<span style="font-size: 10px; " id="span_softapplication_application_developers"> <span style="font-size: 10px; " id="span_softapplication_application_developers">

4
app/views/contests/index.html.erb
View File

@ -43,10 +43,10 @@
if(regexName()){$("#contests_serch").submit();} if(regexName()){$("#contests_serch").submit();}
} }
</script> </script>
<%= text_field_tag 'name', params[:name], :size => 30, :onblur => 'regexName();' %> <%= text_field_tag 'name', params[:name], :size => 30, :onkeyup => 'regexName();' %>
<%= hidden_field_tag 'project_type', params[:project_type] %> <%= hidden_field_tag 'project_type', params[:project_type] %>
<%#= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %> <%#= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
<a href="#" onclick="submitSerch();" class="ButtonColor m3p10"> <a href="#" onclick="submitSerch();" class="ButtonColor m3p10" style="padding-top: 7px !important;">
<%= l(:label_search)%> <%= l(:label_search)%>
</a> </a>
<br /> <br />

4
app/views/courses/_homework_form.html.erb
View File

@ -24,7 +24,7 @@
<p> <p>
<%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", <%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;",
:maxlength => Bid::NAME_LENGTH_LIMIT, :maxlength => Bid::NAME_LENGTH_LIMIT,
:onblur => "regexName();" %> :onkeyup => "regexName();" %>
</p> </p>
<p> <p>
@ -53,7 +53,7 @@
<span id='open_anonymous_evaluation_span' style="display: none">未开启匿评作业将直接进入众评点赞阶段</span> <span id='open_anonymous_evaluation_span' style="display: none">未开启匿评作业将直接进入众评点赞阶段</span>
</p> </p>
<p id="evaluation_num_p"> <p id="evaluation_num_p">
<%= f.text_field :evaluation_num, :required => true, :size => 60, :style => "width:150px;", :onblur => "regexEvaluationNum();" , :maxlength => 4%> <%= f.text_field :evaluation_num, :required => true, :size => 60, :style => "width:150px;", :onkeyup => "regexEvaluationNum();" , :maxlength => 4%>
<span id="bid_evaluation_num_span">即每份作业被允许匿评的人数</span> <span id="bid_evaluation_num_span">即每份作业被允许匿评的人数</span>
</p> </p>
<p> <p>

2
app/views/homework_attach/_evaluation_add_jour.html.erb
View File

@ -69,7 +69,7 @@
<%= f.text_area 'user_message', :rows => 3, :cols => 65, <%= f.text_area 'user_message', :rows => 3, :cols => 65,
:value => "#{comprehensive_evaluation.nil? ? l(:label_leave_a_message) : comprehensive_evaluation}", :value => "#{comprehensive_evaluation.nil? ? l(:label_leave_a_message) : comprehensive_evaluation}",
:onfocus => "clearInfo('new_form_user_message','#{l(:label_leave_a_message)}')", :onfocus => "clearInfo('new_form_user_message','#{l(:label_leave_a_message)}')",
:onblur => "showInfo('new_form_user_message','#{l(:label_leave_a_message)}')", :onkeyup => "showInfo('new_form_user_message','#{l(:label_leave_a_message)}')",
:style => "resize: none;", :class => 'noline'%> :style => "resize: none;", :class => 'noline'%>
</td> </td>
</tr> </tr>

2
app/views/homework_attach/edit.html.erb
View File

@ -64,7 +64,7 @@
<span class="c_red">*</span> <span class="c_red">*</span>
&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;： &nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：
</label> </label>
<%= f.text_field :name, :required => true, :name => "homework_name", :class => "w430 bo", :maxlength => 254, :placeholder => "作品名称", :onblur => "regexName();"%> <%= f.text_field :name, :required => true, :name => "homework_name", :class => "w430 bo", :maxlength => 254, :placeholder => "作品名称", :onkeyup => "regexName();"%>
<span id="homework_attach_name_span"></span> <span id="homework_attach_name_span"></span>
</p> </p>
<p> <p>

4
app/views/homework_attach/new.html.erb
View File

@ -68,7 +68,7 @@
</span> </span>
&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;： &nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：
</label> </label>
<%= f.text_field "name", :required => true, :size => 60, :class => "w430 bo", :maxlength => 254, :placeholder => "作品名称", :onblur => "regexName();" %> <%= f.text_field "name", :required => true, :size => 60, :class => "w430 bo", :maxlength => 254, :placeholder => "作品名称", :onkeyup => "regexName();" %>
<span id="homework_attach_name_span"></span> <span id="homework_attach_name_span"></span>
</p> </p>
<p> <p>
@ -78,7 +78,7 @@
</span> </span>
&nbsp;&nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：&nbsp; &nbsp;&nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：&nbsp;
</label> </label>
<%= f.text_area "description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字", :onblur => "regexDescription();"%> <%= f.text_area "description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字", :onkeyup => "regexDescription();"%>
<span id="homework_attach_description_span" style="padding-left: 100px;"></span> <span id="homework_attach_description_span" style="padding-left: 100px;"></span>
</p> </p>
<div class="cl"></div> <div class="cl"></div>

33
app/views/layouts/base_newcontest.html.erb
View File

@ -36,11 +36,38 @@
<strong><%= l(:label_user_location) %> : </strong> <strong><%= l(:label_user_location) %> : </strong>
</td> </td>
<td rowspan="2" width="250px"> <td rowspan="2" width="250px">
<script type="text/javascript">
function regexName()
{
var name = $.trim($("#name").val());
if(name.length == 0)
{
$("#contest_name_span").text("<%= l(:label_search_conditions_not_null) %>");
$("#contest_name_span").css('color','#ff0000');
$("#contest_name_span").focus();
return false;
}
else
{
$("#contest_name_span").text("");
return true;
}
}
function submitSerch()
{
if(regexName()){$("#contst_search_form").submit();}
}
</script>
<div class="project-search"> <div class="project-search">
<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %> <%= form_tag({controller: 'contests', action: 'index'}, method: :get, :id => "contst_search_form") do %>
<%= text_field_tag 'name', params[:name], :size => 20 %> <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => 'regexName();' %>
<%= hidden_field_tag 'project_type', params[:project_type] %> <%= 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 %>
<a href="#" onclick="submitSerch();" class="ButtonColor m3p10" style="padding-top: 7px !important;">
<%= l(:label_search)%>
</a>
<span id="contest_name_span"></span>
<% end %> <% end %>
</div> </div>
</td> </td>

36
app/views/layouts/base_projects.html.erb
View File

@ -40,10 +40,38 @@
</td> </td>
<td rowspan="2" width="250px"> <td rowspan="2" width="250px">
<div class="top-content-search"> <div class="top-content-search">
<%= form_tag(projects_search_path, :method => :get) do %> <script type="text/javascript">
<%= text_field_tag 'name', params[:name], :size => 20 %> function regexName()
<%= hidden_field_tag 'project_type', params[:project_type] %> {
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> var name = $.trim($("#name").val());
if(name.length == 0)
{
$("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>");
$("#project_name_span").css('color','#ff0000');
$("#project_name_span").focus();
return false;
}
else
{
$("#project_name_span").text("");
return true;
}
}
function submitSerch()
{
if(regexName()){$("#project_search_form").submit();}
}
</script>
<%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %>
<%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();" %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<a href="#" onclick="submitSerch();" class="ButtonColor m3p10" style="padding-top: 7px !important;">
<%= l(:label_search)%>
</a>
<br />
<span id="project_name_span"></span>
<% end %> <% end %>
</div> </div>
</td> </td>

4
app/views/messages/_form.html.erb
View File

@ -49,7 +49,7 @@
<% if replying %> <% if replying %>
<%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject" }.merge(extra_option) %> <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject" }.merge(extra_option) %>
<% else %> <% else %>
<%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject", onblur: "regexSubject();" }.merge(extra_option) %> <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject", onkeyup: "regexSubject();" }.merge(extra_option) %>
<% end %> <% end %>
<span id="subject_span"></span> <span id="subject_span"></span>
</p> </p>
@ -75,7 +75,7 @@
</p> </p>
<p> <p>
<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
<%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content', :onblur => "regexContent();", :maxlength => 5000 %> <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000 %>
<span id="message_content_span"></span> <span id="message_content_span"></span>
</p> </p>
<p> <p>

4
app/views/news/_course_form.html.erb
View File

@ -3,10 +3,10 @@
<%= is_new ? l(:bale_news_notice):l(:bale_edit_notice)%> <%= is_new ? l(:bale_news_notice):l(:bale_edit_notice)%>
</div> </div>
<div class="box tabular"> <div class="box tabular">
<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:468px;", :onblur => "regexTitle();" %></p> <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:468px;", :onkeyup => "regexTitle();" %></p>
<P><span id="title_notice_span">(60个字符以内)</span></P> <P><span id="title_notice_span">(60个字符以内)</span></P>
<!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> --> <!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:470px;", :onblur => "regexDescription();" %></p> <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:470px;", :onkeyup => "regexDescription();" %></p>
<P><span id="description_notice_span"></span></P> <P><span id="description_notice_span"></span></P>
<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p> <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
</div> </div>

4
app/views/news/_form.html.erb
View File

@ -3,10 +3,10 @@
<%= @project ? l(:label_news_new) : l(:bale_news_notice) %> <%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
</div> </div>
<div class="box tabular"> <div class="box tabular">
<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onblur => "regexTitle();" %></p> <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onkeyup => "regexTitle();" %></p>
<P><span id="title_notice_span">(60个字符以内)</span></P> <P><span id="title_notice_span">(60个字符以内)</span></P>
<!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> --> <!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;", :onblur => "regexDescription();" %></p> <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;", :onkeyup => "regexDescription();" %></p>
<P><span id="description_notice_span"></span></P> <P><span id="description_notice_span"></span></P>
<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p> <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
</div> </div>