Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts: public/stylesheets/courses.csssw_new_course
commit
fcbcdffa44
@ -0,0 +1,56 @@
|
|||||||
|
<script type="text/javascript">
|
||||||
|
// $(this).ready(function(){
|
||||||
|
// $('.tag_show').hover(function() {
|
||||||
|
// $(this).children("span").show();
|
||||||
|
// }, function() {
|
||||||
|
// $(this).children("span").hide();
|
||||||
|
// });
|
||||||
|
// })
|
||||||
|
</script>
|
||||||
|
<!-- 1代表是user类型 2代表是project类型 3代表是issue类型 4代表需求 7代表竞赛 9代表课程-->
|
||||||
|
<% @tags = obj.reload.tag_list %>
|
||||||
|
<% if non_list_all and (@tags.size > 0) %>
|
||||||
|
<!-- 这里是显示的非主页的tag 所以当tag数量较多时 不必全部显示 用“更多”代替 -->
|
||||||
|
<% if @tags.size > Setting.show_tags_length.to_i then %>
|
||||||
|
<% i = 0 %>
|
||||||
|
<% until i>Setting.show_tags_length.to_i do %>
|
||||||
|
<div id="tag">
|
||||||
|
<%= link_to @tags[i], :controller => "tags", :action => "index", :q => @tags[i], :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
|
</div>
|
||||||
|
<% i += 1 %>
|
||||||
|
<% end %>
|
||||||
|
<%= more_tags(obj.id,object_flag)%>
|
||||||
|
<% else %>
|
||||||
|
<% @tags.each do |tag| %>
|
||||||
|
<div id="tag">
|
||||||
|
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<!-- 用来显示三大对象的主页中的tag 故是全部显示 -->
|
||||||
|
<% if @tags.size > 0 %>
|
||||||
|
<% @tags.each do |tag| %>
|
||||||
|
<div id="tag">
|
||||||
|
<span class="re_tag f_l">
|
||||||
|
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
|
<!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
|
||||||
|
<% case object_flag %>
|
||||||
|
<% when '10' %>
|
||||||
|
<%# if (User.current.logged? &&
|
||||||
|
User.current.admin?
|
||||||
|
# && (@project && User.current.member_of?(@project))
|
||||||
|
)
|
||||||
|
%>
|
||||||
|
<% if obj.author_id == User.current.id || User.current.admin?%>
|
||||||
|
<span class='del'>
|
||||||
|
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
|
:taggable_id => obj.id, :taggable_type => object_flag %>
|
||||||
|
</span>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
@ -1,15 +1,15 @@
|
|||||||
<%= form_tag(words_create_reply_path, :remote => true) do %>
|
<%= form_tag(words_create_reply_path, :remote => true) do %>
|
||||||
<%= text_area_tag 'user_notes', "", :class => 're_respond-form',
|
<%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
|
||||||
:style => "resize: none;", :rows => 4,
|
|
||||||
:placeholder => l(:label_feedback_respond_content),
|
:placeholder => l(:label_feedback_respond_content),
|
||||||
:width => '100%',
|
|
||||||
:maxlength => 250 %>
|
:maxlength => 250 %>
|
||||||
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
|
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
|
||||||
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
|
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
|
||||||
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
|
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
|
||||||
<%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
|
<%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
|
||||||
|
|
||||||
<%= submit_tag l(:button_feedback_respond), :name => nil ,
|
<%= submit_tag l(:button_feedback_respond), :name => nil ,
|
||||||
:class => "sub_btn",
|
:class => "reply_btn"%>
|
||||||
:style => "float: right; margin-top: 1px; margin-right: 4px;"%>
|
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
Loading…
Reference in new issue