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

Merge pull request #911 from aragonc/bootstrap

Browse Source 
arreglo de errores para chamilo
1.10.x
Yannick Warnier 9 years ago
parent 3d5d11ca26 778ab1352d
commit de1d6b78de
8 changed files with 32 additions and 68 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. 19
      app/Resources/public/css/base.css
  2. 58
      app/Resources/public/css/chat.css
  3. 2
      main/chat/chat.php
  4. 4
      main/chat/chat_chat.php
  5. 2
      main/chat/chat_whoisonline.php
  6. 9
      main/chat/header_frame.inc.php
  7. 2
      main/inc/lib/javascript/jquery-scrollbar/jquery.scrollbar.css
  8. 4
      main/template/default/learnpath/view.tpl

19
app/Resources/public/css/base.css
Unescape View File

@ -95,6 +95,21 @@ a.thumbnail:hover{
padding-top: 10px;
margin-top: 5px;
}
.blackboard_show {
float:left;
position:absolute;
border:1px solid #000;
width: 200px;
padding: 5px;
border-radius: 5px;
background-color:#000;
z-index:99; padding: 3px;
display: inline;
color: #fff;
}
.blackboard_hide {
display: none;
}
.section-page .page-header h3{
font-size:22px;
margin-top:5px;
@ -998,7 +1013,9 @@ button.next.disabled {
cursor:default;
}
.content-chat{
height: 200px;
}
/* Note */
.note {
margin: 6px;

58
app/Resources/public/css/chat.css
Unescape View File

@ -213,63 +213,6 @@ li.list-group-item:hover a{
float: left;
margin-right: 5px;
}
#user-online-scroll .viewport {
width: 260px;
height: 550px;
min-height: 550px;
overflow: hidden;
position: relative;
padding-left: 8px;
}
#user-online-scroll .overview {
list-style: none;
position: relative;
left: 0;
top: 0;
padding: 0;
margin: 0;
}
#user-online-scroll .scrollbar {
background: transparent url(bg-scrollbar-track-y.png) no-repeat 0 0;
position: relative;
background-position: 0 0;
float: right;
width: 15px;
}
#user-online-scroll .track {
background: transparent url(bg-scrollbar-trackend-y.png) no-repeat 0 100%;
height: 100%;
width: 13px;
position: relative;
padding: 0 1px;
}
#user-online-scroll .thumb {
background: transparent url(bg-scrollbar-thumb-y.png) no-repeat 50% 100%;
height: 20px;
width: 25px;
cursor: pointer;
overflow: hidden;
position: absolute;
top: 0;
left: -5px;
}
#user-online-scroll .thumb .end {
background: transparent url(bg-scrollbar-thumb-y.png) no-repeat 50% 0;
overflow: hidden;
height: 5px;
width: 25px;
}
#user-online-scroll .disable {
display: none;
}
.noSelect {
user-select: none;
-o-user-select: none;
@ -277,7 +220,6 @@ li.list-group-item:hover a{
-khtml-user-select: none;
-webkit-user-select: none;
}
.btn-send {
background: #87e0fd; /* Old browsers */
background: -moz-linear-gradient(top, #87e0fd 0%, #53cbf1 40%, #05abe0 100%); /* FF3.6+ */

2
main/chat/chat.php
Unescape View File

@ -82,7 +82,7 @@ echo '<div class="page-chat">';
echo '<iframe src="'.$url.'chat_whoisonline.php?'.$params.'" name="chat_whoisonline" scrolling="no" style="height:550px; width:35%; border: 0px none; float:left"></iframe>';
echo '<iframe src="'.$url.'chat_chat.php?origin='.$origin.'&target='.$target.'&'.$params.'" name="chat_chat" id="chat_chat" scrolling="auto" height="380" style="width:65%; border: 0px none; float:right"></iframe>';
echo '<iframe src="'.$url.'chat_message.php?'.$params.'" name="chat_message" scrolling="no" height="182px" style="width:65%; border: 0px none; float:right"></iframe>';
echo '<iframe src="'.$url.'chat_hidden.php?'.$params.'" name="chat_hidden" height="" style="border: 0px none"></iframe>';
echo '<iframe src="'.$url.'chat_hidden.php?'.$params.'" name="chat_hidden" height="0px" style="height:0px; border: 0px none"></iframe>';
echo '</div>';
if (empty($open_chat_window)) {

4
main/chat/chat_chat.php
Unescape View File

@ -193,8 +193,8 @@ if (!empty($course)) {
WHERE (user_id = ".$userId.")";
$result = Database::query($sql);
}
echo '<div id="content-chat markdown-body">';
echo '<div id="content-chat"';
foreach ($content as & $this_line) {
echo $this_line;
}

2
main/chat/chat_whoisonline.php
Unescape View File

@ -123,7 +123,7 @@ if (!empty($course)) {
<div id="user-online-scroll" class="user-online">
<div class="title"><?php echo get_lang('Users'); ?> <?php echo get_lang('Connected'); ?></div>
<div class="scrollbar"><div class="track"><div class="thumb"><div class="end"></div></div></div></div>
<div class="viewport"><div id="hidden" class="overview">
<div class="scrollbar-inner viewport"><div id="hidden" class="overview">
<ul class="profile list-group">
<?php
foreach ($users as & $user) {

9
main/chat/header_frame.inc.php
Unescape View File

@ -126,6 +126,7 @@ header('Content-Type: text/html; charset=UTF-8');
<link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_PATH); ?>web/assets/bootstrap/dist/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-emojiarea/jquery.emojiarea.css">
<link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_CSS_PATH); ?>chat.css">
<link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_LIBRARY_PATH); ?>/javascript/jquery-scrollbar/jquery.scrollbar.css">
<link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_CSS_PATH); ?>markdown.css">
<link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-textcomplete/jquery.textcomplete.css">
<link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/emojione/css/emojione.min.css">
@ -137,7 +138,8 @@ header('Content-Type: text/html; charset=UTF-8');
<?php echo api_get_js('jquery-textcomplete/jquery.textcomplete.js'); ?>
<?php echo api_get_js('emojione/js/emojione.min.js'); ?>
<?php echo api_get_js('jquery-emojiarea/jquery.emojiarea.js'); ?>
<?php echo api_get_js('jquery.tinyscrollbar.js'); ?>
<?php echo api_get_js('jquery-scrollbar/jquery.scrollbar.min.js'); ?>
<?php // echo api_get_js('jquery.tinyscrollbar.js'); ?>
<script type="text/javascript">
hljs.initHighlightingOnLoad();
emojione.ascii = true;
@ -218,7 +220,6 @@ header('Content-Type: text/html; charset=UTF-8');
],{
//footer: '<a href="http://www.emoji.codes" target="_blank">Browse All<span class="arrow">»</span></a>'
});
$('#user-online-scroll').tinyscrollbar();
});
function play_notification()
@ -264,6 +265,10 @@ header('Content-Type: text/html; charset=UTF-8');
document.formMessage.submit();
}
}
jQuery(document).ready(function(){
jQuery('.scrollbar-inner').scrollbar();
});
</script>
</head>
<body <?php echo $bodyXtra; ?> >

2
main/inc/lib/javascript/jquery-scrollbar/jquery.scrollbar.css
Unescape View File

@ -14,7 +14,7 @@
margin: 0;
max-height: none;
max-width: none !important;
overflow: scroll !important;
/* overflow: scroll !important; */
padding: 0;
position: relative !important;
top: 0;

4
main/template/default/learnpath/view.tpl
Unescape View File

@ -139,10 +139,10 @@
var innerHeight = $(window).height();
if (innerHeight <= 640) {
$('.scrollbar-light').css('height', innerHeight - heightTop + "px");
$('.scrollbar-light').css('height', innerHeight - heightTop - 5 + "px");
$('#content_id').css('height', innerHeight - heightControl + "px");
} else {
$('.scrollbar-light').css('height', innerHeight - heightBreadcrumb - heightTop + "px");
$('.scrollbar-light').css('height', innerHeight - heightBreadcrumb - heightTop - 5 + "px");
$('#content_id').css('height', innerHeight - heightControl + "px");
}

Write Preview
Loading…
Cancel
Save