ADAM / AIAHTML5

Commit 3be6d2b9e7282b4a3235e0100dcfdfabe0601d52

Authored by Nikita Kulshreshtha
2 parents a778af24 aaf71d8d

Merge branch 'ListManagerTriangleButtonIssue' into Develop

Inline Side-by-side
Showing 2 changed files with 20 additions and 29 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @3be6d2b
... ... @@ -2744,7 +2744,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2744 2744 }
2745 2745 });
2746 2746 };
  2747 + $rootScope.restrictBodySystemList = function () {
  2748 + var RestrictListDiv = document.getElementById("restrictListDiv");
  2749 + if (RestrictListDiv.style.display == 'block') {
  2750 + RestrictListDiv.style.display = 'none';
  2751 + $(".restrict-carret-icon").css({ "transform": "rotate(0deg)", "-moz-transform": "rotate(0deg)", "-webkit-transform": "rotate(0deg)", "-ms-transform": "rotate(0deg)" });
  2752 + return;
  2753 + }
  2754 + RestrictListDiv.style.display = 'block';
  2755 + $(".restrict-carret-icon").css({ "transform": "rotate(90deg)", "-moz-transform": "rotate(90deg)", "-webkit-transform": "rotate(90deg)", "-ms-transform": "rotate(90deg)" });
2747 2756  
  2757 + }
2748 2758  
2749 2759 }]
2750 2760 );
2751 2761 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @3be6d2b
... ... @@ -149,6 +149,11 @@
149 149 color: #000;
150 150 border-radius: 0;
151 151 }
  152 + .restrict-carret-icon {
  153 + font-size: 18px;
  154 + position: relative;
  155 + top: 1px;
  156 + }
152 157 </style>
153 158  
154 159  
... ... @@ -774,14 +779,12 @@
774 779 </div>
775 780 <div style="">
776 781 <div class="form-group">
777   - <div onclick="mytoggle()" class="btn btn-success btn-block" style="padding:3px 12px;">
778   - <i class=" fa fa-caret-right"></i> <span>Restrict List to</span>
  782 + <div ng-click="restrictBodySystemList()" class="btn btn-success btn-block" style="padding:3px 12px;">
  783 + <i class=" fa fa-caret-right restrict-carret-icon"></i> <span>Restrict List to</span>
779 784 </div>
780 785 </div>
781 786  
782   - <div id="divSection" style="display:none;">
783   -
784   -
  787 + <div id="restrictListDiv" style="display:none;">
785 788  
786 789 <div class="well well-sm marginTopBtm10">
787 790 <div class="form-horizontal">
... ... @@ -797,7 +800,7 @@
797 800 <select class="form-control" disabled>
798 801 <option value="1" selected="">Entire View</option>
799 802 </select>
800   - </div>
  803 + </div>
801 804 </div>
802 805 </div>
803 806 </div>
... ... @@ -1215,29 +1218,7 @@
1215 1218  
1216 1219 </script>
1217 1220  
1218   - <script>
1219   - function mytoggle() {
1220   - var div = document.getElementById("divSection");
1221   - if (div.style.display == 'block') {
1222   - div.style.display = 'none';
1223   - return;
1224   - }
1225   - div.style.display = 'block';
1226   - }
1227   - </script>
1228   -
1229   -
1230   - <script>
1231   - function mytoggle() {
1232   - var div = document.getElementById("divSection");
1233   - if (div.style.display == 'block') {
1234   - div.style.display = 'none';
1235   - return;
1236   - }
1237   - div.style.display = 'block';
1238   - }
1239   - </script>
1240   - <script>
  1221 + <script>
1241 1222 function Brushsize(object) {
1242 1223  
1243 1224 object.value = object.value.replace(/[^0-9]/g, '');
... ...