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

Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum

This commit is contained in:
fanqiang 2013-11-24 20:46:17 +08:00
parent 4f00b12016 0a88d16a7d
commit cb494f460a
5 changed files with 255 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/memos_controller.rb
View File

@ -1,5 +1,5 @@
class MemosController < ApplicationController
layout "base_memos"
layout 'base_memos'
def new
@memo = Memo.new
@ -11,6 +11,7 @@ class MemosController < ApplicationController
def show
@memo = Memo.find_by_id(params[:id])
@forum = Forum.find(params[:forum_id])
@replies = @memo.replies
@mome_new = Memo.new

154
app/views/layouts/base_memos.html.erb
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title><%= h html_title %></title>
@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= heads_for_theme %>
@ -15,45 +15,155 @@
<!-- page specific tags -->
<%= yield :header_tags -%>
</head>
<!--add by huang-->
<body class="<%= h body_css_classes %>">
<div id="wrapper">
<div id="wrapper2">
<div id="wrapper3">
<%= render :partial => 'layouts/base_header'%>
<div style="margin-top: 10px;">
<%=render :partial => 'layouts/base_header'%>
<div id="main">
<div id="sidebar">
<%= yield :sidebar %>
<%= view_layouts_base_sidebar_hook_response %>
<!-- added by bai -->
<div class="top-content">
<table>
<tr>
<td class="info_font" style="width: 240px; color: #15bccf">软件项目托管社区</td>
<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
<td rowspan="2" width="250px">
<div class="top-content-search">
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
<%= text_field_tag 'name', params[:name], :size => 20 %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
<% end %>
</div>
<div id="content" style="padding-top: 0px;">
</td>
</tr>
<tr>
<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %></a></td>
<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to '讨论区', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name, forum_path(@forum) %> > <%=link_to @memo.subject, forum_memo_path(@forum, @memo) %></p></td>
</tr>
</table>
</div>
<div id="sidebar">
<div class="spaceleft">
<!--informations-->
<div class="inf_user_image">
<table>
<tr>
<td>
<div class="info-course">
<%= @forum.name %>
</div>
<div>
<% unless User.current.member_of? @forum %>
<%= watcher_link(@fourm, User.current) %>
<% end %>
</div>
</td>
</tr>
</table>
</div>
<!--parameter -->
<div class="user_fans">
<table width="240" border="0">
<tr align="center" width="80px">
<td class="font_index"><%=link_to 1, forum_path(@forum) %></td>
<td class="font_index"><%=link_to 2, forum_path(@forum) %></td>
<td class="font_index"><%=link_to 3, forum_path(@forum) %></td>
</tr>
<tr class="font_aram">
<td align="center" width="70px"> <%= l(:label_member) %></td>
<td align="center" width="100px"><%= l(:label_user_watchered) %></td>
<td align="center" width="70px"> <%= l(:label_project_issues) %></td>
<!-- <td align="center" width="58px"><%= l(:label_attachment) %></td> -->
</tr>
</table>
<div class="user_underline"></div>
</div>
<!--informations-->
<div class="inf_user">
<div class="font_title_left">
创建人信息
</div>
<table>
<tr>
<td><%= image_tag(url_to_avatar(@forum.creator), :class => 'avatar2') %></td>
<td>
<div class="info-course">
<%= @forum.name %>
</div>
<div>
<!-- 此处原来是关注 -->
</div>
</td>
</tr>
</table>
<div class="user_underline"></div>
</div>
<!--description-->
<div class="inf_user_context">
<div class="font_title_left">
<%= l(:label_project_overview) %>
</div>
<div style="padding-bottom: 8px">
<div class="font_lighter_sidebar">
<%= textilizable @forum.description %>
</div>
<div class="created_on_project">
<strong style="color: #15bccf"><%= l(:label_create_time) %>：</strong><%= format_time(@forum.created_at) %>
</div>
</div>
<div class="user_underline"></div>
</div>
<!--tags-->
<div class="user_fans">
<!-- added by william -for tag -->
<div class="user_tags">
<div id="tags"> <!-- 此处为tag --> 标签 </div>
</div>
</div>
<!--tool-->
<div class="user_underline"></div>
</div>
</div>
<div id="content">
<%= render_flash_messages %>
<%= yield %>
<%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div>
<%= render_flash_messages %>
</div>
<%= render :partial => 'layouts/base_footer'%>
<%= debug(params) if Rails.env.development? %>
</div>
</div>
</div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="footer">
<div class="bgl">
<div class="bgr">
Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2013 Jean-Philippe Lang
</div>
</div>
</div>
<%= debug(params) if Rails.env.development? %>
</div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>
</div>
</body>
</html>

119
app/views/memos/show.html.erb
View File

@ -1,30 +1,75 @@
<!-- <p id="notice">
< %= notice %>
</p> -->
<ul class="lz" style="background:grey" >
<!-- <li class="title">title ==> <%= link_to @memo.subject, forum_memo_path(@memo) %></li>
<li class="content">content ==> <%= @memo.content %></li>
<li class="author">author ==> <%= @memo.author %></li>
<li class="timestamp">
Posted <%= time_ago_in_words(@memo.created_at) if @memo.created_at %> ago.
</li> -->
<div class="aborad-title">
<!-- < %= avatar(@memo.author, :size => "24") %> -->
<%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar", :style => "width: 24px; height: 24px"), user_path(@memo.author) %></td>
<%=h @memo.subject %></div>
<div class="borad-topic-count-memo">
<%= textilizable(@memo, :content) %>
<%= authoring @memo.created_at, @memo.author %>
<style type="text/css">
/** {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-box-sizing: border-box;
}*/
.lz {
position:relative;
min-height: 200px;
margin: 10px 2px;
border-radius: 5px;
box-shadow: 1px 1px 6px #97EBF4;
}
.lz-left{
float: left;
margin: 2%;
padding: 0;
}
.memo-section{
width: auto;
margin-left: 15%;
padding-top: 1%;
border-left: 2px dotted #EEE;/*#8BE9F3;*/
}
.memo-title{
margin: 1em 0;
padding-left: 1%;
border-bottom: 1px dashed
}
.memo-content{
padding: 1%;
margin: 1%;
margin-bottom: 40px;
background-color: #F6F6F6;
}
.memo-timestamp{
position: absolute;
bottom: 0px;
right: 0;
margin: 20px;
}
.replies{
float: right;
/*max-width: 90%;*/
}
.reply-box{
float: right;
width: 640px;
padding: 3%;
/*border: 2px solid #C6F3F9;*/
border-top: 2px double #C6F3F9;
/*border-radius: 10px;*/
}
</style>
<div class="lz">
<div class="lz-left">
<div class=""><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div>
<p class=""><%=h @memo.author %></p>
</div>
<div class="memo-section">
<div class="memo-title"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
<div class="memo-content"><%= textilizable(@memo, :content) %></div>
<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author %></div>
</div>
<br />
</ul>
<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @replies.nil? ? 0 : @replies.size %>)</h3>
</div>
<div class="replies">
<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @replies.nil? ? 0 : @replies.size %>)</h3>
<% reply_count = 0%>
<% @replies.each do |reply| %>
<p class="font_lighter"><%= reply_count += 1 %>L :</p>
<div class="reply" id="<%= "reply-#{reply.id}" %>">
<div class="contextual-borad">
<%= link_to(
@ -50,41 +95,27 @@
<table class="borad-text-list">
<tr>
<td rowspan="3" valign="top" width="60px">
<%= link_to image_tag(url_to_avatar(reply.author), :class => "avatar"), user_path(reply.author) %></td>
<%= link_to image_tag(url_to_avatar(reply.author), :class => "avatar"), user_path(reply.author) %>
</td>
<td class="comments">
<div class="wiki"><%= textilizable reply, :content %></div>
</div>
</td>
</tr>
<!-- <tr>
<td>
< %= link_to h(reply.subject), { :controller => 'memos', :action => 'show', :board_id => @board, :id => @topic, :r => reply, :anchor => "reply-#{reply.id}" } %>
</td>
</tr> -->
<tr>
<td class="font_lighter" style="float:right"><%= authoring reply.created_at, reply.author %></td>
</tr>
</table>
<!-- <ul>
<li><div class="memo_content">content ===> <%= reply.content %></div></li>
<li>author ===> <%= link_to reply.author, user_path(reply.author) %></li>
<li class="timestamp">
Posted <%= time_ago_in_words(reply.created_at) if reply.created_at %> ago.
</li>
</ul> -->
</div>
<% end %>
</div>
<div class="" style="background:grey">
<%= labelled_form_for(@mome_new, url: forum_memos_path) do |f| %>
reply
<ul>
<div class="reply-box" style="">
<%= form_for(@mome_new, url: forum_memos_path) do |f| %>
<%= f.hidden_field :subject, :required => true, value: @memo.subject %>
<%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %>
<%= f.hidden_field :parent_id, :required => true, value: @memo.id %>
<li> <%= f.text_field :content, :required => true, :size => 80 %> </li>
</ul>
<%= f.submit %>
<%= label_tag(l(:label_reply_plural)) %>:
<p> <%= f.text_area :content, :required => true, :size => "75%", :resize => "none" %> </p>
<%= f.submit value: l(:label_reply_plural), class: "replies" %>
<% end %>
</div>

1
config/locales/en.yml
View File

@ -1565,6 +1565,7 @@ en:
field_hidden_repo: code protected
label_newbie_faq: newbie FAQ
label_hot_project: 'HOT Projects'
label_memo_create_succ: Memo was successfully created.

1
config/locales/zh.yml
View File

@ -1726,3 +1726,4 @@ zh:
label_newbie_faq: '新手指引 & 问答'
label_hot_project: '热门项目'
label_memo_create_succ: 回复成功