@@ -215,5 +216,6 @@
var postContent = $("#message_description_<%= @article.id %>").html();
postContent = postContent.replace(/ /g," ");
$("#message_description_<%= @article.id %>").html(postContent);
+ autoUrl('message_description_<%= @article.id %>');
});
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index afeefd299..dd818fe72 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -1,226 +1,82 @@
-
-<% end %>
\ No newline at end of file
+<% end %>
+
\ No newline at end of file
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index eef7546e5..99c48a3ab 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -90,7 +90,7 @@
''+
''+
''+
''+
'
-
-
-<% end %>
\ No newline at end of file
+<% end %>
+
\ No newline at end of file
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index 6180dac8e..24a0ad047 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -42,9 +42,16 @@
- <%= 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%>
-
-
-
+
+
- <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time"} %>
- <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term"} %>
+ <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"edit_time"} %>
+ <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"edit_term"} %>
- <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time"} %>
- <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term"} %>
-
+ <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"edit_end_time"} %>
+ <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"edit_end_term"} %>
+
-
+
显示明码
-
+
学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。
diff --git a/app/views/courses/show_member_act_score.js.erb b/app/views/courses/show_member_act_score.js.erb
new file mode 100644
index 000000000..c6327d164
--- /dev/null
+++ b/app/views/courses/show_member_act_score.js.erb
@@ -0,0 +1,7 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'courses/show_member_act_score', :locals => {:member => @member}) %>');
+showModal('ajax-modal', '300px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("" +
+ "
");
+$('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("new-watcher");
\ No newline at end of file
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index 8be245958..66bc8ff9a 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -120,6 +120,7 @@
-<% end %>
\ No newline at end of file
+<% end %>
+
\ No newline at end of file
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index a24835fc1..875b9ec4c 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -54,9 +54,16 @@
- <% 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" %>
+
+
+
\ 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 f3fd1aa61..c52fa017e 100644
--- a/app/views/blogs/_article_list.html.erb
+++ b/app/views/blogs/_article_list.html.erb
@@ -38,7 +38,7 @@
+
+
- <% count=0 %>
- <% if activity.parent %>
- <% count=activity.parent.children.count%>
- <% else %>
- <% count=activity.children.count%>
- <% end %>
- 博客列表
+
+ 排序：
+ <%= 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, :type => @type, :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
<% 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} %>
+
-
-
-
- -
-
-
-
-
-
- 编辑 -
- 复制 -
- 删除 +
- + <% 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=> "list-title fl" %> + <% 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=> "list-title fl"%> + <% end %> + <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> + [已设为首页] + <% end %> + <% if activity.sticky == 1 %> + 顶 + <% end%> + <% if activity.locked %> + 锁 + <% 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}" :"0" %> + 回复 + | + <%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" :"0" %> + 赞 +
+
+
+ <% if topics.any? %> + <% topics.each do |activity| %> +--
+
-
+
-
-
- <% activity= activity.parent ? activity.parent : activity%>
- <% replies_all_i = 0 %>
- <% if count > 0 %>
- 回复
- <%= count>0 ? "（#{count}）" : "" %> ▪
-
- <% if activity.author == User.current %>
- 赞<%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %>
- <% 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 %>
-
-
+ <% else %>
+ -
- <% 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 %> - 赞<%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %> - <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> - <% end %> - --- <%= reply.content.html_safe %> --
- <% end %>
+ <% end %>
+
+
- <% end %>
-
- <% if !activity.locked? %>
- -
+ <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
-
- <% end %>
- <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
-
-
-
-
<%= l(:label_no_data) %>
+ <% end %> +
-
-
- <% 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..cb7ee64a1 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} )%>");
+ $("#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/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 402e00cf6..3b6d55d96 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -1,17 +1,17 @@
\ No newline at end of file
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index b0c4a067f..82123a767 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -33,35 +33,35 @@
-
-
+
+
+
@@ -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%>
<%= @user.name%>的博客
");
+$('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("new-watcher");
\ No newline at end of file
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index 8be245958..66bc8ff9a 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -120,6 +120,7 @@
@@ -214,5 +215,6 @@
postContent=postContent.replace(/ /g," ");
$(this).html(postContent);
});
+ autoUrl('message_description_<%= @article.id %>');
});
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index ec099cb09..f8fe7896c 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -87,10 +87,19 @@
var standard_ans = $.trim($("#question_standard_ans").val());
if(title.length == 0 || score.length == 0){
alert("题目标题/分数不能为空");
+ doc.one('click', function(){
+ add_poll_question($(this),quest_type);
+ });
}else if(!/^[1-9][0-9]*$/.test(score)) {
alert("分数必须是非零开头的数字");
+ doc.one('click', function(){
+ add_poll_question($(this),quest_type);
+ });
}else if(quest_type !=3 && standard_ans.length == 0) {
alert("标准答案不能为空");
+ doc.one('click', function(){
+ add_poll_question($(this),quest_type);
+ });
}else{
doc.parent().parent().parent().submit();}
}
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index 6fd6c201e..43628f104 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -54,9 +54,16 @@
'+
- ''+
+ ''+
'保存'+
''+
''+
@@ -77,6 +77,9 @@
'<% end%>'
);
$("#poll_questions_title").focus();
+ $("#add_new_question").one('click', function(){
+ add_poll_question($(this),3);
+ });
}
} else {
$("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index 3bcd6b83f..f9fd114dd 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -22,70 +22,6 @@
- <%= render :partial => "student_table"%>
+ <%= render :partial => "student_table" %>
-
-
-<% @exercise_users_list.each do |exercise|%>
-
- -
-
-
-
-
-
- - <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %> - -
-
-
-
-
- - <%=exercise.user.show_name %> - -
- - <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> - -
- - -- - -
-
--
- - - <% if exercise.created_at%> - <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%> - <% if @exercise.end_time <= exercise.created_at %> - [未答] - <% end %> - <% end %> - - -
- - <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%> - - -
+
+ 测验
+
+ (<%= @exercise_count%>人已交)
+
+ <% if !@is_teacher && @exercise_users_list.empty?%>
+ 您尚未提交
+ <% elsif !@is_teacher && !@exercise_users_list.empty?%>
+ 您已提交
+ <% end %>
+
+ <%#if @is_teacher || @exercise.exercise_status == 3%>
+
+ <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %>
+ <%# end%>
+
+
+
+
+
+ <%= render :partial => "student_table"%>
+
+
+
+<% @exercise_users_list.each do |exercise|%>
+
+ -
+
- 1 +
- + <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(exercise.user)) %> + +
- + <%=exercise.user.show_name %> +
- + <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> + +
- + -- + +
- + <% if exercise.created_at%> + <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%> + <% if @exercise.end_time <= exercise.created_at %> + [未答] + <% end %> + <% end %> + + +
- + <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%> + + +
-
-
- - - 姓名 - 学号 - 班级 - +
- - <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%> - <%# if @show_all && @order == "created_at"%> - <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <%# end%> - + <% @exercise_users_list.each do |exercise|%> + -
- - <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%> - <%# if @show_all && @order == "score"%> - <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> - <%# end%> - - \ No newline at end of file +
- + 序号 + + 姓名 + 学号 + 班级 + + +
- + <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%> + <%# if @show_all && @order == "created_at"%> + <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <%# end%> + + +
- + <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%> + <%# if @show_all && @order == "score"%> + <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%> + <%# end%> + +
-
<% 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%>
- -<% end%> \ No newline at end of file +<% end%> + + diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index faf141600..2a33a8acd 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -113,6 +113,9 @@ + <%# 更新访问数,刷新的时候更新访问次数 %> + <% update_visiti_count @organization %> + <%# over %>
@@ -131,6 +134,7 @@<%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %> +访问计数 <%= @organization.visits.to_i %> - -
| + 序号 + + 姓名 + 学号 + 班级 + | ++ <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%> + | ++ <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%> + | +||||||
|---|---|---|---|---|---|---|---|---|
| 1 | ++ <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;", :class => "mt15"),user_activities_path(exercise.user)) %> + | ++ <%=exercise.user.show_name %> + | ++ <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> + | ++ -- + | ++ | + <% if exercise.created_at%> + <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%> + <% if @exercise.end_time <= exercise.created_at %> + [未答] + <% end %> + <% end %> + | ++ <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%> + | +|
-
+
<% if memos.any? %>
<% memos.each do |topic| %>
+
diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb
index 92021f728..ec9a0bc54 100644
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@@ -6,15 +6,15 @@
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
new file mode 100644
index 000000000..799aaa42b
--- /dev/null
+++ b/app/views/layouts/base_org2.html.erb
@@ -0,0 +1,236 @@
+
+
+
+
+ <%= 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 -%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%# 更新访问数,刷新的时候更新访问次数 %>
+<% update_visiti_count @organization %>
+<%# over %>
+
+
<%= link_to image_tag(url_to_avatar(topic.author), :width => 50,:height => 50,:alt => '贴吧图片'), user_path(topic.author) if topic.author%>
-
-
<% end %>
-
+ <%= topic.content.html_safe%>
+
+
-
+
+ <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
+ <%= get_praise_num(topic)%>
+
+
+ <%= topic.content.html_safe%>
<% author = topic.last_reply.try(:author)%>
@@ -16,17 +30,14 @@
最后回复：<%= author.name%>
<%= format_date(topic.last_reply.created_at)%>
<% end%>
- 更新时间：<%= format_date(topic.updated_at)%>
-
-
- <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
- <%= get_praise_num(topic)%>
+ 更新时间：<%= format_date(topic.updated_at)%>
-
+ <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
+
<%= l(:label_no_data) %>
<% end %> diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index b0ed5a60c..61ffb8b10 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -41,9 +41,6 @@
<%= render :partial => 'show_topics',:locals => {:memos=>@memos}%>
- -
- <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
-
+
-
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
<% case @issue.tracker_id %> <% when 1%> - + 【缺陷】 <% when 2%> - + 【功能】 <% when 3%> - + 【支持】 <% when 4%> - + 【任务】 <% when 5%> - + 【周报】 <% end %> <%= @issue.subject %> <%= get_issue_priority(@issue.priority_id)[1] %>
@@ -28,7 +28,7 @@ <%= render :partial => 'action_menu' %> <% if @issue.description? || @issue.attachments.any? -%> -
+
+
+
\ No newline at end of file
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index aaf9c132f..197cd9c02 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -3,6 +3,7 @@
<% replies_all_i=replies_all_i + 1 %>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index c04081128..f5b421f62 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -5,17 +5,18 @@
<% if @issue.description? %>
<%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
<%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
@@ -43,4 +43,11 @@
<%= render :partial => 'issues/attributes_show' %>
-
\ No newline at end of file
+-
+ <%= link_to "资源库", user_resource_user_path(User.current, :type => 6), :class => "c_white f16 db p10" %>
+
<% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
<% else %>
<% end %>
-<% end%>
\ No newline at end of file
+<% end%>
+
+
diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
index f24eeb16e..16100a353 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|%>
+
+
+
+
+
+ 
+ <% else %>
+
+
+ -
+ <% @subfield_content.each do |field| %>
+ <% if is_default_field?(field) %>
+ <% case field.name %>
+ <% when 'activity' %>
+
+ <% when 'course' %>
+
+ <% when 'project' %>
+
+ <% end %>
+ <% else %>
+ <% if field.field_type == "Post" && field.hide == 0 %>
+
+
+
+ <% elsif field.field_type == "Resource" && field.hide == 0 %>
+
+ <% end %>
+ <% end %>
+ <% end %>
+ <% if User.current.admin_of_org?(@organization) %>
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+<%#= call_hook :view_layouts_base_body_bottom %>
+
+
+
+
+
+
+
+
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 64da94ebf..1fcf60d20 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -397,6 +397,9 @@
<% end %>
<% 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 == 3 %>
+ <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
+
+
+
+ <%= render :partial => 'organizations/org_subfield_leftM1', :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} %>
+ <% elsif field.status.to_i == 5 %>
+ <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
+ <% end %>
+ <% end %>
+
+ <% @subfield_content.each do |field| %>
+ <% if field.status.to_i == 6 %>
+ <%= 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 %>
+ <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
+ <% elsif field.status.to_i == 23 %>
+ <%= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
+ <% end %>
+ <% end %>
+
+
+
diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb
new file mode 100644
index 000000000..871e2cdea
--- /dev/null
+++ b/app/views/layouts/base_sub_domain.html.erb
@@ -0,0 +1,191 @@
+
+
+
+
+ <%= h html_title %>
+
+
+ <%= csrf_meta_tag %>
+ <%= favicon %>
+ <%= javascript_heads %>
+ <%= heads_for_theme %>
+ <%= stylesheet_link_tag 'org_new_style','jquery/jquery-ui-1.9.2', 'org2' %>
+ <%= 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 -%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%# 更新访问数,刷新的时候更新访问次数 %>
+ <% update_visiti_count @organization %>
+<%# over %>
+
+
+
+ <%= render_flash_messages %>
+ <%= yield %>
+ <%= call_hook :view_layouts_base_content %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 7b113ad5e..e43aa499f 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -105,13 +105,13 @@
+ <%= render :partial => 'organizations/org_logined_header' %>
+
+
+
+
+
+
+
+ -
+ <% @subfield_content.each do |field| %>
+ <% if is_default_field?(field) %>
+ <% case field.name %>
+ <% when 'activity' %>
+
+ <% when 'course' %>
+
+ <% when 'project' %>
+
+ <% end %>
+ <% else %>
+ <% if field.field_type == "Post" && field.hide == 0 %>
+
+
+
+ <% elsif field.field_type == "Resource" && field.hide == 0 %>
+
+ <% end %>
+ <% end %>
+ <% end %>
+ <% if User.current.admin_of_org?(@organization) %>
+
+ <% end %>
+
+
+
+ 
+
+
+
+
+
<%= 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%>
@@ -185,81 +185,90 @@
<%= 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)%>
-
+ <% end %>
<%# if @user.courses.visible.count > 0
- course_order_ids = "(" +
- CourseActivity.find_by_sql("SELECT c.course_id, updated_at FROM
+ 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 = Course.where("id in #{course_order_ids}")
+ else
courses = []
- end
+ end
%>
- <% if @user.courses.visible.count > 0
- 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)
- else
- courses = []
- end %>
-
-
+ -
-
-
-
- <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
-
+
+
+ <% if !courses.empty? %>
+
+ <% end %>
-
+ <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
+
- 项目
-
+ <%= 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%>
<%# if @user.projects.visible.count > 0
- project_order_ids = "(" +
- ForgeActivity.find_by_sql("SELECT p.project_id, p.updated_at FROM
- (SELECT fa.project_id, MAX(fa.updated_at) AS updated_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ")
+ 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.updated_at DESC limit 5").map {|p| p.project_id}.join(",") + ")"
- projects = Project.where("projects.id in #{project_order_ids}")
- else
- projects = []
- end
- %>
-
- <% if @user.projects.visible.count > 0
- projects = @user.projects.visible.select("projects.*, (SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)
+ 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 = []
end
%>
-
-
-
- <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
-
+
+
+ <% if !projects.empty? %>
+
+ <% end %>
-
+ <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
+
@@ -337,12 +346,30 @@