+ $rightFloatMenu .= '
'.$iconTicket.'
diff --git a/main/template/rainbow/skill/student_report.tpl b/main/template/rainbow/skill/student_report.tpl
index 1ebd703647..9c3e0bdd34 100644
--- a/main/template/rainbow/skill/student_report.tpl
+++ b/main/template/rainbow/skill/student_report.tpl
@@ -1,3 +1,4 @@
+
-
+
+
+{{ 'MySkillsReportIntroduction' | get_lang }}
+
{% if rows %}
-
+ {% if skill_table %}
+ {{ skill_table }}
+ {% endif %}
+
+
@@ -40,7 +48,4 @@
{% endfor %}
- {% if skill_table %}
- {{ skill_table }}
- {% endif %}
{% endif %}
diff --git a/main/ticket/priorities.php b/main/ticket/priorities.php
index 767b7184f6..5d74c59aea 100644
--- a/main/ticket/priorities.php
+++ b/main/ticket/priorities.php
@@ -150,13 +150,24 @@ $table->set_column_filter('3', 'modify_filter');
Display::display_header($toolName);
$items = [
- [
- 'url' => 'priorities.php?action=add',
- 'content' => Display::return_icon('new_folder.png', null, null, ICON_SIZE_MEDIUM)
- ]
+ 'icon' => 'new_folder.png',
+ 'url' => 'priorities.php?action=add',
+ 'content' => get_lang('AddPriority')
];
-
-echo Display::actions($items);
+echo '
';
+echo Display::url(
+ Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+ api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
+);
+$sections = TicketManager::getSettingsMenuItems('priority');
+array_unshift($sections, $items);
+foreach ($sections as $item) {
+ echo Display::url(
+ Display::return_icon($item['icon'], $item['content'], [], ICON_SIZE_MEDIUM),
+ $item['url']
+ );
+}
+echo '
';
echo $formToString;
echo $table->return_table();
diff --git a/main/ticket/projects.php b/main/ticket/projects.php
index f19bb5e60c..2969b66d78 100644
--- a/main/ticket/projects.php
+++ b/main/ticket/projects.php
@@ -161,13 +161,26 @@ $table->set_column_filter('3', 'modify_filter');
Display::display_header('');
$items = [
- [
- 'url' => 'projects.php?action=add',
- 'content' => Display::return_icon('new_folder.png', null, null, ICON_SIZE_MEDIUM)
- ]
+ 'icon' => 'new_folder.png',
+ 'url' => 'projects.php?action=add',
+ 'content' => get_lang('AddProject')
];
-echo Display::actions($items);
+echo '
';
+echo Display::url(
+ Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+ api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
+);
+$sections = TicketManager::getSettingsMenuItems('project');
+array_unshift($sections, $items);
+foreach ($sections as $item) {
+ echo Display::url(
+ Display::return_icon($item['icon'], $item['content'], [], ICON_SIZE_MEDIUM),
+ $item['url']
+ );
+}
+echo '
';
+
echo $formToString;
echo $table->return_table();
diff --git a/main/ticket/settings.php b/main/ticket/settings.php
index b3c5efde70..defe223e2c 100644
--- a/main/ticket/settings.php
+++ b/main/ticket/settings.php
@@ -21,8 +21,15 @@ echo Display::url(
Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
);
+$sections = TicketManager::getSettingsMenuItems();
+foreach ($sections as $item) {
+ echo Display::url(
+ Display::return_icon($item['icon'], $item['content'], [], ICON_SIZE_MEDIUM),
+ $item['url']
+ );
+}
echo '
';
-echo TicketManager::getSettingsMenu();
+
Display::display_footer();
diff --git a/main/ticket/status.php b/main/ticket/status.php
index b711ca50d7..36ba50def4 100644
--- a/main/ticket/status.php
+++ b/main/ticket/status.php
@@ -151,13 +151,24 @@ $table->set_column_filter('3', 'modify_filter');
Display::display_header($toolName);
$items = [
- [
- 'url' => 'status.php?action=add',
- 'content' => Display::return_icon('new_folder.png', null, null, ICON_SIZE_MEDIUM)
- ]
+ 'icon' => 'new_folder.png',
+ 'url' => 'status.php?action=add',
+ 'content' => get_lang('AddStatus')
];
-
-echo Display::actions($items);
+echo '
';
+echo Display::url(
+ Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+ api_get_path(WEB_CODE_PATH).'ticket/tickets.php'
+);
+$sections = TicketManager::getSettingsMenuItems('status');
+array_unshift($sections, $items);
+foreach ($sections as $item) {
+ echo Display::url(
+ Display::return_icon($item['icon'], $item['content'], [], ICON_SIZE_MEDIUM),
+ $item['url']
+ );
+}
+echo '
';
echo $formToString;
echo $table->return_table();
diff --git a/main/ticket/tickets.php b/main/ticket/tickets.php
index 3545b7146e..1a722c34af 100644
--- a/main/ticket/tickets.php
+++ b/main/ticket/tickets.php
@@ -236,7 +236,7 @@ if (!empty($projectId)) {
null,
ICON_SIZE_MEDIUM
),
- api_get_path(WEB_CODE_PATH) . 'ticket/new_ticket.php?project_id=' . $projectId,
+ api_get_path(WEB_CODE_PATH) . 'ticket/new_ticket.php?project_id=' . $projectId.'&'.api_get_cidReq(),
['title' => get_lang('Add')]
);
}
@@ -256,7 +256,7 @@ if (!empty($projectId)) {
$actionRight .= Display::url(
Display::return_icon(
'settings.png',
- get_lang('Categories'),
+ get_lang('Settings'),
null,
ICON_SIZE_MEDIUM
),
@@ -283,21 +283,32 @@ if (!empty($projectId)) {
}
$options = '';
+ $iconProject = Display::return_icon(
+ 'project.png',
+ get_lang('Projects'),
+ null,
+ ICON_SIZE_MEDIUM
+ ) ;
if ($isAdmin) {
$options .= Display::url(
- get_lang('Projects'),
+ $iconProject,
api_get_path(WEB_CODE_PATH).'ticket/projects.php'
);
}
-
- $options .= Display::url(
+ $iconTicket = Display::return_icon(
+ 'tickets.png',
$ticketLabel,
+ null,
+ ICON_SIZE_MEDIUM
+ ) ;
+ $options .= Display::url(
+ $iconTicket,
$url
);
if ($isAllow) {
echo Display::toolbarAction(
- 'options',
+ 'toolbar-options',
array(
$options
)