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

图标and页面不换行顶出边界

This commit is contained in:
yanxd 2014-01-09 16:57:28 +08:00
parent f728061d05
commit 28bc3c1894
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,12 @@
:onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> --> :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> -->
<!-- <%= watcher_link(@board, User.current) %> --> <!-- <%= watcher_link(@board, User.current) %> -->
<!-- </div> --> <!-- </div> -->
<div id="add-message" class="add_frame" style="display:none;"> <div id="add-message" class="add_frame" style="display:none;">
<% if User.current.logged? %> <% if User.current.logged? %>
<h3><%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h3> <h3><%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h3>
<div class="add_frame_header" >
<%= l(:label_message_new) %>
</div>
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'messages/form', :locals => {:f => f} %> <%= render :partial => 'messages/form', :locals => {:f => f} %>
<p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %> <p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>

3
app/views/messages/_form.html.erb
View File

@ -1,7 +1,4 @@
<%= error_messages_for 'message' %> <%= error_messages_for 'message' %>
<div class="add_frame_header" >
<%= l(:label_message_new) %>
</div>
<% replying ||= false %> <% replying ||= false %>
<div class="box ph10_5"> <div class="box ph10_5">

18
app/views/messages/new.html.erb
View File

@ -1,9 +1,9 @@
<h3><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h3> <h3><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h3>
<%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<%= submit_tag l(:button_create) %> <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
<%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %> <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>

3
app/views/messages/show.html.erb
View File

@ -35,6 +35,9 @@
margin: 1%; margin: 1%;
margin-bottom: 40px; margin-bottom: 40px;
background-color: #F6F6F6; background-color: #F6F6F6;
white-space: normal;
/*word-break: break-all; */
word-wrap: break-word;
} }
.memo-timestamp{ .memo-timestamp{
position: absolute; position: absolute;