谢百川 / seniors_say · 提交

转到一个项目

作者 杨育虎
提交 fa76d7243954214eed8e97c0d285b05e031becb6 2 个父辈 bede123d bed8d6aa

Merge branch 'master' of http://114.215.101.231:8099/xiebaichuan/seniors_say

内嵌 并排对比
正在显示 2 个修改的文件 包含 14 行增加 和 14 行删除
@@ -7,6 +7,12 @@ @@ -7,6 +7,12 @@
7 </div> 7 </div>
8 </div> 8 </div>
9 <div class="form-group"> 9 <div class="form-group">
  10 + <label class="control-label col-xs-12 col-sm-2">{:__('Name_en')}:</label>
  11 + <div class="col-xs-12 col-sm-8">
  12 + <input id="c-name_en" data-rule="required" class="form-control" name="row[name_en]" type="text" value="">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
10 <label class="control-label col-xs-12 col-sm-2">{:__('Des_content')}:</label> 16 <label class="control-label col-xs-12 col-sm-2">{:__('Des_content')}:</label>
11 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
12 <textarea id="c-des_content" data-rule="required" class="form-control editor" rows="5" name="row[des_content]" cols="50"></textarea> 18 <textarea id="c-des_content" data-rule="required" class="form-control editor" rows="5" name="row[des_content]" cols="50"></textarea>
@@ -78,13 +84,7 @@ @@ -78,13 +84,7 @@
78 <div class="form-group"> 84 <div class="form-group">
79 <label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label> 85 <label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label>
80 <div class="col-xs-12 col-sm-8"> 86 <div class="col-xs-12 col-sm-8">
81 - <input id="c-level_id" data-rule="required" data-source="level/index" class="form-control selectpage" name="row[level_id]" type="text" value="">  
82 - </div>  
83 - </div>  
84 - <div class="form-group">  
85 - <label class="control-label col-xs-12 col-sm-2">{:__('Name_en')}:</label>  
86 - <div class="col-xs-12 col-sm-8">  
87 - <input id="c-name_en" data-rule="required" class="form-control" name="row[name_en]" type="text" value=""> 87 + <input id="c-level_id" data-rule="required" data-source="University_level/index" class="form-control selectpage" name="row[level_id]" type="text" value="">
88 </div> 88 </div>
89 </div> 89 </div>
90 <div class="form-group layer-footer"> 90 <div class="form-group layer-footer">
@@ -7,6 +7,12 @@ @@ -7,6 +7,12 @@
7 </div> 7 </div>
8 </div> 8 </div>
9 <div class="form-group"> 9 <div class="form-group">
  10 + <label class="control-label col-xs-12 col-sm-2">{:__('Name_en')}:</label>
  11 + <div class="col-xs-12 col-sm-8">
  12 + <input id="c-name_en" data-rule="required" class="form-control" name="row[name_en]" type="text" value="{$row.name_en|htmlentities}">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
10 <label class="control-label col-xs-12 col-sm-2">{:__('Des_content')}:</label> 16 <label class="control-label col-xs-12 col-sm-2">{:__('Des_content')}:</label>
11 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
12 <textarea id="c-des_content" data-rule="required" class="form-control editor" rows="5" name="row[des_content]" cols="50">{$row.des_content|htmlentities}</textarea> 18 <textarea id="c-des_content" data-rule="required" class="form-control editor" rows="5" name="row[des_content]" cols="50">{$row.des_content|htmlentities}</textarea>
@@ -82,13 +88,7 @@ @@ -82,13 +88,7 @@
82 <div class="form-group"> 88 <div class="form-group">
83 <label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label> 89 <label class="control-label col-xs-12 col-sm-2">{:__('Level_id')}:</label>
84 <div class="col-xs-12 col-sm-8"> 90 <div class="col-xs-12 col-sm-8">
85 - <input id="c-level_id" data-rule="required" data-source="level/index" class="form-control selectpage" name="row[level_id]" type="text" value="{$row.level_id|htmlentities}">  
86 - </div>  
87 - </div>  
88 - <div class="form-group">  
89 - <label class="control-label col-xs-12 col-sm-2">{:__('Name_en')}:</label>  
90 - <div class="col-xs-12 col-sm-8">  
91 - <input id="c-name_en" data-rule="required" class="form-control" name="row[name_en]" type="text" value="{$row.name_en|htmlentities}"> 91 + <input id="c-level_id" data-rule="required" data-source="University_level/index" class="form-control selectpage" name="row[level_id]" type="text" value="{$row.level_id|htmlentities}">
92 </div> 92 </div>
93 </div> 93 </div>
94 <div class="form-group layer-footer"> 94 <div class="form-group layer-footer">