Skip to content

Commit

Permalink
Dev: stretch accordion, second part
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Dec 11, 2015
1 parent f09c0ac commit 1980a23
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 21 deletions.
8 changes: 7 additions & 1 deletion application/views/admin/survey/Question/editQuestion_view.php
View file
Expand Up @@ -36,7 +36,7 @@
</div>

<!-- The Accordion -->
<div class="col-lg-4">
<div class="col-lg-4" id="accordion-container" style="background-color: #fff;">
<?php
// TODO : find why the $groups can't be generated from controller
?>
Expand All @@ -45,6 +45,9 @@
<div class="panel panel-default" id="questionTypeContainer">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
<?php eT("General option");?>
</a>
Expand Down Expand Up @@ -178,6 +181,9 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingTwo">
<h4 class="panel-title">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
<?php eT("Advanced settings"); ?>
</a>
Expand Down
8 changes: 7 additions & 1 deletion application/views/admin/survey/Question/newQuestion_view.php
View file
Expand Up @@ -21,7 +21,7 @@
</div>

<!-- The Accordion -->
<div class="col-lg-4" style="padding-left: 0px; padding-right: 0px;">
<div class="col-lg-4" id="accordion-container" style="background-color: #fff;">
<?php
// TODO : find why the $groups can't be generated from controller
// $this->renderPartial('./survey/Question/newQuestion_subviews/_accordion_container', $accordionDatas);
Expand All @@ -35,6 +35,9 @@
<!-- General Options : Header -->
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
<?php eT("General option");?>
</a>
Expand Down Expand Up @@ -154,6 +157,9 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingTwo">
<h4 class="panel-title">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
<?php eT("Advanced settings"); ?>
</a>
Expand Down
6 changes: 6 additions & 0 deletions application/views/admin/survey/Question/question_subviews/_accordion_container.php
View file
Expand Up @@ -3,6 +3,9 @@
<div class="panel panel-default" id="questionTypeContainer">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
<?php eT("General option");?>
</a>
Expand Down Expand Up @@ -121,6 +124,9 @@
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingTwo">
<h4 class="panel-title">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
<?php eT("Advanced settings"); ?>
</a>
Expand Down
44 changes: 25 additions & 19 deletions styles/Sea_Green/scripts/sidemenu.js
View file
Expand Up @@ -256,32 +256,38 @@ jQuery(document).on('click', '#chevronStretch.opened', function(){
});

$('#accordion').on('shown.bs.collapse', function () {
alert('ok');
sideBodyHeight = sideBody.height();
accordionHeight = $('#accordion').height();
if( sideBodyHeight < ( accordionHeight + 250 ) ){
sideBody.height( sideBodyHeight + ( accordionHeight - sideBodyHeight ) + 250 );
}
})
});





/**
* Stick the side menu and the survey bar to the top
*/
$(function()
{
$(window).scroll(function() { //when window is scrolled
$toTop = ($('.surveybar').offset().top - $(window).scrollTop());

if($toTop <= 0)
{
$('.surveybar').addClass('navbar-fixed-top');
$('.side-menu').css({position:"fixed", top: "45px"});
}

if( $(window).scrollTop() <= 45)
{
$('.surveybar').removeClass('navbar-fixed-top');
$('.side-menu').css({position:"absolute", top: "auto"});
}
});
if ( $('.surveybar').length ) {
var surveybar = $('.surveybar');
var sidemenu = $('.side-menu');

$(window).scroll(function() {
$toTop = (surveybar.offset().top - $(window).scrollTop());

if($toTop <= 0)
{
surveybar.addClass('navbar-fixed-top');
sidemenu.css({position:"fixed", top: "45px"});
}

if( $(window).scrollTop() <= 45)
{
surveybar.removeClass('navbar-fixed-top');
sidemenu.css({position:"absolute", top: "auto"});
}
});
}
});

0 comments on commit 1980a23

Please sign in to comment.