diff --git a/main/css/base.css b/main/css/base.css index d2b3ba3209..e5df1d6c33 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -71,12 +71,12 @@ label, input, button, select, textarea, p { form .label { color: #404040; - float: left; - font-size: 13px; + float: left; line-height: 18px; padding-top: 6px; text-align: right; width: 150px; + text-shadow:none; } form .formw { margin-left: 170px; @@ -2165,23 +2165,6 @@ div.lp_resource { padding:5px; } -/*LP changes -.lp_resource_element img { - float: left; - margin-bottom: 0; - margin-left: 43px; - margin-right: 43px; - margin-top: 7px; -} -.lp_resource_element a { - float: left; - margin-bottom: 12px; - margin-left: 33px; - margin-right: auto; - margin-top: 15px; - width: 100%; -}*/ - .doc_resource { margin:6px; } @@ -2190,7 +2173,6 @@ div.lp_tree { height: 100%; overflow: auto; padding: 3px 10px 3px 0; - width: 230px; } table.lp_build td.tree { @@ -3577,9 +3559,10 @@ a.forum_group_link { #hide_bar_template { width: 10px; display: inline; - overflow: hidden; + float:left; height: 100%; padding-bottom: 90em; + margin-bottom: -90em; cursor:pointer; background-color:#eee; margin-left: 0px !important; diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index 458251fd38..6dc9b3e759 100755 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -882,8 +882,7 @@ div.admin_section h4 { .sectioncomment { color: #000000; margin: 5px 5px 5px 0px; - padding: 5px; - font-size: 11px; + padding: 5px; } .sectionvalue { list-style-type: none; diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template.html b/main/inc/lib/fckeditor/editor/dialog/fck_template.html index 3fc92cea2c..4a54f932b3 100644 --- a/main/inc/lib/fckeditor/editor/dialog/fck_template.html +++ b/main/inc/lib/fckeditor/editor/dialog/fck_template.html @@ -194,21 +194,18 @@ function ItemDiv_OnMouseOut() function ItemDiv_OnClick() { - SelectTemplate( this.TplIndex ) ; + SelectTemplate( this.TplIndex ) ; + if (window.top.hide_bar) { + window.top.hide_bar(); + } } function SelectTemplate( index ) { oEditor.FCKUndo.SaveUndoStep() ; - FCK.SetHTML( FCK._Templates[index].Html ) ; + FCK.SetHTML( FCK._Templates[index].Html ) ; } - - - - - + diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php index f585245ae6..ff0b29915c 100644 --- a/main/newscorm/lp_add_item.php +++ b/main/newscorm/lp_add_item.php @@ -23,70 +23,79 @@ include 'learnpath_functions.inc.php'; include 'resourcelinker.inc.php'; $language_file = 'learnpath'; - $htmlHeadXtra[] = ' build_action_menu(); -echo '
'; +echo '
'; echo '
'; // Show the template list. -if (isset($_GET['type']) && $_GET['type'] == 'document' && !isset($_GET['file'])) { +if ($type == 'document' && !isset($_GET['file'])) { $count_items = count($_SESSION['oLP']->ordered_items); $style = ($count_items > 12) ? ' style="height:250px;width:230px;overflow-x : auto; overflow-y : scroll;" ' : ' class="lp_tree" '; echo '
'; @@ -245,7 +266,7 @@ if (isset($_GET['type']) && $_GET['type'] == 'document' && !isset($_GET['file']) echo $_SESSION['oLP']->build_tree(); echo '
'; // Show the template list. - echo '

'; + echo '

'; echo '
'; echo '
'; } else { @@ -254,31 +275,35 @@ if (isset($_GET['type']) && $_GET['type'] == 'document' && !isset($_GET['file']) echo $_SESSION['oLP']->build_tree(); echo '
'; } - echo '
'; -echo '
'; +//hide bar div +if ($action == 'add_item' && $type == 'document' && !isset($_GET['file'])) { + echo '
'; +} + +echo '
'; if (isset($new_item_id) && is_numeric($new_item_id)) { - switch($_GET['type']) { + switch ($type) { case 'chapter': echo $_SESSION['oLP']->display_manipulate($new_item_id, $_POST['type']); Display::display_confirmation_message(get_lang('NewChapterCreated')); break; case TOOL_LINK: - echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']); + echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); Display::display_confirmation_message(get_lang('NewLinksCreated')); break; case TOOL_STUDENTPUBLICATION: - echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']); + echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); Display::display_confirmation_message(get_lang('NewStudentPublicationCreated')); break; case 'module': - echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']); + echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); Display::display_confirmation_message(get_lang('NewModuleCreated')); break; case TOOL_QUIZ: - echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']); + echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); Display::display_confirmation_message(get_lang('NewExerciseCreated')); break; case TOOL_DOCUMENT: @@ -286,21 +311,21 @@ echo '
'; echo $_SESSION['oLP']->display_item($new_item_id, true); break; case TOOL_FORUM: - echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']); + echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); Display::display_confirmation_message(get_lang('NewForumCreated')); break; case 'thread': - echo $_SESSION['oLP']->display_manipulate($new_item_id, $_GET['type']); + echo $_SESSION['oLP']->display_manipulate($new_item_id, $type); Display::display_confirmation_message(get_lang('NewThreadCreated')); break; } } else { - switch($_GET['type']) { + switch ($type) { case 'chapter': - echo $_SESSION['oLP']->display_item_form($_GET['type'], get_lang('EnterDataNewChapter')); + echo $_SESSION['oLP']->display_item_form($type, get_lang('EnterDataNewChapter')); break; case 'module': - echo $_SESSION['oLP']->display_item_form($_GET['type'], get_lang('EnterDataNewModule')); + echo $_SESSION['oLP']->display_item_form($type, get_lang('EnterDataNewModule')); break; case 'document': if (isset($_GET['file']) && is_numeric($_GET['file'])) {