Skip to content
Snippets Groups Projects
Commit 80ae354c authored by Nina Herrmann's avatar Nina Herrmann
Browse files

Revert "WIP add secondary navigation TODO: add to settings page"

This reverts commit dc463522.

Conflicts:
	renderer.php
parent 34ff95ce
No related branches found
No related tags found
No related merge requests found
......@@ -49,7 +49,6 @@ $PAGE->set_heading(get_string('active_workflows_header', 'tool_lifecycle'));
$renderer = $PAGE->get_renderer('tool_lifecycle');
echo $renderer->header(' ');
echo $renderer->render_extra_navigation();
echo $renderer->render_from_template('tool_lifecycle/search_input', [
'action' => (new moodle_url(urls::ACTIVE_PROCESSES))->out(false),
......
......@@ -56,7 +56,7 @@ $PAGE->set_heading(get_string('course_backups_list_header', 'tool_lifecycle'));
$renderer = $PAGE->get_renderer('tool_lifecycle');
echo $renderer->header();
echo $renderer->render_extra_navigation();
echo '<br>';
$mform->display();
......
......@@ -143,9 +143,6 @@ $table = new delayed_courses_table($data);
$table->define_baseurl($PAGE->url);
echo $OUTPUT->header();
$renderer = $PAGE->get_renderer('tool_lifecycle');
echo $renderer->render_extra_navigation();
$mform->display();
$table->out(100, false);
......
......@@ -65,8 +65,6 @@ $table->define_baseurl($PAGE->url);
$PAGE->requires->js_call_amd('tool_lifecycle/tablebulkactions', 'init');
echo $OUTPUT->header();
$renderer = $PAGE->get_renderer('tool_lifecycle');
echo $renderer->render_extra_navigation();
$table->out(100, false);
echo $OUTPUT->footer();
......@@ -65,41 +65,4 @@ class tool_lifecycle_renderer extends plugin_renderer_base {
$this->footer();
}
/**
* Renders a menu with the "necessary" items for some pages
* General Settings - Workflow drafts - Active Workflows - Delayed Courses - Admin Approve Steps - Error Handling
* - Restore Backups
* @return bool|string
* @throws coding_exception
* @throws moodle_exception
*/
public function render_extra_navigation () {
$data2 = new stdClass();
$children = array();
$urls = array('/admin/settings.php?section=tool_lifecycle', '/admin/tool/lifecycle/workflowdrafts.php',
'/admin/tool/lifecycle/activeworkflows.php', '/admin/tool/lifecycle/delayedcourses.php',
'/admin/tool/lifecycle/step/adminapprove/index.php', '/admin/tool/lifecycle/errors.php',
'/admin/tool/lifecycle/coursebackups.php');
$names = array(get_string('edit') . ' ' . get_string('general_settings_header', 'tool_lifecycle'),
get_string('edit') . ' ' . get_string('workflow_drafts_header', 'tool_lifecycle'),
get_string('edit') . ' ' . get_string('active_workflows_header', 'tool_lifecycle'),
get_string('view') . ' ' . get_string('delayed_courses_header', 'tool_lifecycle'),
get_string('manage-adminapprove', 'lifecyclestep_adminapprove'),
get_string('process_errors_header', 'tool_lifecycle'),
get_string('course_backups_list_header', 'tool_lifecycle'));
for ($i = 0; $i < count($names); $i++) {
$navitem = new stdClass();
$navitem->active = true;
$navitem->showchildreninsubmenu = false;
$navitem->url = new moodle_url($urls[$i]);
$navitem->text = $names[$i];
array_push($children, $navitem);
}
$data2->children = $children;
$moremenu = new \core\navigation\output\more_menu($data2, 'nav', true);
$secondarynavigation = $moremenu->export_for_template($this->output);
return $this->output->render_from_template('tool_lifecycle/navigation_helper', $secondarynavigation);
}
}
......@@ -13,9 +13,7 @@ body.path-admin-tool-lifecycle .wf-secondary-info,
.lifecycle-highlighted {
background-color: rgba(0, 178, 255, 0.15);
}
nav.moremenu {
opacity: 1;
}
span.tool_lifecycle-hint {
text-decoration: underline dashed #444;
}
......
......@@ -71,11 +71,6 @@
}
}}
<div class="d-flex" id="lifecycle-workflow-details">
<div class="navigation" style="width: 100%">
{{#navitems}}
<a href="{{navlink}}"> {{navname}}</a> -
{{/navitems}}
</div>
<div class="wf-wrapper">
<div class="bg-light d-inline-block p-3 position-relative" style="max-width: 800px;">
<a class="edit-pen" href="{{{editsettingslink}}}">{{#pix}} i/edit, core, {{/pix}}</a>
......
......@@ -49,8 +49,6 @@ $PAGE->set_heading(get_string('workflow_drafts_header', 'tool_lifecycle'));
$renderer = $PAGE->get_renderer('tool_lifecycle');
echo $renderer->header();
echo $renderer->render_extra_navigation();
echo html_writer::link(new \moodle_url(urls::EDIT_WORKFLOW),
get_string('add_workflow', 'tool_lifecycle'), ['class' => 'btn btn-primary mx-1']);
......@@ -66,6 +64,9 @@ echo $OUTPUT->box_start("lifecycle-enable-overflow lifecycle-table");
$table->out(10, false);
echo $OUTPUT->box_end();
echo \html_writer::link(new \moodle_url(urls::ACTIVE_WORKFLOWS),
get_string('active_workflows_list', 'tool_lifecycle'));
echo '<br>';
echo \html_writer::link(new \moodle_url(urls::DEACTIVATED_WORKFLOWS),
get_string('deactivated_workflows_list', 'tool_lifecycle'));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment