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

Browse Source
skala
Julio Montoya 14 years ago
parent 2b981c80a1 5a1da2fdbe
commit f823159536
9 changed files with 202 additions and 437 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
      main/css/base.css
  2. BIN
      main/inc/lib/javascript/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
  3. 356
      main/inc/lib/javascript/jquery-ui/smoothness/jquery-ui-1.8.17.custom.min.js
  4. 76
      main/inc/lib/javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.css
  5. 125
      main/inc/lib/javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.min.js
  6. 52
      main/inc/lib/javascript/jquery.lp_minipanel.js
  7. 8
      main/inc/lib/javascript/jquery.min.js
  8. 2
      main/inc/lib/main_api.lib.php
  9. 1
      main/newscorm/lp_view.php

19
main/css/base.css
Unescape View File

@ -4288,4 +4288,23 @@ li.annoucement{
.link.invisible .description{
color: #999999;
}
#learning_path_main #control {
text-align: center;
background-image:-webkit-gradient(linear,left top,left bottom,from(#ececec),to(#fff));
background-image:-webkit-linear-gradient(top,#ececec,#fff);
background-image:-moz-linear-gradient(top,#ececec,#fff);
background-image:-ms-linear-gradient(top,#ececec,#fff);
background-image:-o-linear-gradient(top,#ececec,#fff);
background-image:linear-gradient(top,#ececec,#fff);
height:32px;
padding:8px 0px 8px 0px;
opacity:0.9;
bottom: 0px;
margin: auto;
width: 100%;
height: 34px;
position: absolute
}

BIN
main/inc/lib/javascript/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

356
main/inc/lib/javascript/jquery-ui/smoothness/jquery-ui-1.8.17.custom.min.js vendored
View File

File diff suppressed because one or more lines are too long

76
main/inc/lib/javascript/jquery-ui/smoothness/jquery-ui-1.8.17.custom.css → main/inc/lib/javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.css vendored
Unescape View File

@ -1,7 +1,7 @@
/*
* jQuery UI CSS Framework 1.8.17
/*!
* jQuery UI CSS Framework 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -38,10 +38,10 @@
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
/*
* jQuery UI CSS Framework 1.8.17
/*!
* jQuery UI CSS Framework 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -284,17 +284,17 @@
/* Overlays */
.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
* jQuery UI Resizable 1.8.17
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
* jQuery UI Resizable 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Resizable#theming
*/
.ui-resizable { position: relative;}
.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
@ -303,20 +303,20 @@
.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
* jQuery UI Selectable 1.8.17
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*!
* jQuery UI Selectable 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Selectable#theming
*/
.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
/*
* jQuery UI Accordion 1.8.17
/*!
* jQuery UI Accordion 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -332,10 +332,10 @@
.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
.ui-accordion .ui-accordion-content-active { display: block; }
/*
* jQuery UI Autocomplete 1.8.17
/*!
* jQuery UI Autocomplete 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -347,7 +347,7 @@
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
/*
* jQuery UI Menu 1.8.17
* jQuery UI Menu 1.8.21
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
@ -385,10 +385,10 @@
font-weight: normal;
margin: -1px;
}
/*
* jQuery UI Button 1.8.17
/*!
* jQuery UI Button 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -423,10 +423,10 @@ input.ui-button { padding: .4em 1em; }
/* workarounds */
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
/*
* jQuery UI Dialog 1.8.17
/*!
* jQuery UI Dialog 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -444,10 +444,10 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
.ui-draggable .ui-dialog-titlebar { cursor: move; }
/*
* jQuery UI Slider 1.8.17
/*!
* jQuery UI Slider 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -467,10 +467,10 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
* jQuery UI Tabs 1.8.17
.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
* jQuery UI Tabs 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -485,10 +485,10 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
.ui-tabs .ui-tabs-hide { display: none !important; }
/*
* jQuery UI Datepicker 1.8.17
/*!
* jQuery UI Datepicker 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@ -552,10 +552,10 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
left: -4px; /*must have*/
width: 200px; /*must have*/
height: 200px; /*must have*/
}/*
* jQuery UI Progressbar 1.8.17
}/*!
* jQuery UI Progressbar 1.8.21
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*

125
main/inc/lib/javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.min.js vendored
View File

File diff suppressed because one or more lines are too long

52
main/inc/lib/javascript/jquery.lp_minipanel.js
Unescape View File

@ -5,8 +5,6 @@
Requirements: JQuery 1.4.4, JQuery UI 1.8.7
@author Alberto Torreblanca @albert1t0
@author Julio Montoya Cleaning/fixing some code
@todo this doesn't work due recent changes in this file I partially fixed now we can see the vertical bar
but the minipanel was removed
**/
// Copy little progress bar in <tr></tr>
@ -45,6 +43,8 @@ $(document).ready(function() {
$(this).css('backgroundImage','url(../img/hide2.png)').css('backgroundColor','#EEEEEE');
}
);
var original = $('#content_id').height();
// Adding funcionality
$( "#hide_bar" ).click(function() {
@ -55,52 +55,30 @@ $(document).ready(function() {
// Construct mini panel
var panel = $('#lp_navigation_elem div:first').clone();
$(panel).attr('id','control');
$(panel).attr('id', 'control');
$('#learning_path_main').append(panel);
minipb();
$('#learning_path_main #control .buttons').attr('text-align','center');
$('#learning_path_main #control').css({
margin: "auto",
width: "132px",
height: "34px",
position: "absolute",
top: "5px",
right:"15px",
backgroundColor: "white",
backgroundImage: "url(../img/minipanelback.png)",
paddingTop: "8px",
paddingBottom: "8px",
borderRadius: "4px 4px 4px 4px",
opacity: "0.8",
cursor: "move",
});
//$('#learning_path_main #control').css("text-align", "center");
$('#learning_path_main #control table').attr('align','center');
$('#learning_path_main #control').draggable({
iframeFix: true,
stack: "#learning_path_right_zone",
cursor: "move"
});
$('#learning_path_main #control .buttons img').click(function(){
$('#content_id').css({ height: $('#content_id').height() - ($('#control').height() + 10) });
$('#learning_path_main #control .buttons img').click(function(){
$('#learning_path_main #control tr:eq(1)').remove();
minipb();
});
// Hiding navigation left zone
$('#learning_path_left_zone').hide(50);
$('#learning_path_left_zone').hide(50);
$('#learning_path_right_zone').css('margin-left','10px');
$('#hide_bar table').css('backgroundImage','url(../img/hide2.png)').css('backgroundColor','#EEEEEE');
}
},
},
function(){
// Show navigation left zone
$('#hide_bar table').css('backgroundImage','url(../img/hide0.png)').css('backgroundColor','#EEEEEE');
$('#learning_path_right_zone').css('marginLeft','290px');
$('#learning_path_left_zone').show(50);
$('#learning_path_main #control').remove();
// Show navigation left zone
$('#learning_path_left_zone').show(50);
$('#learning_path_right_zone').css('marginLeft', left_width + 10 + 'px');
$('#hide_bar table').css('backgroundImage','url(../img/hide0.png)').css('backgroundColor','#EEEEEE');
$('#learning_path_main #control').remove();
$('#content_id').css({ height: original});
}
);
});

8
main/inc/lib/javascript/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
main/inc/lib/main_api.lib.php
Unescape View File

@ -5710,7 +5710,7 @@ function api_get_jquery_libraries_js($libraries) {
//Jquery ui
$theme = 'smoothness'; // Current themes: cupertino, smoothness, ui-lightness. Find the themes folder in main/inc/lib/javascript/jquery-ui
$jquery_ui_version = '1.8.17';
$jquery_ui_version = '1.8.21';
//$js .= '<link rel="stylesheet" href="'.$js_path.'jquery-ui/'.$theme.'/jquery-ui-'.$jquery_ui_version.'.custom.css" type="text/css">';
$js .= api_get_css($js_path.'jquery-ui/'.$theme.'/jquery-ui-'.$jquery_ui_version.'.custom.css');

1
main/newscorm/lp_view.php
Unescape View File

@ -11,7 +11,6 @@
* @author Denes Nagy, principal author
* @author Isthvan Mandak, several new features
* @author Roan Embrechts, code improvements and refactoring
* @license GNU/GPL - See Chamilo license directory for details
*/
/**
* Code

Write Preview
Loading…
Cancel
Save