Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev
这个提交包含在:
		
						当前提交
						0de4769739
					
				
					共有  2 个文件被更改,包括 2 次插入 和 2 次删除
				
			
		| 
						 | 
					@ -44,7 +44,7 @@ input[type="email"] {
 | 
				
			||||||
                        <div class="form-group">
 | 
					                        <div class="form-group">
 | 
				
			||||||
                            <div class="input-group">
 | 
					                            <div class="input-group">
 | 
				
			||||||
                                <span class="input-group-addon"><i class="glyphicon glyphicon-envelope color-blue"></i></span>
 | 
					                                <span class="input-group-addon"><i class="glyphicon glyphicon-envelope color-blue"></i></span>
 | 
				
			||||||
                                <input id="email" name="email" placeholder="<?php echo lang('account_email_address'); ?>" class="form-control" type="email">
 | 
					                                <input id="email" name="email" placeholder="<?php echo lang('account_email_address'); ?>" class="form-control" type="email" autofocus>
 | 
				
			||||||
                            </div>
 | 
					                            </div>
 | 
				
			||||||
                        </div>
 | 
					                        </div>
 | 
				
			||||||
                        <div class="form-group">
 | 
					                        <div class="form-group">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -40,7 +40,7 @@ body {
 | 
				
			||||||
                <div>
 | 
					                <div>
 | 
				
			||||||
                    <label for="floatingInput"><strong><?php echo lang('account_username'); ?></strong></label>
 | 
					                    <label for="floatingInput"><strong><?php echo lang('account_username'); ?></strong></label>
 | 
				
			||||||
                    <input type="text" name="user_name" class="form-control" id="floatingInput" placeholder="<?php echo lang('account_username'); ?>"
 | 
					                    <input type="text" name="user_name" class="form-control" id="floatingInput" placeholder="<?php echo lang('account_username'); ?>"
 | 
				
			||||||
                        value="<?php echo $this->input->post('user_name'); ?>">
 | 
					                        value="<?php echo $this->input->post('user_name'); ?>" autofocus>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
                <div>
 | 
					                <div>
 | 
				
			||||||
                    <label for="floatingPassword"><strong><?php echo lang('account_password'); ?></strong></label>
 | 
					                    <label for="floatingPassword"><strong><?php echo lang('account_password'); ?></strong></label>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		正在加载…
	
		在新工单中引用