From ab5da97c4144302b7d436f5a08fb09076c3a39c9 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Fri, 7 Nov 2014 12:56:35 -0500 Subject: [PATCH 1/2] Consistently name edX branded elements within the LMS [OPEN-300] --- ...ccount.png => edx-background-banner-account.png} | Bin lms/static/images/{edx_bw.png => edx-logo-bw.png} | Bin ...-logo-tag-dark.png => openedx-logo-tag-dark.png} | Bin ...ogo-tag-light.png => openedx-logo-tag-light.png} | Bin ...dx-openedx-logo-tag.png => openedx-logo-tag.png} | Bin lms/static/sass/base/_variables.scss | 6 +++--- lms/templates/courseware/courses.html | 5 +++-- lms/templates/footer.html | 6 +++--- 8 files changed, 9 insertions(+), 8 deletions(-) rename lms/static/images/{bg-banner-account.png => edx-background-banner-account.png} (100%) rename lms/static/images/{edx_bw.png => edx-logo-bw.png} (100%) rename lms/static/images/{edx-openedx-logo-tag-dark.png => openedx-logo-tag-dark.png} (100%) rename lms/static/images/{edx-openedx-logo-tag-light.png => openedx-logo-tag-light.png} (100%) rename lms/static/images/{edx-openedx-logo-tag.png => openedx-logo-tag.png} (100%) diff --git a/lms/static/images/bg-banner-account.png b/lms/static/images/edx-background-banner-account.png similarity index 100% rename from lms/static/images/bg-banner-account.png rename to lms/static/images/edx-background-banner-account.png diff --git a/lms/static/images/edx_bw.png b/lms/static/images/edx-logo-bw.png similarity index 100% rename from lms/static/images/edx_bw.png rename to lms/static/images/edx-logo-bw.png diff --git a/lms/static/images/edx-openedx-logo-tag-dark.png b/lms/static/images/openedx-logo-tag-dark.png similarity index 100% rename from lms/static/images/edx-openedx-logo-tag-dark.png rename to lms/static/images/openedx-logo-tag-dark.png diff --git a/lms/static/images/edx-openedx-logo-tag-light.png b/lms/static/images/openedx-logo-tag-light.png similarity index 100% rename from lms/static/images/edx-openedx-logo-tag-light.png rename to lms/static/images/openedx-logo-tag-light.png diff --git a/lms/static/images/edx-openedx-logo-tag.png b/lms/static/images/openedx-logo-tag.png similarity index 100% rename from lms/static/images/edx-openedx-logo-tag.png rename to lms/static/images/openedx-logo-tag.png diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 546af6040f..c32f5e9eab 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -402,9 +402,9 @@ $homepage__header--background: lighten($blue, 15%); // IMAGES: backgrounds $homepage-bg-image: none; -$login-banner-image: url(../images/bg-banner-account.png); -$register-banner-image: url(../images/bg-banner-account.png); -$passwordreset-banner-image: url(../images/bg-banner-account.png); +$login-banner-image: url(../images/edx-background-banner-account.png); +$register-banner-image: url(../images/edx-background-banner-account.png); +$passwordreset-banner-image: url(../images/edx-background-banner-account.png); $video-thumb-url: '../images/homepage-hero-video-thumb.jpg'; diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index f2bb34d6de..9f5d2b1ef1 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -11,11 +11,12 @@ <% course_index_overlay_text = microsite.get_value('course_index_overlay_text', _("Explore free courses from leading universities.")) - # not sure why this is, but if I use static.url('images/edx_bw.png') then the HTML rendering + # not sure why this is, but if I use static.url('images/edx-logo-bw.png') then the HTML rendering # of this template goes wonky logo_file = microsite.get_value( - 'course_index_overlay_logo_file', settings.STATIC_URL + 'images/edx_bw.png') + 'course_index_overlay_logo_file', settings.STATIC_URL + 'images/edx-logo-bw.png' + ) %>
diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 4f32bb282d..e2b0b8d77b 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -65,11 +65,11 @@

## standard powered-by logo - Powered by Open edX + Powered by Open edX ## greyscale logo for dark background - ## Powered by Open edX + ## Powered by Open edX ## greyscale logo for light background - ## Powered by Open edX + ## Powered by Open edX

From ab54f9cf42f7dcfbdd73253714c57ab2a8c32205 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Mon, 10 Nov 2014 13:58:36 -0500 Subject: [PATCH 2/2] Translate "Powered by Open edX" string --- lms/templates/footer.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/templates/footer.html b/lms/templates/footer.html index e2b0b8d77b..dc03a078c9 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -65,11 +65,12 @@

## standard powered-by logo - Powered by Open edX + ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information. + ${_('Powered by Open edX')} ## greyscale logo for dark background - ## Powered by Open edX + ## ${_('Powered by Open edX')} ## greyscale logo for light background - ## Powered by Open edX + ## ${_('Powered by Open edX')}