ADAM / AIAHTML5

Commit 005e31fb125d6db5691338517b9612ab084892bb

Authored by unknown
1 parent 0270d7e6

Commit changes for Ref: 

Issue#7547 :Once the edit shape style popup is opened if user clicks and drag popup gets displaced from its original position.
Inline Side-by-side
Showing 3 changed files with 140 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @005e31f
@@ -264,6 +264,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -264,6 +264,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
264 $rootScope.shapestyle = function (id) { 264 $rootScope.shapestyle = function (id) {
265 265
266 document.getElementById('modelbackground').style.display = "none"; 266 document.getElementById('modelbackground').style.display = "none";
  267 + document.getElementById('modeleditstyle').style.display = "none";
267 268
268 $rootScope.shapestyleOpacity = $("#" + id).css('opacity'); 269 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
269 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color'); 270 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
@@ -275,19 +276,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -275,19 +276,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
275 $rootScope.shapestyleborderWidth = intPart[0]; 276 $rootScope.shapestyleborderWidth = intPart[0];
276 $rootScope.shapestyleborderStyles = "solid"; 277 $rootScope.shapestyleborderStyles = "solid";
277 278
278 - $('#editshapestyle').modal('hide'); 279 + // $('#editshapestyle').modal('hide');
279 } 280 }
280 281
281 $rootScope.enableAnnotationToolBar = function () { 282 $rootScope.enableAnnotationToolBar = function () {
282 283
283 document.getElementById('modelbackground').style.display = "block"; 284 document.getElementById('modelbackground').style.display = "block";
284 - $("#editshapestyle").modal('show'); 285 + // $("#editshapestyle").modal('show');
  286 + document.getElementById('modeleditstyle').style.display = "block";
285 287
286 } 288 }
287 289
288 $rootScope.disableAnnotationToolBar = function () { 290 $rootScope.disableAnnotationToolBar = function () {
289 291
290 document.getElementById('modelbackground').style.display = "none"; 292 document.getElementById('modelbackground').style.display = "none";
  293 + document.getElementById('modeleditstyle').style.display = "none";
291 294
292 } 295 }
293 296
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @005e31f
@@ -662,7 +662,131 @@ @@ -662,7 +662,131 @@
662 662
663 663
664 <!--Edit Shape Modal--> 664 <!--Edit Shape Modal-->
665 - <div class="modal fade" id="editshapestyle" tabindex="-1" role="dialog" aria-labelledby="myModalLabel33" style="z-index:1000000000;width:302px;margin-left:auto;margin-right:auto;overflow:hidden;height:460px;"> 665 +
  666 +
  667 + <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white; height: 433px; width: 302px;position:absolute;left:40%;top:70px;">
  668 + <div class="modal-content">
  669 + <div class="modal-header annotation-modal-header">
  670 + <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
  671 + </div>
  672 + <div class="modal-body">
  673 + <div class="marginTopBtm10">
  674 + <div class="well well-sm no-margin-btm">
  675 + <div class="row">
  676 + <div class="col-sm-12">
  677 + <div class="checkbox no-margin">
  678 + <label>
  679 + <input id="fill-option" type="checkbox" checked onclick="enableDisableFillOption()"> Fill Option
  680 + </label>
  681 + </div>
  682 + </div>
  683 + <div class="col-sm-6 enableDisableOpacity">
  684 + <div class="radio">
  685 + <label>
  686 + <input type="radio" name="filloption" id="filloption1" value="filloption1">
  687 + <span class="">Texture</span>
  688 + <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
  689 + </label>
  690 + </div>
  691 + <div class="radio">
  692 + <label>
  693 + <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
  694 +
  695 +
  696 + <div id="editstylebackgroundcolor" class="form-group" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
  697 + <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
  698 + <input type="text" class="form-control outerBackgroundColor" data-control="saturation" style="display:none;" value="#0088cc">
  699 + </div>
  700 +
  701 +
  702 + </label>
  703 + </div>
  704 + </div>
  705 + <div class="col-sm-6 no-padding marginTop10 enableDisableOpacity">
  706 + <div class="row">
  707 + <label class="pull-left" style="font-weight:normal;">Scale</label>
  708 + <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;">
  709 + <div id="slider-range-min-3"></div>
  710 + </div>
  711 + </div>
  712 +
  713 + <div class="row">
  714 + <label class="pull-left" style="font-weight:normal;">Opacity</label>
  715 + <div id="edit-slider-4" class="pull-left" style="width:53%; margin-left:3%; margin-top:2%;">
  716 + <div id="slider-range-min-4"></div>
  717 + </div>
  718 + </div>
  719 +
  720 + <div class="clearfix"></div>
  721 +
  722 +
  723 + </div>
  724 + </div>
  725 +
  726 + </div>
  727 + </div>
  728 + <div class="marginTopBtm10">
  729 + <div class="well well-sm no-margin-btm">
  730 + <div class="row">
  731 + <div class="col-sm-12">
  732 + <div class="checkbox no-margin">
  733 + <label>
  734 + <input id="Outline-Option" onclick="enableDisableOutline()" type="checkbox" checked> Outline Option
  735 + </label>
  736 + </div>
  737 + </div>
  738 + <div class="col-sm-6 setEnableDisableForEditShapeStyle">
  739 + <label class="marginTop5">
  740 + <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
  741 + <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
  742 +
  743 + <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc">
  744 + </div>
  745 +
  746 +
  747 + </label>
  748 + </div>
  749 +
  750 + <div class="col-sm-6 setEnableDisableForEditShapeStyle">
  751 + <div class="form-horizontal">
  752 + <div class="form-group">
  753 + <label class="col-sm-3 control-label" style=" font-weight:normal; padding-top:9px;">Size</label>
  754 + <div class="col-sm-9 marginTop5">
  755 + <select id="borderWidthCanvasElement" class="form-control input-sm">
  756 + <option value="1">1</option>
  757 + <option value="2">2</option>
  758 + <option value="3">3</option>
  759 + <option value="4">4</option>
  760 + <option value="5">5</option>
  761 + </select>
  762 + </div>
  763 + </div>
  764 + </div>
  765 + </div>
  766 +
  767 + </div>
  768 + </div>
  769 + </div>
  770 +
  771 + <div class="marginTopBtm10">
  772 + <div class="well well-sm no-margin-btm">
  773 + <img id="imgOpacity" class="img-rounded img-responsive imgopacity" alt="..." src="content/images/blank-shape.jpg">
  774 + </div>
  775 + </div>
  776 + </div>
  777 + <div class="modal-footer">
  778 + <button type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')">
  779 + OK
  780 + </button>
  781 + <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
  782 + </div>
  783 + </div>
  784 + </div>
  785 +
  786 +
  787 +
  788 +
  789 + <!--<div class="modal fade" id="editshapestyle" tabindex="-1" role="dialog" aria-labelledby="myModalLabel33" style="z-index:1000000000;width:302px;margin-left:auto;margin-right:auto;overflow:hidden;height:460px;">
666 <div class="modal-dialog modal-sm" role="document"> 790 <div class="modal-dialog modal-sm" role="document">
667 <div class="modal-content"> 791 <div class="modal-content">
668 <div class="modal-header annotation-modal-header"> 792 <div class="modal-header annotation-modal-header">
@@ -698,9 +822,7 @@ @@ -698,9 +822,7 @@
698 </div> 822 </div>
699 823
700 824
701 - <!--<span class="">Color</span> <img src="img/color-picker.png" alt="" class="color-picker">-->  
702 - <!--<span class="demo2" data-control="hue" style="font-weight:normal;">Color</span>-->  
703 - <!--<img src="img/color-picker.png" alt="" class="color-picker">--> 825 +
704 </label> 826 </label>
705 </div> 827 </div>
706 </div> 828 </div>
@@ -709,7 +831,7 @@ @@ -709,7 +831,7 @@
709 <label class="pull-left" style="font-weight:normal;">Scale</label> 831 <label class="pull-left" style="font-weight:normal;">Scale</label>
710 <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;"> 832 <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;">
711 <div id="slider-range-min-3"></div> 833 <div id="slider-range-min-3"></div>
712 - <!--<p>Your slider has a value of <span id="slider-value"></span></p>--> 834 +
713 </div> 835 </div>
714 </div> 836 </div>
715 837
@@ -741,14 +863,12 @@ @@ -741,14 +863,12 @@
741 <div class="col-sm-6 setEnableDisableForEditShapeStyle"> 863 <div class="col-sm-6 setEnableDisableForEditShapeStyle">
742 <label class="marginTop5"> 864 <label class="marginTop5">
743 <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span> 865 <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
744 - <!--<span class="demo " data-control="hue" style="float:left;">&nbsp;</span>-->  
745 <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;"> 866 <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
746 867
747 <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc"> 868 <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc">
748 </div> 869 </div>
749 870
750 871
751 - <!--<img src="img/color-picker.png" alt="" class="color-picker">-->  
752 </label> 872 </label>
753 </div> 873 </div>
754 874
@@ -787,7 +907,7 @@ @@ -787,7 +907,7 @@
787 </div> 907 </div>
788 </div> 908 </div>
789 </div> 909 </div>
790 - </div> 910 + </div>-->
791 911
792 <script> 912 <script>
793 function enableDisableFillOption() 913 function enableDisableFillOption()
@@ -977,6 +1097,7 @@ @@ -977,6 +1097,7 @@
977 $(function () { 1097 $(function () {
978 $(".modal").draggable(); 1098 $(".modal").draggable();
979 $(".annotationTollbar").draggable(); 1099 $(".annotationTollbar").draggable();
  1100 + $(".modeleditstyle").draggable();
980 }); 1101 });
981 </script> 1102 </script>
982 1103
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @005e31f
@@ -842,4 +842,10 @@ cursor:pointer; @@ -842,4 +842,10 @@ cursor:pointer;
842 height:100%; 842 height:100%;
843 843
844 filter: Alpha(opacity=50); / IE8 and earlier / 844 filter: Alpha(opacity=50); / IE8 and earlier /
  845 +}
  846 +
  847 +
  848 +.modeleditstyle
  849 + {
  850 + display:none;
845 } 851 }
846 \ No newline at end of file 852 \ No newline at end of file