This repository has been archived by the owner on Aug 21, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 39
840 course career path(connects #840) #882
Open
Pr0chin
wants to merge
39
commits into
dev
Choose a base branch
from
840-Course-Career-Path
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
72c77d2
[#840]: Layout Created For CareerPath
Pr0chin 1c0bfd5
[#840]: Career Path
Pr0chin acce8e6
[#840] added multiselect feature
Rupesh87 ec0d6a9
[#840] Some Changes
Pr0chin 6bf8c55
[#840]:CLean Conflict
Pr0chin 0db709e
[#840] select value and save career
Rupesh87 d79ab6c
[#840]:Changes Made
Pr0chin 3e23999
[#840]: Removed Conflit
Pr0chin 472c573
[#840]:list of courseCareer
Rupesh87 b6b7650
[#840]:Upgrading
Pr0chin aa9400f
[#840]:Removed conflicts
Pr0chin 72f41a5
[#840]:AddCourseCareer completed
Pr0chin 1e319ff
[#840]:Setting new concept
Pr0chin efee3b0
[#840]:Some changes made
Pr0chin 2d1ab43
[#840]:Upgraded some changes
Pr0chin 8d181f6
[#840]save required career
Rupesh87 b79af87
[#840]-edit careerpath
Rupesh87 ed5410b
[#840]Delete and search
razu9861 59ac284
[#840]:Latest push Course Career
Pr0chin 9d8958c
[#840]-changes on carrerpath
razu9861 6a26b1e
840-Remover Merge Conflict
Pr0chin de5b792
840:Changed as per required
Pr0chin 4c288a7
[#840]:features added
razu9861 e65d1a9
[#840] Tab Function
Pr0chin a4fba58
[#840] Tab Functionality
Pr0chin dd4f37e
[#840] Upgraded changes
Pr0chin 44cf88f
[#840] Made some changes
Pr0chin 0ff745c
Merge branch '840-Course-Career-Path' of https://github.com/open-lear…
Pr0chin 979fa97
[#840]-Career path
razu9861 422c207
[#840]:list career added
razu9861 1134278
[#840] Career Path
razu9861 e396ec4
[#840] careerpath
razu9861 a6395f6
[#840] unwanted files removed
razu9861 c9a06d2
careerppath
razu9861 c454d57
[#840] Career detail view
razu9861 e94449c
Merge branch 'dev' into 840-Course-Career-Path
razu9861 59256b6
[#840] indentation fixed
razu9861 731c52e
Update Text.json
razu9861 b14251a
[#840] indentation fixed
razu9861 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1445,48 +1445,47 @@ <h4 style="width:25em;word-wrap:break-word;"> | |
<button style="margin-top: -186px; margin-left: 536px;" class='btn btn-primary' id="addNewCoursePath" onclick = "document.location.href='#courseCareerPath/add'" >Add New Career</button> | ||
<button class="back_button btn btn-primary" style = "margin-left: -677px;" | ||
onclick = "document.location.href='#courses'"><%= languageDict.attributes.Back_To_Course %></button> | ||
<input id="searchText" type="Text" placeholder="Course Career Name" style="margin-top: -165px; margin-left: 1051px; height: 28px; width: 170px;"> | ||
<input id="searchText" type="Text" placeholder="Course Career Name" style="margin-top: -173px; margin-left: 1051px; height: 28px; width: 170px;"> | ||
<button style="margin-top: -242px; margin-left: 1395px;" class="Search btn btn-info" id="SearchCoursePath" >Search</button> | ||
<div> | ||
<table class="btable btable-striped">> | ||
<th>Course Career</th> | ||
<table class="btable btable-striped"> | ||
<th style="width: 430px">Course Career</th> | ||
<th>Action<th> | ||
</table> | ||
</div> | ||
</script> | ||
<script type="text/template" id="template-addCourseCareer"> | ||
<button class="back_button btn btn-primary" onclick = "document.location.href='#courseCareerPath'"><%= languageDict.attributes.Back_To_Course_Career %></button> | ||
<hr/> | ||
<h4 id="new-quiz"><%= languageDict.attributes.New_Career_Path %></h4> | ||
<style> | ||
input[type=text], select { width: 22%%;padding: 26px 16px; margin:15px 4px;display: inline-block;border: 1px solid #ccc;border-radius: 4px;box-sizing: border-box;} | ||
input[type=submit] { width: 100%;background-color: #4CAF50;color: white;padding: 14px 20px;margin: 8px 0; | ||
border: none;border-radius: 4px;cursor: pointer;}} | ||
</style> | ||
<div> | ||
<form action="/action_page.php"> | ||
<label for="fname">Level Name</label> | ||
<input type="text" id="fname" name="firstname" placeholder="Leve Name"> | ||
<label for="lname">Course Career Path Name</label> | ||
<input type="text" id="lname" name="lastname" placeholder="Course Career Path Name"> | ||
<label for="country">List of Courses</label> | ||
<select id="country" Placeholder="List of Courses" name="country"> | ||
<option value="australia">Australia</option> | ||
<option value="canada">Canada</option> | ||
<option value="usa">USA</option> | ||
<div class ="multipleCourse"> | ||
<form> | ||
<label for="lName"><%= languageDict.attributes.Level_Name %></label> | ||
<select id="LCourse" style="font-size: 15px;font-weight: 500;"> | ||
<option selected><%= languageDict.attributes.Select_An_option %></option> | ||
<option value='Begineers'>Begineers</option> | ||
<option value='Intermediate'>Intermediate</option> | ||
<option value='Professional'>Professional</option> | ||
</select> | ||
<label for="cpName"><%= languageDict.attributes.Course_Career_Path_Name %></label> | ||
<input type="text" id="careerPath" placeholder="Course Career Path Name" style = "padding-top: 12px; padding-bottom: 11px;"> | ||
<label for="LCourse"><%= languageDict.attributes.List_of_Courses %></label> | ||
<select id="LCourse" style="font-size: 15px;font-weight: 500;"> | ||
<option selected><%= languageDict.attributes.Select_An_option %></option> | ||
<%for(var i =0; i<Course_Length;i++){%> | ||
<option value='<%=Courselist[i]%>'><%=Courselist[i]%></option> | ||
<%}%> | ||
</select> | ||
<button id="AddCareerPath" class="course btn btn-success" style="margin-left: 23px;">Create Course Career</button> | ||
<button id ="CancelCOursePath" class="btn resignBtn btn-danger" style="margin-left: 23px;" >Cancel</button> | ||
<button id="AddCareerPath" class="course btn btn-success" style="margin-left: 23px; margin-top: -15px;"><%= languageDict.attributes.Create_Course_Career %></button> | ||
<button id ="CancelCOursePath" class="btn resignBtn btn-danger" style="margin-left: 23px;margin-top: -15px;" ><%= languageDict.attributes.Cancel %></button> | ||
</form> | ||
</div> | ||
<div> | ||
<table class="btable btable-striped"> | ||
<tbody><tr><th style="width: 430px">Course Career</th> | ||
<th>Action</th> | ||
</tr> | ||
<td> </td> | ||
</tr> | ||
</tbody> | ||
</table | ||
<table class="btable btable-striped"> | ||
<th style="width: 430px">Course Career</th> | ||
<th style="width: 430px">Courses List</th> | ||
<th>Action<th> | ||
</table> | ||
</div> | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove extra line There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. extra line |
||
</script> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this function if nothing is in it.