diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 43d7823737..0e1b259349 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -52,7 +52,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
  • - " . $lang->bug->report->common); ?> + " . $lang->bug->report->common); ?>
  • @@ -145,7 +145,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow bug->byQuery;?>
    - +
    • story->colorTag;?>
    - +
    diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index fb5ed5b2f9..9c0dc9ade4 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -50,11 +50,11 @@ var browseType = ''; doc->title;?> - doc->size;?> doc->addedBy;?> doc->addedDate;?> doc->editedDate;?> + @@ -63,14 +63,14 @@ var browseType = ''; collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> id&orderBy=$orderBy&from=$from"), "  " . $module->name);?> - - id&objectType=module", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?> - ", '', "title='{$lang->tree->manage}' class='btn btn-link'")?> - + + id&objectType=module", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?> + ", '', "title='{$lang->tree->manage}' class='btn btn-link'")?> + @@ -78,15 +78,15 @@ var browseType = ''; collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> id"), "  " . $doc->title);?> - - id&objectType=doc", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?> - id", "", '', "title='{$lang->edit}' class='btn btn-link'")?> - id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> - addedBy);?> addedDate, 'm-d h:i');?> editedDate, 'm-d h:i');?> + + id&objectType=doc", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?> + id", "", '', "title='{$lang->edit}' class='btn btn-link'")?> + id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> + diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php index 77c10861e9..29773c789b 100644 --- a/module/file/view/printfiles.html.php +++ b/module/file/view/printfiles.html.php @@ -15,7 +15,7 @@ $sessionString .= session_name() . '=' . session_id(); $(function(){ $(".edit").modalTrigger({width:350, type:'iframe'}); }) - + /* Delete a file. */ function deleteFile(fileID) { @@ -49,7 +49,7 @@ $sessionString .= session_name() . '=' . session_id(); if(common::hasPriv('file', 'download')) { $uploadDate = $lang->file->uploadDate . substr($file->addedDate, 0, 10); - $fileTitle = "
  •  " . $file->title .'.' . $file->extension; + $fileTitle = "
  •  " . $file->title; $imageWidth = 0; if(stripos('jpg|jpeg|gif|png|bmp', $file->extension) !== false) { diff --git a/module/project/lang/en.php b/module/project/lang/en.php index f58995024f..9914171d1c 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -40,7 +40,6 @@ $lang->project->whitelist = 'Whitelist'; $lang->project->totalEstimate = 'Est.(h)'; $lang->project->totalConsumed = 'Cost'; $lang->project->totalLeft = 'Left'; -$lang->project->Left = 'Left'; $lang->project->progress = 'Progress'; $lang->project->hours = '%s Estimate, %s Cost, %s Left.'; $lang->project->viewBug = 'Bugs'; @@ -114,7 +113,6 @@ $lang->project->latestDynamic = 'Latest Dynamic'; $lang->project->build = 'Builds'; $lang->project->testtask = 'Test Tasks'; $lang->project->burn = 'Burndown'; -$lang->project->baseline = 'Baseline'; $lang->project->computeBurn = 'Update'; $lang->project->burnData = 'Burndown Data'; $lang->project->fixFirst = 'Edit Man-hour of 1st Day'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 19ccb1e108..96d8c91355 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -41,7 +41,6 @@ $lang->project->whitelist = '分组白名单'; $lang->project->totalEstimate = '预计'; $lang->project->totalConsumed = '消耗'; $lang->project->totalLeft = '剩余'; -$lang->project->Left = '剩余'; $lang->project->progress = '进度'; $lang->project->hours = '预计 %s 消耗 %s 剩余 %s'; $lang->project->viewBug = '查看bug'; @@ -117,7 +116,6 @@ $lang->project->latestDynamic = '最新动态'; $lang->project->build = '所有版本'; $lang->project->testtask = '测试任务'; $lang->project->burn = '燃尽图'; -$lang->project->baseline = '基准线'; $lang->project->computeBurn = '更新'; $lang->project->burnData = '燃尽图数据'; $lang->project->fixFirst = '修改首天工时'; diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php index 599df65829..b8b1937727 100644 --- a/module/project/view/burn.html.php +++ b/module/project/view/burn.html.php @@ -52,7 +52,7 @@ function initBurnChar() labels: , datasets: [ { - label: "project->baseline;?>", + label: "project->charts->burn->graph->reference;?>", color: "#F1F1F1", pointColor: '#D8D8D8', pointStrokeColor: '#D8D8D8', @@ -62,7 +62,7 @@ function initBurnChar() data: }, { - label: "project->Left?>", + label: "project->charts->burn->graph->actuality;?>", color: "#006AF1", pointStrokeColor: '#006AF1', pointHighlightStroke: '#006AF1', diff --git a/module/project/view/preview.html.php b/module/project/view/preview.html.php index e7ec907cdc..a95be4f6c2 100644 --- a/module/project/view/preview.html.php +++ b/module/project/view/preview.html.php @@ -231,19 +231,19 @@ $dataType = '';