Browse Source

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Angel Fernando Quiroz Campos 8 years ago
parent
commit
be95748ec9

+ 2 - 0
.htaccess

@@ -23,6 +23,8 @@ RewriteRule ^courses/([^/]+)/index.php$ main/course_home/course_home.php?cDir=$1
 RewriteRule ^courses/([^/]+)/scorm/(.*)$ main/document/download_scorm.php?doc_url=/$2&cDir=$1 [QSA,L]
 
 # Rewrite everything in the document folder of a course to the download script
+# Except certificate resources, which might need to be accessible publicly to all
+RewriteRule ^courses/([^/]+)/document/certificates/(.*)$ app/courses/$1/document/certificates/$2 [QSA,L]
 RewriteRule ^courses/([^/]+)/document/(.*)$ main/document/download.php?doc_url=/$2&cDir=$1 [QSA,L]
 
 # Rewrite everything in the work folder

+ 36 - 3
app/Resources/public/css/base.css

@@ -2415,9 +2415,10 @@ table#skill_holder {
 .badges-sidebar{
     height: 250px;
 }
-/* ****************************************************
-                     END SKILL
- **************************************************** */
+.panel figure figcaption{
+    background: none;
+    text-align: center;
+}
 
 .skill_root {
     box-shadow: 2px 2px 19px #aaa;
@@ -5694,6 +5695,38 @@ footer{
     box-shadow: 0 1px 3px #C8C8C8;
     border: 1px solid #e6e6e6;
 }
+#toolnav{
+    position: fixed;
+    left: 0;
+    top: 50px;
+    z-index: 2000;
+}
+#toolnavbox ul{
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+#toolnavbox ul li{
+    height: 40px;
+    
+}
+#toolnavbox ul li a {
+	display: inline-block;
+    margin: 0;
+	color:#fff;
+	padding: 7px;
+	text-decoration: none;
+	-webkit-transition:all 500ms ease;
+	-o-transition:all 500ms ease;
+    transition:all 500ms ease;
+    width: 38px
+}
+#toolnavbox ul li a:hover {
+	padding: 5px 10px;
+}
+.btn-tool{
+    margin-bottom: 2px;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {

+ 10 - 19
main/document/create_document.php

@@ -14,36 +14,27 @@ $this_section = SECTION_COURSES;
 $htmlHeadXtra[] = '
 <script>
 
-var hide_bar = function() {
-    $("#template_col").hide();
-    $("#doc_form").removeClass("col-md-9");
-    $("#doc_form").addClass("col-md-11");
-    $("#hide_bar_template").css({"background-image" : \'url("'.Display::returnIconPath('hide2.png').'")\'})
-}
-
 $(document).ready(function() {
     $(".scrollbar-light").scrollbar();
     
-    if ($(window).width() <= 785 ) {
-        hide_bar();
-    }    
-
+    
     $("#hide_bar_template").click(function() {
-        
-        $("#expand").toggleClass("hide");
         $("#expand").toggleClass("hide");
         $("#contract").toggleClass("hide");
-        
         if ($("#doc_form").is(".col-md-9")) {
             $("#doc_form").removeClass("col-md-9");
             $("#doc_form").addClass("col-md-11");
+            
+            $("#template_col").removeClass("col-md-3");
+            $("#template_col").addClass("hide");
+            
         } else {
             $("#doc_form").removeClass("col-md-11");
             $("#doc_form").addClass("col-md-9");
+            
+            $("#template_col").removeClass("hide");
+            $("#template_col").addClass("col-md-3");
         }
-        
-        $("#hide_bar_template").toggleClass("hide_bar_template_not_hide");
-        
     });
 
     CKEDITOR.on("instanceReady", function (e) {
@@ -615,11 +606,11 @@ if ($form->validate()) {
 	if ($is_certificate_mode) {
             $actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-            $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Back'),null,ICON_SIZE_MEDIUM).'</a>';
+            $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Back'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Back'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
         } else {
             $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-            $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Back'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Back'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
+            $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
         }
 
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));

+ 40 - 31
main/document/edit_document.php

@@ -30,23 +30,27 @@ require_once '../inc/global.inc.php';
 // Template's javascript
 $htmlHeadXtra[] = '
 <script>
-var hide_bar = function() {
-    $("#template_col").hide();
-    $("#doc_form").removeClass("col-md-9");
-    $("#doc_form").addClass("col-md-11");
-    $("#hide_bar_template").css({"background-image" : \'url("'.Display::returnIconPath('hide.png').'")\'})
-}
 
 $(document).ready(function() {
     $(".scrollbar-light").scrollbar();
 
-    if ($(window).width() <= 785 ) {
-        hide_bar();
-    }
-
     $("#hide_bar_template").click(function() {
-        $("#template_col").toggleClass("hide");
-        $("#hide_bar_template").toggleClass("hide_bar_template_not_hide");
+        $("#expand").toggleClass("hide");
+        $("#contract").toggleClass("hide");
+        if ($("#doc_form").is(".col-md-9")) {
+            $("#doc_form").removeClass("col-md-9");
+            $("#doc_form").addClass("col-md-11");
+            
+            $("#template_col").removeClass("col-md-3");
+            $("#template_col").addClass("hide");
+            
+        } else {
+            $("#doc_form").removeClass("col-md-11");
+            $("#doc_form").addClass("col-md-9");
+            
+            $("#template_col").removeClass("hide");
+            $("#template_col").addClass("col-md-3");
+        }
     });
 
     CKEDITOR.on("instanceReady", function (e) {
@@ -533,21 +537,20 @@ if ($owner_id == api_get_user_id() ||
 	if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
 		Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
 	}
-    echo '<div class="row" style="overflow:hidden">
-            <div id="template_col" class="col-md-2">
+    // HTML-editor
+    echo '<div class="page-create">
+            <div class="row" style="overflow:hidden">
+            <div id="template_col" class="col-md-3">
                 <div class="panel panel-default">
                 <div class="panel-body">
                     <div id="frmModel" class="items-templates scrollbar-light"></div>
                 </div>
                 </div>
             </div>
-            <div class="col-md-1">
-                <div id="hide_bar_template"></div>
-            </div>
             <div id="doc_form" class="col-md-9">
-				'.$form->returnForm().'
+                '.$form->returnForm().'
             </div>
-          </div>';
+          </div></div>';
 }
 
 Display::display_footer();
@@ -585,33 +588,39 @@ function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc)
 //return button back to
 function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false)
 {
+    
+    $actionsLeft = null;
+    $actionsRight =  null;
+    
     global $parent_id;
-	echo '<div class="actions">';
-
     $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id;
 
 	if ($is_certificate_mode) {
 		$selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
-		echo '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
+		$actionsLeft .= '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+        $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
 	} elseif($call_from_tool=='slideshow') {
-		echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
+		$actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
             Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>';
 	} elseif($call_from_tool=='editdraw') {
-		echo '<a href="'.$url.'">'.
+		$actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
+		$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
 	} elseif($call_from_tool=='editodf') {
-        echo '<a href="'.$url.'">'.
+        $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-        echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>';
+        $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>';
+        $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
     } elseif($call_from_tool=='editpaint'){
-		echo '<a href="'.$url.'">'.
+		$actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
+		$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
 	} else {
-		echo '<a href="'.$url.'">'.
+		$actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+        $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
 	}
-	echo '</div>';
+    
+    echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
 }

BIN
main/img/icons/22/clock.png


BIN
main/img/icons/22/documents.png


BIN
main/img/icons/22/dropbox.png


BIN
main/img/icons/22/folder_document.png


BIN
main/img/icons/22/glossary.png


BIN
main/img/icons/22/home.png


BIN
main/img/icons/22/links.png


BIN
main/img/icons/22/members.png


BIN
main/img/icons/22/notebook.png


BIN
main/img/icons/22/reference.png


BIN
main/img/icons/22/user.png


BIN
main/img/icons/22/valves.png


BIN
main/img/icons/22/works.png


BIN
main/img/icons/32/clock.png


BIN
main/img/icons/32/reference.png


BIN
main/img/icons/48/clock.png


+ 13 - 9
main/inc/lib/course_home.lib.php

@@ -1159,27 +1159,31 @@ class CourseHome
         $navigation_items = self::get_navigation_items(true);
         $course_id = api_get_course_id();
 
-        $html = '<div id="toolnav"> <!-- start of #toolnav -->';
+        $html = '<div id="toolnav">'
+                . '<div class="btn-tool">'
+                . '<a class="btn btn-default" href="javascript: void(0);" id="swap_menu_link" onclick="javascript: swap_menu();">'.Display::returnFontAwesomeIcon('bars').'</a></div>';
         if (api_get_setting('show_navigation_menu') == 'icons') {
             $html .= self::show_navigation_tool_shortcuts($orientation = SHORTCUTS_VERTICAL);
         } else {
             $html .= '<div id="toolnavbox">';
-            $html .= '<div id="toolnavlist"><dl>';
+            $html .= '<ul>';
+            $count = 0;
             foreach ($navigation_items as $key => $navigation_item) {
                 //students can't see the course settings option
+                $count++;
                 if (!api_is_allowed_to_edit() && $key == 'course_settings') {
                     continue;
                 }
-                $html .= '<dd>';
+                $html .= '<li>';
                 $url_item = parse_url($navigation_item['link']);
                 $url_current = parse_url($_SERVER['REQUEST_URI']);
 
                 if (strpos($navigation_item['link'], 'chat') !== false &&
                     api_get_course_setting('allow_open_chat_window', $course_id)
                 ) {
-                    $html .= '<a href="javascript: void(0);" onclick="javascript: window.open(\''.$navigation_item['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$navigation_item['target'].'"';
+                    $html .= '<a class="btn btn-default" href="javascript: void(0);" onclick="javascript: window.open(\''.$navigation_item['link'].'\',\'window_chat'.$_SESSION['_cid'].'\',config=\'height=\'+600+\', width=\'+825+\', left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="'.$navigation_item['target'].'"';
                 } else {
-                    $html .= '<a href="'.$navigation_item['link'].'" target="_top" ';
+                    $html .= '<a class="btn btn-default" href="'.$navigation_item['link'].'" target="_top" ';
                 }
 
                 if (stristr($url_item['path'], $url_current['path'])) {
@@ -1189,15 +1193,15 @@ class CourseHome
                 }
                 $html .= ' title="'.$navigation_item['name'].'">';
                 if (api_get_setting('show_navigation_menu') != 'text') {
-                    $html .= '<div align="left"><img src="'.api_get_path(WEB_IMG_PATH).$navigation_item['image'].'" alt="'.$navigation_item['name'].'"/></div>';
+                    $html .= '<div class="pull-left">'.Display::return_icon(substr($navigation_item['image'],0,-3)."png", $navigation_item['name'], array('class'=>'tool-img'), ICON_SIZE_SMALL).'</div>';
                 }
                 if (api_get_setting('show_navigation_menu') != 'icons') {
-                    $html .= $navigation_item['name'];
+                    $html .= '<span class="tool-text-'.$count.'">'.$navigation_item['name'].'</span>';
                 }
                 $html .= '</a>';
-                $html .= '</dd>';
+                $html .= '</li>';
             }
-            $html .= '</dl></div></div>';
+            $html .= '</ul></div>';
         }
         $html .= '</div><!-- end "#toolnav" -->';
 

+ 1 - 1
main/inc/lib/javascript/tag/style.css

@@ -23,7 +23,7 @@ ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutt
 
 /* Autocompleter */
 
-.facebook-auto { display: none; position: absolute; background: #eee; z-index:1001;}
+.facebook-auto { display: none; background: #eee; z-index:1001;}
 .facebook-auto .select_all_items {display: block; float: right;}
 .facebook-auto .default { padding: 5px 7px; border: 1px solid #ccc; border-width: 0 1px 1px;font-family:"Lucida Grande","Verdana"; font-size:11px; }
 .facebook-auto ul { display: none; margin: 0; padding: 0; overflow: auto; position:absolute; z-index:9999}

+ 1 - 1
main/inc/lib/sessionmanager.lib.php

@@ -2628,7 +2628,7 @@ class SessionManager
         $return_array = array();
 
         $sql_query = " SELECT
-                    s.id,
+                    DISTINCT(s.id),
                     s.name,
                     s.nbr_courses,
                     s.access_start_date,

+ 12 - 8
main/lp/learnpath.class.php

@@ -5911,10 +5911,12 @@ class learnpath
     public function build_action_menu($returnContent = false)
     {
         $gradebook = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
-        $return = '<div class="actions">';
-        $return .=  '<a href="lp_controller.php?'.api_get_cidreq().'&gradebook=' . $gradebook . '&action=view&lp_id=' . $_SESSION['oLP']->lp_id . '&isStudentView=true" target="_self">' . Display :: return_icon('preview_view.png', get_lang('Display'),'',ICON_SIZE_MEDIUM).'</a> ';
-        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=admin_view&lp_id=' . $_SESSION['oLP']->lp_id . '&updateaudio=true">' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM).'</a>';
-        $return .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=edit&lp_id=' . $_SESSION['oLP']->lp_id . '">' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'',ICON_SIZE_MEDIUM).'</a>';
+        $actionsLeft = null;
+        
+        $actionsLeft .=  '<a href="lp_controller.php?'.api_get_cidreq().'&gradebook=' . $gradebook . '&action=view&lp_id=' . $_SESSION['oLP']->lp_id . '&isStudentView=true" target="_self">' . Display :: return_icon('preview_view.png', get_lang('Display'),'',ICON_SIZE_MEDIUM).'</a> ';
+        $actionsLeft .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=admin_view&lp_id=' . $_SESSION['oLP']->lp_id . '&updateaudio=true">' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM).'</a>';
+        $actionsLeft .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=edit&lp_id=' . $_SESSION['oLP']->lp_id . '">' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'',ICON_SIZE_MEDIUM).'</a>';
+        $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
         $buttons = array(
             array(
                 'title' => get_lang('SetPrerequisiteForEachItem'),
@@ -5925,13 +5927,15 @@ class learnpath
                 'href' => 'lp_controller.php?'.api_get_cidreq().'&action=clear_prerequisites&lp_id=' . $_SESSION['oLP']->lp_id,
             ),
         );
-        $return .= Display::group_button(get_lang('PrerequisitesOptions'), $buttons);
-        $return .= '</div>';
+        $actionsRigth = Display::group_button(get_lang('PrerequisitesOptions'), $buttons);
+        
 
         if ($returnContent) {
-            return $return;
+            return $toolbar=null;
         }
-        echo $return;
+        
+        echo $toolbar = Display::toolbarAction('actions-lp-controller', array(0 => $actionsLeft, 1 => $actionsRigth));
+        
     }
 
     /**

+ 17 - 17
main/lp/lp_add_item.php

@@ -177,19 +177,23 @@ jQuery(document).ready(function(){
 });
 
 $(document).ready(function() {
-    $("#doc_form").removeClass( "col-md-8" ).addClass( "col-md-7" );
-    $("#hide_bar_template").click(function() {
-        $("#lp_sidebar").toggleClass("hide");
-
-        if ($('#doc_form').is('.col-md-7')) {
-            $('#doc_form').removeClass('col-md-7');
-            $('#doc_form').addClass('col-md-11');
+     $("#hide_bar_template").click(function() {
+        $("#expand").toggleClass("hide");
+        $("#contract").toggleClass("hide");
+        if ($("#doc_form").is(".col-md-8")) {
+            $("#doc_form").removeClass("col-md-8");
+            $("#doc_form").addClass("col-md-11");
+            
+            $("#lp_sidebar").removeClass("col-md-4");
+            $("#lp_sidebar").addClass("hide");
+            
         } else {
-            $('#doc_form').removeClass('col-md-11');
-            $('#doc_form').addClass('col-md-7');
+            $("#doc_form").removeClass("col-md-11");
+            $("#doc_form").addClass("col-md-8");
+            
+            $("#lp_sidebar").removeClass("hide");
+            $("#lp_sidebar").addClass("col-md-4");
         }
-
-        $("#hide_bar_template").toggleClass("hide_bar_template_not_hide");
     });
 
     $('.lp-btn-associate-forum').on('click', function (e) {
@@ -223,16 +227,12 @@ $message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
 // Show the template list.
 if ($type == 'document' && !isset($_GET['file'])) {
     // Show the template list.
-    echo '<div id="frmModel" class="scrollbar-inner lp-add-item"></div>';
+    echo '<div id="frmModel" class="scrollbar-inner lp-add-item">';
+    echo '</div>';
 }
 
 echo '</div>';
 
-// hide bar div
-if ($action == 'add_item' && $type == 'document' && !isset($_GET['file'])) {
-    echo '<div class="col-md-1"><div id="hide_bar_template"></div></div> ';
-}
-
 echo '<div id="doc_form" class="col-md-8">';
 
 //@todo use session flash messages

+ 21 - 4
main/lp/lp_edit_item.php

@@ -138,8 +138,25 @@ function confirmation(name) {
         return false;
     }
 }
+jQuery(document).ready(function(){
+    jQuery('.scrollbar-inner').scrollbar();
+});
 
 $(document).ready(function() {
+    
+    $("#doc_form").removeClass( "col-md-8" ).addClass( "col-md-7" );  
+    $("#hide_bar_template").click(function() {
+        $("#lp_sidebar").toggleClass("hide");
+        if ($('#doc_form').is('.col-md-7')) {
+            $('#doc_form').removeClass('col-md-7');
+            $('#doc_form').addClass('col-md-11');
+        } else {
+            $('#doc_form').removeClass('col-md-11');
+            $('#doc_form').addClass('col-md-7');
+        }
+       $("#hide_bar_template").toggleClass("hide_bar_template_not_hide");
+    });
+    
     $('.lp-btn-associate-forum').on('click', function (e) {
         var associate = confirm('<?php echo get_lang('ConfirmAssociateForumToLPItem') ?>');
 
@@ -161,8 +178,8 @@ $(document).ready(function() {
 
 echo $_SESSION['oLP']->build_action_menu();
 
-echo '<div class="row">';
-echo '<div class="col-md-3">';
+echo '<div class="row" style="overflow:hidden">';
+echo '<div id="lp_sidebar" class="col-md-4">';
 $path_item = isset($_GET['path_item']) ? $_GET['path_item'] : 0;
 $path_item = Database::escape_string($path_item);
 $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
@@ -177,13 +194,13 @@ if (Database::num_rows($res_doc) > 0 && $path_parts['extension'] == 'html') {
     echo $_SESSION['oLP']->return_new_tree();
 
     // Show the template list
-    echo '<div id="frmModel" class="lp-add-item"></div>';
+    echo '<div id="frmModel" class="scrollbar-inner lp-add-item"></div>';
 } else {
     echo $_SESSION['oLP']->return_new_tree();
 }
 
 echo '</div>';
-echo '<div class="col-md-9">';
+echo '<div id="doc_form" class="col-md-8">';
 
 if (isset($is_success) && $is_success === true) {
     $msg = '<div class="lp_message" style="margin-bottom:10px;">';

+ 5 - 4
main/template/default/layout/course_navigation.tpl

@@ -13,6 +13,8 @@
                 if (readCookie('menu_state') == 0) {
                     swap_menu();
                 }
+
+              
             });
             function createCookie(name, value, days) {
                 if (days) {
@@ -35,7 +37,7 @@
                 return null;
             }
             function swap_menu() {
-                toolnavlist_el = document.getElementById('toolnav');
+                toolnavlist_el = document.getElementById('toolnavbox');
                 center_el = document.getElementById('center');
                 swap_menu_link_el = document.getElementById('swap_menu_link');
 
@@ -44,18 +46,17 @@
                     if (center_el) {
                         center_el.style.margin = '0 190px 0 0';
                     }
-                    swap_menu_link_el.innerHTML = '{{'Hide'|get_lang}}';
+                    swap_menu_link_el.innerHTML = '<i class="fa fa-bars" aria-hidden="true"></i>';
                     createCookie('menu_state',1,10);
                 } else {
                     toolnavlist_el.style.display = 'none';
                     if (center_el) {
                         center_el.style.margin = '0 0 0 0';
                     }
-                    swap_menu_link_el.innerHTML = '{{'Show'|get_lang}}';
+                    swap_menu_link_el.innerHTML = '<i class="fa fa-bars" aria-hidden="true"></i>';
                     createCookie('menu_state',0,10);
                 }
             }
-            document.write('<div class="col-md-12 pull-right"> <a class="btn btn-default" href="javascript: void(0);" id="swap_menu_link" onclick="javascript: swap_menu();">{{'Hide'|get_lang}}<\/a></div>');
         </script>
     {{ show_course_navigation_menu }}
     {% endif %}

+ 3 - 0
main/template/default/skill/skill_wheel.tpl

@@ -481,6 +481,9 @@
                 $('#frm-save-profile').modal('hide');
             });
         });
+        $(".facebook-auto").css("width","100%");
+        $(".facebook-auto ul").css("width","100%");
+        $("ul.holder").css("width","100%");
     });
 </script>
 <div id="page-back" class="page-skill">

+ 4 - 1
main/template/default/skill/skill_wheel_student.tpl

@@ -146,6 +146,9 @@
         $('#frm-course-info').on('', function () {
             $('#frm-course-info').find('.modal-body').html('');
         });
+        $(".facebook-auto").css("width","100%");
+        $(".facebook-auto ul").css("width","100%");
+        $("ul.holder").css("width","100%");
     });
 
 </script>
@@ -162,7 +165,7 @@
                     <div class="panel-body">
                         <figure class="text-center">
                             <img width="100px" src="{{ user_info.avatar }}" class="img-circle center-block">
-                            <figcaption class="lead">{{ user_info.complete_name }}</figcaption>
+                            <figcaption class="avatar-author">{{ user_info.complete_name }}</figcaption>
                         </figure>
                         <p class="text-center">
                             <a href="{{ _p.web_main }}social/skills_ranking.php" class="btn btn-default" target="_blank">{{ 'YourSkillRankingX'|get_lang|format(ranking) }}</a>