ADAM / AIAHTML5

Commit 0a2ac62ad496903d3db47d13221d6e5a0cfc7477

Authored by unknown
2 parents b89f8c53 518ae30e

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

Inline Side-by-side
Showing 4 changed files with 5 additions and 1 deletions
150-DOCUMENTATION/Audit/Estimation/~$Ebix-Estimation Model_Health_Dev-Product Sprint 34(17-April-17).xlsx 0 → 100644
View file @0a2ac62
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @0a2ac62
@@ -68,6 +68,7 @@ @@ -68,6 +68,7 @@
68 <Content Include="app\views\da\da-view.html" /> 68 <Content Include="app\views\da\da-view.html" />
69 <Content Include="app\views\Home\printPreview.html" /> 69 <Content Include="app\views\Home\printPreview.html" />
70 <Content Include="app\views\LabExerc\lab-exercises-detail.html" /> 70 <Content Include="app\views\LabExerc\lab-exercises-detail.html" />
  71 + <Content Include="app\views\iframeresizer.html" />
71 <Content Include="app\views\Link\Link-view.html" /> 72 <Content Include="app\views\Link\Link-view.html" />
72 <Content Include="app\views\AnatTest\AnatTest-view.html" /> 73 <Content Include="app\views\AnatTest\AnatTest-view.html" />
73 <Content Include="app\views\AOD\AOD-view.html" /> 74 <Content Include="app\views\AOD\AOD-view.html" />
400-SOURCECODE/AIAHTML5.Web/app/views/Link/iframeresizer.html renamed to 400-SOURCECODE/AIAHTML5.Web/app/views/iframeresizer.html
  View file @0a2ac62
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 <title></title> 3 <title></title>
4 </head> 4 </head>
5 <body onload="parentIframeResize();" > 5 <body onload="parentIframeResize();" >
  6 +
6 <script type="text/javascript"> 7 <script type="text/javascript">
7 // Tell the parent iframe what height the iframe needs to be 8 // Tell the parent iframe what height the iframe needs to be
8 function parentIframeResize() { 9 function parentIframeResize() {
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @0a2ac62
@@ -660,7 +660,8 @@ @@ -660,7 +660,8 @@
660 <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="removeToolTipOnMouseOut()"><i class="fa fa-eraser"></i></button>-->&nbsp; 660 <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="removeToolTipOnMouseOut()"><i class="fa fa-eraser"></i></button>-->&nbsp;
661 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;"> 661 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
662 <div style="width: 58px; float: left;" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"> 662 <div style="width: 58px; float: left;" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()">
663 - <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="rese 663 + <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
  664 + </div>
664 <div style="width: 22px; float: left;"> 665 <div style="width: 22px; float: left;">
665 <div style="width: 100%; float: left; height: 16px;"> 666 <div style="width: 100%; float: left; height: 16px;">
666 <button type="button" id="btnBrushSizeIncrement" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> 667 <button type="button" id="btnBrushSizeIncrement" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
@@ -677,6 +678,7 @@ @@ -677,6 +678,7 @@
677 678
678 </div> 679 </div>
679 680
  681 +
680 <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;"> 682 <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
681 <div id="slider-range-min-2" ng-mouseover="addToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"></div> 683 <div id="slider-range-min-2" ng-mouseover="addToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()"></div>
682 </div> 684 </div>