ADAM / AIAHTML5

Commit a6c52ec0ed969c9a9d70a7842cbcf4f880600dbf

Authored by Birendra
1 parent 6fbe9906

add new curriculum and fixed other bugs

Inline Side-by-side
Showing 9 changed files with 207 additions and 120 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @a6c52ec
... ... @@ -76,7 +76,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
76 76  
77 77 $('#CBTextArea_ifr').css('pointer-events', 'none');
78 78 $('#CBTextArea_ifr').css('opacity', '0.7');
79   -
  79 +
80 80 $('#jstree').css('pointer-events', 'none');
81 81 $('#jstree').css('opacity', '0.7');
82 82  
... ... @@ -350,31 +350,113 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
350 350 $location.url("/curriculum-builder-detail");
351 351 }
352 352  
353   - $rootScope.newCurriculumDetail = function () {
354   - $rootScope.selectedNodeSingle.push(
  353 + $rootScope.CreateNewCurriculum = function () {
  354 + $scope.CBDisableUI();
  355 + var date = new Date();
  356 + var newId = date.getTime();//timestamp is the number of milliseconds that have passed since January 1, 1970
  357 + var sectionid='sn'+newId;
  358 + var slideid='sd'+newId;
  359 + var newstruct= [
  360 + { "_label": "New Slide",
  361 + "_id": slideid,
  362 + "_isRoot": "false",
  363 + "_isBranch": "false",
  364 + "_isLocked": "false"
  365 + }
  366 + ] ;
  367 +
  368 + var newcontent=[
  369 + {
  370 + "summary": "",
  371 + "author": "",
  372 + "modified": "",
  373 + "password": "",
  374 + "version": "",
  375 + "windows": "",
  376 + "_id": sectionid
  377 + },
  378 + {
  379 + "notes": "",
  380 + "windows": "",
  381 + "_id": slideid
  382 + }
  383 + ];
  384 +
  385 + var newCbData =
355 386 {
356   - "structure": {
357   - "structure": [
358   - {
359   - "_label": "Untitled Slide",
360   - "_id": "51516C76",
361   - "_isRoot": "false",
362   - "_isBranch": "false",
363   - "_isLocked": "false"
364   - }
365   - ],
366   - },
367   - "_label": "Untitled Curriculum",
368   - "_id": "111112",
369   - "_isRoot": "true",
370   - "_isBranch": "true",
371   - "_isLocked": "false"
372   - });
373   - $rootScope.stru = $scope.selectedNodeSingle[0];
374   - $rootScope.cbTreeFirstLabel = $scope.selectedNodeSingle[0]._label;
375   - $rootScope.structure = $scope.selectedNodeSingle[0].structure.structure;
376   - $rootScope.cbTreeFirstID = $scope.selectedNodeSingle[0]._id;
377   - $location.url("/curriculum-builder-detail");
  387 + "slideshow": {
  388 + "presentation": {
  389 + "structure": {
  390 + "structure":newstruct,
  391 + "_label": "untitled Curriculum",
  392 + "_id": sectionid,
  393 + "_isRoot": "true",
  394 + "_isBranch": "true",
  395 + "_isLocked": "false"
  396 + },
  397 + "_anchor": "true",
  398 + "_window_position": "6,10",
  399 + "_window_size": "828,453" // Apply Dynamic
  400 + },
  401 + "content": {
  402 + "element": newcontent,
  403 + }
  404 + }
  405 +
  406 + };
  407 +
  408 +
  409 + localStorage.setItem("cbJsonDataObject", JSON.stringify(newCbData));
  410 + $rootScope.cbJsonData = "";
  411 + $rootScope.cbDynamicJsonData = "";
  412 + $rootScope.cbJsonData = newCbData;
  413 + $rootScope.cbDynamicJsonData = newCbData;
  414 + $rootScope.AutherName = "";
  415 + $rootScope.summary = "";
  416 +
  417 + $rootScope.getCBsummary();
  418 +
  419 + $rootScope.structure = $rootScope.cbJsonData.slideshow.presentation.structure.structure;
  420 + $rootScope.stru = $rootScope.cbDynamicJsonData.slideshow.presentation;
  421 + $rootScope.cbDynamicContents = $rootScope.cbDynamicJsonData.slideshow.content.element;
  422 + $rootScope.cbTreeFirstLabel = $rootScope.cbJsonData.slideshow.presentation.structure._label;
  423 + $rootScope.cbTreeFirstID = $rootScope.cbJsonData.slideshow.presentation.structure._id;
  424 +
  425 + $rootScope.selectedNodeSingle = [];
  426 + $scope.selectedNodeSingleObj = [];
  427 + $rootScope.structureObjForSaveCB = [];
  428 + $rootScope.contentNotesForSaveCB = [];
  429 + $rootScope.dynamicUpdatedJsonForSaveCB = "";
  430 + $scope.isChangeFromDropDown=false;
  431 +
  432 + if (($location.url() == "/curriculum-builder")) {
  433 + $location.url("/curriculum-builder-detail");
  434 + }
  435 + else
  436 + {
  437 + $scope.openNewCurriculum();
  438 + }
  439 +
  440 + }
  441 +
  442 + $scope.openNewCurriculum = function () {
  443 + $scope.CBDisableUI();
  444 + tinymce.get("CBTextArea").setContent("");
  445 + $('#jstree').jstree('destroy');
  446 +
  447 + var $e1 = $('<ul><li>'
  448 + + '<span id="{{cbTreeFirstID}}">{{cbTreeFirstLabel}}</span>'
  449 + +'<script type="text/ng-template" id="strTree"><span id="{{str._id}}" isBranch="{{str._isBranch}}">{{ str._label }}</span>'
  450 + +'<ul ng-if="str.structure">'
  451 + + "<li ng-repeat='str in str.structure' ng-include=\"'strTree'\"></li></ul></script>"
  452 + + "<ul><li ng-repeat='str in structure' ng-include=\"'strTree'\"></li></ul>"
  453 + + '</li></ul>').appendTo('#jstree');
  454 +
  455 + $compile($e1)($scope);
  456 +
  457 + // initialize jstree after reset for new curriculum
  458 + callEditorOnInit();
  459 +
378 460 }
379 461  
380 462 $scope.openCBJsPanel = function () {
... ... @@ -415,7 +497,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
415 497 left: 20,
416 498 },
417 499 controls: { buttons: 'closeonly' },
418   - size: { width: 850, height: 512 },
  500 + size: { width: 850, height: 480 },
419 501  
420 502 });
421 503  
... ... @@ -432,37 +514,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
432 514  
433 515 }
434 516  
435   - function traverseTreeForSetIcons(o, current_id) {
436   -
437   - for (var i in o) {
438   -
439   - if (o[i] !== null && typeof (o[i]) == "object") {
440   - if (o[i]._isBranch == "false") {
441   -
442   - $("#jstree").jstree(true).set_icon(o[i]._id, "../../../content/images/CB/file.png");
443   - //$("#AddSlide").addClass("cbAddSection");
444   - //$("#AddSection").addClass("cbAddSection");
445   - }
446   - if (o[i]._isBranch == "true") {
447   - //$("#AddSlide").removeClass("cbAddSection");
448   - // $("#AddSection").removeClass("cbAddSection");
449   - }
450   - traverseTreeForSetIcons(o[i], current_id);
451   - }
452   -
453   - }
454   - }
455   -
456 517 $scope.loadNotesById = function () {
457 518  
  519 + $("#cbSelect").empty();
458 520 traverseForLoadDropDown($rootScope.stru);
459 521  
460   - setTimeout(function () {
461   -
  522 + setTimeout(function () {
462 523 var nodeid = document.getElementById('cbSelect').value;
463 524 $('#jstree').jstree('select_node', nodeid);
464   -
465   - // traverseTreeForSetIcons($rootScope.stru, nodeid);
466 525 }, 200);
467 526  
468 527 }
... ... @@ -626,8 +685,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
626 685 $scope.currentSlideNumber = i + 1;
627 686 }
628 687 }
629   - //$scope.currentSlideNumber += 1;
630   - //document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length;
631 688 document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSiblingObjs).length;
632 689 }
633 690 else {
... ... @@ -771,7 +828,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
771 828 }
772 829 if ($scope.selectedNodeSingleObj._isBranch == "true") {
773 830 traverseTreeSelectedSingleObj($rootScope.contentNotesForSaveCB, current_id);
774   - //document.getElementById('cbRenameDate').value = $scope.selectedNodeSingleObj.modified;
775 831 $scope.setProperties();
776 832 document.getElementById('cbModelRenameBackground').style.display = "block";
777 833 document.getElementById('cbModelSectionRenameId').style.display = "block";
... ... @@ -802,7 +858,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
802 858 $scope.selectedNodeSingleObj._label = newSlideText;
803 859 if ($rootScope.structureObjForSaveCB.length == 0) {
804 860 $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
805   - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure;
806 861 }
807 862 //Update Save Draft object for Rename slide
808 863 for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) {
... ... @@ -1207,30 +1262,83 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1207 1262 }
1208 1263  
1209 1264 $rootScope.DeleteSlideSection = function () {
  1265 + var selectNodeAfterDelete=0;
1210 1266 var cbCurrentSelectedId = document.getElementById('cbSelect').value;
1211 1267 var CurrentSelectedLiId = $('#' + cbCurrentSelectedId).closest('li').attr('id');
1212 1268 var CurrentSelectedParentSpanId = $('#' + cbCurrentSelectedId).parent().parent().parent().parent().find('span').attr('id');
1213 1269 var parentNodeObj = $('#' + cbCurrentSelectedId).parent().parent().parent();
1214 1270 var indexOfCurrentSelectedId = $(parentNodeObj).children('li').index($("#" + CurrentSelectedLiId));
1215   - $('#jstree').jstree().delete_node([$("#jstree").jstree().get_selected(true)[0].id]);
1216 1271 var lengthOfCurrentSelectedSlideSiblings = $(parentNodeObj).children('li').length;
1217 1272 if (indexOfCurrentSelectedId <= 0) {
1218 1273 if (lengthOfCurrentSelectedSlideSiblings > 1) {
1219   - $rootScope.cbNext();
  1274 + $scope.nextnodebeforedelete();
  1275 + selectNodeAfterDelete= $scope.nextCurrentId
  1276 + $('#jstree').jstree().delete_node([$("#jstree").jstree().get_selected(true)[0].id]);
1220 1277 }
1221 1278 else {
1222   - $('#jstree').jstree(true).deselect_all();
1223   - $('#jstree').jstree('select_node', CurrentSelectedParentSpanId);
  1279 + $('#jstree').jstree().delete_node([$("#jstree").jstree().get_selected(true)[0].id]);
  1280 + selectNodeAfterDelete=CurrentSelectedParentSpanId
1224 1281 }
1225 1282  
1226 1283 }
1227 1284 else {
1228   - $rootScope.cbBack();
  1285 + $scope.backnodebeforedelete();
  1286 + selectNodeAfterDelete= $scope.backCurrentId
  1287 + $('#jstree').jstree().delete_node([$("#jstree").jstree().get_selected(true)[0].id]);
1229 1288 }
  1289 +
  1290 +
1230 1291 $scope.DeleteSlide(cbCurrentSelectedId, CurrentSelectedParentSpanId);
1231   - var CurrentId = document.getElementById('cbSelect').value;
1232   - $scope.DropDownSelectNodeClick(CurrentId);
  1292 +
1233 1293 $rootScope.closeDeleteModel();
  1294 + $('#jstree').jstree(true).deselect_all();
  1295 + $('#jstree').jstree('select_node', selectNodeAfterDelete);
  1296 +
  1297 + }
  1298 + $scope.backnodebeforedelete = function () {
  1299 + $scope.isChangeFromDropDown=false;
  1300 + var cbCurrentId = document.getElementById('cbSelect').value;
  1301 + var counter = 0;
  1302 + $scope.backCurrentId=0;
  1303 + $("#jstree").jstree("open_all");
  1304 +
  1305 + $($(".jstree-container-ul li a span").get().reverse()).each(function () {
  1306 +
  1307 + var span_Id = $(this).attr("id");
  1308 + if (span_Id == cbCurrentId) {
  1309 + counter++;
  1310 + }
  1311 + if (counter == 2) {
  1312 + $scope.backCurrentId = span_Id;
  1313 + return false;
  1314 + }
  1315 + if (counter == 1) {
  1316 + counter += 1;
  1317 + }
  1318 + });
  1319 + }
  1320 + $scope.nextnodebeforedelete = function () {
  1321 +
  1322 + $scope.isChangeFromDropDown=false;
  1323 + var cbCurrentId = document.getElementById('cbSelect').value;
  1324 + var counter = 0;
  1325 + $scope.nextCurrentId=0;
  1326 + $("#jstree").jstree("open_all");
  1327 +
  1328 + $('.jstree-container-ul li a span').each(function () {
  1329 + var span_Id = $(this).attr("id");
  1330 + if (span_Id == cbCurrentId) {
  1331 + counter++;
  1332 + }
  1333 + if (counter == 2) {
  1334 + $scope.nextCurrentId = span_Id;
  1335 + return false;
  1336 + }
  1337 + if (counter == 1) {
  1338 + counter += 1;
  1339 + }
  1340 + });
  1341 +
1234 1342 }
1235 1343  
1236 1344 $rootScope.closeDeleteModel = function () {
... ... @@ -1264,13 +1372,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1264 1372  
1265 1373 var treeliId=newSlideId+'li';
1266 1374  
1267   - //expend parent if collapse
1268   - $("#jstree").jstree("open_node", $('#'+createNodeId));
1269   -
1270 1375 $('#jstree').jstree().create_node(createNodeId, {
1271 1376 "id": treeliId,
1272 1377 "text": '<span id=' + newSlideId + ' isbranch="false" >New Slide</span>'
1273 1378 }, "last", function () {
  1379 + //expend parent if collapse
  1380 + $("#jstree").jstree("open_node", $('#'+createNodeId));
1274 1381 $scope.addSlide(createNodeId, newSlideId);
1275 1382 $('#jstree').jstree(true).deselect_all();
1276 1383 $('#jstree').jstree('select_node', newSlideId);
... ... @@ -1320,7 +1427,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1320 1427  
1321 1428 setTimeout(function () {
1322 1429 $("#jstree").jstree(true).set_icon(AddSlideId, "../../../content/images/CB/file.png");
1323   - }, 500);
  1430 + }, 50);
1324 1431 }
1325 1432  
1326 1433 $rootScope.CBAddSection = function () {
... ... @@ -1346,13 +1453,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1346 1453 var newSectionId = 'sn'+date.getTime();//timestamp is the number of milliseconds that have passed since January 1, 1970
1347 1454  
1348 1455 var treeliId=newSectionId+'li';
1349   - //expend parent if collapse
1350   - $("#jstree").jstree("open_node", $('#'+createNodeId));
1351   -
  1456 +
1352 1457 $('#jstree').jstree().create_node(createNodeId, {
1353 1458 "id": treeliId,
1354 1459 "text": '<span id=' + newSectionId + ' isbranch="true" >New Section</span>'
1355 1460 }, "last", function () {
  1461 + //expend parent if collapse
  1462 + $("#jstree").jstree("open_node", $('#'+createNodeId));
1356 1463 $scope.addSection(createNodeId, newSectionId);
1357 1464 $('#jstree').jstree(true).deselect_all();
1358 1465 $('#jstree').jstree('select_node', newSectionId);
... ... @@ -1640,10 +1747,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1640 1747 "modified": $scope.selectedNodeSingleObj.modified,
1641 1748 "password": "",
1642 1749 "version": $scope.selectedNodeSingleObj.version,
1643   - "_id": cbCurrentId
1644   - //"notes": notesForSelectedSlide,
1645   - //"windows": windowsInSelectedSlide,
1646   - //"_id": cbCurrentId
  1750 + "_id": cbCurrentId
1647 1751 });
1648 1752 }
1649 1753 else if ($scope.selectedNodeSingleObj._isBranch == "true") {
... ... @@ -1657,9 +1761,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1657 1761 "version": $scope.selectedNodeSingleObj.version,
1658 1762 "windows": windowsInSelectedSlide,
1659 1763 "_id": cbCurrentId
1660   - //"notes": notesForSelectedSlide,
1661   - //"windows": windowsInSelectedSlide,
1662   - //"_id": cbCurrentId
1663 1764 });
1664 1765 }
1665 1766 $rootScope.cbDynamicContents = $rootScope.contentNotesForSaveCB;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @a6c52ec
... ... @@ -1136,7 +1136,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1136 1136 rootScope.$apply(function () {
1137 1137 rootScope.isLoading = true;
1138 1138 })
1139   - var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
  1139 + var scope = angular.element(document.geSideBarToggleDAtElementsByClassName("daBodyView")).scope();
1140 1140 scope.$apply(function () {
1141 1141  
1142 1142 if ($scope.GetwindowStoreData(windviewid,'isTransparencyActivated')) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @a6c52ec
... ... @@ -1847,7 +1847,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1847 1847 $("#openResourceId").addClass("openResources");
1848 1848 $("#annotationButton").addClass("disableMenuoption");
1849 1849 $("#Menuoptionid").addClass("disableMenuoption");
1850   - $rootScope.newCurriculum = "newCurriculum";
  1850 + $rootScope.newCurriculum = "";
1851 1851 $rootScope.openCurriculum = "";
1852 1852 $rootScope.saveCurriculam = "saveCurriculam";
1853 1853  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @a6c52ec
... ... @@ -828,12 +828,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
828 828 var windviewid = (targetid).split("_")[len-1];
829 829 changeThumbnailSize(event, ui.value, windviewid);
830 830 }
831   - }
832   - //,
833   - // change: function (event, ui) {
834   -
  831 + } ,
  832 + stop: function (event, ui) {
  833 + //work on click when slide no is not in below case
  834 + if (ui.value != 25 || ui.value != 40 || ui.value != 55 || ui.value != 70 || ui.value != 85 || ui.value != 100) {
  835 + var targetid = event.target.id;
  836 + var len= (targetid).split("_").length;
  837 + var windviewid = (targetid).split("_")[len-1];
  838 + changeThumbnailSize(event, ui.value, windviewid);
  839 + }
835 840  
836   - // }
  841 + }
837 842 })
838 843 .slider("pips", {
839 844 rest: "label",
... ... @@ -922,7 +927,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
922 927 scope.removeSpeechBubble(windowviewid);
923 928 var relativeWidth = 0;
924 929 var relativeHeight = 0;
925   - if (value == 25 || value == 40 || value == 55 || value == 70 || value == 85 || value == 100) {
  930 + // if (value == 25 || value == 40 || value == 55 || value == 70 || value == 85 || value == 100) {
926 931 $("#listManager").css("display", "none");
927 932 $("#optionsListManagerTab").removeClass("active");
928 933  
... ... @@ -995,7 +1000,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
995 1000 scope.showAllPins(windowviewid,true);
996 1001 break;
997 1002 }
998   - }
  1003 + // }
999 1004 });
1000 1005 }
1001 1006  
... ... @@ -3437,7 +3442,7 @@ function systemChange(event) {
3437 3442 var len = (event.currentTarget.id).split("_").length;
3438 3443 var windowviewid = (event.currentTarget.id).split("_")[len - 1];
3439 3444  
3440   - $("#" + event.currentTarget.id).parent().toggleClass('tools1');
  3445 + $("#" + event.currentTarget.id).parent().toggleClass('active');
3441 3446 $("#selectedTermName_"+windowviewid).parent().parent().parent().parent().parent().toggleClass('active');
3442 3447  
3443 3448 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/CBuild-view.html
  View file @a6c52ec
... ... @@ -2,7 +2,7 @@
2 2 <div ng-include="'app/widget/MainMenu.html'" />
3 3 <div class="main" ng-init="loadCurriculumBuiderData()">
4 4 <div class="col-sm-12">
5   - <div class="well" style=" height:75vh">
  5 + <div class="well" style=" height:80vh">
6 6 <div class="col-sm-6">
7 7 <ul class="list-group" id="leftBodyViewList"></ul>
8 8 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-TinyMCEjspanel.html
  View file @a6c52ec
... ... @@ -27,10 +27,6 @@
27 27 </div>
28 28 </div>
29 29 <div class="col-sm-1 nopadding" id="cbEditorLeftSideBar">
30   - <!--Commented by sandeep for user story-49226(1)-->
31   - <!--<div class="col-sm-12 nopadding" title="Hyperlink">
32   - <button class="btn btn-black btn-sm btn-block marginTop5" data-toggle="modal" data-target="#myModal-transparency-box"><img src="../../../content/images/CB/icon-link.png" alt="" title=""></button>
33   - </div>-->
34 30 <div class="col-sm-6 nopadding" title="Add Slide">
35 31 <button class="btn btn-black btn-sm marginTop5" onclick="CBAddNewSlide()"><img src="../../../content/images/CB/icon-addslide.png" alt=""></button>
36 32 </div>
... ... @@ -82,7 +78,7 @@
82 78 plugins: 'advlist, lists, autolink, link, anchor, print, preview, searchreplace, fullscreen, hr',
83 79 menubar: 'file edit view insert format',
84 80 toolbar: 'undo redo |fontsizeselect fontselect | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist | forecolor backcolor | link anchor | formatselect |strikethrough | outdent indent | removeformat | fullscreen preview print',
85   - height: 482,
  81 + height: 450,
86 82 toolbar_drawer: 'sliding',
87 83 content_style: ".mce-content-body {font-size:14pt;font-family:Arial;}"
88 84  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html
  View file @a6c52ec
... ... @@ -11,7 +11,7 @@
11 11 .CBLeft-Sidebar {
12 12 width: 300px;
13 13 padding-top: 0px;
14   - height: 92vh;
  14 + height: 89vh;
15 15 background: #222;
16 16 padding-top: 20px;
17 17 position: absolute !important;
... ... @@ -53,7 +53,7 @@
53 53 <div id="sidebar-wrapper" class="sidebar-lft">
54 54 <div class="row">
55 55 <div class="col-sm-12" style="">
56   - <div class="content_wrap" style="background:#fff;height:540px;overflow-y:scroll">
  56 + <div class="content_wrap" style="background:#fff;height:480px;overflow-y:scroll">
57 57 <!--this is for Tree structure ul li with json tree-->
58 58 <div id="jstree">
59 59 //loading from controller
... ... @@ -74,15 +74,15 @@
74 74 <button class="btn btn-sm btn-primary " title="Move Down" id="moveDown" ><i class=" fa fa-arrow-down"></i></button>
75 75 </div>
76 76 <div class="btn-group" role="group">
77   - <button class="btn btn-sm btn-primary DeletesectionClass" title="Delete section" id="Deletesection">
  77 + <button class="btn btn-sm btn-primary DeletesectionClass" title="Delete section" id="Deletesection" ng-click="showDeleteSlideModel()">
78 78 <img src="../../../content/images/CB/remove-section.png" />
79 79 </button>
80 80 </div>
81 81 <div class="btn-group" role="group">
82   - <button class="btn btn-sm btn-primary DeleteslideClass" title="Delete slide" id="DeleteSlide"><img src="../../../content/images/CB/remove-slide.png" /></button>
  82 + <button class="btn btn-sm btn-primary DeleteslideClass" title="Delete slide" id="DeleteSlide" ng-click="showDeleteSlideModel()"><img src="../../../content/images/CB/remove-slide.png" /></button>
83 83 </div>
84 84 <div class="btn-group" role="group">
85   - <button class="btn btn-sm btn-primary cbAddSection" title="Add Section" id="AddSection"><img src="../../../content/images/CB/add-section.png" /></button>
  85 + <button class="btn btn-sm btn-primary cbAddSection" title="Add Section" id="AddSection" ng-click="CBAddSection()"><img src="../../../content/images/CB/add-section.png" /></button>
86 86 </div>
87 87 <div class="btn-group" role="group">
88 88 <button class="btn btn-sm btn-primary cbAddSection" title="Add Slide" id="AddSlide" ng-click="CBAddSlide()"><img src="../../../content/images/CB/add-slide.png" /></button>
... ... @@ -139,7 +139,7 @@
139 139 <div class="form-group marginTop10">
140 140 <label for="hyperlink" class="col-sm-3 control-label">Title</label>
141 141 <div class="col-sm-9">
142   - <input type="text" id="renameInputBoxId" class="form-control" placeholder="What is Curriculum Builder">
  142 + <input type="text" id="renameInputBoxId" class="form-control" placeholder="enter slide name">
143 143 </div>
144 144 </div>
145 145 </div>
... ... @@ -366,13 +366,7 @@
366 366 }
367 367  
368 368 $('#jstree').on("select_node.jstree", function (e, data) {
369   - // $('#jstree').bind("dblclick.jstree", function (e, data) {
370   - // var node = $(e.target).closest("li");
371   - // var id = node[0].id;
372   -
373   - // var $parent = $('#'+id).parent();
374   - // count = $parent.children().index($('#' +id));
375   -
  369 +
376 370 var $parent = $('#' + data.node.id).parent();
377 371 count = $parent.children().index($('#' + data.node.id));
378 372 getJSTreeinstance();
... ... @@ -401,9 +395,10 @@
401 395 $("#moveDown").addClass("cbMoveUpDown");
402 396  
403 397 }
404   -
405 398 angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().openTinyMCE(nodeid);
406 399 });
  400 +
  401 + $('#moveUp').unbind('click');
407 402 $("#moveUp").click(function () {
408 403  
409 404 getJSTreeinstance();
... ... @@ -426,6 +421,7 @@
426 421  
427 422 });
428 423  
  424 + $('#moveDown').unbind('click');
429 425 $("#moveDown").click(function ()
430 426 {
431 427 getJSTreeinstance();
... ... @@ -447,18 +443,7 @@
447 443 count++;
448 444 }
449 445 });
450   - $("#DeleteSlide").click(function () {
451   - angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().showDeleteSlideModel();
452   -
453   - });
454   -
455   - $("#Deletesection").click(function () {
456   - angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().showDeleteSlideModel();
457   -
458   - });
459   - $("#AddSection").click(function () {
460   - angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().CBAddSection();
461   - });
  446 +
462 447 },
463 448  
464 449 1);
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @a6c52ec
... ... @@ -22,7 +22,7 @@
22 22 }*/
23 23  
24 24 .tools1 {
25   - left: -96px;
  25 + left: -100px;
26 26 }
27 27  
28 28 .tooltip-custom + .tooltip > .tooltip-inner {
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @a6c52ec
... ... @@ -11,7 +11,7 @@
11 11 <li ng-class="disableMenuoption"><a href="#">Open Test</a></li>
12 12 <li ng-class="disableMenuoption"><a href="#">Save Test As</a></li>
13 13 <li role="separator" class="divider"></li>
14   - <li ng-class="newCurriculum"><a href="curriculum-builder-detail" ng-click="NewCurricullumData('NewCurriculam')">New Curriculum</a></li>
  14 + <li ng-class="newCurriculum" ng-click="CreateNewCurriculum()"><a href="#" >New Curriculum</a></li>
15 15 <li ng-class="openCurriculum" ng-click="OpenExistingCurriculum($event)"><a href="#">Open Existing Curriculum</a></li>
16 16 <li ng-class="saveCurriculam" ng-click="saveCurricullam($event)"><a href="curriculum-builder-detail">Save Curriculum As</a></li>
17 17 <li role="separator" class="divider"></li>
... ...