Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-08-03 14:35:17 +08:00
parent 92bc42118e d60da49f27
commit fc6a645862
51 changed files with 176 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/helper.class.php
+1 -1
View File
@@ -843,7 +843,7 @@ function getWebRoot($full = false)
/**
* 当数组/对象变量$var存在$key项时，返回存在的对应值或设定值，否则返回$key或不存在的设定值。
* When the $var has the $key, return it, esle result one default value.
* When there is a $key in the array/object $var, it returns it or $valueWhenExists, otherwise returns $key or $valueWhenNone.
*
* @param array|object $var
* @param string|int $key
lib/scm/gitlab.class.php
+2 -1
View File
@@ -518,7 +518,8 @@ class gitlab
if(!scm::checkRevision($version)) return array();
$api = "commits";
if(empty($count)) $count = 100;
/* TODO Put getCommits into cron job. And check best size of $count. */
if(empty($count)) $count = 1;
$params = array();
$params['ref_name'] = $branch;
module/block/view/executionblock.html.php
+2 -2
View File
@@ -57,8 +57,8 @@
<td class="c-hours" title="<?php echo $execution->hours->totalLeft . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft . $lang->execution->workHourUnit;?></td>
<?php endif;?>
<td class="c-progress">
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $execution->hours->progress;?></div>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($execution->hours->progress);?></div>
</div>
</td>
<?php if($longBlock):?>
module/block/view/scrumlistblock.html.php
+2 -2
View File
@@ -57,8 +57,8 @@
<td class="c-hours" title="<?php echo $execution->hours->totalLeft . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft . $lang->execution->workHourUnit;?></td>
<?php endif;?>
<td class="c-progress">
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $execution->hours->progress;?></div>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($execution->hours->progress);?></div>
</div>
</td>
<?php if($longBlock):?>
module/bug/lang/de.php
+1 -1
View File
@@ -79,7 +79,7 @@ $lang->bug->lastEditedDate = 'Bearbeitet am';
$lang->bug->fromCase = 'Von Fall';
$lang->bug->toCase = 'Zu Fall';
$lang->bug->colorTag = 'Farb Tag';
$lang->bug->repairRate = 'Repair Rate';
$lang->bug->fixedRate = 'Fixed Rate';
/* 方法列表。*/
$lang->bug->index = 'Home';
module/bug/lang/en.php
+1 -2
View File
@@ -24,7 +24,6 @@ $lang->bug->storyVersion = 'Story Version';
$lang->bug->color = 'Color';
$lang->bug->task = 'Task';
$lang->bug->title = 'Title';
$lang->bug->sync2gitlab = 'Sync gitlab';
$lang->bug->severity = 'Severity';
$lang->bug->severityAB = 'S';
$lang->bug->pri = 'Priority';
@@ -80,7 +79,7 @@ $lang->bug->lastEditedDate = 'EditedDate';
$lang->bug->fromCase = 'From Case';
$lang->bug->toCase = 'To Case';
$lang->bug->colorTag = 'Color';
$lang->bug->repairRate = 'Repair Rate';
$lang->bug->fixedRate = 'Fixed Rate';
/* Method list. */
$lang->bug->index = 'Bug Home';
module/bug/lang/fr.php
+1 -1
View File
@@ -79,7 +79,7 @@ $lang->bug->lastEditedDate = 'Date Modif';
$lang->bug->fromCase = 'du CasTest';
$lang->bug->toCase = 'vers CasTest';
$lang->bug->colorTag = 'Couleur';
$lang->bug->repairRate = 'Repair Rate';
$lang->bug->fixedRate = 'Repair Rate';
/* 方法列表。*/
$lang->bug->index = 'Accueil Bug';
module/bug/lang/vi.php
+1 -1
View File
@@ -79,7 +79,7 @@ $lang->bug->lastEditedDate = 'Ngày sửa';
$lang->bug->fromCase = 'Từ tình huống';
$lang->bug->toCase = 'Tới tình huống';
$lang->bug->colorTag = 'Màu';
$lang->bug->repairRate = 'Repair Rate';
$lang->bug->fixedRate = 'Repair Rate';
/* Method list. */
$lang->bug->index = 'Trang Bug';
module/bug/lang/zh-cn.php
+1 -2
View File
@@ -24,7 +24,6 @@ $lang->bug->storyVersion = "{$lang->SRCommon}版本";
$lang->bug->color = '标题颜色';
$lang->bug->task = '相关任务';
$lang->bug->title = 'Bug标题';
$lang->bug->sync2gitlab = '同步gitlab';
$lang->bug->severity = '严重程度';
$lang->bug->severityAB = '级别';
$lang->bug->pri = '优先级';
@@ -80,7 +79,7 @@ $lang->bug->lastEditedDate = '修改日期';
$lang->bug->fromCase = '来源用例';
$lang->bug->toCase = '生成用例';
$lang->bug->colorTag = '颜色标签';
$lang->bug->repairRate = '修复率';
$lang->bug->fixedRate = '修复率';
/* 方法列表。*/
$lang->bug->index = '首页';
module/bug/lang/zh-tw.php
-1
View File
@@ -24,7 +24,6 @@ $lang->bug->storyVersion = "{$lang->SRCommon}版本";
$lang->bug->color = '標題顏色';
$lang->bug->task = '相關任務';
$lang->bug->title = 'Bug標題';
$lang->bug->sync2gitlab = '同步gitlab';
$lang->bug->severity = '嚴重程度';
$lang->bug->severityAB = '級別';
$lang->bug->pri = '優先順序';
module/ci/model.php
+1 -1
View File
@@ -140,7 +140,7 @@ class ciModel extends model
if(empty($job->duration) or $job->duration == '') $job->duration = '-';
$data->logs = "<font style='font-weight:bold'>&gt;&gt;&gt; Job: $job->name, Stage: $job->stage, Status: $job->status, Duration: $job->duration Sec\r\n </font>";
$data->logs .= "Job URL: <a href=\"$job->web_url\" target='_blank'>$job->web_url</a> \r\n";
$data->logs .= $this->transformAnsiToHtml($this->loadModel('gitlab')->apiGetJobLog($compile->server, $compile->pipeline, $job->id));
$data->logs .= $this->transformAnsiToHtml($this->gitlab->apiGetJobLog($compile->server, $compile->pipeline, $job->id));
}
$this->dao->update(TABLE_COMPILE)->data($data)->where('id')->eq($compile->id)->exec();
module/common/view/markdown.html.php
+17 -10
View File
@@ -10,8 +10,6 @@ $editor['id'] = explode(',', $editor['id']);
<?php js::import($jsRoot . 'markdown/simplemde.min.js'); ?>
<style>
.CodeMirror,.CodeMirror-scroll{min-height:200px!important;}
.CodeMirror-fullscreen + .editor-preview-side{display:block;}
.CodeMirror-fullscreen, .editor-preview-side{margin-bottom:40px;}
.editor-preview-side table > tbody > tr:last-child td{border:1px solid #e5e5e5 !important}
.editor-toolbar {padding: 1px;}
.editor-toolbar .icon-html:before {content:"HTML"; font-size: 12px; padding: 0 2px;}
@@ -37,15 +35,29 @@ $editor['id'] = explode(',', $editor['id']);
$(function()
{
var markdownEditor = <?php echo json_encode($editor);?>;
var toolbar = ["bold", "italic", "heading", "|", "quote", "unordered-list", "ordered-list", "|", "link", "image", "code", "table", "|", "preview", "side-by-side", "fullscreen", "|", "guide"];
var withchange = ["bold", "italic", "heading", "|", "quote", "unordered-list", "ordered-list", "|", "link", "image", "code", "table", "|", "preview", "side-by-side", "fullscreen", "|", "guide", {name: "html", action: function customFunction(editor){toggleEditor("html")}, className:'icon icon-html', title:"HTML"}];
const customFullscreen =
{
name: 'fullscreen',
className: 'icon icon-expand-full',
title: 'Fullscreen',
action: function(editor)
{
editor.toggleFullScreen();
if(editor.isFullscreenActive() && !editor.isSideBySideActive())
{
editor.toggleSideBySide();
}
}
};
var toolbar = ["bold", "italic", "heading", "|", "quote", "unordered-list", "ordered-list", "|", "link", "image", "code", "table", "|", "preview", "side-by-side", customFullscreen, "|", "guide"];
var withchange = ["bold", "italic", "heading", "|", "quote", "unordered-list", "ordered-list", "|", "link", "image", "code", "table", "|", "preview", "side-by-side", customFullscreen, "|", "guide", {name: "html", action: function customFunction(editor){toggleEditor && toggleEditor("html")}, className:'icon icon-html', title:"HTML"}];
function initMarkdown(config, afterInit)
{
config = config || markdownEditor;
$.each(markdownEditor.id, function(key, markdownEditorID)
{
if(typeof(markdownEditor.tools) != 'undefined' && markdownEditor.tools == 'withchange') toolbar = withchange;
var options =
var options =
{
toolbar: toolbar,
element: $('#' + markdownEditorID)[0],
@@ -56,11 +68,6 @@ $(function()
var markdown = new SimpleMDE(options);
if(!window.markdownEditor) window.markdownEditor = {};
window.markdownEditor['#'] = window.markdownEditor[markdownEditorID] = markdown;
// markdown.codemirror.on('focus', function(){window.markdownEditor[markdownEditorID].toggleSideBySide();});
// markdown.codemirror.on('change', function()
// {
// if($('#' + markdownEditorID).parent().find('.editor-preview-active-side').size() == 0) window.markdownEditor[markdownEditorID].toggleSideBySide();
// });
});
if($.isFunction(afterInit)) afterInit();
module/doc/config.php
+7
View File
@@ -30,6 +30,13 @@ $config->doc->markdown->create = array('id' => 'contentMarkdown', 'tools' => 'wi
$config->doc->collectionLimit = 10;
$config->doc->iconList['html'] = 'rich-text';
$config->doc->iconList['markdown'] = 'markdown';
$config->doc->iconList['url'] = 'text-link';
$config->doc->iconList['word'] = 'word';
$config->doc->iconList['ppt'] = 'ppt';
$config->doc->iconList['excel'] = 'excel';
$config->doc->search['module'] = 'doc';
$config->doc->search['fields']['title'] = $lang->doc->title;
$config->doc->search['fields']['id'] = $lang->doc->id;
module/doc/control.php
+1 -1
View File
@@ -1011,7 +1011,7 @@ class doc extends control
if($doc->keywords)
{
$doc->keywords = preg_replace("/(，)/", ',', $doc->keywords);
$doc->keywords = str_replace("，", ',', $doc->keywords);
$doc->keywords = explode(',', $doc->keywords);
}
module/doc/css/common.css
+1
View File
@@ -89,3 +89,4 @@ td.c-name a:visited {color: #082999;}
.tree li > a {white-space: nowrap; text-overflow: ellipsis; overflow: hidden;}
.side-col .menu-actions {position: absolute; top: 0; right: 0; padding: 7px 8px;}
.menu-actions i {font-size: 15px; color: #8c8c8c;}
#dropMenu .table-col .list-group {padding-top: 5px;}
module/doc/js/common.js
+18 -18
View File
@@ -46,7 +46,7 @@ function setBrowseType(type)
$(document).ready(function()
{
// hide #module chosen dropdown on #lib dropdown show
/* hide #module chosen dropdown on #lib dropdown show */
$('#lib').on('chosen:showing_dropdown', function()
{
$('#module').trigger('chosen:close');
@@ -85,8 +85,7 @@ $(document).ready(function()
var NAME = 'zui.splitRow'; // model name
// File input list
// The SplitRow model class
/* The SplitRow model class */
var SplitRow = function(element, options)
{
var that = this;
@@ -166,7 +165,8 @@ $(document).ready(function()
if (options.middleSize) $col.toggleClass('col-md-size', $col.width() < options.middleSize);
};
var resizeCols = function() {
var resizeCols = function()
{
var cellHeight = $(window).height() - $('#footer').outerHeight() - $('#header').outerHeight() - 42;
$cols.children('.panel').height(cellHeight).css('maxHeight', cellHeight).find('.panel-body').css('position', 'absolute');
var sideHeight = cellHeight - $cols.find('.nav-tabs').height() - $cols.find('.side-footer').height() - 35;
@@ -181,7 +181,7 @@ $(document).ready(function()
resizeCols();
};
// default options
/* default options */
SplitRow.DEFAULTS =
{
spliter: '<div class="col-spliter"></div>',
@@ -189,7 +189,7 @@ $(document).ready(function()
middleSize: 850
};
// Extense jquery element
/* Extense jquery element */
$.fn.splitRow = function(option)
{
return this.each(function()
@@ -205,7 +205,7 @@ $(document).ready(function()
$.fn.splitRow.Constructor = SplitRow;
// Auto call splitRow after document load complete
/* Auto call splitRow after document load complete */
$(function()
{
$('.split-row').splitRow();
@@ -225,17 +225,17 @@ $(document).ready(function()
var url = obj.data('url');
$.get(url, function(response)
{
if(response.status == 'yes')
{
obj.children('i').removeClass().addClass('icon icon-star text-yellow');
obj.parent().prev().children('.file-name').children('i').remove('.icon');
obj.parent().prev().children('.file-name').prepend('<i class="icon icon-star text-yellow"></i> ');
}
else
{
obj.children('i').removeClass().addClass('icon icon-star-empty');
obj.parent().prev().children('.file-name').children('i').remove(".icon");
}
if(response.status == 'yes')
{
obj.children('i').removeClass().addClass('icon icon-star text-yellow');
obj.parent().prev().children('.file-name').children('i').remove('.icon');
obj.parent().prev().children('.file-name').prepend('<i class="icon icon-star text-yellow"></i> ');
}
else
{
obj.children('i').removeClass().addClass('icon icon-star-empty');
obj.parent().prev().children('.file-name').children('i').remove(".icon");
}
}, 'json');
return false;
});
module/doc/lang/de.php
+1 -8
View File
@@ -132,13 +132,6 @@ $lang->doc->typeList['word'] = 'Word';
$lang->doc->typeList['ppt'] = 'PPT';
$lang->doc->typeList['excel'] = 'Excel';
$lang->doc->iconList['html'] = 'rich-text';
$lang->doc->iconList['markdown'] = 'markdown';
$lang->doc->iconList['url'] = 'text-link';
$lang->doc->iconList['word'] = 'word';
$lang->doc->iconList['ppt'] = 'ppt';
$lang->doc->iconList['excel'] = 'excel';
$lang->doc->types['text'] = 'Text';
$lang->doc->types['url'] = 'URL';
@@ -213,7 +206,7 @@ $lang->doc->noticeAcl['doc']['private'] = 'Only the one who created it can acces
$lang->doc->placeholder = new stdclass();
$lang->doc->placeholder->url = 'Url';
$lang->doc->summary = "Total files on this page: <strong>%s</strong> , total size: <strong>%s</strong>, <strong>%s</strong>";
$lang->doc->summary = "Total files on this page: <strong>%s</strong> , total size: <strong>%s</strong>, <strong>%s</strong>.";
$lang->doc->ge = ':';
$lang->doc->point = '.';
module/doc/lang/en.php
+1 -8
View File
@@ -137,13 +137,6 @@ $lang->doc->typeList['word'] = 'Word';
$lang->doc->typeList['ppt'] = 'PPT';
$lang->doc->typeList['excel'] = 'Excel';
$lang->doc->iconList['html'] = 'rich-text';
$lang->doc->iconList['markdown'] = 'markdown';
$lang->doc->iconList['url'] = 'text-link';
$lang->doc->iconList['word'] = 'word';
$lang->doc->iconList['ppt'] = 'ppt';
$lang->doc->iconList['excel'] = 'excel';
$lang->doc->types['text'] = 'Text';
$lang->doc->types['url'] = 'URL';
@@ -218,7 +211,7 @@ $lang->doc->noticeAcl['doc']['private'] = 'Only the one who created it can acces
$lang->doc->placeholder = new stdclass();
$lang->doc->placeholder->url = 'URL';
$lang->doc->summary = "Total files on this page: <strong>%s</strong> , total size: <strong>%s</strong>, <strong>%s</strong>";
$lang->doc->summary = "Total files on this page: <strong>%s</strong> , total size: <strong>%s</strong>, <strong>%s</strong>.";
$lang->doc->ge = ':';
$lang->doc->point = '.';
module/doc/lang/fr.php
+1 -8
View File
@@ -132,13 +132,6 @@ $lang->doc->typeList['word'] = 'Word';
$lang->doc->typeList['ppt'] = 'PPT';
$lang->doc->typeList['excel'] = 'Excel';
$lang->doc->iconList['html'] = 'rich-text';
$lang->doc->iconList['markdown'] = 'markdown';
$lang->doc->iconList['url'] = 'text-link';
$lang->doc->iconList['word'] = 'word';
$lang->doc->iconList['ppt'] = 'ppt';
$lang->doc->iconList['excel'] = 'excel';
$lang->doc->types['text'] = 'Text';
$lang->doc->types['url'] = 'URL';
@@ -213,7 +206,7 @@ $lang->doc->noticeAcl['doc']['private'] = 'Seulement celui qui a ajouté le docu
$lang->doc->placeholder = new stdclass();
$lang->doc->placeholder->url = 'URL';
$lang->doc->summary = "Total files on this page: <strong>%s</strong> , total size: <strong>%s</strong>, <strong>%s</strong>";
$lang->doc->summary = "Total files on this page: <strong>%s</strong> , total size: <strong>%s</strong>, <strong>%s</strong>.";
$lang->doc->ge = ':';
$lang->doc->point = '.';
module/doc/lang/vi.php
+1 -8
View File
@@ -132,13 +132,6 @@ $lang->doc->typeList['word'] = 'Word';
$lang->doc->typeList['ppt'] = 'PPT';
$lang->doc->typeList['excel'] = 'Excel';
$lang->doc->iconList['html'] = 'rich-text';
$lang->doc->iconList['markdown'] = 'markdown';
$lang->doc->iconList['url'] = 'text-link';
$lang->doc->iconList['word'] = 'word';
$lang->doc->iconList['ppt'] = 'ppt';
$lang->doc->iconList['excel'] = 'excel';
$lang->doc->types['text'] = 'Text';
$lang->doc->types['url'] = 'URL';
@@ -213,7 +206,7 @@ $lang->doc->noticeAcl['doc']['private'] = 'Chỉ the one who created it có th
$lang->doc->placeholder = new stdclass();
$lang->doc->placeholder->url = 'URL';
$lang->doc->summary = "Total files on this page: <strong>%s</strong> , total size: <strong>%s</strong>, <strong>%s</strong>";
$lang->doc->summary = "Total files on this page: <strong>%s</strong> , total size: <strong>%s</strong>, <strong>%s</strong>.";
$lang->doc->ge = ':';
$lang->doc->point = '.';
module/doc/lang/zh-cn.php
-7
View File
@@ -137,13 +137,6 @@ $lang->doc->typeList['word'] = 'Word';
$lang->doc->typeList['ppt'] = 'PPT';
$lang->doc->typeList['excel'] = 'Excel';
$lang->doc->iconList['html'] = 'rich-text';
$lang->doc->iconList['markdown'] = 'markdown';
$lang->doc->iconList['url'] = 'text-link';
$lang->doc->iconList['word'] = 'word';
$lang->doc->iconList['ppt'] = 'ppt';
$lang->doc->iconList['excel'] = 'excel';
$lang->doc->types['text'] = '文档';
$lang->doc->types['url'] = '链接';
module/doc/model.php
+52 -20
View File
@@ -1732,9 +1732,9 @@ class docModel extends model
foreach($this->lang->doc->typeList as $typeKey => $typeName)
{
$class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';
$icon = zget($this->lang->doc->iconList, $typeKey);
$icon = zget($this->config->doc->iconList, $typeKey);
$html .= "<li>";
$html .= html::a(helper::createLink('doc', 'create', "objectType=$objectType&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon'></i> " . $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
$html .= html::a(helper::createLink('doc', 'create', "objectType=$objectType&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon text-muted'></i> " . $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
$html .= "</li>";
if($typeKey == 'url') $html .= '<li class="divider"></li>';
}
@@ -1742,7 +1742,7 @@ class docModel extends model
if(common::hasPriv('doc', 'createLib'))
{
$html .= '<li class="divider"></li>';
$html .= '<li>' . html::a(helper::createLink('doc', 'createLib', "type=$objectType&objectID=$objectID"), "<i class='icon-doc-lib'></i> " . $this->lang->doc->createLib, '', "class='iframe' data-width='70%'") . '</li>';
$html .= '<li>' . html::a(helper::createLink('doc', 'createLib', "type=$objectType&objectID=$objectID"), "<i class='icon-doc-lib text-muted'></i> " . $this->lang->doc->createLib, '', "class='iframe' data-width='70%'") . '</li>';
}
$html .= "</ul></div>";
}
@@ -1969,7 +1969,7 @@ class docModel extends model
$output = '';
$closedProjectsHtml = '';
$clseedProjects = array();
$closedProjects = array();
$maxHeight = ($type == 'project' and $this->app->openApp == 'doc') ? '260px' : '290px';
$class = ($type == 'project' and $this->app->openApp == 'doc') ? 'col-left' : '';
@@ -1982,19 +1982,29 @@ class docModel extends model
<div class='btn-group angle-btn'>
<div class='btn-group'>
<button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$objects[$objectID]}'>
<span class='text'>{$objects[$objectID]}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list load-indicator' data-ride='searchList'>
<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input"/><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>
<div class='list-group'><div class='table-row'><div class='table-col $class'><div class='list-group' style='max-height: $maxHeight'>
<span class='text'>{$objects[$objectID]}</span>
<span class='caret'></span>
</button>
<div id='dropMenu' class='dropdown-menu search-list load-indicator' data-ride='searchList'>
<div class="input-control search-box has-icon-left has-icon-right search-example">
<input type="search" class="form-control search-input"/>
<label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<div class='list-group'>
<div class='table-row'>
<div class='table-col $class'>
<div class='list-group' style='max-height: $maxHeight'>
EOT;
if($type == 'project' and $this->app->openApp == 'doc')
{
$clseedProjects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in(array_keys($objects))->andWhere('status')->eq('closed')->fetchPairs();
$closedProjects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in(array_keys($objects))->andWhere('status')->eq('closed')->fetchPairs();
}
foreach($objects as $key => $object)
{
$selected = $key == $objectID ? 'selected' : '';
if(isset($clseedProjects[$key]))
if(isset($closedProjects[$key]))
{
$closedProjectsHtml .= html::a(inlink($methodName, "type=$type&objectID=$key"), $object, '', "class='$selected' data-app='{$this->app->openApp}'");
if($selected == 'selected') $tabActive = 'closed';
@@ -2006,7 +2016,21 @@ EOT;
}
if($type == 'project' and $this->app->openApp == 'doc')
{
$output .= "</div><div class='col-footer'><a class='pull-right toggle-right-col not-list-item'>{$this->lang->project->doneProjects}<i class='icon icon-angle-right'></i></a></div></div><div class='table-col col-right'> <div class='list-group'>$closedProjectsHtml</div></div></div></div></div></div></div>";
$output .= <<<EOT
</div>
<div class='col-footer'>
<a class='pull-right toggle-right-col not-list-item'>{$this->lang->project->doneProjects}<i class='icon icon-angle-right'></i></a>
</div>
</div>
<div class='table-col col-right'>
<div class='list-group'>$closedProjectsHtml</div>
</div>
</div>
</div>
</div>
</div>
</div>
EOT;
}
else
{
@@ -2017,9 +2041,20 @@ EOT;
if(!empty($libs))
{
$libName = empty($libID) ? $this->lang->doclib->files : $libs[$libID]->name;
$output .= "<div class='btn-group angle-btn'><div class='btn-group'><button id='currentBranch' data-toggle='dropdown' type='button' class='btn btn-limit'>{$libName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList'>";
$output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
$output .= "<div class='table-col'><div class='list-group'>";
$output .= <<<EOT
<div class='btn-group angle-btn'>
<div class='btn-group'>
<button id='currentBranch' data-toggle='dropdown' type='button' class='btn btn-limit'>{$libName} <span class='caret'></span>
</button>
<div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList'>
<div class="input-control search-box has-icon-left has-icon-right search-example">
<input type="search" class="form-control search-input" />
<label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
<a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
</div>
<div class='table-col'>
<div class='list-group'>
EOT;
foreach($libs as $key => $lib)
{
$selected = $key == $libID ? 'selected' : '';
@@ -2184,30 +2219,27 @@ EOT;
/* Unit conversion. */
$i = 0;
while($sizeCount > 1024)
while($sizeCount > 1024 and $i <= 4)
{
$sizeCount = $sizeCount / 1024;
$i ++;
}
$unitList = array('B', 'K', 'M', 'G');
$unitList = array('B', 'K', 'M', 'G', 'T');
$sizeCount = round($sizeCount, 1) . $unitList[$i];
/* Summary of each type. */
$extensionNum = count($extensionCount);
foreach($extensionCount as $extension => $count)
{
if(in_array($this->app->getClientLang(), ['zh-cn','zh-tw']))
{
$extensionSummary .= $extension . ' ' . $count . $this->lang->doc->ge;
$extensionNum--;
if(!empty($extensionNum)) $extensionSummary .= $this->lang->doc->point;
$extensionSummary .= $extension . ' ' . $count . $this->lang->doc->ge . $this->lang->doc->point;
}
else
{
$extensionSummary .= $extension . ' ' . $this->lang->doc->ge . ' ' . $count . $this->lang->doc->point;
}
}
$extensionSummary = rtrim($extensionSummary, $this->lang->doc->point);
return sprintf($this->lang->doc->summary, $filesCount, $sizeCount, $extensionSummary);
}
module/doc/view/showfiles.html.php
+2 -2
View File
@@ -45,7 +45,7 @@
<?php echo str_replace('.' . $file->extension, '', $file->title);?>
</td>
<td class='c-name'>
<?php echo ($file->objectType == 'requirement' ? $lang->file->requirement : $lang->{$file->objectType}->common) . ' : ';?>
<?php echo ($file->objectType == 'requirement' ? $lang->URCommon : $lang->{$file->objectType}->common) . ' : ';?>
<a title='<?php echo $sourcePairs[$file->objectType][$file->objectID];?>' href='<?php echo $this->createLink(($file->objectType == 'requirement' ? 'story' : $file->objectType), 'view', "objectID=$file->objectID", '', true);?>' class='iframe' data-width='90%'>
<?php echo $sourcePairs[$file->objectType][$file->objectID];?>
</a>
@@ -101,7 +101,7 @@
</a>
<div class='file-name' title='<?php echo $file->title;?>'><?php echo $file->title;?></a></div>
<div class='file-name text-muted'>
<?php echo ($file->objectType == 'requirement' ? $lang->file->requirement : $lang->{$file->objectType}->common) . ' : ';?>
<?php echo ($file->objectType == 'requirement' ? $lang->URCommon : $lang->{$file->objectType}->common) . ' : ';?>
<a href='<?php echo $this->createLink(($file->objectType == 'requirement' ? 'story' : $file->objectType), 'view', "objectID=$file->objectID", '', true);?>' title='<?php echo $sourcePairs[$file->objectType][$file->objectID];?>' class='iframe' data-width='90%'>
<?php echo $sourcePairs[$file->objectType][$file->objectID];?>
</a>
module/doc/view/tablecontents.html.php
+2 -2
View File
@@ -87,10 +87,10 @@ if(empty($type)) $type = 'product';
$html .= "<ul class='dropdown-menu' style='left:0px'>";
foreach($this->lang->doc->typeList as $typeKey => $typeName)
{
$icon = zget($this->lang->doc->iconList, $typeKey);
$icon = zget($this->config->doc->iconList, $typeKey);
$class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';
$html .= "<li>";
$html .= html::a(helper::createLink('doc', 'create', "objectType=$type&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon'></i> " . $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
$html .= html::a(helper::createLink('doc', 'create', "objectType=$type&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon text-muted'></i> " . $typeName, '', "class='$class' data-app='{$this->app->openApp}'");
$html .= "</li>";
if($typeKey == 'url') $html .= '<li class="divider"></li>';
}
module/execution/view/all.html.php
+4 -4
View File
@@ -104,8 +104,8 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
<td class='hours' title='<?php echo $execution->hours->totalConsumed . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalConsumed . $this->lang->execution->workHourUnit;?></td>
<td class='hours' title='<?php echo $execution->hours->totalLeft . ' ' . $this->lang->execution->workHour;?>'><?php echo $execution->hours->totalLeft . $this->lang->execution->workHourUnit;?></td>
<td class="c-progress">
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $execution->hours->progress;?></div>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($execution->hours->progress);?></div>
</div>
</td>
<td id='spark-<?php echo $execution->id?>' class='sparkline text-left no-padding' values='<?php echo join(',', $execution->burns);?>'></td>
@@ -142,8 +142,8 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
<td class='hours' title='<?php echo $child->hours->totalConsumed . ' ' . $this->lang->execution->workHour;?>'><?php echo $child->hours->totalConsumed . ' ' . $this->lang->execution->workHourUnit;?></td>
<td class='hours' title='<?php echo $child->hours->totalLeft . ' ' . $this->lang->execution->workHour;?>'><?php echo $child->hours->totalLeft . ' ' . $this->lang->execution->workHourUnit;?></td>
<td class="c-progress">
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $child->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $child->hours->progress;?></div>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($child->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($child->hours->progress);?></div>
</div>
</td>
<td id='spark-<?php echo $child->id?>' class='sparkline text-left no-padding' values='<?php echo join(',', $child->burns);?>'></td>
module/execution/view/executionkanban.html.php
+2 -2
View File
@@ -63,8 +63,8 @@
<?php if($colStatus == 'doing'):?>
<div class='table-col'>
<div class="c-progress">
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $execution->hours->progress;?></div>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($execution->hours->progress);?></div>
</div>
</div>
</div>
module/file/lang/de.php
-1
View File
@@ -31,7 +31,6 @@ $lang->file->preview = "Vorschau";
$lang->file->addFile = 'Hinzufügen';
$lang->file->beginUpload = 'Upload';
$lang->file->uploadSuccess = 'Hochgeladen!';
$lang->file->requirement = $lang->URCommon;
$lang->file->pathname = 'Pfadname';
$lang->file->title = 'Titel';
module/file/lang/en.php
-1
View File
@@ -31,7 +31,6 @@ $lang->file->preview = "Preview";
$lang->file->addFile = 'Add';
$lang->file->beginUpload = 'Click to Upload';
$lang->file->uploadSuccess = 'Uploaded!';
$lang->file->requirement = $lang->URCommon;
$lang->file->pathname = 'Path Name';
$lang->file->title = 'Title';
module/file/lang/fr.php
-1
View File
@@ -31,7 +31,6 @@ $lang->file->preview = "Apperçu";
$lang->file->addFile = 'Ajouter';
$lang->file->beginUpload = 'Clic pour Charger';
$lang->file->uploadSuccess = 'Chargé !';
$lang->file->requirement = $lang->URCommon;
$lang->file->pathname = 'Nom Chemin';
$lang->file->title = 'Titre';
module/file/lang/vi.php
-1
View File
@@ -31,7 +31,6 @@ $lang->file->preview = "Preview";
$lang->file->addFile = 'Thêm';
$lang->file->beginUpload = 'Click to Upload';
$lang->file->uploadSuccess = 'Uploaded!';
$lang->file->requirement = $lang->URCommon;
$lang->file->pathname = 'Path tên';
$lang->file->title = 'Tiêu đề';
module/file/lang/zh-cn.php
-1
View File
@@ -31,7 +31,6 @@ $lang->file->preview = "预览";
$lang->file->addFile = '添加文件';
$lang->file->beginUpload = '开始上传';
$lang->file->uploadSuccess = '上传成功';
$lang->file->requirement = $lang->URCommon;
$lang->file->pathname = '路径';
$lang->file->title = '标题';
module/file/lang/zh-tw.php
-1
View File
@@ -31,7 +31,6 @@ $lang->file->preview = "預覽";
$lang->file->addFile = '添加檔案';
$lang->file->beginUpload = '開始上傳';
$lang->file->uploadSuccess = '上傳成功';
$lang->file->requirement = $lang->URCommon;
$lang->file->pathname = '路徑';
$lang->file->title = '標題';
module/my/view/execution.html.php
+1 -1
View File
@@ -80,7 +80,7 @@
<td><?php echo $execution->hours;?></td>
<td><?php echo $execution->assignedToMeTasks;?></td>
<td>
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo $execution->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $execution->progress;?></div>
</div>
</td>
module/product/control.php
+1 -2
View File
@@ -513,7 +513,6 @@ class product extends control
$programs = array($product->program => $program->name);
}
$this->view->title = $this->lang->product->edit . $this->lang->colon . $product->name;
$this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $product->name);
$this->view->position[] = $this->lang->product->edit;
@@ -1121,7 +1120,7 @@ class product extends control
/* Process product structure. */
$productStats = $this->product->getStats($orderBy, '', $browseType, '', 'story');
$productStructure = $this->product->statisticProgam($productStats);
$productStructure = $this->product->statisticProgram($productStats);
$this->view->title = $this->lang->product->common;
$this->view->position[] = $this->lang->product->common;
module/product/model.php
+1 -1
View File
@@ -1602,7 +1602,7 @@ class productModel extends model
* @access public
* @return array
*/
public function statisticProgam($productStats)
public function statisticProgram($productStats)
{
$productStructure = array();
module/product/view/all.html.php
+32 -32
View File
@@ -67,7 +67,7 @@
<th><?php echo $lang->story->completeRate;?></th>
<th style="border-left: 1px solid #ddd;"><?php echo $lang->bug->activate;?></th>
<th><?php echo $lang->close;?></th>
<th><?php echo $lang->bug->repairRate;?></th>
<th><?php echo $lang->bug->fixedRate;?></th>
</tr>
</thead>
<tbody id="productTableList">
@@ -75,30 +75,30 @@
<?php foreach($productStructure as $programID => $program):?>
<?php
$trAttrs = "data-id='program.$programID' data-parent='0' data-nested='true'";
$trClass = 'is-top-level table-nest-child';
$trClass = 'is-top-level table-nest-child text-center';
$trAttrs .= " class='$trClass'";
?>
<?php if(isset($program['programName']) and $config->systemMode == 'new'):?>
<tr <?php echo $trAttrs;?>>
<td>
<td class='text-left'>
<span class="table-nest-icon icon table-nest-toggle"></span>
<?php echo $program['programName']?>
</td>
<?php if($this->config->URAndSR):?>
<td class='text-center'><?php echo $program['draftRequirments'];?></td>
<td class='text-center'><?php echo $program['activeRequirments'];?></td>
<td class='text-center'><?php echo $program['changedRequirments'];?></td>
<td class='text-center'><?php echo $program['totalRequirements'] == 0 ? 0 : round($program['closedRequirements'] / $program['totalRequirements'], 3) * 100;?>%</td>
<td><?php echo $program['draftRequirments'];?></td>
<td><?php echo $program['activeRequirments'];?></td>
<td><?php echo $program['changedRequirments'];?></td>
<td><?php echo $program['totalRequirements'] == 0 ? 0 : round($program['closedRequirements'] / $program['totalRequirements'], 3) * 100;?>%</td>
<?php endif;?>
<td class='text-center'><?php echo $program['draftStories'];?></td>
<td class='text-center'><?php echo $program['activeStories'];?></td>
<td class='text-center'><?php echo $program['changedStories'];?></td>
<td class='text-center'><?php echo $program['totalStories'] == 0 ? 0 : round($program['closedStories'] / $program['totalStories'], 3) * 100;?>%</td>
<td class='text-center'><?php echo $program['unResolvedBugs'];?></td>
<td class='text-center'><?php echo $program['closedBugs'];?></td>
<td class='text-center'><?php echo ($program['unResolvedBugs'] + $program['fixedBugs']) == 0 ? 0 : round($program['fixedBugs'] / ($program['unResolvedBugs'] + $program['fixedBugs']), 3) * 100;?>%</td>
<td class='text-center'><?php echo $program['plans'];?></td>
<td class='text-center'><?php echo $program['releases'];?></td>
<td><?php echo $program['draftStories'];?></td>
<td><?php echo $program['activeStories'];?></td>
<td><?php echo $program['changedStories'];?></td>
<td><?php echo $program['totalStories'] == 0 ? 0 : round($program['closedStories'] / $program['totalStories'], 3) * 100;?>%</td>
<td><?php echo $program['unResolvedBugs'];?></td>
<td><?php echo $program['closedBugs'];?></td>
<td><?php echo ($program['unResolvedBugs'] + $program['fixedBugs']) == 0 ? 0 : round($program['fixedBugs'] / ($program['unResolvedBugs'] + $program['fixedBugs']), 3) * 100;?>%</td>
<td><?php echo $program['plans'];?></td>
<td><?php echo $program['releases'];?></td>
<td></td>
</tr>
<?php unset($program['programName']);?>
@@ -111,36 +111,36 @@
if($this->config->systemMode == 'new' and $programID)
{
$trAttrs = "data-id='line.$lineID' data-parent='program.$programID'";
$trClass .= ' is-nest-child table-nest';
$trClass .= ' is-nest-child table-nest text-center';
$trAttrs .= " data-nest-parent='program.$programID' data-nest-path='program.$programID,$lineID'";
}
else
{
$trAttrs = "data-id='line.$lineID' data-parent='0' data-nested='true'";
$trClass = 'is-top-level table-nest-child';
$trClass = 'is-top-level table-nest-child text-center';
$trAttrs .= " class='$trClass'";
}
?>
<tr <?php echo $trAttrs;?>>
<td>
<td class='text-left'>
<span class="table-nest-icon icon table-nest-toggle"></span>
<?php echo $line['lineName']?>
</td>
<?php if($this->config->URAndSR):?>
<td class='text-center'><?php echo $line['draftRequirments'];?></td>
<td class='text-center'><?php echo $line['activeRequirments'];?></td>
<td class='text-center'><?php echo $line['changedRequirments'];?></td>
<td class='text-center'><?php echo $line['totalRequirements'] == 0 ? 0 : round($line['closedRequirements'] / $line['totalRequirements'], 3) * 100;?>%</td>
<td><?php echo $line['draftRequirments'];?></td>
<td><?php echo $line['activeRequirments'];?></td>
<td><?php echo $line['changedRequirments'];?></td>
<td><?php echo $line['totalRequirements'] == 0 ? 0 : round($line['closedRequirements'] / $line['totalRequirements'], 3) * 100;?>%</td>
<?php endif;?>
<td class='text-center'><?php echo $line['draftStories'];?></td>
<td class='text-center'><?php echo $line['activeStories'];?></td>
<td class='text-center'><?php echo $line['changedStories'];?></td>
<td class='text-center'><?php echo $line['totalStories'] == 0 ? 0 : round($line['closedStories'] / $line['totalStories'], 3) * 100;?>%</td>
<td class='text-center'><?php echo $line['unResolvedBugs'];?></td>
<td class='text-center'><?php echo $line['closedBugs'];?></td>
<td class='text-center'><?php echo ($line['unResolvedBugs'] + $line['fixedBugs']) == 0 ? 0 : round($line['fixedBugs'] / ($line['unResolvedBugs'] + $line['fixedBugs']), 3) * 100;?>%</td>
<td class='text-center'><?php echo $line['plans'];?></td>
<td class='text-center'><?php echo $line['releases'];?></td>
<td><?php echo $line['draftStories'];?></td>
<td><?php echo $line['activeStories'];?></td>
<td><?php echo $line['changedStories'];?></td>
<td><?php echo $line['totalStories'] == 0 ? 0 : round($line['closedStories'] / $line['totalStories'], 3) * 100;?>%</td>
<td><?php echo $line['unResolvedBugs'];?></td>
<td><?php echo $line['closedBugs'];?></td>
<td><?php echo ($line['unResolvedBugs'] + $line['fixedBugs']) == 0 ? 0 : round($line['fixedBugs'] / ($line['unResolvedBugs'] + $line['fixedBugs']), 3) * 100;?>%</td>
<td><?php echo $line['plans'];?></td>
<td><?php echo $line['releases'];?></td>
<td></td>
</tr>
<?php unset($line['lineName']);?>
module/product/view/project.html.php
+1 -1
View File
@@ -83,7 +83,7 @@
<td class="text-right padding-right" title="<?php echo $project->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $project->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
<td class="text-right padding-right" title="<?php echo $project->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $project->hours->totalConsumed . $lang->execution->workHourUnit;?></td>
<td class='padding-right text-center'>
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $project->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo $project->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $project->hours->progress;?></div>
</div>
</td>
module/program/css/product.css
+1
View File
@@ -2,3 +2,4 @@
.main-table thead>tr>th {padding: 0px 8px; line-height: 24px;}
tbody.sortable > tr > td > span.sort-handler {color: #999;}
.icon-move {color: #16a8f8;}
.table.has-sort-head thead>tr>th>a:after, .table.has-sort-head thead>tr>th>a:before {top: -4px;}
module/program/view/browsebylist.html.php
+1 -1
View File
@@ -76,7 +76,7 @@
<td><?php echo $program->end == LONG_TIME ? $lang->program->longTime : $program->end;?></td>
<td>
<?php if(isset($progressList[$program->id])):?>
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $progressList[$program->id]?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo $progressList[$program->id]?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $progressList[$program->id];?></div>
</div>
<?php endif;?>
module/program/view/product.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
<th><?php echo $lang->story->completeRate;?></th>
<th style="border-left: 1px solid #ddd;"><?php echo $lang->bug->activate;?></th>
<th><?php echo $lang->close;?></th>
<th><?php echo $lang->bug->repairRate;?></th>
<th><?php echo $lang->bug->fixedRate;?></th>
</tr>
</thead>
<tbody class="sortable" id="productTableList">
module/project/model.php
+1 -1
View File
@@ -1424,7 +1424,7 @@ class projectModel extends model
echo $project->hours->totalLeft . $this->lang->execution->workHourUnit;
break;
case 'progress':
echo "<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}</div></div>";
echo "<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}</div></div>";
break;
case 'actions':
if($project->status == 'wait' || $project->status == 'suspended') common::printIcon('project', 'start', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true);
module/project/view/browsebycard.html.php
+1 -1
View File
@@ -121,7 +121,7 @@
<div class='row'>
<div class='col-xs-4'>
<div><?php echo $lang->project->progress;?></div>
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value="<?php echo $project->hours->progress?>" data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value="<?php echo $project->hours->progress?>" data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $project->hours->progress;?></div>
</div>
</div>
module/repo/js/create.js
+1 -1
View File
@@ -1,6 +1,6 @@
$(function()
{
scmChanged(scm);
scmChanged('Gitlab');
$('#submit').mousedown(function()
{
$form = $(this).closest('form');
module/repo/model.php
+3 -3
View File
@@ -1755,16 +1755,16 @@ class repoModel extends model
/**
* Process gitlab repo.
*
* @param oobject $repo
* @param object $repo
* @access public
* @return object
*/
public function processGitlab($repo)
{
$gitlab = $this->loadModel('gitlab')->getByID($repo->client); // $repo->client is gitlabID
$gitlab = $this->loadModel('gitlab')->getByID($repo->client); // The $repo->client is gitlabID
if(!$gitlab) return $repo;
$repo->gitlab = $gitlab->id;
$repo->project = $repo->path; // projectID in gitlab
$repo->project = $repo->path; // The projectID in gitlab
$repo->path = sprintf($this->config->repo->gitlab->apiPath, $gitlab->url, $repo->path);
$repo->client = $gitlab->url;
$repo->password = $gitlab->token;
module/repo/view/create.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
</tr>
<tr>
<th class='thWidth'><?php echo $lang->repo->type; ?></th>
<td style="width:550px"><?php echo html::select('SCM', $lang->repo->scmList, 'Git', "onchange='scmChanged(this.value)' class='form-control'"); ?></td>
<td style="width:550px"><?php echo html::select('SCM', $lang->repo->scmList, 'Gitlab', "onchange='scmChanged(this.value)' class='form-control'"); ?></td>
<td class="tips-git"><?php echo $lang->repo->syncTips; ?></td>
</tr>
<tr class='gitlab hide'>
www/theme/blue/style.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/fonts/ZentaoIcon.eot
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.svg
+3 -3
View File
@@ -139,7 +139,7 @@
<glyph unicode="&#xe97a;" glyph-name="menu-my, home" d="M182.857-146.286c-18.755 0-34.213 14.118-36.325 32.306l-0.246 4.265-0.001 447.269-86.090-72.901c-14.233-12.043-34.99-11.331-48.36 0.977l-3.181 3.318c-12.043 14.233-11.331 34.99 0.977 48.36l3.318 3.181 475.429 402.286c12.396 10.489 30.031 11.442 43.38 2.861l3.866-2.861 475.429-402.286c15.419-13.047 17.342-36.122 4.295-51.541-12.043-14.233-32.632-16.966-47.855-7.041l-3.686 2.746-86.092 72.864 0.001-447.232c0-18.755-14.118-34.213-32.306-36.325l-4.265-0.246h-658.286zM512 646.985l-292.572-247.552 0.001-472.576h146.285l0.001 292.571c0 18.755 14.118 34.213 32.306 36.325l4.265 0.246h219.429c20.198 0 36.571-16.374 36.571-36.571v0l-0.001-292.571h146.286l-0.001 472.539-292.571 247.589zM585.143 182.857h-146.286v-256h146.286v256z" />
<glyph unicode="&#xe97c;" glyph-name="clock" d="M950.856 292.571c0 242.373-196.482 438.856-438.856 438.856s-438.856-196.482-438.856-438.856c0-242.373 196.482-438.856 438.856-438.856s438.856 196.482 438.856 438.856zM1023.999 292.571c0-282.769-229.23-512.001-512.001-512.001s-511.999 229.23-511.999 512.001c0 282.771 229.23 511.999 511.999 511.999s512.001-229.23 512.001-511.999zM548.57 307.564l135.682-135.315c14.34-14.34 14.34-37.592 0-51.93s-37.592-14.34-51.93 0l-146.286 146.286c-6.847 6.902-10.661 16.245-10.605 25.965v329.143c0 20.198 16.373 36.57 36.57 36.57s36.57-16.373 36.57-36.57v-314.148z" />
<glyph unicode="&#xe97d;" glyph-name="cost" d="M950.856 292.571c0 242.373-196.482 438.856-438.856 438.856s-438.856-196.482-438.856-438.856c0-242.373 196.482-438.856 438.856-438.856s438.856 196.482 438.856 438.856zM1023.999 292.571c0-282.769-229.23-512.001-512.001-512.001s-511.999 229.23-511.999 512.001c0 282.771 229.23 511.999 511.999 511.999s512.001-229.23 512.001-511.999zM558.52 28.667h-85.629v108.996h-124.014v44.46h124.014v61.668l-0.737 0.717h-123.276v44.46h97.439l-143.944 251.697h97.439l115.894-220.145 115.894 220.145h97.439l-143.944-251.697h98.177v-44.46h-124.014l-0.737-0.717v-61.668h124.752v-44.46h-124.752v-108.996z" />
<glyph unicode="&#xe97e;" glyph-name="group, menu-users, persons, team" d="M219.429 530.285c0 111.088 90.055 201.143 201.143 201.143 111.089 0 201.143-90.055 201.143-201.143s-90.053-201.143-201.143-201.143c-111.088 0-201.143 90.053-201.143 201.143zM420.571 658.285c-70.693 0-128-57.307-128-128s57.307-128 128-128c70.693 0 128 57.307 128 128s-57.307 128-128 128zM763.18 676.43c-10.021 17.537-32.358 23.629-49.894 13.608-17.54-10.021-23.632-32.361-13.608-49.897l10.931-19.133c32.124-56.217 32.124-125.229 0-181.445l-10.931-19.134c-10.024-17.536-3.931-39.874 13.608-49.894 17.536-10.024 39.874-3.931 49.894 13.608l10.935 19.131c44.972 78.704 44.972 175.321 0 254.024l-10.935 19.133zM871.574 203.143c-11.205 16.805-33.913 21.347-50.717 10.145-16.805-11.205-21.347-33.913-10.145-50.717l36.293-54.437c20.023-30.036 30.709-65.328 30.709-101.431v-116.418c0-20.198 16.373-36.571 36.571-36.571s36.571 16.373 36.571 36.571v116.418c0 50.542-14.961 99.953-42.993 142.003l-36.29 54.437zM419.343 256c-47.239 0-84.389 0-114.423-1.858-30.561-1.894-56.244-5.815-80.144-14.8-59.12-22.221-107.205-65.287-132.556-120.836-10.413-22.813-14.873-47.225-17.002-75.549-2.075-27.604-2.075-61.612-2.075-104.199v-48.472c0-20.198 16.374-36.571 36.571-36.571h621.714c20.198 0 36.571 16.373 36.571 36.571v48.472c0 42.587 0 76.595-2.074 104.199-2.132 28.325-6.59 52.736-17.006 75.553-25.348 55.548-73.432 98.611-132.553 120.832-23.899 8.986-49.584 12.906-80.143 14.8-30.036 1.858-67.185 1.858-114.425 1.858h-2.458zM250.514 170.88c14.185 5.332 31.685 8.569 58.926 10.258 27.508 1.704 62.396 1.719 111.131 1.719s83.624-0.015 111.13-1.719c27.242-1.69 44.741-4.926 58.928-10.258 42.437-15.952 75.041-46.12 91.754-82.739 5.361-11.75 8.792-26.533 10.606-50.666 1.843-24.543 1.869-55.801 1.869-100.169v-10.448h-548.571v10.448c0 44.368 0.024 75.626 1.869 100.169 1.814 24.133 5.243 38.916 10.605 50.662 16.713 36.623 49.317 66.79 91.754 82.743z" />
<glyph unicode="&#xe97e;" glyph-name="group, menu-users, persons, team" d="M584.672 324.516c59.742 44.875 98.341 114.405 98.341 192.519 0 135.015-114.88 244.873-256.135 244.873s-256.135-109.858-256.135-244.873c0-78.114 38.592-147.641 98.341-192.519-157.463-60.155-269.086-207.184-269.086-378.855v-81.602c0-22.571 19.097-40.821 42.674-40.821h768.4c23.584 0 42.677 18.251 42.677 40.821v81.6c0 171.737-111.623 318.704-269.081 378.855zM241.584 517.357c0 97.71 83.095 177.141 185.294 177.141 102.192 0 185.289-79.433 185.289-177.141 0-97.687-83.099-177.141-185.289-177.141-102.199 0-185.294 79.424-185.294 177.141zM64.16-109.797v43.346c0 191.2 162.709 346.768 362.75 346.768 199.968 0 362.647-155.57 362.647-346.768v-43.346h-725.399zM896 476.153c0 112.544-95.751 204.119-213.456 204.119-3.554 0-6.839-0.834-10.293-0.992 3.328-4.603 6.507-9.305 9.536-14.094 17.339-21.735 30.951-46.315 39.918-72.878 51.415-15.881 107.639-61.719 107.639-116.121 0-48.011-29.525-91.607-75.195-111.426-16.907-6.133-28.832-20.711-28.832-37.749 0-17.643 12.791-32.665 30.656-38.382l8.336-1.922c113.824-27.488 193.097-124.272 193.097-237.106v-31.669h-61.173c5.643-26.375 8.606-44.304 8.606-72.27h76.485c23.616 0 42.677 18.247 42.677 40.818v63.125c0.069 124.533-72.4 234.613-183.531 289.648 34.942 36.823 55.529 85.248 55.529 136.903z" />
<glyph unicode="&#xe980;" glyph-name="menu-collapse" d="M0.003 768.004h1023.997v-111.86h-1023.997v111.86zM341.335 488.335h682.668v-111.86h-682.668v111.86zM341.335 208.672h682.668v-111.86h-682.668v111.86zM0.003-70.992h1023.997v-111.86h-1023.997v111.86zM227.561 488.335v-391.523l-227.555 195.764 227.555 195.764z" />
<glyph unicode="&#xe981;" glyph-name="menu-expand" d="M1023.997 768.004h-1023.997v-111.86h1023.997v111.86zM682.665 488.335h-682.668v-111.86h682.668v111.86zM682.665 208.672h-682.668v-111.86h682.668v111.86zM1023.997-70.992h-1023.997v-111.86h1023.997v111.86zM796.439 488.335v-391.523l227.555 195.764-227.555 195.764z" />
<glyph unicode="&#xe982;" glyph-name="spinner-indicator" d="M416-131.556c0 53.020 42.98 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96s-96 42.98-96 96zM0 284.444c0 53.020 42.982 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96s-96 42.98-96 96zM832 284.444c0 53.020 42.98 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96s-96 42.98-96 96zM121.844 578.6c0 53.020 42.98 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96s-96 42.98-96 96zM710.156-9.712c0 53.020 42.98 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96s-96 42.98-96 96zM121.844-9.712c0 53.020 42.98 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96s-96 42.98-96 96zM710.156 578.6c0 53.020 42.98 96 96 96s96-42.98 96-96c0-53.020-42.98-96-96-96s-96 42.98-96 96z" />
@@ -180,8 +180,8 @@
<glyph unicode="&#xe9a6;" glyph-name="ok" d="M585.143 493.714h-73.143v-402.286h73.143v164.571l10.971 14.629 93.63-179.2h78.256l-109.714 219.429 109.714 182.857h-87.771l-95.086-164.571v164.571zM347.111 512c41.321 0 73.175-9.957 95.231-30.080 19.632-17.91 30.504-42.018 32.68-72.042l0.406-11.535-0.004-211.745-0.395-11.224c-2.154-30.073-13.041-54.228-32.688-72.152-22.056-20.122-53.91-30.080-95.231-30.080-40.902 0-72.545 9.962-94.597 30.080-19.632 17.909-30.504 42.021-32.678 72.042l-0.407 11.535 0.004 211.745 0.395 11.224c2.152 30.074 13.041 54.229 32.686 72.151 22.053 20.119 53.695 30.080 94.597 30.080zM347.135 438.857c-15.858 0-28.873-4.005-39.309-12.010-8.473-6.499-13.413-15.166-14.825-26.262l-0.423-6.949-0.007-201.878 0.331-6.36c1.268-11.491 6.22-20.429 14.923-27.103 10.436-8.005 23.451-12.010 39.309-12.010 15.871 0 28.999 4.012 39.641 12.039 8.62 6.499 13.637 15.159 15.071 26.24l0.432 6.941 0.007 201.874-0.336 6.356c-1.287 11.476-6.32 20.403-15.173 27.081-10.642 8.027-23.77 12.039-39.641 12.039zM36.571 292.571c0 262.572 212.857 475.429 475.429 475.429s475.429-212.857 475.429-475.429c0-262.572-212.857-475.429-475.429-475.429s-475.429 212.857-475.429 475.429zM512 694.857c-222.176 0-402.286-180.11-402.286-402.286s180.11-402.286 402.286-402.286c222.175 0 402.286 180.111 402.286 402.286s-180.111 402.286-402.286 402.286z" />
<glyph unicode="&#xe9a7;" glyph-name="more-alt" d="M36.571 804.571v-1024M73.143 804.571v-1024M109.714 804.571v-1024M146.286 804.571v-1024M182.857 804.571v-1024M219.429 804.571v-1024M256 804.571v-1024M292.571 804.571v-1024M329.143 804.571v-1024M365.714 804.571v-1024M402.286 804.571v-1024M438.857 804.571v-1024M475.429 804.571v-1024M512 804.571v-1024M548.571 804.571v-1024M585.143 804.571v-1024M621.714 804.571v-1024M658.286 804.571v-1024M694.857 804.571v-1024M731.429 804.571v-1024M768 804.571v-1024M804.571 804.571v-1024M841.143 804.571v-1024M877.714 804.571v-1024M914.286 804.571v-1024M950.857 804.571v-1024M987.429 804.571v-1024M0 768h1024M0 731.428h1024M0 694.857h1024M0 658.285h1024M0 621.714h1024M0 585.142h1024M0 548.571h1024M0 512h1024M0 475.428h1024M0 438.857h1024M0 402.285h1024M0 365.714h1024M0 329.142h1024M0 292.571h1024M0 256h1024M0 219.428h1024M0 182.857h1024M0 146.285h1024M0 109.714h1024M0 73.142h1024M0 36.571h1024M0 0h1024M0-36.572h1024M0-73.143h1024M0-109.715h1024M0-146.286h1024M0-182.858h1024M512-219.429c-282.331 0-512 229.669-512 512s229.669 512 512 512c282.331 0 512-229.669 512-512s-229.669-512-512-512zM512 731.428c-242.003 0-438.857-196.854-438.857-438.857s196.854-438.857 438.857-438.857c242.001 0 438.857 196.854 438.857 438.857s-196.854 438.857-438.857 438.857zM742.857 270.107c0-3.707-1.851-7.878-4.626-10.659l-215.59-215.957c-2.776-2.781-6.94-4.634-10.641-4.634s-7.865 1.854-10.641 4.634l-215.59 215.957c-2.776 2.781-4.626 6.951-4.626 10.659s1.851 7.878 4.626 10.659l23.132 23.171c2.776 2.781 6.477 4.634 10.641 4.634 3.701 0 7.865-1.854 10.641-4.634l181.817-182.127 181.817 182.127c2.776 2.781 6.94 4.634 10.641 4.634s7.865-1.854 10.641-4.634l23.132-23.171c2.776-2.781 4.626-6.951 4.626-10.659zM742.857 473.535c0-3.707-1.851-7.878-4.626-10.659l-215.59-215.957c-2.776-2.781-6.94-4.634-10.641-4.634s-7.865 1.854-10.641 4.634l-215.59 215.957c-2.776 2.781-4.626 6.951-4.626 10.659s1.851 7.878 4.626 10.659l23.132 23.171c2.776 2.781 6.477 4.634 10.641 4.634 3.701 0 7.865-1.854 10.641-4.634l181.817-182.127 181.817 182.127c2.776 2.781 6.94 4.634 10.641 4.634s7.865-1.854 10.641-4.634l23.132-23.171c2.776-2.781 4.626-6.951 4.626-10.659z" />
<glyph unicode="&#xe9a8;" glyph-name="list, format-list-bulleted" d="M74.278 678.363c-41.028 0-74.278-33.069-74.278-73.84s33.25-73.83 74.278-73.83c41.028 0 74.278 33.059 74.278 73.83s-33.25 73.84-74.278 73.84zM993.42 682.6h-730.258c-16.912 0-30.58-13.615-30.58-30.398v-84.171c0-16.793 13.667-30.398 30.58-30.398h730.258c16.89 0 30.58 13.605 30.58 30.398v84.171c0 16.784-13.692 30.398-30.58 30.398zM993.42 360.399h-730.258c-16.912 0-30.58-13.605-30.58-30.408v-84.172c0-16.783 13.667-30.398 30.58-30.398h730.258c16.89 0 30.58 13.615 30.58 30.398v84.172c0 16.806-13.692 30.408-30.58 30.408zM993.42 38.187h-730.258c-16.912 0-30.58-13.604-30.58-30.388v-84.172c0-16.781 13.667-30.407 30.58-30.407h730.258c16.89 0 30.58 13.626 30.58 30.407v84.172c0 16.783-13.692 30.388-30.58 30.388zM74.278 356.161c-41.028 0-74.278-33.058-74.278-73.841 0-40.773 33.25-73.83 74.278-73.83s74.278 33.058 74.278 73.83c0 40.781-33.25 73.841-74.278 73.841v0zM74.278 33.947c-41.028 0-74.278-33.058-74.278-73.828 0-40.773 33.25-73.83 74.278-73.83s74.278 33.058 74.278 73.83c0 40.771-33.25 73.828-74.278 73.828z" />
<glyph unicode="&#xe9a9;" glyph-name="run" d="M451.121 546.454l4.091-1.744 219.429-109.714c22.202-11.101 26.811-40.212 10.384-57.675l-3.327-3.131-181.803-151.471 178.677-119.148c15.599-10.399 20.632-30.71 12.313-47.014l-2.158-3.685-146.109-219.429c-11.194-16.812-33.898-21.366-50.71-10.171-15.611 10.395-20.653 30.713-12.33 47.023l2.159 3.686 125.825 189.029-188.99 125.987c-19.069 12.713-21.637 39.272-6.409 55.437l3.283 3.087 176.427 147.082-154.697 77.349-167.593-67.053c-17.414-6.965-37.009 0.402-45.726 16.505l-1.812 3.869c-6.965 17.414 0.402 37.009 16.505 45.726l3.869 1.812 182.857 73.143c8.313 3.325 17.506 3.467 25.846 0.498zM386 176.715c15.605-10.403 20.636-30.725 12.304-47.030l-2.161-3.685-73.143-109.714c-2.648-3.972-6.038-7.373-9.97-10.027l-4.104-2.397-219.429-109.714c-18.065-9.033-40.033-1.71-49.066 16.355-8.388 16.775-2.673 36.915 12.651 46.938l3.705 2.127 210.732 105.383 67.765 101.621c11.204 16.806 33.91 21.347 50.715 10.143zM972.8 468.114c14.915-11.186 18.853-31.579 9.839-47.359l-2.525-3.841-109.714-146.286c-9.721-12.961-26.664-17.85-41.597-12.486l-4.016 1.719-73.143 36.571c-18.065 9.033-25.388 31-16.355 49.066 8.388 16.775 27.928 24.287 45.141 18.043l3.925-1.687 45.816-22.909 91.429 121.856c12.119 16.158 35.042 19.433 51.2 7.314zM768 768c80.791 0 146.286-65.495 146.286-146.286s-65.495-146.286-146.286-146.286c-80.791 0-146.286 65.495-146.286 146.286s65.495 146.286 146.286 146.286zM768 694.857c-40.395 0-73.143-32.747-73.143-73.143s32.748-73.143 73.143-73.143c40.395 0 73.143 32.748 73.143 73.143s-32.748 73.143-73.143 73.143zM256 219.428c20.198 0 36.571-16.374 36.571-36.571 0-18.755-14.118-34.213-32.306-36.325l-4.265-0.246h-182.857c-20.198 0-36.571 16.374-36.571 36.571 0 18.755 14.118 34.213 32.306 36.325l4.265 0.246h182.857zM402.286 365.714c20.198 0 36.571-16.374 36.571-36.571 0-18.755-14.118-34.213-32.306-36.325l-4.265-0.246h-292.571c-20.198 0-36.571 16.374-36.571 36.571 0 18.755 14.118 34.213 32.306 36.325l4.265 0.246h292.571z" />
<glyph unicode="&#xe9aa;" glyph-name="program" d="M438.857 256c20.198 0 36.571-16.374 36.571-36.571v0-329.143c0-20.198-16.374-36.571-36.571-36.571v0h-329.143c-20.198 0-36.571 16.374-36.571 36.571v0 329.143c0 20.198 16.374 36.571 36.571 36.571v0zM914.286 256c20.198 0 36.571-16.374 36.571-36.571v0-329.143c0-20.198-16.374-36.571-36.571-36.571v0h-329.143c-20.198 0-36.571 16.374-36.571 36.571v0 329.143c0 20.198 16.374 36.571 36.571 36.571v0zM402.286 182.857h-256v-256h256v256zM877.714 182.857h-256v-256h256v256zM438.857 731.428c20.198 0 36.571-16.374 36.571-36.571v0-329.143c0-20.198-16.374-36.571-36.571-36.571v0h-329.143c-20.198 0-36.571 16.374-36.571 36.571v0 329.143c0 20.198 16.374 36.571 36.571 36.571v0zM914.286 731.428c20.198 0 36.571-16.374 36.571-36.571v0-329.143c0-20.198-16.374-36.571-36.571-36.571v0h-329.143c-20.198 0-36.571 16.374-36.571 36.571v0 329.143c0 20.198 16.374 36.571 36.571 36.571v0zM402.286 658.285h-256v-256h256v256zM877.714 658.285h-256v-256h256v256z" />
<glyph unicode="&#xe9a9;" glyph-name="run" d="M748.119 179.312l-132.405 64.576c44.565 15.435 103.161 50.199 103.049 126.352v7.566c7.566 6.809 15.131 13.579 22.697 20.427 26.48 23.758 23.68 58.901-5.675 78.571-55.232 36.999-110.802 73.465-166.11 110.386v0c-11.76 8.194-26.594 10.64-40.363 6.658-55.534-15.397-111.031-31.022-166.073-48.007v0c-10.617-3.97-19.829-10.985-26.48-20.162-12.030-15.888-10.215-38.736 1.474-54.325v0c12.265-16.322 33.461-23.179 52.962-17.136 44.942 12.521 89.657 25.723 134.635 38.057v0c5.216 1.175 10.681 0.352 15.321-2.309 25.989-16.494 51.486-33.705 77.136-50.729 4.35-2.875 8.512-5.977 13.392-9.419-3.783-3.783-6.77-6.544-9.835-9.305l-43.278-38.587h-416.201v-23.264h390.402c-27.111-24.16-54.21-48.359-81.296-72.594v0c-9.44-7.941-16.149-18.647-19.179-30.603h-452.293v-23.417h453.577c4.274-12.334 14.299-23.378 30-31.058 36.821-18.032 73.68-35.989 110.576-53.87 23.113-11.349 46.229-22.697 70.325-34.464-2.571-4.464-4.539-8.021-6.658-11.349-30.491-49.456-60.994-98.912-91.509-148.368-19.71-32.119-4.425-68.094 31.776-75.659 18.688-3.783 37.831 5.41 49.746 24.665 41.184 66.528 82.267 133.111 123.25 199.742 19.975 32.496 11.614 60.754-22.962 77.627v0zM585.865 259.058l14.489 13.013c31.424 28.018 62.862 56.039 94.311 84.057-8.208-65.71-73.806-89.166-108.8-97.033v-0.037zM429.856 219.373c-3.406-4.88-5.826-8.208-8.057-11.65-21.639-33.479-43.049-67.109-65.067-100.325v0c-4.151-6.226-9.63-11.458-16.041-15.321-71.385-41.614-143.109-83.035-214.647-124.839-25.081-14.601-32.951-42.937-19.218-66.581s42.672-30.757 67.298-16.645c77.273 44.565 154.432 89.291 231.479 134.181v0c8.395 5.093 15.575 11.961 21.033 20.126 24.704 36.921 48.496 74.448 72.594 111.749 1.552 2.384 2.761 4.955 4.464 8.057-29.621 14.601-61.511 25.12-73.842 61.248v0zM818.329 483.613v0c62.155-0.146 112.663 50.123 112.807 112.279s-50.123 112.663-112.279 112.807c-62.155 0.146-112.663-50.123-112.807-112.279 0-0.165 0-0.329 0-0.491v0c0.187-61.938 50.341-112.11 112.279-112.318v0zM1022.608 488.985c-4.313 18.462-15.813 31.248-34.274 36.014-19.218 4.955-35.902-0.302-49.481-15.131-31.815-34.953-63.781-69.758-95.746-104.939l-52.281 34.766c1.929-39.266-21.262-61.966-48.459-83.225 29.81-19.861 57.689-39.57 86.704-57.387 18.082-11.122 41.614-6.507 56.29 9.57 42.471 46 84.688 92.343 126.654 139.024v0c10.363 11.054 14.359 26.635 10.592 41.31v0z" />
<glyph unicode="&#xe9aa;" glyph-name="program" d="M378.64 326.368h-202.569c-55.877 0.075-101.163 45.335-101.285 101.209v202.569c0 55.829 45.447 101.285 101.285 101.285h202.569c55.829 0 101.209-45.449 101.209-101.285v-202.569c0-55.829-45.376-101.209-101.209-101.209v0zM176.071 663.974v0c-18.651-0.039-33.76-15.173-33.76-33.833v-202.569c0-18.555 15.125-33.76 33.76-33.76h202.569c18.629 0.041 33.721 15.131 33.76 33.76v202.569c-0.041 18.629-15.131 33.721-33.76 33.76l-202.569 0.073zM378.64-146.288h-202.569c-55.899 0.075-101.205 45.376-101.285 101.285v202.569c0 55.829 45.447 101.285 101.285 101.285h202.569c55.829 0 101.209-45.447 101.209-101.285v-202.569c0-55.829-45.376-101.285-101.209-101.285v0zM176.071 191.396v0c-18.64 0-33.76-15.111-33.76-33.76v-202.569c0-18.633 15.125-33.76 33.76-33.76h202.569c18.64 0 33.76 15.113 33.76 33.76v202.498c0 18.64-15.113 33.76-33.76 33.76l-202.569 0.073zM847.929 326.438h-202.569c-55.877 0.075-101.163 45.335-101.285 101.209v202.498c0 55.829 45.447 101.285 101.285 101.285h202.569c55.829 0 101.285-45.449 101.285-101.285v-202.569c0-55.829-45.447-101.209-101.285-101.209v0.073zM645.36 663.974v0c-18.64 0-33.76-15.111-33.76-33.76 0-0.025 0-0.048 0-0.073v-202.569c0-18.555 15.125-33.76 33.76-33.76h202.569c18.64 0 33.76 15.113 33.76 33.76v202.569c0 18.64-15.111 33.76-33.76 33.76 0 0 0 0 0 0l-202.569 0.073zM847.929-146.286h-202.569c-55.899 0.075-101.205 45.376-101.285 101.285v202.569c0 55.829 45.447 101.285 101.285 101.285h202.569c55.829 0 101.285-45.449 101.285-101.285v-202.569c0-55.829-45.447-101.285-101.285-101.285v0zM645.36 191.396v0c-18.64 0-33.76-15.111-33.76-33.76v-202.569c0-18.633 15.125-33.76 33.76-33.76h202.569c18.64 0 33.76 15.111 33.76 33.76v202.498c0 18.64-15.111 33.76-33.76 33.76l-202.569 0.073z" />
<glyph unicode="&#xe9ac;" glyph-name="estimate" d="M146.286 694.857v-573.030h438.356v573.030h-438.356zM73.143 694.857c0 40.396 32.747 73.143 73.143 73.143h438.356c40.397 0 73.143-32.747 73.143-73.143v-115.939l1.591-0.519 228.535-72.96c47.557-15.183 74.39-65.772 58.544-113.697l-169.355-512.121c-15.846-47.927-67.818-73.355-115.379-58.174l-312.729 99.84c-47.558 15.184-74.392 65.774-58.543 113.697l1.812 5.482h0.002l2.827 8.218h-148.804c-40.396 0-73.143 32.75-73.143 73.143v573.030zM657.785 121.826c0-40.393-32.746-73.143-73.143-73.143h-212.22l-10.687-31.078-1.608-4.864c-2.858-8.645 1.815-18.812 11.831-22.009l312.73-99.84c10.013-3.196 19.877 2.33 22.736 10.971l169.351 512.124c2.86 8.642-1.814 18.809-11.827 22.005l-207.163 66.137v-380.304zM441.563 309.233c-26.503 0-49.006 14.142-57.757 34.348-0.541 1.093-0.987 2.081-1.386 2.955-1.434 3.171-2.209 4.875-4.363 4.875-2.344 0-2.271-5.109-2.253-6.371 0-0.080 0.004-0.15 0.004-0.197 2.249-36.871 15.002-56.068 34.501-72.989 3.752-3.533 1.251-7.069 0-7.069h-89.761c-1.25 0-4.25 3.536 0 7.069 19.503 16.417 32.504 36.118 34.505 72.989 0 0.048 0.001 0.117 0.002 0.197 0.018 1.262 0.093 6.371-2.252 6.371-2.349 0-3.012-1.551-4.39-4.769-0.381-0.892-0.818-1.909-1.36-3.061-8.751-20.458-31.254-34.348-57.758-34.348-41.506 0-70.009 36.118-70.009 77.283 0 48.446 37.347 83.783 62.925 107.983 1.223 1.157 2.42 2.289 3.584 3.396 31.254 30.054 66.259 69.454 79.010 89.406 0.25 0.758 1.001 0.758 1.25 0 12.504-19.952 47.759-59.351 79.013-89.406 1.192-1.134 2.414-2.293 3.664-3.477 25.772-24.396 62.844-59.485 62.844-107.902 0-40.912-28.255-77.283-70.012-77.283z" />
<glyph unicode="&#xe9ad;" glyph-name="summary" d="M659.195 733.31h-289.059c-17.315 0.357-31.642-13.39-31.999-30.707 0-0.004 0-0.009 0-0.013v0c0.371-15.846 12.584-28.885 28.373-30.292h292.687c16.907-1.412 31.758 11.148 33.17 28.055s-11.148 31.758-28.055 33.17c-1.702 0.142-3.413 0.142-5.116 0l-0.001-0.213zM684.582 384.092v0c10.306 0.011 20.198-4.053 27.519-11.306v0c13.792-13.715 14.989-35.636 2.774-50.772l-2.774-3.2-221.434-218.234c-7.295-7.293-17.204-11.365-27.519-11.307v0c-8.737 0.013-17.22 2.941-24.106 8.321l-2.56 2.986-126.29 124.797c-14.844 14.646-15.006 38.553-0.36 53.398 0.12 0.121 0.239 0.241 0.361 0.361v0c14.189 14.194 36.771 15.48 52.479 2.986l3.2-2.986 98.558-97.491 193.275 191.996c5.147 5.141 11.664 8.695 18.773 10.239h4.267l3.84 0.214zM270.938 666.326h-103.463c-3.622 0.058-6.845-2.293-7.893-5.761v-801.26c0.205-3.53 2.733-6.494 6.186-7.253h690.756c3.683-0.033 6.925 2.421 7.893 5.974v800.833c-0.205 3.53-2.733 6.494-6.186 7.253h-98.984v-1.92c-16.145-37.137-51.929-61.93-92.371-63.999h-296.738c-41.191-0.331-78.892 23.086-96.851 60.158l-2.347 5.974zM659.195 804.566v0c40.579 0.399 77.87-22.258 96.21-58.458l2.133-5.12 1.493-3.413h2.774l1.28 4.907v-4.907h93.438c40.965 0.968 76.212-28.785 82.131-69.332v-808.939c-0.758-42.499-34.539-77.029-77.011-78.718h-694.169c-42.608-0.826-78.541 31.561-82.131 74.025v804.246c0.863 42.455 34.585 76.924 77.011 78.718h107.944c14.302 37.13 48.298 63.039 87.891 66.991h301.005z" />
<glyph unicode="&#xe9ae;" glyph-name="assets, diamond" d="M537.647-135.797l-0.893-0.844c-0.136-0.126-0.273-0.25-0.411-0.373l-0.421-0.369c-0.376-0.325-0.759-0.641-1.147-0.95-0.056-0.052-0.12-0.103-0.184-0.153l-0.676-0.51c-0.181-0.135-0.363-0.269-0.547-0.401-0.216-0.168-0.418-0.311-0.621-0.451l-0.531-0.344c-0.184-0.122-0.369-0.242-0.556-0.361-0.509-0.333-1.040-0.653-1.581-0.959-0.403-0.24-0.79-0.45-1.179-0.653l-0.433-0.203c-0.191-0.097-0.384-0.191-0.577-0.284-0.106-0.056-0.232-0.115-0.359-0.174l-0.832-0.374c-0.935-0.411-1.887-0.783-2.855-1.115l-0.282-0.093-0.773-0.251c-0.848-0.263-1.706-0.495-2.573-0.696l-0.777-0.169-1.534-0.289c-0.633-0.104-1.27-0.192-1.909-0.262-0.23-0.024-0.462-0.048-0.693-0.069l-1.097-0.084c-0.657-0.040-1.316-0.062-1.977-0.066-0.157 0.009-0.34 0.009-0.524 0.010-0.61-0.005-1.208 0.015-1.805 0.049-0.67 0.040-1.34 0.097-2.011 0.174-0.663 0.074-1.325 0.168-1.983 0.28-0.69 0.119-1.386 0.258-2.081 0.419-0.814 0.185-1.611 0.397-2.399 0.636-0.314 0.098-0.654 0.205-0.993 0.319l-0.354 0.118c-0.905 0.313-1.797 0.66-2.673 1.042l3.027-1.16c-1.504 0.501-2.954 1.091-4.346 1.761-0.174 0.088-0.366 0.183-0.558 0.28-0.147 0.055-0.29 0.129-0.433 0.203l-1.179 0.653c-0.515 0.292-1.020 0.595-1.516 0.91-0.267 0.178-0.539 0.355-0.808 0.536-0.4 0.254-0.808 0.541-1.212 0.838l-0.008 0.018-0.967 0.725c-0.077 0.060-0.153 0.121-0.229 0.181-0.341 0.279-0.687 0.564-1.027 0.857-1.331 1.147-2.598 2.408-3.789 3.782l2.759-2.864-0.77 0.733c-0.070 0.069-0.141 0.139-0.21 0.209-0.472 0.471-0.951 0.976-1.416 1.495l-0.363 0.427-475.429 548.571c-0.228 0.263-0.452 0.528-0.671 0.795l-0.56 0.704-0.451 0.58c-0.661 0.876-1.274 1.768-1.841 2.672l2.292-3.252c-1.023 1.316-1.942 2.679-2.759 4.081-5.431 9.112-6.224 19.464-3.467 28.701 0.225 0.741 0.467 1.477 0.732 2.205 0.188 0.506 0.383 1.005 0.589 1.499 0.296 0.728 0.623 1.451 0.974 2.164 0.223 0.434 0.45 0.873 0.685 1.308 0.333 0.626 0.687 1.233 1.059 1.831 2.597 4.204 6.040 7.914 10.18 10.802l327.564 254.73c5.136 3.994 11.219 6.528 17.611 7.382l4.842 0.322h292.571c6.506 0 12.864-1.735 18.433-4.985l4.019-2.718 327.349-254.582c4.33-2.974 7.91-6.842 10.575-11.249 0.158-0.254 0.308-0.508 0.456-0.764 0.498-0.879 0.968-1.781 1.4-2.701 0.178-0.36 0.338-0.716 0.492-1.074 0.423-0.993 0.815-2.019 1.161-3.060 0.086-0.27 0.167-0.528 0.246-0.787 2.881-9.31 2.134-19.801-3.339-29.046-0.183-0.25-0.345-0.521-0.512-0.791-1.001-1.645-2.173-3.233-3.502-4.766l1.669 2.074c-0.144-0.192-0.29-0.384-0.438-0.575l-0.631-0.66-0.6-0.839-475.727-548.926c-0.408-0.458-0.827-0.906-1.256-1.341l-0.435-0.435zM644.063 402.285h-264.229l132.133-396.325 132.096 396.325zM302.778 402.285h-186.152l302.486-349.038-116.334 349.038zM907.337 402.285h-186.145l-116.297-348.928 302.442 348.928zM383.382 658.285h-5.16l-235.114-182.857h161.902l78.373 182.857zM561.009 658.285h-98.048l-78.409-182.857h254.83l-78.373 182.857zM645.742 658.285h-5.153l78.373-182.857h161.865l-235.085 182.857z" />
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 185 KiB

After

Width:  |  Height:  |  Size: 185 KiB

www/theme/zui/fonts/ZentaoIcon.ttf
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.woff
BIN
View File
Binary file not shown.