From f58deb4c3c6a15e91229020870f03718390d2ec4 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 16 May 2013 15:42:29 -0400 Subject: [PATCH 1/3] removed latex compiler buttom from settings tab --- cms/static/sass/views/_unit.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 042a5dbdd6..2ee1d74cd9 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -971,4 +971,8 @@ body.unit { @include transition(opacity 0.25s ease-in-out); opacity: 1; } +} + +div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{ + display: none; } \ No newline at end of file From 29b77784619d2c1ae8b331adf9b1258071ad911d Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 16 May 2013 17:17:43 -0400 Subject: [PATCH 2/3] initial i18n changes to unit.html, component.html, and the individual setting type template files --- .../client_templates/advanced_entry.html | 3 +- .../metadata_number_entry.html | 5 +-- .../metadata_option_entry.html | 5 +-- .../metadata_string_entry.html | 5 +-- cms/static/sass/views/_unit.scss | 1 + cms/templates/component.html | 13 ++++---- cms/templates/unit.html | 31 ++++++++++--------- 7 files changed, 35 insertions(+), 28 deletions(-) diff --git a/cms/static/client_templates/advanced_entry.html b/cms/static/client_templates/advanced_entry.html index 6be22e2116..0a24be0f49 100644 --- a/cms/static/client_templates/advanced_entry.html +++ b/cms/static/client_templates/advanced_entry.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %>
  • @@ -5,7 +6,7 @@
    - +
    • \ No newline at end of file diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index df534135c7..5629b212dc 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,8 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %>
    -
    <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index d2053e497a..409bb94595 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %>
    -
    <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index 74d64d58af..bbad43f979 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -1,8 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %>
    -
    <%= model.get('help') %> diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 2ee1d74cd9..cb914e74f8 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -973,6 +973,7 @@ body.unit { } } +//hides latex compiler button if settings mode is-active div.wrapper-comp-editor.is-inactive + div.launch-latex-compiler{ display: none; } \ No newline at end of file diff --git a/cms/templates/component.html b/cms/templates/component.html index 54c62dcba9..9e7508ae08 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,13 +1,14 @@ +<%! from django.utils.translation import ugettext as _ %>
    @@ -18,15 +19,15 @@
    - Save - Cancel + ${_("Save")} + ${_("Cancel")}
    - Edit - Delete + ${_("Edit")} + ${_("Delete")}
    ${preview} diff --git a/cms/templates/unit.html b/cms/templates/unit.html index cb34f42a09..02a204b9ba 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,5 +1,6 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> +<%! from django.utils.translation import ugettext as _ %> <%namespace name="units" file="widgets/units.html" /> <%block name="title">Individual Unit <%block name="bodyclass">is-signedin course unit @@ -35,23 +36,23 @@
    -

    You are editing a draft. +

    ${_("You are editing a draft.")} % if published_date: This unit was originally published on ${published_date}. % endif

    - View the Live Version + ${_("View the Live Version")}
    % endfor @@ -135,13 +136,13 @@
    -

    Unit Settings

    +

    ${_("Unit Settings")}

    - +
    @@ -156,14 +157,14 @@ with the subsection "${subsection.display_name_with_default}"

    - Delete Draft - Preview - View Live + ${_("Delete Draft")} + ${_("Preview")} + ${_("View Live")}
    -

    Unit Location

    +

    ${_("Unit Location")}

      From 1f43fa163a1eec91f0d1d834dc421bd51d1fa7e9 Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 17 May 2013 10:29:24 -0400 Subject: [PATCH 3/3] internationalization stripped out --- .../client_templates/advanced_entry.html | 3 +- .../metadata_number_entry.html | 5 ++- .../metadata_option_entry.html | 5 ++- .../metadata_string_entry.html | 5 ++- cms/templates/component.html | 13 ++++---- cms/templates/unit.html | 31 +++++++++---------- 6 files changed, 28 insertions(+), 34 deletions(-) diff --git a/cms/static/client_templates/advanced_entry.html b/cms/static/client_templates/advanced_entry.html index 0a24be0f49..6be22e2116 100644 --- a/cms/static/client_templates/advanced_entry.html +++ b/cms/static/client_templates/advanced_entry.html @@ -1,4 +1,3 @@ -<%! from django.utils.translation import ugettext as _ %>
    1. @@ -6,7 +5,7 @@
      - +
      2. \ No newline at end of file diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html index 5629b212dc..df534135c7 100644 --- a/cms/static/client_templates/metadata_number_entry.html +++ b/cms/static/client_templates/metadata_number_entry.html @@ -1,9 +1,8 @@ -<%! from django.utils.translation import ugettext as _ %>
      -
      <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index 409bb94595..d2053e497a 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -1,4 +1,3 @@ -<%! from django.utils.translation import ugettext as _ %>
      -
      <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index bbad43f979..74d64d58af 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -1,9 +1,8 @@ -<%! from django.utils.translation import ugettext as _ %>
      -
      <%= model.get('help') %> diff --git a/cms/templates/component.html b/cms/templates/component.html index 9e7508ae08..54c62dcba9 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -1,14 +1,13 @@ -<%! from django.utils.translation import ugettext as _ %>
      @@ -19,15 +18,15 @@
      - ${_("Save")} - ${_("Cancel")} + Save + Cancel
    - ${_("Edit")} - ${_("Delete")} + Edit + Delete
    ${preview} diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 02a204b9ba..d34b9ac3f2 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,6 +1,5 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%! from django.utils.translation import ugettext as _ %> <%namespace name="units" file="widgets/units.html" /> <%block name="title">Individual Unit <%block name="bodyclass">is-signedin course unit @@ -36,23 +35,23 @@
    -

    ${_("You are editing a draft.")} +

    You are editing a draft. % if published_date: This unit was originally published on ${published_date}. % endif

    - ${_("View the Live Version")} + View the Live Version
    % endfor @@ -136,13 +135,13 @@
    -

    ${_("Unit Settings")}

    +

    Unit Settings

    - +
    @@ -157,14 +156,14 @@ with the subsection "${subsection.display_name_with_default}"

    - ${_("Delete Draft")} - ${_("Preview")} - ${_("View Live")} + Delete Draft + Preview + View Live
    -

    ${_("Unit Location")}

    +

    Unit Location