Link the skills management with badges management - refs BT#9583 #7385

chamilo · Apr 20, 2015 · 366c609 · 366c609
1 parent 398a80e
commit 366c609
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 20 deletions.
diff --git a/main/admin/skill_badge.php b/main/admin/skill_badge.php
@@ -27,8 +27,18 @@
     )
 );
 
+$toolbar = Display::toolbarButton(
+    get_lang('ManageSkills'),
+    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    'list',
+    'primary',
+    ['title' => get_lang('ManageSkills')]
+);
+
 $tpl = new Template(get_lang('Badges'));
 $tpl->assign('backpack', $backpack);
-$contentTemplate = $tpl->get_template('skill/badge.tpl');
+$contentTemplate = $tpl->fetch('default/skill/badge.tpl');
 
-$tpl->display($contentTemplate);
+$tpl->assign('actions', $toolbar);
+$tpl->assign('content', $contentTemplate);
+$tpl->display_one_col_template();
diff --git a/main/admin/skill_badge_create.php b/main/admin/skill_badge_create.php
@@ -94,10 +94,20 @@
     )
 );
 
+$toolbar = Display::toolbarButton(
+    get_lang('ManageSkills'),
+    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    'list',
+    'primary',
+    ['title' => get_lang('ManageSkills')]
+);
+
 $tpl = new Template(get_lang('CreateBadge'));
 $tpl->assign('platformAdminEmail', api_get_setting('emailAdministrator'));
 $tpl->assign('skill', $skill);
 
-$contentTemplate = $tpl->get_template('skill/badge_create.tpl');
+$contentTemplate = $tpl->fetch('default/skill/badge_create.tpl');
 
-$tpl->display($contentTemplate);
+$tpl->assign('actions', $toolbar);
+$tpl->assign('content', $contentTemplate);
+$tpl->display_one_col_template();
diff --git a/main/admin/skill_badge_list.php b/main/admin/skill_badge_list.php
@@ -37,13 +37,22 @@
     )
 );
 
+$toolbar = Display::toolbarButton(
+    get_lang('ManageSkills'),
+    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    'list',
+    'primary',
+    ['title' => get_lang('ManageSkills')]
+);
+
 $tpl = new Template(get_lang('Skills'));
 $tpl->assign('errorMessage', $errorMessage);
-$tpl->assign('platformAdminEmail', api_get_setting('emailAdministrator'));
 $tpl->assign('skills', $skills);
 
-$contentTemplate = $tpl->get_template('skill/badge_list.tpl');
+$contentTemplate = $tpl->fetch('default/skill/badge_list.tpl');
 
-$tpl->display($contentTemplate);
+$tpl->assign('actions', $toolbar);
+$tpl->assign('content', $contentTemplate);
+$tpl->display_one_col_template();
 
 Session::erase('errorMessage');
diff --git a/main/admin/skill_list.php b/main/admin/skill_list.php
@@ -37,6 +37,13 @@
     'primary',
     ['title' => get_lang('CreateSkill')]
 );
+$toolbar .= Display::toolbarButton(
+    get_lang('Badges'),
+    api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php',
+    'certificate',
+    'warning',
+    ['title' => get_lang('Badges')]
+);
 
 /* View */
 $skill = new Skill();

diff --git a/main/template/default/skill/badge.tpl b/main/template/default/skill/badge.tpl
@@ -1,7 +1,3 @@
-{% extends "default/layout/main.tpl" %}
-
-{% block body %}
-
     <div class="col-md-12">
         <div class="openbadges-tabs">
         <ul class="nav nav-tabs">
@@ -49,4 +45,3 @@
             </div>
         </div>
     </div>
-{% endblock %}
diff --git a/main/template/default/skill/badge_create.tpl b/main/template/default/skill/badge_create.tpl
@@ -1,6 +1,3 @@
-{% extends "default/layout/main.tpl" %}
-
-{% block body %}
     <script>
         (function () {
             var designer = null;
@@ -123,4 +120,3 @@
             </div>
         </div>
     </div>
-{% endblock %}
diff --git a/main/template/default/skill/badge_list.tpl b/main/template/default/skill/badge_list.tpl
@@ -1,6 +1,3 @@
-{% extends "default/layout/main.tpl" %}
-
-{% block body %}
     <div class="col-md-12">
         <div class="openbadges-tabs">
         <ul class="nav nav-tabs">
@@ -55,4 +52,3 @@
             </div>
         </div>
     </div>
-{% endblock %}
diff --git a/main/template/default/skill/list.tpl b/main/template/default/skill/list.tpl
@@ -29,6 +29,9 @@
                     <a href="{{ _p.web_main }}admin/skill_create.php?parent={{ skill.id }}" class="btn btn-default">
                         <i class="fa fa-plus"></i> {{ "CreateChildSkill" | get_lang }}
                     </a>
+                    <a href="{{ _p.web_main }}admin/skill_badge_create.php?id={{ skill.id }}" class="btn btn-default">
+                        <i class="fa fa-plus"></i> {{ "CreateBadge" | get_lang }}
+                    </a>
                 </td>
             </tr>
         {% endfor %}