fix css admin - refs #2681

pull/2818/head
Alex Aragón 7 years ago
parent c857a85042
commit d83ed00811
  1. 56
      assets/css/base.css
  2. 39
      main/admin/index.php
  3. 74
      main/template/default/admin/index.html.twig
  4. 6
      main/template/default/course_home/about.html.twig

@ -1079,10 +1079,6 @@ a.unread {
table.lp_build td.tree {
border: none;
}
g
div.system_announcement {
background-color: #EEEEEE;
}
.RequirementHeading, .RequirementText, .RequirementContent {
margin-top: 12px;
@ -2931,24 +2927,6 @@ a:active {
width: 8em;
}
.welcome_course li {
float: left;
list-style-type: none;
width: 175px
}
.welcome_course li p {
margin-left: auto;
margin-right: auto;
width: 88px;
}
.welcome_course li a {
margin-left: auto;
margin-right: auto;
width: 120px;
}
/* Nanogong - exercise player*/
.nanogong_player_container {
@ -4137,27 +4115,6 @@ ul.holder li.bit-box {
padding-bottom: 2em;
}
.code-course {
padding-left: 10px;
padding-right: 10px;
}
.control-course {
text-align: center;
}
#settings .form-inline {
margin-bottom: 15px;
}
#search_settings {
margin-bottom: 15px;
}
.src-image {
display: none;
}
/* thematic progress */
#thematic .title-topics {
font-size: 15px;
@ -4496,7 +4453,6 @@ div#chat-remote-video video {
display: inline-block;
width: 125px;
padding: 5px;
/* background: url("../../public/img/icons/48/sequence-arrow.png") no-repeat center bottom; */
}
#parents .sequence-plus-icon {
@ -4631,10 +4587,6 @@ div#chat-remote-video video {
font-size: 12px;
}
.form-search {
padding-bottom: 50px;
}
/**** SOCIAL MEDIA ****/
.share-social-media {
background-color: #FFF;
@ -6412,14 +6364,6 @@ footer {
margin-top: 10px;
}
.btn-options {
padding-right: 20px;
}
.btn-tool {
margin-bottom: 2px;
}
ul#toolnavbox {
position: fixed;
margin: 0;

@ -70,13 +70,13 @@ $blocks['users']['class'] = 'block-admin-users';
$search_form = '
<form method="get" class="form-inline" action="user_list.php">
<div class="form-group">
<div class="form-group mb-2">
<input class="form-control" type="text" name="keyword" value=""
aria-label="'.get_lang('Search').'">
<button class="btn btn-default" type="submit">
<em class="fa fa-search"></em> '.get_lang('Search').'
</button>
</div>
<button class="btn btn-primary mb-2" type="submit">
<em class="fa fa-search"></em> '.get_lang('Search').'
</button>
</form>';
$blocks['users']['search_form'] = $search_form;
@ -141,13 +141,13 @@ if (api_is_platform_admin()) {
$blocks['courses']['class'] = 'block-admin-courses';
$blocks['courses']['editable'] = true;
$search_form = ' <form method="get" class="form-inline" action="course_list.php">
<div class="form-group">
<div class="form-group mb-2">
<input class="form-control" type="text" name="keyword" value=""
aria-label="'.get_lang('Search').'">
<button class="btn btn-default" type="submit">
<em class="fa fa-search"></em> '.get_lang('Search').'
</button>
</div>
<button class="btn btn-primary mb-2" type="submit">
<em class="fa fa-search"></em> '.get_lang('Search').'
</button>
</form>';
$blocks['courses']['search_form'] = $search_form;
@ -192,15 +192,15 @@ if (api_is_platform_admin()) {
$blocks['platform']['class'] = 'block-admin-platform';
$blocks['platform']['editable'] = true;
$search_form = ' <form method="get" action="'.api_get_path(WEB_PUBLIC_PATH).'admin/settings/search_settings'.'" class="form-inline">
<div class="form-group">
<div class="form-group mb-2">
<input class="form-control"
type="text"
name="keyword" value=""
aria-label="'.get_lang('Search').'" >
<button class="btn btn-default" type="submit">
</div>
<button class="btn btn-primary mb-2" type="submit">
<em class="fa fa-search"></em> '.get_lang('Search').'
</button>
</div>
</form>';
$blocks['platform']['search_form'] = $search_form;
@ -278,16 +278,17 @@ if (api_is_platform_admin()) {
$sessionPath = api_get_path(WEB_CODE_PATH).'session/';
$search_form = ' <form method="GET" class="form-inline" action="'.$sessionPath.'session_list.php">
<div class="form-group">
<div class="form-group mb-2">
<input class="form-control"
type="text"
name="keyword"
value=""
aria-label="'.get_lang('Search').'">
<button class="btn btn-default" type="submit">
</div>
<button class="btn btn-primary mb-2" type="submit">
<em class="fa fa-search"></em> '.get_lang('Search').'
</button>
</div>
</form>';
$blocks['sessions']['search_form'] = $search_form;
$items = [];
@ -632,7 +633,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);
$tpl->assign('blocks_admin', $blocks);
if (api_is_platform_admin()) {
$extraContentForm = new FormValidator(
@ -686,5 +687,9 @@ if (api_is_platform_admin()) {
}
// The template contains the call to the AJAX version checker
$template = $tpl->get_template('admin/settings_index.tpl');
$tpl->display($template);
$template = $tpl->get_template('admin/index.html.twig');
$content = $tpl->fetch($template);
$tpl->assign('content',$content);
$tpl->display_one_col_template();
//$tpl->display($template);

@ -0,0 +1,74 @@
{% block content %}
{% autoescape false %}
<div id="settings">
<div class="row">
{% for block_item in blocks_admin %}
<div id="tabs-{{ loop.index }}" class="col-md-4">
<div class="card">
<div class="card-body">
<h5 class="card-title">{{ block_item.icon }} {{ block_item.label }}</h5>
<div class="card-search">
{{ block_item.search_form }}
</div>
{% if block_item.items is not empty %}
<ul class="list-settings">
{% for url in block_item.items %}
{% if url.url is not empty %}
<li>
<a href="{{ url.url }}">
{{ url.label }}
</a>
</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
{% if block_item.extra is not null %}
<div>
{{ block_item.extra }}
</div>
{% endif %}
</div>
</div>
</div>
{% endfor %}
</div>
<div class="row">
{% for role in app.user.roles %}
{% set role = role | lower | replace ({ 'role_' : ''}) %}
{% if role in ['global_admin'] %}
{% include '@ChamiloTheme/Admin/' ~ role ~ '/role_index.html.twig' %}
{% endif %}
{% endfor %}
</div>
</div>
{% if is_granted('ROLE_ADMIN') %}
<script>
$(function () {
$.ajax({
url: '{{ web_admin_ajax_url }}?a=version',
success: function (version) {
$(".admin-block-version").html(version);
}
});
});
</script>
<div class="row">
<div class="col-md-12">
<div class="well_border">
<h3>{{ 'VersionCheck' | trans }} </h3>
<div class="admin-block-version"></div>
</div>
</div>
</div>
{% endif %}
{% endautoescape %}
{% endblock %}

@ -43,19 +43,19 @@
<li>
<a href="https://www.facebook.com/sharer/sharer.php?u={{ url }}"
target="_blank" class="btn btn-facebook btn-inverse btn-xs">
<em class="fa fa-facebook"></em> Facebook
<em class="fab fa-facebook-square"></em> Facebook
</a>
</li>
<li>
<a href="https://twitter.com/home?{{ {'status': course.title ~ ' ' ~ url }|url_encode }}"
target="_blank" class="btn btn-twitter btn-inverse btn-xs">
<em class="fa fa-twitter"></em> Twitter
<em class="fab fa-twitter"></em> Twitter
</a>
</li>
<li>
<a href="https://www.linkedin.com/shareArticle?{{ {'mini': 'true', 'url': url , 'title': course.title }|url_encode }}"
target="_blank" class="btn btn-linkedin btn-inverse btn-xs">
<em class="fa fa-linkedin"></em> Linkedin
<em class="fab fa-linkedin-in"></em> Linkedin
</a>
</li>
</ul>

Loading…
Cancel
Save