Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
24d7e0b3
Commit
24d7e0b3
authored
Oct 27, 2016
by
xiabin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
379c247d
32440620
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
151 additions
and
40 deletions
+151
-40
SiteController.php
src/backend/controllers/SiteController.php
+0
-2
index.php
src/backend/views/course/index.php
+1
-1
index.php
src/environments/prod/backend/web/index.php
+2
-2
QiniuCallbackController.php
src/frontend/controllers/QiniuCallbackController.php
+1
-0
index.php
src/frontend/views/classes-info/index.php
+64
-22
classCenter.php
src/frontend/views/layouts/classCenter.php
+12
-7
index.php
src/frontend/views/my-course/index.php
+2
-4
style.css
src/frontend/web/css/style.css
+69
-2
No files found.
src/backend/controllers/SiteController.php
View file @
24d7e0b3
...
...
@@ -3,10 +3,8 @@ namespace backend\controllers;
use
backend\models\LoginForm
;
use
Yii
;
use
yii\base\Event
;
use
yii\web\Controller
;
use
yii\filters\AccessControl
;
use
yii\web\User
;
/**
* Site controller
...
...
src/backend/views/course/index.php
View file @
24d7e0b3
...
...
@@ -52,7 +52,7 @@ $qiniu = \Yii::$app->qiniu;
<th>
时长/秒
</th>
<th>
文件大小
</th>
<th>
原始格式
</th>
<th>
价格/
元
</th>
<th>
价格/
分钟
</th>
<th>
免费试看/秒
</th>
<th>
ACTION
</th>
</tr>
...
...
src/environments/prod/backend/web/index.php
View file @
24d7e0b3
<?php
defined
(
'YII_DEBUG'
)
or
define
(
'YII_DEBUG'
,
tru
e
);
defined
(
'YII_ENV'
)
or
define
(
'YII_ENV'
,
'
dev
'
);
defined
(
'YII_DEBUG'
)
or
define
(
'YII_DEBUG'
,
fals
e
);
defined
(
'YII_ENV'
)
or
define
(
'YII_ENV'
,
'
prod
'
);
if
(
!
function_exists
(
'fnmatch'
))
{
function
fnmatch
(
$pattern
,
$string
)
{
...
...
src/frontend/controllers/QiniuCallbackController.php
View file @
24d7e0b3
...
...
@@ -14,6 +14,7 @@ use common\models\Courseware;
use
common\models\TranscodeQueue
;
use
common\models\UploadPools
;
use
Yii
;
use
yii\log\Logger
;
use
yii\web\Response
;
class
QiniuCallbackController
extends
\yii\web\Controller
...
...
src/frontend/views/classes-info/index.php
View file @
24d7e0b3
...
...
@@ -10,27 +10,69 @@ use yii\helpers\Url;
$this
->
title
=
'我的课堂'
;
?>
<div
class=
"class-name"
>
<span
class=
"nomal-class-name"
>
<?=
$model
->
name
?>
<!-- <a href="#"><i class="icon-mode_edit"></i></a>-->
</span>
<span
class=
"edit-class-name"
style=
"display: none"
><input
type=
"text"
class=
"input-r-control"
>
<button
class=
"btn btn-default"
>
保存
</button>
<button
class=
"btn btn-default"
>
取消
</button></span>
</div>
<div
class=
"class-intro"
>
<div
class=
"col-md-4"
>
<h3>
课程总数
</h3>
<p>
<?=
$courseCount
?>
<small>
讲
</small></p>
<a
href=
"
<?=
Url
::
to
([
'my-course/publish'
])
?>
"
>
发布课程
</a>
<i
class=
"icon-play"
></i>
</div>
<div
class=
"col-md-4"
>
<h3>
今日收益
</h3>
<p>
<?=
$todayIncome
?>
<small>
元
</small></p>
<a
href=
"
<?=
Url
::
to
([
'my-income/index'
])
?>
"
>
查看账单
</a>
<i
class=
"icon-clipboard"
></i>
<!-- Nav tabs -->
<ul
class=
"tab-headbox"
role=
"tablist"
>
<li
role=
"presentation"
class=
"active"
><a
href=
"#home"
role=
"tab"
data-toggle=
"tab"
>
基本信息
</a></li>
<li
role=
"presentation"
><a
href=
"#profile"
role=
"tab"
data-toggle=
"tab"
>
课堂设置
</a></li>
</ul>
<!-- Tab panes -->
<div
class=
"tab-content"
>
<div
role=
"tabpanel"
class=
"tab-pane active"
id=
"home"
>
<div
class=
"class-name m-t-50"
>
<span
class=
"nomal-class-name"
>
<?=
$model
->
name
?>
<!-- <a href="#"><i class="icon-mode_edit"></i></a>-->
</span>
<div
class=
"edit"
><a
href=
"#"
title=
"课堂设置"
><i
class=
"icon-mode_edit"
></i></a></div>
<span
class=
"edit-class-name"
style=
"display: none"
><input
type=
"text"
class=
"input-r-control"
>
<button
class=
"btn btn-default"
>
保存
</button>
<button
class=
"btn btn-default"
>
取消
</button></span>
</div>
<div
class=
"class-intro"
>
<div
class=
"col-md-4"
>
<h3>
课程总数
</h3>
<p>
<?=
$courseCount
?>
<small>
讲
</small></p>
<a
href=
"
<?=
Url
::
to
([
'my-course/publish'
])
?>
"
>
发布课程
</a>
<i
class=
"icon-play"
></i>
</div>
<div
class=
"col-md-4"
>
<h3>
今日收益
</h3>
<p>
<?=
$todayIncome
?>
<small>
元
</small></p>
<a
href=
"
<?=
Url
::
to
([
'my-income/index'
])
?>
"
>
查看账单
</a>
<i
class=
"icon-clipboard"
></i>
</div>
<div
class=
"col-md-4"
>
<h3>
今日发言
</h3>
<p>
<?=
$commentCount
?>
<small>
条
</small></p>
<i
class=
"icon-speech-bubble"
></i>
</div>
</div>
</div>
<div
class=
"col-md-4"
>
<h3>
今日发言
</h3>
<p>
<?=
$commentCount
?>
<small>
条
</small></p>
<i
class=
"icon-speech-bubble"
></i>
<div
role=
"tabpanel"
class=
"tab-pane"
id=
"profile"
>
<div
class=
"send-class apply-class-box m-t-50"
>
<div
class=
"tit"
>
课堂设置
</div>
<div
class=
"cls-part"
>
<div
class=
"tit"
>
课堂名称
</div>
<input
type=
"text"
class=
"input-r-control"
placeholder=
"请输入课堂名称"
>
</div>
<div
class=
"cls-part"
>
<div
class=
"tit"
>
课堂介绍
</div>
<div
class=
"cls-intro-textarea"
>
<textarea
name=
""
id=
""
class=
"input-r-control"
placeholder=
"填写分享或培训的案例链接……"
></textarea>
</div>
</div>
<div
class=
"btn-box text-center"
style=
"margin-top: 10px; "
>
<button
class=
"btn btn-link m-l-10"
>
取消
</button><button
class=
"btn btn-save m-l-10"
>
保存
</button>
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
src/frontend/views/layouts/classCenter.php
View file @
24d7e0b3
...
...
@@ -12,34 +12,39 @@ $this->beginContent('@app/views/layouts/center.php');
<div
class=
"logo"
><a
href=
"/"
><img
src=
"
<?=
Yii
::
$app
->
assetManager
->
baseUrl
?>
/img/logo.png"
></a></div>
<div
class=
"side-menu"
>
<!-- Contenedor -->
<ul
id=
"accordion"
class=
"accordion"
>
<ul
id=
"accordion"
class=
"accordion"
data-route=
"
<?=
Yii
::
$app
->
controller
->
id
?>
_
<?=
Yii
::
$app
->
requestedAction
->
id
?>
"
>
<li>
<div
class=
"link"
><i
class=
"icon-school"
></i>
我的课堂
<i
class=
"icon-navigate_next"
></i></div>
<ul
class=
"submenu"
>
<li
class=
"
active
"
><a
href=
"/classes-info"
>
课堂概况
</a></li>
<li><a
href=
"/teacher-manager"
>
讲师管理
</a></li>
<li
class=
"
RT_classes-info_index
"
><a
href=
"/classes-info"
>
课堂概况
</a></li>
<li
class=
"RT_teacher-manager_index RT_teacher-manager_edit RT_teacher-manager_add"
><a
href=
"/teacher-manager"
>
讲师管理
</a></li>
</ul>
</li>
<li>
<div
class=
"link"
><i
class=
"icon-play_circle_outline"
></i>
我的课程
<i
class=
"icon-navigate_next"
></i></div>
<ul
class=
"submenu"
>
<li><a
href=
"/my-course/publish"
>
发布课程
</a></li>
<li><a
href=
"/my-course"
>
课程列表
</a></li>
<li
class=
"RT_my-course_publish RT_my-course_edit"
><a
href=
"/my-course/publish"
>
发布课程
</a></li>
<li
class=
"RT_my-course_index"
><a
href=
"/my-course"
>
课程列表
</a></li>
</ul>
</li>
<li>
<div
class=
"link"
><i
class=
"icon-person_pin"
></i>
我的会员
<i
class=
"icon-navigate_next"
></i></div>
<ul
class=
"submenu"
>
<li><a
href=
"/my-member"
>
会员列表
</a></li>
<li
class=
"RT_my-member_index"
><a
href=
"/my-member"
>
会员列表
</a></li>
</ul>
</li>
<li>
<div
class=
"link"
><i
class=
"icon-layers"
></i>
知识有价
<i
class=
"icon-navigate_next"
></i></div>
<ul
class=
"submenu"
>
<li><a
href=
"/my-income"
>
购买记录
</a></li>
<li
class=
"RT_my-income_index"
><a
href=
"/my-income"
>
购买记录
</a></li>
</ul>
</li>
</ul>
<script>
var
accordion
=
$
(
"#accordion"
);
var
currentRoute
=
accordion
.
data
(
"route"
);
accordion
.
find
(
"li.RT_"
+
currentRoute
).
addClass
(
"active"
);
</script>
<a
class=
"loginout"
href=
"
<?=
\yii\helpers\Url
::
base
()
.
'/site/logout'
?>
"
><i
class=
"icon-power_settings_new"
></i>
退出登录
</a>
</div>
</div>
...
...
src/frontend/views/my-course/index.php
View file @
24d7e0b3
...
...
@@ -85,16 +85,14 @@ $qiniu = \Yii::$app->qiniu;
<?php
if
(
$course
[
'status'
]
==
'4'
)
:
?>
<div
class=
"mask-big"
>
<span>
<i
class=
"glyphicon glyphicon-refresh"
></i>
视频转码转码中...
<i
class=
"glyphicon glyphicon-refresh"
></i>
视频转码中...
</span></div>
<?php
endif
;
?>
<?php
if
(
$course
[
'status'
]
==
'3'
)
:
?>
<div
class=
"mask-big"
>
<span>
<i
class=
"glyphicon glyphicon-lock"
></i>
课程被锁定
<i
class=
"glyphicon glyphicon-lock"
></i>
课程被锁定
</span>
</div>
<?php
endif
;
?>
...
...
src/frontend/web/css/style.css
View file @
24d7e0b3
...
...
@@ -4,8 +4,8 @@ html {
background-color
:
#f3f3f3
;
font-family
:
"Helvitica Neue"
,
Helvitica
,
Arial
,
"Hiragino Sans GB"
,
"Microsoft YaHei"
,
"Arial Regular"
,
"Microsoft JhengHei"
,
sans-serif
;
}
a
.active
{
text-decoration
:
none
;
a
:link
,
a
:active
,
a
:visited
{
text-decoration
:
none
!important
;
}
.auto-main
{
padding-left
:
225px
;
...
...
@@ -206,6 +206,7 @@ a.active {
}
.class-name
{
position
:
relative
;
height
:
150px
;
border-radius
:
3px
;
background
:
url("../img/classNameBg.jpg")
center
center
no-repeat
;
...
...
@@ -214,6 +215,31 @@ a.active {
font-size
:
18px
;
color
:
#fff
;
}
.class-name
.edit
{
display
:
none
;
position
:
absolute
;
right
:
10px
;
top
:
10px
;
}
.class-name
.edit
a
{
display
:
block
;
width
:
30px
;
height
:
30px
;
text-align
:
center
;
line-height
:
30px
;
font-size
:
16px
;
background-color
:
rgba
(
0
,
0
,
0
,
.3
);
color
:
#fff
;
border-radius
:
100%
;
}
.class-name
.edit
a
:hover
{
background-color
:
#3f7de4
;
color
:
#fff
;
}
.class-name
:hover
.edit
{
display
:
block
;
}
.edit-class-name
input
{
display
:
inline-block
;
width
:
100px
;
...
...
@@ -918,6 +944,11 @@ textarea.input-r-control {
.video-list-cnt
.tit
{
font-size
:
14px
;
height
:
30px
;
line-height
:
30px
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.video-list-cnt
.tit
a
{
color
:
#333
;
...
...
@@ -1315,6 +1346,39 @@ textarea.input-r-control {
text-align
:
left
!important
;
}
/*选项卡*/
.tab-headbox
{
position
:
fixed
;
top
:
60px
;
left
:
0
;
width
:
100%
;
height
:
50px
;
background-color
:
#fff
;
border-bottom
:
1px
solid
#e7e7e7
;
text-align
:
center
;
}
.tab-headbox
li
{
display
:
inline-block
;
margin
:
0
10px
;
}
.tab-headbox
li
:first-child
{
margin-left
:
225px
;
}
.tab-headbox
li
.active
a
{
border-bottom
:
2px
solid
#3f7de4
;
}
.tab-headbox
li
a
{
display
:
block
;
height
:
49px
;
line-height
:
49px
;
color
:
#333
;
font-size
:
14px
;
}
.m-t-50
{
margin-top
:
50px
;
}
@media
(
max-width
:
767px
)
{
.tp-sidebar
{
...
...
@@ -1332,4 +1396,7 @@ textarea.input-r-control {
.add-box
{
width
:
auto
;
}
.tab-headbox
li
:first-child
{
margin-left
:
20px
;
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment