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

src/frontend/views/classes-info/apply.php

@@ -8,16 +8,18 @@ use yii\helpers\Html;
 
 $this->title = '申请课堂';
 ?>
-<div class="send-class apply-class-box">
-	<div class="tit">申请课堂</div>
-
+<div class="apply-class-box">
 	<?php if ($model->id) {
-		if ($model->status == \common\models\Classes::STATUS_UNCHECK) {?>
-		<p class="bg-info" style="padding:10px;margin-top:10px;">您提交的资料正在等待审核</p>
+	if ($model->status == \common\models\Classes::STATUS_UNCHECK) {?>
+		<p class="alert alert-warning text-center">您提交的资料正在等待审核</p>
 	<?php } elseif ($model->status == \common\models\Classes::STATUS_FAILED) {?>
-		<p class="bg-danger" style="padding:10px;margin-top:10px;">您提交的课堂资料未通过审核!</p>
+		<p class="alert alert-danger text-center">您提交的课堂资料未通过审核!</p>
 	<?php } } ?>
+</div>
 
+
+<div class="send-class apply-class-box">
+	<div class="tit">申请课堂</div>
 	<?php $form = MyActiveForm::begin(['id'=>'applyForm', 'options'=>['name'=>'applyClass']]); ?>
 	<?=$form->field($model, 'name', ['inputOptions'=>['placeholder'=>'请输入课堂名称']])?>
 	<?=$form->field($model, 'intro')->textInput(['placeholder'=>'示例：面向谁？服务是什么？优势是什么？'])?>
@@ -29,7 +31,7 @@ $this->title = '申请课堂';
 		<div class="checkbox">
 			<label>
 				<?=Html::checkbox('agreement', $agreement==1)?>
-				同意 <a href="#">云涯使用协议</a>及 <a href="#">版权声明</a>
+				同意 <a href="#">云涯使用协议</a> 及 <a href="#">版权声明</a>
 			</label>
 		</div>
 		<?=$model->getFirstError('agreement')?>

src/frontend/web/css/style.css

@@ -53,7 +53,7 @@ a:link,a:active,a:visited {
 }
 .logo a {
     display: block;
-    font-size: 18px;
+    font-size: 14px;
     color: #fff;
     height: 60px;
     line-height: 60px;
@@ -742,10 +742,21 @@ textarea.input-r-control {
 }
 
 .cls-part .tit {
+    position: relative;
+    display: block;
     font-size: 14px;
     color: #777;
     font-weight: normal;
 }
+.help-block {
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: block;
+    margin: 0;
+    color: #737373;
+    font-size: 12px;
+}
 .cls-part .tit small {
     font-size: 12px;
     color: #999;
@@ -759,6 +770,9 @@ textarea.input-r-control {
     color: red;
     padding-left: 5px;
 }
+.cls-part .checkbox label {
+    position: relative;
+}
 .rules-set label span {
     display: inline-block;
     float: left;
@@ -1355,6 +1369,11 @@ textarea.input-r-control {
     margin: 0 auto
 }
 
+.apply-class-box > p.info {
+    padding: 20px;
+    background-color: #fcffca;
+}
+
 .empty-data {
     height: 300px;
     text-align: center;
@@ -1421,6 +1440,7 @@ textarea.input-r-control {
     background-color: #fff;
     border-bottom: 1px solid #e7e7e7;
     text-align: center;
+    z-index: 2;
 }
 .tab-headbox li {
     display: inline-block;