diff --git a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/MainMenu.html
index ae358f7..8c6abae 100644
--- a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/MainMenu.html
@@ -79,18 +79,7 @@
var bar = $('.sidebar');
var main = $('.main');
$('.toggleBar').click(function () {
- // alert('kkkkkkkkkkkkkk')
- /*barPos = parseInt($('.sidebar').css('left'));
- if(barPos!==0 && !bar.hasClass('active'))
- {
- bar.addClass('active');
- main.addClass('active');
- }
- else
- {
- bar.removeClass('active');
- main.removeClass('active');
- }*/
+
bar.toggleClass('active');
main.toggleClass('active');
});
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index e9ecd41..5e0fe1f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -87,7 +87,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
$scope.openView = function ($event) {
// debugger;
$rootScope.currentBodyViewId = $event.currentTarget.id;
- $rootScope.CurrentActiveView = $event.currentTarget.textContent;
+ $rootScope.currentActiveViewTitle = $event.currentTarget.textContent;
$rootScope.pageToOpen = 'app/views/da/da-body-view.html';
@@ -110,17 +110,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
});
- //load body region data
- //$http({ method: 'GET', url: '~/../content/data/json/da_dat_brview.json' }).success(function (data) {
- // debugger;
- // $scope.BodyRegionData = data;
- // console.log($scope.BodyRegionData);
- //})
- //.error(function (data, status, headers, config) {
- // console.log(data);
- //});
-
-
+
$('#daLoaderLabel').css('visibility', 'hidden')
@@ -140,6 +130,9 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
.error(function (data, status, headers, config) {
console.log(data);
});
+
+ //push the details of open module in array $rootScope.openModules
+ $rootScope.openModules.push( { "ModuleId": 1 } );
}
@@ -154,11 +147,11 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
ajax: {
url: 'app/views/da/da-view.html'
},
- title: $rootScope.CurrentActiveView,
+ title: $rootScope.currentActiveViewTitle,
// bootstrap: 'columns large-10 medium-9',
position: {
top: 70, //50,
- left: 0,
+ left: 1,
// right: 0
},
//overflow: { horizontal: 'scroll', vertical: 'scroll' },
@@ -169,7 +162,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
});
$scope.LoadDefaultLayerImage();
-
+ $rootScope.openViewsDA.push({ "ViewId": 1 });
}
@@ -187,10 +180,9 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
$scope.LoadDefaultLayerImage = function () {
- // debugger;
-
+
$http({ method: 'GET', url: '~/../content/data/json/da_dat_brview.json' }).success(function (data) {
- // debugger;
+
$scope.BodyRegionData = data;
console.log($scope.BodyRegionData);
})
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index de8b0fd..a0f9825 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -9,6 +9,8 @@ AIA.controller("HomeController", ["$rootScope","Modules", "$log", "$location", "
$rootScope.pageToOpen = 'MainMenu.html';
$rootScope.currentBodyViewId = 1;
$rootScope.currentActiveModuleTitle = 'Welcome to A.D.A.M. Interactive Anatomy';//Modules[0].Name;
- $rootScope.CurrentActiveView;
+ $rootScope.currentActiveViewTitle;
+ $rootScope.openModules = [];
+ $rootScope.openViewsDA = [];
}]
);
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index f099fb2..272622a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -60,7 +60,12 @@ AIA.constant('Modules', [
},
]);
-
+AIA.constant('BodyViewws', [
+ {
+ Id:1,
+ Name: 'Male Anterior',
+ },
+]);
AIA.config(function ($routeProvider, pages, $locationProvider) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index 507f1ca..cb67334 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -1,5 +1,5 @@
@@ -181,8 +181,8 @@
"use strict";
/*** Sidebar Toggle ***/
var barPos = 0;
- var bar = $('#leftToolBar');
- var main = $('.main2');
+ var bar = $('.leftToolBar');
+ var main = $('.canavsParent');
$('.toggleBar').click(function () {
// alert('kkkkkkkkkkkkkk')
/*barPos = parseInt($('.sidebar').css('left'));
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
index 9004993..b0bef11 100644
--- a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css
@@ -129,13 +129,14 @@ h3.jsPanel-title{
overflow: hidden;
text-align: left;
text-overflow: ellipsis;
- margin: 0;
+ margin: 10px;
font-variant: normal;
font-weight: bold;
cursor: move;
min-height: 20px;
- padding: 0 5px;
- font-size:15px
+ padding: 0 10px;
+ font-size:25px;
+ font-variant-caps:all-petite-caps;
}
.jsPanel-hdr-r div{
float: right;
@@ -307,7 +308,7 @@ h3.jsPanel-title{
/* success --------------------------------------------- */
.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 }
.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; }
-.jsPanel-hdr.jsPanel-theme-success h3{ color: #fff;font-size:15px;font-weight: bold }
+.jsPanel-hdr.jsPanel-theme-success h3{ color: #fff;font-size:20px;font-weight: bold }
.jsPanel-hdr.jsPanel-theme-success h3 small{ color: #fff; font-size: 65%; font-weight: bold}
.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 }
.jsPanel-ftr.jsPanel-theme-success{}
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
index 32a4f09..7be2c64 100644
--- a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
@@ -791,8 +791,8 @@ var jsPanel = {
//nikita
//newTop = $(window).scrollTop() + parseInt(panel.option.maximizedMargin.top);
//newLeft = $(window).scrollLeft() + parseInt(panel.option.maximizedMargin.left);
- newTop =45;
- newLeft = 25;
+ newTop =70;
+ newLeft = 0;
//nikita
newRight = 15;
}
@@ -801,18 +801,20 @@ var jsPanel = {
left: newLeft,
//nikita
right: newRight,
- width: $(window).outerWidth() - 45, height: $(window).outerHeight() - 60
+ width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 90
//width: $(window).outerWidth() - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right),
//height: $(window).outerHeight() - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom)
});
//nikita
if (panel.outerHeight() >= 435 && panel.outerWidth() >= 650) {
- $('#canvasDiv').css('height', panel.outerHeight() - 90)
+ alert('if')
+ $('#canvasDiv').css('height', panel.outerHeight() - 80)
$('#canvasDiv').css('width', panel.outerWidth() - 100)
$('#canvasDiv').css('overflow', 'scroll')
}
else {
+ alert('else')
$('#canvasDiv').css('height', panel.outerHeight() - 115)
$('#canvasDiv').css('width', panel.outerWidth() - 90)
$('#canvasDiv').css('overflow', 'scroll')
@@ -930,6 +932,7 @@ var jsPanel = {
// restores a panel to its "normalized" (not minimized, maximized or smallified) position & size
normalize: function (panel) {
+ debugger;
var panelTop,
interactions = ["resizable", "draggable"];
panel.trigger('jspanelbeforenormalize', panel.attr('id'));
@@ -953,7 +956,7 @@ var jsPanel = {
}
panel.css({
width: panel.option.size.width,
- height: panel.option.size.height,
+ height: panel.option.size.height+10,
top: panelTop,
left: panel.option.position.left
});
@@ -2034,7 +2037,8 @@ console.log("jsPanel version: " + jsPanel.version);
height: jsP.outerHeight()
};
//nikita
- if (jsP.outerHeight() >= 435 && jsP.outerWidth()>=650){
+ if (jsP.outerHeight() >= 435 && jsP.outerWidth() >= 650) {
+ alert('resizestop')
$('#canvasDiv').css('height', jsP.outerHeight()-90)
$('#canvasDiv').css('width', jsP.outerWidth() - 100)
$('#canvasDiv').css('overflow', 'scroll')