ADAM / AIAHTML5

Commit 8316d40893b947812b720cb93211955f35ce32c6

Authored by Nikita Kulshreshtha
1 parent eb153fe9

added bootstrap classes to resolve following. 

1.added scrollbar and left tool bar is now behaves(on dragginf of jspanel) within jspanel.
2 .the title bar is taking full width
3. male-femakle button in DA are now highlighted correctly.
4. layer change slider is now with its full height.
Inline Side-by-side
Showing 7 changed files with 72 additions and 59 deletions
400-SOURCECODE/AIAHTML5.Web/MainMenu.html
  View file @8316d40
1   -<div class="bodyWrap row" >
  1 +<div class="bodyWrap row container-fluid">
2 2 <div class="col-sm-12 col-md-12 pageHeading">
3 3 <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>-->
4 4 <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar" style="padding-left: 15px; "> <i class="fa fa-bars"></i> </div>
... ... @@ -29,7 +29,7 @@
29 29 </div>
30 30 <div class="main">
31 31 <div class="col-sm-12">
32   - <div align="center" id="MainImage"><img src="content/images/img1.png" alt="" title="" class="img-responsive"></div>
  32 + <div align="center" id="MainImage"><img src="content/images/img1.png" alt="" title="" class="img-responsive"></div>
33 33 <div ng-view></div>
34 34 </div>
35 35 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8316d40
... ... @@ -23,7 +23,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
23 23 //get the DA body view list based on selected gender
24 24 $scope.getDAViewList = function ($event) {
25 25  
26   - // debugger;
  26 + //debugger;
27 27 if ($('#MainImage') != null) {
28 28 $('#MainImage').remove();
29 29 }
... ... @@ -36,8 +36,17 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
36 36 else {
37 37 $scope.genderId = $event.currentTarget.id;
38 38 }
39   - // $($event.currentTarget.id).addClass("active");
  39 + if ($event != null) {
  40 + if ($event.currentTarget.id == "Male") {
  41 + $('#Male').addClass('active');
  42 + $('#Female').removeClass("active");
  43 + }
  44 + else{
  45 + $('#Female').addClass('active');
  46 + $('#Male').removeClass("active");
  47 + }
40 48  
  49 + }
41 50 $scope.selectedGenderBodyViewData = new jinqJs()
42 51 .from($scope.BodyViewData.BodyViews.view)
43 52 .where('_gender == ' + $scope.genderId)
... ... @@ -69,36 +78,14 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
69 78 $compile($el)($scope);
70 79  
71 80  
72   -
73   -
74   -
75 81 });
76 82  
77 83 };
78 84  
79   - $scope.checkImgExistance = function (imagePath) {
80   - var result = "";
81   - $.ajax({
82   - url: imagePath,
83   - success: function (data) {
84   -
85   - result = true;
86   -
87   - },
88   - error: function (data) {
89   -
90   - result = false;
91   -
92   - },
93   - })
94   - // debugger
95   - return result;
96   - }
97   -
98   -
  85 +
99 86  
100 87 $scope.openView = function ($event) {
101   - debugger;
  88 + // debugger;
102 89 $rootScope.currentBodyViewId = $event.currentTarget.id;
103 90 $rootScope.CurrentActiveView = $event.currentTarget.textContent;
104 91 $rootScope.pageToOpen = 'app/views/da/da-body-view.html';
... ... @@ -175,8 +162,8 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
175 162 // right: 0
176 163 },
177 164 //overflow: { horizontal: 'scroll', vertical: 'scroll' },
178   -
179   - size: { width: $(window).outerWidth() , height: $(window).outerHeight()-110 },
  165 +
  166 + size: { width: $(window).outerWidth()-10 , height: $(window).outerHeight()-110 },
180 167 //size: { width: 500, height: 500 },
181 168  
182 169 });
... ... @@ -222,7 +209,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
222 209 .error(function (data, status, headers, config) {
223 210 console.log(data);
224 211 });
225   - debugger;
  212 + // debugger;
226 213  
227 214 $scope.voId = $rootScope.currentBodyViewId;
228 215 $scope.layerNo = 0;
... ... @@ -240,7 +227,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
240 227 //set height of canvas div and left tool bar as per window size
241 228 $scope.BodyRegionCordinatesData = []; // create an empty array
242 229  
243   - $('#canvasDiv').css('height', $('#daImagePanel').outerHeight() - 134)
  230 + $('#canvasDiv').css('height', $('#daImagePanel').outerHeight() - 104)
244 231 //$('#canvasDiv').css('width', $('#daImagePanel').outerWidth() - 100)
245 232 $('#leftToolBar').css('height', $('#daImagePanel').outerHeight() )
246 233  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @8316d40
1 1 <div class=" ">
2   - <div class="tools " id="leftToolBar">
3   - <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar"></div>
  2 + <div class="tools pull-left" id="leftToolBar">
  3 + <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div>
4 4 <div class="" style="top:20px">
5 5 <div class="col-sm-6" title="Identify">
6 6 <button class="btn btn-primary btn-sm"> <img src="content/images/icon-identity.png" alt="" title=""></button>
... ... @@ -70,8 +70,8 @@
70 70 </div>
71 71 </div>
72 72  
73   - <div class="">
74   - <div class="col-sm-12 stickey-area" style="z-index:999;left:20px">
  73 + <div class="main2">
  74 + <div class="col-sm-12 stickey-area" >
75 75 <div class="breadcrumb ">
76 76 <div class="">
77 77 <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
... ... @@ -99,11 +99,11 @@
99 99 </div>
100 100 </div>
101 101 </div>
102   - <div style="top:100px;">
103   - <div>
104   - <div>
105   - <!--<div class="col-sm-12 img-thumbnail" align="center"><img src="content/images/1000x600.jpg" alt="" title="" class="img-responsive"></div>-->
106   - <div id="canvasDiv" style=" width: 95% !important;top:0px;overflow:scroll;background-color:white;">
  102 + <div class="col-sm-12">
  103 + <div class="container-fluid">
  104 + <div class="row">
  105 + <div id="canvasDiv" class="col-sm-12 img-thumbnail" align="center"></div>
  106 + <!--<div id="canvasDiv" style=" width: 95% !important;top:0px;overflow:scroll;background-color:white;">-->
107 107 <div id="daLoaderLabel">Loading....</div>
108 108  
109 109 </div>
... ... @@ -175,4 +175,29 @@
175 175 $(function () {
176 176 $(".modal").draggable();
177 177 });
  178 +</script>
  179 +<script>
  180 + $(function () {
  181 + "use strict";
  182 + /*** Sidebar Toggle ***/
  183 + var barPos = 0;
  184 + var bar = $('#leftToolBar');
  185 + var main = $('.main2');
  186 + $('.toggleBar').click(function () {
  187 + // alert('kkkkkkkkkkkkkk')
  188 + /*barPos = parseInt($('.sidebar').css('left'));
  189 + if(barPos!==0 && !bar.hasClass('active'))
  190 + {
  191 + bar.addClass('active');
  192 + main.addClass('active');
  193 + }
  194 + else
  195 + {
  196 + bar.removeClass('active');
  197 + main.removeClass('active');
  198 + }*/
  199 + bar.toggleClass('active');
  200 + main.toggleClass('active');
  201 + });
  202 + });
178 203 </script>
179 204 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/content/css/main.css
  View file @8316d40
... ... @@ -499,12 +499,12 @@ footer.dark {
499 499 z-index: 99999;
500 500 -moz-transition: left 0.5s ease;
501 501 transition: left 0.5s ease;
502   - background: url(content/images/icon-sidebar.png) no-repeat 0;
  502 + background: url(/content/images/icon-sidebar.png) no-repeat 0;
503 503 width: 11px;
504 504 height: 33px;
505 505 }
506 506 .active .toggle-icon {
507   - background: url(content/images/icon-sidebar.png) no-repeat -11px;
  507 + background: url(/content/images/icon-sidebar.png) no-repeat -11px;
508 508 width: 11px;
509 509 height: 33px;
510 510 }
... ... @@ -515,12 +515,12 @@ footer.dark {
515 515 z-index: 99999;
516 516 -moz-transition: left 0.5s ease;
517 517 transition: left 0.5s ease;
518   - background: url(content/images/icon-sidebar.png) no-repeat 0;
  518 + background: url(/content/images/icon-sidebar.png) no-repeat 0;
519 519 width: 11px;
520 520 height: 33px;
521 521 }
522 522 .active .toggle-icon-treeview {
523   - background: url(content/images/icon-sidebar.png) no-repeat -11px;
  523 + background: url(/content/images/icon-sidebar.png) no-repeat -11px;
524 524 width: 11px;
525 525 height: 33px;
526 526 }
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/1.11.4/jquery-ui.js
  View file @8316d40
... ... @@ -12836,7 +12836,7 @@ var slider = $.widget( &quot;ui.slider&quot;, $.ui.mouse, {
12836 12836 .addClass( "ui-slider" +
12837 12837 " ui-slider-" + this.orientation +
12838 12838 " ui-widget" +
12839   - " ui-widget-content1" +
  12839 + " ui-widget-content" +
12840 12840 " ui-corner-all");
12841 12841  
12842 12842 this._refresh();
... ... @@ -12939,7 +12939,7 @@ var slider = $.widget( &quot;ui.slider&quot;, $.ui.mouse, {
12939 12939 " ui-slider-horizontal" +
12940 12940 " ui-slider-vertical" +
12941 12941 " ui-widget" +
12942   - " ui-widget-content1" +
  12942 + " ui-widget-content" +
12943 12943 " ui-corner-all" );
12944 12944  
12945 12945 this._mouseDestroy();
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
  View file @8316d40
... ... @@ -130,11 +130,12 @@ h3.jsPanel-title{
130 130 text-align: left;
131 131 text-overflow: ellipsis;
132 132 margin: 0;
133   - font-variant: small-caps;
134   - font-weight: normal;
  133 + font-variant: normal;
  134 + font-weight: bold;
135 135 cursor: move;
136 136 min-height: 20px;
137 137 padding: 0 5px;
  138 + font-size:15px
138 139 }
139 140 .jsPanel-hdr-r div{
140 141 float: right;
... ... @@ -304,11 +305,11 @@ h3.jsPanel-title{
304 305 .jsPanel-theme-primary .ui-icon-gripsmall-diagonal-se{ color: #000; }
305 306  
306 307 /* success --------------------------------------------- */
307   -.jsPanel.jsPanel-theme-success{ background: none repeat scroll 0 0 #fff; box-shadow: 0 0 6px rgba(0, 33, 50, 0.1), 0 7px 25px rgba(17, 38, 60, 0.4); }
308   -.jsPanel-hdr.jsPanel-theme-success{ color: #fff; font-family: tahoma,arial,verdana,sans-serif; font-weight: normal; background: #818D43; }
309   -.jsPanel-hdr.jsPanel-theme-success h3{ color: #fff; }
310   -.jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; }
311   -.jsPanel-content.jsPanel-theme-success { background: none repeat scroll 0 0 #ffffff; color: #000000; font-family: tahoma,arial,verdana,sans-serif; outline: 1px solid #bbb; }
  308 +.jsPanel.jsPanel-theme-success{ background: none repeat scroll 0 0 #fff; box-shadow: 0 0 6px rgba(0, 33, 50, 0.1), 0 7px 25px rgba(17, 38, 60, 0.4);background-color:#222222 }
  309 +.jsPanel-hdr.jsPanel-theme-success{ color: #fff; font-family: Open Sans, Helvetica,tahoma,arial,verdana,sans-serif; font-weight: bold; font-size:15px; background: #818D43; }
  310 +.jsPanel-hdr.jsPanel-theme-success h3{ color: #fff;font-size:15px;font-weight: bold }
  311 +.jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; font-weight: bold}
  312 +.jsPanel-content.jsPanel-theme-success { background: none repeat scroll 0 0 #ffffff; color: #000000; font-family: tahoma,arial,verdana,sans-serif; outline: 1px solid #bbb;background-color:#222222 }
312 313 .jsPanel-ftr.jsPanel-theme-success{}
313 314 .jsPanel-theme-successt .ui-icon-gripsmall-diagonal-se{ color: #000; }
314 315  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @8316d40
... ... @@ -395,7 +395,7 @@ footer.dark {
395 395 width: 110px;
396 396 padding-top: 20px;
397 397 /*overflow: hidden;*/
398   - position: fixed;
  398 + /*position: fixed;*/
399 399 left: 0;
400 400 /*nk*/
401 401 /*top: 70px;*/
... ... @@ -498,12 +498,12 @@ footer.dark {
498 498 z-index: 99999;
499 499 -moz-transition: left 0.5s ease;
500 500 transition: left 0.5s ease;
501   - background: url(content/images/icon-sidebar.png) no-repeat 0;
  501 + background: url(../../../../../content/images/icon-sidebar.png) no-repeat 0;
502 502 width: 11px;
503 503 height: 33px;
504 504 }
505 505 .active .toggle-icon {
506   - background: url(content/images/icon-sidebar.png) no-repeat -11px;
  506 + background: url(../../../../../content/images/icon-sidebar.png) no-repeat -11px;
507 507 width: 11px;
508 508 height: 33px;
509 509 }
... ... @@ -514,12 +514,12 @@ footer.dark {
514 514 z-index: 99999;
515 515 -moz-transition: left 0.5s ease;
516 516 transition: left 0.5s ease;
517   - background: url(content/images/icon-sidebar.png) no-repeat 0;
  517 + background: url(../../../../../content/images/icon-sidebar.png) no-repeat 0;
518 518 width: 11px;
519 519 height: 33px;
520 520 }
521 521 .active .toggle-icon-treeview {
522   - background: url(content/images/icon-sidebar.png) no-repeat -11px;
  522 + background: url(../../../../../content/images/icon-sidebar.png) no-repeat -11px;
523 523 width: 11px;
524 524 height: 33px;
525 525 }
... ...