fix 王林春提交了冲突文件
This commit is contained in:
xianbo
parent
e52886cf46
commit
a3a95556a3
|
|
@ -1,73 +0,0 @@
|
||||||
<!--add by huang-->
|
|
||||||
<div class="clearfix"></div>
|
|
||||||
<<<<<<< HEAD
|
|
||||||
<div id="footer" style="margin-left:-5px;padding-top: 50px;clear: both;font-size: 12px;">
|
|
||||||
<div style="border-top:solid 1px #C6E9F1;width: auto;margin-top: 80px;"></div>
|
|
||||||
<div class="base_footer">
|
|
||||||
<div align="center">
|
|
||||||
|
|
||||||
<!--gcm-->
|
|
||||||
<p>
|
|
||||||
<span>主办单位:</span>
|
|
||||||
<span class="footer_text_link"><%= link_to "国防科学技术大学并行与分布处理国家重点实验室","http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
|
|
||||||
<span class="footer_text_link"><%= link_to "计算机科学与技术系", "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
|
|
||||||
<span id="copyright">版权@2007~2014</span>
|
|
||||||
<span id="contact_us" class="footer_text_link"><%= link_to "联系我们","http://forge.trustie.net/projects/2/member",:target=>"_blank"%></span>
|
|
||||||
<span id="record"class="footer_text_link"><%= link_to "湘ICP备09019772","http://www.miibeian.gov.cn/"%></span>
|
|
||||||
|
|
||||||
</p>
|
|
||||||
<div id="logo_link">
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12"%></span>
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn"%></span>
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/"%></span>
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn"%></span>
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com"%></span>
|
|
||||||
</div>
|
|
||||||
<!--gcm-->
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
=======
|
|
||||||
<div id="footer" style="margin-left:-5px;padding-top: 150px;clear: both;font-size: 12px;">
|
|
||||||
<div style="border-top:solid 1px #C6E9F1;"></div>
|
|
||||||
<div class="base_footer">
|
|
||||||
<div align="center">
|
|
||||||
|
|
||||||
<!--gcm-->
|
|
||||||
<p>
|
|
||||||
<span>主办单位:</span>
|
|
||||||
<span class="footer_text_link"><%= link_to "国防科学技术大学并行与分布处理国家重点实验室","http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
|
|
||||||
<span class="footer_text_link"><%= link_to "计算机科学与技术系", "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
|
|
||||||
<span id="copyright">版权@2007~2014</span>
|
|
||||||
<span id="contact_us" class="footer_text_link"><%= link_to "联系我们","http://forge.trustie.net/projects/2/member",:target=>"_blank"%></span>
|
|
||||||
<span id="record"class="footer_text_link"><%= link_to "湘ICP备09019772","http://www.miibeian.gov.cn/"%></span>
|
|
||||||
|
|
||||||
</p>
|
|
||||||
<div id="logo_link">
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12"%></span>
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn"%></span>
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/"%></span>
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn"%></span>
|
|
||||||
<span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com"%></span>
|
|
||||||
</div>
|
|
||||||
<!--gcm-->
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
>>>>>>> develop
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="debug">
|
|
||||||
<%= debug(params) if Rails.env.development? %>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
|
||||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
|
||||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
|
||||||
|
|
||||||
ga('create', 'UA-46523987-1', 'trustie.net');
|
|
||||||
ga('send', 'pageview');
|
|
||||||
|
|
||||||
</script>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<h3><%=l(:label_release_softapplication)%></h3>
|
|
||||||
<!-- <%= render 'form' %>
|
|
||||||
|
|
||||||
<%= link_to 'Back', softapplications_path %> -->
|
|
||||||
|
|
||||||
<%= labelled_form_for @softapplication, :url => {:controller => 'softapplications', :action => 'create'}, method: :post do |f| %>
|
|
||||||
<div class="box tabular">
|
|
||||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
|
||||||
<%= submit_tag l(:button_create) %>
|
|
||||||
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<h3><%=l(:label_release_softapplication)%></h3>
|
|
||||||
<!-- <%= render 'form' %>
|
|
||||||
|
|
||||||
<%= link_to 'Back', softapplications_path %> -->
|
|
||||||
|
|
||||||
<%= labelled_form_for @softapplication, :url => {:controller => 'softapplications', :action => 'create'}, method: :post do |f| %>
|
|
||||||
<div class="box tabular">
|
|
||||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
|
||||||
<%= submit_tag l(:button_create) %>
|
|
||||||
<!-- <%= javascript_tag "$('#bid_name').focus();" %> -->
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
<h3><%= l(:label_release_softapplication)%></h3> <!-- <%= render 'form' %>
|
|
||||||
|
|
||||||
<%= link_to 'Back', softapplications_path %> -->
|
|
||||||
|
|
||||||
|
|
||||||
<div id="put-bid-form" style="">
|
|
||||||
<%= form_for Softapplication.new, :url => {:controller => 'softapplications', :action => 'create'}, :update => "bidding_project_list", :complete => '$("#put-bid-form").hide();', :html => {:multipart => true, :id => 'add_homework_form'} do |f| %>
|
|
||||||
<fieldset>
|
|
||||||
<legend>
|
|
||||||
<%= l(:label_attachment_plural) %>
|
|
||||||
</legend>
|
|
||||||
<tr style="width:700px; margin-left: -10px">
|
|
||||||
<td><%= l(:label_softapplication_name) %></td>
|
|
||||||
<td style="require, color: #bb0000"> * </td>: <td ><%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %></td>
|
|
||||||
<td><%= l(:label_softapplication_name_condition)%></td>
|
|
||||||
</tr></ br>
|
|
||||||
<br />
|
|
||||||
<br />
|
|
||||||
|
|
||||||
<tr style="width:800px;">
|
|
||||||
<td><%= l(:label_softapplication_version_available) %></td>
|
|
||||||
<td style="require, color: #bb0000"> * </td>: <td style="width: 100px"><%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %></td>
|
|
||||||
|
|
||||||
</tr></ br>
|
|
||||||
<br />
|
|
||||||
<br />
|
|
||||||
|
|
||||||
<tr style="width:800px;">
|
|
||||||
<td><%= l(:label_softapplication_type) %></td>
|
|
||||||
|
|
||||||
<td style="require, color: #bb0000"> * </td>: <td style="width: 100px"><%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %></td>
|
|
||||||
|
|
||||||
</tr></ br>
|
|
||||||
<br />
|
|
||||||
<br />
|
|
||||||
|
|
||||||
<tr style="width:800px;">
|
|
||||||
<td><%= l(:label_softapplication_description) %></td>
|
|
||||||
<td style="require, color: #bb0000"> * </td>: <td style="width: 100px"><%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %></td>
|
|
||||||
|
|
||||||
</tr></ br>
|
|
||||||
<br />
|
|
||||||
<br />
|
|
||||||
<%= render_flash_messages %>
|
|
||||||
<p id="put-bid-form-partial">
|
|
||||||
<%= render :partial => 'attachments/form' %>
|
|
||||||
</p>
|
|
||||||
</fieldset>
|
|
||||||
<%= submit_tag l(:button_create), :onclick => "return true" %>
|
|
||||||
<script type="text/javascript">
|
|
||||||
function j_submit () {
|
|
||||||
alert('start')
|
|
||||||
var submit_homework = function(){
|
|
||||||
$('#add_homework_form').clone().attr('action', '<%= url_for({:controller => "softapplications", :action => "create"})+".js" %>').ajaxSubmit()
|
|
||||||
};
|
|
||||||
alert('stop')
|
|
||||||
$.globalEval(submit_homework());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,158 +0,0 @@
|
||||||
<%= render :partial => 'layouts/base_softapplication_top_content' %>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div style="height: auto; padding-bottom: 10px">
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" valign="top" width="320">
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<table width="100%" border="0">
|
|
||||||
<tr style="font-size: 18px">
|
|
||||||
<td colspan="2" valign="top"><strong><%= @softapplication.name %></strong></td>
|
|
||||||
<td style="font-size: 15px; padding-left: 0px">
|
|
||||||
<%= link_to '删除', softapplication_path(@softapplication), method: :delete, data: {confirm: '您确定要删除吗?'} if @softapplication.destroyable_by? User.current %>
|
|
||||||
<%= link_to '编辑', edit_softapplication_path(@softapplication), method: :get if @softapplication.destroyable_by? User.current %>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">所属类别：<%= @softapplication.app_type_name %></td>
|
|
||||||
<% contest = @softapplication.contests.first %>
|
|
||||||
<td style="width: 240px; word-wrap: break-word; word-break: break-all">所属竞赛：<%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding-left: 40px">发布人员：<%= @softapplication.user.name %></td>
|
|
||||||
<td>系统支持：<%= @softapplication.android_min_version_available %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding-left: 40px">
|
|
||||||
<span>作品下载：</span>
|
|
||||||
<span>
|
|
||||||
<% options = {:author => true, :deletable => @softapplication.user.eql?(User.current)} %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %>
|
|
||||||
</span>
|
|
||||||
<<<<<<< HEAD
|
|
||||||
</td>
|
|
||||||
=======
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td>开发人员：<%= @softapplication.application_developers %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding-left: 40px">平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></td>
|
|
||||||
<td>发布时间：<%=format_time @softapplication.created_at %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding-left: 40px">
|
|
||||||
<% if (@softapplication.deposit_project != "nil" && @softapplication.deposit_project != "") %>
|
|
||||||
<%#= textilizable ("托管项目： " + @project.name) %>
|
|
||||||
托管项目：<%= link_to "#@project", project_path(@project.id) %>
|
|
||||||
<% end %>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
>>>>>>> 2f709c92ba93d46c81adc49fac0d77584018a3fe
|
|
||||||
|
|
||||||
<td>开发人员：<%= @softapplication.application_developers %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding-left: 40px">平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></td>
|
|
||||||
<td>发布时间：<%= format_time @softapplication.created_at %></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="padding-left: 40px">
|
|
||||||
<% unless @softapplication.deposit_project_url.nil? %>
|
|
||||||
<%= textilizable ("托管项目网址： " + @softapplication.deposit_project_url) %>
|
|
||||||
<% end %>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</div>
|
|
||||||
<div class="underline-contests_one"></div>
|
|
||||||
|
|
||||||
<div style="height: auto; padding-bottom: 10px">
|
|
||||||
<strong>
|
|
||||||
<div style="font-size: 15px;">作品简介：</div>
|
|
||||||
</strong>
|
|
||||||
|
|
||||||
<div style="padding-top: 5px"><%= @softapplication.description %></div>
|
|
||||||
</div>
|
|
||||||
<div class="underline-contests_one"></div>
|
|
||||||
|
|
||||||
<div style="height: auto; padding-bottom: 10px">
|
|
||||||
<div style="font-size: 15px;"><strong>作品得分：</strong></div>
|
|
||||||
<!-- <div>打分总人数:<%= @softapplication.raters(:quality).count %></div> -->
|
|
||||||
<div style="overflow: hidden">
|
|
||||||
<div style="margin-left: 15%; float: left">
|
|
||||||
<div style="padding-left: 45px; padding-bottom: 5px">得分比例</div>
|
|
||||||
<div>
|
|
||||||
<% 100.step(20, -20) do |star| %>
|
|
||||||
<div data-kls="Softapplication" data-id="2" data-dimension="quality" data-average="3.25" class="rateable div_inline jDisabled" style="height: 20px; width: 115px; overflow: hidden; z-index: 1; position: relative;">
|
|
||||||
<div class="jRatingColor" style="width: <%=star%>%;"></div>
|
|
||||||
<div class="jRatingAverage" style="width: 0px; top: -20px;"></div>
|
|
||||||
<div class="jStar" style="width: 115px; height: 20px; top: -40px; background: url(/images/seems_rateable/stars.png) repeat-x scroll 0% 0% transparent;">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<%= @stars_status_map["star#{(star/20).to_s}".to_sym] %>
|
|
||||||
<br>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="float: left; padding-left: 100px; padding-top:35px " align="center">
|
|
||||||
<div>最终得分</div>
|
|
||||||
<div style="padding-top: 1px; font-size: 15px; color: blue"><%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>
|
|
||||||
分
|
|
||||||
</div>
|
|
||||||
<div><%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></div>
|
|
||||||
</div>
|
|
||||||
<div style="float: left; padding-left: 100px; padding-top:35px;" align="center">
|
|
||||||
<div>打分总人数</div>
|
|
||||||
<div style="padding-top: 1px; font-size: 25px; color: blue;">
|
|
||||||
<strong><%= @softapplication.raters(:quality).count %></strong></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="underline-contests_one"></div>
|
|
||||||
|
|
||||||
<div style="height: auto; padding-bottom: 10px">
|
|
||||||
<strong>
|
|
||||||
<div style="font-size: 15px">作品截图：</div>
|
|
||||||
</strong>
|
|
||||||
|
|
||||||
<div class="softapplication-img" >
|
|
||||||
<ul>
|
|
||||||
<% @image_results.take(4).each do |attachment| %>
|
|
||||||
<li>
|
|
||||||
<div class="title"><a href="#"><%= attachment.filename.to_s -%></a></div>
|
|
||||||
<%= link_to_attachment_img attachment, :class => "soft-application", :download => "true"%>
|
|
||||||
</li>
|
|
||||||
<% end %>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div style='clear :left;'></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="underline-contests_one"></div>
|
|
||||||
|
|
||||||
<div style="height: 50px">
|
|
||||||
<div style="font-size: 15px"><strong>作品评论：</strong></div>
|
|
||||||
<div style="padding-left: 210px">评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
|
|
||||||
<span style="font-size: 11px">(您可以重新打分，打分结果以最后一次打分为主！)</span></div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--提示登录后对应用进行评价-->
|
|
||||||
<div id="history">
|
|
||||||
<%= render :partial => 'message_history', :locals => {:contest => @softapplication, :journals => @jour, :state => false} %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--分页-->
|
|
||||||
<div class="pagination" style="float:left;">
|
|
||||||
<ul>
|
|
||||||
<%= pagination_links_full @feedback_pages %>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div>
|
|
||||||
</div>
|
|
||||||
Loading…
Reference in New Issue