From ddaed5929b5773d4026280f6a07d58c0b86d14f9 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Thu, 1 Sep 2016 18:47:16 +0200 Subject: [PATCH] Naming of sidebars --- app/views/exercises/_editor_file_tree.html.slim | 4 ++-- app/views/exercises/_editor_output.html.slim | 4 ++-- config/locales/de.yml | 6 ++++-- config/locales/en.yml | 6 ++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/views/exercises/_editor_file_tree.html.slim b/app/views/exercises/_editor_file_tree.html.slim index 306342e6..aa2eb35d 100644 --- a/app/views/exercises/_editor_file_tree.html.slim +++ b/app/views/exercises/_editor_file_tree.html.slim @@ -1,5 +1,5 @@ div id='sidebar-collapsed' class=(@exercise.hide_file_tree ? '' : 'hidden') - = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus-square', id: 'sidebar-collapse-collapsed', label:'', title:t('exercises.editor.expand_sidebar')) + = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus-square', id: 'sidebar-collapse-collapsed', label:'', title:t('exercises.editor.expand_action_sidebar')) - if @exercise.allow_file_creation and not @exercise.hide_file_tree? = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', data: {:'data-cause' => 'file', :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-plus', id: 'create-file-collapsed', label:'', title: t('exercises.editor.create_file')) @@ -8,7 +8,7 @@ div id='sidebar-collapsed' class=(@exercise.hide_file_tree ? '' : 'hidden') = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', data: {:'data-message-confirm' => t('exercises.editor.confirm_start_over'), :'data-url' => reload_exercise_path(@exercise), :'data-toggle' => 'tooltip', :'data-placement' => 'right'}, icon: 'fa fa-history', id: 'start-over-collapsed', label:'', title: t('exercises.editor.start_over')) div id='sidebar-uncollapsed' class=(@exercise.hide_file_tree ? 'hidden' : '') - = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', icon: 'fa fa-minus-square', id: 'sidebar-collapse', label: t('exercises.editor.collapse_sidebar')) + = render('editor_button', classes: 'btn-block btn-primary btn-sm enforce-top-margin', icon: 'fa fa-minus-square', id: 'sidebar-collapse', label: t('exercises.editor.collapse_action_sidebar')) div class=(@exercise.hide_file_tree ? 'hidden' : '') hr diff --git a/app/views/exercises/_editor_output.html.slim b/app/views/exercises/_editor_output.html.slim index d084fb63..f470c870 100644 --- a/app/views/exercises/_editor_output.html.slim +++ b/app/views/exercises/_editor_output.html.slim @@ -1,8 +1,8 @@ div id='output_sidebar_collapsed' - = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'left'}, title: t('exercises.editor.expand_sidebar'), icon: 'fa fa-plus-square', id: 'toggle-sidebar-output-collapsed', label: '') + = render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'left'}, title: t('exercises.editor.expand_output_sidebar'), icon: 'fa fa-plus-square', id: 'toggle-sidebar-output-collapsed', label: '') div id='output_sidebar_uncollapsed' class='hidden col-sm-12' data-message-no-output=t('exercises.implement.no_output') .row - = render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_sidebar')) + = render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_output_sidebar')) div.enforce-big-top-margin #turtlediv canvas#turtlecanvas.hidden width=400 height=400 style='border-style:solid;border-width:thin' diff --git a/config/locales/de.yml b/config/locales/de.yml index 76935b93..b12db0ad 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -188,6 +188,8 @@ de: worktime: Durchschnittliche Arbeitszeit exercises: editor: + collapse_action_sidebar: Aktions-Leiste Einklappen + collapse_output_sidebar: Ausgabe-Leiste Einklappen confirm_start_over: Wollen Sie wirklich von vorne anfangen? confirm_submit: Wollen Sie Ihren Code wirklich zur Bewertung abgeben? create_file: Neue Datei @@ -195,6 +197,8 @@ de: destroy_file: Datei löschen download: Herunterladen dummy: Keine Aktion + expand_action_sidebar: Aktions-Leiste Ausklappen + expand_output_sidebar: Ausgabe-Leiste Ausklappen input: Ihre Eingabe lastsaved: 'Zuletzt gespeichert: ' network: 'Während Ihr Code läuft, ist Port %{port} unter folgender Adresse erreichbar: %{address}.' @@ -204,8 +208,6 @@ de: run_success: Ihr Code wurde auf der Plattform ausgeführt. requestComments: Kommentare erbitten requestCommentsTooltip: Wenn du Hilfe mit deinem Code benötigst, kannst dir hier Kommentare erbitten - collapse_sidebar: Sidebar einklappen - expand_sidebar: Sidebar ausklappen save: Speichern score: Bewerten send: Senden diff --git a/config/locales/en.yml b/config/locales/en.yml index 85266025..b70997e3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -188,6 +188,8 @@ en: worktime: Average Working Time exercises: editor: + collapse_action_sidebar: Collapse Action Sidebar + collapse_output_sidebar: Collapse Output Sidebar confirm_start_over: Do you really want to start over? confirm_submit: Do you really want to submit your code for grading? create_file: New File @@ -195,6 +197,8 @@ en: destroy_file: Delete File download: Download dummy: No Action + expand_action_sidebar: Expand Action Sidebar + expand_output_sidebar: Expand Output Sidebar input: Your input lastsaved: 'Last saved: ' network: 'While your code is running, port %{port} is accessible using the following address: %{address}.' @@ -204,8 +208,6 @@ en: run_success: Your code was run on our servers. requestComments: Request comments requestCommentsTooltip: If you need help with your code, you can now request comments here! - collapse_sidebar: Collapse sidebar - expand_sidebar: Expand sidebar save: Save score: Score send: Send