From 4182bb5fe712221457aa8372330e1d73acb92e32 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 20 Apr 2016 14:39:38 +0800 Subject: [PATCH 01/33] 111 --- app/controllers/admin_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index e581216fe..906194951 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -603,7 +603,7 @@ class AdminController < ApplicationController @code_work_tests[tCount-1] = {} @code_work_tests = paginateHelper @code_work_tests,30 - @page = (params['page'] || 1).to_i - 1 + @page = (params['page'] || 1).to_i - 1 #1111111111 #取出需要的那一页数据 tStart = @page*30 From 29115bca3ae1fd2d81303e523b56584ab8cd9c23 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 20 Apr 2016 16:12:20 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 7 +- app/controllers/blogs_controller.rb | 7 + app/views/blogs/_article.html.erb | 258 ++++------------------- app/views/blogs/_article_list.html.erb | 37 +--- app/views/blogs/index.html.erb | 2 +- app/views/layouts/new_base_user.html.erb | 2 +- public/images/liststyle.png | Bin 0 -> 19559 bytes public/stylesheets/new_user.css | 35 +++ 8 files changed, 88 insertions(+), 260 deletions(-) create mode 100644 public/images/liststyle.png diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 906194951..e6e0ec087 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -600,10 +600,11 @@ class AdminController < ApplicationController #设置个空的数组 以便paginateHelper来分页 @code_work_tests = [] - @code_work_tests[tCount-1] = {} - + if tCount >= 1 + @code_work_tests[tCount-1] = {} + end @code_work_tests = paginateHelper @code_work_tests,30 - @page = (params['page'] || 1).to_i - 1 #1111111111 + @page = (params['page'] || 1).to_i - 1 #取出需要的那一页数据 tStart = @page*30 diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb index 7a226f50d..8ee153456 100644 --- a/app/controllers/blogs_controller.rb +++ b/app/controllers/blogs_controller.rb @@ -3,6 +3,13 @@ class BlogsController < ApplicationController before_filter :find_user def index @article = BlogComment.new + + @topics = @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.updated_on desc") + + #分页 + @topics = paginateHelper @topics,10 + @page = (params['page'] || 1).to_i - 1 + respond_to do |format| format.html {render :layout=>'new_base_user'} end diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index edbce26d3..cfc43ca47 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -1,226 +1,46 @@ -
-
-
- <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %> -
-
- <% if activity.author.id == User.current.id || User.current.admin? %> - - <%end%> -
- <% if activity.try(:author).try(:realname) == ' ' %> - <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %> - <% else %> - <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %> - <% end %> - TO - <%= link_to activity.blog.name+" | 博客", user_blogs_path(:user_id=>activity.author_id,:host=>Setting.host_user), :class => "newsBlue ml15 mr5"%> - <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> - 已设为首页 - <% end %> -
-
- - <% if activity.sticky == 1%> - 置顶 - <% end%> - <% if activity.locked%> -        - <% end%> -
-
- 发帖时间：<%= format_time(activity.created_on) %> -
-
- 更新时间：<%= format_time(activity.updated_on) %> -
-
- <% if activity.parent_id.nil? %> - <% content= activity.content%> - <% else %> - <% content= activity.parent.content%> - <% end %> - <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %> - -
- - - -
-
- <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %> -
- -
+
+

博客列表

+
+ 排序： + 时间 + 人气
- <% count=0 %> - <% if activity.parent %> - <% count=activity.parent.children.count%> - <% else %> - <% count=activity.children.count%> - <% end %> -
-
-
回复 - <%= count>0 ? "（#{count}）" : "" %>▪ - - <% if activity.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> - <% end %> - -
-
<%#=format_date(activity.updated_on)%>
- <%if count > 3 %> -
- - 展开更多 - -
- <% end %> -
- - <% activity= activity.parent ? activity.parent : activity%> - <% replies_all_i = 0 %> - <% if count > 0 %> -
-
    - <% activity.children.reorder("created_on desc").each do |reply|%> - - <% replies_all_i=replies_all_i+1 %> -
  • -
    - <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %> -
    -
    -
    - <% if reply.try(:author).try(:realname) == ' ' %> - <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% else %> - <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> - <% end %> - <%= format_time(reply.created_on) %> - - <% if reply.author == User.current %> - - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> - -
    -
    - <%= reply.content.html_safe %> -
    -
    -
    -
    • +
    + <% topics.each do |activity| %> +
      +
    • + <% if activity.parent_id.nil? %> + <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "c_red ml10" %> + <% else %> + <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "c_red ml10"%> <% end %> -
    -
    - <% end %> - - <% if !activity.locked? %> -
    -
    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
    -
    -
    - <%= form_for('new_form',:url => {:controller=>'blog_comments',:action => 'reply', :id => activity.id, :blog_id => activity.blog.id, :user_id => activity.author_id},:method => "post",:remote=>true) do |f|%> - - - - - -
    - - -
    -

    - <% end%> -
    -
    -
    -
    + <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> + [已设为首页] + <% end %> + + <% count=0 %> + <% if activity.parent %> + <% count=activity.parent.children.count%> + <% else %> + <% count=activity.children.count%> + <% end %> +
  • + 发帖时间：<%= format_time(activity.created_on) %> + 更新时间：<%= format_time(activity.updated_on) %> +

    + <%= count>0 ? "（#{count}）" : "" %> + 回复 + | + <%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %> + 赞 +

    +
    • -
    +
<% end %> +
- diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index f3fd1aa61..af9fc1c0f 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -51,44 +51,9 @@ <% end %> <% if topics%> - <% topics.each do |topic| %> - - <% if topic %> - <%= render :partial => 'blogs/article', :locals => {:activity => topic, :user_activity_id => topic.id} %> - <% end %> - <% end %> - - <%# if topics.count == 10 %> - - <%# end %> + <%= render :partial => 'blogs/article', :locals => {:topics => topics} %> <% end%>
- \ No newline at end of file diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index af9fc1c0f..c52fa017e 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -38,7 +38,7 @@
-
+
<%= @user.name%>的博客
diff --git a/app/views/blogs/index.js.erb b/app/views/blogs/index.js.erb index e69de29bb..6c8835f6f 100644 --- a/app/views/blogs/index.js.erb +++ b/app/views/blogs/index.js.erb @@ -0,0 +1 @@ +$("#blog-list").html('<%= escape_javascript( render :partial => 'blogs/article', :locals => {:topics => @topics} ) %>'); \ No newline at end of file diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index f3bd827a4..4e1064b7f 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -7,7 +7,7 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'share','new_user', 'user_leftside','prettify','users','application',:media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'share','new_user', 'user_leftside','prettify','users',:media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%> diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index 7aed347b0..e2268ca3b 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -22,6 +22,8 @@ $(function(){ }; var test_program = function(cb){ + $('#test-program-btn').hide() + var homework_id = $('#test-program-btn').attr('data-homework-id'); var student_work_id = $('#test-program-btn').attr('data-student-work-id'); var src = $('#program-src').val(); @@ -29,6 +31,7 @@ $(function(){ var is_test = $('input[name=is_test]').val(); if(!valid_form()){ + $('#test-program-btn').show() return; } /* @@ -83,12 +86,14 @@ $(function(){ if (r) { $(".HomeWorkCon form").submit(); } + $('#test-program-btn').show() return; } //2 超时 -2 编译错误 测试结束 if (data.status == 2 || data.status == -2 || tSeq >= tCount ){ if (typeof cb == 'function') {cb(data); return;} + $('#test-program-btn').show() return; } @@ -100,6 +105,7 @@ $(function(){ } else { alert("对不起,服务器繁忙请稍后再试!"); } + $('#test-program-btn').show() return; }); }; diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 141205078..8f72b0a52 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1499,18 +1499,19 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;} .box-con-a{ width:170px; margin:0 auto; margin-top:10px;} /*博客列表界面样式*/ +a{text-decoration:none} .listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; } -.bloglistbox{ min-height:690px;} +/*.bloglistbox{ min-height:690px;}*/ .list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;} .category{ padding:10px 0; border-bottom:1px solid #ddd;} .category a,.category span{ float:left; margin-right:5px;} .grayTxt{ color:#9093a6;} -.sortTxt{ color:#000;} -.sortTxt:hover{ color:#28be6c;} +.category a.sortTxt{ color:#9093a6;} +.category .sortTxt:hover{ color:#28be6c;} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} -a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; } +a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} -a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:708px;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} a:hover.list-title{ color:#269ac9;} .c_red{ font-weight:normal; font-size:12px;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} @@ -1531,4 +1532,12 @@ a.messages-title{font-size:14px; font-weight: bold; color:#000;white-space:nowra a:hover.messages-title{ color:#269ac9;} .massages-content{ width:710px; color:#424242; max-height:65px; overflow:hidden; margin:10px 0;margin-left:15px; line-height:1.9;} .red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} -.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} \ No newline at end of file +.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} + +/****翻页***/ +ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } +ul.wlist li{float: left;} +ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;} +ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} +/*.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}*/ +.wlist_select a{background-color: #64bdd9;cursor: default;} \ No newline at end of file From a4d250e16896f3cda35e4ab7e82dd05b3ff11def Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sat, 23 Apr 2016 13:20:49 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/blogs_controller.rb | 4 ---- app/views/blogs/_article.html.erb | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb index 8a725dcca..e3bb92b98 100644 --- a/app/controllers/blogs_controller.rb +++ b/app/controllers/blogs_controller.rb @@ -90,8 +90,4 @@ class BlogsController < ApplicationController def find_user @user = User.find(params[:user_id]) end - - def blogsort - - end end diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 4b733c0f9..10ce3ee64 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -4,13 +4,13 @@

博客列表

排序： - <%= link_to "时间", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> + <%= link_to "时间", {:controller => 'blogs', :action => 'index', :id =>@user.id, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <% if @type.to_i == 1 %> - <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user.id, :type => @type, :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> <% end %> - <%= link_to "人气", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %> + <%= link_to "人气", {:controller => 'blogs', :action => 'index', :id =>@user.id, :type => @type, :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %> <% if @type.to_i == 2 %> - <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user.id, :type => @type, :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> <% end %>
From c8eaf293e7ba050c8e4b578e7e14b3a84ad5a1cc Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 24 Apr 2016 10:49:33 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/blogs_controller.rb | 2 +- app/controllers/users_controller.rb | 45 +++++++++++++++- app/views/blogs/_article.html.erb | 4 +- app/views/layouts/new_base_user.html.erb | 3 +- app/views/users/_user_course_list.html.erb | 61 ++++++++++++++++++++++ app/views/users/user_courselist.html.erb | 3 ++ app/views/users/user_courselist.js.erb | 1 + config/routes.rb | 4 ++ 8 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 app/views/users/_user_course_list.html.erb create mode 100644 app/views/users/user_courselist.html.erb create mode 100644 app/views/users/user_courselist.js.erb diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb index e3bb92b98..7bf122847 100644 --- a/app/controllers/blogs_controller.rb +++ b/app/controllers/blogs_controller.rb @@ -15,7 +15,7 @@ class BlogsController < ApplicationController @b_sort = 1 end - sort_name = "updated_on" + sort_name = "updated_at" sort_type = @b_sort == 1 ? "desc" : "asc" diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8e08508ed..c4f1de41e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -41,7 +41,7 @@ class UsersController < ApplicationController :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index, :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource, :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction, - :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course] + :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist] before_filter :auth_user_extension, only: :show #before_filter :rest_user_score, only: :show #before_filter :select_entry, only: :user_projects @@ -2845,6 +2845,49 @@ class UsersController < ApplicationController end end + def user_courselist + @order, @c_sort,@type = params[:order] || 1, params[:sort] || 2, params[:type] || 1 + + + #确定 sort_type + if @order.to_i == @type.to_i + @c_sort = @c_sort.to_i == 1 ? 2 : 1 #2降序 1升序 + else + @c_sort = 1 + end + + sort_name = "updated_at" + sort_type = @c_sort == 1 ? "desc" : "asc" + + if @user.courses.visible.count > 0 + course_order_ids = "(" + CourseActivity.find_by_sql("SELECT c.course_id, updated_at FROM(SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ") GROUP BY ca.course_id) AS c ").map {|c| c.course_id}.join(",") + ")" + @courses = Course.where("id in #{course_order_ids}").order("#{sort_name} #{sort_type}") + else + @courses = [] + end + + #根据 作业+资源数排序 + if @order.to_i == 2 + @type = 2 + @c_sort == 1 ? (@courses = @courses.sort{|x,y| (y.homework_commons.count + visable_attachemnts_incourse(y).count) <=> (x.homework_commons.count + visable_attachemnts_incourse(x).count) }) : (@courses.sort{|x,y| (x.homework_commons.count + visable_attachemnts_incourse(x).count) <=> (y.homework_commons.count + visable_attachemnts_incourse(y).count) }) + else + @type = 1 + end + + #分页 + @limit = 10 + @is_remote = true + @atta_count = @courses.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset + @courses = paginateHelper @courses,@limit + + respond_to do |format| + format.js + format.html {render :layout => 'new_base_user'} + end + end + private def find_user diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 10ce3ee64..1b9ef992e 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -64,7 +64,7 @@ var rightHeight = $(".homepageRight").height(); if (rightHeight < leftHeight){ var diffHeight = leftHeight - rightHeight; - var blogHeight = $(".listbox").height()+diffHeight; - $(".listbox").css("height",blogHeight); + var tmpHeight = $(".listbox").height()+diffHeight; + $(".listbox").css("height",tmpHeight); } \ No newline at end of file diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 4e1064b7f..5077ecab3 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -186,7 +186,8 @@ <%= link_to "动态",user_activities_path(@user.id),:class => "homepageMenuText"%>
- 课程 + <%= link_to '课程',{:controller => "users", :action => "user_courselist", :id => @user.id}, :class => "homepageMenuText" %> + <% if is_current_user%> <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb new file mode 100644 index 000000000..818c82e6e --- /dev/null +++ b/app/views/users/_user_course_list.html.erb @@ -0,0 +1,61 @@ +
+

课程列表

+
+ 排序： + <%= link_to "时间", {:controller => 'users', :action => 'user_courselist', :id =>@user.id, :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %> + <% if @type.to_i == 1 %> + <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user.id, :type => @type, :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <% end %> + <%= link_to "人气", {:controller => 'users', :action => 'user_courselist', :id =>@user.id, :type => @type, :sort => @c_sort, :order => 2 }, :class => "sortTxt", :remote => true %> + <% if @type.to_i == 2 %> + <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user.id, :type => @type, :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <% end %> +
+
+ +
+ <% @courses.each do |course|%> +
    +
  • + + <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "course-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", + :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%> + <% teacher = User.where("id=?",course.tea_id).first%> + + <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %> + +
    • +
    +
  • + + <%= l(:label_main_term)%> :  <%= current_time_and_term course %> + + <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> + <% homework_num = course.homework_commons.count %> + <% else %> + <% homework_num = course.homework_commons.where("publish_time <= '#{Date.today}'").count %> + <% end %> +

    <%= homework_num %>作业| <%= visable_attachemnts_incourse(course).count %>资源

    +
    • +
    +
+ <% end %> +
+
    + <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %> +
+
+
+
+
+ + \ No newline at end of file diff --git a/app/views/users/user_courselist.html.erb b/app/views/users/user_courselist.html.erb new file mode 100644 index 000000000..6784c42cb --- /dev/null +++ b/app/views/users/user_courselist.html.erb @@ -0,0 +1,3 @@ +
+ <%= render :partial => 'users/user_course_list'%> +
\ No newline at end of file diff --git a/app/views/users/user_courselist.js.erb b/app/views/users/user_courselist.js.erb new file mode 100644 index 000000000..ca4674584 --- /dev/null +++ b/app/views/users/user_courselist.js.erb @@ -0,0 +1 @@ +$("#courses-list").html('<%= escape_javascript( render :partial => 'users/user_course_list') %>'); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index fd7546749..fcb3f5272 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -549,6 +549,10 @@ RedmineApp::Application.routes.draw do match 'code_submit_score_index', :to => 'projects#code_submit_score_index', :via => [:get, :post] match 'projects_topic_score_index', :to => 'projects#projects_topic_score_index', :via => [:get, :post] match 'user_act_issue_assign_to', :to => 'users#user_act_issue_assign_to', :via => [:get, :post] + + #addby yk + match 'user_courselist', :to => 'users#user_courselist', :via => :get, :as => "user_courselist" + get 'edit_brief_introduction' get "user_resource" get "import_resources" From f6d09e055495bd08854d627840ded36356fd6f7d Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Sun, 24 Apr 2016 14:23:08 +0800 Subject: [PATCH 07/33] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=20=E9=9A=90=E8=97=8F=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E4=BF=A1=E6=81=AF=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/settings_controller.rb | 22 ++++++ app/views/layouts/new_base_user.html.erb | 81 ++++++++++++----------- app/views/settings/edit.html.erb | 1 + app/views/settings/hidden_courses.js.erb | 5 ++ app/views/users/_user_activities.html.erb | 6 +- app/views/users/show.html.erb | 32 +++++---- config/locales/zh.yml | 6 +- config/routes.rb | 1 + config/settings.yml | 2 + 9 files changed, 100 insertions(+), 56 deletions(-) create mode 100644 app/views/settings/hidden_courses.js.erb diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 93e0e9c4b..c22f9e4ab 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -32,6 +32,10 @@ class SettingsController < ApplicationController hidden_non_project = Setting.find_by_name("hidden_non_project") @text = (hidden_non_project && hidden_non_project.value == "0") ? l(:label_show_non_project) : l(:label_hidden_non_project) + #1隐藏了课程信息 0显示了课程信息 + hidden_courses = Setting.find_by_name("hidden_courses") + @text_1 = (hidden_courses && hidden_courses.value == "1") ? l(:label_show_courses) : l(:label_hidden_courses) + @notifiables = Redmine::Notifiable.all if request.post? && params[:settings] && params[:settings].is_a?(Hash) settings = (params[:settings] || {}).dup.symbolize_keys @@ -89,4 +93,22 @@ class SettingsController < ApplicationController redirect_to settings_url end + + #隐藏/显示课程信息 + def hidden_courses + @notifiable = Setting.find_by_name("hidden_courses") + if @notifiable + @notifiable.value == "1" ? @notifiable.value = 0 : @notifiable.value = 1 + @notifiable.save + else + @notifiable = Setting.new() + @notifiable.name = "hidden_courses" + @notifiable.value = 1 + @notifiable.save + end + + redirect_to settings_url + end end + + diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 4e1064b7f..0d40bb946 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -185,48 +185,53 @@
<%= link_to "动态",user_activities_path(@user.id),:class => "homepageMenuText"%>
-
- 课程 - <% if is_current_user%> - <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> -
-
    -
  • -
      -
    • - <%= link_to "新建课程", new_course_path(:host=> Setting.host_course), :class => "menuGrey"%> -
      • - -
    • - <%= link_to "加入课程",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%> + <% hidden_courses = Setting.find_by_name("hidden_courses") %> + <% unvisiable = hidden_courses && hidden_courses.value == "1"%> + <% if !unvisiable %> +
      + 课程 + <% if is_current_user%> + <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> +
      +
        +
      • +
          +
        • + <%= link_to "新建课程", new_course_path(:host=> Setting.host_course), :class => "menuGrey"%> +
          • + +
        • + <%= link_to "加入课程",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%> +
          • +
      -
      • -
    -
- <% else%> - <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入课程"%> +
+ <% else%> + <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入课程"%> + <% end%> <% end%> - <% end%> -
- <% if @user.courses.visible.count > 0 - course_order_ids = "(" + - CourseActivity.find_by_sql("SELECT c.course_id, updated_at FROM - (SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ") - GROUP BY ca.course_id) AS c - ORDER BY c.updated_at DESC limit 5").map {|c| c.course_id}.join(",") + ")" - courses = Course.where("id in #{course_order_ids}") - else - courses = [] +
+ <% if @user.courses.visible.count > 0 + course_order_ids = "(" + + CourseActivity.find_by_sql("SELECT c.course_id, updated_at FROM + (SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ") + GROUP BY ca.course_id) AS c + ORDER BY c.updated_at DESC limit 5").map {|c| c.course_id}.join(",") + ")" + courses = Course.where("id in #{course_order_ids}") + else + courses = [] + + end + %> + <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> +
+
    + <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %> +
+
+ <% end %> - end - %> - <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> -
-
    - <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %> -
-
项目 diff --git a/app/views/settings/edit.html.erb b/app/views/settings/edit.html.erb index 798db291b..32e95db57 100644 --- a/app/views/settings/edit.html.erb +++ b/app/views/settings/edit.html.erb @@ -1,5 +1,6 @@

<%=l(:label_settings)%>

<%= link_to @text,settings_hidden_non_project_path,:id => "hidden_non_project",:style => "float: right;margin-right: 60px;margin-top: 9px;"%> +<%= link_to @text_1,settings_hidden_courses_path,:id => "hidden_courses",:style => "float: right;margin-right: 60px;margin-top: 9px;"%>
<%= render_tabs administration_settings_tabs %> diff --git a/app/views/settings/hidden_courses.js.erb b/app/views/settings/hidden_courses.js.erb new file mode 100644 index 000000000..b4d344a6c --- /dev/null +++ b/app/views/settings/hidden_courses.js.erb @@ -0,0 +1,5 @@ +<% if @notifiable.value == "0"%> +$("#hidden_courses").replaceWith("<%= escape_javascript(link_to '隐藏课程信息',settings_hidden_courses_path,:id => 'hidden_courses',:style => 'float: right;margin-right: 60px;margin-top: 9px;', :remote => true)%>"); +<% else%> +$("#hidden_courses").replaceWith("<%= escape_javascript(link_to '显示课程信息',settings_hidden_courses_path,:id => 'hidden_courses',:style => 'float: right;margin-right: 60px;margin-top: 9px;', :remote => true)%>"); +<% end%> \ No newline at end of file diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 69d209df9..b7df824a4 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -65,7 +65,11 @@ <% case user_activity.act_type.to_s %> <% when 'HomeworkCommon' %> <%# cache (act) do %> - <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:course_activity => 0} %> + <% hidden_courses = Setting.find_by_name("hidden_courses") %> + <% unvisiable = hidden_courses && hidden_courses.value == "1"%> + <% if !unvisiable %> + <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:course_activity => 0} %> + <% end %> <%# end %> <% when 'News' %> <%# cache [act, act.comments.count] do %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 2fe9ab079..5470d2bf3 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -5,20 +5,24 @@
diff --git a/app/views/organizations/_org_content.html.erb b/app/views/organizations/_org_content.html.erb new file mode 100644 index 000000000..afcbffd02 --- /dev/null +++ b/app/views/organizations/_org_content.html.erb @@ -0,0 +1,259 @@ + +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> + <% if field.status.to_i == 1 %> + + <% elsif field.status.to_i == 2 %> + + <% elsif field.status.to_i == 3 %> + + <% elsif field.status.to_i == 4 %> + + <% elsif field.status.to_i == 5 %> + + <% elsif field.status.to_i == 6 %> + + <% end %> +
+ <% if field.status == 0 %> +
+

课程动态

+ <% if @course_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + <% unless @course_acts.nil? %> + <%= render :partial => 'organizations/org_new_course_pic', :locals => {:activities => @course_acts.first(3)} %> + <% end %> +
    + <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
    +
+
+ <% end %> +
+ <% else %> +
+

课程动态

+ <% if @course_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %> + +
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + + +
+ <% end %> +
+ <% when 'project' %> +
+ <% if field.status == 0 %> +
+

项目动态

+ <% if @project_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + <% unless @project_acts.nil? %> + <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts.first(3)} %> + <% end %> +
    + <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
    +
+
+ <% end %> + +
+ <% else %> +
+

项目动态

+ <% if @project_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %> + +
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + +
+ <% end %> +
+ <% end %> +<% else %> + <% if field.field_type == "Post" %> <%# 讨论类型 %> + <% org_subfield = OrgSubfield.find(field.id) %> + <% org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0 %> + <% org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc') %> + <%# message_ats = get_message_org(@organization.id, field.id) %> + <%# ids = field.org_document_comments.map{|o| o.id}.join(",") %> +
+ <% if field.status == 0 %> +
+

<%= field.name %>

+ <% if org_acts.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + + <% org_acts.first(3).each do |act| %> + <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %> + <% end %> +
    +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+
+ <% end %> + +
+ <% else %> +
+

<%= field.name %>

+ <% if org_acts.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> +
+ <% else %> +
+ <% org_acts.each do |act| %> + <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %> + <% end %> + +
+
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> +
+ <% end %> + +
+
+ <% end %> +
+ <% elsif field.field_type == "Resource" %> + <% org_attachs = get_attach_org2(field) %> +
+
+

<%= field.name %>

+ <% if org_attachs.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %> + +
+ +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + +
+
+
+
+ <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index 2c679eb3d..7db41cba5 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -27,7 +27,7 @@ 默认 <% else %> <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %> -
+
<%= select( :name,:group_id, subfield_status_option, @@ -63,7 +63,7 @@ 列表 <% else %> <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %> -
+
<%= select( :name,:group_id, subfield_status_option, From 53e6b41d93af31b43bb322606fcd236d94179483 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 26 Apr 2016 10:02:16 +0800 Subject: [PATCH 15/33] =?UTF-8?q?=E5=8C=97=E6=96=97=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 776 +++++++++--------- .../_org_logined_header.html.erb | 102 +-- db/schema.rb | 419 ---------- public/stylesheets/org2.css | 429 +++++----- 4 files changed, 656 insertions(+), 1070 deletions(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index a605b8d4e..0dec2a85a 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -1,388 +1,388 @@ - - - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %> - <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%> - <%= javascript_include_tag 'attachments' %> - <%#= call_hook :view_layouts_base_html_head %> - - <%#= yield :header_tags -%> - - - - - - - - - - - - - - - - -
-
- <%= render :partial => 'organizations/org_logined_header' %> -
- -
- -
-
    - <% @subfield_content.each do |field| %> - <% if is_default_field?(field) %> - <% case field.name %> - <% when 'activity' %> -
  • - <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %> -
    • - <% when 'course' %> -
  • - 课程动态 -
    • - <% when 'project' %> -
  • - 项目动态 -
    • - <% end %> - <% else %> - <% if field.field_type == "Post" && field.hide == 0 %> -
  • - <%= field.name %> -
    • - <% elsif field.field_type == "Resource" && field.hide == 0 %> -
  • - <%= field.name %> -
    • - <% end %> - <% end %> - <% end %> - <% if User.current.admin_of_org?(@organization) %> -
  • - 配置 -
    • - <% end %> -
-
- - - - - - - - - - - - - - -
-
- -
-
-
- - - - -
- -
-

业界动态更多

-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-

2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......

-
-
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
-
-
- - -
-

北斗资源更多

-
-
- -

仪器资源

-
- 测试服务 - 开放日 - 仪器共享 - 定制测试 -
- 更多 -
-
- -

数据资源

-
- 仿真数据 - 实测数据 - 测试场景 - 定制测试 -
- 更多 -
-
- -

专家资源

-
- 人才培养 - 技术咨询 - 学术活动 - 教学教材 - 专家库 -
- 更多 -
-
- -

研究资源

-
- 微小课题 - 开源代码 - 辅助工具 - 技术共享 -
- 更多 -
-
-
-
- - -
-

合作伙伴更多

-
-
    -
  • - - -
    • -
  • - - -
    • -
-
-
-
<
-
>
-
-
-
-
- -
- - - -
-
-

最新活动展示更多

-
- -

北斗第二次工作会议在北京召议在北京召开议在北京召开开

- 2016-04-08 -
-
- -

北斗第二次工作会议在北京召开

- 2016-04-08 -
-
- -

北斗第二次工作会议在北京召开

- 2016-04-08 -
-
- -

北斗第二次工作会议在北京召开

- 2016-04-08 -
-
- -
-

关注北斗

-
- -

卫星导航仿真与测试开放实验室
扫一扫 关注我！

-
-
-
- -
- -
-
- -
-
- -
- -
-
- -
联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org
-
地 址：湖南省长沙市开福区东风路89号观园大厦23层
- 卫星导航仿真与测试开放实验室
-
-
-
- - -<%#= call_hook :view_layouts_base_body_bottom %> - - - + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %> + <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%> + <%= javascript_include_tag 'attachments' %> + <%#= call_hook :view_layouts_base_html_head %> + + <%#= yield :header_tags -%> + + + + + + + + + + + + + + + + +
+
+ <%= render :partial => 'organizations/org_logined_header' %> +
+ +
+ +
+
    + <% @subfield_content.each do |field| %> + <% if is_default_field?(field) %> + <% case field.name %> + <% when 'activity' %> +
  • + <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %> +
    • + <% when 'course' %> +
  • + 课程动态 +
    • + <% when 'project' %> +
  • + 项目动态 +
    • + <% end %> + <% else %> + <% if field.field_type == "Post" && field.hide == 0 %> +
  • + <%= field.name %> +
    • + <% elsif field.field_type == "Resource" && field.hide == 0 %> +
  • + <%= field.name %> +
    • + <% end %> + <% end %> + <% end %> + <% if User.current.admin_of_org?(@organization) %> +
  • + 配置 +
    • + <% end %> +
+
+ + + + + + + + + + + + + + +
+
+ +
+
+
+ + + + +
+ +
+

业界动态更多

+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+

2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......

+
+
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+
+
+ + +
+

北斗资源更多

+
+
+ +

仪器资源

+
+ 测试服务 + 开放日 + 仪器共享 + 定制测试 +
+ 更多 +
+
+ +

数据资源

+
+ 仿真数据 + 实测数据 + 测试场景 + 定制测试 +
+ 更多 +
+
+ +

专家资源

+
+ 人才培养 + 技术咨询 + 学术活动 + 教学教材 + 专家库 +
+ 更多 +
+
+ +

研究资源

+
+ 微小课题 + 开源代码 + 辅助工具 + 技术共享 +
+ 更多 +
+
+
+
+ + +
+

合作伙伴更多

+
+
    +
  • + + +
    • +
  • + + +
    • +
+
+
+
<
+
>
+
+
+
+
+ +
+ + + +
+
+

最新活动展示更多

+
+ +

北斗第二次工作会议在北京召议在北京召开议在北京召开开

+ 2016-04-08 +
+
+ +

北斗第二次工作会议在北京召开

+ 2016-04-08 +
+
+ +

北斗第二次工作会议在北京召开

+ 2016-04-08 +
+
+ +

北斗第二次工作会议在北京召开

+ 2016-04-08 +
+
+ +
+

关注北斗

+
+ +

卫星导航仿真与测试开放实验室
扫一扫 关注我！

+
+
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org
+
地 址：湖南省长沙市开福区东风路89号观园大厦23层
+ 卫星导航仿真与测试开放实验室
+
+
+
+ + +<%#= call_hook :view_layouts_base_body_bottom %> + + + diff --git a/app/views/organizations/_org_logined_header.html.erb b/app/views/organizations/_org_logined_header.html.erb index ead53de9f..22cf920e9 100644 --- a/app/views/organizations/_org_logined_header.html.erb +++ b/app/views/organizations/_org_logined_header.html.erb @@ -1,50 +1,54 @@ -<% if User.current.logged? %> - -<% else %> -
- -
-<% end %> - - \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index ccd953cc5..5bdd5b674 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -52,28 +52,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token" add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id" - create_table "application_settings", :force => true do |t| - t.integer "default_projects_limit" - t.boolean "signup_enabled" - t.boolean "signin_enabled" - t.boolean "gravatar_enabled" - t.text "sign_in_text" - t.datetime "created_at" - t.datetime "updated_at" - t.string "home_page_url" - t.integer "default_branch_protection", :default => 2 - t.boolean "twitter_sharing_enabled", :default => true - t.text "restricted_visibility_levels" - t.boolean "version_check_enabled", :default => true - t.integer "max_attachment_size", :default => 10, :null => false - t.integer "default_project_visibility" - t.integer "default_snippet_visibility" - t.text "restricted_signup_domains" - t.boolean "user_oauth_applications", :default => true - t.string "after_sign_out_path" - t.integer "session_expire_delay", :default => 10080, :null => false - end - create_table "applied_projects", :force => true do |t| t.integer "project_id", :null => false t.integer "user_id", :null => false @@ -155,20 +133,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.string "typeName", :limit => 50 end - create_table "audit_events", :force => true do |t| - t.integer "author_id", :null => false - t.string "type", :null => false - t.integer "entity_id", :null => false - t.string "entity_type", :null => false - t.text "details" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id" - add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type" - add_index "audit_events", ["type"], :name => "index_audit_events_on_type" - create_table "auth_sources", :force => true do |t| t.string "type", :limit => 30, :default => "", :null => false t.string "name", :limit => 60, :default => "", :null => false @@ -266,17 +230,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" add_index "boards", ["project_id"], :name => "boards_project_id" - create_table "broadcast_messages", :force => true do |t| - t.text "message", :null => false - t.datetime "starts_at" - t.datetime "ends_at" - t.integer "alert_type" - t.datetime "created_at" - t.datetime "updated_at" - t.string "color" - t.string "font" - end - create_table "bug_to_osps", :force => true do |t| t.integer "osp_id" t.integer "relative_memo_id" @@ -624,15 +577,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - create_table "deploy_keys_projects", :force => true do |t| - t.integer "deploy_key_id", :null => false - t.integer "project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id" - create_table "discuss_demos", :force => true do |t| t.string "title" t.text "body" @@ -682,16 +626,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.datetime "created_at" end - create_table "emails", :force => true do |t| - t.integer "user_id", :null => false - t.string "email", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true - add_index "emails", ["user_id"], :name => "index_emails_on_user_id" - create_table "enabled_modules", :force => true do |t| t.integer "project_id" t.string "name", :null => false @@ -714,25 +648,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" - create_table "events", :force => true do |t| - t.string "target_type" - t.integer "target_id" - t.string "title" - t.text "data" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "action" - t.integer "author_id" - end - - add_index "events", ["action"], :name => "index_events_on_action" - add_index "events", ["author_id"], :name => "index_events_on_author_id" - add_index "events", ["created_at"], :name => "index_events_on_created_at" - add_index "events", ["project_id"], :name => "index_events_on_project_id" - add_index "events", ["target_id"], :name => "index_events_on_target_id" - add_index "events", ["target_type"], :name => "index_events_on_target_type" - create_table "exercise_answers", :force => true do |t| t.integer "user_id" t.integer "exercise_question_id" @@ -835,15 +750,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type" add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at" - create_table "forked_project_links", :force => true do |t| - t.integer "forked_to_project_id", :null => false - t.integer "forked_from_project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true - create_table "forums", :force => true do |t| t.string "name", :null => false t.text "description" @@ -972,17 +878,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.datetime "updated_at", :null => false end - create_table "identities", :force => true do |t| - t.string "extern_uid" - t.string "provider" - t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id" - add_index "identities", ["user_id"], :name => "index_identities_on_user_id" - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1126,20 +1021,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.integer "private", :default => 0 end - create_table "keys", :force => true do |t| - t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" - t.text "key" - t.string "title" - t.string "type" - t.string "fingerprint" - t.boolean "public", :default => false, :null => false - end - - add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id" - add_index "keys", ["user_id"], :name => "index_keys_on_user_id" - create_table "kindeditor_assets", :force => true do |t| t.string "asset" t.integer "file_size" @@ -1151,27 +1032,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.integer "owner_type", :default => 0 end - create_table "label_links", :force => true do |t| - t.integer "label_id" - t.integer "target_id" - t.string "target_type" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id" - add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type" - - create_table "labels", :force => true do |t| - t.string "title" - t.string "color" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "labels", ["project_id"], :name => "index_labels_on_project_id" - create_table "member_roles", :force => true do |t| t.integer "member_id", :null => false t.integer "role_id", :null => false @@ -1222,47 +1082,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.integer "viewed_count", :default => 0 end - create_table "merge_request_diffs", :force => true do |t| - t.string "state" - t.text "st_commits", :limit => 2147483647 - t.text "st_diffs", :limit => 2147483647 - t.integer "merge_request_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true - - create_table "merge_requests", :force => true do |t| - t.string "target_branch", :null => false - t.string "source_branch", :null => false - t.integer "source_project_id", :null => false - t.integer "author_id" - t.integer "assignee_id" - t.string "title" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "milestone_id" - t.string "state" - t.string "merge_status" - t.integer "target_project_id", :null => false - t.integer "iid" - t.text "description" - t.integer "position", :default => 0 - t.datetime "locked_at" - end - - add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id" - add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id" - add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id" - add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at" - add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id" - add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch" - add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id" - add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch" - add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true - add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title" - create_table "message_alls", :force => true do |t| t.integer "user_id" t.integer "message_id" @@ -1297,39 +1116,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id" add_index "messages", ["parent_id"], :name => "messages_parent_id" - create_table "milestones", :force => true do |t| - t.string "title", :null => false - t.integer "project_id", :null => false - t.text "description" - t.date "due_date" - t.datetime "created_at" - t.datetime "updated_at" - t.string "state" - t.integer "iid" - end - - add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id" - add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date" - add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true - add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id" - - create_table "namespaces", :force => true do |t| - t.string "name", :null => false - t.string "path", :null => false - t.integer "owner_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "type" - t.string "description", :default => "", :null => false - t.string "avatar" - end - - add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id" - add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true - add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id" - add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true - add_index "namespaces", ["type"], :name => "index_namespaces_on_type" - create_table "news", :force => true do |t| t.integer "project_id" t.string "title", :limit => 60, :default => "", :null => false @@ -1355,31 +1141,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.datetime "updated_at", :null => false end - create_table "notes", :force => true do |t| - t.text "note" - t.string "noteable_type" - t.integer "author_id" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "project_id" - t.string "attachment" - t.string "line_code" - t.string "commit_id" - t.integer "noteable_id" - t.boolean "system", :default => false, :null => false - t.text "st_diff", :limit => 2147483647 - end - - add_index "notes", ["author_id"], :name => "index_notes_on_author_id" - add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id" - add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id" - add_index "notes", ["created_at"], :name => "index_notes_on_created_at" - add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type" - add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type" - add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type" - add_index "notes", ["project_id"], :name => "index_notes_on_project_id" - add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at" - create_table "notificationcomments", :force => true do |t| t.string "notificationcommented_type" t.integer "notificationcommented_id" @@ -1389,49 +1150,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.datetime "updated_at", :null => false end - create_table "oauth_access_grants", :force => true do |t| - t.integer "resource_owner_id", :null => false - t.integer "application_id", :null => false - t.string "token", :null => false - t.integer "expires_in", :null => false - t.text "redirect_uri", :null => false - t.datetime "created_at", :null => false - t.datetime "revoked_at" - t.string "scopes" - end - - add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true - - create_table "oauth_access_tokens", :force => true do |t| - t.integer "resource_owner_id" - t.integer "application_id" - t.string "token", :null => false - t.string "refresh_token" - t.integer "expires_in" - t.datetime "revoked_at" - t.datetime "created_at", :null => false - t.string "scopes" - end - - add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true - add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id" - add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true - - create_table "oauth_applications", :force => true do |t| - t.string "name", :null => false - t.string "uid", :null => false - t.string "secret", :null => false - t.text "redirect_uri", :null => false - t.string "scopes", :default => "", :null => false - t.datetime "created_at" - t.datetime "updated_at" - t.integer "owner_id" - t.string "owner_type" - end - - add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type" - add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true - create_table "onclick_times", :force => true do |t| t.integer "user_id" t.datetime "onclick_time" @@ -1587,23 +1305,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.integer "show_mode", :default => 0 end - create_table "permissions", :force => true do |t| - t.string "controller", :limit => 30, :default => "", :null => false - t.string "action", :limit => 30, :default => "", :null => false - t.string "description", :limit => 60, :default => "", :null => false - t.boolean "is_public", :default => false, :null => false - t.integer "sort", :default => 0, :null => false - t.boolean "mail_option", :default => false, :null => false - t.boolean "mail_enabled", :default => false, :null => false - end - - create_table "permissions_roles", :id => false, :force => true do |t| - t.integer "permission_id", :default => 0, :null => false - t.integer "role_id", :default => 0, :null => false - end - - add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id" - create_table "phone_app_versions", :force => true do |t| t.string "version" t.text "description" @@ -1686,11 +1387,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.datetime "updated_at", :null => false end - create_table "project_import_data", :force => true do |t| - t.integer "project_id" - t.text "data" - end - create_table "project_infos", :force => true do |t| t.integer "project_id" t.integer "user_id" @@ -1780,16 +1476,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" - create_table "protected_branches", :force => true do |t| - t.integer "project_id", :null => false - t.string "name", :null => false - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "developers_can_push", :default => false, :null => false - end - - add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id" - create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1924,25 +1610,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.integer "is_teacher_score", :default => 0 end - create_table "services", :force => true do |t| - t.string "type" - t.string "title" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.boolean "active", :default => false, :null => false - t.text "properties" - t.boolean "template", :default => false - t.boolean "push_events", :default => true - t.boolean "issues_events", :default => true - t.boolean "merge_requests_events", :default => true - t.boolean "tag_push_events", :default => true - t.boolean "note_events", :default => true, :null => false - end - - add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id" - add_index "services", ["project_id"], :name => "index_services_on_project_id" - create_table "settings", :force => true do |t| t.string "name", :default => "", :null => false t.text "value" @@ -1972,26 +1639,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.datetime "updated_at", :null => false end - create_table "snippets", :force => true do |t| - t.string "title" - t.text "content", :limit => 2147483647 - t.integer "author_id", :null => false - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "file_name" - t.datetime "expires_at" - t.string "type" - t.integer "visibility_level", :default => 0, :null => false - end - - add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id" - add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id" - add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at" - add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at" - add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id" - add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level" - create_table "softapplications", :force => true do |t| t.string "name" t.text "description" @@ -2088,17 +1735,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.datetime "updated_at", :null => false end - create_table "subscriptions", :force => true do |t| - t.integer "user_id" - t.integer "subscribable_id" - t.string "subscribable_type" - t.boolean "subscribed" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true - create_table "system_messages", :force => true do |t| t.integer "user_id" t.string "content" @@ -2293,25 +1929,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade" add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count" - create_table "user_wechats", :force => true do |t| - t.integer "subscribe" - t.string "openid" - t.string "nickname" - t.integer "sex" - t.string "language" - t.string "city" - t.string "province" - t.string "country" - t.string "headimgurl" - t.string "subscribe_time" - t.string "unionid" - t.string "remark" - t.integer "groupid" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "users", :force => true do |t| t.string "login", :default => "", :null => false t.string "hashed_password", :limit => 40, :default => "", :null => false @@ -2337,17 +1954,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do add_index "users", ["id", "type"], :name => "index_users_on_id_and_type" add_index "users", ["type"], :name => "index_users_on_type" - create_table "users_star_projects", :force => true do |t| - t.integer "project_id", :null => false - t.integer "user_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id" - add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true - add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id" - create_table "versions", :force => true do |t| t.integer "project_id", :default => 0, :null => false t.string "name", :default => "", :null => false @@ -2399,31 +2005,6 @@ ActiveRecord::Schema.define(:version => 20160415030447) do t.datetime "updated_at", :null => false end - create_table "web_hooks", :force => true do |t| - t.string "url" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "type", :default => "ProjectHook" - t.integer "service_id" - t.boolean "push_events", :default => true, :null => false - t.boolean "issues_events", :default => false, :null => false - t.boolean "merge_requests_events", :default => false, :null => false - t.boolean "tag_push_events", :default => false - t.boolean "note_events", :default => false, :null => false - end - - add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id" - add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id" - - create_table "wechat_logs", :force => true do |t| - t.string "openid", :null => false - t.text "request_raw" - t.text "response_raw" - t.text "session_raw" - t.datetime "created_at", :null => false - end - create_table "wiki_content_versions", :force => true do |t| t.integer "wiki_content_id", :null => false t.integer "page_id", :null => false diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index b64940322..e738f841d 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -1,214 +1,215 @@ -/* CSS Document */ -/* 样式重置 */ -body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;} -body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.9; background:#f2f2f2;} -div,img,tr,td,table{ border:0;} -table,tr,td{border:0;cellspacing:0; cellpadding:0;} -ol,ul,li{ list-style-type:none} -a:link,a:visited{color:#000;text-decoration:none;} -a:hover,a:active{color:#24366e;} - -.sn-fl {float:left;} -.sn-fr {float:right;} -.sn-cl {clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden} -.sn-container {width:100%; background-color:#fff;} -.sn-p-absolute {position:absolute;} -.sn-grey-opacity {background:rgba(230, 230, 230, 0.9)!important; filter:Alpha(opacity=90); background:#e6e6e6;} -.sn-border {border-top:1px solid #dfdfdf; border-bottom:1px solid #dfdfdf;} -/* 公共 */ -.cl{ clear:both;} -.fl{ float:left;} -.fr{ float:right;} -.mb18{ margin-bottom:18px;} -.mt10{ margin-top:10px;} -.mr20{ margin-right:20px;} -.mr10{ margin-right:10px;} - -/*字体，链接颜色*/ -.sn-font-black {color:#000;} -.sn-font-grey {color:#b4bbbf;} -.sn-font-grey2 {color:#5e5e5e;} -.sn-font-grey3 {color:#999;} -a.sn-link-blue {color:#24366e;} -a.sn-link-white {color:#fff;} -a.sn-link-grey {color:#999;} -a.sn-link-grey:hover {color:#24366e;} -a.sn-link-grey2 {color:#888;} -a.sn-link-select {color:#809df9;} -/*字体大小*/ -.sn-f14 {font-size:14px;} -.sn-f18 {font-size:18px;} -/*padding&margin*/ -.sn-mt-10 {margin-left:-10px;} -.sn-mt10 {margin-top:10px;} -.sn-mt13 {margin-top:13px;} -.sn-mt15 {margin-top:15px;} -.sn-mt28 {margin-top:28px;} -.sn-mb40 {margin-bottom:40px;} -.sn-ml15 {margin-left:15px;} -.sn-ml55 {margin-left:55px;} -.sn-mr0 {margin-right:0px !important;} -.sn-mr50 {margin-right:50px;} -/*头部样式*/ -.sn-header {} -.sn-row {width:100%;} -.sn-bg-grey {background-color:#f4f4f4;} -.sn-bg-grey2 {background-color:#a5a5a5;} -.sn-bg-white {background-color:#fff;} -.sn-bg-blue {background-color:#24366e;} -.sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} -.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;} -.sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;} -a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;} -.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1;} -.sn-nav li {float:left; margin-top:10px; margin-right:50px; border-radius:5px;} -.sn-nav li a {display:inline-block; padding:8px 6px;} -.sn-nav li:hover {background-color:#809df9;} -.sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;} -.sn-sub-nav li {color:#999; float:left;} -.sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;} -.sn-sub-nav li a:hover {border-bottom:3px solid #ffbd18; height:37px;} -.sn-subnav-slice {margin:12px 5px;} -.sn-banner {width:1200px; height:210px; margin:0 auto;} -.sn-content-position {width:1200px; height:50px; line-height:50px; vertical-align:middle; font-size:14px; color:#888; margin:0 auto;} -/*footer样式*/ -.sn-footer {width:1200px; height:220px; margin:0 auto; text-align:center; font-size:14px; color:#fff; line-height:normal;} -.sn-footer-link {padding:40px 0 30px 0;} -.sn-footer-link li {display:inline-block;} -.sn-contact {margin-bottom:30px;} -/* 首页内容 */ -.sn-content{ width:1200px; margin:0 auto;} -.sn-content-left{ width:820px; margin-right:12px; margin-bottom:74px;} -.sn-content-right{ width:368px; margin-bottom:74px; } -/* index-banner */ -.sn-index-banner{ width:820px; height:435px; margin-bottom:20px;} -.focus{ position:relative; width:820px; height:435px; background-color: #000; float: left;} -.focus img{ width:820px; height:435px;} -.focus .shadow .title{width: 260px; height: 65px;padding-left: 30px;padding-top: 20px;} -.focus .shadow .title a{ text-decoration:none; color:#fff; font-size:14px; font-weight:bolder; overflow:hidden; } -.focus .btn{ position:absolute; bottom:34px; left:510px; overflow:hidden; zoom:1;} -.focus .btn a{position:relative; display:inline; width:13px; height:13px; border-radius:7px; margin:0 5px;color:#B0B0B0; text-decoration:none; text-align:center; outline:0; float:left; background:#D9D9D9; } -.focus .btn a:hover,.focus .btn a.current{ cursor:pointer;background:#fc114a;} -.focus .fPic{ position:absolute; left:0px; top:0px; } -.focus .D1fBt{ overflow:hidden; zoom:1; height:16px; z-index:10; } -.focus .shadow{ width:100%; position:absolute; bottom:0; left:0px; z-index:10; height:80px; line-height: 80px; background:rgba(0,0,0,0.6); - filter:progid:DXImageTransform.Microsoft.gradient( GradientType = 0,startColorstr = '#80000000',endColorstr = '#80000000')\9; display:block; text-align:left; } -.focus .shadow a{ text-decoration:none; color:#fff; font-size:20px; overflow:hidden; margin-left:10px; } -.focus .fcon{ position:relative; width:100%; float:left; display:none; background:#000 } -.focus .fcon img{ display:block; } -.focus .fbg{bottom:25px; right:40px; position:absolute; height:21px; text-align:center; z-index: 200; } -.focus .fbg div{margin:4px auto 0;overflow:hidden;zoom:1;height:14px} -.focus .D1fBt a{position:relative; display:inline; width:12px; height:12px; border-radius:7px; margin:0 5px;color:#B0B0B0; text-decoration:none; text-align:center; outline:0; float:left; background:#D9D9D9; } -.focus .D1fBt .current,.focus .D1fBt a:hover{background:#fc114a;} -.focus .D1fBt img{display:none} -.focus .D1fBt i{display:none; font-style:normal; } -.focus .prev,.focus .next{position:absolute;width:40px;height:74px;background: url(../images/banner/focus_btn.png) no-repeat;} -.focus .prev{top: 50%;margin-top: -37px; left: 0;background-position:0 -74px; cursor:pointer; } -.focus .next{top: 50%;margin-top: -37px; right: 0; background-position:-40px -74px; cursor:pointer;} -.focus .prev:hover{ background-position:0 0; } -.focus .next:hover{ background-position:-40px 0;} -/* index-news */ -.sn-index-leftbox{ width:820px; background:#fff; margin-bottom:20px;} -.h2-title{ padding:5px 0 3px; border-bottom:1px solid #ebebeb; font-size:18px; color:#777; font-weight:normal; padding-left:17px;} -.h2-title a.more{ font-size:12px; color:#777; float:right; margin-right:17px; line-height:2.8;} -.h2-title a:hover.more{ color:#24366e;} -.sn-news-bigbox{ padding:0px 26px 0px 18px; margin:18px 0 26px; border-right:1px solid #ebebeb;} -.sn-news-bigbox a.h3-title{ font-size:18px; width:380px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;} -.sn-news-bigbox .sn-news-txt{ width:380px; color:#666;} -.sn-news-bigbox .sn-news-bigimg{ width:380px; height:165px;} -.txt-grey{ color:#999;} -.sn-news-smallbox{padding:0px 18px 0px 26px; margin:18px 0 26px; width:350px; } -.sn-news-smallbox .sn-news-smallimg{ width:85px; height:85px; margin-right:10px;} -.sn-news-smallbox a.h4-title{ font-size:14px; width:255px; float:left;} -/* index-resources */ -.sn-index-resourcescon{ padding-top:12px;background:#f2f2f2;} -.sn-index-resourcesbox{ padding:10px; background:#f2f2f2; width:185px; float:left;} -.sn-index-resourcesbox:hover{ background:#fff;} -.sn-index-resourcesbox a.resources-title{ font-size:18px; font-weight:normal; line-height:2.0;width:185px; display:block; border-bottom:1px solid #ccc; margin-bottom:5px;} -.sn-index-resourcesbox a.resources-tag{ font-size:14px; color:#999; margin-right:5px; line-height:1.5;} -a.more-btn{ display:block; width:190px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;} -/* index-partner */ -.sn-index-partnerbox{ padding:25px 30px; } -.sn-index-partnerbox{ width:775px;} -.sn-index-partnerbox ul li{ height:55px;} -.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:370px; height:43px; float:left;} -.partner-btnbox{ width:90px; margin:0 auto;} -.partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;} -.partner-btn:hover{ background-color:#172b65;} -/* index-active */ -.sn-index-activebox{ margin-bottom:20px; background:#fff; padding-bottom:10px;} -.active-title{width:330px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;} -.sn-index-active{ margin:0px 20px 5px 20px;} -.sn-index-active a.sn-activeimg{width:330px; height:210px;} -/* index-wx*/ -.sn-index-wxbox{margin-bottom:20px; background:#fff;} -.sn-index-wximg{ margin:15px; margin-right:5px;} -.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;} -.sn-index-smallbanner img{ display:block; width:369px; height:169px; } - -/* 内页新闻列表 */ -.sn-inner-body{ width:100%; background-color:#fff;} -.sn-innner-content{ width:1200px; margin:0 auto;} -.sn-inner-newsh2{ font-size:20px; font-weight:normal; padding-bottom:5px; border-bottom:1px dashed #eee;} -.sn-circle{ margin:18px 5px 0 5px ;border:1px solid #24366e; width:5px; height:5px; -webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px; } -.sn-inner-newslist ul li{ line-height:42px; font-size:15px; border-bottom:1px solid #eee;} -.sn-inner-newslist a{font-size:15px; color:#888;} -.sn-inner-newslist a:hover{ color:#24366e;} -a.sn-newslist-titile{ font-size:15px;width:840px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;} -a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;} -.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; } -.sn-inner-pages a:hover{ background-color:#24366e; color:#fff;} -a.sn-inner-pages-big{ width:50px;} -a.sn-pages-active{ background-color:#24366e; color:#fff;} -.sn-inner-pages{width:330px; margin:20px auto 10px;} -/* 内页新闻展示 */ -.sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; } -.sn-inner-pcon{text-indent:2em;} -.sn-inner-newscon img{ display:block; width:830px; margin:25px auto 5px;} -.sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;} -.sn-inner-imgp{ color:#000; text-align:center; margin-bottom:30px;} -a.sn-newslist-zan{ display:block; background:url(../images/zan.gif) 0 15px no-repeat; width:54px; height:28px; padding-left:12px; color:#999; } -a:hover.sn-newslist-zan{ background:url(../images/zan.gif) 0 -21px no-repeat; } -/* 留言 */ -.sn-replybox{ margin-bottom:100px;} -.sn-reply-h2{ font-size:18px; font-weight:normal; color:#24366e; margin-bottom:6px;} -.sn-reply-form{ width:1200px;height:180px; border:1px solid #e8e8e8; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#fff; margin-bottom:20px; } -.sn-reply-text{ width:1200px; height:130px; background:#fff; border:none; resize:none;} -.sn-reply-btnbox{border-top:1px solid #e8e8e8; height:48px;} -a.submit-btn{ display:block; color:#fff; text-align:center; font-size:14px; line-height:27px; width:79px; height:27px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#24366e; margin:8px 0 0 10px;} -a:hover.submit-btn{ color:#16275c; color:#fff;} -.sn-comment-h2{ color:#999; font-size:16px; font-weight:normal; border-bottom:1px solid #e8e8e8; padding-bottom:5px;} -.sn-reply-userpic{ height:65px; margin-right:15px;} -.sn-reply-userpic img{ width:40px; height:40px;-webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px;} -a.sn-reply-zan{ display:block; background:url(../images/zan.gif) 0 4px no-repeat; width:54px; height:16px; padding-left:12px; color:#999; } -a:hover.sn-reply-zan{ background:url(../images/zan.gif) 0 -32px no-repeat; } -.sn-comment-listbox{ padding:23px 0; width:1200px;border-bottom:1px solid #e8e8e8;} -a.sn-reply-username { color:#24366e; margin-right:15px; } -.sn-reply-usertxt{ width:1145px; font-size:14px; } -.sn-reply-more{ width:1200px; height:25px; background:#ddd; text-align:center; line-height:25px;} - -/*用户图像*/ -.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px;} -.topnav_login_list a{color:#269ac9;} -.topnav_login_list li{ } -.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;} -.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;} -.none {display: none;} -.user-img,.user-img img{ margin-right:10px; -moz-border-radius: 50px; -webkit-border-radius: 50px;border-radius: 50px; display:block; width:40px; height:40px;} -.ml60{ margin-left:60px;} -.user-img img{border:2px solid #e6473b; } -.user-img img:hover{border:2px solid #29156f;} - -.fr{float: right} - - - - - - - - - - - - +/* CSS Document */ +/* 样式重置 */ +body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;} +body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.9; background:#f2f2f2;} +div,img,tr,td,table{ border:0;} +table,tr,td{border:0;cellspacing:0; cellpadding:0;} +ol,ul,li{ list-style-type:none} +a:link,a:visited{color:#000;text-decoration:none;} +a:hover,a:active{color:#24366e;} + +.sn-fl {float:left;} +.sn-fr {float:right;} +.sn-cl {clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden} +.sn-container {width:100%; background-color:#fff;} +.sn-p-absolute {position:absolute;} +.sn-grey-opacity {background:rgba(230, 230, 230, 0.9)!important; filter:Alpha(opacity=90); background:#e6e6e6;} +.sn-border {border-top:1px solid #dfdfdf; border-bottom:1px solid #dfdfdf;} +/* 公共 */ +.cl {clear:both;} +.fl {float:left;} +.fr {float:right;} +.mb18 {margin-bottom:18px;} +.mt10 {margin-top:10px;} +.mr20 {margin-right:20px;} +.mr10 {margin-right:10px;} + +/*字体，链接颜色*/ +.sn-font-black {color:#000;} +.sn-font-grey {color:#b4bbbf;} +.sn-font-grey2 {color:#5e5e5e;} +.sn-font-grey3 {color:#999;} +a.sn-link-blue {color:#24366e;} +a.sn-link-white {color:#fff;} +a.sn-link-grey {color:#999;} +a.sn-link-grey:hover {color:#24366e;} +a.sn-link-grey2 {color:#888;} +a.sn-link-select {color:#809df9;} +/*字体大小*/ +.sn-f12 {font-size:12px;} +.sn-f14 {font-size:14px;} +.sn-f18 {font-size:18px;} +/*padding&margin*/ +.sn-mt-10 {margin-left:-10px;} +.sn-mt4 {margin-top:4px;} +.sn-mt10 {margin-top:10px;} +.sn-mt13 {margin-top:13px;} +.sn-mt15 {margin-top:15px;} +.sn-mt28 {margin-top:28px;} +.sn-mb40 {margin-bottom:40px;} +.sn-ml15 {margin-left:15px;} +.sn-ml55 {margin-left:55px;} +.sn-mr0 {margin-right:0px !important;} +.sn-mr50 {margin-right:50px;} +/*头部样式*/ +.sn-header {} +.sn-row {width:100%;} +.sn-bg-grey {background-color:#f4f4f4;} +.sn-bg-grey2 {background-color:#a5a5a5;} +.sn-bg-white {background-color:#fff;} +.sn-bg-blue {background-color:#24366e;} +.sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} +.sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} +.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;} +.sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;} +a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;} +.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1;} +.sn-nav li {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;} +.sn-nav li a {display:inline-block; padding:8px 6px; border-radius:5px;} +.sn-nav li a:hover {background-color:#809df9;} +.sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;} +.sn-sub-nav li {color:#999; float:left;} +.sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;} +.sn-sub-nav li a:hover {border-bottom:3px solid #ffbd18; height:37px;} +.sn-subnav-slice {margin:12px 5px;} +.sn-banner {width:1200px; height:210px; margin:0 auto;} +.sn-content-position {width:1200px; height:50px; line-height:50px; vertical-align:middle; font-size:14px; color:#888; margin:0 auto;} +/*footer样式*/ +.sn-footer {width:1200px; height:220px; margin:0 auto; text-align:center; font-size:14px; color:#fff; line-height:normal;} +.sn-footer-link {padding:40px 0 30px 0;} +.sn-footer-link li {display:inline-block;} +.sn-contact {margin-bottom:30px;} +/* 首页内容 */ +.sn-content{ width:1200px; margin:0 auto;} +.sn-content-left{ width:820px; margin-right:12px; margin-bottom:100px;} +.sn-content-right{ width:368px; margin-bottom:74px; } +/* index-banner */ +.sn-index-banner{ width:820px; height:435px; margin-bottom:20px;} +.focus{ position:relative; width:820px; height:435px; background-color: #000; float: left;} +.focus img{ width:820px; height:435px;} +.focus .shadow .title{width: 260px; height: 65px;padding-left: 30px;padding-top: 20px;} +.focus .shadow .title a{ text-decoration:none; color:#fff; font-size:14px; font-weight:bolder; overflow:hidden; } +.focus .btn{ position:absolute; bottom:34px; left:510px; overflow:hidden; zoom:1;} +.focus .btn a{position:relative; display:inline; width:13px; height:13px; border-radius:7px; margin:0 5px;color:#B0B0B0; text-decoration:none; text-align:center; outline:0; float:left; background:#D9D9D9; } +.focus .btn a:hover,.focus .btn a.current{ cursor:pointer;background:#fc114a;} +.focus .fPic{ position:absolute; left:0px; top:0px; } +.focus .D1fBt{ overflow:hidden; zoom:1; height:16px; z-index:10; } +.focus .shadow{ width:100%; position:absolute; bottom:0; left:0px; z-index:10; height:80px; line-height: 80px; background:rgba(0,0,0,0.6); + filter:progid:DXImageTransform.Microsoft.gradient( GradientType = 0,startColorstr = '#80000000',endColorstr = '#80000000')\9; display:block; text-align:left; } +.focus .shadow a{ text-decoration:none; color:#fff; font-size:20px; overflow:hidden; margin-left:10px; } +.focus .fcon{ position:relative; width:100%; float:left; display:none; background:#000 } +.focus .fcon img{ display:block; } +.focus .fbg{bottom:25px; right:40px; position:absolute; height:21px; text-align:center; z-index: 200; } +.focus .fbg div{margin:4px auto 0;overflow:hidden;zoom:1;height:14px} +.focus .D1fBt a{position:relative; display:inline; width:12px; height:12px; border-radius:7px; margin:0 5px;color:#B0B0B0; text-decoration:none; text-align:center; outline:0; float:left; background:#D9D9D9; } +.focus .D1fBt .current,.focus .D1fBt a:hover{background:#fc114a;} +.focus .D1fBt img{display:none} +.focus .D1fBt i{display:none; font-style:normal; } +.focus .prev,.focus .next{position:absolute;width:40px;height:74px;background: url(../images/banner/focus_btn.png) no-repeat;} +.focus .prev{top: 50%;margin-top: -37px; left: 0;background-position:0 -74px; cursor:pointer; } +.focus .next{top: 50%;margin-top: -37px; right: 0; background-position:-40px -74px; cursor:pointer;} +.focus .prev:hover{ background-position:0 0; } +.focus .next:hover{ background-position:-40px 0;} +/* index-news */ +.sn-index-leftbox{ width:820px; background:#fff; margin-bottom:20px;} +.h2-title{ padding:5px 0 3px; border-bottom:1px solid #ebebeb; font-size:18px; color:#777; font-weight:normal; padding-left:17px;} +.h2-title a.more{ font-size:12px; color:#777; float:right; margin-right:17px; line-height:2.8;} +.h2-title a:hover.more{ color:#24366e;} +.sn-news-bigbox{ padding:0px 26px 0px 18px; margin:18px 0 26px; border-right:1px solid #ebebeb;} +.sn-news-bigbox a.h3-title{ font-size:18px; width:380px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;} +.sn-news-bigbox .sn-news-txt{ width:380px; color:#666;} +.sn-news-bigbox .sn-news-bigimg{ width:380px; height:165px;} +.txt-grey{ color:#999;} +.sn-news-smallbox{padding:0px 18px 0px 26px; margin:18px 0 26px; width:350px; } +.sn-news-smallbox .sn-news-smallimg{ width:85px; height:85px; margin-right:10px;} +.sn-news-smallbox a.h4-title{ font-size:14px; width:255px; float:left;} +/* index-resources */ +.sn-index-resourcescon{ padding-top:12px;background:#f2f2f2;} +.sn-index-resourcesbox{ padding:10px; background:#f2f2f2; width:185px; float:left;} +.sn-index-resourcesbox:hover{ background:#fff;} +.sn-index-resourcesbox a.resources-title{ font-size:18px; font-weight:normal; line-height:2.0;width:185px; display:block; border-bottom:1px solid #ccc; margin-bottom:5px;} +.sn-index-resourcesbox a.resources-tag{ font-size:14px; color:#999; margin-right:5px; line-height:1.5;} +a.more-btn{ display:block; width:190px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;} +/* index-partner */ +.sn-index-partnerbox{ padding:25px 30px; } +.sn-index-partnerbox{ width:775px;} +.sn-index-partnerbox ul li{ height:55px;} +.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:370px; height:43px; float:left;} +.partner-btnbox{ width:90px; margin:0 auto;} +.partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;} +.partner-btn:hover{ background-color:#172b65;} +/* index-active */ +.sn-index-activebox{ margin-bottom:20px; background:#fff; padding-bottom:10px;} +.active-title{width:330px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;} +.sn-index-active{ margin:0px 20px 5px 20px;} +.sn-index-active a.sn-activeimg{width:330px; height:210px;} +/* index-wx*/ +.sn-index-wxbox{margin-bottom:20px; background:#fff;} +.sn-index-wximg{ margin:15px; margin-right:5px;} +.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;} +.sn-index-smallbanner img{ display:block; width:369px; height:169px; } + +/* 内页新闻列表 */ +.sn-inner-body{ width:100%; background-color:#fff;} +.sn-innner-content{ width:1200px; margin:0 auto;} +.sn-inner-newsh2{ font-size:20px; font-weight:normal; padding-bottom:5px; border-bottom:1px dashed #eee;} +.sn-circle{ margin:18px 5px 0 5px ;border:1px solid #24366e; width:5px; height:5px; -webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px; } +.sn-inner-newslist ul li{ line-height:42px; font-size:15px; border-bottom:1px solid #eee;} +.sn-inner-newslist a{font-size:15px; color:#888;} +.sn-inner-newslist a:hover{ color:#24366e;} +a.sn-newslist-titile{ font-size:15px;width:840px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;} +a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;} +.sn-inner-pages a{ display:block; font-size:12px; border:1px solid #d1d1d1; color:#999; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; } +.sn-inner-pages a:hover{ background-color:#24366e; color:#fff;} +a.sn-inner-pages-big{ width:50px;} +a.sn-pages-active{ background-color:#24366e; color:#fff;} +.sn-inner-pages{width:330px; margin:40px auto 100px;} +/* 内页新闻展示 */ +.sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; } +.sn-inner-pcon{text-indent:2em;} +.sn-inner-newscon img{ display:block; width:830px; margin:25px auto 5px;} +.sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;} +.sn-inner-imgp{ color:#000; text-align:center; margin-bottom:30px;} +a.sn-newslist-zan{ display:block; background:url(../images/zan.gif) 0 15px no-repeat; width:54px; height:28px; padding-left:12px; color:#999; } +a:hover.sn-newslist-zan{ background:url(../images/zan.gif) 0 -21px no-repeat; } +/* 留言 */ +.sn-replybox{ margin-bottom:100px;} +.sn-reply-h2{ font-size:18px; font-weight:normal; color:#24366e; margin-bottom:6px;} +.sn-reply-form{ width:1200px;height:180px; border:1px solid #e8e8e8; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#fff; margin-bottom:20px; } +.sn-reply-text{ width:1200px; height:130px; background:#fff; border:none; resize:none;} +.sn-reply-btnbox{border-top:1px solid #e8e8e8; height:48px;} +a.submit-btn{ display:block; color:#fff; text-align:center; font-size:14px; line-height:27px; width:79px; height:27px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#24366e; margin:8px 0 0 10px;} +a:hover.submit-btn{ color:#16275c; color:#fff;} +.sn-comment-h2{ color:#999; font-size:16px; font-weight:normal; border-bottom:1px solid #e8e8e8; padding-bottom:5px;} +.sn-reply-userpic{ height:65px; margin-right:15px;} +.sn-reply-userpic img{ width:40px; height:40px;-webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px;} +a.sn-reply-zan{ display:block; background:url(../images/zan.gif) 0 4px no-repeat; width:54px; height:16px; padding-left:12px; color:#999; } +a:hover.sn-reply-zan{ background:url(../images/zan.gif) 0 -32px no-repeat; } +.sn-comment-listbox{ padding:23px 0; width:1200px;border-bottom:1px solid #e8e8e8;} +a.sn-reply-username { color:#24366e; margin-right:15px; } +.sn-reply-usertxt{ width:1145px; font-size:14px; } +.sn-reply-more{ width:1200px; height:25px; background:#ddd; text-align:center; line-height:25px;} + +/*用户图像*/ +.topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px;} +.topnav_login_list a{color:#269ac9;} +.topnav_login_list li{ } +.homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block; line-height:0;} +.homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;} +.none {display: none;} +.user-img,.user-img img{ margin-right:10px; -moz-border-radius: 50px; -webkit-border-radius: 50px;border-radius: 50px; display:block; width:40px; height:40px;} +.ml60{ margin-left:60px;} +.user-img img{border:2px solid #e6473b; } +.user-img img:hover{border:2px solid #29156f;} + + + + + + + + + + + + From 9ba0d50f26589c4233e009c1eb6ecf33992eb2e6 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 26 Apr 2016 10:16:23 +0800 Subject: [PATCH 16/33] =?UTF-8?q?=E6=8B=89=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/organizations_helper.rb | 221 ++++++++------- app/views/organizations/_org_content.html.erb | 259 ++++++++++++++++++ .../organizations/_subfield_list.html.erb | 4 +- 3 files changed, 382 insertions(+), 102 deletions(-) create mode 100644 app/views/organizations/_org_content.html.erb diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 03a61a65f..e42bae220 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -1,100 +1,121 @@ -# encoding: utf-8 -module OrganizationsHelper - include ApplicationHelper - include FilesHelper - - - def find_user_not_in_current_org_by_name org - if params[:q] && params[:q].lstrip.rstrip != "" - scope = Principal.active.sorted.not_member_of_org(org).like(params[:q]) - else - scope = [] - end - principals = paginateHelper scope,10 - s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals') - links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| - link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true - } - s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" ) - end - - def get_default_name field - case field.name - when 'activity' then - return '动态' - when 'course' then - return '课程' - when 'project' then - return '项目' - end - end - - def get_message_org(org_id, field_id) - OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and org_subfield_id = #{field_id} and parent_id is null order by updated_at desc limit 8;") - end - - def get_message_reply_org(org_id, ids) - # OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and parent_id is not null order by updated_at desc limit 1;") - OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and parent_id in (#{ids}) order by updated_at desc limit 1;") - end - - def get_attach_org(field_id) - Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;") - end - - def get_attach_org2(field) - org_attachments = field.attachments - attachments = User.current.admin? ? org_attachments : visable_attachemnts(org_attachments) - return attachments.sort_by{|x| x.created_on}.reverse.first(6) - # Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;") - end - - # 从内容中获取路径 - def get_image_path_from_content content - r = Regexp.new(/src="\/files\/uploads\/image(.+?)"/) - if r.match(content).nil? - image_path = nil - else - image_path = r.match(content)[1] - end - end - - #排列下拉框 - def subfield_status_option - type = [] - option1 = [] - option1 << "左上" - option1 << "1" - type << option1 - option2 = [] - option2 << "左中一" - option2 << "2" - type << option2 - option3 = [] - option3 << "左中二" - option3 << "3" - type << option3 - option4 = [] - option4 << "左中下" - option4 << "4" - type << option4 - option5 = [] - option5 << "左下" - option5 << "5" - type << option5 - option6 = [] - option6 << "右上" - option6 << "6" - type << option6 - option7 = [] - option7 << "右中" - option7 << "7" - type << option7 - option8 = [] - option8 << "右下" - option8 << "8" - type << option8 - type - end - -end +# encoding: utf-8 +module OrganizationsHelper + include ApplicationHelper + include FilesHelper + + + def find_user_not_in_current_org_by_name org + if params[:q] && params[:q].lstrip.rstrip != "" + scope = Principal.active.sorted.not_member_of_org(org).like(params[:q]) + else + scope = [] + end + principals = paginateHelper scope,10 + s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals') + links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options| + link_to text, org_member_autocomplete_org_member_index_path( parameters.merge(:q => params[:q],:flag => true,:org=>org, :format => 'js')), :remote => true + } + s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" ) + end + + def get_default_name field + case field.name + when 'activity' then + return '动态' + when 'course' then + return '课程' + when 'project' then + return '项目' + end + end + + def get_message_org(org_id, field_id) + OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and org_subfield_id = #{field_id} and parent_id is null order by updated_at desc limit 8;") + end + + def get_message_reply_org(org_id, ids) + # OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and parent_id is not null order by updated_at desc limit 1;") + OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and parent_id in (#{ids}) order by updated_at desc limit 1;") + end + + def get_attach_org(field_id) + Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;") + end + + def get_attach_org2(field) + org_attachments = field.attachments + attachments = User.current.admin? ? org_attachments : visable_attachemnts(org_attachments) + return attachments.sort_by{|x| x.created_on}.reverse.first(6) + # Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;") + end + + # 从内容中获取路径 + def get_image_path_from_content content + r = Regexp.new(/src="\/files\/uploads\/image(.+?)"/) + if r.match(content).nil? + image_path = nil + else + image_path = r.match(content)[1] + end + end + + #排列下拉框 + def subfield_status_option + type = [] + option1 = [] + option1 << "左上" + option1 << "1" + type << option1 + option2 = [] + option2 << "中一" + option2 << "2" + type << option2 + option3 = [] + option3 << "中二" + option3 << "3" + type << option3 + option4 = [] + option4 << "中下" + option4 << "4" + type << option4 + option5 = [] + option5 << "左下" + option5 << "5" + type << option5 + option6 = [] + option6 << "右上" + option6 << "6" + type << option6 + option7 = [] + option7 << "右中" + option7 << "7" + type << option7 + option8 = [] + option8 << "右下" + option8 << "8" + type << option8 + type + end + + def subfield_list_type subfield + case subfield.to_i + when 1 + resulet = "左上" + when 2 + resulet = "中一" + when 3 + resulet = "中二" + when 4 + resulet = "中下" + when 5 + resulet = "左下" + when 6 + resulet = "右上" + when 7 + resulet = "右中" + when 8 + resulet = "右下" + end + end + +end diff --git a/app/views/organizations/_org_content.html.erb b/app/views/organizations/_org_content.html.erb new file mode 100644 index 000000000..c7d53356c --- /dev/null +++ b/app/views/organizations/_org_content.html.erb @@ -0,0 +1,259 @@ + +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> + <% if field.status.to_i == 1 %> + + <% elsif field.status.to_i == 2 %> + + <% elsif field.status.to_i == 3 %> + + <% elsif field.status.to_i == 4 %> + + <% elsif field.status.to_i == 5 %> + + <% elsif field.status.to_i == 6 %> + + <% end %> +
+ <% if field.status == 0 %> +
+

课程动态

+ <% if @course_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + <% unless @course_acts.nil? %> + <%= render :partial => 'organizations/org_new_course_pic', :locals => {:activities => @course_acts.first(3)} %> + <% end %> +
    + <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
    +
+
+ <% end %> +
+ <% else %> +
+

课程动态

+ <% if @course_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %> + +
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + + +
+ <% end %> +
+ <% when 'project' %> +
+ <% if field.status == 0 %> +
+

项目动态

+ <% if @project_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + <% unless @project_acts.nil? %> + <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts.first(3)} %> + <% end %> +
    + <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
    +
+
+ <% end %> + +
+ <% else %> +
+

项目动态

+ <% if @project_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %> + +
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + +
+ <% end %> +
+ <% end %> +<% else %> + <% if field.field_type == "Post" %> <%# 讨论类型 %> + <% org_subfield = OrgSubfield.find(field.id) %> + <% org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0 %> + <% org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc') %> + <%# message_ats = get_message_org(@organization.id, field.id) %> + <%# ids = field.org_document_comments.map{|o| o.id}.join(",") %> +
+ <% if field.status == 0 %> +
+

<%= field.name %>

+ <% if org_acts.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + + <% org_acts.first(3).each do |act| %> + <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %> + <% end %> +
    +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+
+ <% end %> + +
+ <% else %> +
+

<%= field.name %>

+ <% if org_acts.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> +
+ <% else %> +
+ <% org_acts.each do |act| %> + <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %> + <% end %> + +
+
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> +
+ <% end %> + +
+
+ <% end %> +
+ <% elsif field.field_type == "Resource" %> + <% org_attachs = get_attach_org2(field) %> +
+
+

<%= field.name %>

+ <% if org_attachs.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %> + +
+ +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + +
+
+
+
+ <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index 2c679eb3d..7db41cba5 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -27,7 +27,7 @@ 默认 <% else %> <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %> -
+
<%= select( :name,:group_id, subfield_status_option, @@ -63,7 +63,7 @@ 列表 <% else %> <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %> -
+
<%= select( :name,:group_id, subfield_status_option, From d8f71da1fbcf9c15765b9d4bf499b3e9c507430b Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 26 Apr 2016 11:01:12 +0800 Subject: [PATCH 17/33] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A8=A1=E5=9D=978?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/organizations_helper.rb | 8 + app/views/layouts/base_org2.html.erb | 21 +- app/views/organizations/_org_content.html.erb | 259 ------------------ .../_org_subfield_leftD.html.erb | 0 .../_org_subfield_leftM1.html.erb | 0 .../_org_subfield_leftM2.html.erb | 0 .../_org_subfield_leftMD.html.erb | 0 .../_org_subfield_leftT.html.erb | 0 .../_org_subfield_rightD.html.erb | 73 +++++ .../_org_subfield_rightM.html.erb | 0 .../_org_subfield_rightT.html.erb | 0 public/images/default_blank/ad-default.jpg | Bin 0 -> 22474 bytes .../images/default_blank/banner-default.jpg | Bin 0 -> 25898 bytes public/images/default_blank/default-img2.jpg | Bin 0 -> 21630 bytes public/images/default_blank/files-default.jpg | Bin 0 -> 15907 bytes public/images/default_blank/left-act.jpg | Bin 0 -> 16187 bytes public/images/default_blank/left-act2.jpg | Bin 0 -> 13595 bytes public/images/default_blank/right-top.jpg | Bin 0 -> 17302 bytes 18 files changed, 92 insertions(+), 269 deletions(-) create mode 100644 app/views/organizations/_org_subfield_leftD.html.erb create mode 100644 app/views/organizations/_org_subfield_leftM1.html.erb create mode 100644 app/views/organizations/_org_subfield_leftM2.html.erb create mode 100644 app/views/organizations/_org_subfield_leftMD.html.erb create mode 100644 app/views/organizations/_org_subfield_leftT.html.erb create mode 100644 app/views/organizations/_org_subfield_rightD.html.erb create mode 100644 app/views/organizations/_org_subfield_rightM.html.erb create mode 100644 app/views/organizations/_org_subfield_rightT.html.erb create mode 100644 public/images/default_blank/ad-default.jpg create mode 100644 public/images/default_blank/banner-default.jpg create mode 100644 public/images/default_blank/default-img2.jpg create mode 100644 public/images/default_blank/files-default.jpg create mode 100644 public/images/default_blank/left-act.jpg create mode 100644 public/images/default_blank/left-act2.jpg create mode 100644 public/images/default_blank/right-top.jpg diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 6db9b15a0..3fdfc3aa0 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -118,4 +118,12 @@ module OrganizationsHelper end end + + def get_subfield_acts field + org_subfield = OrgSubfield.find(field.id) + org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0 + org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc') + org_acts + end + end diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 710d6dd02..a3544db49 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -127,12 +127,15 @@
+<%# 更新访问数,刷新的时候更新访问次数 %> +<% update_visiti_count @organization %> +<%# over %>
<% @subfield_content.each do |field| %> <% if field.status.to_i == 1 %> -
+
@@ -188,7 +191,7 @@
<% elsif field.status.to_i == 2 %> -
+

业界动态更多

@@ -200,7 +203,7 @@
<% elsif field.status.to_i == 3 %> -
+

北斗开放实验室迎湖南省省直机关领导调研参观

@@ -229,7 +232,7 @@
<% elsif field.status.to_i == 4 %> -
+

北斗资源更多

@@ -281,7 +284,7 @@
<% elsif field.status.to_i == 5 %> -
+

合作伙伴更多

    @@ -309,7 +312,7 @@
    <% @subfield_content.each do |field| %> <% if field.status.to_i == 6 %> -
    +

    最新活动展示更多

    @@ -333,7 +336,7 @@
    <% elsif field.status.to_i == 7 %> -
    +

    关注北斗

    @@ -342,9 +345,7 @@
    <% elsif field.status.to_i == 8 %> -
    - -
    + <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %> <% end %> <% end %>
    diff --git a/app/views/organizations/_org_content.html.erb b/app/views/organizations/_org_content.html.erb index afcbffd02..e69de29bb 100644 --- a/app/views/organizations/_org_content.html.erb +++ b/app/views/organizations/_org_content.html.erb @@ -1,259 +0,0 @@ - -<% if is_default_field?(field) %> - <% case field.name %> - <% when 'course' %> - <% if field.status.to_i == 1 %> - - <% elsif field.status.to_i == 2 %> - - <% elsif field.status.to_i == 3 %> - - <% elsif field.status.to_i == 4 %> - - <% elsif field.status.to_i == 5 %> - - <% elsif field.status.to_i == 6 %> - - <% end %> -
    - <% if field.status == 0 %> -
    -

    课程动态

    - <% if @course_acts.blank? %> - -
    - <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% else %> -
    -
      - <% unless @course_acts.nil? %> - <%= render :partial => 'organizations/org_new_course_pic', :locals => {:activities => @course_acts.first(3)} %> - <% end %> -
      - <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> -
      -
    -
    - <% end %> -
    - <% else %> -
    -

    课程动态

    - <% if @course_acts.blank? %> - -
    - <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% else %> -
    - <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %> - -
    -
    - <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% end %> - - -
    - <% end %> -
    - <% when 'project' %> -
    - <% if field.status == 0 %> -
    -

    项目动态

    - <% if @project_acts.blank? %> - -
    - <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% else %> -
    -
      - <% unless @project_acts.nil? %> - <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts.first(3)} %> - <% end %> -
      - <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> -
      -
    -
    - <% end %> - -
    - <% else %> -
    -

    项目动态

    - <% if @project_acts.blank? %> - -
    - <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% else %> -
    - <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %> - -
    -
    - <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% end %> - -
    - <% end %> -
    - <% end %> -<% else %> - <% if field.field_type == "Post" %> <%# 讨论类型 %> - <% org_subfield = OrgSubfield.find(field.id) %> - <% org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0 %> - <% org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc') %> - <%# message_ats = get_message_org(@organization.id, field.id) %> - <%# ids = field.org_document_comments.map{|o| o.id}.join(",") %> -
    - <% if field.status == 0 %> -
    -

    <%= field.name %>

    - <% if org_acts.blank? %> - -
    - <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> - <% else %> - <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> - <% end %> - <% else %> - <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> - <% end %> - - <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% else %> -
    -
      - - <% org_acts.first(3).each do |act| %> - <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %> - <% end %> -
      -
    - <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> - <% else %> - <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> - <% end %> - <% else %> - <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> - <% end %> - <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> -
    -
    - <% end %> - -
    - <% else %> -
    -

    <%= field.name %>

    - <% if org_acts.blank? %> - -
    - <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> - <% else %> - <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> - <% end %> - <% else %> - <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> - <% end %> -
    - <% else %> -
    - <% org_acts.each do |act| %> - <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %> - <% end %> - -
    -
    - <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> - <% else %> - <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> - <% end %> - <% else %> - <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> - <% end %> -
    - <% end %> - -
    -
    - <% end %> -
    - <% elsif field.field_type == "Resource" %> - <% org_attachs = get_attach_org2(field) %> -
    -
    -

    <%= field.name %>

    - <% if org_attachs.blank? %> - -
    - <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> - <% else %> - <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> - <% end %> - <% else %> - <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> - <% end %> - <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% else %> -
    - <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %> - -
    - -
    - <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> - <% else %> - <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> - <% end %> - <% else %> - <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> - <% end %> - <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> -
    - <% end %> - -
    -
    -
    -
    - <% end %> -<% end %> \ No newline at end of file diff --git a/app/views/organizations/_org_subfield_leftD.html.erb b/app/views/organizations/_org_subfield_leftD.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/_org_subfield_leftM2.html.erb b/app/views/organizations/_org_subfield_leftM2.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/_org_subfield_leftT.html.erb b/app/views/organizations/_org_subfield_leftT.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/_org_subfield_rightD.html.erb b/app/views/organizations/_org_subfield_rightD.html.erb new file mode 100644 index 000000000..7bc2d565d --- /dev/null +++ b/app/views/organizations/_org_subfield_rightD.html.erb @@ -0,0 +1,73 @@ +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> +

    暂无内容！

    + <% when 'project' %> +

    暂无内容！

    + <% end %> +<% else %> + <% if field.field_type == "Post" %> <%# 讨论类型 %> + <% org_acts = get_subfield_acts field %> + <% unless org_acts.blank? %> + <% activity = org_acts.first %> +
    + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %> + <% end %> + <% elsif activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.board.org_subfield_id %> + <% iamge_path = get_image_path_from_content(content) %> + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %> + <% end %> + <% else %> + <% iamge_path = get_image_path_from_content(content) %> + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %> + <% end %> + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %> + <% end %> + <% end %> + <% end %> +
    + <% else %> +
    + +
    + <% end %> + <% elsif field.field_type == "Resource" %> + <% org_attachs = get_attach_org2(field) %> +
    + <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> + <% end %> + <% else %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> +
    + <% end %> +<% end %> diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/_org_subfield_rightT.html.erb b/app/views/organizations/_org_subfield_rightT.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/public/images/default_blank/ad-default.jpg b/public/images/default_blank/ad-default.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7707775d689fd752016a25fb45cdf839dbd7c305 GIT binary patch literal 22474 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 GPyPo5W!)hF literal 0 HcmV?d00001 diff --git a/public/images/default_blank/banner-default.jpg b/public/images/default_blank/banner-default.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1debf41a820bdf9d70d6447fd99b3ff28614966d GIT binary patch literal 25898 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 Dls*g( literal 0 HcmV?d00001 diff --git a/public/images/default_blank/default-img2.jpg b/public/images/default_blank/default-img2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8d194d605ed72b16f34f9216b7eb4dd1e927d9da GIT binary patch literal 21630 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

    M?yePDmV^@A4r8sNdr>BaR?qw1t*d5u)qls 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 literal 0 HcmV?d00001 diff --git a/public/images/default_blank/left-act2.jpg b/public/images/default_blank/left-act2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7f105cb1cfe041af7254e892d503d1814a4d3ab2 GIT binary patch literal 13595 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 N9Ci6oH|W0o{{VP9c=G@N literal 0 HcmV?d00001 diff --git a/public/images/default_blank/right-top.jpg b/public/images/default_blank/right-top.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5918192487b9ba555c5c844c10a30cd3c49afda1 GIT binary patch literal 17302 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 AApigX literal 0 HcmV?d00001 From 32d7927eb9b6f9ce7611c25973c1052bd8bca750 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 26 Apr 2016 11:06:18 +0800 Subject: [PATCH 18/33] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=B0=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 117 ++++++++++++--------------- 1 file changed, 53 insertions(+), 64 deletions(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 1120aeada..5e05dae44 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -93,52 +93,38 @@ <% @subfield_content.each do |field| %> <% if is_default_field?(field) %> <% case field.name %> - <% when 'activity' %> + <% when 'activity' %>

  • - <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %> + <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
    • <% when 'course' %>
  • - 课程动态 + 课程动态
    • <% when 'project' %>
  • - 项目动态 + 项目动态
    • <% end %> <% else %> <% if field.field_type == "Post" && field.hide == 0 %>
  • - <%= field.name %> + <%= field.name %>
    • <% elsif field.field_type == "Resource" && field.hide == 0 %>
  • - <%= field.name %> + <%= field.name %>
    • <% end %> <% end %> <% end %> <% if User.current.admin_of_org?(@organization) %>
  • - 配置 + 配置
    • <% end %>
- - - - - - - - - - - - - -
<%# 更新访问数,刷新的时候更新访问次数 %> @@ -147,6 +133,8 @@
+ <% @subfield_content.each do |field| %> + <% if field.status.to_i == 1 %>
@@ -202,7 +190,7 @@
- + <% elsif field.status.to_i == 2 %>

业界动态更多

@@ -214,36 +202,36 @@

2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......

-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
+ <% elsif field.status.to_i == 3 %> +
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
-
- - +
+
+ <% elsif field.status.to_i == 4 %>

北斗资源更多

@@ -295,19 +283,18 @@
- - + <% elsif field.status.to_i == 5 %>

合作伙伴更多

  • - - + +
  • - - + +
@@ -318,12 +305,13 @@
- + <% end %> + <% end %>
- - - +
+ <% @subfield_content.each do |field| %> + <% if field.status.to_i == 6 %>

最新活动展示更多

@@ -343,11 +331,11 @@
-

北斗第二次工作会议在北京召开

+

北斗第二次工作会议在北京召开

2016-04-08
- + <% elsif field.status.to_i == 7 %>

关注北斗

@@ -356,10 +344,11 @@
- + <% elsif field.status.to_i == 8 %> <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %> + <% end %> + <% end %>
-
From 43c1120b19fccb5d4d5ab1558ae4cb3ed879b531 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 26 Apr 2016 15:10:47 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=97=AE=E7=AD=94?= =?UTF-8?q?=E5=8C=BA=20=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/blogs_controller.rb | 1 + app/controllers/boards_controller.rb | 44 +++++++---- app/controllers/users_controller.rb | 2 - app/views/blogs/_article.html.erb | 14 +++- app/views/boards/_course_show_detail.html.erb | 40 +--------- .../boards/_project_show_detail.html.erb | 59 +------------- app/views/boards/show.js.erb | 2 +- app/views/layouts/new_base_user.html.erb | 60 +++++++-------- app/views/users/_course_boardlist.html.erb | 77 +++++++++++++++++++ app/views/users/_course_message.html.erb | 5 +- app/views/users/_project_boardlist.html.erb | 77 +++++++++++++++++++ app/views/users/_user_course_list.html.erb | 8 +- public/stylesheets/courses.css | 28 +++++++ 13 files changed, 266 insertions(+), 151 deletions(-) create mode 100644 app/views/users/_course_boardlist.html.erb create mode 100644 app/views/users/_project_boardlist.html.erb diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb index 3305713e7..63b0da009 100644 --- a/app/controllers/blogs_controller.rb +++ b/app/controllers/blogs_controller.rb @@ -25,6 +25,7 @@ class BlogsController < ApplicationController if @order.to_i == 2 @type = 2 @b_sort == 1 ? @topics = @topics.sort{|x,y| get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) <=> get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) } : @topics = @topics.sort{|x,y| get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) <=> get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) } + @topics = @topics.sort{|x,y| y.sticky <=> x.sticky} else @type = 1 end diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index a77346d89..124342041 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -62,13 +62,24 @@ class BoardsController < ApplicationController else render_403 end - end - end def show # 讨论区消息状态更新（已读和未读） + @order, @b_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1 + + #确定 sort_type 1升序 2 降序 + if @order.to_i == @type.to_i + @b_sort = @b_sort.to_i == 1 ? 2 : 1 + else + @b_sort = 2 + end + + sort_name = "updated_at" + + sort_type = @b_sort == 1 ? "asc" : "desc" + if @project ForgeMessage.where("user_id =? and project_id =? and viewed =?", User.current.id, @project.id, 0).update_all(:viewed => true) # 更新@消息为已读 @@ -82,10 +93,10 @@ class BoardsController < ApplicationController CourseMessage.where("user_id =? and course_id =? and viewed =?", User.current.id, @course.id, 0).update_all(:viewed => true) end - sort_init 'updated_on', 'desc' - sort_update 'created_on' => "#{Message.table_name}.created_on", - 'replies' => "#{Message.table_name}.replies_count", - 'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)" + # sort_init 'updated_on', 'desc' + # sort_update 'created_on' => "#{Message.table_name}.created_on", + # 'replies' => "#{Message.table_name}.replies_count", + # 'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)" @is_new = params[:is_new] @topic_count = @board ? @board.topics.count : 0 @@ -93,26 +104,31 @@ class BoardsController < ApplicationController if @board limit = 10; @topic_count = @board.topics.count(); - @topic_pages = (params[:page] ? params[:page].to_i + 1 : 0) *10 - @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) desc"). - limit(limit).offset(@topic_pages).includes(:last_reply). + @topic_pages = 0#(params[:page] ? params[:page].to_i + 1 : 0) *10 + @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) #{sort_type}"). + offset(@topic_pages).includes(:last_reply). preload(:author, {:last_reply => :author}).all(); else @topics = []; end elsif @course if (@board) - limit = 10; @topic_count = @board.topics.count(); - @topic_pages = (params[:page] ? params[:page].to_i + 1 : 0) *10 - @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) desc"). - limit(limit).offset(@topic_pages).includes(:last_reply). - preload(:author, {:last_reply => :author}).all(); + @topic_pages = 0 #(params[:page] ? params[:page].to_i + 1 : 0) *10 + @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) #{sort_type}").offset(@topic_pages).includes(:last_reply).preload(:author, {:last_reply => :author}).all(); else @topics = []; end end + #分页 + @limit = 10 + @is_remote = true + @atta_count = @topics.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset + @topics = paginateHelper @topics,@limit + @page = params[:page] ? params[:page].to_i + 1 : 0 @message = Message.new(:board => @board) #modify by nwb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8f80190bf..54b19a3e6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2848,7 +2848,6 @@ class UsersController < ApplicationController def user_courselist @order, @c_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1 - #确定 sort_type if @order.to_i == @type.to_i @c_sort = @c_sort.to_i == 1 ? 2 : 1 #1升序 2降序 @@ -2871,7 +2870,6 @@ class UsersController < ApplicationController @type = 2 @courses.each do |course| course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count) : (course.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(course).count) - puts course[:infocount] end @c_sort == 1 ? (@courses = @courses.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@courses = @courses.sort{|x,y| y[:infocount] <=> x[:infocount]}) else diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 1b9ef992e..9ec17bf90 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -4,13 +4,13 @@

博客列表

排序： - <%= link_to "时间", {:controller => 'blogs', :action => 'index', :id =>@user.id, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> + <%= link_to "时间", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <% if @type.to_i == 1 %> - <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user.id, :type => @type, :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> <% end %> - <%= link_to "人气", {:controller => 'blogs', :action => 'index', :id =>@user.id, :type => @type, :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %> + <%= link_to "人气", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %> <% if @type.to_i == 2 %> - <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user.id, :type => @type, :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <%= link_to "", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> <% end %>
@@ -27,6 +27,12 @@ <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> [已设为首页] <% end %> + <% if activity.sticky == 1 %> + 顶 + <% end%> + <% if activity.locked %> + 锁 + <% end %>
<% count=0 %> diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb index d465571c5..64654f517 100644 --- a/app/views/boards/_course_show_detail.html.erb +++ b/app/views/boards/_course_show_detail.html.erb @@ -2,41 +2,7 @@ <%= import_ke(enable_at: false, prettify: false) %> <%= javascript_include_tag "create_kindeditor" %> <% end %> -<% if topics %> - <% topics.each do |topic| %> - - <% if topic %> - <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id, :is_course => 1, :is_board=>1} %> - <% end %> - <% end %> - - <% if topics.count == 10 %> - <%= link_to "点击展开更多",boards_topic_path(@board, :course_id => @board.course.id ,:page => page),:id => "show_more_course_topic",:remote => "true",:class => "loadMore mt10 f_grey"%> - <% end %> -<% end%> +<% if @topics || topics %> + <%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics ? @topics: topics , :is_course => 1, :is_board=>1} %> +<% end %> \ No newline at end of file diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb index 1d5cc3b75..260fb88c1 100644 --- a/app/views/boards/_project_show_detail.html.erb +++ b/app/views/boards/_project_show_detail.html.erb @@ -2,60 +2,7 @@ <%= import_ke(enable_at: false, prettify: false) %> <%= javascript_include_tag "create_kindeditor" %> <% end %> - -<% if topics%> - <% topics.each do |topic| %> - - <% if topic %> - <%= render :partial => 'users/project_message', :locals => {:activity => topic, :user_activity_id => topic.id,:is_course=>1,:is_board=>1} %> - <% end %> - <% end %> - - <% if topics.count == 10 %> - - <%= link_to "点击展开更多", boards_topic_path(@board, :project_id => @board.project.id ,:page => page), :id => "show_more_project_topic",:remote => "true",:class => "loadMore mt10 f_grey"%> - <% end %> -<% end%> - - +<%if @topics || topics %> + <%= render :partial => 'users/project_boardlist', :locals => {:topics => @topics ? @topics: topics , :is_course => 1, :is_board=>1} %> +<% end %> \ No newline at end of file diff --git a/app/views/boards/show.js.erb b/app/views/boards/show.js.erb index c9208fd2c..c842197c7 100644 --- a/app/views/boards/show.js.erb +++ b/app/views/boards/show.js.erb @@ -1,5 +1,5 @@ <% if @course %> - $("#show_more_course_topic").replaceWith("<%= escape_javascript( render :partial => 'boards/course_show_detail',:locals => {:topics => @topics, :page => @page} )%>"); + <%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1} %> <% else %> $("#show_more_project_topic").replaceWith("<%= escape_javascript( render :partial => 'boards/project_show_detail',:locals => {:topics => @topics, :page => @page} )%>"); <% end %> \ No newline at end of file diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 0d40bb946..6fb880ed8 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -105,13 +105,13 @@
<%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %> <% if User.current.logged?%> - <% if is_current_user%> -
-
- -
-
- <% end %> + <% if is_current_user%> +
+
+ +
+
+ <% end %> <% end%>
@@ -189,7 +189,8 @@ <% unvisiable = hidden_courses && hidden_courses.value == "1"%> <% if !unvisiable %>
- 课程 + <%= link_to '课程',{:controller => "users", :action => "user_courselist", :id => @user.id}, :class => "homepageMenuText" %> + <% if is_current_user%> <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
@@ -212,26 +213,25 @@ <% end%> <% end%>
- <% if @user.courses.visible.count > 0 - course_order_ids = "(" + - CourseActivity.find_by_sql("SELECT c.course_id, updated_at FROM - (SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ") - GROUP BY ca.course_id) AS c - ORDER BY c.updated_at DESC limit 5").map {|c| c.course_id}.join(",") + ")" - courses = Course.where("id in #{course_order_ids}") - else - courses = [] - - end - %> - <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> -
-
    - <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %> -
-
<% end %> + <% if @user.courses.visible.count > 0 + course_order_ids = "(" + + CourseActivity.find_by_sql("SELECT c.course_id, updated_at FROM + (SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ") + GROUP BY ca.course_id) AS c + ORDER BY c.updated_at DESC limit 5").map {|c| c.course_id}.join(",") + ")" + courses = Course.where("id in #{course_order_ids}") + else + courses = [] + end + %> + <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> +
+
    + <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %> +
+
项目 @@ -240,13 +240,13 @@ <% end%>
<% if @user.projects.visible.count > 0 - project_order_ids = "(" + - ForgeActivity.find_by_sql("SELECT p.project_id, p.created_at FROM + project_order_ids = "(" + + ForgeActivity.find_by_sql("SELECT p.project_id, p.created_at FROM (SELECT fa.project_id, MAX(fa.created_at) AS created_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ") GROUP BY fa.project_id) AS p ORDER BY p.created_at DESC limit 5").map {|p| p.project_id}.join(",") + ")" - projects = Project.where("projects.id in #{project_order_ids}") - else + projects = Project.where("projects.id in #{project_order_ids}") + else projects = [] end %> diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb new file mode 100644 index 000000000..0d31903ca --- /dev/null +++ b/app/views/users/_course_boardlist.html.erb @@ -0,0 +1,77 @@ +
+
+
+

问答区列表

+
+ 排序： + <%= link_to "时间", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> + <% if @type.to_i == 1 %> + <%= link_to "", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <% end %> + <%= link_to "人气", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %> + <% if @type.to_i == 2 %> + <%= link_to "", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <% end %> +
+
+
+ <% topics.each do |activity| %> +
+
+ <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %> + <% end %> + <% if activity.sticky == 1 %> + 顶 + <% end%> + <% if activity.locked %> + 锁 + <% end %> + + <%= activity.course.name.to_s %> + +
+
+
+ <% if activity.parent_id.nil? %> + <% content = activity.content %> + <% else %> + <% content = activity.parent.content %> + <% end %> +

<%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %>

+
+
+ 发帖时间：<%= format_time(activity.created_on) %> + 更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %> + <% count=0 %> + <% if activity.parent %> + <% count=activity.parent.children.count%> + <% else %> + <% count=activity.children.count%> + <% end %> +

<%= count>0 ? "（#{count}）" : "" %>回复|<%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>赞

+
+
+
+ <% end %> +
+
    + <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %> +
+
+
+
+
+
+ \ No newline at end of file diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 0ac756f71..3f2b8b5c4 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -89,7 +89,7 @@
回复 - <%= count>0 ? "（#{count}）" : "" %>▪ + <%= count>0 ? "（#{count}）" : "" %>? <% if activity.author == User.current %> @@ -174,5 +174,4 @@
<% end %>
-
- +
\ No newline at end of file diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb new file mode 100644 index 000000000..a48001fdc --- /dev/null +++ b/app/views/users/_project_boardlist.html.erb @@ -0,0 +1,77 @@ +
+
+
+

讨论区列表

+
+ 排序： + <%= link_to "时间", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> + <% if @type.to_i == 1 %> + <%= link_to "", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <% end %> + <%= link_to "人气", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %> + <% if @type.to_i == 2 %> + <%= link_to "", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <% end %> +
+
+
+ <% topics.each do |activity| %> +
+
+ <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %> + <% end %> + <% if activity.sticky == 1 %> + 顶 + <% end%> + <% if activity.locked %> + 锁 + <% end %> + + <%= activity.project.name.to_s %> + +
+
+
+ <% if activity.parent_id.nil? %> + <% content = activity.content %> + <% else %> + <% content = activity.parent.content %> + <% end %> +

<%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %>

+
+
+ 发帖时间：<%= format_time(activity.created_on) %> + 更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %> + <% count=0 %> + <% if activity.parent %> + <% count=activity.parent.children.count%> + <% else %> + <% count=activity.children.count%> + <% end %> +

<%= count>0 ? "（#{count}）" : "" %>回复|<%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>赞

+
+
+
+ <% end %> +
+
    + <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %> +
+
+
+
+
+
+ \ No newline at end of file diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb index 0a3ac5e5a..fa326264e 100644 --- a/app/views/users/_user_course_list.html.erb +++ b/app/views/users/_user_course_list.html.erb @@ -2,13 +2,13 @@

课程列表

排序： - <%= link_to "时间", {:controller => 'users', :action => 'user_courselist', :id =>@user.id, :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %> + <%= link_to "时间", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <% if @type.to_i == 1 %> - <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user.id, :type => @type, :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type, :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> <% end %> - <%= link_to "人气", {:controller => 'users', :action => 'user_courselist', :id =>@user.id, :type => @type, :sort => @c_sort, :order => 2 }, :class => "sortTxt", :remote => true %> + <%= link_to "人气", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type, :sort => @c_sort, :order => 2 }, :class => "sortTxt", :remote => true %> <% if @type.to_i == 2 %> - <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user.id, :type => @type, :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <%= link_to "", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type, :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> <% end %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index d58d951d0..6349e4faa 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1306,3 +1306,31 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;} .box-con{ width:450px; margin:0 auto; text-align:center;} .box-con-a{ width:170px; margin:0 auto; margin-top:10px;} /*--------------------------------------*/ + +/*博客列表界面样式*/ +a{text-decoration:none} +.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; } +/*.bloglistbox{ min-height:690px;}*/ +.list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;} +.category{ padding:10px 0; border-bottom:1px solid #ddd;} +.category a,.category span{ float:left; margin-right:5px;} +.grayTxt{ color:#9093a6;} +.category a.sortTxt{ color:#9093a6;} +.category .sortTxt:hover{ color:#28be6c;} +a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} +a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } +.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} +a:hover.list-title{ color:#269ac9;} +.c_red{ font-weight:normal; font-size:12px;} +.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} +.list-file li{ line-height:1.9;} +.list-info span{ margin-left:5px;} +.pages a{ display:block; border:1px solid #d1d1d1; color:#000; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; } +.pages a:hover{ background-color:#269ac9; color:#fff;} +a.pages-big{ width:50px;} +.pages .active{ background-color:#269ac9; color:#fff;} +.pages{width:330px; margin:20px auto 10px;} + +.red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} From 17b2e82963203eaed563c6a42bb87f74a1212db7 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 26 Apr 2016 16:23:08 +0800 Subject: [PATCH 20/33] =?UTF-8?q?banner=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 58 +--- .../_org_subfield_leftT.html.erb | 276 ++++++++++++++++++ .../_org_subfield_leftT_default.html | 10 + public/stylesheets/org2.css | 1 + 4 files changed, 289 insertions(+), 56 deletions(-) create mode 100644 app/views/organizations/_org_subfield_leftT_default.html diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 5e05dae44..1f6929d43 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -93,7 +93,7 @@ <% @subfield_content.each do |field| %> <% if is_default_field?(field) %> <% case field.name %> - <% when 'activity' %> + <% when 'activity' %>
  • <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
    • @@ -135,61 +135,7 @@
    <% @subfield_content.each do |field| %> <% if field.status.to_i == 1 %> -
    - - - - -
    + <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %> <% elsif field.status.to_i == 2 %>

    业界动态更多

    diff --git a/app/views/organizations/_org_subfield_leftT.html.erb b/app/views/organizations/_org_subfield_leftT.html.erb index e69de29bb..e64044a6b 100644 --- a/app/views/organizations/_org_subfield_leftT.html.erb +++ b/app/views/organizations/_org_subfield_leftT.html.erb @@ -0,0 +1,276 @@ +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> + <% if @course_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftT_default', :locals => {:field => field} %> + <% else %> +
    + +
    +
    + <% @course_acts.first(4).each do |act| %> + <% if act.org_act_type == "HomeworkCommon" %> + <% activity = HomeworkCommon.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> + + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> + + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> + + <% elsif act.org_act_type == "Poll" %> + <% activity = Poll.find(act.org_act_id) %> + <% has_commit = has_commit_poll?(activity.id ,User.current)%> + <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%> + <% iamge_path = get_image_path_from_content(activity.polls_description) %> + <% if ( activity.polls_status==2) %> + + <% end %> + <% end %> + <% end %> +
    +
    +
    + + + + +
    +
    + + +
    +
    + <% end %> + <% when 'project' %> + <% if @project_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftT_default', :locals => {:field => field} %> + <% else %> +
    + +
    +
    + <% @project_acts.first(4).each do |act| %> + <% if act.org_act_type == "Issue" %> + <% activity = Issue.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> + + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> + + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> + + <% end %> + <% end %> +
    +
    +
    + + + + +
    +
    + + +
    +
    + <% end %> + <% end %> +<% else %> + <% if field.field_type == "Post" %> + <% org_acts = get_subfield_acts field %> + <% if org_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftT_default', :locals => {:field => field} %> + <% else %> +
    + +
    +
    + <% org_acts.first(4).each do |activity| %> + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> + + <% elsif activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.board.org_subfield_id %> + <% if message.parent_id.nil? %> + <% content = message.content%> + <% else %> + <% content = message.parent.content%> + <% end %> + <% iamge_path = get_image_path_from_content(content) %> + + <% else %> + <% if message.parent_id.nil? %> + <% content = message.content%> + <% else %> + <% content = message.parent.content%> + <% end %> + <% iamge_path = get_image_path_from_content(content) %> + + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> + + <% end %> + <% end %> + <% end %> +
    +
    +
    + + + + +
    +
    + + +
    +
    + <% end %> + <% end %> +<% end %> + + \ No newline at end of file diff --git a/app/views/organizations/_org_subfield_leftT_default.html b/app/views/organizations/_org_subfield_leftT_default.html new file mode 100644 index 000000000..f2f66758f --- /dev/null +++ b/app/views/organizations/_org_subfield_leftT_default.html @@ -0,0 +1,10 @@ +
    + +
    +
    +
    + +
    +
    +
    +
    \ No newline at end of file diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index e738f841d..19f0c4bdf 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -98,6 +98,7 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left: filter:progid:DXImageTransform.Microsoft.gradient( GradientType = 0,startColorstr = '#80000000',endColorstr = '#80000000')\9; display:block; text-align:left; } .focus .shadow a{ text-decoration:none; color:#fff; font-size:20px; overflow:hidden; margin-left:10px; } .focus .fcon{ position:relative; width:100%; float:left; display:none; background:#000 } +.focus .fcon-default{ position:relative; width:100%; float:left; background:#fff } .focus .fcon img{ display:block; } .focus .fbg{bottom:25px; right:40px; position:absolute; height:21px; text-align:center; z-index: 200; } .focus .fbg div{margin:4px auto 0;overflow:hidden;zoom:1;height:14px} From b589d5b2ff2f111d242e8b5f63fc393d05e73b2a Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 26 Apr 2016 18:27:01 +0800 Subject: [PATCH 21/33] =?UTF-8?q?=E6=9C=AB=E7=8F=AD=E5=85=AD=E5=AE=9A?= =?UTF-8?q?=E9=85=8D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 53 +--- .../_org_subfield_leftM2.html.erb | 27 ++ .../_org_subfield_leftMD.html.erb | 258 ++++++++++++++++++ .../_org_subfield_leftMD_default.html.erb | 11 + 4 files changed, 298 insertions(+), 51 deletions(-) create mode 100644 app/views/organizations/_org_subfield_leftMD_default.html.erb diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 1f6929d43..fc65b653f 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -137,6 +137,7 @@ <% if field.status.to_i == 1 %> <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %> <% elsif field.status.to_i == 2 %> + <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>

    业界动态更多

    @@ -178,57 +179,7 @@
    <% elsif field.status.to_i == 4 %> -
    -

    北斗资源更多

    -
    -
    - -

    仪器资源

    -
    - 测试服务 - 开放日 - 仪器共享 - 定制测试 -
    - 更多 -
    -
    - -

    数据资源

    -
    - 仿真数据 - 实测数据 - 测试场景 - 定制测试 -
    - 更多 -
    -
    - -

    专家资源

    -
    - 人才培养 - 技术咨询 - 学术活动 - 教学教材 - 专家库 -
    - 更多 -
    -
    - -

    研究资源

    -
    - 微小课题 - 开源代码 - 辅助工具 - 技术共享 -
    - 更多 -
    -
    -
    -
    + <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %> <% elsif field.status.to_i == 5 %>

    合作伙伴更多

    diff --git a/app/views/organizations/_org_subfield_leftM2.html.erb b/app/views/organizations/_org_subfield_leftM2.html.erb index e69de29bb..486340615 100644 --- a/app/views/organizations/_org_subfield_leftM2.html.erb +++ b/app/views/organizations/_org_subfield_leftM2.html.erb @@ -0,0 +1,27 @@ +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    +
    \ No newline at end of file diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb index e69de29bb..595da871c 100644 --- a/app/views/organizations/_org_subfield_leftMD.html.erb +++ b/app/views/organizations/_org_subfield_leftMD.html.erb @@ -0,0 +1,258 @@ +
    +

    <%= field.name %>更多

    +
    + <% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> + <% if @course_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %> + <% else %> + <% @course_acts.first(4).each do |act| %> + <% if act.org_act_type == "HomeworkCommon" %> + <% activity = HomeworkCommon.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %> +

    +
    + <%= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %> + <% end %> +

    +
    + <%= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %> +

    +
    + <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% elsif act.org_act_type == "Poll" %> + <% activity = Poll.find(act.org_act_id) %> + <% has_commit = has_commit_poll?(activity.id ,User.current)%> + <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%> + <% iamge_path = get_image_path_from_content(activity.polls_description) %> + <% if ( activity.polls_status==2) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <% if has_commit %> + <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title" %> + <% else %> + <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-title" %> + <% end %> +

    +
    + <%= link_to activity.polls_description.to_s.html_safe, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% when 'project' %> + <% if @project_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %> + <% else %> + <% @project_acts.first(4).each do |act| %> + <% if act.org_act_type == "Issue" %> + <% activity = Issue.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %> +

    +
    + <%= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-title" %> + <% end %> +

    +
    + <%= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title" %> +

    +
    + <%= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% else %> + <% if field.field_type == "Post" %> + <% org_acts = get_subfield_acts field %> + <% if org_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %> + <% else %> + <% org_acts.first(4).each do |activity| %> + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title" %> +

    +
    + <%= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% else activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.parent_id.nil? %> + <% content = message.content%> + <% else %> + <% content = message.parent.content%> + <% end %> + <% iamge_path = get_image_path_from_content(content) %> + <% if message.board.org_subfield_id %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <% if message.parent_id.nil? %> + <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title" %> + <% else %> + <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "resources-title" %> + <% end %> +

    +
    + <%= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% else %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <% if message.parent_id.nil? %> + <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "resources-title" %> + <% else %> + <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-title" %> + <% end %> +

    +
    + <%= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "185", :height => "125"), news_path(news), :target => "_blank", :class =>"sn-resourcesimg" %> + <% end %> +

    + <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "resources-title" %> +

    +
    + <%= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %> +
    + 更多 +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% end %> + <% end %> +
    +
    +
    \ No newline at end of file diff --git a/app/views/organizations/_org_subfield_leftMD_default.html.erb b/app/views/organizations/_org_subfield_leftMD_default.html.erb new file mode 100644 index 000000000..bca12985c --- /dev/null +++ b/app/views/organizations/_org_subfield_leftMD_default.html.erb @@ -0,0 +1,11 @@ +
    + +

    仪器资源

    +
    + 测试服务 + 开放日 + 仪器共享 + 定制测试 +
    + 更多 +
    \ No newline at end of file From b8d6ca0229c04450ebbf334c78547c8615033f21 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 27 Apr 2016 09:36:54 +0800 Subject: [PATCH 22/33] =?UTF-8?q?=E5=8C=97=E6=96=97=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E9=97=A8=E6=88=B7=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 648 +++++++++++++-------------- public/stylesheets/org2.css | 5 +- 2 files changed, 328 insertions(+), 325 deletions(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 1f6929d43..a79fb7a7c 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -1,324 +1,324 @@ - - - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %> - <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%> - <%= javascript_include_tag 'attachments' %> - <%#= call_hook :view_layouts_base_html_head %> - - <%#= yield :header_tags -%> - - - - - - - - - - - - - - - - -
    -
    - <%= render :partial => 'organizations/org_logined_header' %> -
    - -
    - -
    -
      - <% @subfield_content.each do |field| %> - <% if is_default_field?(field) %> - <% case field.name %> - <% when 'activity' %> -
    • - <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %> -
      • - <% when 'course' %> -
    • - 课程动态 -
      • - <% when 'project' %> -
    • - 项目动态 -
      • - <% end %> - <% else %> - <% if field.field_type == "Post" && field.hide == 0 %> -
    • - <%= field.name %> -
      • - <% elsif field.field_type == "Resource" && field.hide == 0 %> -
    • - <%= field.name %> -
      • - <% end %> - <% end %> - <% end %> - <% if User.current.admin_of_org?(@organization) %> -
    • - 配置 -
      • - <% end %> -
    -
    -
    -
    -<%# 更新访问数,刷新的时候更新访问次数 %> -<% update_visiti_count @organization %> -<%# over %> - -
    -
    - <% @subfield_content.each do |field| %> - <% if field.status.to_i == 1 %> - <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %> - <% elsif field.status.to_i == 2 %> -
    -

    业界动态更多

    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -

    2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......

    -
    -
    - <% elsif field.status.to_i == 3 %> -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    -
    -
    - <% elsif field.status.to_i == 4 %> -
    -

    北斗资源更多

    -
    -
    - -

    仪器资源

    -
    - 测试服务 - 开放日 - 仪器共享 - 定制测试 -
    - 更多 -
    -
    - -

    数据资源

    -
    - 仿真数据 - 实测数据 - 测试场景 - 定制测试 -
    - 更多 -
    -
    - -

    专家资源

    -
    - 人才培养 - 技术咨询 - 学术活动 - 教学教材 - 专家库 -
    - 更多 -
    -
    - -

    研究资源

    -
    - 微小课题 - 开源代码 - 辅助工具 - 技术共享 -
    - 更多 -
    -
    -
    -
    - <% elsif field.status.to_i == 5 %> -
    -

    合作伙伴更多

    -
    -
      -
    • - - -
      • -
    • - - -
      • -
    -
    -
    -
    <
    -
    >
    -
    -
    -
    -
    - <% end %> - <% end %> -
    - -
    - <% @subfield_content.each do |field| %> - <% if field.status.to_i == 6 %> -
    -

    最新活动展示更多

    -
    - -

    北斗第二次工作会议在北京召议在北京召开议在北京召开开

    - 2016-04-08 -
    -
    - -

    北斗第二次工作会议在北京召开

    - 2016-04-08 -
    -
    - -

    北斗第二次工作会议在北京召开

    - 2016-04-08 -
    -
    - -

    北斗第二次工作会议在北京召开

    - 2016-04-08 -
    -
    - <% elsif field.status.to_i == 7 %> -
    -

    关注北斗

    -
    - -

    卫星导航仿真与测试开放实验室
    扫一扫 关注我！

    -
    -
    -
    - <% elsif field.status.to_i == 8 %> - <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %> - <% end %> - <% end %> -
    -
    -
    - -
    - -
    -
    - -
    联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org
    -
    地 址：湖南省长沙市开福区东风路89号观园大厦23层
    - 卫星导航仿真与测试开放实验室
    -
    -
    -
    - - -<%#= call_hook :view_layouts_base_body_bottom %> - - - + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %> + <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%> + <%= javascript_include_tag 'attachments' %> + <%#= call_hook :view_layouts_base_html_head %> + + <%#= yield :header_tags -%> + + + + + + + + + + + + + + + + +
    +
    + <%= render :partial => 'organizations/org_logined_header' %> +
    + +
    + +
    +
      + <% @subfield_content.each do |field| %> + <% if is_default_field?(field) %> + <% case field.name %> + <% when 'activity' %> +
    • + <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %> +
      • + <% when 'course' %> +
    • + 课程动态 +
      • + <% when 'project' %> +
    • + 项目动态 +
      • + <% end %> + <% else %> + <% if field.field_type == "Post" && field.hide == 0 %> +
    • + <%= field.name %> +
      • + <% elsif field.field_type == "Resource" && field.hide == 0 %> +
    • + <%= field.name %> +
      • + <% end %> + <% end %> + <% end %> + <% if User.current.admin_of_org?(@organization) %> +
    • + 配置 +
      • + <% end %> +
    +
    +
    +
    +<%# 更新访问数,刷新的时候更新访问次数 %> +<% update_visiti_count @organization %> +<%# over %> + +
    +
    + <% @subfield_content.each do |field| %> + <% if field.status.to_i == 1 %> + <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %> + <% elsif field.status.to_i == 2 %> +
    +

    业界动态更多

    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +

    2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......

    +
    +
    + <% elsif field.status.to_i == 3 %> +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    +
    +
    + <% elsif field.status.to_i == 4 %> +
    +

    北斗资源更多

    +
    +
    + +

    仪器资源

    +
    + 测试服务 + 开放日 + 仪器共享 + 定制测试 +
    + 更多 +
    +
    + +

    数据资源

    +
    + 仿真数据 + 实测数据 + 测试场景 + 定制测试 +
    + 更多 +
    +
    + +

    专家资源

    +
    + 人才培养 + 技术咨询 + 学术活动 + 教学教材 + 专家库 +
    + 更多 +
    +
    + +

    研究资源

    +
    + 微小课题 + 开源代码 + 辅助工具 + 技术共享 +
    + 更多 +
    +
    +
    +
    + <% elsif field.status.to_i == 5 %> +
    +

    合作伙伴更多

    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    +
    +
    +
    <
    +
    >
    +
    +
    +
    +
    + <% end %> + <% end %> +
    + +
    + <% @subfield_content.each do |field| %> + <% if field.status.to_i == 6 %> +
    +

    最新活动展示更多

    +
    + +

    北斗第二次工作会议在北京召议在北京召开议在北京召开开

    + 2016-04-08 +
    +
    + +

    北斗第二次工作会议在北京召开

    + 2016-04-08 +
    +
    + +

    北斗第二次工作会议在北京召开

    + 2016-04-08 +
    +
    + +

    北斗第二次工作会议在北京召开

    + 2016-04-08 +
    +
    + <% elsif field.status.to_i == 7 %> +
    +

    关注北斗

    +
    + +

    卫星导航仿真与测试开放实验室
    扫一扫 关注我！

    +
    +
    +
    + <% elsif field.status.to_i == 8 %> + <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %> + <% end %> + <% end %> +
    +
    +
    + +
    + +
    +
    + +
    联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org
    +
    地 址：湖南省长沙市开福区东风路89号观园大厦23层
    + 卫星导航仿真与测试开放实验室
    +
    +
    +
    + + +<%#= call_hook :view_layouts_base_body_bottom %> + + + diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index 19f0c4bdf..7e6e2e1ea 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -129,8 +129,11 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left: .sn-index-resourcesbox{ padding:10px; background:#f2f2f2; width:185px; float:left;} .sn-index-resourcesbox:hover{ background:#fff;} .sn-index-resourcesbox a.resources-title{ font-size:18px; font-weight:normal; line-height:2.0;width:185px; display:block; border-bottom:1px solid #ccc; margin-bottom:5px;} +.sn-hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} .sn-index-resourcesbox a.resources-tag{ font-size:14px; color:#999; margin-right:5px; line-height:1.5;} -a.more-btn{ display:block; width:190px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;} +.resources-tagbox {width:185px; height: 46px; overflow:hidden;} +.resources-tagbox img {max-width: 100%;} +a.more-btn{ display:block; width:185px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;} /* index-partner */ .sn-index-partnerbox{ padding:25px 30px; } .sn-index-partnerbox{ width:775px;} From b6f5bfc4506d950401e54369ec1f53fa5ab21b80 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 27 Apr 2016 09:45:56 +0800 Subject: [PATCH 23/33] =?UTF-8?q?=E5=8F=B3=E4=B8=8B=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 9 +- .../_org_subfield_rightD.html.erb | 4 +- .../_org_subfield_rightM.html.erb | 98 +++++++++++++++++++ 3 files changed, 101 insertions(+), 10 deletions(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index fc65b653f..0e3ae2a4d 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -233,14 +233,7 @@
    <% elsif field.status.to_i == 7 %> -
    -

    关注北斗

    -
    - -

    卫星导航仿真与测试开放实验室
    扫一扫 关注我！

    -
    -
    -
    + <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %> <% elsif field.status.to_i == 8 %> <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %> <% end %> diff --git a/app/views/organizations/_org_subfield_rightD.html.erb b/app/views/organizations/_org_subfield_rightD.html.erb index 7bc2d565d..131ae5183 100644 --- a/app/views/organizations/_org_subfield_rightD.html.erb +++ b/app/views/organizations/_org_subfield_rightD.html.erb @@ -25,14 +25,14 @@ <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> <% message = Message.find(activity.org_act_id) %> <% if message.board.org_subfield_id %> - <% iamge_path = get_image_path_from_content(content) %> + <% iamge_path = get_image_path_from_content(message.content) %> <% if iamge_path.nil? %> <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %> <% else %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %> <% end %> <% else %> - <% iamge_path = get_image_path_from_content(content) %> + <% iamge_path = get_image_path_from_content(message.content) %> <% if iamge_path.nil? %> <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %> <% else %> diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb index e69de29bb..f293b1ea8 100644 --- a/app/views/organizations/_org_subfield_rightM.html.erb +++ b/app/views/organizations/_org_subfield_rightM.html.erb @@ -0,0 +1,98 @@ +<% if is_default_field?(field) %> + <% case field.name %> +<% when 'course' %> +

    暂无内容！

    + <% when 'project' %> +

    暂无内容！

    + <% end %> +<% else %> + <% if field.field_type == "Post" %> <%# 讨论类型 %> + <% org_acts = get_subfield_acts field %> + <% unless org_acts.blank? %> + <% activity = org_acts.first %> +
    + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> +

    <%= field.name %>

    +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %> + <% end %> +

    <%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %>

    +
    +
    + <% else activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.board.org_subfield_id %> + <% iamge_path = get_image_path_from_content(message.content) %> +

    <%= field.name %>

    +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %> + <% end %> +

    <%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>

    +
    +
    + <% else %> + <% iamge_path = get_image_path_from_content(message.content) %> +

    <%= field.name %>

    +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %> + <% end %> +

    <%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %>

    +
    +
    + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> +

    <%= field.name %>

    +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %> + <% end %> +

    <%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %>

    +
    +
    + <% end %> + <% end %> +
    + <% else %> +
    +

    <%= field.name %>

    +
    + +

    暂无内容！

    +
    +
    +
    + <% end %> + <% elsif field.field_type == "Resource" %> + <% org_attachs = get_attach_org2(field) %> +
    + <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> + <% end %> + <% else %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> +
    + <% end %> +<% end %> From 23f48b718910a2e8ed3dbea4825d88aa65ae6e5f Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 27 Apr 2016 09:54:49 +0800 Subject: [PATCH 24/33] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/boards_controller.rb | 1 - app/controllers/users_controller.rb | 44 ++++++++++++++++- app/views/layouts/_user_courses.html.erb | 13 ++++- app/views/layouts/new_base_user.html.erb | 3 +- app/views/users/_course_boardlist.html.erb | 2 +- app/views/users/_project_boardlist.html.erb | 4 +- app/views/users/_user_project_list.html.erb | 53 +++++++++++++++++++++ app/views/users/user_projectlist.html.erb | 3 ++ app/views/users/user_projectlist.js.erb | 1 + config/routes.rb | 1 + public/stylesheets/project.css | 28 +++++++++++ 11 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 app/views/users/_user_project_list.html.erb create mode 100644 app/views/users/user_projectlist.html.erb create mode 100644 app/views/users/user_projectlist.js.erb diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 124342041..aab9bf963 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -153,7 +153,6 @@ class BoardsController < ApplicationController elsif @course render_feed(@messages, :title => "#{@course}: #{@board}") end - } end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 54b19a3e6..da143fa8d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -41,7 +41,7 @@ class UsersController < ApplicationController :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index, :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource, :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction, - :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist] + :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist,:user_projectlist] before_filter :auth_user_extension, only: :show #before_filter :rest_user_score, only: :show #before_filter :select_entry, only: :user_projects @@ -2890,6 +2890,48 @@ class UsersController < ApplicationController end end + def user_projectlist + @order, @c_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1 + + #确定 sort_type + if @order.to_i == @type.to_i + @c_sort = @c_sort.to_i == 1 ? 2 : 1 #1升序 2降序 + else + @c_sort = 2 + end + + sort_name = "updated_on" + sort_type = @c_sort == 1 ? "asc" : "desc" + + if @user.projects.visible.count > 0 + project_order_ids = "(" +ForgeActivity.find_by_sql("SELECT p.project_id, p.created_at FROM (SELECT fa.project_id, MAX(fa.created_at) AS created_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ") GROUP BY fa.project_id) AS p ").map {|p| p.project_id}.join(",") + ")" + @projects = Project.where("projects.id in #{project_order_ids}").order("#{sort_name} #{sort_type}") + else + @projects = [] + end + + #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num + if @order.to_i == 2 + @type = 2 + @c_sort == 1 ? (@projects = @projects.sort{|x,y| x.project_score.issue_num+x.project_score.attach_num <=> y.project_score.issue_num+y.project_score.attach_num }) : (@projects = @projects.sort{|x,y| y.project_score.issue_num+y.project_score.attach_num <=> x.project_score.issue_num+x.project_score.attach_num }) + else + @type = 1 + end + + #分页 + @limit = 10 + @is_remote = true + @atta_count = @projects.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset + @projects = paginateHelper @projects,@limit + + respond_to do |format| + format.js + format.html {render :layout => 'new_base_user'} + end + end + private def find_user diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index 20bccfef3..d470e5fbc 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -72,4 +72,15 @@ -<% end%> \ No newline at end of file +<% end%> +
    + + +
    + + diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 6fb880ed8..0487cd75c 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -233,8 +233,7 @@
    - 项目 - + <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :class => "homepageMenuText" %> <% if is_current_user%> <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%> <% end%> diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 0d31903ca..3bb29282d 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -42,7 +42,7 @@ <% end %>

    <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %>

    -
    +
    发帖时间：<%= format_time(activity.created_on) %> 更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %> <% count=0 %> diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index a48001fdc..db054313c 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -42,9 +42,9 @@ <% end %>

    <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %>

    -
    +
    发帖时间：<%= format_time(activity.created_on) %> - 更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %> + 更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %> <% count=0 %> <% if activity.parent %> <% count=activity.parent.children.count%> diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb new file mode 100644 index 000000000..417cfa7b3 --- /dev/null +++ b/app/views/users/_user_project_list.html.erb @@ -0,0 +1,53 @@ +
    +

    项目列表

    +
    + 排序： + <%= link_to "时间", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %> + <% if @type.to_i == 1 %> + <%= link_to "", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type, :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <% end %> + <%= link_to "人气", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type, :sort => @c_sort, :order => 2 }, :class => "sortTxt", :remote => true %> + <% if @type.to_i == 2 %> + <%= link_to "", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type, :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %> + <% end %> +
    +
    + +
    + <% @projects.each do |project|%> +
      +
    • + + <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "course-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%> + <% projectUser = User.where("id=?",project.user_id).first%> + + <%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %> + +
      • +
      +
    • + 创建时间：<%= format_time(project.created_on) %> +

      <%= project.project_score.issue_num %>问题| <%= project.project_score.attach_num %>资源

      +
      • +
      +
    + <% end %> +
    +
      + <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %> +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/app/views/users/user_projectlist.html.erb b/app/views/users/user_projectlist.html.erb new file mode 100644 index 000000000..0f314c5aa --- /dev/null +++ b/app/views/users/user_projectlist.html.erb @@ -0,0 +1,3 @@ +
    + <%= render :partial => 'users/user_project_list'%> +
    \ No newline at end of file diff --git a/app/views/users/user_projectlist.js.erb b/app/views/users/user_projectlist.js.erb new file mode 100644 index 000000000..6d3f1834b --- /dev/null +++ b/app/views/users/user_projectlist.js.erb @@ -0,0 +1 @@ +$("#project-list").html('<%= escape_javascript( render :partial => 'users/user_project_list') %>'); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 17857d3b0..40fe687fa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -552,6 +552,7 @@ RedmineApp::Application.routes.draw do #addby yk match 'user_courselist', :to => 'users#user_courselist', :via => :get, :as => "user_courselist" + match 'user_projectlist', :to => 'users#user_projectlist', :via => :get, :as => "user_projectlist" get 'edit_brief_introduction' get "user_resource" diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index f711c25e2..a5b87049d 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -1200,3 +1200,31 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;} .popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;} .subjectType {width:70px; text-align:center;} .subjectCount {width:65px; text-align:center;} + +/*博客列表界面样式*/ +a{text-decoration:none} +.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; } +/*.bloglistbox{ min-height:690px;}*/ +.list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;} +.category{ padding:10px 0; border-bottom:1px solid #ddd;} +.category a,.category span{ float:left; margin-right:5px;} +.grayTxt{ color:#9093a6;} +.category a.sortTxt{ color:#9093a6;} +.category .sortTxt:hover{ color:#28be6c;} +a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} +a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } +.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} +a:hover.list-title{ color:#269ac9;} +.c_red{ font-weight:normal; font-size:12px;} +.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} +.list-file li{ line-height:1.9;} +.list-info span{ margin-left:5px;} +.pages a{ display:block; border:1px solid #d1d1d1; color:#000; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; } +.pages a:hover{ background-color:#269ac9; color:#fff;} +a.pages-big{ width:50px;} +.pages .active{ background-color:#269ac9; color:#fff;} +.pages{width:330px; margin:20px auto 10px;} + +.red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} From c9cc4739aa9b9879419a75a68e7721d1ba2b1905 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 27 Apr 2016 09:57:41 +0800 Subject: [PATCH 25/33] =?UTF-8?q?=E5=8C=97=E6=96=97=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9D=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_org_subfield_rightM.html.erb | 196 +++++++++--------- public/stylesheets/org2.css | 3 +- 2 files changed, 100 insertions(+), 99 deletions(-) diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb index f293b1ea8..d75b9f20f 100644 --- a/app/views/organizations/_org_subfield_rightM.html.erb +++ b/app/views/organizations/_org_subfield_rightM.html.erb @@ -1,98 +1,98 @@ -<% if is_default_field?(field) %> - <% case field.name %> -<% when 'course' %> -

    暂无内容！

    - <% when 'project' %> -

    暂无内容！

    - <% end %> -<% else %> - <% if field.field_type == "Post" %> <%# 讨论类型 %> - <% org_acts = get_subfield_acts field %> - <% unless org_acts.blank? %> - <% activity = org_acts.first %> -
    - <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> - <% document = activity.org_act %> - <% org_subfield_id = params[:org_subfield_id] %> - <% flag = 2 %> - <% iamge_path = get_image_path_from_content(document.content) %> -

    <%= field.name %>

    -
    - <% if iamge_path.nil? %> - <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %> - <% else %> - <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %> - <% end %> -

    <%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %>

    -
    -
    - <% else activity.container_type == 'OrgSubfield' %> - <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> - <% message = Message.find(activity.org_act_id) %> - <% if message.board.org_subfield_id %> - <% iamge_path = get_image_path_from_content(message.content) %> -

    <%= field.name %>

    -
    - <% if iamge_path.nil? %> - <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %> - <% else %> - <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %> - <% end %> -

    <%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>

    -
    -
    - <% else %> - <% iamge_path = get_image_path_from_content(message.content) %> -

    <%= field.name %>

    -
    - <% if iamge_path.nil? %> - <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %> - <% else %> - <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %> - <% end %> -

    <%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %>

    -
    -
    - <% end %> - <% end %> - <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> - <% news = News.find(activity.org_act_id) %> - <% iamge_path = get_image_path_from_content(news.description) %> -

    <%= field.name %>

    -
    - <% if iamge_path.nil? %> - <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %> - <% else %> - <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %> - <% end %> -

    <%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %>

    -
    -
    - <% end %> - <% end %> -
    - <% else %> -
    -

    <%= field.name %>

    -
    - -

    暂无内容！

    -
    -
    -
    - <% end %> - <% elsif field.field_type == "Resource" %> - <% org_attachs = get_attach_org2(field) %> -
    - <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> - <% else %> - <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> - <% end %> - <% else %> - <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> - <% end %> -
    - <% end %> -<% end %> +<% if is_default_field?(field) %> + <% case field.name %> +<% when 'course' %> +

    暂无内容！

    + <% when 'project' %> +

    暂无内容！

    + <% end %> +<% else %> + <% if field.field_type == "Post" %> <%# 讨论类型 %> + <% org_acts = get_subfield_acts field %> + <% unless org_acts.blank? %> + <% activity = org_acts.first %> +
    + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> +

    <%= field.name %>

    +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "fl sn-index-wximg" %> + <% end %> +

    <%=link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %>

    +
    +
    + <% else activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.board.org_subfield_id %> + <% iamge_path = get_image_path_from_content(message.content) %> +

    <%= field.name %>

    +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %> + <% end %> +

    <%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>

    +
    +
    + <% else %> + <% iamge_path = get_image_path_from_content(message.content) %> +

    <%= field.name %>

    +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %> + <% end %> +

    <%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %>

    +
    +
    + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> +

    <%= field.name %>

    +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %> + <% end %> +

    <%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %>

    +
    +
    + <% end %> + <% end %> +
    + <% else %> +
    +

    <%= field.name %>

    +
    + +

    暂无内容！

    +
    +
    +
    + <% end %> + <% elsif field.field_type == "Resource" %> + <% org_attachs = get_attach_org2(field) %> +
    + <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> + <% end %> + <% else %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "104", :height => "104"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> +
    + <% end %> +<% end %> diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index 7e6e2e1ea..7c0b9f84a 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -39,7 +39,7 @@ a.sn-link-select {color:#809df9;} .sn-f12 {font-size:12px;} .sn-f14 {font-size:14px;} .sn-f18 {font-size:18px;} -/*padding&margin*/ +/*padding&margin&width*/ .sn-mt-10 {margin-left:-10px;} .sn-mt4 {margin-top:4px;} .sn-mt10 {margin-top:10px;} @@ -51,6 +51,7 @@ a.sn-link-select {color:#809df9;} .sn-ml55 {margin-left:55px;} .sn-mr0 {margin-right:0px !important;} .sn-mr50 {margin-right:50px;} +.sn-w229 {width:229px;} /*头部样式*/ .sn-header {} .sn-row {width:100%;} From cded1802ccac564a7adfcd99d560addde7edd4c8 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 27 Apr 2016 10:41:05 +0800 Subject: [PATCH 26/33] =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 24 +- .../_org_subfield_rightT.html.erb | 223 ++++++++++++++++++ .../org_subfield_rightT_default.html.erb | 7 + 3 files changed, 231 insertions(+), 23 deletions(-) create mode 100644 app/views/organizations/org_subfield_rightT_default.html.erb diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 0e3ae2a4d..f9e8a0b7b 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -209,29 +209,7 @@
    <% @subfield_content.each do |field| %> <% if field.status.to_i == 6 %> -
    -

    最新活动展示更多

    -
    - -

    北斗第二次工作会议在北京召议在北京召开议在北京召开开

    - 2016-04-08 -
    -
    - -

    北斗第二次工作会议在北京召开

    - 2016-04-08 -
    -
    - -

    北斗第二次工作会议在北京召开

    - 2016-04-08 -
    -
    - -

    北斗第二次工作会议在北京召开

    - 2016-04-08 -
    -
    + <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %> <% elsif field.status.to_i == 7 %> <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %> <% elsif field.status.to_i == 8 %> diff --git a/app/views/organizations/_org_subfield_rightT.html.erb b/app/views/organizations/_org_subfield_rightT.html.erb index e69de29bb..e93031991 100644 --- a/app/views/organizations/_org_subfield_rightT.html.erb +++ b/app/views/organizations/_org_subfield_rightT.html.erb @@ -0,0 +1,223 @@ +
    +

    <%= field.name %>更多

    +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> + <% if @course_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %> + <% else %> + <% @course_acts.first(4).each do |act| %> + <% if act.org_act_type == "HomeworkCommon" %> + <% activity = HomeworkCommon.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "active-title" %> +

    + <%= format_date activity.updated_at %> +
    + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %> + <% end %> +

    + <%= format_date activity.updated_on %> +
    + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %> +

    + <%= format_date activity.created_on %> +
    + <% elsif act.org_act_type == "Poll" %> + <% activity = Poll.find(act.org_act_id) %> + <% has_commit = has_commit_poll?(activity.id ,User.current)%> + <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%> + <% iamge_path = get_image_path_from_content(activity.polls_description) %> + <% if ( activity.polls_status==2) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <% if has_commit %> + <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title" %> + <% else %> + <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "active-title" %> + <% end %> +

    + <%= format_date activity.published_at %> +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% when 'project' %> + <% if @project_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %> + <% else %> + <% @project_acts.first(4).each do |act| %> + <% if act.org_act_type == "Issue" %> + <% activity = Issue.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "active-title" %> +

    + <%= format_date activity.updated_on %> +
    + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "active-title" %> + <% end %> +

    + <%= format_date activity.updated_on %> +
    + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "active-title" %> +

    + <%= format_date activity.created_on %> +
    + <% end %> + <% end %> + <% end %> + <% end %> +<% else %> + <% if field.field_type == "Post" %> + <% org_acts = get_subfield_acts field %> + <% if org_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %> + <% else %> + <% org_acts.first(4).each do |activity| %> + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "active-title" %> +

    + <%= format_date document.created_at %> +
    + <% else activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.parent_id.nil? %> + <% content = message.content%> + <% else %> + <% content = message.parent.content%> + <% end %> + <% iamge_path = get_image_path_from_content(content) %> + <% if message.board.org_subfield_id %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <% if message.parent_id.nil? %> + <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %> + <% else %> + <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "active-title" %> + <% end %> +

    + <%= format_date message.created_on %> +
    + <% else %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <% if message.parent_id.nil? %> + <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "active-title" %> + <% else %> + <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "active-title" %> + <% end %> +

    + <%= format_date message.created_on %> +
    + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "330", :height => "210"), news_path(news), :target => "_blank", :class =>"sn-activeimg" %> + <% end %> +

    + <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "active-title" %> +

    + <%= format_date news.created_on %> +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% end %> +<% end %> +
    +
    \ No newline at end of file diff --git a/app/views/organizations/org_subfield_rightT_default.html.erb b/app/views/organizations/org_subfield_rightT_default.html.erb new file mode 100644 index 000000000..ecdc7fba0 --- /dev/null +++ b/app/views/organizations/org_subfield_rightT_default.html.erb @@ -0,0 +1,7 @@ +
    +
    + +

    + +
    +
    \ No newline at end of file From ddf1e6f2dbb3694786bd10cdd90c38fec6d04995 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 27 Apr 2016 11:29:01 +0800 Subject: [PATCH 27/33] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=BC=8F3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 49 +--- .../_org_subfield_leftD.html.erb | 117 ++++++++ .../_org_subfield_leftM2.html.erb | 260 ++++++++++++++++-- .../_org_subfield_leftM2_default.html.erb | 26 ++ 4 files changed, 378 insertions(+), 74 deletions(-) create mode 100644 app/views/organizations/_org_subfield_leftM2_default.html.erb diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index f9e8a0b7b..393af9330 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -150,58 +150,13 @@
    <% elsif field.status.to_i == 3 %> -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    + <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
    <% elsif field.status.to_i == 4 %> <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %> <% elsif field.status.to_i == 5 %> -
    -

    合作伙伴更多

    -
    -
      -
    • - - -
      • -
    • - - -
      • -
    -
    -
    -
    <
    -
    >
    -
    -
    -
    -
    + <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %> <% end %> <% end %>
    diff --git a/app/views/organizations/_org_subfield_leftD.html.erb b/app/views/organizations/_org_subfield_leftD.html.erb index e69de29bb..676d5d1c3 100644 --- a/app/views/organizations/_org_subfield_leftD.html.erb +++ b/app/views/organizations/_org_subfield_leftD.html.erb @@ -0,0 +1,117 @@ +
    +

    合作伙伴更多

    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    +
    +
    +
    <
    +
    >
    +
    +
    +
    +
    + +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> +

    暂无内容！

    + <% when 'project' %> +

    暂无内容！

    + <% end %> +<% else %> + <% if field.field_type == "Post" %> <%# 讨论类型 %> + <% org_acts = get_subfield_acts field %> + <% unless org_acts.blank? %> + <% org_acts.each do |activity| %> +
    +

    合作伙伴更多

    +
    + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %> + <% end %> + <% elsif activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.board.org_subfield_id %> + <% iamge_path = get_image_path_from_content(message.content) %> + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %> + <% end %> + <% else %> + <% iamge_path = get_image_path_from_content(message.content) %> + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank" %> + <% end %> + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), news_path(news), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "369", :height => "169"), news_path(news), :target => "_blank" %> + <% end %> + <% end %> + <% end %> +
    +
    + <% end %> + <% else %> +
    +

    合作伙伴更多

    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    +
    +
    +
    <
    +
    >
    +
    +
    +
    +
    + <% end %> + <% elsif field.field_type == "Resource" %> + <% org_attachs = get_attach_org2(field) %> +
    + <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> + <% else %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :target => "_blank" %> + <% end %> + <% else %> + <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "369", :height => "169"), org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> +
    + <% end %> +<% end %> diff --git a/app/views/organizations/_org_subfield_leftM2.html.erb b/app/views/organizations/_org_subfield_leftM2.html.erb index 9c4237c15..aec1a88fe 100644 --- a/app/views/organizations/_org_subfield_leftM2.html.erb +++ b/app/views/organizations/_org_subfield_leftM2.html.erb @@ -1,27 +1,233 @@ -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -
    -
    -
    \ No newline at end of file +
    +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> + <% if @course_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %> + <% else %> + <% @course_acts.first(4).each do |act| %> + <% if act.org_act_type == "HomeworkCommon" %> + <% activity = HomeworkCommon.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/right_top.jpg", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %> +

    + <%= format_date activity.updated_at %> +
    +
    + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %> + <% end %> +

    + <%= format_date activity.updated_on %> +
    +
    + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %> +

    + <%= format_date activity.created_on %> +
    +
    + <% elsif act.org_act_type == "Poll" %> + <% activity = Poll.find(act.org_act_id) %> + <% has_commit = has_commit_poll?(activity.id ,User.current)%> + <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%> + <% iamge_path = get_image_path_from_content(activity.polls_description) %> + <% if ( activity.polls_status==2) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <% if has_commit %> + <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10" %> + <% else %> + <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h4-title fl mt10" %> + <% end %> +

    + <%= format_date activity.published_at %> +
    +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% when 'project' %> + <% if @project_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %> + <% else %> + <% @project_acts.first(4).each do |act| %> + <% if act.org_act_type == "Issue" %> + <% activity = Issue.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %> +

    + <%= format_date activity.updated_on %> +
    +
    + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h4-title fl mt10" %> + <% end %> +

    + <%= format_date activity.updated_on %> +
    +
    + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h4-title fl mt10" %> +

    + <%= format_date activity.created_on %> +
    +
    + <% end %> + <% end %> + <% end %> + <% end %> +<% else %> + <% if field.field_type == "Post" %> + <% org_acts = get_subfield_acts field %> + <% if org_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftM2_default', :locals => {:field => field} %> + <% else %> + <% org_acts.first(4).each do |activity| %> + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h4-title fl mt10" %> +

    + <%= format_date document.created_at %> +
    +
    + <% else activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.parent_id.nil? %> + <% content = message.content%> + <% else %> + <% content = message.parent.content%> + <% end %> + <% iamge_path = get_image_path_from_content(content) %> + <% if message.board.org_subfield_id %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <% if message.parent_id.nil? %> + <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %> + <% else %> + <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h4-title fl mt10" %> + <% end %> +

    + <%= format_date message.created_on %> +
    +
    + <% else %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <% if message.parent_id.nil? %> + <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h4-title fl mt10" %> + <% else %> + <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h4-title fl mt10" %> + <% end %> +

    + <%= format_date message.created_on %> +
    +
    + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "85", :height => "85"), news_path(news), :target => "_blank", :class =>"sn-news-smallimg fl" %> + <% end %> +

    + <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h4-title fl mt10" %> +

    + <%= format_date news.created_on %> +
    +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% end %> +<% end %> +
    +
    \ No newline at end of file diff --git a/app/views/organizations/_org_subfield_leftM2_default.html.erb b/app/views/organizations/_org_subfield_leftM2_default.html.erb new file mode 100644 index 000000000..1b47d9d5c --- /dev/null +++ b/app/views/organizations/_org_subfield_leftM2_default.html.erb @@ -0,0 +1,26 @@ +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    + +

    北斗开放实验室迎湖南省省直机关领导调研参观

    + 2016-04-08 +
    +
    +
    \ No newline at end of file From 811c3a065e8cc39196bb49f233897e4a4ce6da38 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 27 Apr 2016 14:09:15 +0800 Subject: [PATCH 28/33] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A6=E4=B8=AD?= =?UTF-8?q?=E4=B8=80=E6=A8=A1=E5=9D=97=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 15 +- .../_org_subfield_leftM1.html.erb | 256 ++++++++++++++++++ .../_org_subfield_leftM1_default.html.erb | 8 + 3 files changed, 267 insertions(+), 12 deletions(-) create mode 100644 app/views/organizations/_org_subfield_leftM1_default.html.erb diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 393af9330..fc550c90f 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -139,19 +139,10 @@ <% elsif field.status.to_i == 2 %> <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
    -

    业界动态更多

    -
    -
    - -

    北斗开放实验室迎湖南省省直机关领导调研参观

    - 2016-04-08 -
    -

    2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......

    -
    -
    + <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %> <% elsif field.status.to_i == 3 %> - <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %> -
    + <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %> +
    <% elsif field.status.to_i == 4 %> <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %> diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb index e69de29bb..a987e23cb 100644 --- a/app/views/organizations/_org_subfield_leftM1.html.erb +++ b/app/views/organizations/_org_subfield_leftM1.html.erb @@ -0,0 +1,256 @@ +

    <%= field.name %>更多

    +
    +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> + <% if @course_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %> + <% else %> + <% @course_acts.first(1).each do |act| %> + <% if act.org_act_type == "HomeworkCommon" %> + <% activity = HomeworkCommon.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %> +

    + <%= format_date activity.updated_at %> +
    +

    <%= activity.description.to_s.html_safe %>

    +
    +
    + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %> + <% end %> +

    + <%= format_date activity.updated_on %> +
    +

    <%= activity.content.to_s.html_safe %>

    +
    +
    + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %> +

    + <%= format_date activity.created_on %> +
    +

    <%= activity.description.to_s.html_safe %>

    +
    +
    + <% elsif act.org_act_type == "Poll" %> + <% activity = Poll.find(act.org_act_id) %> + <% has_commit = has_commit_poll?(activity.id ,User.current)%> + <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%> + <% iamge_path = get_image_path_from_content(activity.polls_description) %> + <% if ( activity.polls_status==2) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <% if has_commit %> + <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title" %> + <% else %> + <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "h3-title" %> + <% end %> +

    + <%= format_date activity.published_at %> +
    +

    <%= activity.polls_description.to_s.html_safe %>

    +
    +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% when 'project' %> + <% if @project_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %> + <% else %> + <% @project_acts.first(4).each do |act| %> + <% if act.org_act_type == "Issue" %> + <% activity = Issue.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %> +

    + <%= format_date activity.updated_on %> +
    +

    <%= activity.description.to_s.html_safe %>

    +
    +
    + <% elsif act.org_act_type == "Message" %> + <% activity = Message.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %> + <% else %> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "h3-title" %> + <% end %> +

    + <%= format_date activity.updated_on %> +
    +

    <%= activity.content.to_s.html_safe %>

    +
    +
    + <% elsif act.org_act_type == "News" %> + <% activity = News.find(act.org_act_id) %> + <% iamge_path = get_image_path_from_content(activity.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "h3-title" %> +

    + 2016-04-08 +
    +

    <%= activity.description.to_s.html_safe %>

    +
    +
    + <% end %> + <% end %> + <% end %> + <% end %> +<% else %> + <% if field.field_type == "Post" %> + <% org_acts = get_subfield_acts field %> + <% if org_acts.blank? %> + <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %> + <% else %> + <% org_acts.first(4).each do |activity| %> + <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> + <% document = activity.org_act %> + <% org_subfield_id = params[:org_subfield_id] %> + <% flag = 2 %> + <% iamge_path = get_image_path_from_content(document.content) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "h3-title" %> +

    + <%= format_date document.created_at %> +
    +

    <%= document.content.to_s.html_safe %>

    +
    +
    + <% else activity.container_type == 'OrgSubfield' %> + <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> + <% message = Message.find(activity.org_act_id) %> + <% if message.parent_id.nil? %> + <% content = message.content%> + <% else %> + <% content = message.parent.content%> + <% end %> + <% iamge_path = get_image_path_from_content(content) %> + <% if message.board.org_subfield_id %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <% if message.parent_id.nil? %> + <%= link_to message.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %> + <% else %> + <%= link_to message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => '_blank', :class => "h3-title" %> + <% end %> +

    + <%= format_date message.created_on %> +
    +

    <%= content.to_s.html_safe %>

    +
    +
    + <% else %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <% if message.parent_id.nil? %> + <%= link_to message.subject.to_s.html_safe, board_message_path(message.board,message), :target => '_blank', :class => "h3-title" %> + <% else %> + <%= link_to message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "h3-title" %> + <% end %> +

    + <%= format_date message.created_on %> +
    +

    <%= content.to_s.html_safe %>

    +
    +
    + <% end %> + <% end %> + <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %> + <% news = News.find(activity.org_act_id) %> + <% iamge_path = get_image_path_from_content(news.description) %> +
    + <% if iamge_path.nil? %> + <%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %> + <% else %> + <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg" %> + <% end %> +

    + <%= link_to news.title.to_s, news_path(news), :target => '_blank', :class => "h3-title" %> +

    + <%= format_date news.created_on %> +
    +

    <%= news.description.to_s.html_safe %>

    +
    +
    + <% end %> + <% end %> + <% end %> + <% end %> + <% end %> +<% end %> + + diff --git a/app/views/organizations/_org_subfield_leftM1_default.html.erb b/app/views/organizations/_org_subfield_leftM1_default.html.erb new file mode 100644 index 000000000..919d76363 --- /dev/null +++ b/app/views/organizations/_org_subfield_leftM1_default.html.erb @@ -0,0 +1,8 @@ +
    + +

    + +
    +

    +
    +
    From dac717bd97b424f93b02c6622c585cb486d42d5e Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 27 Apr 2016 14:12:56 +0800 Subject: [PATCH 29/33] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B7=A6=E8=BE=B9?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=94=B6=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/views/layouts/_user_courses.html.erb | 11 +++-- app/views/layouts/_user_projects.html.erb | 14 ++++++- app/views/layouts/new_base_user.html.erb | 47 ++++++++++++++++++---- public/images/homepage_icon.png | Bin 16534 -> 31328 bytes public/stylesheets/new_user.css | 3 ++ 6 files changed, 60 insertions(+), 17 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index da143fa8d..774a8dabd 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2900,7 +2900,7 @@ class UsersController < ApplicationController @c_sort = 2 end - sort_name = "updated_on" + sort_name = "created_on" sort_type = @c_sort == 1 ? "asc" : "desc" if @user.projects.visible.count > 0 diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index d470e5fbc..befc1a7ec 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -73,14 +73,13 @@ <% end%> -
    - -
    - diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb index a82ea4103..e7bdacd22 100644 --- a/app/views/layouts/_user_projects.html.erb +++ b/app/views/layouts/_user_projects.html.erb @@ -1,7 +1,7 @@ <% projects.each do |project|%>
  • <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %> - <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "coursesLineGrey hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%> + <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "projectsLineGrey hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
      • @@ -53,4 +53,14 @@ -<% end%> \ No newline at end of file +<% end%> + + \ No newline at end of file diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 0487cd75c..0ef49408d 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -227,10 +227,18 @@ end %> <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> -
        -
          - <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %> -
        + +
        +
        +
          + <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %> +
        +
        + <% if !courses.empty? %> +
        + +
        + <% end %>
        <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :class => "homepageMenuText" %> @@ -251,10 +259,17 @@ %> <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%> -
        -
          - <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %> -
        +
        +
        +
          + <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %> +
        +
        + <% if !projects.empty? %> +
        + +
        + <% end %>
        @@ -338,6 +353,22 @@ $("#courseMenu").mouseleave(function(){ $("#topnav_course_menu").hide(); }); + + $('#user_hide_course').hide(); + function leftCourseslistChange(){ + $('#homepageLeftMenuCourses').slideToggle(); + $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon"); + $('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon"); + + } + + $('#user_hide_project').hide(); + function leftProjectslistChange(){ + $('#homepageLeftMenuForge').slideToggle(); + $('#hide_show_projecticon').toggleClass("homepageLeftMenuHideIcon"); + $('#hide_show_projecticon').toggleClass("homepageLeftMenuMoreIcon"); + + } diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png index 9f2212ff0e3121e121e2412d4e1c2810fa1f739f..1a928ff33bb744c3cf6ef2053d030cc449ea5b83 100644 GIT binary patch literal 31328 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 literal 16534 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 Date: Wed, 27 Apr 2016 16:02:52 +0800 Subject: [PATCH 30/33] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E7=AD=89=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/boards_controller.rb | 60 +++++++++++++-------- app/views/blogs/index.js.erb | 2 +- app/views/boards/show.js.erb | 4 +- app/views/users/_course_boardlist.html.erb | 4 +- app/views/users/_project_boardlist.html.erb | 4 +- app/views/users/_user_course_list.html.erb | 2 +- app/views/users/_user_project_list.html.erb | 2 +- app/views/users/user_courselist.html.erb | 4 +- app/views/users/user_courselist.js.erb | 2 +- app/views/users/user_projectlist.html.erb | 4 +- app/views/users/user_projectlist.js.erb | 2 +- db/schema.rb | 48 ++++++----------- 12 files changed, 67 insertions(+), 71 deletions(-) diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index aab9bf963..2e499ea1d 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -28,6 +28,7 @@ class BoardsController < ApplicationController helper :watchers helper :project_score helper :attachments + include PraiseTreadHelper def index #modify by nwb @flag = params[:flag] || false @@ -121,6 +122,15 @@ class BoardsController < ApplicationController end end + #根据 赞+回复数排序 + if @order.to_i == 2 + @type = 2 + @b_sort == 1 ? @topics = @topics.sort{|x,y| get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) <=> get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) } : @topics = @topics.sort{|x,y| get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) <=> get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) } + @topics = @topics.sort{|x,y| y.sticky <=> x.sticky} + else + @type = 1 + end + #分页 @limit = 10 @is_remote = true @@ -132,28 +142,34 @@ class BoardsController < ApplicationController @page = params[:page] ? params[:page].to_i + 1 : 0 @message = Message.new(:board => @board) #modify by nwb - respond_to do |format| - format.js - format.html { - if @project - render :action => 'show', :layout => 'base_projects' - elsif @course - @params=params - render :action => 'show', :layout => 'base_courses' - end - } - format.atom { - @messages = @board.messages. - reorder('created_on DESC'). - includes(:author, :board). - limit(Setting.feeds_limit.to_i). - all - if @project - render_feed(@messages, :title => "#{@project}: #{@board}") - elsif @course - render_feed(@messages, :title => "#{@course}: #{@board}") - end - } + if (params[:page] || params[:order]) + respond_to do |format| + format.js{render "show.js.erb"} + end + else + respond_to do |format| + format.js + format.html { + if @project + render :action => 'show', :layout => 'base_projects' + elsif @course + @params=params + render :action => 'show', :layout => 'base_courses' + end + } + format.atom { + @messages = @board.messages. + reorder('created_on DESC'). + includes(:author, :board). + limit(Setting.feeds_limit.to_i). + all + if @project + render_feed(@messages, :title => "#{@project}: #{@board}") + elsif @course + render_feed(@messages, :title => "#{@course}: #{@board}") + end + } + end end end diff --git a/app/views/blogs/index.js.erb b/app/views/blogs/index.js.erb index 6c8835f6f..cdbc3cc01 100644 --- a/app/views/blogs/index.js.erb +++ b/app/views/blogs/index.js.erb @@ -1 +1 @@ -$("#blog-list").html('<%= escape_javascript( render :partial => 'blogs/article', :locals => {:topics => @topics} ) %>'); \ No newline at end of file +$("#blog-list").replaceWith('<%= escape_javascript( render :partial => 'blogs/article', :locals => {:topics => @topics} ) %>'); \ No newline at end of file diff --git a/app/views/boards/show.js.erb b/app/views/boards/show.js.erb index c842197c7..cb7ee64a1 100644 --- a/app/views/boards/show.js.erb +++ b/app/views/boards/show.js.erb @@ -1,5 +1,5 @@ <% if @course %> - <%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1} %> + $("#course-boardlist").replaceWith('<%= escape_javascript( render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>'); <% else %> - $("#show_more_project_topic").replaceWith("<%= escape_javascript( render :partial => 'boards/project_show_detail',:locals => {:topics => @topics, :page => @page} )%>"); + $("#project-boardlist").replaceWith('<%= escape_javascript( render :partial => 'users/project_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>'); <% end %> \ No newline at end of file diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 3bb29282d..9b5ea305a 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -1,5 +1,5 @@
        -
        +

        问答区列表

        @@ -67,7 +67,7 @@
        \ No newline at end of file diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index 917eb2742..5dc1ac673 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -29,8 +29,9 @@ <% if activity.locked %> 锁 <% end %> + <% u = User.where("id=?",activity.author_id).first%> - <%= activity.project.name.to_s %> + 发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
        @@ -40,7 +41,7 @@ <% else %> <% content = activity.parent.content %> <% end %> -

        <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %>

        +

        <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>36 } %>

        发帖时间：<%= format_time(activity.created_on) %> @@ -51,7 +52,7 @@ <% else %> <% count=activity.children.count%> <% end %> -

        <%= count>0 ? "（#{count}）" : "" %>回复|<%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>赞

        +

        <%= count>0 ? "#{count}" : "0" %>回复|<%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %>赞

        diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb index ae24a26de..8d45510a1 100644 --- a/app/views/users/_user_course_list.html.erb +++ b/app/views/users/_user_course_list.html.erb @@ -28,7 +28,7 @@
      • - <%= l(:label_main_term)%> :  <%= current_time_and_term course %> + 开课学期:  <%= current_time_and_term course %> <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> <% homework_num = course.homework_commons.count %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 6349e4faa..3ec30ae51 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1320,7 +1320,7 @@ a{text-decoration:none} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} -.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} a:hover.list-title{ color:#269ac9;} .c_red{ font-weight:normal; font-size:12px;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e9e760a3c..eece88a23 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1514,7 +1514,7 @@ a{text-decoration:none} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} -.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} a:hover.list-title{ color:#269ac9;} .c_red{ font-weight:normal; font-size:12px;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 02a7759f9..ebedb1c30 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -1218,7 +1218,7 @@ a{text-decoration:none} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} -.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:635px;} +.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} a:hover.list-title{ color:#269ac9;} .c_red{ font-weight:normal; font-size:12px;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} From dd0053308494327840efa4d44361f24b3666432e Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 28 Apr 2016 10:32:32 +0800 Subject: [PATCH 32/33] =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=89=E8=A1=8C=E5=A5=BD=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_boardlist.html.erb | 2 +- app/views/users/_project_boardlist.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 12aafa0c3..2d45c0b83 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -41,7 +41,7 @@ <% else %> <% content = activity.parent.content %> <% end %> -

        <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>36} %>

        +

        <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54} %>

        • 发帖时间：<%= format_time(activity.created_on) %> diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb index 5dc1ac673..9d25b7bd5 100644 --- a/app/views/users/_project_boardlist.html.erb +++ b/app/views/users/_project_boardlist.html.erb @@ -41,7 +41,7 @@ <% else %> <% content = activity.parent.content %> <% end %> -

        <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>36 } %>

        +

        <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54 } %>

        发帖时间：<%= format_time(activity.created_on) %> From 22fc31eb8271f6ea98696a9773214ab05fc062c9 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 28 Apr 2016 10:39:11 +0800 Subject: [PATCH 33/33] =?UTF-8?q?=E5=85=88=E6=8A=8A=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/settings/edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/settings/edit.html.erb b/app/views/settings/edit.html.erb index 32e95db57..033254a07 100644 --- a/app/views/settings/edit.html.erb +++ b/app/views/settings/edit.html.erb @@ -1,6 +1,6 @@

        <%=l(:label_settings)%>

        <%= link_to @text,settings_hidden_non_project_path,:id => "hidden_non_project",:style => "float: right;margin-right: 60px;margin-top: 9px;"%> -<%= link_to @text_1,settings_hidden_courses_path,:id => "hidden_courses",:style => "float: right;margin-right: 60px;margin-top: 9px;"%> +
        <%= render_tabs administration_settings_tabs %>