Fix UI, update lang see BT#12723

pull/2487/head
jmontoyaa 9 years ago
parent 1507783a39
commit 443dd0a086
  1. 6
      main/inc/lib/banner.lib.php
  2. 2
      plugin/studentfollowup/lang/english.php
  3. 1
      plugin/studentfollowup/post.php
  4. 1
      plugin/studentfollowup/posts.php
  5. 10
      plugin/studentfollowup/view/post.html.twig
  6. 2
      plugin/studentfollowup/view/posts.html.twig

@ -343,9 +343,10 @@ function return_navigation_array()
if (true) {
$params = array('variable = ? AND subkey = ?' => ['status', 'studentfollowup']);
$result = api_get_settings_params_simple($params);
$plugin = StudentFollowUpPlugin::create();
if (!empty($result) && $result['selected_value'] === 'installed') {
$navigation['follow_up']['url'] = api_get_path(WEB_PLUGIN_PATH).'studentfollowup/posts.php';
$navigation['follow_up']['title'] = get_lang('MyDossier');
$navigation['follow_up']['title'] = $plugin->get_lang('CareDetailView');
$navigation['follow_up']['key'] = 'homepage';
$navigation['follow_up']['icon'] = 'homepage.png';
}
@ -363,8 +364,7 @@ function return_navigation_array()
// Reports
if (!empty($possible_tabs['reports'])) {
if (api_get_setting('show_tabs', 'reports') == 'true') {
if (
(api_is_platform_admin() || api_is_drh() || api_is_session_admin())
if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin())
&& Rights::hasRight('show_tabs:reports')
) {
$navigation['reports'] = $possible_tabs['reports'];

@ -5,4 +5,6 @@ $strings['plugin_comment'] = "Care system (Zorgdossier) [CS]
Career follow system (Structuurschema) [CFS]
Competence based evaluation system (Competentie evaluatie systeem) [CBES]";
$strings['tool_enable'] = 'Enable plugin';
$strings['CareDetailView'] = 'Care detail view';

@ -89,6 +89,7 @@ $tpl->assign(
);
$tpl->assign('information_icon', Display::return_icon('info.png'));
$tpl->assign('student_info', api_get_user_info($studentId));
$tpl->assign('care_title', $plugin->get_lang('CareDetailView'));
$content = $tpl->fetch('/'.$plugin->get_name().'/view/post.html.twig');
// Assign into content

@ -74,6 +74,7 @@ $tpl->assign('post_url', $url);
$tpl->assign('information_icon', Display::return_icon('info.png'));
$tpl->assign('student_info', api_get_user_info($studentId));
$tpl->assign('pagination', $pagination);
$tpl->assign('care_title', $plugin->get_lang('CareDetailView'));
$content = $tpl->fetch('/'.$plugin->get_name().'/view/posts.html.twig');
// Assign into content
$tpl->assign('content', $content);

@ -14,16 +14,10 @@
{% if countElements > 1 %}
{{ information_icon }} + {{ countElements }}
{% else %}
{{ information_icon }}
{{ information_icon }} + 1
{% endif %}
</a>
{% endif %}
{% if post.parent %}
<a href="{{ post_url }}&post_id={{ post.parent.id }}">
{{ post.parent.title }}
</a>
{% endif %}
{% endif %}
{#{% if type == 'all' %}#}
@ -78,7 +72,7 @@
</div>
<h2 class="text-center">
Care detail view - {{ student_info.complete_name }} - {{ post.title }}
{{ care_title }} - {{ student_info.complete_name }} - {{ post.title }}
{% if post.parent %}
{{ post.parent.title }}
{% endif %}

@ -1,6 +1,6 @@
{% import 'studentfollowup/view/post.html.twig' as template %}
<h2 class="text-center">Care detail view - {{ student_info.complete_name }}</h2>
<h2 class="text-center">{{ care_title }} - {{ student_info.complete_name }}</h2>
{% if posts %}
{% for post in posts %}
{{ template.post_template('simple', post, information_icon, post_url, current_url) }}

Loading…
Cancel
Save