kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

贴吧

This commit is contained in:
daiao 2017-09-26 08:40:27 +08:00
parent 61fbd6a8e8
commit 71e7725e5c
8 changed files with 175 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/debates.js.coffee Normal file
View File

@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/stylesheets/debates.css.scss Normal file
View File

@ -0,0 +1,3 @@
// Place all the styles related to the debates controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

2
app/controllers/debates_controller.rb Normal file
View File

@ -0,0 +1,2 @@
class DebatesController < ApplicationController
end

6
app/controllers/forums_controller.rb
View File

@ -121,6 +121,7 @@ class ForumsController < ApplicationController
def index
order = ""
@order_str = ""
@user = User.current
if(params[:reorder_complex])
order = "replies_count #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}"
@order_str = "reorder_complex="+params[:reorder_complex]
@ -148,10 +149,13 @@ class ForumsController < ApplicationController
@my_forums_count = Memo.where("author_id =? and parent_id is null", User.current.id).count
@my_memos_count = Memo.where("author_id =? and parent_id is not null", User.current.id).count
@errors = params[:errors]
memos_id = Memo.where("author_id =?", User.current.id).map(&:id)
@memos_praise_count = PraiseTread.where(:praise_tread_object_id => memos_id, :praise_tread_object_type => "Memo").count
respond_to do |format|
format.js
format.html {
render :layout => 'base_new_forum'
render :layout => 'base_edu'
}# show.html.erb
format.json { render json: @forum }
end

2
app/helpers/debates_helper.rb Normal file
View File

@ -0,0 +1,2 @@
module DebatesHelper
end

184
app/views/forums/index.html.erb
View File

@ -1,3 +1,128 @@
<div class="edu-class-container edu-position">
<p class="mb10 font-14">
<i class="fa fa-map-marker mr5 color-grey"></i>
<a href="<%= user_path(@user) %>"><%= @user.show_name %></a> &gt; 讨论
</p>
<div class="edu-class-top clearfix mb30 pr user_bg_shadow bor-grey-e">
<div class="clearfix">
<div class="fl with60 mt5">
<a href="javascript:void(0)" class="fl">
<%= image_tag(url_to_avatar(User.current), :width => 60, :height => 60,:alt=>'贴吧图像', :class=>"bor-radius-all" ) %>
</a>
<div class="fl ml15">
<li class="font-16"><%= @user.show_name %></li>
<li class="mt5 color-grey"><%= @user.login %></li>
</div>
</div>
<ul class="task-index-head-info fr with30" style="padding: 10px 0px;">
<li><span class="color-orange font-bd" id="all_syllabuses"><%= @memos_praise_count %></span><br><span>被赞</span></li>
<li><span class="color-orange font-bd" id="all_syllabuses"><%= @my_memos_count %></span><br><span>回复/评论</span></li>
<li><span class="color-orange font-bd" id="all_syllabuses"><%= @my_forums_count %></span><br><span>主题</span></li>
</ul>
</div>
</div>
<div class="clearfix user_bg_shadow bor-grey-e">
<div class="clearfix pt10 pb10 pl15 pr15 bor-bottom-greyE">
<p class="color-grey3 fl font-16">问吧</p>
<a href="javascript:void(0)" class="mt3 white-btn orange-btn fr">+&nbsp;新话题</a>
</div>
<div id="forum_list" class="forum_table mh650">
<div class="forum_table_item">
<a class="fr mr15"><img src="http://tx.haiqq.com/uploads/allimg/150331/214H3HN-8.jpg" class="bor-radius-all mt3" width="50" height="50"/></a>
<div class="fl color-grey pr" style="flex: 1;">
<a href="javascript:void(0)">华沙沙</a>
<p class="font-16">
<a href="javascript:void(0)" class="clearfix item_name">五个值得推荐的英语学习网站，不可错过哦！</a>
</p>
<p style="width: 1103px;" class="overellipsis">1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈</p>
<p class="clearfix font-12 mt5">
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-eye mr5"></i>10</span>
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-thumbs-o-up mr5"></i>10</span>
<span class="mr50 fl" style="cursor: pointer;"><i class="fa fa-comments-o mr5"></i>10</span>
<!--<span class="fl">类别：分享</span>-->
<span class="fr mr5">最后更新：2小时前</span>
</p>
<div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
<ul class="edu-position-hide undis">
<li><a href="javascript:void(0)">精&nbsp;&nbsp;选</a></li>
<li><a href="javascript:void(0);">编&nbsp;&nbsp;辑</a></li>
<li><a href="javascript:void(0)">删&nbsp;&nbsp;除</a></li>
</ul>
</div>
</div>
</div>
<div class="forum_table_item">
<a class="fr mr15"><img src="http://tx.haiqq.com/uploads/allimg/150331/214H3HN-8.jpg" class="bor-radius-all mt3" width="50" height="50"/></a>
<div class="fl color-grey pr" style="flex: 1;">
<a href="javascript:void(0)">华沙沙</a>
<p class="font-16">
<a href="javascript:void(0)" class="clearfix item_name">五个值得推荐的英语学习网站，不可错过哦！</a>
</p>
<p style="width: 1103px;" class="overellipsis">1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈</p>
<p class="clearfix font-12 mt5">
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-eye mr5"></i>10</span>
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-thumbs-o-up mr5"></i>10</span>
<span class="mr50 fl" style="cursor: pointer;"><i class="fa fa-comments-o mr5"></i>10</span>
<!--<span class="fl">类别：分享</span>-->
<span class="fr mr5">最后更新：2小时前</span>
</p>
<div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
<ul class="edu-position-hide undis">
<li><a href="javascript:void(0)">精&nbsp;&nbsp;选</a></li>
<li><a href="javascript:void(0);">编&nbsp;&nbsp;辑</a></li>
<li><a href="javascript:void(0)">删&nbsp;&nbsp;除</a></li>
</ul>
</div>
</div>
</div>
<div class="forum_table_item">
<a class="fr mr15"><img src="http://tx.haiqq.com/uploads/allimg/150331/214H3HN-8.jpg" class="bor-radius-all mt3" width="50" height="50"/></a>
<div class="fl color-grey pr clearfix" style="flex: 1;">
<a href="javascript:void(0)">华沙沙</a>
<p class="font-16">
<a href="javascript:void(0)" class="clearfix item_name">五个值得推荐的英语学习网站，不可错过哦！</a>
</p>
<p style="width: 1103px;" class="overellipsis">1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈</p>
<p class="clearfix font-12 mt5">
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-eye mr5"></i>10</span>
<span class="mr20 fl" style="cursor: pointer;"><i class="fa fa-thumbs-o-up mr5"></i>10</span>
<span class="mr50 fl" style="cursor: pointer;"><i class="fa fa-comments-o mr5"></i>10</span>
<!--<span class="fl">类别：分享</span>-->
<span class="fr mr5">最后更新：2小时前</span>
</p>
<div class="edu-position-hidebox" style="position: absolute;right: 10px;top:0px;">
<a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
<ul class="edu-position-hide undis">
<li><a href="javascript:void(0)">精&nbsp;&nbsp;选</a></li>
<li><a href="javascript:void(0);">编&nbsp;&nbsp;辑</a></li>
<li><a href="javascript:void(0)">删&nbsp;&nbsp;除</a></li>
</ul>
</div>
</div>
</div>
</div>
<div style="text-align:center;" class="new_expand">
<div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">
<ul id="homework_pository_ref_pages">
<li><a href="javascript:void(0)" class="pages-big" data-remote="true">上一页</a></li>
<li><a class="active">1</a></li>
<li><a href="javascript:void(0)" class="page c_blue" data-remote="true">2</a></li>
<li><a href="javascript:void(0)" class="page c_blue" data-remote="true">3</a></li>
<li><a href="javascript:void(0)" class="pages-big pages-border-right" data-remote="true">下一页</a></li>
</ul>
<div class="cl"></div>
</div>
</div>
</div>
</div>
<% if false %>
<%= content_for(:header_tags) do %>
<%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
<% end %>
@ -107,34 +232,34 @@
});
var first_click = true;
// function check_and_submit(){
// if(!check_memo_name()){
// return;
// }
// if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){
// first_click = false;
// memo_content.sync();
// $.ajax({
// url:'/forums/'+'<%#= @forum.id.to_s%>'+'/memos',
// type:'post',
// data:$("#new_memo").serialize(),
// success:function(data){
//
// },
// error:function(){
// alert('请检查当前网络连接')
// }
// });
// //$("#new_memo").submit();
// }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
// $("#error").html("主题和内容不能为空").show();
// }
// else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
// $("#error").html("主题不能为空").show();
// }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
// $("#error").html("内容不能为空").show();
// }
// }
// function check_and_submit(){
// if(!check_memo_name()){
// return;
// }
// if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){
// first_click = false;
// memo_content.sync();
// $.ajax({
// url:'/forums/'+'<%#= @forum.id.to_s%>'+'/memos',
// type:'post',
// data:$("#new_memo").serialize(),
// success:function(data){
//
// },
// error:function(){
// alert('请检查当前网络连接')
// }
// });
// //$("#new_memo").submit();
// }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
// $("#error").html("主题和内容不能为空").show();
// }
// else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
// $("#error").html("主题不能为空").show();
// }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
// $("#error").html("内容不能为空").show();
// }
// }
function check_memo_name(){
if($("#memo_subject").val().trim().length > 50){
@ -156,4 +281,5 @@
memo_content.html('')
$('#error').html('').hide();
}
</script>
</script>
<% end %>

1
app/views/layouts/_logined_header.html.erb
View File

@ -18,6 +18,7 @@
<li><%= link_to "全部实训", shixuns_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "实训路径", subjects_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "在线课堂", courses_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "讨论", forums_path, :class => "new-nav-a font-16" %></li>
<!-- <li><%#= link_to "论坛", forums_path, :class =>"new-nav-a", :target => "_blank" %></li>-->
<!-- <li><%#= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "new-nav-a", :target=>"_blank" %></li>-->

4
config/routes.rb
View File

@ -738,6 +738,10 @@ RedmineApp::Application.routes.draw do
end
end
resources :debates do
end
resources :cooperation do
collection do