Commit 34c983dcb2f1f36ca66fe1fb8cc0be4e4eec70d3

Authored by Amrita Vishnoi
2 parents b48791d1 22e24f93

Merge branch 'logoexprtimageissue' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

400-SOURCECODE/AIAHTML5.Web/index.html
... ... @@ -1893,6 +1893,7 @@
1893 1893 <script>
1894 1894 $(function () {
1895 1895 $("#btnSaveEI").click(function () {
  1896 + $("#canvasDiv").append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
1896 1897 html2canvas($("#canvasDiv"), {
1897 1898 onrendered: function (canvas) {
1898 1899 theCanvas = canvas;
... ... @@ -1902,6 +1903,7 @@
1902 1903 var dataURL = canvas.toDataURL("image/jpeg");
1903 1904 var blob = dataURItoBlob(dataURL);
1904 1905 saveAs(blob, fileName);
  1906 + $("#exportlogo").remove();
1905 1907 $("#filename").val("");
1906 1908 }
1907 1909 });
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
... ... @@ -1025,4 +1025,11 @@ background-size:cover;
1025 1025 {
1026 1026 height:175px;
1027 1027 }
1028   -
  1028 +
  1029 +#exportlogo
  1030 + {
  1031 +
  1032 + bottom: 50PX;
  1033 + position: fixed;
  1034 + right: 50px;
  1035 +}
... ...