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

module/block/view/bugblock.html.php

@@ -34,7 +34,7 @@
         <?php if($longBlock):?>
         <td class='c-pri'><span class='label-pri label-pri-<?php echo $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
         <?php endif;?>
-        <td class='c-level'><span class='label-level' data-level='<?php echo zget($lang->bug->severityList, $bug->severity);?>'></span></td>
+        <td class='c-pri'><span class='label-severity' data-level='<?php echo zget($lang->bug->severityList, $bug->severity);?>'></span></td>
         <td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
         <td class='c-status' title='<?php echo zget($lang->bug->statusList, $bug->status)?>'>
           <span class="bug-status-<?php echo $bug->status?>">

module/file/lang/en.php

@@ -41,7 +41,7 @@ $lang->file->extra     = 'Extra';
 
 $lang->file->dragFile         = 'Please drag here.';
 $lang->file->errorNotExists   = "<span class='text-red'>'%s' is not found.</span>";
-$lang->file->errorCanNotWrite = "<span class='text-red'>'%s' is not writable. Please change its permission. Enter sudo chmod -R 777 '%s'</span> in Linux.";
+$lang->file->errorCanNotWrite = "<span class='text-red'>'%s' is not writable. Please change its permission. Enter <span class='code'>sudo chmod -R 777 '%s'</span></span> in Linux.";
 $lang->file->confirmDelete    = " Do you want to delete it?";
 $lang->file->errorFileSize    = " File size exceeds the limit. It cannot be uploaded!";
 $lang->file->errorFileUpload  = " Uploading failed. File size might exceeds the limit.";

module/file/lang/zh-cn.php

@@ -41,7 +41,7 @@ $lang->file->extra     = '备注';
 
 $lang->file->dragFile            = '请拖拽文件到此处';
 $lang->file->errorNotExists      = "<span class='text-red'>文件夹 '%s' 不存在</span>";
-$lang->file->errorCanNotWrite    = "<span class='text-red'>文件夹 '%s' 不可写,请改变文件夹的权限。在linux中输入指令:sudo chmod -R 777 %s</span>";
+$lang->file->errorCanNotWrite    = "<span class='text-red'>文件夹 '%s' 不可写,请改变文件夹的权限。在linux中输入指令: <span class='code'>sudo chmod -R 777 %s</span></span>";
 $lang->file->confirmDelete       = " 您确定删除该附件吗？";
 $lang->file->errorFileSize       = " 文件大小已经超过%s，可能不能成功上传！";
 $lang->file->errorFileUpload     = " 文件上传失败，文件大小可能超出限制";

module/file/lang/zh-tw.php

@@ -41,7 +41,7 @@ $lang->file->extra     = '備註';
 
 $lang->file->dragFile            = '請拖拽檔案到此處';
 $lang->file->errorNotExists      = "<span class='text-red'>檔案夾 '%s' 不存在</span>";
-$lang->file->errorCanNotWrite    = "<span class='text-red'>檔案夾 '%s' 不可寫,請改變檔案夾的權限。在linux中輸入指令:sudo chmod -R 777 %s</span>";
+$lang->file->errorCanNotWrite    = "<span class='text-red'>檔案夾 '%s' 不可寫,請改變檔案夾的權限。在linux中輸入指令: <span class='code'>sudo chmod -R 777 %s</span></span>";
 $lang->file->confirmDelete       = " 您確定刪除該附件嗎？";
 $lang->file->errorFileSize       = " 檔案大小已經超過%s，可能不能成功上傳！";
 $lang->file->errorFileUpload     = " 檔案上傳失敗，檔案大小可能超出限制";