Skip to content

Feature/christina/metadata ui - #11

Merged
cahrens merged 154 commits into
masterfrom
feature/christina/metadata-ui
Jun 1, 2013
Merged

Feature/christina/metadata ui#11
cahrens merged 154 commits into
masterfrom
feature/christina/metadata-ui

Conversation

@cahrens

@cahrens cahrens commented May 31, 2013

Copy link
Copy Markdown

I am ready for folks to start code reviewing my pull request. Since there are 69 files in the pull request, I have split them up into categories. Please look for the category or categories with your name. Please review by Friday of this week (or let me know if you cannot do the review).

To try out the feature, pull the branch and try creating/editing components (on the unit page) in Studio. There should be a "Settings" view to the components, where you can edit the metadata.

If you have any questions, let me know and we can go over the changes together.

Thanks!

Christina

Lettuce integration tests (Jay, DB if interested)

  1. component_settings_editor_helpers.py
  2. discussion-editor.feature
  3. discussion-editor.py
  4. html-editor.feature
  5. html-editor.py
  6. problem-editor.feature
  7. problem-editor.py
  8. video-editor.feature
  9. video-editor.py

Jasmine unit tests (Jay, DB)

  1. cms/envs/common.py
  2. cms/static/coffee/fixtures/metadata-editor.underscore (symlink)
  3. cms/static/coffee/fixtures/metadata-number-entry.underscore (symlink)
  4. cms/static/coffee/fixtures/metadata-option-entry.underscore (symlink)
  5. cms/static/coffee/fixtures/metadata-string-entry.underscore (symlink)
  6. main_spec.coffee
  7. metadata_spec.coffee
  8. feedback_spec.coffee
  9. metadata_edit_spec.coffee
  10. module_edit_spec.coffee (module_edit used to determine which metadata fields had changed, but now it is the metadata editor)
  11. section_spec.coffee

New JavaScript/HTML (DB, Don) and updates to metadata fields

  1. module_edit.coffee
  2. metadata_model.js
  3. metadata_editor_view.js
  4. component.html
  5. cms/templates/js/metadata-editor.underscore
  6. cms/templates/js/metadata-number-entry.underscore
  7. cms/templates/js/metadata-option-entry.underscore
  8. cms/templates/js/metadata-string-entry.underscore
  9. html-edit.html
  10. metadata-edit.html
  11. problem-edit.html
  12. raw-edit.html
  13. sequence-edit.html (really an unused file)
  14. capa_module.py
  15. discussion_module.py
  16. test_xml_module.py
  17. x_module.py

CSS (Brian)

  1. _forms.scss
  2. _settings.scss
  3. _static-pages.scss
  4. _unit.scss
  5. _updates.scss
  6. common/lib/xmodule/xmodule/css/editor/edit.scss
  7. common/lib/xmodule/xmodule/css/problem/edit.scss
  8. number-polyfill.css
  9. number-polyfill.js
  10. tiny_mce/themes/advanced/skins/studio/ui.css

Cleanup of templates (Don)

  1. component.py (empty no longer used)
  2. unit.html (empty no longer used)
  3. xmodule_namespace.py
  4. templates/html/empty.yaml
  5. templates/problem/circuitschematic.yaml
  6. templates/problem/customgrader.yaml
  7. templates/problem/empty.yaml
  8. templates/problem/emptyadvanced.yaml
  9. templates/problem/forumularesponse.yaml
  10. templates/problem/imageresponse.yaml
  11. templates/problem/multiplechoice.yaml
  12. templates/problem/numericalresponse.yaml
  13. templates/problem/optionresponse.yaml
  14. templates/problem/string_response.yaml
    See also yaml files listed below (openended, peer grading, word cloud)

Openended and peer grading (Vik)

  1. open-ended-edit.html
  2. combined_open_ended_module.py
  3. peer_grading_module.py
  4. templates/combinedopenended/default.yaml
  5. templates/peer_grading/default.yaml

Wordcloud (Alex)

  1. templates/word_cloud/default.yaml
  2. word_cloud_module.py
  3. test_import.py

marcotuts and others added 30 commits April 29, 2013 10:18
… well as examples for dropdown case and extra logic required there
…l as is-set mode styling. no js behavior in yet. adds overscoll fix for webkit
…ms, fonts, colors, etc; currently open select box issue on chrome
…, etc standards. also opted to try out initial pass at hierarchy splitting of css classes on items that repeat (li, for example)
@VikParuchuri

Copy link
Copy Markdown
Contributor

@cahrens 👍

@auraz

auraz commented May 31, 2013

Copy link
Copy Markdown
Contributor

@cahrens

  1. Created word cloud in studio - all fine
  2. Looking word cloud in lms - fine
  3. rake tests - OK

Good to go.

Bug that i found, is not reproducible, do not mind.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not move this into defaults too?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

max_grade isn't being exposed in the UI. I didn't try to move settings that I wasn't touching. I'll let you do that. :)

@cahrens

cahrens commented May 31, 2013

Copy link
Copy Markdown
Author

Note somewhat for myself (to remember on Monday). Ran all the CMS acceptance tests and they passed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this is rendering the template, which really belongs in the render method. Also, why is it appending to this.$el, instead of replacing its HTML?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it to set the HTML. I didn't put this in the render method because the template itself doesn't need to re-render each time. But perhaps that it is too much of an optimization? We can chat on Monday at the lunch-and-learn, and I can always change it later.

@singingwolfboy

Copy link
Copy Markdown
Contributor

Just nitpicks from me -- nothing that would block this from being merged. Go for it.

cahrens pushed a commit that referenced this pull request Jun 1, 2013
@cahrens
cahrens merged commit 52b76c8 into master Jun 1, 2013
@cahrens
cahrens deleted the feature/christina/metadata-ui branch June 1, 2013 23:01
martynovp referenced this pull request in miptliot/edx-platform Aug 19, 2015
ooduye pushed a commit to ooduye/edx-platform that referenced this pull request May 5, 2016
* remotes/tosin/tandc:
  [#118162721] set t and c URL to point to '/legal'
mumarkhan999 pushed a commit to mumarkhan999/edx-platform that referenced this pull request Mar 4, 2019
…icked

Implement edx.ui.lms.link_clicked transformer with currently available data attributes.
pomegranited referenced this pull request in edx-olive/edx-platform-old May 8, 2019
Adds the Studio version of the compiled static JS translation files
lpm0073 added a commit to grid-synergy/edx-platform that referenced this pull request Apr 27, 2021
yasir1brahim pushed a commit to yasir1brahim/edx-platform that referenced this pull request May 4, 2021
Change notification API response format

Approved-by: Oksana Slusarenko
Sujeet1379 pushed a commit to chandrudev/edx-platform that referenced this pull request Nov 17, 2022
* feat: add bookmarking for units

* refactor: add redux for state management
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants