From 2554993ae01e920e2c7616a8705afa007ab06272 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 19 Oct 2020 15:49:46 +0800 Subject: [PATCH] * Adjusting the left menu style. --- module/common/lang/de.php | 1 + module/common/lang/fr.php | 1 + module/common/lang/vi.php | 1 + module/common/model.php | 4 ++-- www/theme/default/style.css | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index f9a475dfec..7bc9cb9c89 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -60,6 +60,7 @@ $lang->required = 'Pflicht'; $lang->noData = 'Kein Datensatz'; $lang->fullscreen = 'Fullscreen'; $lang->retrack = 'Retrack'; +$lang->recent = 'Kürzlich'; $lang->actions = 'Aktionen'; $lang->restore = 'Wiederherstellen'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index ca9fe871f8..dcda885692 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -60,6 +60,7 @@ $lang->required = 'Obligatoire'; $lang->noData = 'No data.'; $lang->fullscreen = 'Plein Ecran'; $lang->retrack = 'Réduire'; +$lang->recent = 'Récent'; $lang->actions = 'Action'; $lang->restore = 'Réinitialiser'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index a34da52340..93a40ae3e7 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -60,6 +60,7 @@ $lang->required = 'Bắt buộc'; $lang->noData = 'Không có dữ liệu.'; $lang->fullscreen = 'Fullscreen'; $lang->retrack = 'Retrack'; +$lang->recent = 'Recente'; $lang->actions = 'Hành động'; $lang->restore = 'Thiết lập lại'; diff --git a/module/common/model.php b/module/common/model.php index 965429b89b..d084d58ff9 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -543,7 +543,7 @@ class commonModel extends model { global $dbh, $lang, $app; echo '

  • '; - echo '
  • ' . $lang->recent . '
  • '; + echo '
  • ' . $lang->recent . '
  • '; $extraWhere = empty($app->user->admin) && !empty($app->user->view->projects) ? ' and parent in (' . $app->user->view->projects . ') ' : ''; $recentProjects = $dbh->query('select * from ' . TABLE_PROJECT . " where type in ('stage','sprint') $extraWhere and status != 'close' and deleted = '0' order by 'id' desc limit 6")->fetchAll(); @@ -553,7 +553,7 @@ class commonModel extends model foreach($recentProjects as $key => $project) { if($key == 5) continue; - echo '
  • ' . html::a(helper::createLink('project', 'task', 'projectID=' . $project->id, '', false, $project->parent), $project->name, '', "class='text-ellipsis' title='$project->name'") . '
  • '; + echo '
  • ' . html::a(helper::createLink('project', 'task', 'projectID=' . $project->id, '', false, $project->parent), $project->name, '', "style='padding: 2px 8px 2px 8px;' class='text-ellipsis' title='$project->name'") . '
  • '; } if(count($recentProjects) > 5) echo '
  • ' . $lang->more . '
  • '; } diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 99ee9c89cb..b94bbfbeea 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -50,6 +50,6 @@ a.showMoreImage:hover {opacity: 1;} #mainMenu .pull-right > .btn-group > .btn-icon {background: transparent;} #mainMenu .pull-right > .btn-group > .btn-icon:hover {background: #fff;} -#menuNav> .nav > li > span {padding: 8px; line-height: 20px; cursor: pointer; color: #fff; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; -khtml-user-select: none; user-select:none;} +#mainRecent {padding: 8px; line-height: 20px; cursor: pointer; color: #fff; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; -khtml-user-select: none; user-select:none;} #morePRJ {display:none; max-height: 420px; position: fixed; bottom: 0; left: 100px; z-index: 999; background: white; padding: 20px 10px; height: 420px; margin-bottom: 40px; border: 1px solid #efefef} #morePRJ > .list-group {height: 380px; min-width: 150px; max-width:200px;}