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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 

Conflicts:
	app/views/statistics/show.html.erb
This commit is contained in:
daiao 2018-02-09 11:06:35 +08:00
parent 9da515a318 818535492f
commit 3c1bc10274
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/statistics/_form.html.erb
View File

@ -15,12 +15,12 @@
<% end %>
<div class="field line_field">
<label><span>*</span>数据名称：</label>
<label class="field_lab"><span>*</span>数据名称：</label>
<%= f.text_field :name, :class => "wb85" %>
<p class="cl" style="padding-left: 10%;color: red;height: 20px"><span id="input_name_notice" class="none">请输入数据名称</span></p>
</div>
<div class="field line_field mb50">
<label><span>*</span>数据分类：</label>
<label class="field_lab"><span>*</span>数据分类：</label>
<%= f.select :main_category_id, (@main_categories.collect { |mc| [mc.name, mc.id] }),
{:no_label => true}, :onchange => 'getSubCategory(this.options[this.options.selectedIndex].value)',
:class => "w150" %>
@ -31,13 +31,13 @@
</div>
</div>
<div class="field line_field">
<label>数据描述：</label>
<label class="field_lab">数据描述：</label>
<div id="statistics_description" class="new_li fl">
<%= f.text_area :description, :class => "wb85 h200 mb20", :style => "display: none;" %>
</div>
</div>
<div class="field cl">
<label>&nbsp;</label>
<label class="field_lab">&nbsp;</label>
<div class="fl">
<%= render :partial => 'attachments/form_statistic', :locals => {:container => @statistic, :isReply => @isReply} %>
</div>

2
app/views/statistics/_statistics_list.html.erb
View File

@ -19,9 +19,9 @@
</div>
<div class="data_info mt7 c_grey">
<span><%= statistic.creator.show_name %></span>
<span><%= format_time statistic.created_at %></span>
<span><%= statistic.main_category.name %></span>
<span><%= statistic.sub_category.try(:name) %></span>
<span><%= format_time statistic.created_at %></span>
</div>
</div>
</div>

8
public/stylesheets/css/public.css
View File

@ -952,9 +952,9 @@ a.syllabusbox_a_blue{ color:#3b94d6;}
.mainCon{position: relative;min-height: 100%;height: auto !important;height: 100%;}
.pos_footer{position: absolute;bottom: 0;width: 100%;clear: both;z-index: 99999; }
#create_new_statis form div.field{clear: both;zoom: 1;}
#create_new_statis form label{float: left;width: 10%;text-align: center;font-size: 14px;height: 35px;line-height: 35px;}
#create_new_statis form label span{color: red}
#create_new_statis .line_field input,#create_new_statis .line_field select{float: left;height: 35px;line-height: 35px;border-radius: 4px;}
#create_new_statis form label.field_lab{float: left;width: 10%;text-align: center;font-size: 14px;height: 35px;line-height: 35px;}
#create_new_statis form label.field_lab span{color: red}
#create_new_statis .line_field input[type='text'],#create_new_statis .line_field select{float: left;height: 35px;line-height: 35px;border-radius: 4px;}
.input_tag{height: 30px!important;border-radius: 3px!important;width: 160px}
.tag_modal span{display: inline-block;border-radius: 3px;border:1px solid #dddddd;background: #FFFFFF;padding: 3px 7px;margin-right: 5px ;margin-top: 3px}
.tag_del{cursor: pointer}
@ -985,7 +985,7 @@ a.syllabusbox_a_blue{ color:#3b94d6;}
.list_tag{border: 1px solid #F8DF8C;background: #FFFCE6;color: #3BA6DD;margin-right:10px;padding: 2px 4px;border-radius: 3px}
.attachment_file{color: #FF8D00!important;}
.data_info span{font-size: 14px;width: 17%;text-align: left;display: inline-block}
.data_info span:nth-child(2){width:26% }
.data_info span:nth-child(2){width:15% }
span.down{display: block;position: absolute;top: 13px;right: 4px;width: 12px;height: 10px;background: url(/images/user/icons_user_leftnav.png) -3px -347px no-repeat;}
.submit_btn{padding-bottom: 5px;