muikku-evaluation-plugin/src/main/resources/META-INF/resources/scripts/gui/evaluation-main.js

@@ -72,7 +72,7 @@
       this._loadOperations++;
       if (this._loadOperations == 1) {
         var loadingContainer = $('<div>')
-          .addClass('loading')
+          .addClass('loading') 
           .appendTo(target);
       }
     },

muikku-evaluation-plugin/src/main/resources/fi/otavanopisto/muikku/plugins/evaluation/EvaluationJsPluginMessages_en.properties

@@ -35,7 +35,7 @@ plugin.evaluation.assignmentEvaluationDialog.evaluation.successful = Assignment'
 plugin.evaluation.assignmentEvaluationDialog.evaluation.updateSuccessful = Updating assignment's evaluation was successful
 
 plugin.evaluation.evaluationRequestsTitle = Evaluation Requests
-plugin.evaluation.evaluationWellDone = Good job! There are no evaluation requests left, you handled them all!
+plugin.evaluation.evaluationWellDone = Good job! All evaluation requests are handled!
 
 plugin.evaluation.notifications.workspaceEvaluation.saveSuccessful = Workspace evaluated successfully
 plugin.evaluation.notifications.workspaceEvaluation.updateSuccessful = Workspace's evaluation updated successfully
@@ -75,4 +75,4 @@ plugin.evaluation.evaluationModal.assignmentEvaluationForm.cancelButtonLabel = C
 plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.title = Archive Student
 plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.description = Do you want to archive student <b>{0}</b> from the workspace?
 plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.buttonArchiveLabel = Yes, archive student
-plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.buttonNoLabel = No
+plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.buttonNoLabel = Cancel

muikku-evaluation-plugin/src/main/resources/fi/otavanopisto/muikku/plugins/evaluation/EvaluationJsPluginMessages_fi.properties

@@ -35,7 +35,7 @@ plugin.evaluation.assignmentEvaluationDialog.evaluation.successful = Teht
 plugin.evaluation.assignmentEvaluationDialog.evaluation.updateSuccessful = Tehtävän arvioinnin päivitys onnistui
 
 plugin.evaluation.evaluationRequestsTitle = Arviointipyynnöt
-plugin.evaluation.evaluationWellDone = Mahtavaa! Olet käsitellyt kaikki arviointipyynnöt!
+plugin.evaluation.evaluationWellDone = Mahtavaa! Kaikki arviointipyynnöt on käsitelty!
 
 plugin.evaluation.notifications.workspaceEvaluation.saveSuccessful = Kurssin arviointi tallennettu
 plugin.evaluation.notifications.workspaceEvaluation.updateSuccessful = Kurssin arvioinnin päivitys onnistui
@@ -75,4 +75,4 @@ plugin.evaluation.evaluationModal.assignmentEvaluationForm.cancelButtonLabel = P
 plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.title = Opiskelijan arkistointi
 plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.description = Haluatko arkistoida opiskelijan <b>{0}</b> työtilasta?
 plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.buttonArchiveLabel = Kyllä, arkistoi opiskelija
-plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.buttonNoLabel = En
+plugin.evaluation.evaluationModal.archiveStudent.confirmationDialog.buttonNoLabel = Peruuta

muikku/src/main/webapp/resources/theme-muikku/sass/flex/announcement-view.scss

@@ -1,6 +1,6 @@
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
 
 body { 
 

muikku/src/main/webapp/resources/theme-muikku/sass/flex/announcer.scss

@@ -1,7 +1,7 @@
-@import "_jquery.datepicker.scss";
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
+@import "jquery.datepicker.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
 
   /* announcer (.an-*) */
 

muikku/src/main/webapp/resources/theme-muikku/sass/flex/communicator.scss

@@ -1,6 +1,6 @@
-@import "_vars.scss";
-@import "_styles.scss";
-@import "_draft.scss";
+@import "vars.scss";
+@import "styles.scss";
+@import "draft.scss";
 
 .cm-message-create {
   width:100%;

muikku/src/main/webapp/resources/theme-muikku/sass/flex/coursepicker.scss

@@ -1,6 +1,6 @@
-@import "_vars.scss";
-@import "_animations.scss";
-@import "_styles.scss";
+@import "vars.scss";
+@import "animations.scss";
+@import "styles.scss";
 
 /* Coursepicker (.cp-*) */
 

muikku/src/main/webapp/resources/theme-muikku/sass/flex/custom-ckeditor-contentcss_management.scss

@@ -1,5 +1,5 @@
-@import "_custom-ckeditor-styles.scss";
-@import "_fonts.scss";
+@import "custom-ckeditor-styles.scss";
+@import "fonts.scss";
 
 body {
   font-family:'Open Sans', Arial, sans-serif;

muikku/src/main/webapp/resources/theme-muikku/sass/flex/custom-ckeditor-contentcss_reading.scss

@@ -1,5 +1,5 @@
-@import "_custom-ckeditor-styles.scss";
-@import "_fonts.scss";
+@import "custom-ckeditor-styles.scss";
+@import "fonts.scss";
 
 body {
   font-family:'Open Sans', Arial, sans-serif;

muikku/src/main/webapp/resources/theme-muikku/sass/flex/discussion.scss

@@ -1,6 +1,6 @@
-@import "_vars.scss";
-@import "_styles.scss";
-@import "_draft.scss";
+@import "vars.scss";
+@import "styles.scss";
+@import "draft.scss";
 
 /* discussion (.di-*) */
 

muikku/src/main/webapp/resources/theme-muikku/sass/flex/evaluation-index.scss

@@ -1,22 +1,22 @@
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles";
-@import "_animations";
-@import "_fonts";
-@import "_custom-ckeditor-styles";
-@import "_jquery.datepicker";
-@import "_ckeditor_theme_management";
-@import "_draft";
-@import "_dialog";
-@import "_evaluation_evaluate_modal";
-@import "_connect-field";
-@import "_organizer-field";
-@import "_sorter-field";
-@import "_audio-field";
-@import "_file-field";
-@import "_evaluation_material_styles";
-@import "_correct_answers"; 
-@import "_notif-queue";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles";
+@import "animations";
+@import "fonts";
+@import "custom-ckeditor-styles";
+@import "jquery.datepicker";
+@import "ckeditor_theme_management";
+@import "draft";
+@import "dialog";
+@import "evaluation_evaluate_modal";
+@import "connect-field";
+@import "organizer-field";
+@import "sorter-field";
+@import "audio-field";
+@import "file-field";
+@import "evaluation_material_styles";
+@import "correct_answers"; 
+@import "notif-queue";
 
 body {
   background-color: #fff;
@@ -177,8 +177,10 @@ body {
 // REQUESTS ALL HANDLED CONTAINER
 .evaluation-well-done-container {
   color: #4c4c4c;
-  font-size: 26px;
-  padding: 30px;
+  font-size: 20px;
+  font-style: italic;
+  line-height: 1.4em;
+  padding: 50px 10px;
   text-align: center;
 }
 
@@ -343,4 +345,4 @@ body {
   z-index:20;
 }
 
-@import "_mobile_evaluation";
+@import "mobile_evaluation";

muikku/src/main/webapp/resources/theme-muikku/sass/flex/evaluation.scss

@@ -1,18 +1,18 @@
-@import "_vars";
-@import "_vars_backup";
-@import "_styles";
-@import "_custom-ckeditor-styles";
-@import "_connect-field";
-@import "_organizer-field";
-@import "_sorter-field";
-@import "_audio-field";
-@import "_file-field";
-@import "_jquery.datepicker";
-@import "_evaluation_material_styles_backup";
-@import "_correct_answers"; 
-@import "_ckeditor_theme.scss";
-@import "_draft";
-@import "_dialog";
+@import "vars";
+@import "vars_backup";
+@import "styles";
+@import "custom-ckeditor-styles";
+@import "connect-field";
+@import "organizer-field";
+@import "sorter-field";
+@import "audio-field";
+@import "file-field";
+@import "jquery.datepicker";
+@import "evaluation_material_styles_backup";
+@import "correct_answers"; 
+@import "ckeditor_theme.scss";
+@import "draft";
+@import "dialog";
 
 body.evaluation {
   background: none;

muikku/src/main/webapp/resources/theme-muikku/sass/flex/flex-main-functionality.scss

@@ -1,6 +1,6 @@
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
 
 .mf-content-master {
   margin: 0 5px;

muikku/src/main/webapp/resources/theme-muikku/sass/flex/flex-main-workspace.scss

@@ -1,14 +1,14 @@
-@import "_fonts.scss";
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
-@import "_forms.scss";
-@import "_animations.scss";
-@import "_dialog.scss";
-@import "_flex-dialog.scss";
-@import "_buttons.scss";
-@import "_notif-queue.scss";
-@import "_connectionlost.scss";
+@import "fonts.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
+@import "forms.scss";
+@import "animations.scss";
+@import "dialog.scss";
+@import "flex-dialog.scss";
+@import "buttons.scss";
+@import "notif-queue.scss";
+@import "connectionlost.scss";
 
 html {
   height: 100%;
@@ -369,8 +369,8 @@ article.workspace-materials-view-page {
 
 }
 
-@import "_workspace_navigation_wide.scss"; 
-@import "_workspace_navigation_narrow.scss"; 
-@import "_mobile.scss";
-@import "_mobile_workspace.scss";
-@import "_tablet.scss";
+@import "workspace_navigation_wide.scss"; 
+@import "workspace_navigation_narrow.scss"; 
+@import "mobile.scss";
+@import "mobile_workspace.scss";
+@import "tablet.scss";

muikku/src/main/webapp/resources/theme-muikku/sass/flex/flex-main.scss

@@ -1,15 +1,15 @@
-@import "_fonts";
-@import "_vars";
-@import "_vars_backup";
-@import "_styles";
-@import "_forms";
-@import "_animations";
-@import "_dialog";
-@import "_flex-dialog";
-@import "_buttons";
-@import "_notif-queue";
-@import "_connectionlost";
-@import "_environment_print";
+@import "fonts";
+@import "vars";
+@import "vars_backup";
+@import "styles";
+@import "forms";
+@import "animations";
+@import "dialog";
+@import "flex-dialog";
+@import "buttons";
+@import "notif-queue";
+@import "connectionlost";
+@import "environment_print";
 
 html {
   height: 100%;
@@ -531,5 +531,5 @@ blockquote{
   padding-left: 20px;  
 }
 
-@import "_mobile";
-@import "_tablet";
+@import "mobile";
+@import "tablet";

muikku/src/main/webapp/resources/theme-muikku/sass/flex/flex-reading-view.scss

@@ -1,6 +1,6 @@
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
 
 body { 
 
@@ -99,4 +99,3 @@ body {
   }
 
 }
-

muikku/src/main/webapp/resources/theme-muikku/sass/flex/forgot-password.scss

@@ -1,11 +1,11 @@
-@import "_fonts.scss";
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
-@import "_forms.scss";
-@import "_buttons.scss";
-@import "_notif-queue.scss";
-@import "_connectionlost.scss";
+@import "fonts.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
+@import "forms.scss";
+@import "buttons.scss";
+@import "notif-queue.scss";
+@import "connectionlost.scss";
 
 body {
   margin:10px;

muikku/src/main/webapp/resources/theme-muikku/sass/flex/frontpage.scss

@@ -1,7 +1,6 @@
-
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
 
   /* frontpage (.fp-*) */
 

muikku/src/main/webapp/resources/theme-muikku/sass/flex/guider.scss

@@ -1,5 +1,5 @@
-@import "_vars.scss";
-@import "_styles.scss";
+@import "vars.scss";
+@import "styles.scss";
 
 /* Guider, Guiding tool (.gt-*) */
 

muikku/src/main/webapp/resources/theme-muikku/sass/flex/profile.scss

@@ -1,6 +1,6 @@
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
 
 
 #profile { 
@@ -99,4 +99,3 @@
   }
 
 }
-

muikku/src/main/webapp/resources/theme-muikku/sass/flex/records.scss

@@ -1,5 +1,5 @@
-@import "_vars.scss";
-@import "_styles.scss";
+@import "vars.scss";
+@import "styles.scss";
 
 /* Transcript of records (.tr-*) */
 

muikku/src/main/webapp/resources/theme-muikku/sass/flex/workspace-announcements.scss

@@ -1,6 +1,6 @@
-@import "_vars.scss";
-@import "_vars_backup";
-@import "_styles.scss";
+@import "vars.scss";
+@import "vars_backup";
+@import "styles.scss";
 
  body {