Skip to content
Snippets Groups Projects
Commit 043df1d9 authored by Loïs Poujade's avatar Loïs Poujade
Browse files

Fixes from demo

- change playback rate icon
- pause on paste annotation
- padding under settings button
- reset filter on line upper
- "playback rate" title + reduce size (& size of labels)
- message sf danger/warning don't disapear
- prevent crash on capsule with a bad video url
parent 8b138036
Branches
Tags
No related merge requests found
Pipeline #1096 failed
...@@ -28,6 +28,6 @@ $(function() { ...@@ -28,6 +28,6 @@ $(function() {
$("document").ready(function(){ $("document").ready(function(){
setTimeout(function(){ setTimeout(function(){
$(".flash-message").remove(); $(".flash-message:not(.alert-danger):not(.alert-warning)").remove();
}, 5000 ); // 5 secs }, 5000 ); // 5 secs
}); });
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.playback_form label { .playback_form label {
background-color: rgba(0, 0, 0, .5); background-color: rgba(0, 0, 0, .5);
padding: 4px; padding: 2px;
box-shadow: 2px 2px 2px 1px rgba(0, 0, 0, 0.2); box-shadow: 2px 2px 2px 1px rgba(0, 0, 0, 0.2);
} }
......
...@@ -49,3 +49,7 @@ ...@@ -49,3 +49,7 @@
#left_menu_item_preview::before { content: url('images/icn-menu-preview.png'); } #left_menu_item_preview::before { content: url('images/icn-menu-preview.png'); }
#left_menu_item_settings::before { content: url('images/icn-menu-settings.png');} #left_menu_item_settings::before { content: url('images/icn-menu-settings.png');}
#left_menu_item_settings {
margin-bottom: 5px;
}
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
} }
#popupSpeedInput label { #popupSpeedInput label {
margin: 2px; margin: 1px;
font-size: 15px;
} }
#popupSpeedInput label:first-child { #popupSpeedInput label:first-child {
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
max-height: 300px; max-height: 300px;
align-content: first baseline; align-content: first baseline;
overflow: auto; overflow: auto;
font-size: 15px;
} }
#popupLabelsInput label { #popupLabelsInput label {
...@@ -52,6 +54,7 @@ ...@@ -52,6 +54,7 @@
margin: 0; margin: 0;
margin-bottom: 2px; margin-bottom: 2px;
font-size: 100%; font-size: 100%;
font-size: 15px;
} }
#popupSpace, #popupAlertSpace, #popupAddLinkSpace, #popupSettingsSpace { #popupSpace, #popupAlertSpace, #popupAddLinkSpace, #popupSettingsSpace {
......
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</ul> </ul>
<div class='flex-col'> <div class='flex-col'>
<input type='checkbox' id='inp_playback_rate_dropdown' class='dropdown_control' /> <input type='checkbox' id='inp_playback_rate_dropdown' class='dropdown_control' />
<label for ='inp_playback_rate_dropdown' class='left_menu_item' title='change playback rate'><i class='fas fa-play'></i></label> <label for ='inp_playback_rate_dropdown' class='left_menu_item' title='change playback rate'><i class='fas fa-forward'></i></label>
<form id='playback_speed_form' class='dropdown_content flex-col playback_form'> <form id='playback_speed_form' class='dropdown_content flex-col playback_form'>
<input type='radio' id='playback_speed_025' value='0.25' name='playback_rate' /> <input type='radio' id='playback_speed_025' value='0.25' name='playback_rate' />
<label class='left_menu_item' for='playback_speed_025'>0.25</label> <label class='left_menu_item' for='playback_speed_025'>0.25</label>
......
...@@ -160,15 +160,17 @@ ...@@ -160,15 +160,17 @@
} }
const fillPanel = function () { const fillPanel = function () {
let resetfilterdiv = $('<div/>').addClass('mosaic_filter');
let typefilterdiv = $('<div/>').addClass('mosaic_filter'); let typefilterdiv = $('<div/>').addClass('mosaic_filter');
let labelsfilterdiv = $('<div/>').addClass('mosaic_filter'); let labelsfilterdiv = $('<div/>').addClass('mosaic_filter');
typefilterdiv.append(getFilterElement( resetfilterdiv.append(getFilterElement(
'Reset filters', 'Reset filters',
'rgb(100,100,100)', 'rgb(100,100,100)',
localOptions._resetFilters, localOptions._resetFilters,
'mosaic_filter_item_all', 'mosaic_filter_item_all',
false false
)); ));
localOptions.htmlElement().append(resetfilterdiv);
localOptions.htmlElement().append(typefilterdiv); localOptions.htmlElement().append(typefilterdiv);
localOptions.htmlElement().append(labelsfilterdiv); localOptions.htmlElement().append(labelsfilterdiv);
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
......
...@@ -625,6 +625,8 @@ AnnotationSpeedPanelEdition.prototype.appendInputEditorDiv = function (parentDiv ...@@ -625,6 +625,8 @@ AnnotationSpeedPanelEdition.prototype.appendInputEditorDiv = function (parentDiv
that.closeEdition.call(that); that.closeEdition.call(that);
}) })
var title = $('<div>').addClass('popupNewTitles').html('+ Playback rate');
parentDiv.append(title);
parentDiv.append(this.readonlyDiv); parentDiv.append(this.readonlyDiv);
} }
AnnotationSpeedPanelEdition.prototype.closeEdition = function () { AnnotationSpeedPanelEdition.prototype.closeEdition = function () {
......
...@@ -1004,8 +1004,16 @@ $(window).resize(function(e) { ...@@ -1004,8 +1004,16 @@ $(window).resize(function(e) {
}); });
$(window).trigger("resize"); $(window).trigger("resize");
function openPasteModal() { $('#paste_modal').css('display', 'flex'); $('#paste_modal_content').first().focus() } function openPasteModal() {
function closePasteModal() { $('#paste_modal').hide(); $('#paste_modal_content').empty(); } $('#paste_modal').css('display', 'flex');
$('#paste_modal_content').first().focus();
rekall.timeline.pause();
}
function closePasteModal() {
$('#paste_modal').hide();
$('#paste_modal_content').empty();
}
function openImageEdition(message, tag) { function openImageEdition(message, tag) {
$('#edit_pic_modal').show(); $('#edit_pic_modal').show();
......
...@@ -200,6 +200,7 @@ class Capsule ...@@ -200,6 +200,7 @@ class Capsule
return null; return null;
} }
try {
$project_retriever = new ProjectRetriever($this); $project_retriever = new ProjectRetriever($this);
$video_url = $project_retriever->getVideoUrl(); $video_url = $project_retriever->getVideoUrl();
$video_id = $project_retriever->getVideoId($video_url); $video_id = $project_retriever->getVideoId($video_url);
...@@ -217,6 +218,9 @@ class Capsule ...@@ -217,6 +218,9 @@ class Capsule
} }
return 'https://vumbnail.com/' . $video_id . '.jpg'; return 'https://vumbnail.com/' . $video_id . '.jpg';
} catch (\Exception $e) {
return null;
}
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment