update files newscorm admin view

1.10.x
aragonc 10 years ago
commit 8fa63cc596
  1. 6
      main/css/base.css
  2. 4
      main/exercice/exercise_admin.php
  3. 7
      main/inc/lib/display.lib.php
  4. 2
      main/inc/lib/formvalidator/FormValidator.class.php
  5. 37
      main/inc/lib/pear/HTML/QuickForm.php
  6. 147
      main/inc/lib/pear/HTML/QuickForm/button.php
  7. 5
      main/inc/lib/pear/HTML/QuickForm/element.php
  8. 2
      main/inc/lib/pear/HTML/QuickForm/hidden.php
  9. 13
      main/newscorm/learnpath.class.php
  10. 6
      main/newscorm/lp_add_audio.php
  11. 2
      main/newscorm/lp_add_item.php
  12. 6
      main/newscorm/lp_admin_view.php
  13. 6
      main/newscorm/lp_build.php
  14. 2
      main/newscorm/lp_controller.php
  15. 6
      main/newscorm/lp_edit_item.php
  16. 6
      main/newscorm/lp_edit_item_prereq.php
  17. 6
      main/newscorm/lp_move_item.php
  18. 6
      main/newscorm/lp_view_item.php

@ -2397,11 +2397,9 @@ div.admin_section h4 {
/*min-width: 173px; */
}
.lp_tree {
padding: 15px;
}
#lp_item_list {
margin:0px;
margin:0;
padding: 0;
}
#lp_item_list, #lp_item_list li {
list-style-type: none;

@ -7,9 +7,7 @@
* @package chamilo.exercise
* @author Olivier Brouckaert, Julio Montoya
*/
/**
* Code
*/
// name of the language file that needs to be included
use \ChamiloSession as Session;

@ -1885,15 +1885,14 @@ class Display
*/
public static function group_button($title, $elements)
{
$html = '<div class="btn-toolbar">
<div class="btn-group">
<button class="btn dropdown-toggle" data-toggle="dropdown">'.$title.' <span class="caret"></span></button>
$html = '<div class="btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">'.$title.' <span class="caret"></span></button>
<ul class="dropdown-menu">';
foreach ($elements as $item) {
$html .= Display::tag('li', Display::url($item['title'], $item['href']));
}
$html .= '</ul>
</div> </div>';
</div>';
return $html;
}

@ -238,7 +238,7 @@ EOT;
$icon = 'check',
$style = 'default',
$size = 'default',
$class = 'btn',
$class = null,
$attributes = array()
) {
return $this->addElement(

@ -88,6 +88,8 @@ define('QUICKFORM_INVALID_DATASOURCE', -9);
*/
class HTML_QuickForm extends HTML_Common
{
const MAX_ELEMENT_ARGUMENT = 10;
private $dateTimePickerLibraryAdded;
/**
@ -592,18 +594,35 @@ class HTML_QuickForm extends HTML_Common
throw new \Exception("Class '$className' does not exist. ");
}
$elementObject = new $className();
for ($i = 0; $i < 5; $i++) {
for ($i = 0; $i < self::MAX_ELEMENT_ARGUMENT; $i++) {
if (!isset($args[$i])) {
$args[$i] = null;
}
}
$err = $elementObject->onQuickFormEvent($event, $args, $this);
if ($err !== true) {
return $err;
/** @var HTML_QuickForm_element $element */
$element = new $className(
$args[0],
$args[1],
$args[2],
$args[3],
$args[4],
$args[5],
$args[6],
$args[7],
$args[8],
$args[9]
);
if ($event != 'createElement') {
$err = $element->onQuickFormEvent($event, $args, $this);
if ($err !== true) {
return $err;
}
}
return $elementObject;
return $element;
}
// }}}
@ -637,7 +656,9 @@ class HTML_QuickForm extends HTML_Common
$elementName = $elementObject->getName();
// Add the element if it is not an incompatible duplicate
if (!empty($elementName) && isset($this->_elementIndex[$elementName])) {
if (!empty($elementName) &&
isset($this->_elementIndex[$elementName])
) {
if ($this->_elements[$this->_elementIndex[$elementName]]->getType() == $elementObject->getType()) {
$this->_elements[] =& $elementObject;
$elKeys = array_keys($this->_elements);

@ -34,52 +34,125 @@
*/
class HTML_QuickForm_button extends HTML_QuickForm_input
{
private $icon;
private $style;
private $size;
private $class;
/**
* @param string $elementName
* @param string $value
* @param string $icon
* @return mixed
*/
public function getClass()
{
return $this->class;
}
/**
* @param mixed $class
*/
public function setClass($class)
{
$this->class = $class;
}
/**
* @param string $name input name example 'submit'
* @param string $text button text to show
* @param string $icon icons based in font-awesome
* @param string $style i.e default|primary|success|info|warning|danger|link
* @param string $size large|default|small|extra-small
* @param string $class
* @param array $extra
* @param array $attributes
* @param array $attributes
*/
public function HTML_QuickForm_button(
$elementName = null,
$value = null,
$name,
$text,
$icon = 'check',
$class = 'btn btn-default',
$extra = array(),
$style = 'default',
$size = 'default',
$class = null,
$attributes = array()
) {
$icon = !empty($icon) ? $icon : 'check';
$class = !empty($class) ? $class : 'btn btn-default';
if ($class == 'primary') {
$class == 'btn btn-primary';
}
if ($class == 'btn') {
$class == 'btn btn-default';
}
$style = !empty($extra['style']) ? $extra['style'] : '';
$size = !empty($extra['size']) ? $extra['size'] : '';
$attributes['icon'] = $icon;
if ($style != '') {
$attributes['style'] = $style;
}
if ($size != '') {
$attributes['size'] = $size;
}
$attributes['class'] = $class;
$this->setIcon($icon);
$this->setStyle($style);
$this->setSize($size);
$this->setClass($class);
HTML_QuickForm_input::HTML_QuickForm_input(
$elementName,
$name,
null,
$attributes
);
$this->_persistantFreeze = false;
$this->setValue($value);
$this->setValue($text);
$this->setType('submit');
}
/**
* @return mixed
*/
public function getIcon()
{
return $this->icon;
}
/**
* @param mixed $icon
*/
public function setIcon($icon)
{
$this->icon = !empty($icon) ? 'fa fa-'.$icon : null;
}
/**
* @return mixed
*/
public function getStyle()
{
return $this->style;
}
/**
* @param mixed $style
*/
public function setStyle($style)
{
$style = !empty($style) ? 'btn-'.$style : null;
$this->style = $style;
}
/**
* @return mixed
*/
public function getSize()
{
return $this->size;
}
/**
* @param mixed $size
*/
public function setSize($size)
{
switch ($size) {
case 'large':
$size = 'btn-lg';
break;
case 'small':
$size = 'btn-sm';
break;
case 'extra-small':
$size = 'btn-xs';
break;
case 'default':
$size = null;
break;
}
$size = !empty($size) ? $size : null;
$this->size = $size;
}
/**
* @return string
*/
@ -89,15 +162,21 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
return $this->getFrozenHtml();
} else {
$value = $this->_attributes['value'];
unset($this->_attributes['value']);
$icon = isset($this->_attributes['icon']) ? $this->_attributes['icon'] : 'check';
unset($this->_attributes['class']);
$icon = $this->getIcon();
if (!empty($icon)) {
$icon = '<i class="' . $this->getIcon() . '"></i> ';
}
unset($this->_attributes['icon']);
$icon = '<i class="fa fa-'.$icon.'"></i> ';
$class = $this->getClass().' '.$this->getStyle().' '.$this->getSize();
return
$this->_getTabs() . '
<button' . $this->_getAttrString($this->_attributes) . ' />'.
<button class="'.$class.'" ' . $this->_getAttrString($this->_attributes) . ' />'.
$icon.$value.
'</button>';
}

@ -398,9 +398,8 @@ class HTML_QuickForm_element extends HTML_Common
{
switch ($event) {
case 'createElement':
$className = get_class($this);
$this->$className($arg[0], $arg[1], $arg[2], $arg[3], $arg[4]);
//$className = get_class($this);
//$this->$className($arg[0], $arg[1], $arg[2], $arg[3], $arg[4], $arg[5], $arg[6]);
break;
case 'addElement':
$this->onQuickFormEvent('createElement', $arg, $caller);

@ -47,7 +47,7 @@ class HTML_QuickForm_hidden extends HTML_QuickForm_input
* @access public
* @return void
*/
function HTML_QuickForm_hidden($elementName=null, $value='', $attributes=null)
public function HTML_QuickForm_hidden($elementName = null, $value = '', $attributes = null)
{
HTML_QuickForm_input::HTML_QuickForm_input($elementName, null, $attributes);
$this->setType('hidden');

@ -5384,12 +5384,12 @@ class learnpath
} else {
$return_audio = '<table class="data_table">';
$return_audio .= '<tr>';
$return_audio .= '<th width="60%">' . get_lang('Title') . '</th>';
$return_audio .= '<th width="40%">' . get_lang('Title') . '</th>';
$return_audio .= '<th>' . get_lang('Audio') . '</th>';
$return_audio .= '</tr>';
if ($update_audio != 'true') {
$return .= '<div class="span12">';
$return .= '<div class="col-md-12">';
$return .= self::return_new_tree($update_audio);
$return .='</div>';
$return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn')), array('style'=>'float:left; margin-top:15px;width:100%'));
@ -5400,7 +5400,7 @@ class learnpath
// We need to close the form when we are updating the mp3 files.
if ($update_audio == 'true') {
$return .= '<div style="margin:40px 0; float:right;"><button class="save" type="submit" name="save_audio" id="save_audio">' . get_lang('SaveAudioAndOrganization') . '</button></div>'; // TODO: What kind of language variable is this?
$return .= '<div><button class="save" type="submit" name="save_audio" id="save_audio">' . get_lang('SaveAudioAndOrganization') . '</button></div>'; // TODO: What kind of language variable is this?
}
}
@ -5618,9 +5618,10 @@ class learnpath
}
}
$return .= '<div class="lp_tree well">';
$return .= '<div class="panel panel-default">';
$return .= '<div class="panel-heading">'.$this->name.'</div>';
$return .= '<div class="panel-body">';
$return .= '<ul id="lp_item_list">';
$return .='<h4>'.$this->name.'</h4><br>';
$tree = self::print_recursive($elements, $default_data, $default_content);
@ -5635,7 +5636,7 @@ class learnpath
if ($update_audio == 'true') {
$return = $return_audio;
} else {
$return .= '</div>';
$return .= '</div></div>';
}
return $return;
}

@ -99,8 +99,8 @@ if (isset($lp_item->audio) && !empty($lp_item->audio)) {
}
$page = $_SESSION['oLP']->build_action_menu(true);
$page .= '<div class="row-fluid" style="overflow:hidden">';
$page .= '<div id="lp_sidebar" class="span4">';
$page .= '<div class="row" style="overflow:hidden">';
$page .= '<div id="lp_sidebar" class="col-md-4">';
$page .= $_SESSION['oLP']->return_new_tree(null, true);
// Show the template list.
@ -108,7 +108,7 @@ $page .= '</div>';
$recordVoiceForm = Display::page_subheader(get_lang('RecordYourVoice'));
$page .= '<div id="doc_form" class="span8">';
$page .= '<div id="doc_form" class="col-md-8">';
$tpl = new Template(null);
$tpl->assign('unique_file_id', api_get_unique_id());

@ -178,7 +178,7 @@ $(document).ready(function() {
echo $learnPath->build_action_menu();
echo '<div class="row-fluid" style="overflow:hidden">';
echo '<div class="row" style="overflow:hidden">';
echo '<div id="lp_sidebar" class="col-md-4">';
echo $learnPath->return_new_tree(null, true);

@ -277,12 +277,12 @@ function confirmation(name) {
echo $_SESSION['oLP']->build_action_menu();
echo '<div class="row-fluid">';
echo '<div class="span3">';
echo '<div class="row">';
echo '<div class="col-md-4">';
echo $_SESSION['oLP']->return_new_tree(null, true);
echo '</div>';
echo '<div class="span9">';
echo '<div class="col-md-8">';
switch ($_GET['action']) {
case 'edit_item':
if (isset($is_success) && $is_success === true) {

@ -125,12 +125,12 @@ function confirmation(name) {
echo $_SESSION['oLP']->build_action_menu();
echo '<div class="row-fluid">';
echo '<div class="span4">';
echo '<div class="row">';
echo '<div class="col-md-4">';
// Build the tree with the menu items in it.
echo $_SESSION['oLP']->return_new_tree();
echo '</div>';
echo '<div class="span8">';
echo '<div class="col-md-8">';
if (isset($is_success) && $is_success === true) {
Display::display_confirmation_message(get_lang('ItemRemoved'));

@ -984,7 +984,7 @@ switch ($action) {
if (!empty($_REQUEST['id'])) {
$_SESSION['oLP']->delete_item($_REQUEST['id']);
}
$url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_REQUEST['lp_id']);
$url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_REQUEST['lp_id']).api_get_cidreq();
header('Location: '.$url);
exit;
}

@ -117,8 +117,8 @@ function confirmation(name) {
echo $_SESSION['oLP']->build_action_menu();
echo '<div class="row-fluid">';
echo '<div class="span3">';
echo '<div class="row">';
echo '<div class="col-md-3">';
$path_item = isset($_GET['path_item']) ? $_GET['path_item'] : 0;
$path_item = Database::escape_string($path_item);
@ -139,7 +139,7 @@ if (Database::num_rows($res_doc) > 0 && $path_parts['extension'] == 'html') {
}
echo '</div>';
echo '<div class="span9">';
echo '<div class="col-md-9">';
if (isset($is_success) && $is_success === true) {
$msg = '<div class="lp_message" style="margin-bottom:10px;">';

@ -100,11 +100,11 @@ $suredel = trim(get_lang('AreYouSureToDelete'));
echo $lp->build_action_menu();
echo '<div class="row-fluid">';
echo '<div class="span3">';
echo '<div class="row">';
echo '<div class="col-md-3">';
echo $lp->return_new_tree();
echo '</div>';
echo '<div class="span9">';
echo '<div class="col-md-9">';
if (isset($is_success) && $is_success == true) {
echo $lp->display_manipulate($_GET['id'], null);
echo Display::return_message(get_lang("PrerequisitesAdded"));

@ -159,12 +159,12 @@ function confirmation(name)
echo $_SESSION['oLP']->build_action_menu();
echo '<div class="row-fluid">';
echo '<div class="span3">';
echo '<div class="row">';
echo '<div class="col-md-3">';
echo $_SESSION['oLP']->return_new_tree();
echo '</div>';
echo '<div class="span9">';
echo '<div class="col-md-9">';
if (isset($is_success) && $is_success === true) {
$msg = '<div class="lp_message" style="margin-bottom:10px;">';

@ -136,11 +136,11 @@ if (is_object($_SESSION['oLP'])) {
switch ($mode) {
case 'fullpage':
echo $_SESSION['oLP']->build_action_menu();
echo '<div class="row-fluid">';
echo '<div class="span3">';
echo '<div class="row">';
echo '<div class="col-md-3">';
echo $_SESSION['oLP']->return_new_tree();
echo '</div>';
echo '<div class="span9">';
echo '<div class="col-md-9">';
echo $_SESSION['oLP']->display_item($id);
echo '</div>';
echo '</div>';

Loading…
Cancel
Save