Commit 07fb9e1d721b49150f0e38fa2aa64d6618561b11

Authored by Amrita Vishnoi
1 parent e0a5604f

renamed view and controller name for AA and also fixed the issues created due to this...

400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
... ... @@ -50,7 +50,7 @@
50 50 <Content Include="app\controllers\DAController.js" />
51 51 <Content Include="app\controllers\HomeController.js" />
52 52 <Content Include="app\controllers\LabExercController.js" />
53   - <Content Include="app\controllers\TinyViewListController.js" />
  53 + <Content Include="app\controllers\TileViewListController.js" />
54 54 <Content Include="app\main\AIA.js" />
55 55 <Content Include="app\main\Link.js" />
56 56 <Content Include="app\services\AuthenticationService.js" />
... ... @@ -67,6 +67,7 @@
67 67 <Content Include="app\views\ci\clinical-illustrations-detail.html" />
68 68 <Content Include="app\views\da\da-view.html" />
69 69 <Content Include="app\views\LabExerc\lab-exercises-detail.html" />
  70 + <Content Include="app\views\module-item-view.html" />
70 71 <Content Include="app\views\Link\Link-view.html" />
71 72 <Content Include="app\views\AnatTest\AnatTest-view.html" />
72 73 <Content Include="app\views\AOD\AOD-view.html" />
... ... @@ -76,7 +77,7 @@
76 77 <Content Include="app\views\da\da-body-view-list.html" />
77 78 <Content Include="app\views\da\da-body-view.html" />
78 79 <Content Include="app\views\LabExerc\LabExerc-view.html" />
79   - <Content Include="app\views\tiny-view.html" />
  80 + <Content Include="app\views\tile-view.html" />
80 81 <Content Include="app\widget\MainMenu.html" />
81 82 <Content Include="body-view-wp.js" />
82 83 <Content Include="content\css\main.css" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TinyViewListController.js renamed to 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
1 1 'use strict';
2 2  
3   -AIA.controller("TinyViewListController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "$timeout", "Modules", "$routeParams", "DataService",
  3 +AIA.controller("TileViewListController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "$timeout", "Modules", "$routeParams", "DataService",
4 4 function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, BodySystems, ViewOrientations, ImageTypes, $timeout, Modules, $routeParam, DataService)
5 5 {
6 6 var ATLAS_ANATOMY = 'Atlas Anatomy';
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
... ... @@ -26,9 +26,9 @@ AIA.constant(&#39;pages&#39;, [
26 26 },
27 27 {
28 28 name: 'Tiny View List',
29   - pageSlug: 'tiny-view-list',
30   - pageUrl: 'app/views/tiny-view.html',
31   - pageController: 'TinyViewListController'
  29 + pageSlug: 'tile-view-list',
  30 + pageUrl: 'app/views/tile-view.html',
  31 + pageController: 'TileViewListController'
32 32  
33 33 },
34 34 { // id:3,
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/module-item-view.html 0 → 100644
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +<head>
  4 + <meta charset="utf-8">
  5 + <meta http-equiv="X-UA-Compatible" content="IE=edge">
  6 + <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
  7 + <title>A.D.A.M. Interactive Anatomy</title>
  8 + <link href="css/bootstrap.css" rel="stylesheet">
  9 + <link href="css/main.css" rel="stylesheet">
  10 +
  11 + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
  12 + <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic">
  13 +
  14 + <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
  15 + <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
  16 + <!--[if lt IE 9]>
  17 + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
  18 + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
  19 + <![endif]-->
  20 + <!-- include the jQuery and jQuery UI scripts -->
  21 + <script src="https://code.jquery.com/jquery-2.1.1.js"></script>
  22 + <script src="https://code.jquery.com/ui/1.11.1/jquery-ui.js"></script>
  23 + <!-- plus a jQuery UI theme, here I use "flick" -->
  24 + <link rel="stylesheet" href="css/jquery-ui-slider-pips.css">
  25 + <link rel="stylesheet" href="css/jquery-ui.css">
  26 +</head>
  27 +<body>
  28 + <div class="container-fluid ">
  29 + <!--Header-->
  30 + <nav class="navbar navbar-inverse navbar-fixed-top">
  31 + <div class="container-fluid">
  32 + <!-- Brand and toggle get grouped for better mobile display -->
  33 + <div class="navbar-header">
  34 + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topFixedNavbar1" aria-expanded="false"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button>
  35 + <a class="frameLogo navbar-brand" href="welcome.html"><img src="img/logo-main.png" class="img-responsive" alt=""></a>
  36 + </div>
  37 + <div class="collapse navbar-collapse" id="topFixedNavbar1">
  38 + <ul class="nav navbar-nav toperMenu-spaceleft">
  39 + <li class="dropdown">
  40 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a>
  41 + <ul class="dropdown-menu">
  42 + <li><a href="#">Open Resources</a></li>
  43 + <li><a href="#">Open My Pictures</a></li>
  44 + <li><a href="#">Open My Animations</a></li>
  45 + <li role="separator" class="divider"></li>
  46 + <li><a href="#">Test Creator</a></li>
  47 + <li><a href="#">Open Test</a></li>
  48 + <li><a href="#">Save Test As</a></li>
  49 + <li role="separator" class="divider"></li>
  50 + <li><a href="#">New Curriculum</a></li>
  51 + <li><a href="#">Open Existing Curriculum</a></li>
  52 + <li><a href="#">Save Curriculum As</a></li>
  53 + <li role="separator" class="divider"></li>
  54 + <li><a href="#">Export Image</a></li>
  55 + <li role="separator" class="divider"></li>
  56 + <li><a href="#">Print Active Viewer</a></li>
  57 + <li><a href="#">Print All Open Viewers</a></li>
  58 + <li><a href="#">Print Priview</a></li>
  59 + </ul>
  60 + </li>
  61 + <li><a href="#" data-toggle="modal" data-target=".bs-example-modal-sm">Annotation</a></li>
  62 +
  63 +
  64 +
  65 + <li class="dropdown">
  66 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
  67 + <ul class="dropdown-menu">
  68 + <li><a href="#">List Manager</a></li>
  69 + <li><a href="#">Annotation Toolbar</a></li>
  70 + <li><a href="#">Add to Existing Curriculum</a></li>
  71 + <li><a href="#">Settings</a></li>
  72 + <li role="separator" class="divider"></li>
  73 + <li><a href="#">Lab Exercises PDF</a></li>
  74 + </ul>
  75 + </li>
  76 + <li class="dropdown">
  77 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a>
  78 + <ul class="dropdown-menu">
  79 + <li><a href="#">Help Topics</a></li>
  80 + <li><a href="#">Customer Support</a></li>
  81 + <li role="separator" class="divider"></li>
  82 + <li><a href="#">About A.D.A.M.</a></li>
  83 + </ul>
  84 + </li>
  85 + <li><a href="#">Admin</a></li>
  86 + </ul>
  87 + <ul class="nav navbar-nav navbar-right">
  88 + <li class="visible-xs"><a href="index.html">Logout</a></li>
  89 + <li class="hidden-xs marginR5" data-toggle="tooltip" data-placement="top" title="Logout"><a href="index.html"><i class="fa fa-power-off"></i></a></li>
  90 + </ul>
  91 + <!--<form class="navbar-form navbar-right" role="search">
  92 + <div class="input-group">
  93 + <select class="form-control">
  94 + <option selected>----Select----</option>
  95 + <option>1</option>
  96 + <option>2</option>
  97 + <option>3</option>
  98 + <option>4</option>
  99 + </select>
  100 + <span class="input-group-btn">
  101 + <button class="btn btn-success" type="button"><i class="fa fa-search"></i> Search</button>
  102 + </span> </div>
  103 + </form>-->
  104 + <div id="imaginary_container">
  105 + <div class="input-group stylish-input-group paddTop5 hidden-sm">
  106 + <input type="text" class="form-control width120" placeholder="Search">
  107 + <span class="input-group-addon">
  108 + <button type="submit">
  109 + <span class="fa fa-search color-green"></span>
  110 + </button>
  111 + </span>
  112 + </div>
  113 +
  114 + <div class="visible-sm visible-md pull-right marginTop5">
  115 + <div class="dropdown">
  116 + <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
  117 + <i class="fa fa-search color-white"></i>
  118 + </button>
  119 + <!--<div class="hidden-xs marginR5 dropdown-toggle marginTop5" id="dropdownMenu1" data-toggle="dropdown" data-placement="top" title="Logout"><a href="index.html"><i class="fa fa-search color-white"></i></a></div>-->
  120 + <ul class="dropdown-menu right0" aria-labelledby="dropdownMenu1">
  121 + <li>
  122 + <!--<div class="input-group"><input type="text" aria-label="Amount (to the nearest dollar)" class="form-control"> <span class="input-group-addon"><i class="fa fa-search color-green"></i></span> </div>-->
  123 + <div class="input-group stylish-input-group ">
  124 + <input type="text" class="form-control" placeholder="Search" style="width:100%;">
  125 + <span class="input-group-addon">
  126 + <button type="submit">
  127 + <span class="fa fa-search color-green"></span>
  128 + </button>
  129 + </span>
  130 + </div>
  131 + </li>
  132 + </ul>
  133 + </div>
  134 + </div>
  135 + </div>
  136 + </div>
  137 + </div>
  138 + </nav>
  139 + <!--Body-->
  140 + <div class="bodyWrap row">
  141 + <div class="col-sm-12 pageHeading">
  142 + <!--<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>-->
  143 + <!--<div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-exchange"></i> </div>-->
  144 + <h4 class="pull-left">1<sup>st</sup> &amp; 2<sup>nd</sup> Intercostal Spaces</h4>
  145 + <div class="pull-right btn-group paddTop4 hidden-xs"> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div>
  146 + <div class="clearfix"></div>
  147 + </div>
  148 + <div class="tools pull-left" style="top:44px;">
  149 + <div class="toggle-icon toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div>
  150 + <div class="">
  151 + <div class="col-sm-6" title="Hide Pins"><button class="btn btn-black btn-sm"> <img src="img/hide-pin.png" alt="" title=""></button> </div>
  152 + <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right"><img src="img/draw-pin.png" alt="" title=""></button></div>
  153 + <div class="col-sm-6" title="Show All Pins in System(s)"><button class="btn btn-primary btn-sm marginTop5"><img src="img/all-pin.png" alt="" title=""></button></div>
  154 + <div class="col-sm-6" title="Select System">
  155 + <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="img/icon-highlight.png" alt="" title=""></button>
  156 + <ul class="dropdown-menu" aria-labelledby="dropdownMenu221">
  157 + <li><a href="#" title="Current Structure">All</a></li>
  158 + <li role="separator" class="divider"></li>
  159 + <li><a href="#" title="Cardiovascular">Cardiovascular</a></li>
  160 + <li><a href="#" title="Digestive">Digestive</a></li>
  161 + <li class="disabled"><a href="#" title="Endocrine">Endocrine</a></li>
  162 + <li class="disabled"><a href="#" title="Immune">Immune</a></li>
  163 + <li class="disabled"><a href="#" title="Integumentary">Integumentary</a></li>
  164 + <li class="disabled"><a href="#" title="Lymphatic">Lymphatic</a></li>
  165 + <li><a href="#" title="Muscular">Muscular</a></li>
  166 + <li class="disabled"><a href="#" title="Nervous">Nervous</a></li>
  167 + <li class="disabled"><a href="#" title="Reproductive">Reproductive</a></li>
  168 + <li class="disabled"><a href="#" title="Respiratory">Respiratory</a></li>
  169 + <li><a href="#" title="Skeletal">Skeletal</a></li>
  170 + <li class="disabled"><a href="#" title="Urinary">Urinary</a></li>
  171 + </ul>
  172 +
  173 + </div>
  174 + <div class="col-sm-12" data-toggle="tooltip" data-placement="top" title="Show/Hide Structure Name Boxes"><button class="btn btn-black btn-sm marginTop5 btn-block"> <img src="img/comment-box.png" alt="" title=""></button> </div>
  175 + </div>
  176 + <div class="pips-slider" style="margin-top:125px">
  177 + <h3>Zoom <i class="fa fa-search-plus"></i></h3>
  178 + <div class="slider" id="vertical-slider"></div>
  179 + </div>
  180 + </div>
  181 +
  182 + <div class="main2">
  183 + <div class="col-sm-12 stickey-area">
  184 + <div class="breadcrumb">
  185 + <div class="">
  186 + <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
  187 + <input class="form-control input-sm " type="text" placeholder="Anterior cutaneous branch of first intercostal nerve">
  188 + <!--<select class="form-control input-sm ">
  189 + <option>---Select---</option>
  190 + <option selected>Anterior cutaneous branch of first intercostal nerve</option>
  191 + <option>Anterior cutaneous branch of second intercostal nerve</option>
  192 + <option>Anterior cutaneous branch of third intercostal nerve</option>
  193 + <option>Anterior intercostal artery</option>
  194 + <option>Anterior intercostal vein</option>
  195 + </select>-->
  196 + <!--<div class="input-group-addon btn btn-primary btn-sm"></div>-->
  197 + </div>
  198 + &nbsp;
  199 + <!-- Single button -->
  200 + <div class="btn-group">
  201 + <button type="button" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  202 + <i class="fa fa-arrow-circle-right"></i>
  203 + </button>
  204 + <ul class="dropdown-menu">
  205 + <li><a href="#">1<sup>st</sup> &amp; 2<sup>nd</sup> Intercostal Spaces</a></li>
  206 + <li role="separator" class="divider"></li>
  207 + <li><a href="#">All</a></li>
  208 + </ul>
  209 + </div>
  210 + <div class="btn-group">
  211 + <button type="button" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  212 + <i class="fa fa-male"></i>
  213 + </button>
  214 + <ul class="dropdown-menu" style="min-width:auto;">
  215 + <li><img src="img/position.jpg" class="img-responsive"></li>
  216 + </ul>
  217 + </div>
  218 +
  219 + </div>
  220 + </div>
  221 + </div>
  222 + <div class="col-sm-12">
  223 + <div class="container-fluid">
  224 + <div class="row">
  225 + <div class="col-sm-12 img-thumbnail" align="center"><img src="img/1000x600.jpg" alt="" title="" class="img-responsive"></div>
  226 + <!--<div class="col-sm-1 img-thumbnail pull-right" align="center"><img src="img/500x300.jpg" alt="" title="" class="img-responsive"></div>
  227 + <div class="clearfix"></div>-->
  228 + </div>
  229 + </div>
  230 + </div>
  231 + <div class="clearfix"></div>
  232 +
  233 +
  234 +
  235 + </div>
  236 + </div>
  237 + </div>
  238 +
  239 + <!--Annotation Modal-->
  240 + <div class="modal fade bs-example-modal-sm" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="z-index:9999;" id="draggable">
  241 + <div class="modal-dialog modal-sm" role="document">
  242 + <div class="modal-content">
  243 + <div class="modal-header annotation-modal-header">
  244 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  245 + <h4 class="modal-title" id="myModalLabel">Annotation</h4>
  246 + </div>
  247 + <div class="modal-body">
  248 + <div class="row">
  249 + <div class="col-sm-12">
  250 + <h5>Mode</h5>
  251 + <!--<div class="btn-group" role="group" aria-label="...">
  252 + <button type="button" class="btn btn-primary btn-sm">Identify</button>
  253 + <button type="button" class="btn btn-primary btn-sm">Draw</button>
  254 + </div>-->
  255 + <div class="btn-group btn-group-justified" role="group" aria-label="...">
  256 + <div class="btn-group" role="group">
  257 + <button type="button" class="btn btn-sm btn-success">Identify</button>
  258 + </div>
  259 + <div class="btn-group" role="group">
  260 + <button type="button" class="btn btn-sm btn-success">Draw</button>
  261 + </div>
  262 + </div>
  263 +
  264 + </div>
  265 + <div class="col-sm-12">
  266 + <h5>Tools</h5>
  267 + <div class="well well-popup">
  268 + <div class="" role="" aria-label="...">
  269 + <div class="" role="group" align="center">
  270 + <button type="button" class="btn btn-black btn-xs mrgnBtm5" data-toggle="tooltip" data-placement="top" title="Select Shapes(S)"><img src="img/icon-identity.png" alt="" title=""></button>
  271 + <button type="button" class="btn btn-black btn-xs mrgnBtm5" data-toggle="tooltip" data-placement="top" title="Draw Pin"><img src="img/draw-pin.png" alt="" title=""></button>
  272 + <button type="button" class="btn btn-black btn-xs mrgnBtm5" data-toggle="tooltip" data-placement="top" title="Draw Arrow"><img src="img/draw-arrow.png" alt="" title=""></button>
  273 + <button type="button" class="btn btn-black btn-xs mrgnBtm5" data-toggle="tooltip" data-placement="top" title="Draw Text"><img src="img/draw-text.png" alt="" title=""></button>
  274 + </div>
  275 + <div class="" role="group" align="center">
  276 + <button type="button" class="btn btn-black btn-xs " data-toggle="tooltip" data-placement="top" title="Draw Line"><img src="img/draw-line.png" alt="" title=""></button>
  277 + <button type="button" class="btn btn-black btn-xs" data-toggle="tooltip" data-placement="top" title="Draw Rectangle"><img src="img/draw-rec.png" alt="" title=""></button>
  278 + <button type="button" class="btn btn-black btn-xs" data-toggle="tooltip" data-placement="top" title="Draw Circle"><img src="img/draw-cir.png" alt="" title=""></button>
  279 + <button type="button" class="btn btn-black btn-xs" data-toggle="tooltip" data-placement="top" title="Draw Polygon"><img src="img/draw-poly.png" alt="" title=""></button>
  280 + </div>
  281 + </div>
  282 + </div>
  283 + <div class="well-popup well">
  284 + <img src="img/blank-shape.jpg" alt="..." class="img-rounded img-responsive">
  285 + </div>
  286 + <div class="well well-popup">
  287 + <div class="" role="group" aria-label="...">
  288 + <div>
  289 + <button type="button" class="btn btn-primary btn-xs pull-left" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;"><i class="fa fa-paint-brush"></i></button>
  290 + <button type="button" class="btn btn-primary btn-xs pull-left" data-toggle="tooltip" data-placement="top" title="Erase"><i class="fa fa-eraser"></i></button>&nbsp;
  291 + <div class="marginL2 pull-left"><input type="number" id="amount-2" value="25" step="1" style="width:60px;"></div>&nbsp;
  292 + <div class="pull-left" style="width:45%; margin-left:2%;">
  293 + <div id="slider-range-min-2"></div>
  294 + </div>
  295 + <div class="clearfix"></div>
  296 + </div>
  297 +
  298 +
  299 + </div>
  300 +
  301 +
  302 + </div>
  303 +
  304 + </div>
  305 + </div>
  306 + </div>
  307 +
  308 + </div>
  309 + </div>
  310 + </div>
  311 +
  312 + <script src="js/jquery-1.11.3.min.js"></script>
  313 + <script src="js/bootstrap.js"></script>
  314 + <script src="js/custom.js"></script>
  315 + <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
  316 + <script src="js/jquery.sticky.js"></script>
  317 + <script>
  318 + $(window).load(function () {
  319 + $(".stickey-area").sticky();
  320 + });
  321 + </script>
  322 + <script>
  323 + $(function () {
  324 + $("#slider-range-min-2").slider({
  325 + range: "min",
  326 + min: 1,
  327 + max: 60,
  328 + value: 10,
  329 + slide: function (event, ui) {
  330 + $("#amount-2").val(ui.value);
  331 + }
  332 + });
  333 + $("#amount-2").val($("#slider-vertical-2").slider("value"));
  334 +
  335 + });
  336 + </script>
  337 +
  338 + <script>
  339 + $(document).ready(function () {
  340 + $('[data-toggle="tooltip"]').tooltip();
  341 + });
  342 + </script>
  343 + <script src="js/jquery-ui-slider-pips.js"></script>
  344 + <script>
  345 + $(".slider")
  346 +
  347 + .slider({
  348 + min: 25,
  349 + max: 100,
  350 + value: 100,
  351 + range: "min",
  352 + orientation: "vertical"
  353 + })
  354 +
  355 + .slider("pips", {
  356 + rest: "label",
  357 + step: "15"
  358 + });
  359 + </script>
  360 +
  361 + <script>
  362 + $(function () {
  363 + $("#draggable").draggable();
  364 + });
  365 + </script>
  366 +
  367 +
  368 +</body>
  369 +</html>
0 370 \ No newline at end of file
... ...