ADAM / AIAHTML5

Commit 4ca5af23ab6815d87d456da7fee5032e6256c313

Authored by unknown
1 parent 005e31fb

commit changes for Issue : Ref 

1) #7414:Settings > User should be able to access Annotation Toolbar from Settings too
2)#7178 : Tool Tip is not reflecting for the mode "Identify" and the "Draw" and the "Tool" in the Annotation toolbar
Inline Side-by-side
Showing 2 changed files with 49 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @4ca5af2
... ... @@ -29,7 +29,7 @@
29 29 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
30 30  
31 31 <li><a href="#" ng-click="ShowListManager()">List Manager</a></li>
32   - <li><a href="#">Annotation Toolbar</a></li>
  32 + <li><a href="#" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
33 33 <li><a href="#">Add to Existing Curriculum</a></li>
34 34 <li><a data-toggle="modal" data-target="#modal-settings" class="cursor-pointer">Settings</a></li>
35 35 <li role="separator" class="divider"></li>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @4ca5af2
... ... @@ -55,6 +55,24 @@
55 55 border-color: #1B92D0 !important;
56 56 color: #ffffff !important;
57 57 }*/
  58 +
  59 + .custom-tooltip-annotation {
  60 + background-color: #fff;
  61 + border: 0 none;
  62 + color: #000;
  63 + left: -52px;
  64 + opacity: 0.9;
  65 + padding: 3px 0;
  66 + position: absolute;
  67 + text-align: center;
  68 + top: 41px;
  69 + width: 120px;
  70 + display: none;
  71 + z-index: 10000;
  72 + border: 1px solid #000;
  73 + color: #000;
  74 + border-radius: 0;
  75 + }
58 76 </style>
59 77  
60 78  
... ... @@ -395,11 +413,13 @@
395 413 <h5>Mode</h5>
396 414  
397 415 <div class="btn-group btn-group-justified" role="group" aria-label="...">
398   - <div class="btn-group" role="group">
399   - <button type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
  416 + <div class="btn-group" role="group" tooltip>
  417 + <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div>
  418 + <button id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
400 419 </div>
401 420 <div class="btn-group" role="group">
402   - <button type="button" class="btn btn-sm btn-success">Draw</button>
  421 + <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div>
  422 + <button id="DrawMode" type="button" class="btn btn-sm btn-success">Draw</button>
403 423 </div>
404 424 </div>
405 425  
... ... @@ -1328,7 +1348,32 @@
1328 1348  
1329 1349  
1330 1350  
  1351 + <script>
  1352 + $(function () {
  1353 +
1331 1354  
  1355 + $("#OnIdentify").on('mouseover', function () {
  1356 + $("#identify-block").addClass("custom-tooltip-annotation");
  1357 + $(".custom-tooltip-annotation").css('display', 'block');
  1358 + }).on('mouseout', function () {
  1359 + // $("#identify-block").removeClass("custom-tooltip-annotation");
  1360 + $(".custom-tooltip-annotation").css('display', 'none');
  1361 + $("#identify-block").removeClass("custom-tooltip-annotation");
  1362 + });
  1363 +
  1364 +
  1365 + $("#DrawMode").on('mouseover', function () {
  1366 + $("#draw-block").addClass("custom-tooltip-annotation");
  1367 + $(".custom-tooltip-annotation").css('display', 'block');
  1368 +
  1369 + }).on('mouseout', function () {
  1370 +
  1371 + $(".custom-tooltip-annotation").css('display', 'none');
  1372 + $("#draw-block").removeClass("custom-tooltip-annotation");
  1373 + });
  1374 +
  1375 + });
  1376 + </script>
1332 1377  
1333 1378  
1334 1379  
... ...