jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

This commit is contained in:
guange 2016-07-15 18:11:01 +08:00
parent c02245adfb 69009122e6
commit 82aa369687
7 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/views/wechats/user_activities.html.erb
View File

@ -28,31 +28,31 @@
<!--<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>--> <!--<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>-->
<script src="/javascripts/wechat/build/angular.all.min.js"></script> <script src="/javascripts/wechat/build/angular.all.min.js"></script>
<script src="/javascripts/wechat/build/app.min.js?version=20160715-1449"></script> <!--<script src="/javascripts/wechat/build/app.min.js?version=20160715-1449"></script>-->
<!-- <script src="/javascripts/wechat/app.js"></script> --> <script src ="/javascripts/wechat/app.js"></script>
<!-- <script src="/javascripts/wechat/others/factory.js"></script> --> <script src="/javascripts/wechat/others/factory.js"></script>
<!-- <script src="/javascripts/wechat/others/filter.js"></script> --> <script src="/javascripts/wechat/others/filter.js"></script>
<!-- <script src="/javascripts/wechat/directives/alert.js"></script> --> <script src="/javascripts/wechat/directives/alert.js"></script>
<!-- <script src="/javascripts/wechat/directives/form_validate.js"></script> --> <script src="/javascripts/wechat/directives/form_validate.js"></script>
<!-- <script src="/javascripts/wechat/directives/input_auto.js"></script> --> <script src="/javascripts/wechat/directives/input_auto.js"></script>
<!-- <script src="/javascripts/wechat/directives/loading_spinner.js"></script> --> <script src="/javascripts/wechat/directives/loading_spinner.js"></script>
<!-- <script src="/javascripts/wechat/controllers/reg.js"></script> --> <script src="/javascripts/wechat/controllers/reg.js"></script>
<!-- <script src="/javascripts/wechat/controllers/invite_code.js"></script> --> <script src="/javascripts/wechat/controllers/invite_code.js"></script>
<!-- <script src="/javascripts/wechat/controllers/login.js"></script> --> <script src="/javascripts/wechat/controllers/login.js"></script>
<!-- <script src="/javascripts/wechat/controllers/activity.js"></script> --> <script src="/javascripts/wechat/controllers/activity.js"></script>
<!-- <script src="/javascripts/wechat/controllers/new_class.js"></script> --> <script src="/javascripts/wechat/controllers/new_class.js"></script>
<!-- <script src="/javascripts/wechat/controllers/edit_class.js"></script> --> <script src="/javascripts/wechat/controllers/edit_class.js"></script>
<!-- <script src="/javascripts/wechat/controllers/blog.js"></script> --> <script src="/javascripts/wechat/controllers/blog.js"></script>
<!-- <script src="/javascripts/wechat/controllers/course_notice.js"></script> --> <script src="/javascripts/wechat/controllers/course_notice.js"></script>
<!-- <script src="/javascripts/wechat/controllers/discussion.js"></script> --> <script src="/javascripts/wechat/controllers/discussion.js"></script>
<!-- <script src="/javascripts/wechat/controllers/homework.js"></script> --> <script src="/javascripts/wechat/controllers/homework.js"></script>
<!-- <script src="/javascripts/wechat/controllers/issue.js"></script> --> <script src="/javascripts/wechat/controllers/issue.js"></script>
<!-- <script src="/javascripts/wechat/controllers/journals.js"></script> --> <script src="/javascripts/wechat/controllers/journals.js"></script>
<!-- <script src="/javascripts/wechat/controllers/class.js"></script> --> <script src="/javascripts/wechat/controllers/class.js"></script>
<!-- <script src="/javascripts/wechat/controllers/class_list.js"></script> --> <script src="/javascripts/wechat/controllers/class_list.js"></script>
<!-- <script src="/javascripts/wechat/controllers/myresource.js"></script> --> <script src="/javascripts/wechat/controllers/myresource.js?version=20160715-1737"></script>
<!-- <script src="/javascripts/wechat/controllers/send_class_list.js"></script> --> <script src="/javascripts/wechat/controllers/send_class_list.js"></script>
<!-- <script src="/javascripts/wechat/others/routes.js"></script> --> <script src="/javascripts/wechat/others/routes.js"></script>
</body> </body>
</html> </html>

4
public/assets/wechat/class_list.html
View File

@ -4,7 +4,7 @@
<div> <div>
<div class="course-diff-row"><span class="c-blue f13 ml10">我创建的课程</span></div> <div class="course-diff-row"><span class="c-blue f13 ml10">我创建的课程</span></div>
<div ng-show = "syllabus.can_setting" ng-repeat="syllabus in syllabuses"> <div ng-show = "syllabus.can_setting" ng-repeat="syllabus in syllabuses">
<div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div> <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
<ul ng-show="syllabus.show_plus" class="class-list f13 c-grey3"> <ul ng-show="syllabus.show_plus" class="class-list f13 c-grey3">
<li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}"> <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
<img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /> <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
@ -18,7 +18,7 @@
<div> <div>
<div class="course-diff-row border-top mt10"><span class="c-blue f13 ml10">我参与的课程</span></div> <div class="course-diff-row border-top mt10"><span class="c-blue f13 ml10">我参与的课程</span></div>
<div ng-show = "!syllabus.can_setting" ng-repeat="syllabus in syllabuses"> <div ng-show = "!syllabus.can_setting" ng-repeat="syllabus in syllabuses">
<div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div> <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 border-top-none"><img src="/images/wechat/plus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
<ul ng-show="syllabus.show_plus" class="class-list f13 c-grey3"> <ul ng-show="syllabus.show_plus" class="class-list f13 c-grey3">
<li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}"> <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
<img src="/images/wechat/dot.png" width="15px" class="class-list-dot" /> <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />

4
public/assets/wechat/edit_class.html
View File

@ -3,9 +3,9 @@
<div class="blue-title">管理课程</div> <div class="blue-title">管理课程</div>
<form novalidate name="classForm"> <form novalidate name="classForm">
<div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input class="new-class-input ml25 c-black" ng-model="syllabus.tmptitle" required placeholder="请输入课程名" /></div> <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">课程</span><input ng-change="fadeText()" ng-class="['new-class-input ml25', {'c-grey':change} ]" ng-model="syllabus.tmptitle" required placeholder="请输入课程名" /></div>
<div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses" ng-show="course.can_setting"><span class="fl ml15 c-grey3">班级</span><input required class="new-class-input ml25 c-black" ng-model="course.tmpname" placeholder="请输入班级名" /><a ng-click="deleteClass($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div> <div class="course-list-row f13 c-grey3 mt10" ng-repeat="course in syllabus.courses" ng-show="course.can_setting"><span class="fl ml15 c-grey3">班级</span><input ng-change="fadeText()" required ng-class="['new-class-input ml25', {'c-grey':change} ]" ng-model="course.tmpname" placeholder="请输入班级名" /><a ng-click="deleteClass($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
<div class="tac"><a ng-click="addClass()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div> <div class="tac"><a ng-click="addClass()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增班级</a></div>
<a ng-click="newClass(classForm, syllabus)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a> <a ng-click="newClass(classForm, syllabus)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
</form> </form>

4
public/javascripts/wechat/controllers/edit_class.js
View File

@ -107,4 +107,8 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
} }
vm.fadeText = function () {
$scope.change = true;
}
}] ); }] );

5
public/stylesheets/weui/weixin.css
View File

@ -43,7 +43,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4e
.mr55 {margin-right:55px;} .mr55 {margin-right:55px;}
.c-red {color:#e81a1a;} .c-red {color:#e81a1a;}
.c-blue {color:#269ac9;} .c-blue {color:#269ac9;}
.c-grey {color:#9a9a9a;} .c-grey {color:#9a9a9a !important;}
.c-grey2 {color:#707070;} .c-grey2 {color:#707070;}
.c-grey3 {color:#555555;} .c-grey3 {color:#555555;}
.c-grey4 {color:#888888;} .c-grey4 {color:#888888;}
@ -198,13 +198,14 @@ a.underline {text-decoration:underline;}
.other-from-width {max-width:80%;} .other-from-width {max-width:80%;}
/*20160614班级列表*/ /*20160614班级列表*/
.course-diff-row {width:100%; height:28px; line-height:28px; vertical-align:middle; background-color:#fff;} .course-diff-row {width:100%; height:28px; line-height:28px; vertical-align:middle; background-color:#fff; border-bottom:1px solid #ccc;}
.course-list-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-top:1px solid #ccc; border-bottom:1px solid #ccc; background-color:#fff;} .course-list-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-top:1px solid #ccc; border-bottom:1px solid #ccc; background-color:#fff;}
.class-list {width:100%; border-bottom:1px solid #ccc;} .class-list {width:100%; border-bottom:1px solid #ccc;}
.class-list li {height:40px; line-height:40px; vertical-align:middle; margin:0 25px; border-left:1px solid #ccc; border-bottom:1px solid #ccc; position:relative;} .class-list li {height:40px; line-height:40px; vertical-align:middle; margin:0 25px; border-left:1px solid #ccc; border-bottom:1px solid #ccc; position:relative;}
.class-list-name {max-width:75%; display:inline-block;} .class-list-name {max-width:75%; display:inline-block;}
.class-list-dot {position:absolute; top:13px; left:-8px;} .class-list-dot {position:absolute; top:13px; left:-8px;}
.border-bottom-none {border-bottom:none !important;} .border-bottom-none {border-bottom:none !important;}
.border-top-none {border-top:none !important;}
.students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;} .students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;}
.new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;} .new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
.join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;} .join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}

0
show Normal file
View File