[#840] Tab Functionality

open-learning-exchange · Jun 19, 2017 · a4fba58 · a4fba58
1 parent e65d1a9
commit a4fba58
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/app/MyApp/app/Router.js b/app/MyApp/app/Router.js
@@ -2183,7 +2183,11 @@ $(function() {
                     button += '<button class="btn btn-info" onclick="CourseSearch()">'+App.languageDict.attributes.Search+'</button></span>'
                     button += '</p>'
                     $('#parentLibrary').append( button);
-                    $('#parentLibrary').append('<p id="labelOnResource" style="font-size:30px;color:#808080"><a href="#courses"style="font-size:30px;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;">'+languageDict.attributes.Course_Career_Path+'</a></p>')                                        
+                    if($.url().attr('fragment') == "courses") {
+                        $('#parentLibrary').append('<p id="labelOnResource" style="font-size:30px;color:#808080;"><a href="#courses"style="font-size:30px;text-decoration: underline;;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;" >'+languageDict.attributes.Course_Career+'</a></p>')
+                    }else{
+                        $('#parentLibrary').append('<p id="labelOnResource" style="font-size:30px;color:#808080;"><a href="#courses"style="font-size:30px;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;text-decoration: underline;">'+languageDict.attributes.Course_Career+'</a></p>')
+                    }
                     $('#parentLibrary').append(coursesTable.el);
                     coursesTable.changeDirection();
                     if(directionOfLang.toLowerCase()==="right")
@@ -6765,8 +6769,12 @@ $(function() {
             addCourseCareer.render()
             App.$el.children('.body').html('<div id="ManageCourseCareer"></div>');
             $('#ManageCourseCareer').append('<a id="addCourseButton" class="btn btn-success" href="#course/add">'+App.languageDict.attributes.Add_Course+'</a>')
-            $('#ManageCourseCareer').append('<a id="requestCourseButton" class="btn btn-success" style="margin: 24px;" onclick=showRequestForm("Course")>'+App.languageDict.attributes.Request_Course+'</a>')
-            $('#ManageCourseCareer').append('<p id="labelOnResource" style="font-size:30px;color:#808080"><a href="#courses"style="font-size:30px;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;">'+languageDict.attributes.Course_Career_Path+'</a></p>')
+            $('#ManageCourseCareer').append('<a id="requestCourseButton" class="btn btn-success" style="margin: 13px;margin-left: 9px;" onclick=showRequestForm("Course")>'+App.languageDict.attributes.Request_Course+'</a>')
+            if($.url().attr('fragment') == "courses") {
+                $('#ManageCourseCareer').append('<p id="labelOnResource" style="font-size:30px; margin-bottom: -23px;color:#808080"><a href="#courses"style="font-size:30px;text-decoration: underline;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;text-decoration: underline;"checked data-toggle="toggle">'+languageDict.attributes.Course_Career+'</a></p>')
+            }else{
+                $('#ManageCourseCareer').append('<p id="labelOnResource" style="font-size:30px; margin-bottom: -23px;color:#808080"><a href="#courses"style="font-size:30px;">'+languageDict.attributes.Courses+'</a>&nbsp&nbsp|&nbsp&nbsp<a href="#courseCareerPath" style="font-size:30px;text-decoration: underline;"checked data-toggle="toggle">'+languageDict.attributes.Course_Career+'</a></p>')
+            }
             $('#ManageCourseCareer').append(addCourseCareer.el);
             $("#EditCareerPath").hide();
             $('#LCourse').multiselect().multiselectfilter();

diff --git a/app/MyApp/index.html b/app/MyApp/index.html
@@ -1460,8 +1460,8 @@ <h4 style="width:25em;word-wrap:break-word;">
     </script>
 
     <script type="text/template" id="template-addCourseCareer">
-    <input id="searchText" type="Text" placeholder="Course Career Name" style="margin-top: -233px; margin-left: 1056px; height: 28px; width: 170px;">
-        <button style="margin-top: -275px; margin-left: 1251px;" class="Search btn btn-info" id="SearchCoursePath" >Search</button>
+    <input id="searchText" type="Text" placeholder="Course Career Name" style="margin-top: -137px; margin-left: 1056px; height: 28px; width: 170px;">
+        <button style="margin-top: -183px; margin-left: 1251px;" class="Search btn btn-info" id="SearchCoursePath" >Search</button>
         <div class ="multipleCourse">
             <form>
                 <label for="cpName"><%= languageDict.attributes.Career_Path_Name %></label>