{{attempt.fullname}}
+{{attempt.timemodified * 1000 | coreFormatDate:"LLL"}}
+ + +{{ 'addon.mod_feedback.response_nr' |translate }}: {{attempt.number}} ({{ 'addon.mod_feedback.anonymous' |translate }})
+{{attempt.timemodified * 1000 | coreFormatDate:"LLL"}}
+
+ {{item.itemnumber}}.
+ {{ 'addon.mod_feedback.mode' | translate }}
+{{ 'addon.mod_feedback.anonymous' | translate }}
+{{ 'addon.mod_feedback.non_anonymous' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'addon.mod_feedback.numberoutofrange' | translate }} [{{item.rangefrom}}, {{item.rangeto}}]
+
+
+
+
+
+ {{ 'addon.mod_feedback.this_feedback_is_already_submitted' | translate }}
+{{ 'addon.mod_feedback.feedback_submitted_offline' | translate }}
+
+
{{attempt.timemodified * 1000 | coreFormatDate: "LLL"}}
+ +{{ 'addon.mod_feedback.response_nr' |translate }}: {{attempt.number}}
+ +
-
\ No newline at end of file
diff --git a/src/components/iframe/iframe.scss b/src/components/iframe/iframe.scss
index 562b80430..8ebb42eb7 100644
--- a/src/components/iframe/iframe.scss
+++ b/src/components/iframe/iframe.scss
@@ -5,4 +5,25 @@ core-iframe {
iframe {
border: 0;
}
+
+ .core-loading-container {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ display: table;
+ height: 100%;
+ width: 100%;
+ z-index: 1;
+ margin: 0;
+ padding: 0;
+ clear: both;
+
+ .core-loading-spinner {
+ display: table-cell;
+ text-align: center;
+ vertical-align: middle;
+ }
+ }
}
diff --git a/src/components/iframe/iframe.ts b/src/components/iframe/iframe.ts
index fa61c91fe..67ed9ed94 100644
--- a/src/components/iframe/iframe.ts
+++ b/src/components/iframe/iframe.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, Input, OnInit, ViewChild, ElementRef } from '@angular/core';
+import { Component, Input, Output, OnInit, ViewChild, ElementRef, EventEmitter } from '@angular/core';
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { Platform } from 'ionic-angular';
import { CoreFileProvider } from '@providers/file';
@@ -35,6 +35,7 @@ export class CoreIframeComponent implements OnInit {
@Input() src: string;
@Input() iframeWidth: string;
@Input() iframeHeight: string;
+ @Output() loaded?: EventEmitter
+
+
+
+
+
+
+{{ 'core.answered' | translate }}
+{{ 'core.login.recaptchaexpired' | translate }}
+
+
\ No newline at end of file
diff --git a/src/components/recaptcha/recaptcha.ts b/src/components/recaptcha/recaptcha.ts
new file mode 100644
index 000000000..d9ccfa674
--- /dev/null
+++ b/src/components/recaptcha/recaptcha.ts
@@ -0,0 +1,127 @@
+// (C) Copyright 2015 Martin Dougiamas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Component, Input } from '@angular/core';
+import { ModalController, ViewController, NavParams } from 'ionic-angular';
+import { CoreSitesProvider } from '@providers/sites';
+import { CoreLangProvider } from '@providers/lang';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
+
+/**
+ * Directive to display a reCaptcha.
+ *
+ * Accepts the following attributes:
+ * @param {any} model The model where to store the recaptcha response.
+ * @param {string} publicKey The site public key.
+ * @param {string} [modelValueName] Name of the model property where to store the response. Defaults to 'recaptcharesponse'.
+ * @param {string} [siteUrl] The site URL. If not defined, current site.
+ */
+@Component({
+ selector: 'core-recaptcha',
+ templateUrl: 'recaptcha.html'
+})
+export class CoreRecaptchaComponent {
+ expired = false;
+
+ protected lang: string;
+
+ @Input() model: any;
+ @Input() publicKey: string;
+ @Input() modelValueName = 'recaptcharesponse';
+ @Input() siteUrl?: string;
+
+ constructor(private sitesProvider: CoreSitesProvider, langProvider: CoreLangProvider,
+ private textUtils: CoreTextUtilsProvider, private modalCtrl: ModalController) {
+
+ // Get the current language of the app.
+ langProvider.getCurrentLanguage().then((lang) => {
+ this.lang = lang;
+ });
+ }
+
+ /**
+ * Component being initialized.
+ */
+ ngOnInit(): void {
+ this.siteUrl = this.siteUrl || this.sitesProvider.getCurrentSite().getURL();
+ }
+
+ /**
+ * Open the recaptcha modal.
+ */
+ answerRecaptcha(): void {
+ // Set the iframe src. We use an iframe because reCaptcha V2 doesn't work with file:// protocol.
+ const src = this.textUtils.concatenatePaths(this.siteUrl, 'webservice/recaptcha.php?lang=' + this.lang);
+
+ // Modal to answer the recaptcha.
+ // This is because the size of the recaptcha is dynamic, so it could cause problems if it was displayed inline.
+ const modal = this.modalCtrl.create(CoreRecaptchaModalComponent, { src: src },
+ { cssClass: 'core-modal-fullscreen'});
+ modal.onDidDismiss((data) => {
+ this.expired = data.expired;
+ this.model[this.modelValueName] = data.value;
+ });
+ modal.present();
+ }
+}
+
+@Component({
+ selector: 'core-recaptcha-modal',
+ templateUrl: 'recaptchamodal.html'
+})
+export class CoreRecaptchaModalComponent {
+
+ expired = false;
+ value = '';
+ src: string;
+
+ constructor(protected viewCtrl: ViewController, params: NavParams) {
+ this.src = params.get('src');
+ }
+
+ /**
+ * Close modal.
+ */
+ closeModal(): void {
+ this.viewCtrl.dismiss({
+ expired: this.expired,
+ value: this.value
+ });
+ }
+
+ /**
+ * The iframe with the recaptcha was loaded.
+ *
+ * @param {HTMLIFrameElement} iframe Iframe element.
+ */
+ loaded(iframe: HTMLIFrameElement): void {
+ // Search the iframe content.
+ const contentWindow = iframe && iframe.contentWindow;
+
+ if (contentWindow) {
+ // Set the callbacks we're interested in.
+ contentWindow['recaptchacallback'] = (value): void => {
+ this.expired = false;
+ this.value = value;
+ this.closeModal();
+ };
+
+ contentWindow['recaptchaexpiredcallback'] = (): void => {
+ // Verification expired. Check the checkbox again.
+ this.expired = true;
+ this.value = '';
+ };
+ }
+ }
+}
diff --git a/src/components/recaptcha/recaptchamodal.html b/src/components/recaptcha/recaptchamodal.html
new file mode 100644
index 000000000..8acfd27be
--- /dev/null
+++ b/src/components/recaptcha/recaptchamodal.html
@@ -0,0 +1,14 @@
+