Commit 734defc5 authored by xiabin's avatar xiabin

Merge remote-tracking branch 'origin/dev' into dev

parents 81842382 f5b42e48
...@@ -17,27 +17,27 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -17,27 +17,27 @@ $this->beginContent('@app/views/layouts/center.php');
<!-- Contenedor --> <!-- Contenedor -->
<ul id="accordion" class="accordion"> <ul id="accordion" class="accordion">
<li> <li>
<div class="link"><i class="icon-palette"></i>我的课堂<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-school"></i>我的课堂<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li class="active"><a href="/classes-info">课堂概况</a></li> <li class="active"><a href="/classes-info">课堂概况</a></li>
<li><a href="/teacher-manager">讲师管理</a></li> <li><a href="/teacher-manager">讲师管理</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-ondemand_video"></i>我的课程<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-play_circle_outline"></i>我的课程<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li><a href="/my-course/publish">发布课程</a></li> <li><a href="/my-course/publish">发布课程</a></li>
<li><a href="/my-course">课程列表</a></li> <li><a href="/my-course">课程列表</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-fingerprint"></i>我的会员<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-person_pin"></i>我的会员<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li><a href="/my-member">会员列表</a></li> <li><a href="/my-member">会员列表</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-bell"></i>知识有价<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-layers"></i>知识有价<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li><a href="/my-income">购买记录</a></li> <li><a href="/my-income">购买记录</a></li>
</ul> </ul>
......
...@@ -19,7 +19,7 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -19,7 +19,7 @@ $baseUrl = \yii\helpers\Url::base();
<meta charset="<?= Yii::$app->charset ?>"> <meta charset="<?= Yii::$app->charset ?>">
<meta name="description" content=""> <meta name="description" content="">
<meta name="keywords" content=""> <meta name="keywords" content="">
<!-- Use latest IE randering angine and switch on chrome Frame if available --> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="<?= AppAsset::getStaticUrl('img/favicon.ico') ?>"> <link rel="shortcut icon" href="<?= AppAsset::getStaticUrl('img/favicon.ico') ?>">
<?= Html::csrfMetaTags() ?> <?= Html::csrfMetaTags() ?>
......
...@@ -21,19 +21,19 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -21,19 +21,19 @@ $this->beginContent('@app/views/layouts/center.php');
<ul class="simple-menu"> <ul class="simple-menu">
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'info') ? 'class = "active"' : '' ?>> <li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'info') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center' ?>"><i class="glyphicon glyphicon-th-list"></i>基本信息</a> <a href="<?= $baseUrl . '/user-center' ?>"><i class="icon-person_pin"></i>基本信息</a>
</li> </li>
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'purchased-course') ? 'class = "active"' : '' ?>> <li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'purchased-course') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/purchased-course' ?>"><i <a href="<?= $baseUrl . '/user-center/purchased-course' ?>"><i
class="glyphicon glyphicon-ok"></i>已购课程</a></li> class="icon-shop"></i>已购课程</a></li>
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'favorite') ? 'class = "active"' : '' ?>> <li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'favorite') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/favorite' ?>"><i class="glyphicon glyphicon-star"></i>收藏纪录</a> <a href="<?= $baseUrl . '/user-center/favorite' ?>"><i class="icon-stars"></i>收藏纪录</a>
</li> </li>
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'browse-record') ? 'class = "active"' : '' ?>> <li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'browse-record') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/browse-record' ?>"><i class="glyphicon glyphicon-eye-open"></i>浏览记录</a> <a href="<?= $baseUrl . '/user-center/browse-record' ?>"><i class="icon-visibility"></i>浏览记录</a>
</li> </li>
<li><a href="<?=$baseUrl .'/my-course'?>"><i class="glyphicon glyphicon-play-circle"></i>我的课堂</a></li> <li><a href="<?=$baseUrl .'/my-course'?>"><i class="icon-school"></i>我的课堂</a></li>
<li><a href="<?=$baseUrl .'/site/logout'?>"><i class="glyphicon glyphicon-off"></i>退出登录</a></li> <li><a href="<?=$baseUrl .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a></li>
</ul> </ul>
<div class="apply-class"> <div class="apply-class">
......
...@@ -12,13 +12,15 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -12,13 +12,15 @@ $baseUrl = \yii\helpers\Url::base();
<h3>云涯</h3> <h3>云涯</h3>
<p>欢迎来到最课堂,专注在线直播</p> <p>欢迎来到最课堂,专注在线直播</p>
<div id="myTab" class="tab-a"> <div id="myTab" class="tab-a">
<ul> <ul>
<li class="active"><a href="<?= $baseUrl . "/site/login" ?>" data-toggle="tab">登录</a></li> <li class="active"><a href="<?= $baseUrl . "/site/login" ?>">登录</a></li>
<li><a href="<?= $baseUrl . "/site/signup" ?>" data-toggle="tab">注册</a></li> <li><a href="<?= $baseUrl . "/site/signup" ?>">注册</a></li>
</ul> </ul>
</div> </div>
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
<div class="tab-pane fade in active" id="login"> <div class="tab-pane fade in active" id="login">
...@@ -36,7 +38,6 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -36,7 +38,6 @@ $baseUrl = \yii\helpers\Url::base();
<div class=" input-wrapper last-wrapper"> <div class=" input-wrapper last-wrapper">
<input name="password" type="password" class="" placeholder="密码"> <input name="password" type="password" class="" placeholder="密码">
<span class="tips tip-vcode"><?=$model->getFirstError('password')?></span> <span class="tips tip-vcode"><?=$model->getFirstError('password')?></span>
</div> </div>
</div> </div>
......
...@@ -36,12 +36,14 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -36,12 +36,14 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<input name="telephone" type="text" class="" placeholder="请输入注册的手机号码" required="" autofocus=""> <input name="telephone" type="text" class="" placeholder="请输入注册的手机号码" required="" autofocus="">
<!--<span class="tips">手机号或者密码错误</span>--> <!--<span class="tips">手机号或者密码错误</span>-->
</div> </div>
<div style="margin-top: 20px;margin-bottom: 20px">
</div>
<div class="v-geetest">
<div id="embed-captcha"></div> <div id="embed-captcha"></div>
<p id="wait" class="show">正在加载验证码......</p> <p id="wait" class="show">正在加载验证码......</p>
<p id="notice" class="hide">请先拖动验证码到相应位置</p> <p id="notice" class="hide">请先拖动验证码到相应位置</p>
</div> </div>
</div>
<div class="foot-reg-btn"> <div class="foot-reg-btn">
<button id="submit" class="btn btn-log" type="submit">获取验证码</button> <button id="submit" class="btn btn-log" type="submit">获取验证码</button>
......
...@@ -13,18 +13,16 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -13,18 +13,16 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<div class="container"> <div class="container">
<div class="z-m-center"> <div class="z-m-center">
<h3>云涯</h3> <h3>云涯</h3>
<p>欢迎来到最课堂,专注在线直播</p> <p>欢迎来到云涯,专注在线直播</p>
<div id="myTab" class="tab-a"> <div id="myTab" class="tab-a">
<ul> <ul>
<li><a href="<?= $baseUrl . "/site/login" ?>" data-toggle="tab">登录</a></li> <li><a href="<?= $baseUrl . "/site/login" ?>">登录</a></li>
<li class="active"><a href="<?= $baseUrl . "/site/singup" ?>" data-toggle="tab">注册</a></li> <li class="active"><a href="<?= $baseUrl . "/site/singup" ?>">注册</a></li>
</ul> </ul>
</div> </div>
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
<div class="tab-pane fade in active" id="register"> <div class="tab-pane fade in active" id="register">
<?php $form = ActiveForm::begin(['id' => 'form-signup']); ?> <?php $form = ActiveForm::begin(['id' => 'form-signup']); ?>
...@@ -52,20 +50,21 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -52,20 +50,21 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<span class="tips tip-vcode"><?= $model->getFirstError('rePassword') ?></span> <span class="tips tip-vcode"><?= $model->getFirstError('rePassword') ?></span>
<span id="repassword_tips" class="tips"><?= $model->getFirstError('rePassword') ?></span> <span id="repassword_tips" class="tips"><?= $model->getFirstError('rePassword') ?></span>
</div> </div>
</div>
<div style="margin-top: 20px;margin-bottom: 20px"> <div class="v-geetest">
<div id="embed-captcha"></div> <div id="embed-captcha"></div>
<p id="wait" class="show">正在加载验证码......</p> <p id="wait" class="show">正在加载验证码......</p>
<p id="notice" class="hide">请先拖动验证码到相应位置</p> <p id="notice" class="hide">请先拖动验证码到相应位置</p>
</div> </div>
</div>
<div id="submit" class="foot-reg-btn"> <div id="submit" class="foot-reg-btn">
<button class="btn btn-reg" type="submit">注册</button> <button class="btn btn-reg" type="submit">注册</button>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>
......
...@@ -12,26 +12,41 @@ a,a:hover,a:link { ...@@ -12,26 +12,41 @@ a,a:hover,a:link {
box-shadow: 0 0 30px rgba(0,0,0,.05); box-shadow: 0 0 30px rgba(0,0,0,.05);
} }
.logo { .logo {
line-height: 50px; line-height: 60px;
margin-left: 30px; margin-left: 30px;
} }
.logo a {
color: #333;
}
.yun-login-btn { .yun-login-btn {
margin-right: 30px; margin-right: 30px;
margin-bottom: 0;
}
.yun-login-btn,.yun-login-btn li {
list-style: none;
}
.yun-login-btn li {
display: inline-block;
height: 60px;
line-height: 60px;
padding: 0 10px;
} }
.yun-login-btn li a { .yun-login-btn li a {
color: #333; color: #333;
display: block;
} }
.z-m-center { .z-m-center {
text-align: center; text-align: center;
margin-top: 40px;
} }
.z-m-center > p { .z-m-center > p {
font-size: 12px; font-size: 12px;
padding: 0 0 20px;
color: #999; color: #999;
} }
.v-geetest {
width: 300px;
margin: 20px auto;
}
.tab-a ul,li , .tab-a ul,li ,
......
...@@ -231,6 +231,12 @@ i, em { ...@@ -231,6 +231,12 @@ i, em {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-jian:before {
content: "\e906";
}
.icon-shen:before {
content: "\e907";
}
.icon-comment-empty:before { .icon-comment-empty:before {
content: "\e900"; content: "\e900";
} }
...@@ -291,11 +297,11 @@ i, em { ...@@ -291,11 +297,11 @@ i, em {
.icon-crop_original:before { .icon-crop_original:before {
content: "\e3c4"; content: "\e3c4";
} }
.icon-favorite:before { .icon-expand_less:before {
content: "\e87d"; content: "\e5ce";
} }
.icon-favorite_border:before { .icon-expand_more:before {
content: "\e87e"; content: "\e5cf";
} }
.icon-fingerprint:before { .icon-fingerprint:before {
content: "\e90d"; content: "\e90d";
...@@ -303,12 +309,36 @@ i, em { ...@@ -303,12 +309,36 @@ i, em {
.icon-ondemand_video:before { .icon-ondemand_video:before {
content: "\e63a"; content: "\e63a";
} }
.icon-person_pin:before {
content: "\e55a";
}
.icon-play_circle_outline:before {
content: "\e039";
}
.icon-power_settings_new:before { .icon-power_settings_new:before {
content: "\e8ac"; content: "\e8ac";
} }
.icon-visibility:before {
content: "\e8f4";
}
.icon-school:before {
content: "\e80c";
}
.icon-shop:before {
content: "\e8c9";
}
.icon-slideshow:before { .icon-slideshow:before {
content: "\e41b"; content: "\e41b";
} }
.icon-textsms:before {
content: "\e0d8";
}
.icon-stars:before {
content: "\e8d0";
}
.icon-thumb_up:before {
content: "\e8dc";
}
.icon-verified_user:before { .icon-verified_user:before {
content: "\e8e8"; content: "\e8e8";
} }
......
...@@ -290,6 +290,8 @@ html { ...@@ -290,6 +290,8 @@ html {
} }
/*teacher list*/ /*teacher list*/
.teacher-box { .teacher-box {
position: relative; position: relative;
...@@ -1040,7 +1042,7 @@ textarea.input-r-control { ...@@ -1040,7 +1042,7 @@ textarea.input-r-control {
margin-left: 10px; margin-left: 10px;
} }
.sm-box { .sm-box {
height: 320px; height: 400px;
} }
.sm-box .price { .sm-box .price {
height: 40px; height: 40px;
...@@ -1106,3 +1108,22 @@ textarea.input-r-control { ...@@ -1106,3 +1108,22 @@ textarea.input-r-control {
margin-top: 5px; margin-top: 5px;
color: #999; color: #999;
} }
@media (max-width: 767px) {
.tp-sidebar {
left: -225px;
}
.auto-main {
padding-left: 0;
}
.menu-btn {
padding-left: 30px;
}
.foot p {
padding-left: 30px;
}
.add-box {
width: auto;
}
}
\ No newline at end of file
This diff is collapsed.
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