hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into rep_quality

Browse Source
rep_quality
huang 9 years ago
parent 3881e5c5c5 0d7e9d4f9b
commit 58176456e1
27 changed files with 301 additions and 233 deletions
Show Stats Download Patch File Download Diff File

4
app/api/mobile/entities/issue.rb
Unescape View File

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

4
app/api/mobile/entities/news.rb
Unescape View File

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

9
app/controllers/admin_controller.rb
Unescape View File

@ -777,8 +777,15 @@ class AdminController < ApplicationController
#留言列表
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
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
@page = (params['page'] || 1).to_i - 1
respond_to do |format|

4
app/views/courses/_new_member_list.html.erb
Unescape View File

@ -54,11 +54,11 @@
</a>
<ul>
<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>
<br/>
<% 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%>
</ul>
<% unless @course.course_groups.empty? %>

1
app/views/layouts/_new_feedback.html.erb
Unescape View File

@ -3,6 +3,7 @@
<div class="scrollsidebar" id="scrollsidebar">
<div class="side_content">
<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">
<a title="<%= l(:button_hide) %>" class="close_btn">
<span>

2
app/views/layouts/_syllabus_teacher_list.html.erb
Unescape View File

@ -8,7 +8,7 @@
<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 => "用户头像" %>
<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">
<% if teacher.user_extensions && teacher.user_extensions.identity %>
<%= get_user_roll teacher %>

13
app/views/layouts/base_syllabus.html.erb
Unescape View File

@ -38,7 +38,16 @@
<% end%>
</div>
<div class="cl"></div>
<div style="width:1000px; margin: 5px auto;">
<p class="sy_cgrey">
位置：&nbsp;&nbsp;
<%= link_to User.current, user_path(User.current.id), :class => 'sy_cgrey', :target => '_blank' %>
&nbsp;&gt;&nbsp;
<%= link_to '课程', user_courselist_user_path(User.current.id), :class => "sy_cgrey", :target => '_blank' %>
&nbsp;&gt;&nbsp;
<%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_cgrey" %>
</p>
</div>
<div class="sy_contanier">
<div class="sy_top">
<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();" -->
@ -50,7 +59,7 @@
<div class="sy_con_l fl mb15">
<%= yield %>
</div><!--sy_con_l end-->
<div class="sy_con_r fr ">
<div class="sy_con_r fr mb10">
<div class="sy_right_box" id="syllabus_base_info">
<%= render :partial => 'layouts/syllabus_base_info', :locals => {:syllabus => @syllabus} %>
</div>

2
app/views/messages/_course_show.html.erb
Unescape View File

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

2
app/views/student_work/_work_information.html.erb
Unescape View File

@ -6,7 +6,7 @@
</p>
<div class="f14 mt5" style="max-width: 425px; color:#808181; max-height:300px; overflow: auto;">
<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>
<p class="mt5">

7
public/assets/wechat/blog_detail.html
Unescape View File

@ -57,9 +57,14 @@
</div>
</div>
<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>
<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>
</div>

7
public/assets/wechat/course_discussion.html
Unescape View File

@ -57,7 +57,12 @@
</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>
</div>

7
public/assets/wechat/course_notice.html
Unescape View File

@ -72,7 +72,12 @@
</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>
</div>

2
public/assets/wechat/edit_class_member.html
Unescape View File

@ -15,7 +15,7 @@
</ul>
<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="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>

2
public/assets/wechat/edit_project_member.html
Unescape View File

@ -15,7 +15,7 @@
</ul>
<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="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>

7
public/assets/wechat/homework_detail.html
Unescape View File

@ -61,7 +61,12 @@
</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>
</div>

7
public/assets/wechat/issue_detail.html
Unescape View File

@ -78,7 +78,12 @@
</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>
</div>

1
public/assets/wechat/join_class.html
Unescape View File

@ -13,6 +13,7 @@
<div class="f12 c-grey6 mt10 ml15">
<span class="f13 c-grey3">提示</span>
<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>
</ul>

1
public/assets/wechat/join_project.html
Unescape View File

@ -12,6 +12,7 @@
<div class="f12 c-grey6 mt10 ml15">
<span class="f13 c-grey3">提示</span>
<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>
</ul>

7
public/assets/wechat/jour_message_detail.html
Unescape View File

@ -56,7 +56,12 @@
</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>
</div>

7
public/assets/wechat/project_discussion.html
Unescape View File

@ -57,7 +57,12 @@
</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>
</div>

BIN
public/images/syllabus/icons_syllabus.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

3
public/javascripts/wechat/controllers/class.js
Unescape View File

@ -23,10 +23,11 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
}).then(function successCallback(response) {
console.log(response.data);
if(response.data.status == 0){
vm.class_activities_page = response.data.page;
vm.course_activities_page = response.data.page;
if(response.data.page > 0)
{
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{
vm.course_activities = response.data.data;

1
public/javascripts/wechat/controllers/project.js
Unescape View File

@ -63,6 +63,7 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
if(response.data.page > 0)
{
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{
vm.project_activities = response.data.data;

3
public/stylesheets/css/courses.css
Unescape View File

@ -537,3 +537,6 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
/*20160520作品列表table*/
.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;}
/*20160901作品信息确认*/
#worksDescription p {word-wrap:break-word;}

4
public/stylesheets/css/public.css
Unescape View File

@ -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;}
/*意见反馈*/
.qr-code-border {border:2px solid #269ac9;}
html{ overflow-x:hidden;}
.scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
.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 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_info_block {width:150px; display:inline-block; vertical-align:bottom;}
/* 创建作品 homework,项目配置 */
.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_user{ margin:10px 15px 10px 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_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; }

2
public/stylesheets/css/structure.css
Unescape View File

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

9
public/stylesheets/syllabus.css
Unescape View File

@ -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;}
.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -53px 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_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 -52px no-repeat; width:20px; height:23px; display:block; }
.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: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{
background:#f5f5f5;
width: 100%;
width: 1000px;
height: 138px;
margin: 0 auto;
}
.sy_top_con{
background: url(../images/sy/bg_sy.jpg) no-repeat;
width: 1280px;
width: 1000px;
margin: 0 auto;
height: 108px;
text-align:center;

Write Preview
Loading…
Cancel
Save