Fixed issue #10618: Unable to see whole content if survey title is big

LimeSurvey · Mar 8, 2016 · 64d333c · 64d333c · Shnoulle · Mar 8, 2016
1 parent ea879fe
commit 64d333c
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 21 deletions.
diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -1,5 +1,6 @@
- body {
-     padding-top: 50px;
+ body
+ {
+     /*padding-top: 50px; now define in JS to fit any title length */
      padding-bottom: 10px;
  }
 
@@ -20,7 +21,7 @@ div[id^="group-"]>div {
 
 #topContainer {
     position: absolute;
-    top: 55px;
+    /*top: 55px; now define in JS to fit any title length */
     width: 100%;
     padding: 1em;
     border-bottom: none;
@@ -843,3 +844,7 @@ html body .navbar.navbar-default.navbar-fixed-top {
 .gender-button .gender-icon {
     font-size: 2em;
 }
+
+.navbar-brand {
+    height: auto;
+}
diff --git a/templates/default/scripts/template.js b/templates/default/scripts/template.js
@@ -96,14 +96,21 @@ $(document).ready(function(){
         }
     }
 
-    var outerframeDistanceFromTop = 50;
+    //var outerframeDistanceFromTop = 50;
+    //topsurveymenubar
+    var topsurveymenubarHeight = $('#topsurveymenubar').innerHeight();
+    var outerframeDistanceFromTop = topsurveymenubarHeight;
     // Manage top container
     if(!$.trim($('#topContainer .container').html()))
     {
         $('#topContainer').hide();
     }
     else
     {
+        $('#topContainer').css({
+            top: topsurveymenubarHeight+'px',
+        });
+
         $topContainerHeight = $('#topContainer').height();
         outerframeDistanceFromTop += $topContainerHeight;
     }

diff --git a/templates/default/views/startpage.pstpl b/templates/default/views/startpage.pstpl
@@ -14,7 +14,7 @@
 </head>
 <body class="default lang-{SURVEYLANGUAGE} {SURVEYFORMAT}">
 
-    <nav class="navbar navbar-default navbar-fixed-top">
+    <nav class="navbar navbar-default navbar-fixed-top" id="topsurveymenubar">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -23,7 +23,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="#">{SURVEYNAME}</a>
+          <a class="navbar-brand col-xs-8" href="#">{SURVEYNAME}</a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">

diff --git a/templates/news_paper/css/template.css b/templates/news_paper/css/template.css
@@ -1,5 +1,6 @@
- body {
-     padding-top: 50px;
+ body
+ {
+     /*padding-top: 50px; now define in JS to fit any title length */
      padding-bottom: 10px;
  }
 
@@ -20,7 +21,7 @@ div[id^="group-"]>div {
 
 #topContainer {
     position: absolute;
-    top: 55px;
+    /*top: 55px; now define in JS to fit any title length */
     width: 100%;
     padding: 1em;
     border-bottom: none;
@@ -843,3 +844,7 @@ html body .navbar.navbar-default.navbar-fixed-top {
 .gender-button .gender-icon {
     font-size: 2em;
 }
+
+.navbar-brand {
+    height: auto;
+}
diff --git a/templates/news_paper/scripts/template.js b/templates/news_paper/scripts/template.js
@@ -96,14 +96,21 @@ $(document).ready(function(){
         }
     }
 
-    var outerframeDistanceFromTop = 50;
+    //var outerframeDistanceFromTop = 50;
+    //topsurveymenubar
+    var topsurveymenubarHeight = $('#topsurveymenubar').innerHeight();
+    var outerframeDistanceFromTop = topsurveymenubarHeight;
     // Manage top container
     if(!$.trim($('#topContainer .container').html()))
     {
         $('#topContainer').hide();
     }
     else
     {
+        $('#topContainer').css({
+            top: topsurveymenubarHeight+'px',
+        });
+
         $topContainerHeight = $('#topContainer').height();
         outerframeDistanceFromTop += $topContainerHeight;
     }

diff --git a/templates/news_paper/views/startpage.pstpl b/templates/news_paper/views/startpage.pstpl
@@ -14,7 +14,7 @@
 </head>
 <body class="default lang-{SURVEYLANGUAGE} {SURVEYFORMAT}">
 
-    <nav class="navbar navbar-default navbar-fixed-top">
+    <nav class="navbar navbar-default navbar-fixed-top" id="topsurveymenubar">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -23,7 +23,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="#">{SURVEYNAME}</a>
+          <a class="navbar-brand col-xs-8" href="#">{SURVEYNAME}</a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">

diff --git a/templates/ubuntu_orange/css/template.css b/templates/ubuntu_orange/css/template.css
@@ -1,5 +1,6 @@
- body {
-     padding-top: 50px;
+ body
+ {
+     /*padding-top: 50px; now define in JS to fit any title length */
      padding-bottom: 10px;
  }
 
@@ -20,7 +21,7 @@ div[id^="group-"]>div {
 
 #topContainer {
     position: absolute;
-    top: 55px;
+    /*top: 55px; now define in JS to fit any title length */
     width: 100%;
     padding: 1em;
     border-bottom: none;
@@ -843,3 +844,7 @@ html body .navbar.navbar-default.navbar-fixed-top {
 .gender-button .gender-icon {
     font-size: 2em;
 }
+
+.navbar-brand {
+    height: auto;
+}
diff --git a/templates/ubuntu_orange/css/ubuntu_orange.css b/templates/ubuntu_orange/css/ubuntu_orange.css
diff --git a/templates/ubuntu_orange/scripts/template.js b/templates/ubuntu_orange/scripts/template.js
@@ -96,14 +96,21 @@ $(document).ready(function(){
         }
     }
 
-    var outerframeDistanceFromTop = 50;
+    //var outerframeDistanceFromTop = 50;
+    //topsurveymenubar
+    var topsurveymenubarHeight = $('#topsurveymenubar').innerHeight();
+    var outerframeDistanceFromTop = topsurveymenubarHeight;
     // Manage top container
     if(!$.trim($('#topContainer .container').html()))
     {
         $('#topContainer').hide();
     }
     else
     {
+        $('#topContainer').css({
+            top: topsurveymenubarHeight+'px',
+        });
+
         $topContainerHeight = $('#topContainer').height();
         outerframeDistanceFromTop += $topContainerHeight;
     }

diff --git a/templates/ubuntu_orange/views/startpage.pstpl b/templates/ubuntu_orange/views/startpage.pstpl
@@ -14,7 +14,7 @@
 </head>
 <body class="default lang-{SURVEYLANGUAGE} {SURVEYFORMAT}">
 
-    <nav class="navbar navbar-default navbar-fixed-top">
+    <nav class="navbar navbar-default navbar-fixed-top" id="topsurveymenubar">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -23,7 +23,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="#">{SURVEYNAME}</a>
+          <a class="navbar-brand col-xs-8" href="#">{SURVEYNAME}</a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">