fix tabs learningpath - refs #2681

assets/css/base.css

@@ -1309,11 +1309,7 @@ a.unread {
 table.lp_build td.tree {
     border: none;
 }
-
-#resource_tab {
-    min-height: 380px;
-}
-
+g
 div.system_announcement {
     background-color: #EEEEEE;
 }
@@ -6595,10 +6591,6 @@ a.sessionView {
     margin-top: 20px;
 }
 
-#resource_tab li a {
-    padding: 5px;
-}
-
 /* Gravatar */
 #user_image_block img,
 #sn-avatar-one a.expand-image img {
@@ -7020,10 +7012,6 @@ ul#toolnavbox-two li a.btn {
     padding-top: 15px;
 }
 
-#resource_tab #subtab #ul_subtab li a {
-    padding: 10px 15px;
-}
-
 .feeback-form .form-group .form-control {
     width: 100%;
 }

assets/css/scss/_base.scss

@@ -223,6 +223,15 @@ hr {
   background-color: $default-white;
   border-top: 1px solid #dee2e6;
 }
+
+/*** TABS ***/
+.nav-tabs{
+  margin-bottom: 10px;
+}
+.tab-content{
+  margin-top: 10px;
+}
+
 /** SELECT */
 
 .btn-select{

assets/js/app.js

@@ -250,15 +250,13 @@ $(function() {
     });
 
     // Bootstrap tabs.
-    $('.tab-wrapper a').click(function (e) {
-        e.preventDefault();
-        $(this).tab('show');
-
-        //$('#tabs a:first').tab('show') // Select first tab
-    });
+    $('.tab_wrapper .nav a').on('click', function (e) {
+        e.preventDefault()
+        $(this).tab('show')
+    })
 
     // Fixes bug when loading links inside a tab.
-    $('.tab-wrapper .tab-pane a').unbind();
+    $('.tab_wrapper .tab-pane a').unbind();
 
     /**
      * Advanced options

main/inc/lib/display.lib.php

@@ -1161,6 +1161,7 @@ class Display
                 $active = ' active';
                 $selected = 'true';
             }
+
             $item = self::tag(
                 'a',
                 $item,
@@ -1170,7 +1171,7 @@ class Display
                     'id' => $id.$i.'-tab',
                     'data-toggle' => 'tab',
                     'role' => 'tab',
-                    'aria-controls' => 'aria_'.$id.$i,
+                    'aria-controls' => $id.'-'.$i,
                     'aria-selected' => $selected,
                 ]
             );
@@ -1202,7 +1203,7 @@ class Display
                     'id' => $id.'-'.$i,
                     'class' => 'tab-pane fade '.$active,
                     'role' => 'tabpanel',
-                    'aria-labelledby' => $id.'-'.$i,
+                    'aria-labelledby' => $id.$i.'-tab',
                 ]
             );
             $i++;

main/lp/learnpath.class.php

@@ -10715,7 +10715,7 @@ class learnpath
                     document.getElementById(tool+"_"+id+"_opener").src = "'.Display::returnIconPath('remove.gif').'";
                 } else {
                     document.getElementById(tool+"_"+id+"_content").style.display = "none";
-                    document.getElementById(tool+"_"+id+"_opener").src = "'.Display::returnIconPath('add.gif').'";
+                    document.getElementById(tool+"_"+id+"_opener").src = "'.Display::returnIconPath('add.png').'";
                 }
             }
         </script>
@@ -10758,7 +10758,7 @@ class learnpath
             $linksHtmlCode .=
                 '<li>
                 <a style="cursor:hand" onclick="javascript: toggle_tool(\''.TOOL_LINK.'\','.$categoryId.')" style="vertical-align:middle">
-                    <img src="'.Display::returnIconPath('add.gif').'" id="'.TOOL_LINK.'_'.$categoryId.'_opener"
+                    <img src="'.Display::returnIconPath('add.png').'" id="'.TOOL_LINK.'_'.$categoryId.'_opener"
                     align="absbottom" />
                 </a>
                 <span style="vertical-align:middle">'.Security::remove_XSS($categories[$categoryId]).'</span>
@@ -10883,7 +10883,7 @@ class learnpath
                     document.getElementById("forum_"+forum_id+"_opener").src = "'.Display::returnIconPath('remove.gif').'";
                 } else {
                     document.getElementById("forum_"+forum_id+"_content").style.display = "none";
-                    document.getElementById("forum_"+forum_id+"_opener").src = "'.Display::returnIconPath('add.gif').'";
+                    document.getElementById("forum_"+forum_id+"_opener").src = "'.Display::returnIconPath('add.png').'";
                 }
             }
         </script>';
@@ -10902,7 +10902,7 @@ class learnpath
                 $return .= ' </a>';
                 $return .= Display::return_icon('forum.png', '', [], ICON_SIZE_TINY);
                 $return .= '<a onclick="javascript:toggle_forum('.$forum['forum_id'].');" style="cursor:hand; vertical-align:middle">
-                                <img src="'.Display::returnIconPath('add.gif').'" id="forum_'.$forum['forum_id'].'_opener" align="absbottom" />
+                                <img src="'.Display::returnIconPath('add.png').'" id="forum_'.$forum['forum_id'].'_opener" align="absbottom" />
                             </a>
                             <a class="moved" href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_FORUM.'&forum_id='.$forum['forum_id'].'&lp_id='.$this->lp_id.'" style="vertical-align:middle">'.
                     Security::remove_XSS($forum['forum_title']).' '.$link.'</a>';

src/ThemeBundle/Resources/views/LearnPath/list.html.twig

@@ -493,11 +493,11 @@
         <h2>{{ "LearningPaths"|trans }}</h2>
         <img src="{{ "scorms.png"|icon(64) }}" width="64" height="64">
         <div class="controls">
-            <a href="{{ web_self ~ "?" ~ _p.web_cid_query ~ "&action=add_lp" }}" class="btn btn-default">
+            <a href="{{ web_self ~ "?" ~ _p.web_cid_query ~ "&action=add_lp" }}" class="btn btn-outline-primary">
                 {{ "LearnpathAddLearnpath"|trans }}
             </a>
         </div>
     </div>
-{% endif %}
+{% endif %}ul_resource_tab
 {% endautoescape %}
 {% endblock %}