Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workspace #1873

Open
wants to merge 35 commits into
base: beta
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3cafd7f
Primary header color chnaged, activity player header made reverted co…
Prachirb Feb 26, 2018
91c6b11
Dropdown colors fixed, color chnge depicted on hover
Prachirb Feb 26, 2018
2c0baa1
Lms secondary header cms lms merge color changed to match primary hea…
Prachirb Feb 26, 2018
d86c810
All buttons made of same color and on hover the color and background …
Prachirb Feb 26, 2018
cdb98c1
Merge branch 'master' of https://github.com/gnowledge/gstudio into ma…
Prachirb Feb 26, 2018
cadd60f
Buddy Bar dynamic height
Prachirb Feb 26, 2018
cc9b1a3
Collapsible left nav of activity player completed.
Prachirb Feb 27, 2018
837049c
Save & Cancel button for add buddy added on the top and botton for th…
Prachirb Feb 27, 2018
55a51ed
Removed the alert message for displaying the list of the current/busy…
Prachirb Feb 27, 2018
e79b9fd
Merge pull request #1902 from Prachirb/master-icons
saavrabh Mar 8, 2018
5c881a7
use modules sort list sent from views
katkamrachana Mar 8, 2018
6dc3eff
show all modules as default if not sorting is applied
katkamrachana Mar 8, 2018
217c9a6
fetchcing all modules and sorted modules list. Delete sort-list gattr…
katkamrachana Mar 8, 2018
4a19d5c
Merge branch 'master' of https://github.com/gnowledge/gstudio into sa…
katkamrachana Mar 8, 2018
8df85f8
default base template set to lms.html for asset content detail
saavrabh Mar 8, 2018
88a00b0
contributed by field commented if announced unit
saavrabh Mar 8, 2018
13749d8
file size added in asset content detail view
saavrabh Mar 8, 2018
0d4f181
Merge pull request #1904 from katkamrachana/saviour
saavrabh Mar 8, 2018
c98eb8c
my workspace added for all sites
saavrabh Mar 8, 2018
dc7603c
my workspace added in mydesk
saavrabh Mar 8, 2018
64e0f9f
Replaced svg with font-awesome collapse icon in LMS. scroll-up the ac…
katkamrachana Mar 8, 2018
ba9906a
primary-pink added for transcripts. Open/Close icon toggle in lms index
katkamrachana Mar 8, 2018
a65ff9a
icon for discuss button
saavrabh Mar 8, 2018
3e78be1
transcript icon added in audio widget
saavrabh Mar 8, 2018
2289cf9
Module card udpates: Name on RHS instead of description
katkamrachana Mar 8, 2018
42b07d4
explore module listing moved to the right slightly.
katkamrachana Mar 8, 2018
62ece5a
transcript icon added for video widget and url persists after login
saavrabh Mar 8, 2018
220aa33
course progress defined with green and orange filled circles in conte…
katkamrachana Mar 8, 2018
2915acd
Merge pull request #1905 from katkamrachana/saviour
saavrabh Mar 8, 2018
73e52ec
Merge branch 'master' of https://github.com/gnowledge/gstudio into ma…
saavrabh Mar 8, 2018
c7587a1
transcript button bg fixed
saavrabh Mar 8, 2018
0ba53f7
Merge pull request #1906 from saavrabh/master-UI
katkamrachana Mar 8, 2018
74e2728
conflicts resolved
tirthakarmahesh211 Mar 9, 2018
cdcb241
event form created
tirthakarmahesh211 Mar 13, 2018
75dfccb
event url is commited
tirthakarmahesh211 Mar 13, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
transcript icon added in audio widget
saavrabh committed Mar 8, 2018
commit 3e78be13e3cde3fb9f4d36f437e7d29e365e87bd
29 changes: 29 additions & 0 deletions gnowsys-ndf/gnowsys_ndf/ndf/static/ndf/images/Transcript_v1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -45,9 +45,9 @@

<div {% if user_access_priv == "allow" %} onclick="createDiscussion()" class="ckeditor-comment explore-button "{% else %} class="ckeditor-comment explore-button user_not_enrolled" {% endif %} id="create-discussion" data-id="{{ node.pk }}" style="margin-bottom:0;">
{% if thr_int_type %}
{{thr_int_type}} <i class="fa fa-comments"></i> {% if all_replies|length > 0 %}({{all_replies|length }}) {% endif %}
<i class="fa fa-comments"></i> {{thr_int_type}} {% if all_replies|length > 0 %}({{all_replies|length }}) {% endif %}
{% else %}
{{default_discussion_lbl}} <i class="fa fa-comments"></i> {% if all_replies|length > 0 %} ({{all_replies|length }}) {% endif %}
<i class="fa fa-comments"></i> {{default_discussion_lbl}} {% if all_replies|length > 0 %} ({{all_replies|length }}) {% endif %}
{% endif %}
</div>
{% endif %}
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@
{% if transcript_rel %}

<div>
{# <button type = "button" class="small radius transcript-toggler" onclick="togglerTranscript(this)">Transcript</button> #}
{# <button type = "button" class="small radius transcript-toggler" onclick="togglerTranscript(this)">Transcript</button> #}
<input type="button" class="small radius transcript-toggler" onclick="togglerTranscript(this)" value="Transcript">
<img src="/static/ndf/images/Transcript.svg" style="margin-top: -60px;margin-left: 9px;" />
<img src="/static/ndf/images/Transcript_v1.svg" style="margin-top: -60px;margin-left: 9px;" />
<div class="transcript-data hide">
<object type="text/html" data="{{MEDIA_URL}}{{transcript_rel.grel_node.if_file.original.relurl}}"></object>
</div>