Commit Graph

67 Commits

Author SHA1 Message Date
cahrens
3aa7a313fc Move file to common directory.
It is needed by both Studio and LMS.
TNL-4642

x
2016-05-30 12:43:46 -04:00
Toby Lawrence
7efd8773fb Adding optimized images in batches [10/19] 2016-01-13 20:38:40 -05:00
Toby Lawrence
f18b2a7fe2 Adding optimized images in batches [09/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
10e9517de2 Adding optimized images in batches [08/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
3824f0a68c Adding optimized images in batches [07/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
fc0775be2b Adding optimized images in batches [06/19] 2016-01-13 20:38:38 -05:00
Toby Lawrence
451b0a9c66 Revert "Crush down images."
This reverts commit 8402be3b20.
2016-01-13 19:12:13 -05:00
Toby Lawrence
8402be3b20 Crush down images.
Ran these suckers through ImageOptim, which crunched 'em down real nice.
2016-01-13 18:29:00 -05:00
Calen Pennington
ed12c61dd0 Shrink images using trimage
.../static/images/capa/vsepr/T-shaped-3D-balls.png | Bin 57074 -> 53926 bytes
 .../images/capa/vsepr/Tetrahedral-3D-balls.png     | Bin 53631 -> 48796 bytes
 .../static/images/capa/vsepr/Trigonal-3D-balls.png | Bin 56071 -> 51879 bytes
 .../capa/vsepr/Trigonal-bipyramidal-3D-balls.png   | Bin 47683 -> 43395 bytes
 .../images/capa/vsepr/Trigonal-planar-stick.png    | Bin 89521 -> 69265 bytes
 common/static/images/hd.png                        | Bin 364 -> 355 bytes
 common/static/images/high_pass_filter.png          | Bin 48150 -> 26132 bytes
 common/static/images/ico-tinymce-code.png          | Bin 337 -> 228 bytes
 common/static/images/ml_grading_icon.png           | Bin 405 -> 379 bytes
 common/static/images/partially-correct-icon.png    | Bin 1141 -> 1047 bytes
 common/static/images/peer_grading_icon.png         | Bin 610 -> 472 bytes
 common/static/images/placeholder-faculty.png       | Bin 9137 -> 9130 bytes
 common/static/images/placeholder-image.png         | Bin 2312412 -> 1930682 bytes
 .../static/images/sequence-nav/list-finished.png   | Bin 1063 -> 139 bytes
 .../static/images/sequence-nav/list-unfinished.png | Bin 1070 -> 142 bytes
 .../static/images/sequence-nav/list-unstarted.png  | Bin 1067 -> 142 bytes
 common/static/images/sequence-nav/next-icon.png    | Bin 1079 -> 264 bytes
 .../static/images/sequence-nav/previous-icon.png   | Bin 1062 -> 256 bytes
 common/static/images/voltage_divider.png           | Bin 27331 -> 13855 bytes
 common/static/js/capa/genex/images/circles.png     | Bin 1492 -> 974 bytes
 common/static/js/capa/genex/images/circles_ie6.png | Bin 432 -> 358 bytes
 common/static/js/capa/genex/images/corner.png      | Bin 1140 -> 709 bytes
 common/static/js/capa/genex/images/corner_ie6.png  | Bin 412 -> 328 bytes
 common/static/js/capa/genex/images/hborder.png     | Bin 1995 -> 1205 bytes
 common/static/js/capa/genex/images/hborder_ie6.png | Bin 706 -> 607 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
2016-01-07 10:48:35 -05:00
Calen Pennington
1a97c72f75 Shrink images using trimage
common/static/images/capa/vsepr/AX2E2-3D-balls.png  | Bin 80754 -> 74749 bytes
 common/static/images/capa/vsepr/AX2E3-3D-balls.png  | Bin 79137 -> 73373 bytes
 common/static/images/capa/vsepr/AX3E0-3D-balls.png  | Bin 65304 -> 58931 bytes
 common/static/images/capa/vsepr/AX3E1-3D-balls.png  | Bin 63627 -> 57952 bytes
 common/static/images/capa/vsepr/AX3E2-3D-balls.png  | Bin 67530 -> 63447 bytes
 common/static/images/capa/vsepr/AX4E0-3D-balls.png  | Bin 52642 -> 47395 bytes
 common/static/images/capa/vsepr/AX4E1-3D-balls.png  | Bin 76179 -> 70045 bytes
 common/static/images/capa/vsepr/AX4E2-3D-balls.png  | Bin 87475 -> 80027 bytes
 common/static/images/capa/vsepr/AX5E1-3D-balls.png  | Bin 72517 -> 65354 bytes
 common/static/images/capa/vsepr/AX5E2-3D-balls.png  | Bin 81700 -> 74925 bytes
 common/static/images/capa/vsepr/AX6E0-3D-balls.png  | Bin 58834 -> 52799 bytes
 common/static/images/capa/vsepr/AX6E1-3D-balls.png  | Bin 65374 -> 60540 bytes
 common/static/images/capa/vsepr/AX7E0-3D-balls.png  | Bin 57532 -> 52260 bytes
 common/static/images/capa/vsepr/AX8E0-3D-balls.png  | Bin 72760 -> 66708 bytes
 common/static/images/capa/vsepr/AX9E0-3D-balls.png  | Bin 70859 -> 64089 bytes
 common/static/images/capa/vsepr/Bent-3D-balls.png   | Bin 62092 -> 56501 bytes
 common/static/images/capa/vsepr/Linear-3D-balls.png | Bin 44902 -> 42863 bytes
 .../images/capa/vsepr/Octahedral-3D-balls.png       | Bin 62223 -> 56735 bytes
 .../capa/vsepr/Pentagonal-bipyramidal-3D-balls.png  | Bin 61456 -> 55610 bytes
 .../capa/vsepr/Pentagonal-planar-3D-balls.png       | Bin 72626 -> 65949 bytes
 .../capa/vsepr/Pentagonal-pyramidal-3D-balls.png    | Bin 71485 -> 64805 bytes
 .../static/images/capa/vsepr/Pyramidal-3D-balls.png | Bin 63322 -> 58066 bytes
 common/static/images/capa/vsepr/Seesaw-3D-balls.png | Bin 66832 -> 61761 bytes
 .../capa/vsepr/Square-antiprismatic-3D-balls.png    | Bin 88977 -> 80249 bytes
 .../images/capa/vsepr/Square-planar-3D-balls.png    | Bin 71351 -> 65996 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
2016-01-07 10:48:35 -05:00
Calen Pennington
dbffd5d686 Shrink images using trimage
common/static/css/vendor/slickgrid/images/help.png  | Bin 345 -> 334 bytes
 .../static/css/vendor/slickgrid/images/stripes.png  | Bin 1125 -> 88 bytes
 .../images/ui-bg_flat_0_aaaaaa_40x100.png           | Bin 180 -> 86 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png          | Bin 178 -> 86 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin 105 -> 97 bytes
 .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 86 bytes
 .../smoothness/images/ui-icons_222222_256x240.png   | Bin 4369 -> 3714 bytes
 .../smoothness/images/ui-icons_2e83ff_256x240.png   | Bin 4369 -> 3714 bytes
 .../smoothness/images/ui-icons_454545_256x240.png   | Bin 4369 -> 3714 bytes
 .../smoothness/images/ui-icons_888888_256x240.png   | Bin 4369 -> 3714 bytes
 .../smoothness/images/ui-icons_cd0a0a_256x240.png   | Bin 4369 -> 3714 bytes
 .../ui-bg_diagonals-thick_18_b81900_40x40.png       | Bin 260 -> 136 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png       | Bin 251 -> 136 bytes
 .../images/ui-bg_flat_10_000000_40x100.png          | Bin 178 -> 86 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin 105 -> 97 bytes
 .../images/ui-bg_gloss-wave_35_f6a828_500x100.png   | Bin 3762 -> 1756 bytes
 .../ui-lightness/images/ui-icons_222222_256x240.png | Bin 4369 -> 3714 bytes
 .../ui-lightness/images/ui-icons_228ef1_256x240.png | Bin 4369 -> 3714 bytes
 .../ui-lightness/images/ui-icons_ef8c08_256x240.png | Bin 4369 -> 3714 bytes
 .../ui-lightness/images/ui-icons_ffd27a_256x240.png | Bin 4369 -> 3714 bytes
 .../ui-lightness/images/ui-icons_ffffff_256x240.png | Bin 4369 -> 3714 bytes
 common/static/images/arrow-left.png                 | Bin 1062 -> 256 bytes
 common/static/images/arrow-right.png                | Bin 1079 -> 264 bytes
 common/static/images/capa/vsepr/AX2E0-3D-balls.png  | Bin 32790 -> 30318 bytes
 common/static/images/capa/vsepr/AX2E1-3D-balls.png  | Bin 61843 -> 57213 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
2016-01-07 10:48:33 -05:00
stv
0532b87a86 Remove ORA1 images 2015-12-11 15:07:07 -05:00
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -05:00
Colin-Fredericks
350387c0a9 TNL-3197 Partial Credit (not Dropdown)
Updated templates

Updating responsetype tests.

Updating other tests for PC

Putting OptionInput back the way it was.

Acceptance tests for partial credit

Testing tools

pep8

scss name fix

Missing }

icon fix

icon fix
2015-09-22 13:20:39 -04:00
Syed Hassan Raza
f82662356f Revert "OSPR-535 Partial Credit"
This reverts commit 7624c63362.
2015-09-01 14:04:42 -04:00
Colin-Fredericks
7624c63362 OSPR-535 Partial Credit
Squashed commit of the following:

commit 0f7c2af5f7b8caed575dd253a45299293b2729d7
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 12:04:43 2015 -0400

    Forgot icon

commit b48970392741130f774709c54eb6e5ab0089812c
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 11:49:57 2015 -0400

    OSPR-535 Partial Credit

    Squashed commit of the following:

    commit 6dd34f58f994e32d0d54bf1d67bffd04e0f8ef08
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:44:01 2015 -0400

        Fixing accidental overwrite.

    commit 1ff8fc4b0e83b90356e8e8dce1022f49bfd162cf
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:18:36 2015 -0400

        OSPR-535 Partial Credit

        Revised after first pull discussion.

Fixing scss typos

Fixing check/x display problem

Empty set is not []

Shuffling empty answer code to grade properly.

I don't think I ever wrote this in the first place...

Adding tests for MC and Checkbox

including proper partial-credit marking and scoring

Numerical and OptionResponse tests

Also a few improvements to NumericalResponse problem type and
exception-raising.

CustomResponse tests and more numerical tests

Increasing coverage and fixing typos

Exception added for pylint false positive

Hopefully fixing coverage issue

Retabulating line continuation

Bok Choy test for partial credit

Copypasta fix

Adding tooltip for partial credit

Improving and expanding comments

Minor fixes
2015-08-20 11:18:13 -04:00
Sarina Canelake
25a117613d Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit"
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
2015-08-19 11:07:14 -04:00
Colin-Fredericks
c940814c8c OSPR-535 Partial Credit
Squashed commit of the following:

commit 0f7c2af5f7b8caed575dd253a45299293b2729d7
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 12:04:43 2015 -0400

    Forgot icon

commit b48970392741130f774709c54eb6e5ab0089812c
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 11:49:57 2015 -0400

    OSPR-535 Partial Credit

    Squashed commit of the following:

    commit 6dd34f58f994e32d0d54bf1d67bffd04e0f8ef08
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:44:01 2015 -0400

        Fixing accidental overwrite.

    commit 1ff8fc4b0e83b90356e8e8dce1022f49bfd162cf
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:18:36 2015 -0400

        OSPR-535 Partial Credit

        Revised after first pull discussion.

Fixing scss typos

Fixing check/x display problem

Empty set is not []

Shuffling empty answer code to grade properly.

I don't think I ever wrote this in the first place...

Adding tests for MC and Checkbox

including proper partial-credit marking and scoring

Numerical and OptionResponse tests

Also a few improvements to NumericalResponse problem type and
exception-raising.

CustomResponse tests and more numerical tests

Increasing coverage and fixing typos

Exception added for pylint false positive

Hopefully fixing coverage issue

Retabulating line continuation

Bok Choy test for partial credit

Copypasta fix

Adding tooltip for partial credit

Improving and expanding comments

Minor fixes
2015-08-10 10:58:50 -04:00
Sarina Canelake
e1dc0f5cdc Remove unused common image 2015-03-06 13:05:03 -05:00
David Baumgold
96d86e4e17 Placeholder image for Open edX Studio logo, when not running on edx.org 2015-01-08 12:42:26 -05:00
Sarina Canelake
db09c5529f Replace 'mit_dome.jpg' and 'simple_graph.png' with a default placeholder image 2014-12-09 22:28:09 -05:00
Sarina Canelake
7779f742c9 Rename pl-faculty.png to placeholder-faculty.png
OPEN-328
2014-12-09 22:28:09 -05:00
Sarina Canelake
5106710d13 Move wiki icons to the LMS, where they are used
OPEN-328
2014-12-09 22:28:08 -05:00
Sarina Canelake
0c535e44d5 Remove duplicate image files
spinner.gif and spinner-on-grey.gif are the same file.
Explicitly give the LMS a spinner.gif file.

OPEN-328
2014-12-09 22:28:08 -05:00
Sarina Canelake
f5588ed4fe Remove image that is duplicated in LMS and CMS
OPEN-328
2014-12-09 22:28:08 -05:00
Sarina Canelake
a790d9f8fb Move images from common to LMS that are only used in LMS
OPEN-328
2014-12-09 22:28:08 -05:00
Sarina Canelake
4e9bf5e104 Last reference removed in 3b2c970248 [OPEN-299] 2014-11-07 09:50:45 -05:00
Sarina Canelake
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -05:00
David Baumgold
1b49dd0e6d Deleted some unused images under common 2014-10-30 13:49:45 -04:00
Abdallah
fe847720ea Upgrade to TinyMCE 4.0.16.
Detailed commit messages:
deleted old tinymce

new tinymce
js changes to support new tinymce
scss changes for alignments

Include all the controls on the toolbar that we previously had.

Changes to support Bulk e-mail usage.

adding new studio skin for TinyMCE4

Get handling of static image links working again.

Delete old Studio skin.

Version 1.3 of CodeMirror plugin.

Modify paths for location of CodeMirror files.

Fire events when CodeMirror Editor is open and closed.

Needed to switch static links back and forth.

Remove CodeMirror tabbed editor.

fixed tinymce visual editor css

Change how we detect that an image has been inserted.

made the codemirror look more studio-like

reordered the tinymce buttons

Update unit tests.

Update acceptance test for image plugin.

Make sure to strip out temporary caret.

It can get left behind in style blocks.

Test for style block being maintained.

Allow TinyMCE to create p's, else formatting doesn't work.

Add tests for toolbar buttons and converting links.

Add test for code format toolbar button.

Remove unnecessary code.

Remove unused testing templates and unused tabs.

Update tinymce paths.

Fire an event with the link plugin closes so we can rewrite links.

pep8

Updates from code review.

Change the name of the button to "Edit HTML".

Changed menu name for consistency, but we don't show it.

Changed name of "code" toolbar button to "Code block".

Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422

Fire events before and after the image dialog is shown.

We use this to rewrite links.

Change the event handling for image plugin.

Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).

Code review feedback.

Fire events before and after the link dialog is shown.

This allows us to convert the static links.

Remove unnecessary helper method.

keeping the component editor inside the component window

Use compressed CodeMirror file.

replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar

Change code editor icon to say HTML.

Move code style block button.

Update tests for minor UI changes.

Code editor button no longer shows an icon, and code style toolbar button location has moved.

Fix typos.
2014-04-02 10:35:27 -04:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE.
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
2014-03-26 11:06:59 -04:00
Frances Botsford
ed51a664f4 replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar 2014-03-24 09:42:12 -04:00
Julia Hansbrough
48e35d8da2 Removed unused image 2014-02-12 21:49:05 +00:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
Fix/btalbot/studio courseinfo
2013-04-30 13:34:52 -07:00
Christina Roberts
4c97f92245 Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images
add more images to support templates
2013-04-30 09:50:41 -07:00
Chris Dodge
c5d520574d also move the MIT dome image in Latex to be in our source pack 2013-04-30 12:02:58 -04:00
Chris Dodge
1f1a6e3ec5 add more images to support templates 2013-04-30 11:46:49 -04:00
Chris Dodge
02ed9f26c4 add dependent image for the image response template 2013-04-30 10:07:42 -04:00
Brian Talbot
a861c8b310 revised placeholder course and faculty images - more opacity to reinforce placeholderness 2013-04-29 16:03:00 -04:00
Brian Talbot
4e251a3b19 adding in placeholder images for a course and its faculty 2013-04-29 15:38:55 -04:00
Arthur Barrett
44a68e6903 added partially correct icon from marco 2013-02-27 14:36:14 -05:00
Vik Paruchuri
46da4cf241 Add in a better notification icon 2013-02-09 10:15:11 -05:00
Vik Paruchuri
0feb8f66bc Fix colors on legend, add random assessment 2013-02-08 23:59:39 -05:00
Vik Paruchuri
4973363353 Attach images to rubric to indicate which graders scored what 2013-02-07 18:35:09 -05:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
Conflicts:
	cms/static/css/tiny-mce.css
2013-01-22 16:15:27 -05:00
cahrens
b554eb5afe Cleanup of format dropdown, toolbar buttons. 2013-01-22 15:28:47 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Valera Rozuvan
545b1bea24 Slight changes to UI design. 2013-01-21 15:55:45 +02:00