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

Merge branch 'rep_quality' into develop

This commit is contained in:
huang 2016-09-28 11:04:03 +08:00
parent b573563a52 ca81b1a3ba
commit 382c414341
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/wiki/edit.html.erb
View File

@ -1,7 +1,7 @@
<%= wiki_page_breadcrumb(@page) %> <%= wiki_page_breadcrumb(@page) %>
<script src="http://<%= Setting.host_name%>/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script> <script src="http://<%= Setting.host_name%>/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
<div class="project_r_h"> <div class="project_r_h" style="width:730px;">
<h2 class="project_h2">Wiki</h2> <h2 class="project_h2">Wiki</h2>
</div> </div>
<!--<h3 style="word-break: break-all;word-wrap: break-word;">--> <!--<h3 style="word-break: break-all;word-wrap: break-word;">-->
@ -21,8 +21,8 @@
<div class="wiki_new"> <div class="wiki_new">
<div class="actions" style="max-width:680px"> <div class="actions" style="max-width:730px">
<p style="max-width:680px;"> <p style="max-width:730px;">
<%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %> <%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %>
</p> </p>
<script type="text/javascript"> <script type="text/javascript">
@ -66,3 +66,7 @@
<%= robot_exclusion_tag %> <%= robot_exclusion_tag %>
<% end %> <% end %>
<% html_title @page.pretty_title %> <% html_title @page.pretty_title %>
<script>
$("#RSide").css("width","730px");
</script>

4
app/views/wiki/show.html.erb
View File

@ -1,4 +1,4 @@
<div class="project_r_h" xmlns="http://www.w3.org/1999/html"> <div class="project_r_h" xmlns="http://www.w3.org/1999/html" style="width:730px;">
<h2 class="project_h2">Wiki</h2> <h2 class="project_h2">Wiki</h2>
</div> </div>
<div class="wiki_page"> <div class="wiki_page">
@ -94,5 +94,7 @@
} }
}); });
}; };
$("#RSide").css("width","730px");
</script> </script>
</div> </div>