chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace html file with page block in settings help description text

Browse Source
pull/2715/head
Julio 7 years ago
parent ffeef707d3
commit 910a2e92ca
4 changed files with 53 additions and 103 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 44
      main/admin/index.php
  2. 103
      main/template/default/admin/settings_index.html.twig
  3. 2
      src/CoreBundle/Resources/views/Index/page.html.twig
  4. 7
      src/PageBundle/Controller/PageController.php

44
main/admin/index.php
Unescape View File

@ -22,22 +22,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
$nameTools = get_lang('PlatformAdmin');
$accessUrlId = 0;
/** @var Filesystem $fileSystem */
$fileSystem = Container::$container->get('home_filesystem');
$adminExtraContentDir = 'admin/';
if (api_is_multiple_url_enabled()) {
$accessUrlId = api_get_current_access_url_id();
if ($accessUrlId != -1) {
$urlInfo = api_get_access_url($accessUrlId);
$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url']));
$cleanUrl = str_replace('/', '-', $url);
$adminExtraContentDir = "$cleanUrl/admin/";
}
}
// Displaying the header
if (api_is_platform_admin()) {
@ -83,12 +68,6 @@ $blocks['users']['icon'] = Display::return_icon(
$blocks['users']['label'] = api_ucfirst(get_lang('Users'));
$blocks['users']['class'] = 'block-admin-users';
$usersBlockExtraFile = "{$adminExtraContentDir}block-admin-users_extra.html";
if ($fileSystem->has($usersBlockExtraFile)) {
$blocks['users']['extraContent'] = $fileSystem->read($usersBlockExtraFile);
}
$search_form = '
<form method="get" class="form-inline" action="user_list.php">
<div class="form-group">
@ -148,13 +127,6 @@ if (api_is_platform_admin()) {
$blocks['courses']['label'] = api_ucfirst(get_lang('Courses'));
$blocks['courses']['class'] = 'block-admin-courses';
$blocks['courses']['editable'] = true;
$coursesBlockExtraFile = "{$adminExtraContentDir}block-admin-courses_extra.html";
if ($fileSystem->has($coursesBlockExtraFile)) {
$blocks['courses']['extraContent'] = $fileSystem->read($coursesBlockExtraFile);
}
$search_form = ' <form method="get" class="form-inline" action="course_list.php">
<div class="form-group">
<input class="form-control" type="text" name="keyword" value=""
@ -207,13 +179,6 @@ if (api_is_platform_admin()) {
$blocks['platform']['label'] = api_ucfirst(get_lang('Platform'));
$blocks['platform']['class'] = 'block-admin-platform';
$blocks['platform']['editable'] = true;
$platformBlockExtraFile = "{$adminExtraContentDir}block-admin-platform_extra.html";
if ($fileSystem->has($platformBlockExtraFile)) {
$blocks['platform']['extraContent'] = $fileSystem->read($platformBlockExtraFile);
}
$search_form = ' <form method="get" action="'.api_get_path(WEB_PUBLIC_PATH).'admin/settings/search_settings'.'" class="form-inline">
<div class="form-group">
<input class="form-control"
@ -292,12 +257,6 @@ $blocks['sessions']['icon'] = Display::return_icon(
$blocks['sessions']['label'] = api_ucfirst(get_lang('Sessions'));
$blocks['sessions']['class'] = 'block-admin-sessions';
$sessionsBlockExtraFile = "{$adminExtraContentDir}block-admin-sessions_extra.html";
if ($fileSystem->has($sessionsBlockExtraFile)) {
$blocks['sessions']['extraContent'] = $fileSystem->read($sessionsBlockExtraFile);
}
if (api_is_platform_admin()) {
$blocks['sessions']['editable'] = true;
}
@ -657,6 +616,7 @@ if ($useCookieValidation === 'true') {
}
$tpl->assign('web_admin_ajax_url', $admin_ajax_url);
$tpl->assign('web_public', api_get_path(WEB_PUBLIC_PATH));
$tpl->assign('blocks', $blocks);
if (api_is_platform_admin()) {
@ -678,7 +638,7 @@ if (api_is_platform_admin()) {
$extraData = array_map(['Security', 'remove_XSS'], $extraData);
if (!empty($extraData['block'])) {
$fileSystem->put('admin/'.$extraData['block'].'_extra.html', $extraData['extra_content']);
//$fileSystem->put('admin/'.$extraData['block'].'_extra.html', $extraData['extra_content']);
header('Location: '.api_get_self());
exit;

103
main/template/default/admin/settings_index.html.twig
Unescape View File

@ -9,18 +9,13 @@
}
});
{% if _u.is_admin %}
(function (CKEDITOR) {
CKEDITOR.replace('extra_content');
var extraContentEditor = CKEDITOR.instances.extra_content;
{% if is_granted('ROLE_ADMIN') %}
$('button.admin-edit-block').on('click', function (e) {
e.preventDefault();
/*
var $self = $(this);
var extraContent = $.ajax('{{ _p.web_ajax }}admin.ajax.php', {
var extraContent = $.ajax('{{ web_admin_ajax_url }}', {
type: 'post',
data: {
a: 'get_extra_content',
@ -29,72 +24,70 @@
});
$.when(extraContent).done(function (content) {
extraContentEditor.setData(content);
//extraContentEditor.setData(content);
$('#extra-block').val($self.data('id'));
$('#modal-extra-title').text($self.data('label'));
$('#modal-extra').modal('show');
});
});*/
});
})(window.CKEDITOR);
{% endif %}
});
</script>
<section id="settings">
<div class="row">
{% set columns = 2 %}
{% for block_item in blocks %}
{% if block_item.items %}
<div id="tabs-{{ loop.index }}" class="settings-block col-md-6">
{% set header %}
{{ block_item.icon|raw }} {{ block_item.label }}
{% if block_item.editable and is_granted('ROLE_ADMIN') %}
<button type="button" class="btn btn-link btn-sm admin-edit-block float-right"
data-label="{{ block_item.label }}" data-id="{{ block_item.class }}">
<img src="{{ "edit.png"|icon(22) }}" width="22" height="22"
alt="{{ "Edit"|get_lang }}" title="{{ "Edit"|get_lang }}"/>
</button>
{% endif %}
{% endset %}
{% set columns = 2 %}
{% for block_item in blocks %}
{% if block_item.items %}
<div id="tabs-{{ loop.index }}" class="settings-block col-md-6">
{% set header %}
{{ block_item.icon|raw }} {{ block_item.label }}
{% if block_item.editable and is_granted('ROLE_ADMIN') %}
<a href="{{ web_public ~ 'internal_page/edit/' ~ block_item.class }}"
class="btn btn-link btn-sm admin-edit-block float-right">
<img src="{{ "edit.png"|icon(22) }}" alt="{{ "Edit"|get_lang }}" title="{{ "Edit"|get_lang }}" />
</a>
{% endif %}
{% endset %}
{% set content %}
<div style="display: block;">
{{ block_item.search_form|raw }}
{% set content %}
<div style="display: block;">
{{ block_item.search_form|raw }}
</div>
{% if block_item.items is not null %}
<div class="block-items-admin">
<ul class="list-items-admin">
{% for url in block_item.items %}
<li>
<a href="{{ url.url }}">
{{ url.label }}
</a>
</li>
{% endfor %}
</ul>
</div>
{% if block_item.items is not null %}
<div class="block-items-admin">
<ul class="list-items-admin">
{% for url in block_item.items %}
<li>
<a href="{{ url.url }}">
{{ url.label }}
</a>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endif %}
{% if block_item.extra is not null %}
<div>
{{ block_item.extra|raw }}
</div>
{% endif %}
{% if block_item.extra is not null %}
<div>
{{ block_item.extra|raw }}
</div>
{% endif %}
{% if block_item.extraContent %}
<div>{{ block_item.extraContent|raw }}</div>
{% endif %}
{% endset %}
{% if block_item.editable %}
{{ render(controller('ChamiloPageBundle:Page:renderPage', {'slug': block_item.class, 'showEditPageLink': false} )) }}
{% endif %}
{% endset %}
{{ macro.panel(header, content) }}
</div>
{% endif %}
{% endfor %}
{{ macro.panel(header, content) }}
</div>
{% endif %}
{% endfor %}
</div>
</section>
{% if _u.is_admin %}
{% if is_granted('ROLE_ADMIN') %}
<div class="modal fade" id="modal-extra">
<div class="modal-dialog">
<div class="modal-content">

2
src/CoreBundle/Resources/views/Index/page.html.twig
Unescape View File

@ -1,4 +1,4 @@
{% if is_granted('ROLE_ADMIN') %}
{% if is_granted('ROLE_ADMIN') and show_edit_page_link %}
<a href="{{ _p.web_public ~ 'internal_page/edit/' ~ slug }}" class="btn btn-primary" >
<i class="fas fa-edit"></i> {{ "header.edit_page"|trans({}, 'SonataPageBundle') }}
</a>

7
src/PageBundle/Controller/PageController.php
Unescape View File

@ -74,7 +74,6 @@ class PageController extends BaseController
public function createPage($pageSlug, $redirect, Request $request)
{
$container = $this->container;
//$siteSelector = $container->get('sonata.page.site.selector');
$siteManager = $container->get('sonata.page.manager.site');
$host = $request->getHost();
@ -281,11 +280,8 @@ class PageController extends BaseController
*
* @return Response
*/
public function renderPageAction(string $slug, Request $request): Response
public function renderPageAction(string $slug, Request $request, $showEditPageLink = true): Response
{
/*$siteSelector = $this->get('sonata.page.site.selector');
$site = $siteSelector->retrieve();*/
$container = $this->container;
$siteManager = $container->get('sonata.page.manager.site');
$host = $request->getHost();
@ -309,6 +305,7 @@ class PageController extends BaseController
[
'page' => $page,
'slug' => $slug,
'show_edit_page_link' => $showEditPageLink,
'content' => 'welcome',
]
);

Write Preview
Loading…
Cancel
Save