From f61412d787533116a117eeac9c266696901637fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 24 Feb 2017 09:09:44 +0100 Subject: [PATCH 1/6] MOBILE-1987 css: Fallback on flex columns --- www/core/scss/styles.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss index 3b1870a93bf..16081d850dd 100644 --- a/www/core/scss/styles.scss +++ b/www/core/scss/styles.scss @@ -155,14 +155,17 @@ p.item-text-wrap { .col-65 { @include flex(0, 0, 65%); max-width: 65%; + width: 65%; } .col-60 { @include flex(0, 0, 60%); + width: 60%; max-width: 60%; } .col-40 { @include flex(0, 0, 40%); max-width: 40%; + width: 40%; } // Media item, ideal for icons. From 2c59a8bc4cf84ac2466cb8631be6ab4a3ddbca28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 24 Feb 2017 09:10:06 +0100 Subject: [PATCH 2/6] MOBILE-1987 assign: getSubmissionGradingStatusTranslationId not found --- www/addons/mod/assign/directives/submission.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/addons/mod/assign/directives/submission.js b/www/addons/mod/assign/directives/submission.js index 48d35bdf86a..b625463acf2 100644 --- a/www/addons/mod/assign/directives/submission.js +++ b/www/addons/mod/assign/directives/submission.js @@ -222,7 +222,8 @@ angular.module('mm.addons.mod_assign') originalGrades.applyToAll = true; } if (assign.markingworkflow && scope.grade.gradingStatus) { - scope.workflowStatusTranslationId = getSubmissionGradingStatusTranslationId(scope.grade.gradingStatus); + scope.workflowStatusTranslationId = + $mmaModAssign.getSubmissionGradingStatusTranslationId(scope.grade.gradingStatus); } if (!scope.feedback) { From 5c503ea09803b9637781844fd7cbf9b44b5398f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 24 Feb 2017 11:00:17 +0100 Subject: [PATCH 3/6] MOBILE-1987 quiz: Fix styling match questions --- www/addons/qtype/match/scss/styles.scss | 9 +++++-- www/addons/qtype/match/template.html | 24 ++++++++++-------- .../components/question/services/helper.js | 12 ++++++--- www/core/scss/styles.scss | 25 ++++++++++++++++++- 4 files changed, 53 insertions(+), 17 deletions(-) diff --git a/www/addons/qtype/match/scss/styles.scss b/www/addons/qtype/match/scss/styles.scss index 83033c3cee5..f7f229fd6b5 100644 --- a/www/addons/qtype/match/scss/styles.scss +++ b/www/addons/qtype/match/scss/styles.scss @@ -1,7 +1,12 @@ // Style match content a bit. -.mma-qtype-match-container { - select { +.mma-qtype-match-container .item-select { + select, + .mm-select-fix { padding: 0 36px 0 0; max-width: 100%; + display: flex; + justify-content:center; + align-content:center; + flex-direction:column; } } diff --git a/www/addons/qtype/match/template.html b/www/addons/qtype/match/template.html index d7a33890c4c..316a1903fc5 100644 --- a/www/addons/qtype/match/template.html +++ b/www/addons/qtype/match/template.html @@ -2,15 +2,17 @@

{{ question.text }}

-
-
-

{{ row.text }}

-
-
- - -
-
+
+
+

{{ row.text }}

+
+
+ + +

+ {{row.selected.label}} +

+
+
diff --git a/www/core/components/question/services/helper.js b/www/core/components/question/services/helper.js index cc80d73d133..beb11c82bda 100644 --- a/www/core/components/question/services/helper.js +++ b/www/core/components/question/services/helper.js @@ -687,6 +687,7 @@ angular.module('mm.core.question') rowModel.id = select.id; rowModel.name = select.name; rowModel.disabled = select.disabled; + rowModel.selected = false; rowModel.options = []; // Check if answer is correct. @@ -702,12 +703,17 @@ angular.module('mm.core.question') log.warn('Aborting because couldn\'t find option value.', question.name); return self.showDirectiveError(scope); } - - rowModel.options.push({ + var opt = { value: option.value, label: option.innerHTML, selected: option.selected - }); + }; + + if (opt.selected) { + rowModel.selected = opt; + } + + rowModel.options.push(opt); }); // Get the accessibility label. diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss index 16081d850dd..378287252fa 100644 --- a/www/core/scss/styles.scss +++ b/www/core/scss/styles.scss @@ -581,7 +581,7 @@ mm-navigation-bar { // When using .item and .row in the same element, .row's padding prevails. Use this class to keep .item's padding. .item.row.mm-item-padding { - padding: $item-padding; + padding: $item-padding / 2; } p.mm-error { @@ -746,6 +746,28 @@ mm-timer { } } +.item-select .mm-select-fix { + // Taken from .item-select select. + position: absolute; + top: 0; + bottom: 0; + right: 0; + padding: 0 ($item-padding * 3) 0 $item-padding; + max-width: 65%; + width: 100%; + border: none; + background: $item-default-bg; + color: #333; + text-indent: .01px; + white-space: nowrap; + font-size: $font-size-base; + cursor: pointer; + direction: rtl; // right align the select text + + pointer-events: none; +} + + .item-input-inset .item-input-wrapper input, .item-input .item-input-wrapper input { width: 100%; @@ -923,6 +945,7 @@ mm-timer { .input-label, .mm-textarea { padding-left: $item-padding; + padding-top: $item-padding/2; } } From 0a45d57f94fdfb1ebebbd1dfba3c7d901a075521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 24 Feb 2017 11:18:31 +0100 Subject: [PATCH 4/6] MOBILE-1987 survey: more space to answers --- www/addons/mod/survey/templates/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/addons/mod/survey/templates/index.html b/www/addons/mod/survey/templates/index.html index 24a0ae657ff..e862bdc81ba 100644 --- a/www/addons/mod/survey/templates/index.html +++ b/www/addons/mod/survey/templates/index.html @@ -27,11 +27,11 @@ -
+
-

{{ question.text }}

+

{{ question.text }}

{{ 'mma.mod_survey.responses' | translate }}
@@ -51,7 +51,7 @@

{{ question.text }}

-
+
@@ -78,7 +78,7 @@

{{ question.text }}

-
+
From 532d3c1735a89d4844f5ebd79c962faad7abeefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 24 Feb 2017 12:24:52 +0100 Subject: [PATCH 5/6] MOBILE-1987 chat: Better looking chat users modal --- www/addons/mod/chat/scss/styles.scss | 10 ++++++++++ www/addons/mod/chat/templates/chat.html | 2 +- www/addons/mod/chat/templates/users.html | 24 ++++++++++++------------ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/www/addons/mod/chat/scss/styles.scss b/www/addons/mod/chat/scss/styles.scss index 19ee340fe70..1ce1a06dec7 100644 --- a/www/addons/mod/chat/scss/styles.scss +++ b/www/addons/mod/chat/scss/styles.scss @@ -33,4 +33,14 @@ $mma-chat-notice-badge: "stable" !default; .mma-chat-reconnect-button, .button.mma-chat-reconnect-button { margin: 0; +} + +.mma-mod_chat-users-modal { + .item-complex .item-avatar { + padding-bottom: 0; + + .tabs { + border: 0; + } + } } \ No newline at end of file diff --git a/www/addons/mod/chat/templates/chat.html b/www/addons/mod/chat/templates/chat.html index 16e64772c68..2f2b1b43021 100644 --- a/www/addons/mod/chat/templates/chat.html +++ b/www/addons/mod/chat/templates/chat.html @@ -39,7 +39,7 @@

{{ message.userfullname }}

-
+

{{ 'mma.mod_chat.nomessages' | translate}}

diff --git a/www/addons/mod/chat/templates/users.html b/www/addons/mod/chat/templates/users.html index e5f105cb051..f6d5325ec27 100644 --- a/www/addons/mod/chat/templates/users.html +++ b/www/addons/mod/chat/templates/users.html @@ -3,23 +3,23 @@

{{ 'mma.mod_chat.currentusers' | translate }}

- + From f145cdd8b78a5684e2dfc8c07f01738df33f0f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 24 Feb 2017 12:38:58 +0100 Subject: [PATCH 6/6] MOBILE-1987 forum: Enlarge form content --- www/addons/mod/forum/scss/styles.scss | 4 ++++ www/addons/mod/forum/templates/newdiscussion.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/www/addons/mod/forum/scss/styles.scss b/www/addons/mod/forum/scss/styles.scss index 8cc7ff346c3..5abf88a07ce 100644 --- a/www/addons/mod/forum/scss/styles.scss +++ b/www/addons/mod/forum/scss/styles.scss @@ -13,6 +13,10 @@ border-style: solid; } +.mma-forum-reply-edit { + padding: $item-padding/2; +} + .mm-site_mod_forum, .mm-site_mod_forum-discussion { .item.item-heading { padding-bottom: 2px; diff --git a/www/addons/mod/forum/templates/newdiscussion.html b/www/addons/mod/forum/templates/newdiscussion.html index 213ca5f566f..e333830c3d6 100644 --- a/www/addons/mod/forum/templates/newdiscussion.html +++ b/www/addons/mod/forum/templates/newdiscussion.html @@ -1,9 +1,9 @@ - + -
+ {{ 'mma.mod_forum.subject' | translate }}