ADAM / AIAHTML5

Commit 67d9dc40c216b538b97a3bb7564d50813868fc40

Authored by Nikita Kulshreshtha
1 parent 962f3335

login and other html are on same page. used ng-show. 

error in modules showing.
Inline Side-by-side
Showing 4 changed files with 565 additions and 529 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @67d9dc4
1 1 'use strict';
2 2  
3   -AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService",
4   - function ($rootScope, Modules, $log, $location, $timeout, DataService) {
  3 +AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService","AuthenticationService",
  4 +function ($rootScope, Modules, $log, $location, $timeout, DataService,AuthenticationService) {
5 5  
6 6 //$scope.pageToOpen = {
7 7 // name: 'MainMenu'
... ... @@ -65,6 +65,81 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
65 65 $rootScope.isEraseToolSelected = false;
66 66 $rootScope.isMousedownOnPaintCanvas = false;
67 67  
  68 + $rootScope.initializeAIA = function () {
  69 + $rootScope.isLoading = false;
  70 + $rootScope.isVisibleLogin = true;
  71 + $rootScope.isVisibleIndex = false;
  72 +
  73 + }
  74 +
  75 + $rootScope.userInfo = {
  76 + username: null,
  77 + password: null
  78 + };
  79 +
  80 + $rootScope.AuthenticateUser = function (userInfo) {
  81 + AuthenticationService.authenticateUser(userInfo)
  82 + .then(
  83 +
  84 + function (result) {
  85 +
  86 + if (result.length > 0) {
  87 + angular.forEach(result, function (value, key) {
  88 +
  89 + if (value.Name == "modules") {
  90 + $rootScope.modules = value.Value;
  91 + var moduleList = []
  92 + angular.forEach($rootScope.modules, function (value, key) {
  93 +
  94 +
  95 + moduleList.push(
  96 +
  97 + {
  98 +
  99 + "ModuleName": value[0].Value,
  100 + "ModuleSlug": value[1].Value
  101 +
  102 + }
  103 +
  104 + );
  105 + });
  106 + localStorage.setItem("modules", moduleList);
  107 +
  108 + // $scope.name = "HELLO";
  109 + $rootScope.isVisibleLogin = false;
  110 + $rootScope.isVisibleIndex = true;
  111 + // $location.url('/index.html')
  112 + // $window.location.assign('/index.html');
  113 +
  114 + }
  115 +
  116 +
  117 +
  118 + // if ((value._id == 1)
  119 + })
  120 + }
  121 + //alert('user authentication = ' + result)
  122 + },
  123 + function (error) {
  124 + // handle errors here
  125 + console.log(' $rootScope.BodyLayerData= ' + error.statusText);
  126 + });
  127 + //.success(function (data) {
  128 +
  129 + // alert('user authentication= '+data)
  130 +
  131 + // })
  132 + // .error(function () {
  133 + // alert('issue in authentocation')
  134 + // })
  135 + }
  136 +
  137 +
  138 + $rootScope.showModules = function () {
  139 + $scope.modules = localStorage.getItem("modules");
  140 +
  141 + }
  142 +
68 143 $rootScope.$on("$locationChangeSuccess", function () {
69 144  
70 145 if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LoginController.js
  View file @67d9dc4
... ... @@ -19,7 +19,22 @@ function ($scope, $rootScope,$location, $window, AuthenticationService) {
19 19  
20 20 if (value.Name == "modules") {
21 21 $scope.modules = value.Value;
22   - localStorage.setItem("modules", value.Value);
  22 + var moduleList = []
  23 + angular.forEach($scope.modules, function (value, key) {
  24 +
  25 +
  26 + moduleList.push(
  27 +
  28 + {
  29 +
  30 + "ModuleName": value[0].Value,
  31 + "ModuleSlug": value[1].Value
  32 +
  33 + }
  34 +
  35 + );
  36 + });
  37 + localStorage.setItem("modules", moduleList);
23 38  
24 39 $scope.name = "HELLO";
25 40 // $location.url('/index.html')
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @67d9dc4
... ... @@ -25,7 +25,7 @@
25 25 <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide " ng-init="showModules()">
26 26 <!--{{name}}-->
27 27 <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
28   - <li ng-repeat="module in modules"><a href="{{module.slug}}" ng-click="IsVisible()">{{module.name}}</a></li>
  28 + <li ng-repeat="module in modules track by $index"><a href="{{module.ModuleName}}" ng-click="IsVisible()">{{module.ModuleSlug}}</a></li>
29 29 <!--<li><a href="da-view-list" ng-click="IsVisible()">Dissectible Anatomy</a></li>
30 30 <li><a href="3dAnatomy" ng-click="IsVisible()">3D Anatomy</a></li>
31 31 <li><a href="clinical-illustrations" ng-click="IsVisible()">Clinical Illustrations</a></li>
... ... @@ -48,6 +48,8 @@
48 48 </div>
49 49  
50 50 <script src="../controllers/LoginController.js"></script>
  51 +<script src="app/services/AuthenticationService.js"></script>
  52 +
51 53  
52 54 <script>
53 55 $(function () {
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @67d9dc4
... ... @@ -157,387 +157,451 @@
157 157  
158 158  
159 159 </head>
160   -<body ng-controller="HomeController" id="bo">
161   - <div class="container-fluid ">
162   - <!--Header-->
163   -
164   - <nav class="navbar navbar-inverse navbar-fixed-top">
165   - <div class="container-fluid">
166   - <!-- Brand and toggle get grouped for better mobile display -->
167   - <div class="navbar-header">
168   - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topFixedNavbar1" aria-expanded="false">
169   - <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
170   - </button>
171   - <a class="frameLogo navbar-brand" href="home"><img src="content/images/logo-main.png" class="img-responsive" alt=""></a>
  160 +<body ng-controller="HomeController" id="bo" ng-init="initializeAIA()">
  161 + <div id="login" ng-show="isVisibleLogin">
  162 +
  163 + <div class="container-fluid loginBg">
  164 + <div class="row">
  165 + <div class="col-xs-12 text-center">
  166 + <a href="index.html" class="loginLogo"><img src="img/logo-large.png" class="img-responsive" alt=""></a>
  167 + <div class="headerBand row">
  168 + <div class="col-xs-12">
  169 + <h1>A.D.A.M. Interactive Anatomy</h1>
  170 + <p>The most compresive online interactive anatomy learning resource</p>
  171 + </div>
  172 + </div>
172 173 </div>
173   - <div ng-include="'app/widget/TopMenu.html'"></div>
174   - </div>
175   - </nav>
176   - <div class="bodyWrap row container-fluid">
  174 + <!--LOGIN PANEL-->
  175 + <div class="col-xs-12 loginPanel">
  176 + <div class="loginBox clearfix">
  177 + <div class="col-xs-12">
  178 + <!--<strong>Login</strong>-->
  179 + <form>
  180 + <div class="form-group">
  181 + <!--<label for="">User ID</label>-->
  182 + <!--input type="email" class="form-control" placeholder="User ID">
  183 + <span class="help-block text-right small"><a href="#" class="color-white">Forgot User ID?</a></span>-->
  184 +
  185 +
  186 + <div class="input-group">
  187 + <span class="input-group-addon"><i class="fa fa-user"></i></span>
  188 + <input type="text" class="form-control" placeholder="Username" ng-model="userInfo.username">
  189 + </div>
  190 + <span class="help-block text-right small"><a href="#" class="color-white">Forgot User ID?</a></span>
177 191  
178   - <div id="spinner" class="spinner" ng-show="isLoading">
179   - <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading" />
180   - </div>
181   - <div ng-view></div>
182 192  
  193 + </div>
  194 + <div class="form-group">
  195 + <!--<label for="">Password</label>-->
  196 + <!--<input type="password" class="form-control" placeholder="Password">
  197 + <span class="help-block text-right small "><a href="#" class="color-white">Forgot Password?</a></span>-->
  198 + <div class="input-group">
  199 + <span class="input-group-addon"><i class="fa fa-key"></i></span>
  200 + <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
  201 + </div>
  202 + <span class="help-block text-right small "><a href="#" class="color-white">Forgot Password?</a></span>
  203 + </div>
  204 + <div class="form-group">
  205 + <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
  206 + </div>
  207 + </form>
  208 + </div>
  209 + </div>
  210 + <div class="loginExBtn">
  211 + <a href="#" class="btn btn-primary">Subscribe Now</a>
  212 + <a href="#" class="btn btn-primary pull-right">Learn More</a>
  213 + </div>
  214 + </div>
  215 + </div>
183 216 </div>
184   - </div>>
185 217  
  218 + <!-- Footer -->
  219 + <footer class="dark">
  220 + <div class="container-fluid text-center">Copyright &copy; 2016 Ebix Inc. All rights reserved.</div>
  221 + </footer>
186 222  
187   - <!--list manager Modal-->
188   - <div class="modal fade" id="ShowListManager" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" ng-init="tab = 1" style="width:27%;left:50%;overflow:hidden;height:500px;top:100px">
189   - <div class="modal-dialog" role="document" style="width:400px;">
190   - <div class="modal-content" style="width:100%;max-width:400px;">
191   - <div class="modal-header setting-modal-header" style="padding: 5px 10px; border-bottom: 1px solid #e5e5e5;">
192   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
193   - <h4 class="modal-title" id="myModalLabel">Setting</h4>
  223 + </div>
  224 + <div id="index" ng-show="isVisibleIndex">
  225 + <div class="container-fluid ">
  226 + <!--Header-->
  227 +
  228 + <nav class="navbar navbar-inverse navbar-fixed-top">
  229 + <div class="container-fluid">
  230 + <!-- Brand and toggle get grouped for better mobile display -->
  231 + <div class="navbar-header">
  232 + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topFixedNavbar1" aria-expanded="false">
  233 + <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
  234 + </button>
  235 + <a class="frameLogo navbar-brand" href="home"><img src="content/images/logo-main.png" class="img-responsive" alt=""></a>
  236 + </div>
  237 + <div ng-include="'app/widget/TopMenu.html'"></div>
194 238 </div>
195   - <div class="modal-body">
196   - <div class="row" style="padding-top:20px;">
197   - <div class="col-sm-12">
  239 + </nav>
  240 + <div class="bodyWrap row container-fluid">
198 241  
199   - <div aria-label="..." role="group" class="btn-group btn-group-justified">
200   - <div role="group" class="btn-group">
201   - <button class="btn btn-sm btn-success" type="button" ng-click="tab = 1">Appearance</button>
202   - </div>
203   - <div role="group" class="btn-group">
204   - <button class="btn btn-sm btn-success" type="button" ng-click="tab = 2">Lexicons</button>
205   - </div>
206   - <div role="group" class="btn-group">
207   - <button class="btn btn-sm btn-success" type="button" ng-click="tab = 3">Dissectible</button>
  242 + <div id="spinner" class="spinner" ng-show="isLoading" style="visibility:hidden">
  243 + <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading" />
  244 + </div>
  245 + <div ng-view></div>
  246 +
  247 + </div>
  248 + </div>>
  249 +
  250 +
  251 + <!--list manager Modal-->
  252 + <div class="modal fade" id="ShowListManager" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" ng-init="tab = 1" style="width:27%;left:50%;overflow:hidden;height:500px;top:100px">
  253 + <div class="modal-dialog" role="document" style="width:400px;">
  254 + <div class="modal-content" style="width:100%;max-width:400px;">
  255 + <div class="modal-header setting-modal-header" style="padding: 5px 10px; border-bottom: 1px solid #e5e5e5;">
  256 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  257 + <h4 class="modal-title" id="myModalLabel">Setting</h4>
  258 + </div>
  259 + <div class="modal-body">
  260 + <div class="row" style="padding-top:20px;">
  261 + <div class="col-sm-12">
  262 +
  263 + <div aria-label="..." role="group" class="btn-group btn-group-justified">
  264 + <div role="group" class="btn-group">
  265 + <button class="btn btn-sm btn-success" type="button" ng-click="tab = 1">Appearance</button>
  266 + </div>
  267 + <div role="group" class="btn-group">
  268 + <button class="btn btn-sm btn-success" type="button" ng-click="tab = 2">Lexicons</button>
  269 + </div>
  270 + <div role="group" class="btn-group">
  271 + <button class="btn btn-sm btn-success" type="button" ng-click="tab = 3">Dissectible</button>
  272 + </div>
208 273 </div>
  274 +
209 275 </div>
210 276  
211   - </div>
212 277  
  278 + <div class="col-sm-12" ng-show="tab === 1">
213 279  
214   - <div class="col-sm-12" ng-show="tab === 1">
215 280  
  281 + <div class="row">
  282 + <div class="center-block col-md-11" style="float: none; background-color:#E2E2E2;height:300px;">
  283 + <div class="row" style="padding-top: 22px;">
  284 + <div class="center-block col-md-10" style="float: none; ">
  285 + <h5><strong>System Font</strong></h5>
  286 +
  287 + <div style="border:2px solid #ACACAC;float:left;padding:15px;background-color:#CCCCCC;">
  288 + <div class="col-md-3" style="padding-left:0px;">
  289 + Sample
  290 + </div>
  291 + <div class="col-md-6" style="padding-right:0px;">
  292 + <input type="text" value="" style="width:85%;">
  293 + </div>
  294 + <div class="col-md-3" style="padding-left:0px;">
  295 + <button class="btn btn-primary" style="margin-bottom:5px;">Change</button>
  296 + <button class="btn btn-primary" style="margin-bottom:5px;">Default</button>
  297 + </div>
216 298  
217   - <div class="row">
218   - <div class="center-block col-md-11" style="float: none; background-color:#E2E2E2;height:300px;">
219   - <div class="row" style="padding-top: 22px;">
220   - <div class="center-block col-md-10" style="float: none; ">
221   - <h5><strong>System Font</strong></h5>
222   -
223   - <div style="border:2px solid #ACACAC;float:left;padding:15px;background-color:#CCCCCC;">
224   - <div class="col-md-3" style="padding-left:0px;">
225   - Sample
226 299 </div>
227   - <div class="col-md-6" style="padding-right:0px;">
228   - <input type="text" value="" style="width:85%;">
229   - </div>
230   - <div class="col-md-3" style="padding-left:0px;">
231   - <button class="btn btn-primary" style="margin-bottom:5px;">Change</button>
232   - <button class="btn btn-primary" style="margin-bottom:5px;">Default</button>
233   - </div>
234   -
235 300 </div>
236 301 </div>
237   - </div>
238 302  
239   - </div>
240   - </div>
241   -
242   - </div>
243   - <div class="col-sm-12" ng-show="tab === 2">
244   -
245   -
246   - <div class="row">
247   - <div class="center-block col-md-11" style="float: none; background-color:#E2E2E2;height:300px;">
248   - <div class="col-md-6">
249   - <h6><strong>Primary Lexicon</strong></h6>
250   - <input type="text" value="English" style="width:90%;">
251   - <button class="btn btn-primary" style="float:right;margin-bottom:5px;margin-top:5px;">Change</button>
252   - <h6>Secondry Lexicon</h6>
253   - <textarea style="width:90%;"></textarea>
254   - <button>Change</button>
255   - <button>Change</button>
256   - </div>
257   - <div class="col-md-6">
258   - <h6>Available Lexicon</h6>
259   - <select multiple class="form-control" id="sel2">
260   - <option>1</option>
261   - <option>2</option>
262   - <option>3</option>
263   - <option>4</option>
264   - <option>5</option>
265   - </select>
266   -
267   - <p>Note: Some languages require special system fonts to display correctly</p>
268 303 </div>
269   -
270 304 </div>
  305 +
271 306 </div>
  307 + <div class="col-sm-12" ng-show="tab === 2">
272 308  
273   - </div>
274   - <div class="col-sm-12" ng-show="tab === 3">
275 309  
276   - <div class="row">
277   - <div class="center-block col-md-11" style="float: none; background-color:#E2E2E2;height:300px;">
278   - <h6>Skin Tones</h6>
279   - <div class="center-block col-md-8" style="float: none;">
280   - <div class="col-md-6">
281   - <img class="img-responsive" alt="" src="http://placehold.it/400x300">
282   - </div>
283   - <div class="col-md-6">
284   - <img class="img-responsive" alt="" src="http://placehold.it/400x300">
285   - </div>
  310 + <div class="row">
  311 + <div class="center-block col-md-11" style="float: none; background-color:#E2E2E2;height:300px;">
286 312 <div class="col-md-6">
287   - <img class="img-responsive" alt="" src="http://placehold.it/400x300">
  313 + <h6><strong>Primary Lexicon</strong></h6>
  314 + <input type="text" value="English" style="width:90%;">
  315 + <button class="btn btn-primary" style="float:right;margin-bottom:5px;margin-top:5px;">Change</button>
  316 + <h6>Secondry Lexicon</h6>
  317 + <textarea style="width:90%;"></textarea>
  318 + <button>Change</button>
  319 + <button>Change</button>
288 320 </div>
289 321 <div class="col-md-6">
290   - <img class="img-responsive" alt="" src="http://placehold.it/400x300">
  322 + <h6>Available Lexicon</h6>
  323 + <select multiple class="form-control" id="sel2">
  324 + <option>1</option>
  325 + <option>2</option>
  326 + <option>3</option>
  327 + <option>4</option>
  328 + <option>5</option>
  329 + </select>
  330 +
  331 + <p>Note: Some languages require special system fonts to display correctly</p>
291 332 </div>
292 333  
293 334 </div>
294   - <h6>Modesty Setting</h6>
295   - <div class="col-md-6">
296   - <div class="col-md-4">
297   - <img class="img-responsive" alt="" src="http://placehold.it/400x300">
298   - </div>
299   - <div class="col-md-8">
  335 + </div>
300 336  
301   - <div class="radio">
302   - <label><input type="radio" name="optradio" checked>On</label>
  337 + </div>
  338 + <div class="col-sm-12" ng-show="tab === 3">
  339 +
  340 + <div class="row">
  341 + <div class="center-block col-md-11" style="float: none; background-color:#E2E2E2;height:300px;">
  342 + <h6>Skin Tones</h6>
  343 + <div class="center-block col-md-8" style="float: none;">
  344 + <div class="col-md-6">
  345 + <img class="img-responsive" alt="" src="http://placehold.it/400x300">
  346 + </div>
  347 + <div class="col-md-6">
  348 + <img class="img-responsive" alt="" src="http://placehold.it/400x300">
303 349 </div>
304   - <div class="radio">
305   - <label><input type="radio" name="optradio">Off</label>
  350 + <div class="col-md-6">
  351 + <img class="img-responsive" alt="" src="http://placehold.it/400x300">
  352 + </div>
  353 + <div class="col-md-6">
  354 + <img class="img-responsive" alt="" src="http://placehold.it/400x300">
306 355 </div>
307 356  
308 357 </div>
309   - </div>
310   - <div class="col-md-6">
311   - <h6>Annotaion</h6>
312   - <div class="checkbox">
313   - <label><input type="checkbox" value="" checked>Erase Annotations when changeing layers</label>
  358 + <h6>Modesty Setting</h6>
  359 + <div class="col-md-6">
  360 + <div class="col-md-4">
  361 + <img class="img-responsive" alt="" src="http://placehold.it/400x300">
  362 + </div>
  363 + <div class="col-md-8">
  364 +
  365 + <div class="radio">
  366 + <label><input type="radio" name="optradio" checked>On</label>
  367 + </div>
  368 + <div class="radio">
  369 + <label><input type="radio" name="optradio">Off</label>
  370 + </div>
  371 +
  372 + </div>
  373 + </div>
  374 + <div class="col-md-6">
  375 + <h6>Annotaion</h6>
  376 + <div class="checkbox">
  377 + <label><input type="checkbox" value="" checked>Erase Annotations when changeing layers</label>
  378 + </div>
314 379 </div>
315 380 </div>
316   - </div>
317 381  
318   - </div>
  382 + </div>
319 383  
320 384  
321 385  
  386 + </div>
  387 + </div>
  388 + <div class="modal-footer">
  389 + <button type="button" class="btn btn-primary">Ok</button>
  390 + <button type="button" class="btn btn-primary" data-dismiss="modal">Cancle</button>
  391 + <button type="button" class="btn btn-primary">Apply</button>
322 392 </div>
323   - </div>
324   - <div class="modal-footer">
325   - <button type="button" class="btn btn-primary">Ok</button>
326   - <button type="button" class="btn btn-primary" data-dismiss="modal">Cancle</button>
327   - <button type="button" class="btn btn-primary">Apply</button>
328 393 </div>
329 394 </div>
330 395 </div>
331 396 </div>
332   - </div>
333 397  
334   - <!--Settings modal-->
335   - <div class="modal fade" id="modal-settings" tabindex="-1" role="dialog" aria-labelledby="myModalLabel2">
336   - <div class="modal-dialog modal-sm" role="document">
337   - <form>
338   - <div ng-init="loadsettings()" class="modal-content" id="setting-modal-dark">
339   - <div class="modal-header annotation-modal-header">
340   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
341   - <h4 class="modal-title" id="myModalLabel2">Settings</h4>
342   - </div>
343   - <div class="modal-body">
344   - <div class="paddTop15">
345   - <!-- Nav tabs -->
346   - <ul class="nav nav-tabs" role="tablist">
347   - <li role="presentation" ng-class="{'active':SettingsTab==1}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(1)">Appearance</a></li>
348   - <li role="presentation" ng-class="{'active':SettingsTab==2}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(2)">Lexicons</a></li>
349   - <li role="presentation" ng-class="{'active':SettingsTab==3}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(3)">Dissectible</a></li>
350   -
351   - </ul>
352   - <!-- Tab panes -->
353   - <div class="tab-content">
354   - <div role="tabpanel" ng-class="{'tab-pane active' : SettingsTab === 1,'tab-pane' : SettingsTab !==1 }" id="appearance">
355   - <div class="row">
356   - <div class="col-sm-12">
357   - <div class="well well-sm no-margin-btm">
358   - <h5>System Font</h5>
359   - <div class="form-group">
360   - <label for="SystemFont" class="font13">Sample</label>
361   - <input type="text" class="form-control" id="SystemFont" value="AaBbYyZz" disabled>
  398 + <!--Settings modal-->
  399 + <div class="modal fade" id="modal-settings" tabindex="-1" role="dialog" aria-labelledby="myModalLabel2">
  400 + <div class="modal-dialog modal-sm" role="document">
  401 + <form>
  402 + <div ng-init="loadsettings()" class="modal-content" id="setting-modal-dark">
  403 + <div class="modal-header annotation-modal-header">
  404 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  405 + <h4 class="modal-title" id="myModalLabel2">Settings</h4>
  406 + </div>
  407 + <div class="modal-body">
  408 + <div class="paddTop15">
  409 + <!-- Nav tabs -->
  410 + <ul class="nav nav-tabs" role="tablist">
  411 + <li role="presentation" ng-class="{'active':SettingsTab==1}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(1)">Appearance</a></li>
  412 + <li role="presentation" ng-class="{'active':SettingsTab==2}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(2)">Lexicons</a></li>
  413 + <li role="presentation" ng-class="{'active':SettingsTab==3}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(3)">Dissectible</a></li>
  414 +
  415 + </ul>
  416 + <!-- Tab panes -->
  417 + <div class="tab-content">
  418 + <div role="tabpanel" ng-class="{'tab-pane active' : SettingsTab === 1,'tab-pane' : SettingsTab !==1 }" id="appearance">
  419 + <div class="row">
  420 + <div class="col-sm-12">
  421 + <div class="well well-sm no-margin-btm">
  422 + <h5>System Font</h5>
  423 + <div class="form-group">
  424 + <label for="SystemFont" class="font13">Sample</label>
  425 + <input type="text" class="form-control" id="SystemFont" value="AaBbYyZz" disabled>
  426 + </div>
  427 + <button class="btn btn-success btn-sm" data-toggle="modal" data-target="#modal-change">Change</button>
  428 + <button class="btn btn-success btn-sm">Default</button>
362 429 </div>
363   - <button class="btn btn-success btn-sm" data-toggle="modal" data-target="#modal-change">Change</button>
364   - <button class="btn btn-success btn-sm">Default</button>
365 430 </div>
366 431 </div>
367 432 </div>
368   - </div>
369   - <div role="tabpanel" ng-class="{'tab-pane active' : SettingsTab === 2,'tab-pane' : SettingsTab !==2 }" id="lexicons">
370   - <div class="row paddingTopBtm10">
371   - <div class="col-sm-6">
372   - <div class="form-group">
373   - <label for="SystemFont" class="font13">Primary Lexicon</label>
374   - <input type="text" class="form-control" value="English" disabled>
375   - <button class="btn btn-sm btn-success btn-block marginTop5">Change</button>
376   - </div>
  433 + <div role="tabpanel" ng-class="{'tab-pane active' : SettingsTab === 2,'tab-pane' : SettingsTab !==2 }" id="lexicons">
  434 + <div class="row paddingTopBtm10">
  435 + <div class="col-sm-6">
  436 + <div class="form-group">
  437 + <label for="SystemFont" class="font13">Primary Lexicon</label>
  438 + <input type="text" class="form-control" value="English" disabled>
  439 + <button class="btn btn-sm btn-success btn-block marginTop5">Change</button>
  440 + </div>
377 441  
378   - <div class="form-group">
379   - <label for="SystemFont" class="font13">Secondary Lexicon</label>
380   - <textarea class="form-control" rows="3"></textarea>
381   - </div>
382   - <div class="form-group">
383   - <button class="btn btn-sm btn-success" disabled>Add</button>
384   - <button class="btn btn-sm btn-success">Remove</button>
  442 + <div class="form-group">
  443 + <label for="SystemFont" class="font13">Secondary Lexicon</label>
  444 + <textarea class="form-control" rows="3"></textarea>
  445 + </div>
  446 + <div class="form-group">
  447 + <button class="btn btn-sm btn-success" disabled>Add</button>
  448 + <button class="btn btn-sm btn-success">Remove</button>
  449 + </div>
385 450 </div>
386   - </div>
387   - <div class="col-sm-6">
388   - <div class="form-group">
389   - <label for="SystemFont" class="font13">Available Lexicon</label>
390   - <select multiple class="form-control" size="8">
391   - <option selected value="1">English</option>
392   - <option>French</option>
393   - <option>German</option>
394   - <option>Hungarian</option>
395   - <option>Italian</option>
396   - <option>Japanese (Kanji)</option>
397   - <option>Japanese (Yomi)</option>
398   - <option>Portuguese</option>
399   - <option>Spanish</option>
400   - <option>Swedish</option>
401   - </select>
  451 + <div class="col-sm-6">
  452 + <div class="form-group">
  453 + <label for="SystemFont" class="font13">Available Lexicon</label>
  454 + <select multiple class="form-control" size="8">
  455 + <option selected value="1">English</option>
  456 + <option>French</option>
  457 + <option>German</option>
  458 + <option>Hungarian</option>
  459 + <option>Italian</option>
  460 + <option>Japanese (Kanji)</option>
  461 + <option>Japanese (Yomi)</option>
  462 + <option>Portuguese</option>
  463 + <option>Spanish</option>
  464 + <option>Swedish</option>
  465 + </select>
  466 + </div>
  467 + <p class="font11"><strong>Note :</strong> Some languages require special system fonts to display correctly</p>
402 468 </div>
403   - <p class="font11"><strong>Note :</strong> Some languages require special system fonts to display correctly</p>
  469 + <div class="clearfix"></div>
404 470 </div>
405   - <div class="clearfix"></div>
406 471 </div>
407   - </div>
408   - <div role="tabpanel" id="dissectible" ng-class="{'tab-pane active' : SettingsTab === 3,'tab-pane' : SettingsTab !==3 }">
409   - <div class="">
410   - <div class="col-sm-12">
411   - <h5 class="bolder font13 no-margin-top">Skin Tones</h5>
412   - <div class="skin-tones">
413   - <div align="center">
414   - <div class="col-sm-5">
415   - <button id="btnEthnicW" class="thumbnail skinmarginbtm6" ng-model="formsetting.ethnicity" ng-click="ChangeEthnicity(formsetting,'W')">
416   - <img src="~/../content/images/common/skin1.jpg" alt="">
417   - </button>
418   - </div>
419   - <div class="col-sm-5">
420   - <button id="btnEthnicB" class="thumbnail skinmarginbtm6" ng-model="formsetting.ethnicity" ng-click="ChangeEthnicity(formsetting,'B')">
421   - <img src="~/../content/images/common/skin2.jpg" alt="">
422   - </button>
423   - </div>
424   - <div class="col-sm-5">
425   - <button id="btnEthnicL" class="thumbnail skinmarginbtm6" ng-model="formsetting.ethnicity" ng-click="ChangeEthnicity(formsetting,'A')">
426   - <img src="~/../content/images/common/skin3.jpg" alt="">
427   - </button>
428   - </div>
429   - <div class="col-sm-5">
430   - <button id="btnEthnicA" class="thumbnail skinmarginbtm6" ng-model="formsetting.ethnicity" ng-click="ChangeEthnicity(formsetting,'L')">
431   - <img src="~/../content/images/common/skin4.jpg" alt="">
432   - </button>
  472 + <div role="tabpanel" id="dissectible" ng-class="{'tab-pane active' : SettingsTab === 3,'tab-pane' : SettingsTab !==3 }">
  473 + <div class="">
  474 + <div class="col-sm-12">
  475 + <h5 class="bolder font13 no-margin-top">Skin Tones</h5>
  476 + <div class="skin-tones">
  477 + <div align="center">
  478 + <div class="col-sm-5">
  479 + <button id="btnEthnicW" class="thumbnail skinmarginbtm6" ng-model="formsetting.ethnicity" ng-click="ChangeEthnicity(formsetting,'W')">
  480 + <img src="~/../content/images/common/skin1.jpg" alt="">
  481 + </button>
  482 + </div>
  483 + <div class="col-sm-5">
  484 + <button id="btnEthnicB" class="thumbnail skinmarginbtm6" ng-model="formsetting.ethnicity" ng-click="ChangeEthnicity(formsetting,'B')">
  485 + <img src="~/../content/images/common/skin2.jpg" alt="">
  486 + </button>
  487 + </div>
  488 + <div class="col-sm-5">
  489 + <button id="btnEthnicL" class="thumbnail skinmarginbtm6" ng-model="formsetting.ethnicity" ng-click="ChangeEthnicity(formsetting,'A')">
  490 + <img src="~/../content/images/common/skin3.jpg" alt="">
  491 + </button>
  492 + </div>
  493 + <div class="col-sm-5">
  494 + <button id="btnEthnicA" class="thumbnail skinmarginbtm6" ng-model="formsetting.ethnicity" ng-click="ChangeEthnicity(formsetting,'L')">
  495 + <img src="~/../content/images/common/skin4.jpg" alt="">
  496 + </button>
  497 + </div>
433 498 </div>
434 499 </div>
435   - </div>
436 500  
437   - </div>
438   - </div>
439   - <div class="">
440   - <div class="col-sm-6">
441   - <h5 class="font13 bolder">Modesty Setting</h5>
442   - <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5">
443   - <div class="radio">
444   - <label>
445   - <input type="radio" ng-checked="isModestyOn" ng-model="formsetting.modesty" value="Y" name="modestyRadios" id="modon" ng-click="ChangeModesty(formsetting,'Y')">
446   - <span class="">On</span>
447   - </label>
448   - </div>
449   - <div class="radio">
450   - <label>
451   - <input type="radio" ng-checked="isModestyOff" ng-model="formsetting.modesty" value="N" name="modestyRadios" id="modoff" ng-click="ChangeModesty(formsetting,'N')">
452   - <span class="">Off</span>
453   - </label>
454 501 </div>
455 502 </div>
456   - <div class="col-sm-6">
457   - <h5 class="font13 bolder">Annotation</h5>
458   - <div class="checkbox no-margin">
459   - <!--Settings > The entire highlighted part should be active-->
460   - <label class="font11 no-margin-btm">
461   - <input type="checkbox" value="" checked>
462   - Erase Annotations when changing layers
463   - </label>
  503 + <div class="">
  504 + <div class="col-sm-6">
  505 + <h5 class="font13 bolder">Modesty Setting</h5>
  506 + <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5">
  507 + <div class="radio">
  508 + <label>
  509 + <input type="radio" ng-checked="isModestyOn" ng-model="formsetting.modesty" value="Y" name="modestyRadios" id="modon" ng-click="ChangeModesty(formsetting,'Y')">
  510 + <span class="">On</span>
  511 + </label>
  512 + </div>
  513 + <div class="radio">
  514 + <label>
  515 + <input type="radio" ng-checked="isModestyOff" ng-model="formsetting.modesty" value="N" name="modestyRadios" id="modoff" ng-click="ChangeModesty(formsetting,'N')">
  516 + <span class="">Off</span>
  517 + </label>
  518 + </div>
  519 + </div>
  520 + <div class="col-sm-6">
  521 + <h5 class="font13 bolder">Annotation</h5>
  522 + <div class="checkbox no-margin">
  523 + <!--Settings > The entire highlighted part should be active-->
  524 + <label class="font11 no-margin-btm">
  525 + <input type="checkbox" value="" checked>
  526 + Erase Annotations when changing layers
  527 + </label>
  528 + </div>
464 529 </div>
465 530 </div>
466 531 </div>
467 532 </div>
468 533 </div>
469 534 </div>
  535 + <div class="modal-footer">
  536 + <button type="button" class="btn btn-primary" ng-click="UpdateAndCloseSetting(formsetting)">OK</button>
  537 + <!--<button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>-->
  538 + <button type="button" class="btn btn-primary" ng-click="CloseSetting()">Cancel</button>
  539 + <button type="button" class="btn btn-primary" ng-click="UpdateSetting(formsetting)">Apply</button>
  540 + </div>
470 541 </div>
471   - <div class="modal-footer">
472   - <button type="button" class="btn btn-primary" ng-click="UpdateAndCloseSetting(formsetting)">OK</button>
473   - <!--<button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>-->
474   - <button type="button" class="btn btn-primary" ng-click="CloseSetting()">Cancel</button>
475   - <button type="button" class="btn btn-primary" ng-click="UpdateSetting(formsetting)">Apply</button>
476   - </div>
477   - </div>
478   - </form>
  542 + </form>
  543 + </div>
479 544 </div>
480   - </div>
481 545  
482   - <!--Annotation Modal-->
483   - <div class="annotationTollbar" style="width: 300px;position: fixed; top: 80px; right: 20px; display: none; z-index: 1200000;">
484   - <div class="annotationbar">
485   - <div class="modal-content">
486   - <div class="modal-header annotation-modal-header">
487   - <button type="button" class="close" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">&times;</span></button>
488   - <h4 class="modal-title" id="myModalLabel">Annotation</h4>
489   - </div>
490   - <div class="modal-body" id="AnnotaionPopupDiv" >
491   - <div class="row">
492   - <div class="col-sm-12">
493   - <h5>Mode</h5>
494   -
495   - <div class="btn-group btn-group-justified" role="group" aria-label="...">
496   - <div class="btn-group" role="group" tooltip>
497   - <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div>
498   - <button id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
499   - </div>
500   - <div class="btn-group" role="group">
501   - <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div>
502   - <button id="DrawMode" type="button" ng-click="DrawingMode()" class="btn btn-sm btn-success">Draw</button>
503   - </div>
504   - </div>
  546 + <!--Annotation Modal-->
  547 + <div class="annotationTollbar" style="width: 300px;position: fixed; top: 80px; right: 20px; display: none; z-index: 1200000;">
  548 + <div class="annotationbar">
  549 + <div class="modal-content">
  550 + <div class="modal-header annotation-modal-header">
  551 + <button type="button" class="close" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">&times;</span></button>
  552 + <h4 class="modal-title" id="myModalLabel">Annotation</h4>
  553 + </div>
  554 + <div class="modal-body" id="AnnotaionPopupDiv">
  555 + <div class="row">
  556 + <div class="col-sm-12">
  557 + <h5>Mode</h5>
505 558  
506   - </div>
507   - <div class="col-sm-12">
508   - <h5>Tools</h5>
509   - <div class="well well-popup">
510   - <div class="" aria-label="...">
511   - <div class="" role="group" align="center">
512   - <div id="cursor-block" style="display: none; font-size:13px;"></div>
513   - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="mouseMoveToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="mouseOutToolTip()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button>
514   - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="mouseMoveToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="mouseOutToolTip()" ng-click="DrPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>
515   - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="mouseMoveToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button>
516   - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="mouseMoveToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button>
  559 + <div class="btn-group btn-group-justified" role="group" aria-label="...">
  560 + <div class="btn-group" role="group" tooltip>
  561 + <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div>
  562 + <button id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
517 563 </div>
518   - <div class="" role="group" align="center">
519   - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="mouseMoveToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="mouseOutToolTip()" ng-click="DrLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>
520   - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="mouseMoveToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>
521   - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="mouseMoveToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>
522   - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="mouseMoveToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>
  564 + <div class="btn-group" role="group">
  565 + <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div>
  566 + <button id="DrawMode" type="button" ng-click="DrawingMode()" class="btn btn-sm btn-success">Draw</button>
523 567 </div>
524 568 </div>
  569 +
525 570 </div>
526   - <div class="well-popup well blankshapediv">
527   - <!--#7931-->
  571 + <div class="col-sm-12">
  572 + <h5>Tools</h5>
  573 + <div class="well well-popup">
  574 + <div class="" aria-label="...">
  575 + <div class="" role="group" align="center">
  576 + <div id="cursor-block" style="display: none; font-size:13px;"></div>
  577 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="mouseMoveToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="mouseOutToolTip()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button>
  578 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="mouseMoveToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="mouseOutToolTip()" ng-click="DrPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>
  579 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="mouseMoveToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button>
  580 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="mouseMoveToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button>
  581 + </div>
  582 + <div class="" role="group" align="center">
  583 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="mouseMoveToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="mouseOutToolTip()" ng-click="DrLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>
  584 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="mouseMoveToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>
  585 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="mouseMoveToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>
  586 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="mouseMoveToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>
  587 + </div>
  588 + </div>
  589 + </div>
  590 + <div class="well-popup well blankshapediv">
  591 + <!--#7931-->
528 592  
529   - <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
530   - <div class="outlinediv">
531   - <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
  593 + <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
  594 + <div class="outlinediv">
  595 + <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
532 596  
533   - </div>
  597 + </div>
534 598  
  599 + </div>
535 600 </div>
536   - </div>
537   - <div class="well well-popup">
538   - <div class="" role="group" aria-label="...">
539   - <div>
540   - <a href="#canvasPaint" data-size="1" data-color="#fff" id="annotationpaintbrushsize" class="btn btn-primary btn-xs pull-left btn-annotation" role="button" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>
  601 + <div class="well well-popup">
  602 + <div class="" role="group" aria-label="...">
  603 + <div>
  604 + <a href="#canvasPaint" data-size="1" data-color="#fff" id="annotationpaintbrushsize" class="btn btn-primary btn-xs pull-left btn-annotation" role="button" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>
541 605 <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-toggle="tooltip" data-placement="top" title="Erase" ng-click="EraseDrawing()"><i class="fa fa-eraser"></i></button>&nbsp;
542 606 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
543 607 <div style="width: 58px; float: left;">
... ... @@ -563,24 +627,24 @@
563 627 <div id="slider-range-min-2"></div>
564 628 </div>
565 629 <div class="clearfix"></div>
566   -</div>
  630 + </div>
567 631  
568   - </div>
  632 + </div>
569 633  
570 634  
571   - </div>
  635 + </div>
572 636  
  637 + </div>
573 638 </div>
574 639 </div>
575   - </div>
576 640  
  641 + </div>
577 642 </div>
578 643 </div>
579   - </div>
580 644  
581   - <!--Modal For Annotation Text Box-->
582   - <div id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:0;right:0;top:0px;bottom:0;margin:auto;">
583   -
  645 + <!--Modal For Annotation Text Box-->
  646 + <div id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:0;right:0;top:0px;bottom:0;margin:auto;">
  647 +
584 648 <div class="modal-content">
585 649 <div class="modal-header" style="background-color: #808D43;padding:10px;border-bottom:0;">
586 650 <!--<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
... ... @@ -649,259 +713,131 @@
649 713 <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
650 714 </div>
651 715 </div>
652   -
653   - </div>
654 716  
  717 + </div>
655 718  
656 719  
657 720  
658   - <!--List manager-->
659   - <!--List manager-->
660   - <style>
661   - #listManager {
662   - background: #fff;
663   - border-radius: 3px;
664   - border: 1px solid #ededed;
665   - -webkit-box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
666   - -moz-box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
667   - box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
668   - width: 350px;
669   - position: absolute;
670   - top: 170px;
671   - left: 140px;
672   - display: none;
673   - z-index: 1100;
674   - }
675 721  
676   - #listManager .annotation-modal-header {
677   - background: #818f44;
678   - padding: 2px 10px;
  722 + <!--List manager-->
  723 + <!--List manager-->
  724 + <style>
  725 + #listManager {
  726 + background: #fff;
  727 + border-radius: 3px;
  728 + border: 1px solid #ededed;
  729 + -webkit-box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
  730 + -moz-box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
  731 + box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
  732 + width: 350px;
  733 + position: absolute;
  734 + top: 170px;
  735 + left: 140px;
  736 + display: none;
  737 + z-index: 1100;
679 738 }
680 739  
681   - #listManager .annotation-modal-header h4 {
682   - color: #fff;
683   - font-size: 15px;
684   - line-height: 20px;
  740 + #listManager .annotation-modal-header {
  741 + background: #818f44;
  742 + padding: 2px 10px;
685 743 }
686 744  
687   - #listManager .modal-header .close {
688   - color: #fff;
689   - margin: 0;
690   - opacity: 10;
691   - text-shadow: none;
692   - }
  745 + #listManager .annotation-modal-header h4 {
  746 + color: #fff;
  747 + font-size: 15px;
  748 + line-height: 20px;
  749 + }
693 750  
694   - #listManager .modal-footer {
695   - padding: 5px 10px;
696   - }
697   - </style>
698   - <div id="listManager" style="">
699   - <div class="modal-header annotation-modal-header">
700   - <button type="button" class="close" aria-label="Close" ng-click="CloseListManager()"><span aria-hidden="true">&times;</span></button>
701   - <h4 class="modal-title" id="myModalLabel">List Manager</h4>
702   - </div>
703   - <div class="modal-body">
704   - <div class="row paddingTopBtm10">
705   - <div class="col-sm-12" ng-init="FillListManager()">
  751 + #listManager .modal-header .close {
  752 + color: #fff;
  753 + margin: 0;
  754 + opacity: 10;
  755 + text-shadow: none;
  756 + }
706 757  
707   - <div class="form-group">
708   - <label for="sel1">Window</label>
709   - <select class="form-control" id="viewName" disabled>
710   - <!--<option>Male Lateral</option>-->
  758 + #listManager .modal-footer {
  759 + padding: 5px 10px;
  760 + }
  761 + </style>
  762 + <div id="listManager" style="">
  763 + <div class="modal-header annotation-modal-header">
  764 + <button type="button" class="close" aria-label="Close" ng-click="CloseListManager()"><span aria-hidden="true">&times;</span></button>
  765 + <h4 class="modal-title" id="myModalLabel">List Manager</h4>
  766 + </div>
  767 + <div class="modal-body">
  768 + <div class="row paddingTopBtm10">
  769 + <div class="col-sm-12" ng-init="FillListManager()">
711 770  
712   - </select>
713   - </div>
714   - <div style="">
715 771 <div class="form-group">
716   - <div onclick="mytoggle()" class="btn btn-success btn-block" style="padding:3px 12px;">
717   - <i class=" fa fa-caret-right"></i> <span>Restrict List to</span>
718   - </div>
719   - </div>
720   -
721   - <div id="divSection" style="display:none;">
722   -
723   -
724   -
725   - <div class="well well-sm marginTopBtm10">
726   - <div class="form-horizontal">
727   - <div class="form-group">
728   - <label class="col-sm-4 control-label" for="System">System</label>
729   - <div class="col-sm-8">
730   - <select id="bodySystems" class="form-control" onchange="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystem(this.options[this.selectedIndex].id)"></select>
731   - </div>
732   - </div>
733   - <div class="form-group">
734   - <label class="col-sm-4 control-label" for="inputPassword3">Area</label>
735   - <div class="col-sm-8">
736   - <select class="form-control" disabled>
737   - <option value="1" selected="">Entire View</option>
738   - </select>
739   - </div>
740   - </div>
741   - </div>
742   - </div>
743   -
  772 + <label for="sel1">Window</label>
  773 + <select class="form-control" id="viewName" disabled>
  774 + <!--<option>Male Lateral</option>-->
744 775  
  776 + </select>
745 777 </div>
746   -
747   - <!--DA > List Manager > Multiple structure selection should not be available.-->
748   - <div class="form-group">
749   - <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select>
750   - </div>
751   -
752   - </div>
753   - <div style="clear:both;"></div>
754   -
755   -
756   -
757   -
758   - </div>
759   - </div>
760   -
761   - </div>
762   - <div class="modal-footer" id="totalTerms">
763   - <!--<span class="pull-left marginTop5">424 Structures</span>-->
764   - <button data-dismiss="modal" class="btn btn-primary" type="button"><i class="fa fa-arrow-circle-right"></i></button>
765   - </div>
766   - </div>
767   -
768   - <!--background disable div-->
769   -
770   - <div id="modelbackground"></div>
771   -
772   -
773   - <!--Edit Shape Modal-->
774   -
775   -
776   - <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white; height: 433px; width: 302px;position:absolute;left:40%;right:0;top:70px;">
777   - <div class="modal-content">
778   - <div class="modal-header annotation-modal-header">
779   - <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
780   - </div>
781   - <div class="modal-body">
782   - <div class="marginTopBtm10">
783   - <div class="well well-sm no-margin-btm">
784   - <div class="row">
785   - <div class="col-sm-12">
786   - <div class="checkbox no-margin">
787   - <label>
788   - <input id="fill-option" type="checkbox" checked onclick="enableDisableFillOption()"> Fill Option
789   - </label>
  778 + <div style="">
  779 + <div class="form-group">
  780 + <div onclick="mytoggle()" class="btn btn-success btn-block" style="padding:3px 12px;">
  781 + <i class=" fa fa-caret-right"></i> <span>Restrict List to</span>
790 782 </div>
791 783 </div>
792   - <div class="col-sm-6 enableDisableOpacity">
793   - <div class="radio">
794   - <label>
795   - <input type="radio" name="filloption" id="filloption1" value="filloption1">
796   - <span class="">Texture</span>
797   - <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
798   - </label>
799   - </div>
800   - <div class="radio">
801   - <label>
802   - <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
803   -
804 784  
805   - <div id="editstylebackgroundcolor" class="form-group" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
806   - <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
807   - <input type="text" class="form-control outerBackgroundColor" data-control="saturation" style="display:none;" value="#0088cc">
808   - </div>
  785 + <div id="divSection" style="display:none;">
809 786  
810 787  
811   - </label>
812   - </div>
813   - </div>
814   - <div class="col-sm-6 no-padding marginTop10 enableDisableOpacity">
815   - <div class="row">
816   - <label class="pull-left" style="font-weight:normal;">Scale</label>
817   - <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;">
818   - <div id="slider-range-min-3"></div>
819   - </div>
820   - </div>
821 788  
822   - <div class="row">
823   - <label class="pull-left" style="font-weight:normal;">Opacity</label>
824   - <div id="edit-slider-4" class="pull-left" style="width:53%; margin-left:3%; margin-top:2%;">
825   - <div id="slider-range-min-4"></div>
  789 + <div class="well well-sm marginTopBtm10">
  790 + <div class="form-horizontal">
  791 + <div class="form-group">
  792 + <label class="col-sm-4 control-label" for="System">System</label>
  793 + <div class="col-sm-8">
  794 + <select id="bodySystems" class="form-control" onchange="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystem(this.options[this.selectedIndex].id)"></select>
  795 + </div>
  796 + </div>
  797 + <div class="form-group">
  798 + <label class="col-sm-4 control-label" for="inputPassword3">Area</label>
  799 + <div class="col-sm-8">
  800 + <select class="form-control" disabled>
  801 + <option value="1" selected="">Entire View</option>
  802 + </select>
  803 + </div>
  804 + </div>
826 805 </div>
827 806 </div>
828 807  
829   - <div class="clearfix"></div>
830   -
831 808  
832 809 </div>
833   - </div>
834 810  
835   - </div>
836   - </div>
837   - <div class="marginTopBtm10">
838   - <div class="well well-sm no-margin-btm">
839   - <div class="row">
840   - <div class="col-sm-12">
841   - <div class="checkbox no-margin">
842   - <label>
843   - <input id="Outline-Option" onclick="enableDisableOutline()" type="checkbox" checked> Outline Option
844   - </label>
845   - </div>
  811 + <!--DA > List Manager > Multiple structure selection should not be available.-->
  812 + <div class="form-group">
  813 + <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select>
846 814 </div>
847   - <div class="col-sm-6 setEnableDisableForEditShapeStyle">
848   - <label class="marginTop5">
849   - <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span>
850   - <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;">
851 815  
852   - <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc">
853   - </div>
  816 + </div>
  817 + <div style="clear:both;"></div>
854 818  
855 819  
856   - </label>
857   - </div>
858 820  
859   - <div class="col-sm-6 setEnableDisableForEditShapeStyle">
860   - <div class="form-horizontal">
861   - <div class="form-group">
862   - <label class="col-sm-3 control-label" style=" font-weight:normal; padding-top:9px;">Size</label>
863   - <div class="col-sm-9 marginTop5">
864   - <select id="borderWidthCanvasElement" class="form-control input-sm">
865   - <option value="1">1</option>
866   - <option value="2">2</option>
867   - <option value="3">3</option>
868   - <option value="4">4</option>
869   - <option value="5">5</option>
870   - </select>
871   - </div>
872   - </div>
873   - </div>
874   - </div>
875 821  
876   - </div>
877 822 </div>
878 823 </div>
879 824  
880   - <div class="marginTopBtm10">
881   -
882   - <div class="well well-sm no-margin-btm blankshapediv">
883   - <div class="outlinediv">
884   - <div id="imgOpacity" class="fullcolordiv imgopacity">
885   - </div>
886   - </div>
887   - </div>
888   -
889   - </div>
890 825 </div>
891   - <div class="modal-footer">
892   - <button type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')">
893   - OK
894   - </button>
895   - <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
  826 + <div class="modal-footer" id="totalTerms">
  827 + <!--<span class="pull-left marginTop5">424 Structures</span>-->
  828 + <button data-dismiss="modal" class="btn btn-primary" type="button"><i class="fa fa-arrow-circle-right"></i></button>
896 829 </div>
897 830 </div>
898   - </div>
899 831  
  832 + <!--background disable div-->
900 833  
  834 + <div id="modelbackground"></div>
901 835  
902 836  
903   - <!--<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;">
904   - <div class="modal-dialog modal-sm" role="document">
  837 + <!--Edit Shape Modal-->
  838 +
  839 +
  840 + <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white; height: 433px; width: 302px;position:absolute;left:40%;right:0;top:70px;">
905 841 <div class="modal-content">
906 842 <div class="modal-header annotation-modal-header">
907 843 <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
... ... @@ -936,7 +872,6 @@
936 872 </div>
937 873  
938 874  
939   -
940 875 </label>
941 876 </div>
942 877 </div>
... ... @@ -945,7 +880,6 @@
945 880 <label class="pull-left" style="font-weight:normal;">Scale</label>
946 881 <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;">
947 882 <div id="slider-range-min-3"></div>
948   -
949 883 </div>
950 884 </div>
951 885  
... ... @@ -1008,9 +942,14 @@
1008 942 </div>
1009 943  
1010 944 <div class="marginTopBtm10">
1011   - <div class="well well-sm no-margin-btm">
1012   - <img id="imgOpacity" class="img-rounded img-responsive imgopacity" alt="..." src="content/images/blank-shape.jpg">
  945 +
  946 + <div class="well well-sm no-margin-btm blankshapediv">
  947 + <div class="outlinediv">
  948 + <div id="imgOpacity" class="fullcolordiv imgopacity">
  949 + </div>
  950 + </div>
1013 951 </div>
  952 +
1014 953 </div>
1015 954 </div>
1016 955 <div class="modal-footer">
... ... @@ -1021,8 +960,11 @@
1021 960 </div>
1022 961 </div>
1023 962 </div>
1024   - </div>-->
1025 963  
  964 + </div>
  965 +
  966 +
  967 +
1026 968 <script>
1027 969 function enableDisableFillOption()
1028 970 {
... ... @@ -1168,6 +1110,8 @@
1168 1110 <script src="app/controllers/HomeController.js"></script>
1169 1111 <script src="app/controllers/LinkController.js"></script>
1170 1112 <script src="app/controllers/LoginController.js"></script>
  1113 + <script src="app/services/AuthenticationService.js"></script>
  1114 +
1171 1115 <script src="app/services/DataService.js"></script>
1172 1116 <script src="libs/jquery/jquery_plugin/jqueryui.js"></script>
1173 1117  
... ...