From 4133740a2fb28b9c8916afa0713a0de77b4cbd20 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Fri, 6 Mar 2015 12:44:39 -0500 Subject: [PATCH 1/3] Add default logo to Studio --- cms/static/images/default-theme/logo.png | Bin 0 -> 4243 bytes cms/templates/widgets/header.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 cms/static/images/default-theme/logo.png diff --git a/cms/static/images/default-theme/logo.png b/cms/static/images/default-theme/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..94099e36507aaa769236d86c65682c934b00c390 GIT binary patch literal 4243 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 % else: - ${settings.STUDIO_NAME} + ${settings.STUDIO_NAME} % endif From e1dc0f5cdc5ba34f0482e1fd197da891b121f1dd Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Fri, 6 Mar 2015 13:00:46 -0500 Subject: [PATCH 2/3] Remove unused common image --- common/static/images/logo-placeholder.png | Bin 4243 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 common/static/images/logo-placeholder.png diff --git a/common/static/images/logo-placeholder.png b/common/static/images/logo-placeholder.png deleted file mode 100644 index 94099e36507aaa769236d86c65682c934b00c390..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4243 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 Date: Fri, 6 Mar 2015 13:02:06 -0500 Subject: [PATCH 3/3] Abstract out platform name in default Wiki string --- lms/djangoapps/course_wiki/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/course_wiki/views.py b/lms/djangoapps/course_wiki/views.py index 3bcdfa1fe6..37e5594ab2 100644 --- a/lms/djangoapps/course_wiki/views.py +++ b/lms/djangoapps/course_wiki/views.py @@ -125,7 +125,7 @@ def get_or_create_root(): pass starting_content = "\n".join(( - _("Welcome to the edX Wiki"), + _("Welcome to the {platform_name} Wiki").format(platform_name=settings.PLATFORM_NAME), "===", _("Visit a course wiki to add an article."), ))