Commit 25c1cfd0 authored by 汪波's avatar 汪波

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

parents 9ac4950a fc580718
...@@ -97,4 +97,20 @@ class ClassesInfoController extends \yii\web\Controller ...@@ -97,4 +97,20 @@ class ClassesInfoController extends \yii\web\Controller
return $this->render('apply', compact('model', 'agreement')); return $this->render('apply', compact('model', 'agreement'));
} }
public function actionSetting()
{
//课堂信息
$model = Classes::findOne($this->classStatus['id']);
if (Yii::$app->request->getIsPost()) {
$model->load(Yii::$app->request->post());
if ($model->update()) {
return $this->redirect(['classes-info/index']);
}
}
return $this->render('setting', compact('model'));
}
} }
...@@ -143,7 +143,7 @@ class HomeController extends \yii\web\Controller ...@@ -143,7 +143,7 @@ class HomeController extends \yii\web\Controller
$coursewareInfo['isSupport'] = (Support::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE); $coursewareInfo['isSupport'] = (Support::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE);
$coursewareInfo['isFavorite'] = (Favorite::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE); $coursewareInfo['isFavorite'] = (Favorite::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE);
$coursewareInfo['isShop'] = FALSE; $coursewareInfo['isShop'] = FALSE;
$coursewareInfo['isMe'] = true; $coursewareInfo['isMe'] = FALSE;
//已登录 //已登录
if (!Yii::$app->user->isGuest) { if (!Yii::$app->user->isGuest) {
$coursewareInfo['userAvatar'] = User::getAvatarUrl(Yii::$app->user->identity->avatar); $coursewareInfo['userAvatar'] = User::getAvatarUrl(Yii::$app->user->identity->avatar);
......
...@@ -10,22 +10,17 @@ use yii\helpers\Url; ...@@ -10,22 +10,17 @@ use yii\helpers\Url;
$this->title = '我的课堂'; $this->title = '我的课堂';
?> ?>
<ul class="tab-headbox">
<!-- Nav tabs --> <li class="active"><a href="#">基本信息</a></li>
<ul class="tab-headbox" role="tablist"> <li ><a href="<?=Url::to(['classes-info/setting'])?>">课堂设置</a></li>
<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> </ul>
<!-- Tab panes --> <div class="class-name m-t-50">
<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> <!--<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>
...@@ -43,33 +38,4 @@ $this->title = '我的课堂'; ...@@ -43,33 +38,4 @@ $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>
\ No newline at end of file
<?php
/**
* @var $this yii\web\View
* @var \common\models\Classes $model
* @var $courseCount int
* @var $todayIncome float
* @var $commentCount int
*/
use frontend\models\MyActiveForm;
use yii\helpers\Url;
$this->title = '课堂设置';
?>
<ul class="tab-headbox">
<li><a href="<?=Url::to(['classes-info/index'])?>">基本信息</a></li>
<li class="active"><a href="#">课堂设置</a></li>
</ul>
<div class="send-class apply-class-box m-t-50">
<div class="tit">课堂设置</div>
<?php $form = MyActiveForm::begin(['id'=>'applyForm', 'options'=>['name'=>'applyClass']]); ?>
<?=$form->field($model, 'name', ['inputOptions'=>['placeholder'=>'请输入课堂名称']])?>
<?=$form->field($model, 'intro', [
'template' => "{label}\n<div class=\"cls-intro-textarea\">{input}</div>\n{hint}\n{error}"
])->textarea(['placeholder'=>'填写分享或培训的案例链接…'])?>
<div class="btn-box text-center" style="margin-top: 10px; ">
<a href="<?=Url::to(['classes-info/index'])?>" class="btn btn-link m-l-10">取消</a><button type="submit" class="btn btn-save m-l-10">保存</button>
</div>
<?php MyActiveForm::end(); ?>
</div>
\ 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