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

课程 作业、通知模块，新版编辑器相关BUG

This commit is contained in:
sw 2015-06-12 16:26:24 +08:00
parent 0d6c4a9984
commit 6d8f0e728d
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/homework_common/_homework_common_form.html.erb
View File

@ -11,12 +11,14 @@
<li > <li >
<label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label> <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
<!--<textarea name="" placeholder="请在此填入作业的要求及评分依据" class=" w548 h150 mb10 fl" ></textarea>--> <!--<textarea name="" placeholder="请在此填入作业的要求及评分依据" class=" w548 h150 mb10 fl" ></textarea>-->
<% if edit_mode %> <div style="width: 83%;float: left;">
<%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %> <% if edit_mode %>
<% else %> <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> <% else %>
<%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor' %> <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
<% end %> <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
<% end %>
</div>
</li> </li>
<div class="cl"></div> <div class="cl"></div>
<li class="mt10"> <li class="mt10">

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

@ -8,11 +8,15 @@
<% if is_new %> <% if is_new %>
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
<label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label> <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
<%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor' %> <div class="fl" style="width: 91%">
<%= f.kindeditor :description,:editor_id=>'news_description_editor' %>
</div>
<p id="description_notice_span" class="ml55"></p> <p id="description_notice_span" class="ml55"></p>
<% else %> <% else %>
<label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label> <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
<%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %> <div class="fl" style="width: 91%">
<%= f.kindeditor :description,:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %>
</div>
<p id="description_notice_span" class="ml55"></p> <p id="description_notice_span" class="ml55"></p>
<% end %> <% end %>

1
lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css vendored
View File

@ -421,6 +421,7 @@
overflow: hidden; overflow: hidden;
margin: 0; margin: 0;
padding: 0; padding: 0;
max-width: 100%;
} }
/* toolbar */ /* toolbar */
.ke-toolbar { .ke-toolbar {

1
public/assets/kindeditor/themes/default/default.css
View File

@ -432,6 +432,7 @@
} }
/* container */ /* container */
.ke-container { .ke-container {
max-width: 100%;
display: block; display: block;
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
background-color: #FFF; background-color: #FFF;

1
public/stylesheets/public.css
View File

@ -440,3 +440,4 @@ img{max-width: 100%;}
.attachments {clear: both;} .attachments {clear: both;}
.is_public_checkbox{margin-left: 15px;margin-right: 10px;} .is_public_checkbox{margin-left: 15px;margin-right: 10px;}
.author_name{color: #3ca5c6 !important;} .author_name{color: #3ca5c6 !important;}
.ke-container-default{max-width: 100%;}