Skip to content

Sidebar text for Content Library page in Studio - #6426

Merged
catong merged 2 commits into
content-librariesfrom
carol/CL_library_SidebarText
Jan 6, 2015
Merged

Sidebar text for Content Library page in Studio#6426
catong merged 2 commits into
content-librariesfrom
carol/CL_library_SidebarText

Conversation

@catong

@catong catong commented Dec 31, 2014

Copy link
Copy Markdown
Contributor

@antoviaque @marcotuts @bradenmacdonald @e-kolpakov
This PR contains updated text for the Content Libraries page in Studio. Please review and let me know if I need to correct anything.

Comment thread cms/templates/library.html Outdated

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.

Currently we also still need to add library_content to advanced settings, to be able to add it to a courseware section.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ah, yes, I should add that. Thanks @antoviaque

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.

You're welcome! Note that you will also need to rebase against the content-libraries branch, removing any commit that isn't yours from git rebase -i content-libraries, as the feature branch has been rebased against master since you originally created the PR.

@antoviaque

Copy link
Copy Markdown
Contributor

👍 besides my comment. Also including @mtyaka to allow him to be aware of this change & review, he's the one working on the UI changes PR at https://github.com/edx/edx-platform/pull/6388

@bradenmacdonald

Copy link
Copy Markdown
Contributor

👍

@catong
catong force-pushed the carol/CL_library_SidebarText branch from 6cf51e2 to d494ce3 Compare January 5, 2015 19:18
@catong

catong commented Jan 5, 2015

Copy link
Copy Markdown
Contributor Author

Rebased with @antoviaque's help. @mtyaka pls let me know if you have any comments before I merge? Thanks!

@marcotuts

Copy link
Copy Markdown
Contributor

👍

@mtyaka

mtyaka commented Jan 6, 2015

Copy link
Copy Markdown
Contributor

👍 Looks good @catong

@catong

catong commented Jan 6, 2015

Copy link
Copy Markdown
Contributor Author

catong added a commit that referenced this pull request Jan 6, 2015
Sidebar text for Content Library page in Studio
@catong
catong merged commit 77a9a2f into content-libraries Jan 6, 2015
@bradenmacdonald
bradenmacdonald deleted the carol/CL_library_SidebarText branch January 6, 2015 22:34
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.

5 participants