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

Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3

Browse Source
This commit is contained in:
caoyanyi
2023-03-30 13:29:20 +08:00
parent 845c6ab860 ac4e792e27
commit 0321ec1262
12 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/css/browse.css
+2
View File
@@ -1 +1,3 @@
#mainContent .c-id > a {color: #0c60e1;}
.btn.ajaxCollect {width: 20px; padding: 0px;}
.btn.ajaxCollect > img {width: 20px;}
module/doc/js/common.js
+2 -2
View File
@@ -297,13 +297,13 @@ $(document).ready(function()
{
if(response.status == 'yes')
{
obj.children('i').removeClass().addClass('icon icon-star text-yellow');
obj.children('img').attr('src', 'static/svg/star.svg');
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.children('img').attr('src', 'static/svg/star-empty.svg');
obj.parent().prev().children('.file-name').children('i').remove(".icon");
}
}, 'json');
module/doc/js/tablecontents.js
+3 -2
View File
@@ -239,6 +239,7 @@ $(function()
}).on('click', '.dropdown-in-tree li', function(e)
{
var item = $(this).data();
var $tree = $(this).closest('.tree');
if($(this).hasClass('edit-module'))
{
new $.zui.ModalTrigger({
@@ -261,6 +262,7 @@ $(function()
var $input = $('[data-id=liTreeModal]').html();
var $rootDom = $('[data-id=' + item.moduleid + ']a + ul');
$rootDom.append($input);
$tree.data('zui.tree').expand($('li[data-id="' + item.libid + '"]'));
}
else
{
@@ -271,7 +273,6 @@ $(function()
$rootDom.after($input);
$li.addClass('open in has-list');
}
$('#fileTree').data('zui.tree').expand($('li[data-id="' + item.libid + '"]'));
$rootDom.parent().find('input').focus();
break;
case 'addCataBro' :
@@ -290,6 +291,7 @@ $(function()
var $input = $('[data-id=liTreeModal]').html();
var $rootDom = $('#fileTree [data-id=' + item.id + ']a + ul');
var $rootDom = $('#fileTree [data-id=' + item.id + ']a + ul');
$tree.data('zui.tree').expand($('li[data-id="' + item.id + '"]'));
}
else
{
@@ -299,7 +301,6 @@ $(function()
$rootDom.addClass('open in has-list');
}
$('#fileTree').data('zui.tree').expand($('li[data-id="' + item.id + '"]'));
$rootDom.append($input);
$rootDom.find('input').focus();
break;
module/doc/view/browse.html.php
+2 -2
View File
@@ -47,7 +47,7 @@
</thead>
<tbody>
<?php foreach($docs as $doc):?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
<?php $collectTitle = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
<tr>
<?php if($browseType !== 'bySearch'):?>
@@ -82,7 +82,7 @@
<td class="c-actions">
<?php if(common::canBeChanged('doc', $doc)):?>
<?php if(common::hasPriv('doc', 'collect')):?>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><?php echo html::image("static/svg/{$star}.svg");?></a>
<?php endif;?>
<?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'", true, false)?>
<?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
module/doc/view/content.html.php
+2 -2
View File
@@ -40,8 +40,8 @@
}
?>
<?php if(common::hasPriv('doc', 'collect')):?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $lang->doc->collect;?>" class='ajaxCollect btn btn-link'><i class='icon <?php echo $star;?>'></i></a>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $lang->doc->collect;?>" class='ajaxCollect btn btn-link'><?php echo html::image("static/svg/{$star}.svg");?></a>
<?php endif;?>
<?php if($this->config->edition == 'max' and $this->app->tab == 'project'):?>
module/doc/view/doclist.html.php
+2 -2
View File
@@ -64,7 +64,7 @@ body {margin-bottom: 25px;}
</thead>
<tbody>
<?php foreach($docs as $doc):?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
<?php $collectTitle = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
<tr>
<?php $objectID = isset($doc->{$type}) ? $doc->{$type} : 0;?>
@@ -92,7 +92,7 @@ body {margin-bottom: 25px;}
}
?>
<?php if(common::canBeChanged('doc', $doc) and common::hasPriv('doc', 'collect') and $libType and $libType != 'api'):?>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><?php echo html::image("static/svg/{$star}.svg");?></a>
<?php endif;?>
</td>
<td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
module/my/css/doc.css
+1
View File
@@ -1 +1,2 @@
.fullscreen-close {top: 8px !important;}
.btn.ajaxCollect > img {width: 20px;}
module/my/js/doc.js
+2 -5
View File
@@ -5,14 +5,11 @@ $('.ajaxCollect').click(function (event) {
{
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> ');
obj.children('img').attr('src', 'static/svg/star.svg');
}
else
{
obj.children('i').removeClass().addClass('icon icon-star-empty');
obj.parent().prev().children('.file-name').children('i').remove(".icon");
obj.children('img').attr('src', 'static/svg/star-empty.svg');
}
}, 'json');
return false;
module/my/view/doc.html.php
+2 -2
View File
@@ -55,7 +55,7 @@
</thead>
<tbody id='docTableList'>
<?php foreach($docs as $doc):?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
<?php $collectTitle = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
<tr>
<td class="c-id"><?php echo $doc->id;?></td>
@@ -80,7 +80,7 @@
<td class="c-actions">
<?php if(common::canBeChanged('doc', $doc)):?>
<?php if(common::hasPriv('doc', 'collect')):?>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><?php echo html::image("static/svg/{$star}.svg");?></a>
<?php endif;?>
<?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false&from={$lang->navGroup->doc}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link' data-app='doc'", true, false)?>
<?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no&from={$lang->navGroup->doc}", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
module/project/view/createguide.html.php
+1
View File
@@ -20,6 +20,7 @@
#guideDialog .project-type.active img {border-color: #006AF1; border-width: 2px; margin-top: 0}
#guideDialog .col:nth-child(-n+3) {margin-bottom: 15px;}
@media screen and (max-width: 1366px){#guideDialog {width: 640px} #guideDialog .project-type-img.more-type {height: 108px;}}
@media screen and (max-width: 1366px){[lang^='en'] #guideDialog .row .col-xs-4 {height: 200px;} [lang^='de'] #guideDialog .row .col-xs-4 {height: 200px;} [lang^='fr'] #guideDialog .row .col-xs-4 {height: 200px;}}
</style>
<div class='modal-content'>
<div class='modal-body'>
www/static/svg/star-empty.svg
+3
View File
@@ -0,0 +1,3 @@
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.0915 4.30365L7.13335 2L6.17521 4.30365C5.8872 4.99612 5.23598 5.46926 4.4884 5.52919L2.00141 5.72857L3.89623 7.35169C4.46581 7.83959 4.71455 8.60515 4.54054 9.33466L3.96164 11.7615L6.09085 10.461C6.73088 10.0701 7.53583 10.0701 8.17586 10.461L10.3051 11.7615L9.72617 9.33465C9.55215 8.60514 9.8009 7.83959 10.3705 7.35169L12.2653 5.72857L9.77831 5.52919C9.03073 5.46926 8.37951 4.99612 8.0915 4.30365ZM8.05667 1.61597C7.71508 0.794676 6.55163 0.794678 6.21003 1.61597L5.25189 3.91962C5.10788 4.26585 4.78227 4.50242 4.40848 4.53239L1.9215 4.73177C1.03485 4.80285 0.675322 5.90936 1.35086 6.48803L3.24568 8.11114C3.53047 8.3551 3.65484 8.73787 3.56783 9.10263L2.98893 11.5295C2.78254 12.3947 3.7238 13.0786 4.4829 12.6149L6.6121 11.3144C6.93212 11.119 7.33459 11.119 7.65461 11.3144L9.78381 12.6149C10.5429 13.0786 11.4842 12.3947 11.2778 11.5295L10.6989 9.10263C10.6119 8.73787 10.7362 8.3551 11.021 8.11114L12.9159 6.48803C13.5914 5.90936 13.2319 4.80285 12.3452 4.73177L9.85822 4.53239C9.48443 4.50242 9.15882 4.26585 9.01482 3.91962L8.05667 1.61597Z" fill="#C4C4C4"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

www/static/svg/star.svg
+4
View File
@@ -0,0 +1,4 @@
<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.16999 1.73316C6.51159 0.911865 7.67504 0.911864 8.01664 1.73316L8.97478 4.0368C9.11878 4.38304 9.44439 4.61961 9.81818 4.64958L12.3052 4.84896C13.1918 4.92004 13.5513 6.02655 12.8758 6.60522L10.981 8.22833C10.6962 8.47228 10.5718 8.85506 10.6588 9.21982L11.2377 11.6467C11.4441 12.5119 10.5029 13.1958 9.74377 12.7321L7.61457 11.4316C7.29455 11.2361 6.89208 11.2361 6.57206 11.4316L4.44286 12.7321C3.68376 13.1958 2.7425 12.5119 2.94889 11.6467L3.52779 9.21982C3.6148 8.85506 3.49043 8.47228 3.20564 8.22833L1.31082 6.60522C0.635283 6.02655 0.994808 4.92004 1.88146 4.84896L4.36844 4.64958C4.74223 4.61961 5.06785 4.38304 5.21185 4.03681L6.16999 1.73316Z" fill="#FFBC7E"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.05146 4.42084L7.09332 2.11719L6.13517 4.42084C5.84716 5.11331 5.19594 5.58645 4.44836 5.64638L1.96138 5.84576L3.85619 7.46887C4.42577 7.95678 4.67451 8.72233 4.5005 9.45184L3.9216 11.8787L6.05081 10.5782C6.69084 10.1873 7.49579 10.1873 8.13582 10.5782L10.265 11.8787L9.68613 9.45184C9.51211 8.72233 9.76086 7.95678 10.3304 7.46887L12.2253 5.84576L9.73827 5.64638C8.99069 5.58645 8.33947 5.11331 8.05146 4.42084ZM8.01664 1.73316C7.67504 0.911864 6.51159 0.911865 6.16999 1.73316L5.21185 4.03681C5.06785 4.38304 4.74223 4.61961 4.36844 4.64958L1.88146 4.84896C0.994808 4.92004 0.635283 6.02655 1.31082 6.60522L3.20564 8.22833C3.49043 8.47228 3.6148 8.85506 3.52779 9.21982L2.94889 11.6467C2.7425 12.5119 3.68376 13.1958 4.44286 12.7321L6.57206 11.4316C6.89208 11.2361 7.29455 11.2361 7.61457 11.4316L9.74377 12.7321C10.5029 13.1958 11.4441 12.5119 11.2377 11.6467L10.6588 9.21982C10.5718 8.85506 10.6962 8.47228 10.981 8.22833L12.8758 6.60522C13.5513 6.02655 13.1918 4.92004 12.3052 4.84896L9.81818 4.64958C9.4444 4.61961 9.11878 4.38304 8.97478 4.0368L8.01664 1.73316Z" fill="#FF9F46"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB