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

module/bug/config.php

@@ -1,12 +1,12 @@
 <?php
 $config->bug = new stdClass();
-$config->bug->batchCreate = 10;
-$config->bug->longlife    = 7;
-$config->bug->removeFields= 'objectTypeList,productList,executionList,gitlabID,gitlabProjectID';
+$config->bug->batchCreate  = 10;
+$config->bug->longlife     = 7;
+$config->bug->removeFields = 'objectTypeList,productList,executionList,gitlabID,gitlabProjectID';
 
-$config->bug->create  = new stdclass();
-$config->bug->edit    = new stdclass();
-$config->bug->resolve = new stdclass();
+$config->bug->create       = new stdclass();
+$config->bug->edit         = new stdclass();
+$config->bug->resolve      = new stdclass();
 $config->bug->create->requiredFields  = 'title,openedBuild';
 $config->bug->edit->requiredFields    = $config->bug->create->requiredFields;
 $config->bug->resolve->requiredFields = 'resolution';

module/install/lang/de.php

@@ -128,8 +128,9 @@ $lang->install->company            = 'Firmenname';
 $lang->install->account            = 'Admin Konto';
 $lang->install->password           = 'Admin Passwort';
 $lang->install->errorEmptyPassword = 'Passwort sollte nicht leer sein.';
+
 $lang->install->selectedMode       = 'Selection mode';
-$lang->install->selectedModeTips   = 'Later, you can go to the background - Custom - mode to adjust';
+$lang->install->selectedModeTips   = 'You can go to the Admin - Custom - Mode to set it later.';
 
 $lang->install->groupList['ADMIN']['name']   = 'Admin';
 $lang->install->groupList['ADMIN']['desc']   = 'System Administrator';

module/install/lang/en.php

@@ -128,8 +128,9 @@ $lang->install->company            = 'Company Name';
 $lang->install->account            = 'Admin Account';
 $lang->install->password           = 'Admin Password';
 $lang->install->errorEmptyPassword = 'Password should not be blank.';
+
 $lang->install->selectedMode       = 'Selection mode';
-$lang->install->selectedModeTips   = 'Later, you can go to the background - Custom - mode to adjust';
+$lang->install->selectedModeTips   = 'You can go to the Admin - Custom - Mode to set it later.';
 
 $lang->install->groupList['ADMIN']['name']   = 'Admin';
 $lang->install->groupList['ADMIN']['desc']   = 'System Admin';

module/install/lang/fr.php

@@ -128,8 +128,9 @@ $lang->install->company            = 'Nom Entreprise';
 $lang->install->account            = 'Compte Admin';
 $lang->install->password           = 'Mot de Passe Admin';
 $lang->install->errorEmptyPassword = 'Password ne doit pas être vide.';
+
 $lang->install->selectedMode       = 'Selection mode';
-$lang->install->selectedModeTips   = 'Later, you can go to the background - Custom - mode to adjust';
+$lang->install->selectedModeTips   = 'You can go to the Admin - Custom - Mode to set it later.';
 
 $lang->install->groupList['ADMIN']['name']   = 'Admin';
 $lang->install->groupList['ADMIN']['desc']   = 'Administrateur';

module/install/lang/vi.php

@@ -128,8 +128,9 @@ $lang->install->company            = 'Tên doanh nghiệp';
 $lang->install->account            = 'Tài khoản quản trị';
 $lang->install->password           = 'Mật khẩu quản trị';
 $lang->install->errorEmptyPassword = 'Mật khẩu không nên là blank.';
+
 $lang->install->selectedMode       = 'Selection mode';
-$lang->install->selectedModeTips   = 'Later, you can go to the background - Custom - mode to adjust';
+$lang->install->selectedModeTips   = 'You can go to the Admin - Custom - Mode to set it later.';
 
 $lang->install->groupList['ADMIN']['name']   = 'Quản trị';
 $lang->install->groupList['ADMIN']['desc']   = 'Quản trị hệ thống';

module/install/lang/zh-cn.php

@@ -128,6 +128,7 @@ $lang->install->company  = '公司名称';
 $lang->install->account  = '管理员帐号';
 $lang->install->password = '管理员密码';
 $lang->install->errorEmptyPassword = '密码不能为空';
+
 $lang->install->selectedMode       = '选择模式';
 $lang->install->selectedModeTips   = '后续您还可以去后台-自定义-模式中进行调整';
 

module/install/lang/zh-tw.php

@@ -128,6 +128,7 @@ $lang->install->company  = '公司名稱';
 $lang->install->account  = '管理員帳號';
 $lang->install->password = '管理員密碼';
 $lang->install->errorEmptyPassword = '密碼不能為空';
+
 $lang->install->selectedMode       = '選擇模式';
 $lang->install->selectedModeTips   = '後續您還可以去後臺-自定義-模式中進行調整';
 

module/story/lang/de.php

@@ -405,3 +405,5 @@ $lang->story->categoryList['safe']        = 'Safe';
 $lang->story->categoryList['experience']  = 'Experience';
 $lang->story->categoryList['improve']     = 'Improve';
 $lang->story->categoryList['other']       = 'Other';
+
+$lang->story->sync2Gitlab = 'Mit Gitlab synchronisieren';

module/story/lang/fr.php

@@ -405,3 +405,5 @@ $lang->story->categoryList['safe']        = 'Safe';
 $lang->story->categoryList['experience']  = 'Experience';
 $lang->story->categoryList['improve']     = 'Improve';
 $lang->story->categoryList['other']       = 'Other';
+
+$lang->story->sync2Gitlab = 'Synchroniser avec Gitlab';

module/story/lang/vi.php

@@ -405,3 +405,5 @@ $lang->story->categoryList['safe']        = 'Safe';
 $lang->story->categoryList['experience']  = 'Experience';
 $lang->story->categoryList['improve']     = 'Improve';
 $lang->story->categoryList['other']       = 'Other';
+
+$lang->story->sync2Gitlab = 'Đồng bộ hóa với Gitlab';

module/story/lang/zh-cn.php

@@ -407,4 +407,4 @@ $lang->story->categoryList['experience']  = '体验';
 $lang->story->categoryList['improve']     = '改进';
 $lang->story->categoryList['other']       = '其他';
 
-$lang->story->sync2Gitlab                 = '同步到Gitlab';
+$lang->story->sync2Gitlab = '同步到Gitlab';

module/story/lang/zh-tw.php

@@ -405,3 +405,5 @@ $lang->story->categoryList['safe']        = '安全';
 $lang->story->categoryList['experience']  = '體驗';
 $lang->story->categoryList['improve']     = '改進';
 $lang->story->categoryList['other']       = '其他';
+
+$lang->story->sync2Gitlab = '同步到Gitlab';

module/story/view/create.html.php

@@ -252,14 +252,13 @@
             </td>
           </tr>
           <?php endif;?>
-        <?php if(!empty($gitlabProjects)):?>
-        <tr>
-          <th><?php echo $lang->story->sync2Gitlab;?></th>
-          <td><?php echo html::select('gitlab', $gitlabList, '', "class='form-control chosen'");?></td>
-          <td><?php echo html::select('gitlabProject', '', '', "class='w-50px form-control chosen'");?></td>
-        </tr>
-        <?php endif;?>
-
+          <?php if(!empty($gitlabProjects)):?>
+          <tr>
+            <th><?php echo $lang->story->sync2Gitlab;?></th>
+            <td><?php echo html::select('gitlab', $gitlabList, '', "class='form-control chosen'");?></td>
+            <td><?php echo html::select('gitlabProject', '', '', "class='w-50px form-control chosen'");?></td>
+          </tr>
+          <?php endif;?>
         </tbody>
         <tfoot>
           <tr>

module/upgrade/model.php

@@ -684,6 +684,11 @@ class upgradeModel extends model
             $this->execSQL($this->getUpgradeFile('15.0.2'));
             $this->uniqueProjectAdmin();
             $this->appendExec('15_0_2');
+        case '15_0_3':
+            $this->saveLogs('Execute 15_0_3');
+            $this->execSQL($this->getUpgradeFile('15.0.3'));
+            $this->processGitlabRepo();
+            $this->appendExec('15_0_3');
         }
 
         $this->deletePatch();
@@ -874,6 +879,7 @@ class upgradeModel extends model
             case '15_0': $confirmContent .= file_get_contents($this->getUpgradeFile('15.0'));
             case '15_0_1':
             case '15_0_2': $confirmContent .= file_get_contents($this->getUpgradeFile('15.0.2'));
+            case '15_0_3': $confirmContent .= file_get_contents($this->getUpgradeFile('15.0.3'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
@@ -5084,6 +5090,12 @@ class upgradeModel extends model
         return true;
     }
 
+    /**
+     * Process gitlab repo data.
+     *
+     * @access public
+     * @return void
+     */
     public function processGitlabRepo()
     {
         $repoList = $this->dao->select('*')->from(TABLE_REPO)->where('SCM')->eq('Gitlab')->fetchAll();
@@ -5105,7 +5117,7 @@ class upgradeModel extends model
             $this->loadModel('gitlab')->saveProjectRelation($products, $gitlabID, $gitlabProject);
 
             $this->dao->update(TABLE_REPO)->set('client')->eq($gitlabID)->set('path')->eq($gitlabProject)->where('id')->eq($repo->id)->exec();
-            
+
             $this->loadModel("gitlab")->initWebhooks($products, $gitlabID, $gitlabProject);
         }
     }

www/theme/zui/fonts/ZentaoIcon.svg

@@ -144,7 +144,7 @@
 <glyph unicode="&#xe978;" glyph-name="menu-doc" horiz-adv-x="951" d="M754.189 804.136l7.973-1.287c31.345-6.879 55.703-34.159 59.043-67.861l0.4-8.3-0.009-463.951 6.919-6.917 51.729-0.047 8.067-0.427 7.975-1.285c31.348-6.879 55.708-34.159 59.049-67.861l0.4-8.3-0.009-319.788-0.417-8.301-1.261-8.211c-6.727-32.269-33.349-57.216-66.092-60.624l-8.059-0.407-812.481 0.435-7.973 1.287c-31.345 6.879-55.701 34.159-59.043 67.861l-0.4 8.3 0.009 547.853 0.417 8.301 1.261 8.211c6.727 32.269 33.349 57.216 66.092 60.624l8.059 0.407 51.377-0.009 6.925 6.919v236.269l0.417 8.301 1.261 8.211c6.727 32.269 33.349 57.216 66.092 60.624l8.059 0.407 544.221-0.435zM283.962 413.227h-208.481l-6.927-6.919v-548.195l6.927-6.919h804.78l6.925 6.919v320.125l-6.925 6.917h-384.507l-12.604 0.464-12.124 1.337c-52.119 7.689-98.423 39.761-124.765 87.233l-5.829 11.455-3.621 8.355-46.429 114.895-6.423 4.329zM746.129 733.948h-536.521l-6.927-6.919v-229.212l6.927-6.917h74.353l8.605-0.46 8.761-1.417c23.039-5.071 43.261-20.321 54.855-41.98l4.087-8.769 46.352-114.681 3.983-8.615 5.503-9.253c15.865-23.677 40.988-39.212 69.023-42.353l10.245-0.577 250.76 0.037 6.925 6.917v457.279l-6.925 6.919zM611.998 445.623l6.103-0.505c17.884-2.995 31.581-18.935 31.581-38.215 0-21.423-16.911-38.72-37.684-38.72h-134.129l-6.103 0.507c-17.884 2.995-31.581 18.933-31.581 38.213 0 21.423 16.911 38.72 37.684 38.72h134.129zM611.998 628.552l6.103-0.507c17.884-2.995 31.581-18.933 31.581-38.213 0-21.423-16.911-38.72-37.684-38.72h-268.26l-6.103 0.505c-17.884 2.995-31.581 18.935-31.581 38.215 0 21.423 16.911 38.72 37.684 38.72h268.26z" />
 <glyph unicode="&#xe979;" glyph-name="menu-project" d="M477.867 173.104c-28.277 0-51.2 22.923-51.2 51.2s22.923 51.2 51.2 51.2c28.277 0 51.2-22.923 51.2-51.2s-22.923-51.2-51.2-51.2zM643.617 173.104c-28.277 0-51.2 22.923-51.2 51.2s22.923 51.2 51.2 51.2c28.277 0 51.2-22.923 51.2-51.2s-22.923-51.2-51.2-51.2zM136.534 668.038v-68.267h-68.267v102.4c0 18.851 15.282 34.133 34.133 34.133h750.934c18.851 0 34.133-15.282 34.133-34.133v-102.4h-68.267v68.267h-682.668zM896.545 394.971v136.534h-827.58v-614.401h827.58v136.534h-589.344c-18.851 0-34.133 15.282-34.133 34.133v273.066c0 18.851 15.282 34.133 34.133 34.133h589.344zM955.036 326.704h-618.039v-204.801h618.039v204.801zM965.51-117.029c0-18.851-15.438-34.133-34.483-34.133h-896.545c-19.044 0-34.482 15.282-34.482 34.133v682.668c0 18.851 15.438 34.133 34.482 34.133h896.545c19.044 0 34.483-15.282 34.483-34.133v-168.406h24.008c19.044 0 34.482-15.282 34.482-34.133v-277.21c0-18.851-15.438-34.133-34.482-34.133h-24.008v-168.785z" />
 <glyph unicode="&#xe97a;" glyph-name="menu-my" d="M598.313-217.87c-19.728-0.572-36.183 14.957-36.755 34.685-0.020 0.69-0.020 1.381 0 2.071v179.674c0 31.295-25.37 56.665-56.665 56.665s-56.665-25.37-56.665-56.665v-179.674c0.572-19.728-14.956-36.184-34.684-36.756-0.69-0.016-1.381-0.016-2.071 0h-194.5c-60.853 0.113-110.155 49.415-110.267 110.267v322.125h-20.931c-46.941-0.425-85.339 37.284-85.771 84.225 0 0.513 0 1.026 0 1.54-0.176 22.142 8.457 43.449 24.002 59.218l371.643 393.596c60.793 63.891 161.717 66.853 226.151 6.636 1.204-2.737 3.389-4.922 6.126-6.126l371.644-394.105c32.993-33.59 32.51-87.567-1.081-120.561-16.303-16.013-38.352-24.811-61.199-24.42h-31.652v-322.127c-0.056-60.677-49.081-109.931-109.757-110.267h-197.563zM636.090-144.359h159.276c21.087 0.142 38.148 17.202 38.288 38.29v357.347c-0.572 19.728 14.956 36.184 34.684 36.756 0.691 0.020 1.382 0.020 2.072 0h68.917c5.104 0.043 9.616 3.325 11.23 8.167v0c2.018 4.941 0.803 10.613-3.062 14.294l-373.173 392.064c-32.46 34.803-86.988 36.702-121.792 4.242-0.417-0.389-0.83-0.782-1.24-1.18v0c-1.638-0.122-2.941-1.424-3.062-3.062l-371.642-392.576c-4.59-4.874-4.59-12.48 0-17.356v0c2.603-2.435 6.169-3.561 9.699-3.063h59.219c19.728 0.572 36.184-14.956 36.756-34.684 0.020-0.691 0.020-1.382 0-2.072v-358.88c0.139-21.087 17.199-38.148 38.287-38.288h157.234v176.634c0 40.599 32.912 73.511 73.511 73.511h113.332c40.599 0 73.511-32.912 73.511-73.511 0 0 0 0 0 0l-2.042-176.634h-0.001z" />
-<glyph unicode="&#xe97b;" glyph-name="swap" d="M457.387 758.428h-345.144c-19.556 0-34.927-17.161-34.927-39.012v-336.972c0-21.852 15.371-39.012 34.927-39.012h345.144c19.556 0 34.927 17.161 34.927 39.012v336.972c0 21.852-15.371 39.012-34.927 39.012zM178.929 444.494v207.5h207.5v-207.5h-207.5zM908.473 240.692h-345.265c-19.624 0-34.932-17.164-34.932-38.868v-337.327c0-21.705 15.308-38.803 34.932-38.803h345.199c19.559 0 34.867 17.097 34.867 38.803v337.327c0.065 21.705-16.681 38.868-34.801 38.868zM631.373-69.525v207.5h207.5v-207.5h-207.5zM625.269 684.291c109.041-10.953 196.527-76.597 215.193-189.209h-63.115l101.856-151.651 101.924 151.651h-70.299c-18.667 151.651-133.413 250.22-278.375 264.263-20.076 1.612-38.675-15.589-38.675-37.493 1.344-18.813 14.235-35.945 31.491-37.56zM398.595-99.157c-121.932 10.953-215.193 92.255-219.491 226.769h67.412l-101.789 151.651-101.856-151.651h67.412c2.82-173.623 124.752-286.165 281.195-301.823 20.076-1.544 38.743 15.657 38.743 37.56v0c0.256 18.635-13.227 34.616-31.625 37.493v0z" />
+<glyph unicode="&#xe97b;" glyph-name="switch" d="M457.387 758.428h-345.144c-19.556 0-34.927-17.161-34.927-39.012v-336.972c0-21.852 15.371-39.012 34.927-39.012h345.144c19.556 0 34.927 17.161 34.927 39.012v336.972c0 21.852-15.371 39.012-34.927 39.012zM178.929 444.494v207.5h207.5v-207.5h-207.5zM908.473 240.692h-345.265c-19.624 0-34.932-17.164-34.932-38.868v-337.327c0-21.705 15.308-38.803 34.932-38.803h345.199c19.559 0 34.867 17.097 34.867 38.803v337.327c0.065 21.705-16.681 38.868-34.801 38.868zM631.373-69.525v207.5h207.5v-207.5h-207.5zM625.269 684.291c109.041-10.953 196.527-76.597 215.193-189.209h-63.115l101.856-151.651 101.924 151.651h-70.299c-18.667 151.651-133.413 250.22-278.375 264.263-20.076 1.612-38.675-15.589-38.675-37.493 1.344-18.813 14.235-35.945 31.491-37.56zM398.595-99.157c-121.932 10.953-215.193 92.255-219.491 226.769h67.412l-101.789 151.651-101.856-151.651h67.412c2.82-173.623 124.752-286.165 281.195-301.823 20.076-1.544 38.743 15.657 38.743 37.56v0c0.256 18.635-13.227 34.616-31.625 37.493v0z" />
 <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" d="M584.671 324.515c59.742 44.876 98.341 114.404 98.341 192.518 0 135.015-114.881 244.873-256.134 244.873s-256.134-109.858-256.134-244.873c0-78.114 38.591-147.641 98.34-192.518-157.462-60.156-269.086-207.184-269.086-378.854v-81.603c0-22.571 19.097-40.82 42.675-40.82h768.401c23.584 0 42.676 18.251 42.676 40.82v81.601c0.001 171.738-111.623 318.705-269.081 378.855zM241.585 517.358c0 97.71 83.095 177.14 185.293 177.14 102.191 0 185.29-79.432 185.29-177.14 0-97.686-83.099-177.14-185.29-177.14-102.198 0-185.293 79.425-185.293 177.14zM64.159-109.798v43.346c0 191.199 162.708 346.769 362.749 346.769 199.968 0 362.648-155.571 362.648-346.769v-43.346h-725.398zM895.999 476.153c0 112.543-95.75 204.12-213.457 204.12-3.554 0-6.839-0.835-10.292-0.991 3.328-4.604 6.507-9.305 9.536-14.094 17.339-21.735 30.951-46.316 39.918-72.878 51.414-15.881 107.639-61.72 107.639-116.121 0-48.012-29.525-91.607-75.195-111.427-16.908-6.133-28.832-20.71-28.832-37.749 0-17.644 12.792-32.665 30.656-38.382l8.335-1.922c113.824-27.488 193.098-124.273 193.098-237.107v-31.668h-61.173c5.644-26.375 8.605-44.304 8.605-72.27h76.484c23.616 0 42.677 18.248 42.677 40.818v63.124c0.069 124.532-72.401 234.612-183.532 289.649 34.942 36.823 55.529 85.247 55.529 136.902z" />
@@ -195,7 +195,11 @@
 <glyph unicode="&#xe9ab;" glyph-name="alter" d="M207.461-190.178l200.355 202.59h-148.075v332.852c0 20.361 16.506 36.866 36.866 36.866h371.016v97.533h-425.961c-24.062 0-46.609-11.74-60.406-31.453-4.477-6.398-8.065-12.407-10.762-18.029-6.749-14.067-10.023-30.084-9.823-48.051v0-369.718h-160.671l207.461-202.59zM816.539 775.319l-200.355-202.59h148.075v-332.852c0-20.361-16.506-36.866-36.866-36.866h-371.016v-97.533h443.634c28.279 0 52.263 20.776 56.294 48.767l5.769 40.051c0.836 5.803 1.255 11.658 1.255 17.52v360.913h160.671l-207.461 202.59z" />
 <glyph unicode="&#xe9ac;" glyph-name="estimate" d="M906.777 547.172c62.494-20.419 99-84.768 84.768-148.499l-3.094-11.756-168.299-518.511c-20.419-62.494-84.768-99-148.499-84.768l-11.756 3.094-345.262 111.994c-62.494 20.419-99 84.768-84.768 148.499l3.094 11.756 3.712 11.137 69.299-22.275-3.712-11.137c-8.044-25.369 3.094-53.212 26.606-64.968l8.044-3.712 345.262-111.994c25.369-8.044 53.212 3.094 64.968 26.606l3.712 8.044 168.299 518.511c8.044 25.369-3.094 53.212-26.606 64.968l-8.044 3.712-280.293 90.956 22.275 69.299 280.293-90.956zM520.058 804.571h-363.825c-69.918 0-126.844-56.925-126.844-126.844v-545.118c0-69.918 56.925-126.844 126.844-126.844h363.206c69.918 0 126.849 56.925 126.849 126.844v545.118c0.614 69.918-56.311 126.844-126.23 126.844zM156.235 732.178h363.206c30.318 0 54.45-24.131 54.45-54.45v-545.118c0-30.318-24.131-54.45-54.45-54.45h-363.206c-30.318 0-54.45 24.131-54.45 54.45v545.118c0 29.699 24.75 54.45 54.45 54.45zM338.146 564.496c12.994 0 56.306-77.962 95.288-119.419 42.694-44.55 44.55-84.15 28.463-113.85-14.85-28.463-64.968 1.238-118.181 0-55.688-1.238-110.756-32.175-129.937 0-18.562 30.937-8.044 61.875 28.463 113.85 37.125 51.356 82.912 119.419 95.906 119.419v0zM327.009 346.078h21.038l9.282-56.925 26.606-19.181v-14.85h-90.337v15.469l25.987 19.181 7.425 56.306zM713.727 382.585l83.531 60.019 40.219-92.812-89.718-61.256-34.031 94.050z" />
 <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="asset, diamond" d="M1023.998 469.318c0 4.411-2.046 8.285-4.955 11.583l0.296 0.194-1.454 1.228c-0.553 0.526-1.138 1.019-1.75 1.476l-276.068 232.96-0.318-0.192c-4.25 4.757-10.682 8.055-18.294 8.055h-418.908c-7.612 0-14.045-3.299-18.294-8.055l-0.321 0.192-276.066-232.961c-0.639-0.479-1.183-0.939-1.75-1.476l-1.454-1.228 0.318-0.194c-2.934-3.297-4.979-7.172-4.979-11.583 0-4.679 2.204-8.784 5.431-12.159l-0.248-0.171 488.728-589.18 0.248 0.192c4.272-4.47 10.521-7.48 17.841-7.48s13.568 3.010 17.84 7.48l0.25-0.192 488.477 589.354c3.228 3.374 5.433 7.478 5.433 12.158v0.001zM712.135 685.344l232.728-196.387h-209.182l-116.363 196.387h92.819zM567.591 685.344l116.339-196.387h-343.862l116.341 196.387h111.183zM311.863 685.344h92.818l-116.362-196.387h-209.182l232.728 196.387zM67.909 449.68h217.339l163.022-458.519-380.362 458.519zM511.998-51.568l-178.204 501.247h356.408l-178.204-501.247zM575.726-8.839l163.023 458.519h217.339l-380.363-458.519z" />
+<glyph unicode="&#xe9ae;" glyph-name="assets, diamond" d="M1023.998 469.318c0 4.411-2.046 8.285-4.955 11.583l0.296 0.194-1.454 1.228c-0.553 0.526-1.138 1.019-1.75 1.476l-276.068 232.96-0.318-0.192c-4.25 4.757-10.682 8.055-18.294 8.055h-418.908c-7.612 0-14.045-3.299-18.294-8.055l-0.321 0.192-276.066-232.961c-0.639-0.479-1.183-0.939-1.75-1.476l-1.454-1.228 0.318-0.194c-2.934-3.297-4.979-7.172-4.979-11.583 0-4.679 2.204-8.784 5.431-12.159l-0.248-0.171 488.728-589.18 0.248 0.192c4.272-4.47 10.521-7.48 17.841-7.48s13.568 3.010 17.84 7.48l0.25-0.192 488.477 589.354c3.228 3.374 5.433 7.478 5.433 12.158v0.001zM712.135 685.344l232.728-196.387h-209.182l-116.363 196.387h92.819zM567.591 685.344l116.339-196.387h-343.862l116.341 196.387h111.183zM311.863 685.344h92.818l-116.362-196.387h-209.182l232.728 196.387zM67.909 449.68h217.339l163.022-458.519-380.362 458.519zM511.998-51.568l-178.204 501.247h356.408l-178.204-501.247zM575.726-8.839l163.023 458.519h217.339l-380.363-458.519z" />
+<glyph unicode="&#xe9b0;" glyph-name="swap" horiz-adv-x="788" d="M301.518-113.905c12.612 5.237 20.521 16.994 20.521 30.675v812.202c0 18.277-14.964 33.241-33.241 33.241s-33.241-14.964-33.241-33.241v-731.398l-8.123 8.123-136.703 136.169c-6.306 6.306-14.536 9.726-23.514 9.726-8.871 0-17.208-3.527-23.514-9.726l-0.748-0.748c-12.185-13.147-11.971-33.561 0.748-46.28l201.367-201.581c9.833-9.619 23.728-12.398 36.447-7.161zM498.717 699.045c-12.612-5.237-20.521-16.994-20.521-30.675l0.107-812.202c0-18.277 14.964-33.241 33.241-33.241s33.241 14.964 33.241 33.241v731.292l8.123-8.123 136.382-136.062c12.933-12.933 33.989-12.933 46.922 0 6.413 6.52 9.726 14.964 9.726 23.514s-3.206 16.994-9.726 23.514l-201.367 201.581c-9.619 9.619-23.514 12.398-36.126 7.161v0z" />
+<glyph unicode="&#xe9b1;" glyph-name="lane" d="M67.587-124.12v855.921c0 40.19 32.581 72.771 72.771 72.771 0 0 0 0 0 0h810.872c40.19 0 72.771-32.58 72.771-72.771v-855.921c0-40.19-32.581-72.771-72.771-72.771h-810.872c-40.19 0-72.771 32.581-72.771 72.771 0 0 0 0 0 0v0zM961.625 731.8v0c0 5.741-4.654 10.396-10.396 10.396h-810.872c-5.741 0-10.396-4.654-10.396-10.396v-855.921c0-5.741 4.654-10.396 10.396-10.396h810.872c5.741 0 10.396 4.654 10.396 10.396v855.921zM992.812 513.489v-62.375h-894.038v62.375h894.038zM992.812 128.845v-62.375h-894.038v62.375h894.038z" />
+<glyph unicode="&#xe9b2;" glyph-name="side-right" d="M148.028 802.13v0c-80.406 0-145.588-65.182-145.588-145.588 0 0 0 0 0 0v-727.942c0-80.406 65.182-145.588 145.588-145.588 0 0 0 0 0 0h727.942c80.406 0 145.588 65.182 145.588 145.588 0 0 0 0 0 0v727.942c0 80.406-65.182 145.588-145.588 145.588 0 0 0 0 0 0h-727.942zM75.234 729.335h873.53v-873.53h-873.53v873.53zM584.793 656.541h291.177v-727.942h-291.177z" />
+<glyph unicode="&#xe9b3;" glyph-name="side-left" d="M875.972 802.13v0c80.406 0 145.588-65.182 145.588-145.588 0 0 0 0 0 0v-727.942c0-80.406-65.182-145.588-145.588-145.588 0 0 0 0 0 0h-727.942c-80.406 0-145.588 65.182-145.588 145.588 0 0 0 0 0 0v727.942c0 80.406 65.182 145.588 145.588 145.588 0 0 0 0 0 0h727.942zM948.766 729.335h-873.53v-873.53h873.53v873.53zM439.207 656.541h-291.177v-727.942h291.177z" />
 <glyph unicode="&#xf016;" glyph-name="file, file-empty" horiz-adv-x="878" d="M838.857 587.428c21.143-21.143 38.857-63.429 38.857-93.714v-658.286c0-30.286-24.571-54.857-54.857-54.857h-768c-30.286 0-54.857 24.571-54.857 54.857v914.286c0 30.286 24.571 54.857 54.857 54.857h512c30.286 0 72.571-17.714 93.714-38.857zM585.143 726.857v-214.857h214.857c-3.429 9.714-8.571 19.429-12.571 23.429l-178.857 178.857c-4 4-13.714 9.143-23.429 12.571zM804.571-146.286v585.143h-237.714c-30.286 0-54.857 24.571-54.857 54.857v237.714h-438.857v-877.714h731.429z" />
 <glyph unicode="&#xf02d;" glyph-name="book" d="M948.764 510.653c13.529-19.482 17.318-44.918 9.741-69.81l-148.822-490.3c-13.529-45.999-61.152-81.716-107.693-81.716h-499.501c-55.199 0-114.186 43.835-134.21 100.116-8.658 24.352-8.658 48.165-1.083 68.728 1.083 10.823 3.248 21.647 3.789 34.635 0.541 8.658-4.329 15.694-3.248 22.188 2.165 12.988 13.529 22.188 22.188 36.799 16.235 27.058 34.635 70.893 40.587 99.033 2.706 10.281-2.706 22.188 0 31.388 2.706 10.281 12.988 17.859 18.401 27.6 14.612 24.894 33.554 73.058 36.259 98.493 1.083 11.364-4.329 23.811-1.083 32.471 3.789 12.447 15.694 17.859 23.811 28.682 12.988 17.859 34.635 69.269 37.881 97.952 1.083 9.199-4.329 18.401-2.706 28.14 2.165 10.281 15.153 21.106 23.811 33.554 22.728 33.554 27.058 107.693 95.787 88.211l-0.541-1.623c9.199 2.165 18.401 4.871 27.6 4.871h411.831c25.434 0 48.165-11.364 61.694-30.306 14.070-19.482 17.318-44.918 9.741-70.352l-148.281-490.3c-25.434-83.34-39.505-101.74-108.235-101.74h-470.277c-7.035 0-15.694-1.623-20.565-8.117-4.329-6.495-4.871-11.364-0.541-23.269 10.823-31.388 48.165-37.881 77.93-37.881h499.501c20.024 0 43.293 11.364 49.247 30.846l162.352 534.135c3.248 10.281 3.248 21.106 2.706 30.846 12.447-4.871 23.811-12.447 31.929-23.269zM372.959 509.57c-3.248-9.741 2.165-17.318 11.905-17.318h329.032c9.199 0 19.482 7.576 22.728 17.318l11.364 34.635c3.248 9.741-2.165 17.318-11.905 17.318h-329.032c-9.199 0-19.482-7.576-22.728-17.318zM328.043 371.031c-3.248-9.741 2.165-17.318 11.905-17.318h329.032c9.199 0 19.482 7.576 22.728 17.318l11.364 34.635c3.248 9.741-2.165 17.318-11.905 17.318h-329.032c-9.199 0-19.482-7.576-22.728-17.318z" />
 <glyph unicode="&#xf064;" glyph-name="share" d="M960.285 412.526c0-8.506-3.502-16.511-9.505-22.514l-256.163-256.163c-6.003-6.003-14.008-9.505-22.514-9.505-17.512 0-32.020 14.509-32.020 32.020v128.082h-112.072c-215.638 0-357.227-41.527-357.227-280.178 0-20.513 1.001-41.025 2.501-61.54 0.5-8.005 2.501-17.011 2.501-25.015 0-9.505-6.003-17.512-16.010-17.512-7.004 0-10.506 3.502-14.008 8.506-7.505 10.506-13.009 26.518-18.511 38.025-28.517 64.041-63.54 155.598-63.54 225.643 0 56.036 5.504 113.572 26.518 166.606 69.545 172.609 273.673 201.628 437.778 201.628h112.072v128.082c0 17.512 14.509 32.020 32.020 32.020 8.506 0 16.511-3.502 22.514-9.505l256.163-256.163c6.003-6.003 9.505-14.008 9.505-22.514z" />