ADAM / AIAHTML5

Commit c269a51fbffe4cf745e9dbc1b2c925bd70d51707

Authored by Amrita Vishnoi
2 parents 6aceb76b bf715664

Merge branch 'jspannelheightissue' into Develop

Inline Side-by-side
Showing 2 changed files with 6 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c269a51
... ... @@ -3341,6 +3341,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3341 3341 document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
3342 3342 document.getElementById('spnModuleLan').innerHTML = curModule;
3343 3343 document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
  3344 + if ($('#printcontainer').length > 0) {
  3345 + $("#printcontainer").css('width', $(window).outerWidth());
  3346 + $("#printcontainer").css('height', $(window).outerHeight());
  3347 + }
3344 3348 }, 320);
3345 3349 }
3346 3350  
... ... @@ -3369,7 +3373,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3369 3373 top: 70,
3370 3374 left: 1,
3371 3375 },
3372   - size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
  3376 + size: { width: $(window).outerWidth(), height: $(window).outerHeight() + 60},
3373 3377 });
3374 3378 }
3375 3379  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/Home/printPreview.html
  View file @c269a51
... ... @@ -30,7 +30,7 @@
30 30 </div>
31 31 <div class="clearfix"></div>
32 32 </div>
33   - <div class="pp-col-sm-12 well" align="center" style="overflow-y: auto; width: 100%; height: 490px;">
  33 + <div class="pp-col-sm-12 well" align="center" id="printcontainer" style="overflow-y: auto;">
34 34 <div class="print-paper" id="dvPP">
35 35 <div class="print-box portrait-box" id="printBoxPor">
36 36 <div id="printDivContent">
... ...