Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
dbfc77e4
Commit
dbfc77e4
authored
Feb 08, 2013
by
Vik Paruchuri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add in legend, move status bar, fix js where it was constantly displaying a message
parent
70f71857
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
6 deletions
+17
-6
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+11
-0
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+1
-1
lms/templates/combined_open_ended.html
+4
-4
lms/templates/combined_open_ended_status.html
+1
-1
No files found.
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
View file @
dbfc77e4
...
...
@@ -43,6 +43,17 @@ section.combined-open-ended {
}
}
section
.legend-container
{
.legenditem
{
color
:
#FFFFFF
;
background-color
:
#000000
;
font-size
:
.9em
;
padding
:
2px
;
display
:
inline
;
width
:
20%
;
}
}
section
.combined-open-ended-status
{
.statusitem
{
...
...
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
View file @
dbfc77e4
...
...
@@ -397,8 +397,8 @@ class @CombinedOpenEnded
window
.
queuePollerID
=
window
.
setTimeout
(
@
poll
,
10000
)
setup_file_upload
:
=>
if
window
.
File
and
window
.
FileReader
and
window
.
FileList
and
window
.
Blob
if
@
accept_file_upload
==
"True"
if
window
.
File
and
window
.
FileReader
and
window
.
FileList
and
window
.
Blob
@
can_upload_files
=
true
@
file_upload_area
.
html
(
'<input type="file" class="file-upload-box">'
)
@
file_upload_area
.
show
()
...
...
lms/templates/combined_open_ended.html
View file @
dbfc77e4
<section
id=
"combined-open-ended"
class=
"combined-open-ended"
data-ajax-url=
"${ajax_url}"
data-allow_reset=
"${allow_reset}"
data-state=
"${state}"
data-task-count=
"${task_count}"
data-task-number=
"${task_number}"
data-accept-file-upload =
"${accept_file_upload}"
>
<div
class=
"status-container"
>
${status | n}
</div>
<h2>
${display_name}
</h2>
<div
class=
"item-container"
>
...
...
@@ -17,6 +13,10 @@
<input
type=
"button"
value=
"Reset"
class=
"reset-button"
name=
"reset"
/>
<input
type=
"button"
value=
"Next Step"
class=
"next-step-button"
name=
"reset"
/>
</div>
<div
class=
"status-container"
>
${status | n}
</div>
<div
class=
"combined-rubric-container"
>
</div>
...
...
lms/templates/combined_open_ended_status.html
View file @
dbfc77e4
<div
class=
"status-elements"
>
<section
name
=
"legend-container"
>
<section
class
=
"legend-container"
>
% for i in xrange(0,len(legend_list)):
<
%
legend_title=
legend_list[i]['name']
%
>
<
%
legend_image=
legend_list[i]['image']
%
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment