pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] website(_sale)_slides(_survey): improve course management and creation

Browse Source 
PURPOSE

Improve usability of course creation and management in frontend

SPECIFICATIONS

This commit improves various elements of the eLearning module:
  * the create 'new course' dialog has been improved with examples and
    improved placeholders;
  * allow to create tags directly from course creation modal. Using the
    add tag button after having created the course is not the only way of
    managing tags anymore;
  * the create 'new content' dialog has some explanations on the right side;
  * add a flag indicating which content has already been viewed in
    documentation;
  * changes the text/color of some buttons;

LINKS

Task ID-2241513
PR #55698
This commit is contained in:
Patrick Hoste
2020-08-11 10:22:23 +00:00
committed by Thibault Delavallée
parent 8d30e343b1
commit b39f4b6307
20 changed files with 265 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_slides/controllers/main.py
+42 -22
View File
@@ -259,6 +259,37 @@ class WebsiteSlides(WebsiteProfile):
session_slide_answer_quiz.pop(str(slide['id']), None)
request.session['slide_answer_quiz'] = json.dumps(session_slide_answer_quiz)
# TAG UTILITIES
# --------------------------------------------------
def _create_or_get_channel_tag(self, tag_id, group_id):
if not tag_id:
return request.env['slide.channel.tag']
# handle creation of new channel tag
if tag_id[0] == 0:
group_id = self._create_or_get_channel_tag_group(group_id)
if not group_id:
return {'error': _('Missing "Tag Group" for creating a new "Tag".')}
new_tag = request.env['slide.channel.tag'].create({
'name': tag_id[1]['name'],
'group_id': group_id,
})
return new_tag
return request.env['slide.channel.tag'].browse(tag_id[0])
def _create_or_get_channel_tag_group(self, group_id):
if not group_id:
return False
# handle creation of new channel tag group
if group_id[0] == 0:
tag_group = request.env['slide.channel.tag.group'].create({
'name': group_id[1]['name'],
})
group_id = tag_group.id
# use existing channel tag group
return group_id[0]
# --------------------------------------------------
# SLIDE.CHANNEL MAIN / SEARCH
# --------------------------------------------------
@@ -617,29 +648,9 @@ class WebsiteSlides(WebsiteProfile):
if not can_upload or not can_publish:
return {'error': _('You cannot add tags to this course.')}
if tag_id:
# handle creation of new channel tag
if tag_id[0] == 0:
if group_id:
# handle creation of new channel tag group
if group_id[0] == 0:
tag_group = request.env['slide.channel.tag.group'].create({
'name': group_id[1]['name'],
})
group_id = tag_group.id
# use existing channel tag group
else:
group_id = group_id[0]
else:
return {'error': _('Missing "Tag Group" for creating a new "Tag".')}
tag = self._create_or_get_channel_tag(tag_id, group_id)
tag.write({'channel_ids': [(4, channel.id, 0)]})
request.env['slide.channel.tag'].create({'name': tag_id[1]['name'],
'channel_ids': [channel.id],
'group_id': group_id,
})
else:
# use existing channel tag
request.env['slide.channel.tag'].browse(tag_id[0]).write({'channel_ids': [(4, channel.id, 0)]})
return {'url': "/slides/%s" % (slug(channel))}
@http.route(['/slides/channel/subscribe'], type='json', auth='user', website=True)
@@ -811,6 +822,15 @@ class WebsiteSlides(WebsiteProfile):
result = slide._send_share_email(email, fullscreen)
return result
# --------------------------------------------------
# TAGS SECTION
# --------------------------------------------------
@http.route('/slide_channel_tag/add', type='json', auth='user', methods=['POST'], website=True)
def slide_channel_tag_create_or_get(self, tag_id, group_id):
tag = self._create_or_get_channel_tag(tag_id, group_id)
return {'tag_id': tag.id}
# --------------------------------------------------
# QUIZ SECTION
# --------------------------------------------------
addons/website_slides/static/src/img/channel-documentation-layout.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

addons/website_slides/static/src/img/channel-training-layout.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

addons/website_slides/static/src/img/onboarding-quiz.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

addons/website_slides/static/src/js/slides_course_quiz.js
+1 -5
View File
@@ -567,11 +567,7 @@ odoo.define('website_slides.quiz', function (require) {
}
this.quiz.questionsCount++;
event.data.questionFormWidget.destroy();
if (event.data.save_and_new) {
this._onCreateQuizClick();
} else {
this.$('.o_wslides_js_quiz_add_question').removeClass('d-none');
}
this.$('.o_wslides_js_quiz_add_question').removeClass('d-none');
},
/**
addons/website_slides/static/src/js/slides_course_quiz_finish.js
-1
View File
@@ -24,7 +24,6 @@ var SlideQuizFinishModal = Dialog.extend({
options = _.defaults(options || {}, {
size: 'medium',
dialogClass: 'd-flex p-0',
$parentNode: parent.$el,
technical: false,
renderHeader: false,
renderFooter: false
addons/website_slides/static/src/js/slides_course_quiz_question_form.js
+1 -4
View File
@@ -116,14 +116,12 @@ var QuestionFormWidget = publicWidget.Widget.extend({
},
/**
* Handler when user click on 'Save & New', 'Save & Close'
* or 'Update' buttons.
* Handler when user click on 'Save' or 'Update' buttons.
* @param ev
* @private
*/
_validateQuestion: function (ev) {
this._createOrUpdateQuestion({
save_and_new: $(ev.currentTarget).hasClass('o_wslides_js_quiz_create_next'),
update: $(ev.currentTarget).hasClass('o_wslides_js_quiz_update'),
});
},
@@ -169,7 +167,6 @@ var QuestionFormWidget = publicWidget.Widget.extend({
} else {
self.trigger_up('display_created_question', {
newQuestionRenderedTemplate: renderedQuestion,
save_and_new: options.save_and_new,
questionFormWidget: self
});
}
addons/website_slides/static/src/js/slides_course_tag_add.js
+48 -1
View File
@@ -29,12 +29,14 @@ var TagCourseDialog = Dialog.extend({
click: this._onClickFormSubmit.bind(this)
}, {
text: _t("Discard"),
close: true
click: this._onClickClose.bind(this)
}]
});
this.channelID = parseInt(options.channelId, 10);
this.tagIds = options.channelTagIds || [];
// Open with a tag name as default
this.defaultTag = options.defaultTag;
this._super(parent, options);
},
start: function () {
@@ -42,6 +44,9 @@ var TagCourseDialog = Dialog.extend({
return this._super.apply(this, arguments).then(function () {
self._bindSelect2Dropdown();
self._hideTagGroup();
if (self.defaultTag) {
self._setDefaultSelection();
}
});
},
@@ -151,6 +156,11 @@ var TagCourseDialog = Dialog.extend({
return values;
},
_setDefaultSelection: function () {
this.$('#tag_id').select2('data', {id: _.uniqueId('tag_'), text: this.defaultTag, create: true}, true);
this.$('#tag_id').select2('readonly', true);
},
/**
* Get value for tag_id and [when appropriate] tag_group_id to send to server
*
@@ -260,7 +270,16 @@ var TagCourseDialog = Dialog.extend({
//--------------------------------------------------------------------------
// Handler
//--------------------------------------------------------------------------
_onClickFormSubmit: function () {
if (this.defaultTag && !this.channelID) {
this._createNewTag();
} else {
this._addTagToChannel();
}
},
_addTagToChannel: function () {
var self = this;
var $form = this.$('#slides_channel_tag_add_form');
if (this._formValidate($form)) {
@@ -280,6 +299,34 @@ var TagCourseDialog = Dialog.extend({
}
},
_createNewTag: function () {
var self = this;
var $form = this.$('#slides_channel_tag_add_form');
this.$('#tag_id').select2('readonly', false);
var valid = this._formValidate($form);
this.$('#tag_id').select2('readonly', true);
if (valid) {
var values = this._getSelect2DropdownValues();
return this._rpc({
route: '/slide_channel_tag/add',
params: {
'tag_id': values.tag_id,
'group_id': values.group_id
},
}).then(function (data) {
self.trigger_up('tag_refresh', { tag_id: data.tag_id });
self.close();
});
}
},
_onClickClose: function () {
if (this.defaultTag && !this.channelID) {
this.trigger_up('tag_remove_new');
}
this.close();
},
_onChangeTag: function (ev) {
var self = this;
var tag = $(ev.currentTarget).select2('data');
addons/website_slides/static/src/js/slides_course_unsubscribe.js
+2 -2
View File
@@ -13,7 +13,7 @@ var SlideUnsubscribeDialog = Dialog.extend({
template: 'slides.course.unsubscribe.modal',
_texts: {
titleSubscribe: _t("Subscribe"),
titleUnsubscribe: _t("Unsubscribe"),
titleUnsubscribe: _t("Notifications"),
titleLeaveCourse: _t("Leave the course")
},
@@ -60,7 +60,7 @@ var SlideUnsubscribeDialog = Dialog.extend({
if (state === '_subscription') {
btnList.push({text: _t("Save"), classes: "btn-primary", click: this._onClickSubscriptionSubmit.bind(this)});
btnList.push({text: _t("Discard"), close: true});
btnList.push({text: _t("Leave the course"), classes: "btn-danger ml-auto", click: this._onClickLeaveCourse.bind(this)});
btnList.push({text: _t("or Leave the course"), classes: "btn-danger ml-auto", click: this._onClickLeaveCourse.bind(this)});
} else if (state === '_leave') {
btnList.push({text: _t("Leave the course"), classes: "btn-danger", click: this._onClickLeaveCourseSubmit.bind(this)});
btnList.push({text: _t("Discard"), click: this._onClickLeaveCourseCancel.bind(this)});
addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js
+2 -2
View File
@@ -19,9 +19,9 @@ odoo.define('website_slides.slide.preview', function (require) {
}).then(function (isPreview) {
if (isPreview) {
$slideTarget.removeClass('badge-light badge-hide border');
$slideTarget.addClass('badge-success py-1');
$slideTarget.addClass('badge-success');
} else {
$slideTarget.removeClass('badge-success py-1');
$slideTarget.removeClass('badge-success');
$slideTarget.addClass('badge-light badge-hide border');
}
});
addons/website_slides/static/src/js/slides_upload.js
+15 -16
View File
@@ -67,11 +67,12 @@ var SlideUploadDialog = Dialog.extend({
this._alertRemove();
$('<div/>', {
"class": 'alert alert-warning',
id: 'upload-alert',
role: 'alert'
}).text(message).insertBefore(this.$('form'));
},
_alertRemove: function () {
this.$('.alert-warning').remove();
this.$('#upload-alert').remove();
},
/**
* Section and tags management from select2
@@ -188,17 +189,17 @@ var SlideUploadDialog = Dialog.extend({
if (! this.modulesToInstallStatus.installing) {
btnList.push({text: this.modulesToInstallStatus.failed ? _t("Retry") : _t("Install"), classes: 'btn-primary', click: this._onClickInstallModuleConfirm.bind(this)});
}
btnList.push({text: _t("Go Back"), classes: 'o_w_slide_go_back', click: this._onClickGoBack.bind(this)});
btnList.push({text: _t("Discard"), classes: 'o_w_slide_go_back', click: this._onClickGoBack.bind(this)});
} else if (state !== '_upload') { // no button when uploading
if (this.canUpload) {
if (this.canPublish) {
btnList.push({text: _t("Publish"), classes: 'btn-primary o_w_slide_upload o_w_slide_upload_published', click: this._onClickFormSubmit.bind(this)});
btnList.push({text: _t("Save as Draft"), classes: 'o_w_slide_upload', click: this._onClickFormSubmit.bind(this)});
btnList.push({text: _t("Save & Publish"), classes: 'btn-primary o_w_slide_upload o_w_slide_upload_published', click: this._onClickFormSubmit.bind(this)});
btnList.push({text: _t("Save"), classes: 'o_w_slide_upload', click: this._onClickFormSubmit.bind(this)});
} else {
btnList.push({text: _t("Save as Draft"), classes: 'btn-primary o_w_slide_upload', click: this._onClickFormSubmit.bind(this)});
btnList.push({text: _t("Save"), classes: 'btn-primary o_w_slide_upload', click: this._onClickFormSubmit.bind(this)});
}
}
btnList.push({text: _t("Go Back"), classes: 'o_w_slide_go_back', click: this._onClickGoBack.bind(this)});
btnList.push({text: _t("Discard"), classes: 'o_w_slide_go_back', click: this._onClickGoBack.bind(this)});
}
return btnList;
},
@@ -351,22 +352,20 @@ var SlideUploadDialog = Dialog.extend({
};
},
/**
* Show the preview/right column and resize the modal
* Show the preview
* @private
*/
_showPreviewColumn: function () {
this.$('#o_wslides_js_slide_upload_left_column').removeClass('col').addClass('col-md-6');
this.$('#o_wslides_js_slide_upload_preview_column').removeClass('d-none');
this.$modal.find('.modal-dialog').addClass('modal-lg');
this.$('.o_slide_tutorial').addClass('d-none');
this.$('.o_slide_preview').removeClass('d-none');
},
/**
* Hide the preview/right column and resize the modal
* Hide the preview
* @private
*/
_hidePreviewColumn: function () {
this.$('#o_wslides_js_slide_upload_left_column').addClass('col').removeClass('col-md-6');
this.$('#o_wslides_js_slide_upload_preview_column').addClass('d-none');
this.$modal.find('.modal-dialog').removeClass('modal-lg');
this.$('.o_slide_tutorial').removeClass('d-none');
this.$('.o_slide_preview').addClass('d-none');
},
/**
* @private
@@ -388,6 +387,7 @@ var SlideUploadDialog = Dialog.extend({
_onChangeType: function () {
var currentType = this.get('state');
var tmpl;
this.$modal.find('.modal-dialog').removeClass('modal-lg');
if (currentType === '_select') {
tmpl = 'website.slide.upload.modal.select';
} else if (currentType === '_upload') {
@@ -396,6 +396,7 @@ var SlideUploadDialog = Dialog.extend({
tmpl = 'website.slide.upload.modal.import';
} else {
tmpl = this.slide_type_data[currentType]['template'];
this.$modal.find('.modal-dialog').addClass('modal-lg');
}
this.$('.o_w_slide_upload_modal_container').empty();
this.$('.o_w_slide_upload_modal_container').append(QWeb.render(tmpl, {widget: this}));
@@ -407,8 +408,6 @@ var SlideUploadDialog = Dialog.extend({
} else {
this.set_title(_t("Upload a document"));
}
this.$modal.find('.modal-dialog').removeClass('modal-lg');
},
_onChangeCanSubmitForm: function (ev) {
if (this.get('can_submit_form')) {
addons/website_slides/static/src/js/website_slides.editor.js
+71 -1
View File
@@ -5,6 +5,7 @@ var core = require('web.core');
var Dialog = require('web.Dialog');
var QWeb = core.qweb;
var WebsiteNewMenu = require('website.newMenu');
var TagCourseDialog = require('website_slides.channel_tag.add').TagCourseDialog;
var wUtils = require('website.utils');
var _t = core._t;
@@ -13,8 +14,16 @@ var _t = core._t;
var ChannelCreateDialog = Dialog.extend({
template: 'website.slide.channel.create',
xmlDependencies: Dialog.prototype.xmlDependencies.concat(
['/website_slides/static/src/xml/website_slides_channel.xml']
['/website_slides/static/src/xml/website_slides_channel.xml',
'/website_slides/static/src/xml/website_slides_channel_tag.xml']
),
events: _.extend({}, Dialog.prototype.events, {
'change input#tag_ids' : '_onChangeTag',
}),
custom_events: _.extend({}, Dialog.prototype.custom_events, {
'tag_refresh': '_onTagRefresh',
'tag_remove_new': '_onTagRemoveNew',
}),
/**
* @override
* @param {Object} parent
@@ -45,6 +54,29 @@ var ChannelCreateDialog = Dialog.extend({
formatNoMatches: false,
multiple: true,
selection_data: false,
formatSelection: function (data) {
if (data.tag) {
data.text = data.tag;
}
return data.text;
},
createSearchChoice: function(term, data) {
var addedTags = $(this.opts.element).select2('data');
if (_.filter(_.union(addedTags, data), function (tag) {
return tag.text.toLowerCase().localeCompare(term.toLowerCase()) === 0;
}).length === 0) {
if (this.opts.can_create) {
return {
id: _.uniqueId('tag_'),
create: true,
tag: term,
text: _.str.sprintf(_t("Create new Tag '%s'"), term),
};
} else {
return undefined;
}
}
},
fill_data: function (query, data) {
var that = this,
tags = {results: []};
@@ -87,6 +119,44 @@ var ChannelCreateDialog = Dialog.extend({
$form.submit();
}
},
_onChangeTag: function (ev) {
var self = this;
var tags = $(ev.currentTarget).select2('data');
tags.forEach(function (element) {
if (element.create) {
new TagCourseDialog(self, { defaultTag: element.text }).open();
}
});
},
/**
* Replace the new tag ID by its real ID
* @param ev
* @private
*/
_onTagRefresh: function (ev) {
var $tag_ids = $('#tag_ids');
var tags = $tag_ids.select2('data');
tags.forEach(function (element) {
if (element.create) {
element.id = ev.data.tag_id;
element.create = false;
}
});
$tag_ids.select2('data', tags);
// Set selection_data to false to force tag reload
$tag_ids.data('select2').opts.selection_data = false;
},
/**
* Remove the created tag if the user clicks on 'Discard' on the create tag Dialog
* @private
*/
_onTagRemoveNew: function () {
var tags = $('#tag_ids').select2('data');
tags = tags.filter(function (value) {
return !value.create;
});
$('#tag_ids').select2('data', tags);
},
});
WebsiteNewMenu.include({
addons/website_slides/static/src/scss/slides_slide_fullscreen.scss
+1 -1
View File
@@ -119,6 +119,6 @@
.modal-open {
> .modal-backdrop {
z-index: $zindex-dropdown - 1;
z-index: $zindex-modal-backdrop;
}
}
addons/website_slides/static/src/scss/website_slides.scss
+5
View File
@@ -554,6 +554,11 @@ $o-wslides-fs-side-width: 300px;
}
}
#slide_channel_add_form input[name="channel_type"]:checked + label {
border: 4px solid $primary;
box-shadow: 3px 3px 5px gray;
}
// Embed PDFViewer
// **************************************************
#PDFViewer.o_wslides_fs_pdf_viewer {
addons/website_slides/static/src/xml/slide_quiz_create.xml
+1 -4
View File
@@ -68,10 +68,7 @@
<t t-name="slide.quiz.create.buttons">
<div>
<a class="o_wslides_js_quiz_validate_question btn btn-primary text-white border" role="button">
<span>Save &amp; Close</span>
</a>
<a class="o_wslides_js_quiz_validate_question o_wslides_js_quiz_create_next btn btn-primary text-white border" role="button">
<span>Save &amp; New</span>
<span>Save</span>
</a>
<a class="o_wslides_js_quiz_cancel_question btn btn-light border" role="button">
<span>Cancel</span>
addons/website_slides/static/src/xml/website_slides_channel.xml
+23 -17
View File
@@ -8,38 +8,44 @@
<input type="hidden" name="csrf_token" t-att-value="csrf_token"/>
<div class="form-group">
<label for="title" class="col-form-label">Title</label>
<input type="text" class="form-control" name="name" id="title" placeholder="Course Title" required="1"/>
<input type="text" class="form-control" name="name" id="title" placeholder="Computer Science for kids" required="1"/>
<p id="title-required" class="text-danger mt-1 mb-0 d-none">Please fill in this field</p>
</div>
<div class="form-group">
<label for="tag_ids" class="col-form-label">Tags</label>
<input type="text" class="form-control" name="tag_ids" id="tag_ids" placeholder="Tags"/>
</div>
<fieldset class="form-group">
<label for="channel_type">Type</label>
<div class="form-check">
<input class="form-check-input" type="radio" name="channel_type" id="channel_type1" value="training" checked="checked"/>
<span class="form-check-label" for="channel_type1">
Training (with progress)
</span>
<label for="channel_type">Choose a layout</label>
<div class="form-row">
<div class="form-group col-6">
<div class="form-check px-0">
<input class="form-check-input d-none" type="radio" name="channel_type" id="channel_type1" value="training" checked="checked"/>
<label for="channel_type1">
<img class="w-100" src="/website_slides/static/src/img/channel-training-layout.png" alt="Training Layout"/>
</label>
</div>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="channel_type" id="channel_type2" value="documentation"/>
<span class="form-check-label" for="channel_type2">
Documentation
</span>
<div class="form-group col-6">
<div class="form-check px-0">
<input class="form-check-input d-none" type="radio" name="channel_type" id="channel_type2" value="documentation"/>
<label for="channel_type2">
<img class="w-100" src="/website_slides/static/src/img/channel-documentation-layout.png" alt="Documentation Layout"/>
</label>
</div>
</div>
</fieldset>
</div>
<div class="form-group">
<label for="title">Description</label>
<input type="text" class="form-control" name="description" id="description" placeholder="Write here a short description of your first course" />
<textarea rows="2" class="form-control" name="description" id="description"
placeholder="Common tasks for a computer scientist is asking the right questions and answering
questions. In this course, you'll study those topics with activities about mathematics, science and logic." />
</div>
<div class="form-group">
<label id="communication-label">Review</label>
<div class="o_wslide_channel_communication_type">
<div class="form-check">
<input class="form-check-input" type="checkbox" id="allow_comment" name="allow_comment"/>
<span class="form-check-label" for="allow_comment">Allow review on Course</span>
<input class="form-check-input" type="checkbox" id="allow_comment" name="allow_comment" checked="checked"/>
<span class="form-check-label" for="allow_comment">Allow students to review your course</span>
</div>
</div>
</div>
addons/website_slides/static/src/xml/website_slides_unsubscribe.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<div class="form-group row">
<div class="controls mt8 ml-3">
<input id="subscribed" name="subscribed" type="checkbox"/>
<label for="subscribed" class="col-form-label font-weight-normal">Subscribe to get notified when a new content is added.</label>
<label for="subscribed" class="col-form-label font-weight-normal">Be notified when a new content is added.</label>
</div>
</div>
</form>
addons/website_slides/static/src/xml/website_slides_upload.xml
+45 -21
View File
@@ -39,7 +39,7 @@
Uploading template
-->
<t t-name="website.slide.upload.modal.uploading">
<div class="text-center" aria-hidden="true" role="status">
<div class="text-center" role="status">
<div class="fa-3x">
<i class="fa fa-spinner fa-pulse"></i>
</div>
@@ -88,17 +88,25 @@
<div>
<form class="clearfix">
<div class="row">
<div id="o_wslides_js_slide_upload_left_column" class="col">
<div id="o_wslides_js_slide_upload_left_column" class="col-md-6">
<div class="form-group">
<label for="upload" class="col-form-label">Choose a PDF or an Image</label>
<input id="upload" name="file" class="form-control" accept="image/*,application/pdf" type="file" required="required"/>
<input id="upload" name="file" class="form-control h-100" accept="image/*,application/pdf" type="file" required="required"/>
</div>
<canvas id="data_canvas" class="d-none"></canvas>
<t t-call="website.slide.upload.modal.common"/>
</div>
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6 d-none">
<div class="img-thumbnail">
<div class="o_slide_preview">
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6">
<div class="img-thumbnail h-100">
<div class="o_slide_tutorial p-3">
<div class="h5">How to upload your PowerPoint Presentations or Word Documents?</div>
<div class="mx-3 my-4">Save your presentations or documents as PDF files and upload them.</div>
<div class="alert alert-warning" role="alert">
<i class="fa fa-info-circle pr-2"/>
Only JPG, PNG, PDF, files types are supported
</div>
</div>
<div class="o_slide_preview d-none">
<img src="/website_slides/static/src/img/document.png" id="slide-image" title="Content Preview" alt="Content Preview" class="img-fluid"/>
</div>
</div>
@@ -112,18 +120,15 @@
<div>
<form class="clearfix">
<div class="row">
<div id="o_wslides_js_slide_upload_left_column" class="col">
<div class="form-group">
<label for="upload" class="col-form-label">Choose a Cover Image</label>
<input id="upload" name="file" class="form-control" accept="image/*" type="file" required="required"/>
</div>
<div id="o_wslides_js_slide_upload_left_column" class="col-md-6">
<canvas id="data_canvas" class="d-none"></canvas>
<t t-call="website.slide.upload.modal.common"/>
</div>
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6 d-none">
<div class="img-thumbnail">
<div class="o_slide_preview">
<img src="/website_slides/static/src/img/document.png" id="slide-image" title="Content Preview" alt="Content Preview" class="img-fluid"/>
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6">
<div class="img-thumbnail h-100">
<div class="o_slide_tutorial p-3">
<div class="h5">How to create a Lesson as a Web Page?</div>
<div class="mx-3 my-4">First, create your lesson, then edit it with the website builder. You'll be able to drop building blocks on your page and edit them.</div>
</div>
</div>
</div>
@@ -136,7 +141,7 @@
<div>
<form class="clearfix">
<div class="row">
<div id="o_wslides_js_slide_upload_left_column" class="col">
<div id="o_wslides_js_slide_upload_left_column" class="col-md-6">
<div class="form-group">
<label for="url" class="col-form-label">Youtube Link</label>
<input id="url" name="url" class="form-control" placeholder="Youtube Video URL" required="required"/>
@@ -144,9 +149,15 @@
<canvas id="data_canvas" class="d-none"></canvas>
<t t-call="website.slide.upload.modal.common"/>
</div>
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6 d-none">
<div class="img-thumbnail">
<div class="o_slide_preview">
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6">
<div class="img-thumbnail h-100">
<div class="o_slide_tutorial p-3">
<div class="h5">How to upload your videos ?</div>
<div class="mx-3 my-4">First, upload your videos on YouTube and mark them as <strong>unlisted</strong>. This way, they will be secured.</div>
<div class="mx-3 my-4">What does <strong>unlisted</strong> means? The YouTube unlisted meaning is a video which can be viewed only by the users having the link to it. Your video will never come up in the search results nor on your channel.</div>
<div class="mx-3 my-4"><a href="https://support.google.com/youtube/answer/157177" target="_blank" >Change video privacy settings</a></div>
</div>
<div class="o_slide_preview d-none">
<img src="/website_slides/static/src/img/document.png" id="slide-image" title="Content Preview" alt="Content Preview" class="img-fluid"/>
</div>
</div>
@@ -159,8 +170,21 @@
<t t-name="website.slide.upload.quiz">
<div>
<form class="clearfix">
<canvas id="data_canvas" class="d-none"></canvas>
<t t-call="website.slide.upload.modal.common"/>
<div class="row">
<div id="o_wslides_js_slide_upload_left_column" class="col-md-6">
<canvas id="data_canvas" class="d-none"></canvas>
<t t-call="website.slide.upload.modal.common"/>
</div>
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6">
<div class="img-thumbnail h-100">
<div class="o_slide_tutorial p-3">
<div class="h5">Test your students with small Quizzes</div>
<div class="mx-3 my-4">With Quizzes you can keep your students focused and motivated by answering some questions and gaining some karma points</div>
<img src="/website_slides/static/src/img/onboarding-quiz.png" title="Quiz Demo Data" class="img-fluid"/>
</div>
</div>
</div>
</div>
</form>
</div>
</t>
addons/website_slides_survey/controllers/slides.py
-1
View File
@@ -54,7 +54,6 @@ class WebsiteSlidesSurvey(WebsiteSlides):
# Create survey first as certification slide needs a survey_id (constraint)
post['survey_id'] = request.env['survey.survey'].create({
'title': post['survey']['title'],
'background_image': post['image_1920'],
'questions_layout': 'page_per_question',
'is_attempts_limited': True,
'attempts_limit': 1,
addons/website_slides_survey/static/src/xml/website_slide_upload.xml
+7 -10
View File
@@ -4,23 +4,20 @@
<div>
<form class="clearfix">
<div class="row">
<div class="col" id="o_wslides_js_slide_upload_left_column">
<div id="o_wslides_js_slide_upload_left_column" class="col-md-6">
<div class="form-group">
<label for="certification_id" class="col-form-label col-md-3">Certification</label>
<label for="certification_id" class="col-form-label">Certification</label>
<input class="form-control" id="certification_id" required="required"/>
</div>
<div class="form-group">
<label for="upload" class="col-form-label">Choose an Image</label>
<input id="upload" class="form-control" data-prevent-onchange='true' name="file" accept="image/*" type="file" required="required"/>
</div>
<t t-call="website.slide.upload.modal.common"/>
<canvas id="data_canvas" class="d-none"></canvas>
</div>
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6 d-none">
<div class="img-thumbnail">
<div class="o_slide_preview">
<img src="/website_slides/static/src/img/document.png" id="slide-image" title="Content Preview" alt="Content Preview" class="img-fluid"/>
<div id="o_wslides_js_slide_upload_preview_column" class="col-md-6">
<div class="img-thumbnail h-100">
<div class="o_slide_tutorial p-3">
<div class="h5">How to upload a certification on your course?</div>
<div class="mx-3 my-4">You can create your certification from here or use an existing one. Once your certification is created, you can still edit it in backend.</div>
</div>
</div>
</div>