Merge branch 'develop' into rep_quality

rep_quality
huang 9 years ago
commit 58176456e1

@ -52,6 +52,10 @@ module Mobile
time_from_now issue.created_on time_from_now issue.created_on
when :act_id when :act_id
issue.id issue.id
when :act_type
'Journal'
when :praise_count
get_activity_praise_num(issue)
end end
end end
end end

@ -36,6 +36,10 @@ module Mobile
time_from_now f.created_on time_from_now f.created_on
when :act_id when :act_id
f.id f.id
when :praise_count
get_activity_praise_num(f)
when :act_type
'Comment'
end end
elsif f.is_a?(Hash) && !f.key?(field) elsif f.is_a?(Hash) && !f.key?(field)

@ -777,8 +777,15 @@ class AdminController < ApplicationController
#留言列表 #留言列表
def leave_messages def leave_messages
notes1, notes2, notes3 = '', '', ''
begin
notes1 = Message.find(19292).content
notes2 = Message.find(19291).content
notes3 = Message.find(19504).content
rescue => e
end
@jour = JournalsForMessage.find_by_sql("SELECT * FROM journals_for_messages AS j1 @jour = JournalsForMessage.find_by_sql("SELECT * FROM journals_for_messages AS j1
WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) order by created_on desc") WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) AND j1.notes !='#{notes1}' AND j1.notes !='#{notes2}' AND j1.notes !='#{notes3}' order by created_on desc")
@jour = paginateHelper @jour,30 @jour = paginateHelper @jour,30
@page = (params['page'] || 1).to_i - 1 @page = (params['page'] || 1).to_i - 1
respond_to do |format| respond_to do |format|

@ -54,11 +54,11 @@
</a> </a>
<ul> <ul>
<li> <li>
<%= link_to("#{l(:label_bidding_user_studentname)}<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %> <%= link_to("#{l(:label_bidding_user_studentname)}<span class='hidden st_info_block'>#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
</li> </li>
<br/> <br/>
<% unless member.user.user_extensions.student_id == ''%> <% unless member.user.user_extensions.student_id == ''%>
<li><%= link_to("#{l(:label_bidding_user_studentcode)}<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li> <li><%= link_to("#{l(:label_bidding_user_studentcode)}<span class='hidden st_info_block'>#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
<% end%> <% end%>
</ul> </ul>
<% unless @course.course_groups.empty? %> <% unless @course.course_groups.empty? %>

@ -3,6 +3,7 @@
<div class="scrollsidebar" id="scrollsidebar"> <div class="scrollsidebar" id="scrollsidebar">
<div class="side_content"> <div class="side_content">
<div class="side_list"> <div class="side_list">
<div class="qr-code-border borderBottomNone"><img src="/images/wechat/trustie_QR.jpg" width="150" style="display:block;" /> </div>
<div class="side_title"> <div class="side_title">
<a title="<%= l(:button_hide) %>" class="close_btn"> <a title="<%= l(:button_hide) %>" class="close_btn">
<span> <span>

@ -1,21 +1,21 @@
<h3 class="sy_right_title">教师团队 <h3 class="sy_right_title">教师团队
<a href="javascript:void(0);" class="sy_cmore fr mr10 none" >增加教师</a> <a href="javascript:void(0);" class="sy_cmore fr mr10 none" >增加教师</a>
<div class="cl"></div> <div class="cl"></div>
</h3> </h3>
<ul class="sy_teachers_list"> <ul class="sy_teachers_list">
<% teacher = syllabus.user %> <% teacher = syllabus.user %>
<%# teachers.each do |teacher| %> <%# teachers.each do |teacher| %>
<li > <li >
<%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sy_teachers_img fl mr15"), user_path(teacher), :target => "_blank", :alt => "用户头像" %> <%= link_to image_tag(url_to_avatar(teacher), :width => "60", :height => "60", :class => "sy_teachers_img fl mr15"), user_path(teacher), :target => "_blank", :alt => "用户头像" %>
<div class="sy_teachers_txt fl"> <div class="sy_teachers_txt fl">
<%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name", :target => "_blank" %> <%= link_to teacher.show_name, user_path(teacher), :class => "sy_teachers_name hidden", :target => "_blank", :title => teacher.show_name %>
<span class="sy_teachers_span"> <span class="sy_teachers_span">
<% if teacher.user_extensions && teacher.user_extensions.identity %> <% if teacher.user_extensions && teacher.user_extensions.identity %>
<%= get_user_roll teacher %> <%= get_user_roll teacher %>
<% end%> <% end%>
</span> </span>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<%# end %> <%# end %>
</ul> </ul>

@ -1,148 +1,157 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title><%= h html_title %></title> <title><%= h html_title %></title>
<meta name="description" content="<%= Redmine::Info.app_name %>" /> <meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public',:media => 'all'%> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public',:media => 'all'%>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%> <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%>
<%= heads_for_theme %> <%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%> <%= yield :header_tags -%>
<!-- MathJax的配置 --> <!-- MathJax的配置 -->
<script type="text/javascript" src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> <script type="text/javascript" src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
</script> </script>
<!-- 配置 在生成的公式图片上去掉Math定义的右键菜单$$ $$ \( \) \[ \] 中的公式给予显示--> <!-- 配置 在生成的公式图片上去掉Math定义的右键菜单$$ $$ \( \) \[ \] 中的公式给予显示-->
<script type="text/x-mathjax-config"> <script type="text/x-mathjax-config">
MathJax.Hub.Config({ MathJax.Hub.Config({
showMathMenu: false, showMathMenu: false,
showMathMenuMSIE: false, showMathMenuMSIE: false,
tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]} tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
}); });
</script> </script>
</head> </head>
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<% is_current_user = User.current.logged?%> <% is_current_user = User.current.logged?%>
<div class="navContainer"> <div class="navContainer">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>
<% else%> <% else%>
<%= render :partial => 'layouts/unlogin_header' %> <%= render :partial => 'layouts/unlogin_header' %>
<% end%> <% end%>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div style="width:1000px; margin: 5px auto;">
<div class="sy_contanier"> <p class="sy_cgrey">
<div class="sy_top"> 位置:&nbsp;&nbsp;
<div class="sy_top_con" onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();"> <!-- onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();" --> <%= link_to User.current, user_path(User.current.id), :class => 'sy_cgrey', :target => '_blank' %>
<%=render :partial => 'layouts/syllabus_info' %> &nbsp;&gt;&nbsp;
</div> <%= link_to '课程', user_courselist_user_path(User.current.id), :class => "sy_cgrey", :target => '_blank' %>
</div> &nbsp;&gt;&nbsp;
<%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_cgrey" %>
<div class="sy_content "> </p>
<div class="sy_con_l fl mb15"> </div>
<%= yield %> <div class="sy_contanier">
</div><!--sy_con_l end--> <div class="sy_top">
<div class="sy_con_r fr "> <div class="sy_top_con" onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();"> <!-- onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();" -->
<div class="sy_right_box" id="syllabus_base_info"> <%=render :partial => 'layouts/syllabus_info' %>
<%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %> </div>
</div> </div>
<div class="sy_right_box">
<%= render :partial => 'layouts/syllabus_teacher_list', :locals => {:syllabus => @syllabus} %> <div class="sy_content ">
</div> <div class="sy_con_l fl mb15">
</div><!--sy_con_r end--> <%= yield %>
<div class="cl"></div> </div><!--sy_con_l end-->
</div><!--sy_content end--> <div class="sy_con_r fr mb10">
<div class="sy_right_box" id="syllabus_base_info">
</div> <%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>
<div class="cl"></div> </div>
<%= render :partial => 'layouts/footer' %> <div class="sy_right_box">
<div class="cl"></div> <%= render :partial => 'layouts/syllabus_teacher_list', :locals => {:syllabus => @syllabus} %>
</div>
<div id="ajax-modal" style="display:none;"></div> </div><!--sy_con_r end-->
<div id="ajax-indicator" style="display:none;"> <div class="cl"></div>
<span><%= l(:label_loading) %></span> </div><!--sy_content end-->
</div>
<script type="text/javascript"> </div>
$(function() { <div class="cl"></div>
$('#user_hide_course').hide(); <%= render :partial => 'layouts/footer' %>
$("#syllabus_title_edit").live("blur", function () { <div class="cl"></div>
edit_syllabus_title('<%= edit_syllabus_title_syllabus_path(@syllabus.id)%>');
}); <div id="ajax-modal" style="display:none;"></div>
$("#syllabus_eng_name_edit").live("blur", function () { <div id="ajax-indicator" style="display:none;">
edit_syllabus_eng_name('<%= edit_syllabus_eng_name_syllabus_path(@syllabus.id)%>'); <span><%= l(:label_loading) %></span>
}); </div>
<script type="text/javascript">
$("#courseMenu").mouseenter(function () { $(function() {
$("#topnav_course_menu").show(); $('#user_hide_course').hide();
}); $("#syllabus_title_edit").live("blur", function () {
$("#courseMenu").mouseleave(function () { edit_syllabus_title('<%= edit_syllabus_title_syllabus_path(@syllabus.id)%>');
$("#topnav_course_menu").hide(); });
}); $("#syllabus_eng_name_edit").live("blur", function () {
// Store variables edit_syllabus_eng_name('<%= edit_syllabus_eng_name_syllabus_path(@syllabus.id)%>');
var accordion_head = $('.accordion > li > a'), });
accordion_body = $('.accordion li > .sub-menu');
$("#courseMenu").mouseenter(function () {
// Click function $("#topnav_course_menu").show();
accordion_head.on('click', function(event) { });
// Disable header links $("#courseMenu").mouseleave(function () {
event.preventDefault(); $("#topnav_course_menu").hide();
// Show and hide the tabs on click });
if ($(this).attr('class') != 'active'){ // Store variables
accordion_body.slideUp('normal'); var accordion_head = $('.accordion > li > a'),
$(this).next().stop(true,true).slideToggle('normal'); accordion_body = $('.accordion li > .sub-menu');
accordion_head.removeClass('active');
$(this).addClass('active'); // Click function
} accordion_head.on('click', function(event) {
}); // Disable header links
}); event.preventDefault();
function leftCourseslistChange(){ // Show and hide the tabs on click
$('#homepageLeftMenuCourses').slideToggle(); if ($(this).attr('class') != 'active'){
$('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon"); accordion_body.slideUp('normal');
$('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon"); $(this).next().stop(true,true).slideToggle('normal');
accordion_head.removeClass('active');
} $(this).addClass('active');
function show_edit_base_info() { }
$("#syllabus_base_info").html("<%=escape_javascript(render :partial => 'layouts/syllabus_edit_info', :locals => {:syllabus => @syllabus}) %>"); });
} });
function g(o){return document.getElementById(o);} function leftCourseslistChange(){
function HoverLi(n){ $('#homepageLeftMenuCourses').slideToggle();
for(var i=1;i<=2;i++){ $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon");
//g('sy_tab_nav_'+i).className='sy_tab_nomal'; $('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon");
//g('sy_tab_con_'+i).className='undis';
} }
//g('sy_tab_con_'+n).className='dis'; function show_edit_base_info() {
//g('sy_tab_nav_'+n).className='sy_tab_hover'; $("#syllabus_base_info").html("<%=escape_javascript(render :partial => 'layouts/syllabus_edit_info', :locals => {:syllabus => @syllabus}) %>");
if(n == 1) { }
window.location.href = '<%=syllabus_path(@syllabus) %>'; function g(o){return document.getElementById(o);}
} else { function HoverLi(n){
window.location.href = '<%=syllabus_courselist_syllabus_path(@syllabus) %>'; for(var i=1;i<=2;i++){
} //g('sy_tab_nav_'+i).className='sy_tab_nomal';
} //g('sy_tab_con_'+i).className='undis';
//侧导航栏配置设置 }
$(".homepageLeftMenuCoursesLine").mouseover(function(){ //g('sy_tab_con_'+n).className='dis';
$(this).children(".shild").css("background","url(/images/hwork_icon.png) -82px -399px no-repeat"); //g('sy_tab_nav_'+n).className='sy_tab_hover';
$(this).children().css("color","#ffffff"); if(n == 1) {
}); window.location.href = '<%=syllabus_path(@syllabus) %>';
$(".homepageLeftMenuCoursesLine").mouseout(function(){ } else {
$(this).children(".shild").css("background","url(/images/hwork_icon.png) -6px -354px no-repeat"); window.location.href = '<%=syllabus_courselist_syllabus_path(@syllabus) %>';
$(this).children().css("color","#808080"); }
}); }
$(".subNavRow").mouseover(function(){ //侧导航栏配置设置
$(this).css("background-color","#269ac9"); $(".homepageLeftMenuCoursesLine").mouseover(function(){
$(this).children().css("color","#ffffff"); $(this).children(".shild").css("background","url(/images/hwork_icon.png) -82px -399px no-repeat");
}); $(this).children().css("color","#ffffff");
$(".subNavRow").mouseout(function(){ });
$(this).css("background-color","#ffffff"); $(".homepageLeftMenuCoursesLine").mouseout(function(){
$(this).children().css("color","#888888"); $(this).children(".shild").css("background","url(/images/hwork_icon.png) -6px -354px no-repeat");
}); $(this).children().css("color","#808080");
</script> });
</body> $(".subNavRow").mouseover(function(){
</html> $(this).css("background-color","#269ac9");
$(this).children().css("color","#ffffff");
});
$(".subNavRow").mouseout(function(){
$(this).css("background-color","#ffffff");
$(this).children().css("color","#888888");
});
</script>
</body>
</html>

@ -42,7 +42,6 @@
<ul> <ul>
<li class="homepagePostSettingIcon"> <li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText"> <ul class="homepagePostSettiongText">
<% if @topic.author.id == User.current.id %>
<li> <li>
<%= link_to( <%= link_to(
l(:button_edit), l(:button_edit),
@ -59,7 +58,6 @@
:class => 'postOptionLink' :class => 'postOptionLink'
) if @message.course_destroyable_by?(User.current) %> ) if @message.course_destroyable_by?(User.current) %>
</li> </li>
<% end %>
<li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{@message.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li> <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{@message.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
</ul> </ul>
</li> </li>

@ -1,44 +1,44 @@
<div id="popbox02"> <div id="popbox02">
<div class="ni_con"> <div class="ni_con">
<span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span> <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
<p class="f14 mt5"> <p class="f14 mt5">
<span class="fb">作品名称:</span><%=@student_work.name%> <span class="fb">作品名称:</span><%=@student_work.name%>
</p> </p>
<div class="f14 mt5" style="max-width: 425px; color:#808181; max-height:300px; overflow: auto;"> <div class="f14 mt5" style="max-width: 425px; color:#808181; max-height:300px; overflow: auto;">
<div class="fb fl dis">作品描述:</div> <div class="fb fl dis">作品描述:</div>
<div class="upload_img fl" style="max-width: 330px;"><%=@student_work.description.html_safe %></div> <div id="worksDescription" class="upload_img fl" style="max-width: 330px;"><%=@student_work.description.html_safe %></div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<p class="mt5"> <p class="mt5">
<span class="fl fb mr30">附</span><span class="fb fl">件:</span> <span class="fl fb mr30">附</span><span class="fb fl">件:</span>
<% if @student_work.attachments.empty? %> <% if @student_work.attachments.empty? %>
<span class="fl c_red"><%= "无附件"%></span> <span class="fl c_red"><%= "无附件"%></span>
<% else %> <% else %>
<div class="fl grey_c"> <div class="fl grey_c">
<% @student_work.attachments.each_with_index do |attachment,i| %> <% @student_work.attachments.each_with_index do |attachment,i| %>
<div id="attachment_<%= attachment.id%>"> <div id="attachment_<%= attachment.id%>">
<%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%> <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
<%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) %> <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) %>
<span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span> <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<% end -%> <% end -%>
<%#= render :partial => 'work_attachments_status', :locals => {:attachments => @student_work.attachments, :status => 2} %> <%#= render :partial => 'work_attachments_status', :locals => {:attachments => @student_work.attachments, :status => 2} %>
</div> </div>
<% end %> <% end %>
</p> </p>
<div class="cl"></div> <div class="cl"></div>
<div class="ni_btn mt10"> <div class="ni_btn mt10">
<a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" > <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px;margin-top:15px;" >
确&nbsp;定 确&nbsp;定
</a> </a>
<%= link_to("重 试", retry_work_student_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%> <%= link_to("重 试", retry_work_student_work_path(@student_work.id),:class => "tijiao",:style =>"margin-bottom: 15px;margin-top:15px;",:remote => true)%>
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
function clickOK() { function clickOK() {
window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>'; window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
} }
</script> </script>

@ -57,9 +57,14 @@
</div> </div>
</div> </div>
<div class="post-reply-content c-grey3 ml40"> <div class="post-reply-content c-grey3 ml40">
<div class="mult-reply-content mb15"> <div class="mult-reply-content mb5">
<div ng-bind-html="journal.content|safeHtml"></div> <div ng-bind-html="journal.content|safeHtml"></div>
</div> </div>
<div class="fr f13 mb5">
<div ng-if="!journal.praise_count" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span></span></div>
<div ng-if="journal.praise_count && !journal.has_praise" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
<div ng-if="journal.has_praise" ng-click="decreasePraise(journal);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
</div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

@ -57,7 +57,12 @@
</div> </div>
</div> </div>
<div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div> <div class="post-reply-content c-grey3 ml40 mb5" ng-bind-html="journal.content|safeHtml"></div>
<div class="fr f13 mb5">
<div ng-if="!journal.praise_count" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span></span></div>
<div ng-if="journal.praise_count && !journal.has_praise" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
<div ng-if="journal.has_praise" ng-click="decreasePraise(journal);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
</div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

@ -72,7 +72,12 @@
</div> </div>
</div> </div>
<div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div> <div class="post-reply-content c-grey3 ml40 mb5" ng-bind-html="journal.content|safeHtml"></div>
<div class="fr f13 mb5">
<div ng-if="!journal.praise_count" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span></span></div>
<div ng-if="journal.praise_count && !journal.has_praise" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
<div ng-if="journal.has_praise" ng-click="decreasePraise(journal);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
</div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

@ -15,7 +15,7 @@
</ul> </ul>
<div class="bottom-tab-wrap mt10"> <div class="bottom-tab-wrap mt10">
<a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a> <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
<a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab border-top link-blue2" ng-class="{'bg-grey':buttongrey}" >确定</a> <a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab border-top" ng-class="[{'bg-grey c-white':buttongrey},{'link-blue2':!buttongrey}]" >确定</a>
</div> </div>
</div> </div>

@ -15,7 +15,7 @@
</ul> </ul>
<div class="bottom-tab-wrap mt10"> <div class="bottom-tab-wrap mt10">
<a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a> <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
<a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab border-top link-blue2" ng-class="{'bg-grey':buttongrey}">确定</a> <a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab border-top" ng-class="[{'bg-grey c-white':buttongrey},{'link-blue2':!buttongrey}]" >确定</a>
</div> </div>
</div> </div>

@ -61,7 +61,12 @@
</div> </div>
</div> </div>
<div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div> <div class="post-reply-content c-grey3 ml40 mb5" ng-bind-html="journal.content|safeHtml"></div>
<div class="fr f13 mb5">
<div ng-if="!journal.praise_count" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span></span></div>
<div ng-if="journal.praise_count && !journal.has_praise" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
<div ng-if="journal.has_praise" ng-click="decreasePraise(journal);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
</div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

@ -78,7 +78,12 @@
</div> </div>
</div> </div>
<div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div> <div class="post-reply-content c-grey3 ml40 mb5" ng-bind-html="journal.content|safeHtml"></div>
<div class="fr f13 mb5">
<div ng-if="!journal.praise_count" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span></span></div>
<div ng-if="journal.praise_count && !journal.has_praise" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
<div ng-if="journal.has_praise" ng-click="decreasePraise(journal);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
</div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

@ -13,6 +13,7 @@
<div class="f12 c-grey6 mt10 ml15"> <div class="f12 c-grey6 mt10 ml15">
<span class="f13 c-grey3">提示</span> <span class="f13 c-grey3">提示</span>
<ul class="mb15 mt5 ml10 new-tip"> <ul class="mb15 mt5 ml10 new-tip">
<li><span class="project-intro-dot"></span>邀请码在创建班级时产生,请向班级老师获取</li>
<li><span class="project-intro-dot"></span>教师、助教角色需要班级管理员审批</li> <li><span class="project-intro-dot"></span>教师、助教角色需要班级管理员审批</li>
<li><span class="project-intro-dot"></span>学生角色无需管理员审批</li> <li><span class="project-intro-dot"></span>学生角色无需管理员审批</li>
</ul> </ul>

@ -12,6 +12,7 @@
<div class="f12 c-grey6 mt10 ml15"> <div class="f12 c-grey6 mt10 ml15">
<span class="f13 c-grey3">提示</span> <span class="f13 c-grey3">提示</span>
<ul class="mb15 mt5 ml10 new-tip"> <ul class="mb15 mt5 ml10 new-tip">
<li><span class="project-intro-dot"></span>邀请码在创建项目时产生,请向项目管理员获取</li>
<li><span class="project-intro-dot"></span>管理人员、开发人员角色需要项目管理员审批</li> <li><span class="project-intro-dot"></span>管理人员、开发人员角色需要项目管理员审批</li>
<li><span class="project-intro-dot"></span>报告人员角色无需管理员审批</li> <li><span class="project-intro-dot"></span>报告人员角色无需管理员审批</li>
</ul> </ul>

@ -56,7 +56,12 @@
</div> </div>
</div> </div>
<div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div> <div class="post-reply-content c-grey3 ml40 mb5" ng-bind-html="journal.content|safeHtml"></div>
<div class="fr f13 mb5">
<div ng-if="!journal.praise_count" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span></span></div>
<div ng-if="journal.praise_count && !journal.has_praise" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
<div ng-if="journal.has_praise" ng-click="decreasePraise(journal);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
</div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

@ -57,7 +57,12 @@
</div> </div>
</div> </div>
<div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div> <div class="post-reply-content c-grey3 ml40 mb5" ng-bind-html="journal.content|safeHtml"></div>
<div class="fr f13 mb5">
<div ng-if="!journal.praise_count" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span></span></div>
<div ng-if="journal.praise_count && !journal.has_praise" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
<div ng-if="journal.has_praise" ng-click="decreasePraise(journal);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
</div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

@ -23,10 +23,11 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data); console.log(response.data);
if(response.data.status == 0){ if(response.data.status == 0){
vm.class_activities_page = response.data.page; vm.course_activities_page = response.data.page;
if(response.data.page > 0) if(response.data.page > 0)
{ {
vm.course_activities = vm.course_activities.concat(response.data.data); vm.course_activities = vm.course_activities.concat(response.data.data);
vm.course_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
} }
else{ else{
vm.course_activities = response.data.data; vm.course_activities = response.data.data;

@ -63,6 +63,7 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
if(response.data.page > 0) if(response.data.page > 0)
{ {
vm.project_activities = vm.project_activities.concat(response.data.data); vm.project_activities = vm.project_activities.concat(response.data.data);
vm.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
} }
else{ else{
vm.project_activities = response.data.data; vm.project_activities = response.data.data;

@ -536,4 +536,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
/*20160520作品列表table*/ /*20160520作品列表table*/
.hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;} .hwork-table-wrap {width:720px; border-collapse:collapse; vertical-align:middle; table-layout:fixed;}
.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;} .hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;}
/*20160901作品信息确认*/
#worksDescription p {word-wrap:break-word;}

@ -116,6 +116,7 @@ a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px n
.softwareIcon {background:url(/images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;} .softwareIcon {background:url(/images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;}
/*意见反馈*/ /*意见反馈*/
.qr-code-border {border:2px solid #269ac9;}
html{ overflow-x:hidden;} html{ overflow-x:hidden;}
.scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; } .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
.side_content{width:154px; height:auto; overflow:hidden; float:left; } .side_content{width:154px; height:auto; overflow:hidden; float:left; }
@ -750,6 +751,7 @@ a:hover.st_add{ color:#ff8e15;}
.classbox_on{ border:1px solid #f8df8c; background:#f6f098; padding:0 3px; float:left; margin-left:15px;} .classbox_on{ border:1px solid #f8df8c; background:#f6f098; padding:0 3px; float:left; margin-left:15px;}
.classbox_on a{ color:#716cad;} .classbox_on a{ color:#716cad;}
.st_list_score {width:105px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; vertical-align:middle; font-size:12px; text-align:center;} .st_list_score {width:105px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; vertical-align:middle; font-size:12px; text-align:center;}
.st_info_block {width:150px; display:inline-block; vertical-align:bottom;}
/* 创建作品 homework,项目配置 */ /* 创建作品 homework,项目配置 */
.hwork_new{ color:#4c4c4c;} .hwork_new{ color:#4c4c4c;}
@ -1385,7 +1387,7 @@ a.content-username:hover{ color:#297fb8;}
.orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;} .orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
.orig_user{ margin:10px 15px 10px 5px;} .orig_user{ margin:10px 15px 10px 5px;}
.orig_user span{ color:#999; padding-right:5px;} .orig_user span{ color:#999; padding-right:5px;}
.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; } .orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; word-wrap:break-word; }
.orig_content img {max-width:100%;} .orig_content img {max-width:100%;}
.orig_right{ width:80%; margin-top:5px;} .orig_right{ width:80%; margin-top:5px;}
a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; } a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }

@ -499,7 +499,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
.user_leftnav{ width:240px;} .user_leftnav{ width:240px;}
.users_accordion li > a { .users_accordion li > a {
display: block; display: block;
padding: 0 10px 0 32px; padding: 0 25px 0 32px;
height:49px; height:49px;
line-height:49px; line-height:49px;
color: #333; color: #333;

@ -74,8 +74,8 @@ input.syllabus_input_min{
/*课程大纲-课程列表*/ /*课程大纲-课程列表*/
.icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;} .icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;}
.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -53px no-repeat; width:20px; height:23px; display:block; cursor:pointer; } .icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -50px no-repeat; width:20px; height:23px; display:block; cursor:pointer; }
.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -53px no-repeat; width:20px; height:23px; display:block; } .icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -52px no-repeat; width:20px; height:23px; display:block; }
.syllabus_courses_box {position:relative;} .syllabus_courses_box {position:relative;}
.icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; position:absolute; right:10px; top:10px; } .icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; position:absolute; right:10px; top:10px; }
.icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; } .icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; }
@ -113,12 +113,13 @@ a.syllabus_class_title{ font-size:14px; color:#333; max-width:480px; margin-bott
/* 课程大纲头部 */ /* 课程大纲头部 */
.sy_top{ .sy_top{
background:#f5f5f5; background:#f5f5f5;
width: 100%; width: 1000px;
height: 138px; height: 138px;
margin: 0 auto;
} }
.sy_top_con{ .sy_top_con{
background: url(../images/sy/bg_sy.jpg) no-repeat; background: url(../images/sy/bg_sy.jpg) no-repeat;
width: 1280px; width: 1000px;
margin: 0 auto; margin: 0 auto;
height: 108px; height: 108px;
text-align:center; text-align:center;

Loading…
Cancel
Save