Merge branch 'master' of https://github.com/easysoft/zentaopms

module/action/view/trash.html.php

@@ -12,12 +12,10 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='titlebar'>
-  <div class='heading'>
-    <?php echo html::icon($lang->icons['trash']);?> <?php echo $lang->action->trash;?>
-  </div>
+  <div class='heading'><?php echo html::icon($lang->icons['trash']);?> <?php echo $lang->action->trash;?></div>
   <div class='actions'>
     <?php if($type == 'hidden') echo html::a(inLink('trash', "type=all"),    $lang->goback, '', "class='btn'");?>
-      <?php if($type == 'all')    echo html::a(inLink('trash', "type=hidden"), "<i class='icon-eye-close'></i> " . $lang->action->dynamic->hidden, '', "class='btn btn-danger'");?>
+    <?php if($type == 'all')    echo html::a(inLink('trash', "type=hidden"), "<i class='icon-eye-close'></i> " . $lang->action->dynamic->hidden, '', "class='btn btn-danger'");?>
   </div>
 </div>
 

module/admin/view/cleardata.html.php

@@ -31,7 +31,7 @@
               <?php echo html::input('sure', '', "class='form-control' onkeyup='showClearButton()' autocomplete='off'");?>
             </div>
           </div>
-            <?php echo html::submitButton($lang->admin->clearData, "class='hidden btn-block btn btn-danger'");?>
+          <?php echo html::submitButton($lang->admin->clearData, "class='hidden btn-block btn btn-danger'");?>
         </form>
       </div>
     </div>

module/admin/view/register.html.php

@@ -29,7 +29,7 @@
     <table align='center' class='table table-form'>
       <tr>
         <th class='w-100px'><?php echo $lang->user->account;?></th>
-    	  <td>
+    	<td>
           <div class="required required-wrapper"></div>
           <?php echo html::input('account', '', "class='form-control'");?>
           <div class='help-block'><?php echo $lang->admin->register->lblAccount;?></div>