ADAM / AIAHTML5

Commit 3edf656b264390c3180b0e05110946c9e6459f99

Authored by Nikita Kulshreshtha
1 parent 8316d408

fix the maximize of jspanel. 

fix the title properties.
Inline Side-by-side
Showing 7 changed files with 42 additions and 49 deletions
400-SOURCECODE/AIAHTML5.Web/MainMenu.html
  View file @3edf656
... ... @@ -79,18 +79,7 @@
79 79 var bar = $('.sidebar');
80 80 var main = $('.main');
81 81 $('.toggleBar').click(function () {
82   - // alert('kkkkkkkkkkkkkk')
83   - /*barPos = parseInt($('.sidebar').css('left'));
84   - if(barPos!==0 && !bar.hasClass('active'))
85   - {
86   - bar.addClass('active');
87   - main.addClass('active');
88   - }
89   - else
90   - {
91   - bar.removeClass('active');
92   - main.removeClass('active');
93   - }*/
  82 +
94 83 bar.toggleClass('active');
95 84 main.toggleClass('active');
96 85 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @3edf656
... ... @@ -87,7 +87,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
87 87 $scope.openView = function ($event) {
88 88 // debugger;
89 89 $rootScope.currentBodyViewId = $event.currentTarget.id;
90   - $rootScope.CurrentActiveView = $event.currentTarget.textContent;
  90 + $rootScope.currentActiveViewTitle = $event.currentTarget.textContent;
91 91 $rootScope.pageToOpen = 'app/views/da/da-body-view.html';
92 92  
93 93  
... ... @@ -110,17 +110,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
110 110 });
111 111  
112 112  
113   - //load body region data
114   - //$http({ method: 'GET', url: '~/../content/data/json/da_dat_brview.json' }).success(function (data) {
115   - // debugger;
116   - // $scope.BodyRegionData = data;
117   - // console.log($scope.BodyRegionData);
118   - //})
119   - //.error(function (data, status, headers, config) {
120   - // console.log(data);
121   - //});
122   -
123   -
  113 +
124 114 $('#daLoaderLabel').css('visibility', 'hidden')
125 115  
126 116  
... ... @@ -140,6 +130,9 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
140 130 .error(function (data, status, headers, config) {
141 131 console.log(data);
142 132 });
  133 +
  134 + //push the details of open module in array $rootScope.openModules
  135 + $rootScope.openModules.push( { "ModuleId": 1 } );
143 136 }
144 137  
145 138  
... ... @@ -154,11 +147,11 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
154 147 ajax: {
155 148 url: 'app/views/da/da-view.html'
156 149 },
157   - title: $rootScope.CurrentActiveView,
  150 + title: $rootScope.currentActiveViewTitle,
158 151 // bootstrap: 'columns large-10 medium-9',
159 152 position: {
160 153 top: 70, //50,
161   - left: 0,
  154 + left: 1,
162 155 // right: 0
163 156 },
164 157 //overflow: { horizontal: 'scroll', vertical: 'scroll' },
... ... @@ -169,7 +162,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
169 162 });
170 163  
171 164 $scope.LoadDefaultLayerImage();
172   -
  165 + $rootScope.openViewsDA.push({ "ViewId": 1 });
173 166  
174 167 }
175 168  
... ... @@ -187,10 +180,9 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
187 180  
188 181  
189 182 $scope.LoadDefaultLayerImage = function () {
190   - // debugger;
191   -
  183 +
192 184 $http({ method: 'GET', url: '~/../content/data/json/da_dat_brview.json' }).success(function (data) {
193   - // debugger;
  185 +
194 186 $scope.BodyRegionData = data;
195 187 console.log($scope.BodyRegionData);
196 188 })
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @3edf656
... ... @@ -9,6 +9,8 @@ AIA.controller("HomeController", ["$rootScope","Modules", "$log", "$location", "
9 9 $rootScope.pageToOpen = 'MainMenu.html';
10 10 $rootScope.currentBodyViewId = 1;
11 11 $rootScope.currentActiveModuleTitle = 'Welcome to A.D.A.M. Interactive Anatomy';//Modules[0].Name;
12   - $rootScope.CurrentActiveView;
  12 + $rootScope.currentActiveViewTitle;
  13 + $rootScope.openModules = [];
  14 + $rootScope.openViewsDA = [];
13 15 }]
14 16 );
15 17 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @3edf656
... ... @@ -60,7 +60,12 @@ AIA.constant('Modules', [
60 60 },
61 61  
62 62 ]);
63   -
  63 +AIA.constant('BodyViewws', [
  64 + {
  65 + Id:1,
  66 + Name: 'Male Anterior',
  67 + },
  68 +]);
64 69  
65 70 AIA.config(function ($routeProvider, pages, $locationProvider) {
66 71  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @3edf656
1 1 ๏ปฟ<div class=" ">
2   - <div class="tools pull-left" id="leftToolBar">
  2 + <div class=" leftToolBar tools pull-left ">
3 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">
... ... @@ -99,18 +99,18 @@
99 99 </div>
100 100 </div>
101 101 </div>
102   - <div class="col-sm-12">
  102 + <div class=" canavsParent col-sm-12 " >
103 103 <div class="container-fluid">
104 104 <div class="row">
105 105 <div id="canvasDiv" class="col-sm-12 img-thumbnail" align="center"></div>
106 106 <!--<div id="canvasDiv" style=" width: 95% !important;top:0px;overflow:scroll;background-color:white;">-->
107   - <div id="daLoaderLabel">Loading....</div>
  107 + <div id="daLoaderLabel">Loading....</div>
108 108  
109   - </div>
110   - <div class="clearfix"></div>
111 109 </div>
  110 + <div class="clearfix"></div>
112 111 </div>
113 112 </div>
  113 + </div>
114 114 <div class="clearfix"></div>
115 115 </div>
116 116 </div>
... ... @@ -181,8 +181,8 @@
181 181 "use strict";
182 182 /*** Sidebar Toggle ***/
183 183 var barPos = 0;
184   - var bar = $('#leftToolBar');
185   - var main = $('.main2');
  184 + var bar = $('.leftToolBar');
  185 + var main = $('.canavsParent');
186 186 $('.toggleBar').click(function () {
187 187 // alert('kkkkkkkkkkkkkk')
188 188 /*barPos = parseInt($('.sidebar').css('left'));
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
  View file @3edf656
... ... @@ -129,13 +129,14 @@ h3.jsPanel-title{
129 129 overflow: hidden;
130 130 text-align: left;
131 131 text-overflow: ellipsis;
132   - margin: 0;
  132 + margin: 10px;
133 133 font-variant: normal;
134 134 font-weight: bold;
135 135 cursor: move;
136 136 min-height: 20px;
137   - padding: 0 5px;
138   - font-size:15px
  137 + padding: 0 10px;
  138 + font-size:25px;
  139 + font-variant-caps:all-petite-caps;
139 140 }
140 141 .jsPanel-hdr-r div{
141 142 float: right;
... ... @@ -307,7 +308,7 @@ h3.jsPanel-title{
307 308 /* success --------------------------------------------- */
308 309 .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 310 .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{ color: #fff;font-size:20px;font-weight: bold }
311 312 .jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; font-weight: bold}
312 313 .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 }
313 314 .jsPanel-ftr.jsPanel-theme-success{}
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
  View file @3edf656
... ... @@ -791,8 +791,8 @@ var jsPanel = {
791 791 //nikita
792 792 //newTop = $(window).scrollTop() + parseInt(panel.option.maximizedMargin.top);
793 793 //newLeft = $(window).scrollLeft() + parseInt(panel.option.maximizedMargin.left);
794   - newTop =45;
795   - newLeft = 25;
  794 + newTop =70;
  795 + newLeft = 0;
796 796 //nikita
797 797 newRight = 15;
798 798 }
... ... @@ -801,18 +801,20 @@ var jsPanel = {
801 801 left: newLeft,
802 802 //nikita
803 803 right: newRight,
804   - width: $(window).outerWidth() - 45, height: $(window).outerHeight() - 60
  804 + width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 90
805 805  
806 806 //width: $(window).outerWidth() - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right),
807 807 //height: $(window).outerHeight() - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom)
808 808 });
809 809 //nikita
810 810 if (panel.outerHeight() >= 435 && panel.outerWidth() >= 650) {
811   - $('#canvasDiv').css('height', panel.outerHeight() - 90)
  811 + alert('if')
  812 + $('#canvasDiv').css('height', panel.outerHeight() - 80)
812 813 $('#canvasDiv').css('width', panel.outerWidth() - 100)
813 814 $('#canvasDiv').css('overflow', 'scroll')
814 815 }
815 816 else {
  817 + alert('else')
816 818 $('#canvasDiv').css('height', panel.outerHeight() - 115)
817 819 $('#canvasDiv').css('width', panel.outerWidth() - 90)
818 820 $('#canvasDiv').css('overflow', 'scroll')
... ... @@ -930,6 +932,7 @@ var jsPanel = {
930 932  
931 933 // restores a panel to its "normalized" (not minimized, maximized or smallified) position & size
932 934 normalize: function (panel) {
  935 + debugger;
933 936 var panelTop,
934 937 interactions = ["resizable", "draggable"];
935 938 panel.trigger('jspanelbeforenormalize', panel.attr('id'));
... ... @@ -953,7 +956,7 @@ var jsPanel = {
953 956 }
954 957 panel.css({
955 958 width: panel.option.size.width,
956   - height: panel.option.size.height,
  959 + height: panel.option.size.height+10,
957 960 top: panelTop,
958 961 left: panel.option.position.left
959 962 });
... ... @@ -2034,7 +2037,8 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
2034 2037 height: jsP.outerHeight()
2035 2038 };
2036 2039 //nikita
2037   - if (jsP.outerHeight() >= 435 && jsP.outerWidth()>=650){
  2040 + if (jsP.outerHeight() >= 435 && jsP.outerWidth() >= 650) {
  2041 + alert('resizestop')
2038 2042 $('#canvasDiv').css('height', jsP.outerHeight()-90)
2039 2043 $('#canvasDiv').css('width', jsP.outerWidth() - 100)
2040 2044 $('#canvasDiv').css('overflow', 'scroll')
... ...