Merge pull request #1047 from crazyserver/MOBILE-2103

Mobile 2103

Author: jleyva

scss/app.scss

@@ -105,11 +105,24 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   }
 }
 
-.button .icon {
-  color: $positive;
+.button,
+.button.button-icon {
+  .icon,
+  &.active,
+  &.activated,
+  &.active .icon,
+  &.activated .icon {
+    color: $positive;
 
-  &.icon-accessory {
-    color: $item-icon-accessory-color;
+    &.assertive {
+      color: $assertive;
+    }
+    &.dark {
+      color: $dark;
+    }
+    &.icon-accessory {
+      color: $item-icon-accessory-color;
+    }
   }
 }
 
@@ -125,6 +138,12 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   color: $bar-content-text;
 }
 
+.item-delete .button.icon,
+.item-delete .button.icon.active,
+.item-delete .button.icon.actived {
+  color: $assertive;
+}
+
 // Setting the default button to button-outline positive.
 .button {
   &.button-light,
@@ -142,13 +161,21 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
     &.activated {
       box-shadow: none;
       color: $white;
+
+      .icon {
+        color: $white;
+      }
     }
   }
 
   &.active,
   &.activated {
     box-shadow: none;
     color: $white;
+
+    .icon {
+      color: $white;
+    }
   }
 
   &.button-dark {

www/addons/mod/assign/directives/submission.js

@@ -231,11 +231,14 @@ angular.module('mm.addons.mod_assign')
                         $mmaModAssign.getSubmissionGradingStatusTranslationId(scope.grade.gradingStatus);
                 }
 
-                if (!scope.feedback) {
+                if (!scope.feedback || !scope.feedback.plugins) {
                     scope.feedback = {};
 
                     // Feedback plugins not present, we have to use assign configs to detect the plugins used.
                     scope.feedback.plugins = $mmaModAssignHelper.getPluginsEnabled(assign, 'assignfeedback');
+                    console.error(assign, scope.feedback.plugins);
+                } else {
+                    console.error(scope.feedback);
                 }
 
                 // Check if there's any offline data for this submission.
@@ -481,7 +484,7 @@ angular.module('mm.addons.mod_assign')
                     promises.push(feedbackController(scope, assign, response.feedback, courseId, moduleId, submitId));
 
                     // Check if there's any unsupported plugin for editing.
-                    if (!scope.userSubmission) {
+                    if (!scope.userSubmission || !scope.userSubmission.plugins) {
                         scope.userSubmission = {};
                         // Submission not created yet, we have to use assign configs to detect the plugins used.
                         scope.userSubmission.plugins = $mmaModAssignHelper.getPluginsEnabled(assign, 'assignsubmission');

www/addons/mod/forum/lang/ca.json

@@ -25,8 +25,6 @@
     "refreshdiscussions": "Actualitza els debats",
     "refreshposts": "Actualitza els missatges",
     "reply": "Respon",
-    "sortnewestfirst": "Mostra els més recents primer",
-    "sortoldestfirst": "Mostra els més antics primer",
     "subject": "Assumpte",
     "unread": "No llegit",
     "unreadpostsnumber": "{{$a}} missatges no llegits"

www/addons/mod/forum/lang/cs.json

@@ -26,8 +26,6 @@
     "refreshdiscussions": "Obnovit diskuse",
     "refreshposts": "Obnovit diskusní příspěvky",
     "reply": "Odpovědět",
-    "sortnewestfirst": "Zobrazit nejnovější",
-    "sortoldestfirst": "Zobrazit nejstarší",
     "subject": "Předmět",
     "unread": "Nepřečteno",
     "unreadpostsnumber": "Nepřečtené příspěvky: {{$a}}"

www/addons/mod/forum/lang/da.json

@@ -25,8 +25,6 @@
     "refreshdiscussions": "Genindlæs diskussioner",
     "refreshposts": "Genindlæs indlæg",
     "reply": "Svar",
-    "sortnewestfirst": "Vis nyeste først",
-    "sortoldestfirst": "Vis ældste først",
     "subject": "Emne",
     "unread": "Ikke læst",
     "unreadpostsnumber": "{{$a}} nye indlæg"

www/addons/mod/forum/lang/de.json

@@ -26,8 +26,6 @@
     "refreshdiscussions": "Themen aktualisieren",
     "refreshposts": "Forenbeiträge aktualisieren",
     "reply": "Antworten",
-    "sortnewestfirst": "Neu zuerst",
-    "sortoldestfirst": "Alt zuerst",
     "subject": "Betreff",
     "unread": "Ungelesen",
     "unreadpostsnumber": "{{$a}} ungelesene Beiträge"

www/addons/mod/forum/lang/el.json

@@ -24,8 +24,6 @@
     "refreshdiscussions": "Ανανεώστε τις συζητήσεις",
     "refreshposts": "Ανανεώστε τα μηνύματα της συζήτησης",
     "reply": "Απάντηση",
-    "sortnewestfirst": "Εμφανίστε πρώτα τα νεότερα",
-    "sortoldestfirst": "Εμφανίστε πρώτα τα παλαιότερα",
     "subject": "Θέμα",
     "unread": "Μη αναγνωσμένο",
     "unreadpostsnumber": "{{$a}} μη αναγνωσμένες δημοσιεύσεις"

www/addons/mod/forum/lang/es-mx.json

@@ -26,8 +26,6 @@
     "refreshdiscussions": "Refrescar discusiones",
     "refreshposts": "Refrescar publicaciones de discusiones",
     "reply": "Responder (réplica)",
-    "sortnewestfirst": "Mostrar primeramente los más nuevos",
-    "sortoldestfirst": "Mostrar primeramente los más antiguos",
     "subject": "Asunto",
     "unread": "No leído",
     "unreadpostsnumber": "{{$a}} mensajes no leídos"

www/addons/mod/forum/lang/es.json

@@ -26,8 +26,6 @@
     "refreshdiscussions": "Actualizar foro",
     "refreshposts": "Actualizar publicaciones del foro",
     "reply": "Responder",
-    "sortnewestfirst": "Mostrar los más nuevos primero",
-    "sortoldestfirst": "Mostrar los más antiguos primero",
     "subject": "Asunto",
     "unread": "No leído",
     "unreadpostsnumber": "{{$a}} mensajes no leídos"

www/addons/mod/forum/lang/eu.json

@@ -26,8 +26,6 @@
     "refreshdiscussions": "Freskatu eztabaidak",
     "refreshposts": "Freskatu eztabaidetako mezuak",
     "reply": "Erantzun",
-    "sortnewestfirst": "Erakutsi berrienak lehenago",
-    "sortoldestfirst": "Erakutsi zaharrenak lehenago",
     "subject": "Gaia",
     "unread": "Irakurri gabe",
     "unreadpostsnumber": "Irakurri gabeko {{$a}} mezu"