Commit 32440620 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent ed9c662a
...@@ -10,12 +10,25 @@ use yii\helpers\Url; ...@@ -10,12 +10,25 @@ use yii\helpers\Url;
$this->title = '我的课堂'; $this->title = '我的课堂';
?> ?>
<div class="class-name">
<!-- 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> <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> <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>
<div class="class-intro"> <div class="class-intro">
<div class="col-md-4"> <div class="col-md-4">
<h3>课程总数</h3> <h3>课程总数</h3>
<p><?=$courseCount?><small>讲</small></p> <p><?=$courseCount?><small>讲</small></p>
...@@ -33,4 +46,33 @@ $this->title = '我的课堂'; ...@@ -33,4 +46,33 @@ $this->title = '我的课堂';
<p><?=$commentCount?><small>条</small></p> <p><?=$commentCount?><small>条</small></p>
<i class="icon-speech-bubble"></i> <i class="icon-speech-bubble"></i>
</div> </div>
</div>
</div>
<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> </div>
...@@ -4,8 +4,8 @@ html { ...@@ -4,8 +4,8 @@ html {
background-color: #f3f3f3; background-color: #f3f3f3;
font-family: "Helvitica Neue",Helvitica,Arial,"Hiragino Sans GB","Microsoft YaHei","Arial Regular","Microsoft JhengHei",sans-serif; font-family: "Helvitica Neue",Helvitica,Arial,"Hiragino Sans GB","Microsoft YaHei","Arial Regular","Microsoft JhengHei",sans-serif;
} }
a.active { a:link,a:active,a:visited {
text-decoration: none; text-decoration: none!important;
} }
.auto-main { .auto-main {
padding-left: 225px; padding-left: 225px;
...@@ -206,6 +206,7 @@ a.active { ...@@ -206,6 +206,7 @@ a.active {
} }
.class-name { .class-name {
position: relative;
height: 150px; height: 150px;
border-radius: 3px; border-radius: 3px;
background: url("../img/classNameBg.jpg") center center no-repeat; background: url("../img/classNameBg.jpg") center center no-repeat;
...@@ -214,6 +215,31 @@ a.active { ...@@ -214,6 +215,31 @@ a.active {
font-size: 18px; font-size: 18px;
color: #fff; 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{ .edit-class-name input{
display: inline-block; display: inline-block;
width: 100px; width: 100px;
...@@ -918,6 +944,11 @@ textarea.input-r-control { ...@@ -918,6 +944,11 @@ textarea.input-r-control {
.video-list-cnt .tit { .video-list-cnt .tit {
font-size: 14px; font-size: 14px;
height: 30px;
line-height: 30px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.video-list-cnt .tit a { .video-list-cnt .tit a {
color: #333; color: #333;
...@@ -1315,6 +1346,39 @@ textarea.input-r-control { ...@@ -1315,6 +1346,39 @@ textarea.input-r-control {
text-align: left!important; 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) { @media (max-width: 767px) {
.tp-sidebar { .tp-sidebar {
...@@ -1332,4 +1396,7 @@ textarea.input-r-control { ...@@ -1332,4 +1396,7 @@ textarea.input-r-control {
.add-box { .add-box {
width: auto; width: auto;
} }
.tab-headbox li:first-child{
margin-left: 20px;
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment