Commit 05ce4d33 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 339e7a1e
...@@ -11,9 +11,9 @@ use yii\helpers\Url; ...@@ -11,9 +11,9 @@ use yii\helpers\Url;
$this->title = '我的课堂'; $this->title = '我的课堂';
?> ?>
<div class="class-name"> <div class="class-name">
<span class="nomal-class-name" style="display: none"><?=$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>
<span class="edit-class-name"><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">
......
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