Skip to content

Commit

Permalink
Merge pull request #113 from annagav/feature/facs_video_105
Browse files Browse the repository at this point in the history
facs: progress bar fixed, video added
pdpinch committed Mar 18, 2015
2 parents 4acf1c6 + 5748077 commit fefa82d
Showing 3 changed files with 100 additions and 11 deletions.
14 changes: 9 additions & 5 deletions html_app/ui/FacsView.js
Original file line number Diff line number Diff line change
@@ -1394,17 +1394,21 @@ scb.ui.FacsView = function scb_ui_FacsView(gstate) {
$(".scb_s_facs_selected").keypress(function(e){ return e.which != 13; });

if(kind == 'analyze'){
//correct offset caused in FACS to align all parts of progress bar correctly
$('.scb_s_western_blot_progress_gray_bar').children().each(function () { console.log($(this).css('left'));
$(this).css('left', parseInt($(this).css('left'))-5+'px');
});
$('.scb_s_western_blot_progress_bar').addClass('scb_s_facs_bar');
$('.scb_s_facs_single_range_button').button();
$('.scb_s_facs_double_range_button').button();
if(state.facs.samples_finished && state.facs.selected_lane.bisector_gate_created)
$('.scb_s_facs_double_range_button').button('disable');

}

var elem = document.getElementById('slider');
window.mySwipe = Swipe(elem, {
continuous: false,
disableScroll: true,
transitionEnd: function(index, element) {
$('.slider_dots li').attr('class','');
$($('.slider_dots li')[index]).attr('class','on');}
});


document.body.scrollTop = state.experiment.last_scroll;
68 changes: 63 additions & 5 deletions html_app/ui/facs.gss
Original file line number Diff line number Diff line change
@@ -6,6 +6,62 @@
/* @alternate */ background-image: -o-linear-gradient(POS, START_COLOR, END_COLOR); /* Opera 11.10+ */
}

.scb_s_facs_video_box_wrapper {
width: 199px;
height:190px;
background-color: #e1e3e8;
border-radius: 5px;
border: 2px solid #f2f3f5;
position: absolute;
right: -79px;
top:36px;
}

.scb_s_facs_video_box_wrapper_title {
text-align: center;
font-size: 16pt;
margin-bottom: -27px;
}
.scb_s_facs_video_box {
width: 240px;
height:188px;
margin-left:8px;
margin-top:24px;
overflow:hidden;
font-size: 8pt;
}

.scb_s_facs_video_box_img {
width: 145px;
height: 102px;
padding-left: 17px;
}

.scb_s_facs_video_heading{
color: black;
font-size: 7.5pt;
font-family: 'sourcesanspro-semibold';
display: inline-block !important;
width: auto !important;
height: auto !important;
}

.scb_facs_video_text{
color:black;
font-size: 7.5pt;
font-family: 'sourcesanspro-regular';
display: inline !important;
width: 187px !important;
}

.scb_s_facs_video_text_second{
color:black;
font-size: 7.5pt;
font-family: 'sourcesanspro-regular';
display: inline !important;
width: 187px !important;
}


.scb_s_facs_chart_wrapper {
position: relative;
@@ -91,8 +147,9 @@
.scb_s_facs_progress {
display: block;
width:800px;
height:120px;
margin-left:25px;
height:80px;
margin-left: -5px;
position:relative;
}

.scb_s_facs_progress_rest {
@@ -294,7 +351,7 @@ background-color:#676767 !important;
background-color: #b0b0b0;
height:12px;
top:55px;
left: 75px;
left: 50px;
}


@@ -305,7 +362,7 @@ background-color:#676767 !important;
background-color: #b0b0b0;
height:12px;
top:55px;
left: 349px;
left: 324px;
}


@@ -316,7 +373,7 @@ background-color:#676767 !important;
background-color: #b0b0b0;
height:12px;
top:55px;
left: 622px;
left: 597px;
}

.scb_s_facs_cell_treatment{
@@ -501,6 +558,7 @@ input[type=radio]:disabled{
}

.scb_s_facs_samples_container{
margin-top: 180px;
position: relative;
left: 16px;
width: 856px;
29 changes: 28 additions & 1 deletion html_app/ui/facs.soy
Original file line number Diff line number Diff line change
@@ -454,6 +454,33 @@ FACS Main View
*/
{template .display_facs_progress}
<div class='scb_s_facs_progress'>
{if $step == 1}
<div class='scb_s_facs_video_box_wrapper'>
<div class='scb_s_facs_video_box_wrapper_title'>
IN THE LAB
</div>
<div id='slider' class='scb_s_facs_video_box swipe'>
<div class='slides_container swipe-wrap'>
<div>
<iframe height="124" width="187" controls="0" class='scb_s_experiment_setup_video_box_vid' src="https://www.youtube.com/embed/2P7YsJ0Zkio" frameborder="0"></iframe>
</div>
<div>
<iframe height="124" width="187" controls="0" class='scb_s_experiment_setup_video_box_vid' src="https://www.youtube.com/embed/pFtO0xxJL9s" frameborder="0"></iframe>
</div>
</div>
</div>
<div class='slider_controls' style='text-align:center;'>
<button onclick='mySwipe.prev()'>&#x25c0;</button>
<nav id = 'nav'>
<ul class='slider_dots'>
<li class='on'></li>
<li ></li>
</ul>
</nav>
<button onclick='mySwipe.next()'>&#x25b6;</button>
</div>
</div>
{/if}

<div class='scb_s_facs_vertical_line_1' role='presentation'></div>
<div class='scb_s_facs_vertical_line_4' role='presentation'></div>
@@ -467,7 +494,7 @@ FACS Main View
<div class='scb_s_western_blot_progress_stripe_bar' style='width:
{if $step== 1}20px;{/if}
{if $step== 2} 289px;{/if}
{if $step== 2} 294px;{/if}
{if $step== 3}607px; border-top-right-radius:8px; border-bottom-right-radius:8px;{/if}'

aria-label='

0 comments on commit fefa82d

Please sign in to comment.