Commit 43959480a9eb0ea78604317e8c0053d4ca53090f
1 parent
60984076
Open resource partially committed
Showing
4 changed files
with
35 additions
and
13 deletions
400-SOURCECODE/AIAHTML5.Web/Web.config
... | ... | @@ -39,7 +39,9 @@ |
39 | 39 | <remove fileExtension=".mp3" /> |
40 | 40 | <!--<clientCache cacheControlMode="DisableCache" />--> |
41 | 41 | <remove fileExtension=".woff" /> |
42 | + <remove fileExtension=".woff2" /> | |
42 | 43 | <mimeMap fileExtension=".woff" mimeType="application/font-woff" /> |
44 | + <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" /> | |
43 | 45 | <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" /> |
44 | 46 | <mimeMap fileExtension=".vtt" mimeType="text/vtt" /> |
45 | 47 | <mimeMap fileExtension=".json" mimeType="application/json" /> | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -119,32 +119,41 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
119 | 119 | $rootScope.isOpenResourceBtnClicked = false; |
120 | 120 | $rootScope.multiViewInfo = []; |
121 | 121 | $rootScope.openResource = function () { |
122 | - $rootScope.isOpenResourceBtnClicked = true; | |
123 | - $rootScope.isTermClicked = false; | |
122 | + // $rootScope.isOpenResourceBtnClicked = true; | |
123 | + // $rootScope.isTermClicked = false; | |
124 | 124 | //switch ($location.url()) { |
125 | 125 | // case '/curriculum-builder-detail': |
126 | 126 | // $location.url('/curriculum-builder'); |
127 | 127 | // break; |
128 | 128 | //} |
129 | 129 | |
130 | - $('#dvPrintPreview').css('display', 'block'); | |
130 | + $('#dvOpenResoucePanel').css('display', 'block'); | |
131 | + | |
132 | + // var homepath = $location.protocol() + "//" + $location.host() + ":" + $location.port() + "/"; | |
133 | + var homepath = $rootScope.homeURL; | |
134 | + $("#CBDetailPageDiv").css({ "display": "none", "pointer-events": "none", "opacity": ".5" }); | |
135 | + $(".navbar-fixed-top").css({"display": "none", "pointer-events": "none", "opacity": ".5" }); | |
136 | + $("#topMenuBar").css({ "display": "none", "pointer-events": "none", "opacity": ".5" }); | |
137 | + | |
131 | 138 | |
132 | 139 | $.jsPanel({ |
133 | 140 | id: 'OpenResourcePanel', |
134 | - selector: '#dvPrintPreview', | |
141 | + selector: '#dvOpenResoucePanel', | |
135 | 142 | theme: 'success', |
136 | 143 | currentController: 'HomeController', |
137 | 144 | parentSlug: 'curriculum-builder-detail', |
138 | 145 | content: '<div class="col-sm-12" >' + |
139 | - '<object data="' + $location + '" width="100%" height="800px" type="text/html" id="threedImage"></object>', | |
140 | - title: tittle, | |
146 | + '<object data="' + homepath + '" width="100%" height="600px" type="text/html" id="openmodulecb"></object>', | |
147 | + title: "Open Module in Curriculum Builder", | |
141 | 148 | position: { |
142 | - top: 70, | |
149 | + top: 1, | |
143 | 150 | left: 1 |
144 | 151 | }, |
152 | + controls: { buttons: 'closeonly' }, | |
153 | + draggable: "disabled", | |
145 | 154 | |
146 | 155 | size: { |
147 | - width: 900, | |
156 | + width: screen.width-10, | |
148 | 157 | height: 600 |
149 | 158 | }, |
150 | 159 | |
... | ... | @@ -173,9 +182,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
173 | 182 | } |
174 | 183 | |
175 | 184 | $scope.helpTopicLink = function () { |
176 | - var absurl = $location.absUrl(); | |
177 | - var hTopicUrl = absurl + "content/help/index.html"; | |
178 | - var aboutADAM = absurl + "content/help/about/Adam_Credits_AIA5.html"; | |
185 | + $rootScope.homeURL = $location.absUrl(); | |
186 | + var hTopicUrl = $rootScope.homeURL + "content/help/index.html"; | |
187 | + var aboutADAM = $rootScope.homeURL + "content/help/about/Adam_Credits_AIA5.html"; | |
179 | 188 | |
180 | 189 | $("#helplinkId").append("<li><a target='_blank' href='" + hTopicUrl + "'> Help Topics </li>"); |
181 | 190 | $("#helplinkId").append("<li><a target='_blank' href='http://adameducation.com/Contact'> Customer Support </li>"); |
... | ... | @@ -6520,6 +6529,14 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
6520 | 6529 | |
6521 | 6530 | }); |
6522 | 6531 | |
6532 | + $(document).on('click', '#OpenResourcePanel .jsglyph-remove', function () { | |
6533 | + | |
6534 | + $("#CBDetailPageDiv").css({ "display": "block", "pointer-events": "auto", "opacity": "1" }); | |
6535 | + $(".navbar-fixed-top").css({ "display": "block", "pointer-events": "auto", "opacity": "1" }); | |
6536 | + $("#topMenuBar").css({ "display": "block", "pointer-events": "auto", "opacity": "1" }); | |
6537 | + | |
6538 | + }); | |
6539 | + | |
6523 | 6540 | $rootScope.restrictBodySystemList = function () { |
6524 | 6541 | var RestrictListDiv = document.getElementById("restrictListDiv"); |
6525 | 6542 | if (RestrictListDiv.style.display == 'block') { | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
1 | -<div class="collapse navbar-collapse" id="topFixedNavbar1"> | |
1 | +<div class="collapse navbar-collapse" id="topMenuBar"> | |
2 | 2 | <ul class="nav navbar-nav toperMenu-spaceleft"> |
3 | 3 | <li class="dropdown navbarDropdownItem" ng-class="disableFileMenu"> |
4 | 4 | <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a> | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.aspx
... | ... | @@ -1204,7 +1204,10 @@ |
1204 | 1204 | </div> |
1205 | 1205 | </div> |
1206 | 1206 | <!--Print Preview Modal--> |
1207 | - <div id="dvPrintPreview" style="display: none;"></div> | |
1207 | + <div id="dvPrintPreview" style="display: none;"></div> | |
1208 | + | |
1209 | + <!--Open Resouce --> | |
1210 | + <div id="dvOpenResoucePanel" style="display: none;"></div> | |
1208 | 1211 | |
1209 | 1212 | </div> |
1210 | 1213 | </div> | ... | ... |