Commit 0e5d209124315ea62aac61963b84306aebb09d42
Merge branch 'messageModalIntergartion' into Develop
Showing
9 changed files
with
191 additions
and
150 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
... | ... | @@ -31,17 +31,26 @@ namespace AIAHTML5.API.Controllers |
31 | 31 | { |
32 | 32 | ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType)); |
33 | 33 | logger.Debug("inside POST"); |
34 | - | |
35 | - dynamic authenticationRepsonse = AIAHTML5.API.Models.Users.AuthenticateUser(credentials); | |
36 | - if (Convert.ToString(authenticationRepsonse) != AIAConstants.USER_NOT_FOUND && Convert.ToString(authenticationRepsonse) != AIAConstants.ERROR_IN_FECTHING_DETAILS) | |
37 | - { | |
38 | - string userDetails = Newtonsoft.Json.JsonConvert.SerializeObject(authenticationRepsonse); | |
39 | - return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(userDetails) }; | |
34 | + | |
35 | + bool isUserAuthenticatedByDefault = Convert.ToBoolean(System.Configuration.ConfigurationManager.AppSettings["isUserAuthenticated"]); | |
36 | + if (isUserAuthenticatedByDefault) { | |
37 | + return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent("true") }; | |
38 | + | |
40 | 39 | } |
41 | 40 | else |
42 | 41 | { |
43 | - return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(authenticationRepsonse) }; | |
44 | 42 | |
43 | + dynamic authenticationRepsonse = AIAHTML5.API.Models.Users.AuthenticateUser(credentials); | |
44 | + if (Convert.ToString(authenticationRepsonse) != AIAConstants.USER_NOT_FOUND && Convert.ToString(authenticationRepsonse) != AIAConstants.ERROR_IN_FECTHING_DETAILS) | |
45 | + { | |
46 | + string userDetails = Newtonsoft.Json.JsonConvert.SerializeObject(authenticationRepsonse); | |
47 | + return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(userDetails) }; | |
48 | + } | |
49 | + else | |
50 | + { | |
51 | + return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(authenticationRepsonse) }; | |
52 | + | |
53 | + } | |
45 | 54 | } |
46 | 55 | } |
47 | 56 | ... | ... |
400-SOURCECODE/AIAHTML5.API/Web.config
... | ... | @@ -39,6 +39,7 @@ |
39 | 39 | <add key="EnableSSL" value="false" /> |
40 | 40 | <add key="Site_Url" value ="//52.2.38.120"/> |
41 | 41 | <add key ="HostAddress" value="10.100.12.13" /> |
42 | + <add key="isUserAuthenticated" value="false"/> | |
42 | 43 | </appSettings> |
43 | 44 | <system.web> |
44 | 45 | <compilation debug="true" targetFramework="4.5" /> | ... | ... |
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
... | ... | @@ -39,6 +39,7 @@ |
39 | 39 | <add key="EnableSSL" value="false" /> |
40 | 40 | <add key="Site_Url" value ="//52.2.38.120"/> |
41 | 41 | <add key ="HostAddress" value="10.100.12.13" /> |
42 | + <add key="isUserAuthenticated" value="true"/> | |
42 | 43 | </appSettings> |
43 | 44 | <system.web> |
44 | 45 | <compilation debug="true" targetFramework="4.5" /> | ... | ... |
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
1 | 1 | 'use strict'; |
2 | 2 | |
3 | -AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants","LoginMessageConstants", | |
4 | -function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, LoginMessageConstants) { | |
3 | +AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants","UserModules","LoginMessageConstants", | |
4 | +function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants) { | |
5 | 5 | |
6 | 6 | //$scope.pageToOpen = { |
7 | 7 | // name: 'MainMenu' |
... | ... | @@ -70,7 +70,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
70 | 70 | $rootScope.shapestyleFillBorderColor = "black"; |
71 | 71 | $rootScope.shapestyleborderWidth = 2; |
72 | 72 | $rootScope.shapestyleborderStyles = "solid"; |
73 | - | |
73 | + $rootScope.errorMassage = ''; | |
74 | 74 | |
75 | 75 | $rootScope.userInfo = { |
76 | 76 | username: null, |
... | ... | @@ -98,8 +98,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
98 | 98 | $rootScope.AuthenticateUser = function (userInfo) { |
99 | 99 | if (userInfo.username == "" || userInfo.username == null || userInfo.password == "" || userInfo.password == null) { |
100 | 100 | |
101 | - alert(LoginMessageConstants.USER_CREDENTIALS_MISSING); | |
102 | - $rootScope.isVisibleLogin = true; | |
101 | + // alert(LoginMessageConstants.USER_CREDENTIALS_MISSING); | |
102 | + $rootScope.errorMassage = LoginMessageConstants.USER_CREDENTIALS_MISSING; | |
103 | + $("#messageModal").modal('show'); | |
103 | 104 | } |
104 | 105 | else { |
105 | 106 | |
... | ... | @@ -107,14 +108,24 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
107 | 108 | .then( |
108 | 109 | |
109 | 110 | function (result) { |
111 | + if (result == 'true') { | |
112 | + $rootScope.userModules = UserModules; | |
113 | + $rootScope.isVisibleLogin = false; | |
114 | + } | |
115 | + else | |
116 | + { | |
110 | 117 | if (result == LoginConstants.USER_NOT_FOUND) { |
111 | 118 | $rootScope.isVisibleLogin = true; |
112 | - alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT); | |
119 | + // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT); | |
120 | + $rootScope.errorMassage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT; | |
121 | + $("#messageModal").modal('show'); | |
113 | 122 | |
114 | 123 | } |
115 | 124 | else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) { |
116 | - alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
125 | + //alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
117 | 126 | $rootScope.isVisibleLogin = true; |
127 | + $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS; | |
128 | + $("#messageModal").modal('show'); | |
118 | 129 | } |
119 | 130 | else { |
120 | 131 | if (result.loginId != undefined || result.loginId != "" || result.loginId != null) { |
... | ... | @@ -126,11 +137,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
126 | 137 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); |
127 | 138 | } |
128 | 139 | } |
140 | + } | |
129 | 141 | }, |
130 | 142 | function (error) { |
131 | 143 | console.log(' Error in authentication = ' + error.statusText); |
132 | - alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
144 | + // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
133 | 145 | $rootScope.isVisibleLogin = true; |
146 | + $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS; | |
147 | + $("#messageModal").modal('show'); | |
134 | 148 | }); |
135 | 149 | } |
136 | 150 | |
... | ... | @@ -187,13 +201,19 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
187 | 201 | AuthenticationService.SendMailToUser(userInfo) |
188 | 202 | .then(function (result) { |
189 | 203 | if (result == LoginConstants.USER_NOT_FOUND) { |
190 | - alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT); | |
204 | + // alert(LoginMessageConstants.INCORRECT_EMAIL_ID); | |
205 | + $rootScope.errorMassage = LoginMessageConstants.INCORRECT_EMAIL_ID; | |
206 | + $("#messageModal").modal('show'); | |
191 | 207 | } |
192 | 208 | else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) { |
193 | - alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
209 | + // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
210 | + $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS; | |
211 | + $("#messageModal").modal('show'); | |
194 | 212 | } |
195 | 213 | else if (result == LoginConstants.MAIL_NOT_SENT) { |
196 | - alert(LoginMessageConstants.MAIL_NOT_SENT); | |
214 | + // alert(LoginMessageConstants.MAIL_NOT_SENT); | |
215 | + $rootScope.errorMassage = LoginMessageConstants.MAIL_NOT_SENT; | |
216 | + $("#messageModal").modal('show'); | |
197 | 217 | } |
198 | 218 | else { |
199 | 219 | if (result.loginId != undefined || result.loginId != "" || result.loginId != null) { |
... | ... | @@ -210,8 +230,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
210 | 230 | message = LoginMessageConstants.RESET_PASSWORD; |
211 | 231 | else |
212 | 232 | message = LoginMessageConstants.USERID_SENT_IN_EMAIL |
213 | - alert(message); | |
214 | - | |
233 | + //alert(message); | |
234 | + $rootScope.errorMassage = message; | |
235 | + $("#messageModal").modal('show'); | |
236 | + | |
215 | 237 | |
216 | 238 | } |
217 | 239 | } |
... | ... | @@ -219,15 +241,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
219 | 241 | }, |
220 | 242 | function (error) { |
221 | 243 | console.log(' Error in authentication = ' + error.statusText); |
222 | - alert(LoginConstants.ERROR_IN_FECTHING_DETAILS); | |
244 | + // alert(LoginConstants.ERROR_IN_FECTHING_DETAILS); | |
245 | + $rootScope.errorMassage = LoginConstants.ERROR_IN_FECTHING_DETAILS; | |
246 | + $("#messageModal").modal('show'); | |
223 | 247 | }); |
224 | 248 | } |
225 | 249 | else { |
226 | - alert(LoginMessageConstants.INCORRECT_EMAIL_ID); | |
250 | + // alert(LoginMessageConstants.INCORRECT_EMAIL_ID); | |
251 | + $rootScope.errorMassage = LoginMessageConstants.INCORRECT_EMAIL_ID; | |
252 | + $("#messageModal").modal('show'); | |
227 | 253 | } |
228 | 254 | } |
229 | 255 | else { |
230 | - alert(LoginMessageConstants.BLANK_EMAIL_ID); | |
256 | + //alert(LoginMessageConstants.BLANK_EMAIL_ID); | |
257 | + $rootScope.errorMassage = LoginMessageConstants.BLANK_EMAIL_ID; | |
258 | + $("#messageModal").modal('show'); | |
259 | + | |
231 | 260 | } |
232 | 261 | }; |
233 | 262 | |
... | ... | @@ -259,14 +288,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
259 | 288 | .then( |
260 | 289 | function (result) { |
261 | 290 | if (result == LoginConstants.USER_NOT_FOUND) { |
262 | - alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT); | |
291 | + // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT); | |
292 | + $rootScope.errorMassage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT; | |
293 | + $("#messageModal").modal('show'); | |
294 | + | |
263 | 295 | } |
264 | 296 | else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) { |
265 | - alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
297 | + // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
298 | + $rootScope.errorMassage = LoginConstants.ERROR_IN_FECTHING_DETAILS; | |
299 | + $("#messageModal").modal('show'); | |
300 | + | |
266 | 301 | } |
267 | 302 | else { |
268 | 303 | if ((result.IsAcknowledged == true) && (result.IsModifiedCountAvailable == true)) { |
269 | - alert(LoginMessageConstants.PASSWORD_RESET_MESSAGE); | |
304 | + // alert(LoginMessageConstants.PASSWORD_RESET_MESSAGE); | |
305 | + $rootScope.errorMassage = LoginMessageConstants.PASSWORD_RESET_MESSAGE; | |
306 | + $("#messageModal").modal('show'); | |
270 | 307 | $rootScope.isVisibleLogin = true; |
271 | 308 | $rootScope.isVisibleResetPass = false; |
272 | 309 | $location.url("/") ; |
... | ... | @@ -275,11 +312,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
275 | 312 | }, |
276 | 313 | function (error) { |
277 | 314 | console.log(' Error in authentication = ' + error.statusText); |
278 | - alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
315 | + // alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | |
316 | + $rootScope.errorMassage = LoginMessageConstants.ERROR_IN_FECTHING_DETAILS; | |
317 | + $("#messageModal").modal('show'); | |
318 | + | |
279 | 319 | }); |
280 | 320 | } |
281 | 321 | else { |
282 | 322 | $rootScope.errorMesaage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH; |
323 | + $("#messageModal").modal('show'); | |
283 | 324 | } |
284 | 325 | } |
285 | 326 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
... | ... | @@ -293,13 +293,86 @@ AIA.constant("LoginMessageConstants", { |
293 | 293 | "USERID_SENT_IN_EMAIL": "Please check you email, sent UserId in your email.", |
294 | 294 | "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.", |
295 | 295 | "MAIL_NOT_SENT": "We are facing some issue in sending email. Please try after sometime.", |
296 | - "INCORRECT_EMAIL_ID": "Please enter correct email id", | |
297 | - "BLANK_EMAIL_ID": "Please enter your email id", | |
296 | + "INCORRECT_EMAIL_ID": "Please enter correct email id.", | |
297 | + "BLANK_EMAIL_ID": "Please enter your email id.", | |
298 | 298 | "PASSWORD_RESET_MESSAGE": "Your password has been reset.", |
299 | 299 | "NEW_AND_OLD_PASSWORD_DONOT_MATCH": "Your new password and confirm password not matched!", |
300 | - "USER_CREDENTIALS_MISSING":"Please Enter your credentials" | |
300 | + "USER_CREDENTIALS_MISSING": "Please Enter your credentials.", | |
301 | + "USER_NOT_FOUND": "User not found.", | |
302 | + //"ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.", | |
303 | + //"MAIL_NOT_SENT": "Mail not sent." | |
301 | 304 | |
302 | 305 | }) |
306 | +AIA.constant("UserModules", [ | |
307 | + { | |
308 | + "name": "Dissectible Anatomy", | |
309 | + "slug": "da-view-list" | |
310 | + }, | |
311 | + { | |
312 | + "name": "Atlas Anatomy", | |
313 | + "slug": "aa-view-list" | |
314 | + }, | |
315 | + { | |
316 | + "name": "3D Anatomy", | |
317 | + "slug": "3d-anatomy-list" | |
318 | + }, | |
319 | + { | |
320 | + "name": "Clinical Illustrations", | |
321 | + "slug": "clinical-illustrations" | |
322 | + }, | |
323 | + { | |
324 | + "name": "Clinical Animations", | |
325 | + "slug": "clinical-animations" | |
326 | + }, | |
327 | + { | |
328 | + "name": "Encyclopedia", | |
329 | + "slug": "Link/encyclopedia" | |
330 | + }, | |
331 | + { | |
332 | + "name": "Curriculum Builder", | |
333 | + "slug": "curriculum-builder" | |
334 | + }, | |
335 | + { | |
336 | + "name": "Anatomy Tests", | |
337 | + "slug": "anatomy-test" | |
338 | + }, | |
339 | + { | |
340 | + "name": "IP 10", | |
341 | + "slug": "Link/IP-10" | |
342 | + }, | |
343 | + { | |
344 | + "name": "Lab Exercises", | |
345 | + "slug": "lab-exercises" | |
346 | + }, | |
347 | + { | |
348 | + "name": "In-Depth Reports", | |
349 | + "slug": "Link/indepth-reports" | |
350 | + }, | |
351 | + { | |
352 | + "name": "Complementary and Alternative Medicine", | |
353 | + "slug": "Link/complementary-and-alternate-medicine" | |
354 | + }, | |
355 | + { | |
356 | + "name": "A.D.A.M Images", | |
357 | + "slug": "ADAM-images" | |
358 | + }, | |
359 | + { | |
360 | + "name": "Body Guide", | |
361 | + "slug": "Link/bodyguide" | |
362 | + }, | |
363 | + { | |
364 | + "name": "Symptom Navigator", | |
365 | + "slug": "Link/symptom-navigator" | |
366 | + }, | |
367 | + { | |
368 | + "name": "The Wellness Tools", | |
369 | + "slug": "Link/wellness-tools" | |
370 | + }, | |
371 | + { | |
372 | + "name": "A.D.A.M OnDemand", | |
373 | + "slug": "ADAM-on-demand" | |
374 | + } | |
375 | +]); | |
303 | 376 | |
304 | 377 | AIA.config(function ($routeProvider, pages, $locationProvider) { |
305 | 378 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.html
... | ... | @@ -1144,129 +1144,20 @@ |
1144 | 1144 | </tbody> |
1145 | 1145 | </table> |
1146 | 1146 | </div> |
1147 | - <!--<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;"> | |
1148 | - <div class="modal-dialog modal-sm" role="document"> | |
1149 | - <div class="modal-content"> | |
1150 | - <div class="modal-header annotation-modal-header"> | |
1151 | - <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4> | |
1152 | - </div> | |
1153 | - <div class="modal-body"> | |
1154 | - <div class="marginTopBtm10"> | |
1155 | - <div class="well well-sm no-margin-btm"> | |
1156 | - <div class="row"> | |
1157 | - <div class="col-sm-12"> | |
1158 | - <div class="checkbox no-margin"> | |
1159 | - <label> | |
1160 | - <input id="fill-option" type="checkbox" checked onclick="enableDisableFillOption()"> Fill Option | |
1161 | - </label> | |
1162 | - </div> | |
1163 | - </div> | |
1164 | - <div class="col-sm-6 enableDisableOpacity"> | |
1165 | - <div class="radio"> | |
1166 | - <label> | |
1167 | - <input type="radio" name="filloption" id="filloption1" value="filloption1"> | |
1168 | - <span class="">Texture</span> | |
1169 | - <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern"> | |
1170 | - </label> | |
1171 | - </div> | |
1172 | - <div class="radio"> | |
1173 | - <label> | |
1174 | - <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;"> | |
1175 | - | |
1176 | - | |
1177 | - <div id="editstylebackgroundcolor" class="form-group" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;"> | |
1178 | - <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span> | |
1179 | - <input type="text" class="form-control outerBackgroundColor" data-control="saturation" style="display:none;" value="#0088cc"> | |
1180 | - </div> | |
1181 | - | |
1182 | - | |
1183 | - | |
1184 | - </label> | |
1185 | - </div> | |
1186 | - </div> | |
1187 | - <div class="col-sm-6 no-padding marginTop10 enableDisableOpacity"> | |
1188 | - <div class="row"> | |
1189 | - <label class="pull-left" style="font-weight:normal;">Scale</label> | |
1190 | - <div id="edit-slider-3" class="pull-left" style="width:62%; margin-left:3%; margin-top:2%;"> | |
1191 | - <div id="slider-range-min-3"></div> | |
1192 | - | |
1193 | - </div> | |
1194 | - </div> | |
1195 | - | |
1196 | - <div class="row"> | |
1197 | - <label class="pull-left" style="font-weight:normal;">Opacity</label> | |
1198 | - <div id="edit-slider-4" class="pull-left" style="width:53%; margin-left:3%; margin-top:2%;"> | |
1199 | - <div id="slider-range-min-4"></div> | |
1200 | - </div> | |
1201 | - </div> | |
1202 | - | |
1203 | - <div class="clearfix"></div> | |
1204 | - | |
1205 | - | |
1206 | - </div> | |
1207 | - </div> | |
1208 | - | |
1209 | - </div> | |
1210 | - </div> | |
1211 | - <div class="marginTopBtm10"> | |
1212 | - <div class="well well-sm no-margin-btm"> | |
1213 | - <div class="row"> | |
1214 | - <div class="col-sm-12"> | |
1215 | - <div class="checkbox no-margin"> | |
1216 | - <label> | |
1217 | - <input id="Outline-Option" onclick="enableDisableOutline()" type="checkbox" checked> Outline Option | |
1218 | - </label> | |
1219 | - </div> | |
1220 | - </div> | |
1221 | - <div class="col-sm-6 setEnableDisableForEditShapeStyle"> | |
1222 | - <label class="marginTop5"> | |
1223 | - <span style="font-weight: normal; float: left; padding-top: 5px; padding-right: 5px;">Color</span> | |
1224 | - <div class="form-group" id="outlineColor" style="display:inline-flex;vertical-align:top;cursor:pointer;margin-right:36px;"> | |
1225 | - | |
1226 | - <input type="text" class="form-control borderColorCanvasPreview" data-control="saturation" style="display:none;" value="#0088cc"> | |
1227 | - </div> | |
1147 | + | |
1148 | + <div class="modal fade" id="messageModal" role="dialog"> | |
1149 | + <div class="modal-dialog"> | |
1228 | 1150 | |
1229 | - | |
1230 | - </label> | |
1231 | - </div> | |
1232 | - | |
1233 | - <div class="col-sm-6 setEnableDisableForEditShapeStyle"> | |
1234 | - <div class="form-horizontal"> | |
1235 | - <div class="form-group"> | |
1236 | - <label class="col-sm-3 control-label" style=" font-weight:normal; padding-top:9px;">Size</label> | |
1237 | - <div class="col-sm-9 marginTop5"> | |
1238 | - <select id="borderWidthCanvasElement" class="form-control input-sm"> | |
1239 | - <option value="1">1</option> | |
1240 | - <option value="2">2</option> | |
1241 | - <option value="3">3</option> | |
1242 | - <option value="4">4</option> | |
1243 | - <option value="5">5</option> | |
1244 | - </select> | |
1245 | - </div> | |
1246 | - </div> | |
1247 | - </div> | |
1248 | - </div> | |
1249 | - | |
1250 | - </div> | |
1251 | - </div> | |
1252 | - </div> | |
1253 | - | |
1254 | - <div class="marginTopBtm10"> | |
1255 | - <div class="well well-sm no-margin-btm"> | |
1256 | - <img id="imgOpacity" class="img-rounded img-responsive imgopacity" alt="..." src="content/images/blank-shape.jpg"> | |
1257 | - </div> | |
1258 | - </div> | |
1259 | - </div> | |
1260 | - <div class="modal-footer"> | |
1261 | - <button type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')"> | |
1262 | - | |
1263 | - OK | |
1264 | - </button> | |
1265 | - <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button> | |
1151 | + <div class="modal-content"> | |
1152 | + <div class="modal-header"> | |
1153 | + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> | |
1266 | 1154 | </div> |
1155 | + <div class="modal-title"></div> | |
1156 | + <div class="modal-body">{{errorMassage}}</div> | |
1157 | + <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button></div> | |
1267 | 1158 | </div> |
1268 | 1159 | </div> |
1269 | - </div>--> | |
1160 | + </div> | |
1270 | 1161 | |
1271 | 1162 | <script> |
1272 | 1163 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
... | ... | @@ -957,4 +957,29 @@ background-size:cover; |
957 | 957 | { |
958 | 958 | color: #fff; |
959 | 959 | } |
960 | - | |
961 | 960 | \ No newline at end of file |
961 | + | |
962 | + #messageModal .modal-dialog | |
963 | + { | |
964 | + width:300px | |
965 | + } | |
966 | + #messageModal .modal-content | |
967 | + { | |
968 | + | |
969 | + box-shadow: 0 0 40px rgba(0,0,0,.5); | |
970 | + border: rgba(0,0,0,0); | |
971 | + } | |
972 | + #messageModal .modal-body | |
973 | + { | |
974 | + text-align:center; | |
975 | + } | |
976 | + #messageModal .modal-header | |
977 | + { | |
978 | + padding: 6px; | |
979 | + border-bottom: none; | |
980 | + } | |
981 | + #messageModal .modal-footer | |
982 | + { | |
983 | + border-top: none; | |
984 | + padding: 20px 10px; | |
985 | + text-align:center; | |
986 | + } | |
962 | 987 | \ No newline at end of file | ... | ... |