Skip to content

E
edx-platform
Commit dfc4da15 by Sarina Canelake
Options

Merge pull request #6135 from edx/sarina/categorize-common-images 

Clean up common/ images - moving, deleting, renaming as necessary
parents cdca3fcb db09c552
Showing with 16 additions and 15 deletions
common/lib/xmodule/xmodule/templates/about/overview.yaml
...@@ -19,7 +19,7 @@ data: | ...@@ -19,7 +19,7 @@ data: |
<h2>Course Staff</h2> <h2>Course Staff</h2>
<article class="teacher"> <article class="teacher">
<div class="teacher-image"> <div class="teacher-image">
<img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1"> <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
</div> </div>
<h3>Staff Member #1</h3> <h3>Staff Member #1</h3>
...@@ -28,7 +28,7 @@ data: | ...@@ -28,7 +28,7 @@ data: |
<article class="teacher"> <article class="teacher">
<div class="teacher-image"> <div class="teacher-image">
<img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2"> <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
</div> </div>
<h3>Staff Member #2</h3> <h3>Staff Member #2</h3>
......
common/lib/xmodule/xmodule/templates/problem/customgrader.yaml
...@@ -41,7 +41,8 @@ data: | ...@@ -41,7 +41,8 @@ data: |
<div class="detailed-solution"> <div class="detailed-solution">
<p>Explanation</p> <p>Explanation</p>
<p>Any set of integers on the line \(y = 10 - x\) and \(y = 20 - x\) satisfy these constraints.</p> <p>Any set of integers on the line \(y = 10 - x\) and \(y = 20 - x\) satisfy these constraints.</p>
<img src="/static/images/simple_graph.png"/> <p>You can also add images within the solution clause like so:</p>
<img src="/static/images/placeholder-image.png"/>
</div> </div>
</solution> </solution>
</problem> </problem>
common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml
...@@ -74,7 +74,7 @@ metadata: ...@@ -74,7 +74,7 @@ metadata:
Include image by using the edXxml macro: Include image by using the edXxml macro:
\edXxml{<img src="https://courses.edx.org/static/images/mit_dome.jpg"/>} \edXxml{<img src="https://courses.edx.org/static/images/placeholder-image.png"/>}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Example show/hide explanation} \subsection{Example show/hide explanation}
...@@ -189,7 +189,7 @@ data: | ...@@ -189,7 +189,7 @@ data: |
<p> <p>
Include image by using the edXxml macro: </p> Include image by using the edXxml macro: </p>
<p> <p>
<img src="https://courses.edx.org/static/images/mit_dome.jpg"/> <img src="https://courses.edx.org/static/images/placeholder-image.png"/>
</p> </p>
<p> <p>
<h4>Example show/hide explanation</h4> <h4>Example show/hide explanation</h4>
......
common/test/data/2014/about/overview.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<h2>Course Staff</h2> <h2>Course Staff</h2>
<article class="teacher"> <article class="teacher">
<div class="teacher-image"> <div class="teacher-image">
<img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1"> <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
</div> </div>
<h3>Staff Member #1</h3> <h3>Staff Member #1</h3>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<article class="teacher"> <article class="teacher">
<div class="teacher-image"> <div class="teacher-image">
<img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2"> <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
</div> </div>
<h3>Staff Member #2</h3> <h3>Staff Member #2</h3>
......
common/test/data/course_info_updates/about/overview.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<h2>Course Staff</h2> <h2>Course Staff</h2>
<article class="teacher"> <article class="teacher">
<div class="teacher-image"> <div class="teacher-image">
<img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1"> <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
</div> </div>
<h3>Staff Member #1</h3> <h3>Staff Member #1</h3>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<article class="teacher"> <article class="teacher">
<div class="teacher-image"> <div class="teacher-image">
<img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2"> <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
</div> </div>
<h3>Staff Member #2</h3> <h3>Staff Member #2</h3>
......
common/test/data/manual-testing-complete/about/overview.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<h2>Course Staff</h2> <h2>Course Staff</h2>
<article class="teacher"> <article class="teacher">
<div class="teacher-image"> <div class="teacher-image">
<img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1"> <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
</div> </div>
<h3>Staff Member #1</h3> <h3>Staff Member #1</h3>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<article class="teacher"> <article class="teacher">
<div class="teacher-image"> <div class="teacher-image">
<img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2"> <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
</div> </div>
<h3>Staff Member #2</h3> <h3>Staff Member #2</h3>
......
docs/en_us/platform_api/source/course_info.rst
...@@ -144,14 +144,14 @@ Get the HTML for the course about page. ...@@ -144,14 +144,14 @@ Get the HTML for the course about page.
<h2>Course Staff</h2>\n <h2>Course Staff</h2>\n
<article class=\"teacher\">\n <article class=\"teacher\">\n
<div class=\"teacher-image\">\n <div class=\"teacher-image\">\n
<img src=\"/static/images/pl-faculty.png\" align=\"left\" style=\"margin:0 20 px 0\">\n <img src=\"/static/images/placeholder-faculty.png\" align=\"left\" style=\"margin:0 20 px 0\">\n
</div>\n\n </div>\n\n
<h3>Staff Member #1</h3>\n <h3>Staff Member #1</h3>\n
<p>Biography of instructor/staff member #1</p>\n <p>Biography of instructor/staff member #1</p>\n
</article>\n\n </article>\n\n
<article class=\"teacher\">\n <article class=\"teacher\">\n
<div class=\"teacher-image\">\n <div class=\"teacher-image\">\n
<img src=\"/static/images/pl-faculty.png\" align=\"left\" style=\"margin:0 20 px 0\">\n <img src=\"/static/images/placeholder-faculty.png\" align=\"left\" style=\"margin:0 20 px 0\">\n
</div>\n\n </div>\n\n
<h3>Staff Member #2</h3>\n <h3>Staff Member #2</h3>\n
<p>Biography of instructor/staff member #2</p>\n <p>Biography of instructor/staff member #2</p>\n
......
lms/djangoapps/courseware/features/problems_setup.py
...@@ -170,7 +170,7 @@ PROBLEM_DICT = { ...@@ -170,7 +170,7 @@ PROBLEM_DICT = {
'image': { 'image': {
'factory': ImageResponseXMLFactory(), 'factory': ImageResponseXMLFactory(),
'kwargs': { 'kwargs': {
'src': '/static/images/mit_dome.jpg', 'src': '/static/images/placeholder-image.png',
'rectangle': '(50,50)-(100,100)' 'rectangle': '(50,50)-(100,100)'
}, },
'correct': ['span.correct'], 'correct': ['span.correct'],
......
lms/static/sass/discussion/_discussion.scss
...@@ -715,7 +715,7 @@ body.discussion { ...@@ -715,7 +715,7 @@ body.discussion {
} }
.loading-animation { .loading-animation {
background-image: url(../images/spinner-on-grey.gif); background-image: url(../images/spinner.gif);
} }
.discussion-show { .discussion-show {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment