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

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
lizanle 2015-07-10 11:13:08 +08:00
parent 15f8e4272e a52b2b37e5
commit 9596746e7c
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/courses_helper.rb
View File

@ -520,10 +520,14 @@ module CoursesHelper
option1 << l(:label_spring) option1 << l(:label_spring)
option1 << l(:label_spring) option1 << l(:label_spring)
option2 = [] option2 = []
option2 << l(:label_autumn) option2 << l(:label_summer)
option2 << l(:label_autumn) option2 << l(:label_summer)
option3 = []
option3 << l(:label_autumn)
option3 << l(:label_autumn)
type << option1 type << option1
type << option2 type << option2
type << option3
type type
end end

4
app/helpers/watchers_helper.rb
View File

@ -169,14 +169,14 @@ module WatchersHelper
if joined if joined
link_to text, {:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, link_to text, {:controller => "courses", :action => "join_group", :object_id => "#{group.id}"},
:remote => true, :method => 'delete', :remote => true, :method => 'delete',
:id => "#{group.id}", :style => "padding: 8px 8px 4px; ", :id => "#{group.id}", :style => "padding: 2px 8px 2px; background-color:#15bccf; color:#fff; ",
:confirm => l(:text_are_you_sure_out_group), :class => 'group_in' :confirm => l(:text_are_you_sure_out_group), :class => 'group_in'
end end
else else
text = l(:label_new_join_group) text = l(:label_new_join_group)
form_tag({:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, :remote => true, :method => 'post') do form_tag({:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, :remote => true, :method => 'post') do
submit_tag text, class: "group_in", style: "width: 90px;height: 21px;" submit_tag text, class: "group_in", style: "width: 90px;height: 21px; background-color:#15bccf; color:#fff;"
end end
end end
end end

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

@ -21,7 +21,7 @@
<img src="/images/pic_del.gif" width="11" height="12" alt="删除班级" title="删除该班级" /> <img src="/images/pic_del.gif" width="11" height="12" alt="删除班级" title="删除该班级" />
</a> </a>
<% end%> <% end%>
<a href="javascript:void(0)" class="f_l" style="padding-left: 5px;" onclick="$('#group_name_<%= group.id %>').val('');$('#edit_group_<%= group.id %>').slideToggle();"> <a href="javascript:void(0)" class="f_l" style="padding-left: 5px;" onclick="$('#group_name_<%= group.id %>').val('');$('#edit_group_<%= group.id %>').slideToggle();$('#new_group_name').hide();">
<img src="/images/pic_edit.png" width="14" height="15" alt="编辑班级" /> <img src="/images/pic_edit.png" width="14" height="15" alt="编辑班级" />
</a> </a>
<% end %> <% end %>
@ -42,7 +42,7 @@
<% if @canShowCode %> <% if @canShowCode %>
<li style="margin-left:15px;margin-top: 2px;"> <li style="margin-left:15px;margin-top: 2px;">
<a href="javascript:void(0)" class="st_add f_l" onclick="$('#group_name').value='';$('#new_group_name').slideToggle();">+添加分班</a> <a href="javascript:void(0)" class="st_add f_l" onclick="$('#group_name').value='';$('#new_group_name').slideToggle();$('#edit_group_36').hide();">+添加分班</a>
</li> </li>
<li > <li >
<span id="new_group_name" style="display:none; vertical-align: middle;" class="ml10 f_l"> <span id="new_group_name" style="display:none; vertical-align: middle;" class="ml10 f_l">

2
app/views/words/_journal_reply_items.html.erb
View File

@ -6,7 +6,7 @@
<div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()"> <div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
<div class="recall_head"> <div class="recall_head">
<% if show_name %> <% if show_name %>
<%= image_tag url_to_avatar(reply.user.show_name),:width => '30',:height => '30' %> <%= image_tag url_to_avatar(journal.user),:width => '30',:height => '30' %>
<% else %> <% else %>
<%= image_tag url_to_avatar(nil),:width => '30',:height => '30' %> <%= image_tag url_to_avatar(nil),:width => '30',:height => '30' %>
<% end %> <% end %>

2
public/stylesheets/jstoolbar.css
View File

@ -3,7 +3,7 @@
} }
.jstEditor textarea, .jstEditor iframe { .jstEditor textarea, .jstEditor iframe {
margin: 0; margin: 0;
margin-left: 80px; margin-left: 0px;
} }
.jstHandle { .jstHandle {