Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r6af90c8a49a8d9f8ba84c6219e0c3c7c092889b5 -r65f6cda04f38eb60e5346f1601ebac80af95557b --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6af90c8a49a8d9f8ba84c6219e0c3c7c092889b5) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 65f6cda04f38eb60e5346f1601ebac80af95557b) @@ -570,7 +570,6 @@ authoring.fla.range.condition.add.start.error =The start value can not be within the range of an existing condition authoring.fla.range.condition.add.end.error =The end value can not be within the range of an existing condition authoring.fla.group.title.validation.erorr =Group name must not be blank and must not contain any of these characters < > ^ * @ % $ -authoring.fla.info.dialog.title =Click to dismiss authoring.fla.page.title =Authoring authoring.fla.page.menu.new =New authoring.fla.page.menu.open =Open Index: lams_central/web/authoring/authoring.jsp =================================================================== diff -u -r6af90c8a49a8d9f8ba84c6219e0c3c7c092889b5 -r65f6cda04f38eb60e5346f1601ebac80af95557b --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 6af90c8a49a8d9f8ba84c6219e0c3c7c092889b5) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 65f6cda04f38eb60e5346f1601ebac80af95557b) @@ -88,8 +88,6 @@ SEQUENCE : '', WEIGHTS_TITLE : '', - - INFO_DIALOG_TITLE : '', SEQUENCE_NOT_VALID : decoderDiv.html('').text(), @@ -1119,5 +1117,15 @@ + + +
+
+
+ +
+
\ No newline at end of file Index: lams_central/web/css/_authoring_base.scss =================================================================== diff -u -rc4022c1389b21b06cc36d609a91021b94ea1cb2d -r65f6cda04f38eb60e5346f1601ebac80af95557b --- lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision c4022c1389b21b06cc36d609a91021b94ea1cb2d) +++ lams_central/web/css/_authoring_base.scss (.../_authoring_base.scss) (revision 65f6cda04f38eb60e5346f1601ebac80af95557b) @@ -152,29 +152,35 @@ width: 95%; } -div#infoDialog { - cursor: pointer; -} - div#infoDialog .modal-content { - border-color: $brand-primary-darker; } -div#infoDialog .close { - display : none; +div#infoDialog .modal-header { + padding-top: 5px; + padding-bottom: 5px; } -div#infoDialog .modal-header { - text-align: center; - color: $brand-primary-darker; +div#infoDialog .modal-header .close { + opacity: 1; } div#infoDialog .modal-body { font-weight: bold; padding: 5px; } +div#infoDialog .infoDialogBody.fade { + cursor: pointer; +} +div#infoDialog #infoDialogButtons { + height: 35px; +} + +div#infoDialog #infoDialogOKButton { + width: 40%; +} + div.exportDialog { text-align: center; } Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -r6af90c8a49a8d9f8ba84c6219e0c3c7c092889b5 -r65f6cda04f38eb60e5346f1601ebac80af95557b --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 6af90c8a49a8d9f8ba84c6219e0c3c7c092889b5) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 65f6cda04f38eb60e5346f1601ebac80af95557b) @@ -974,7 +974,12 @@ }); GeneralLib.updateAccess(initAccess); - + + var infoDialogContents = $('#infoDialogContents'); + $('#infoDialogOKButton', infoDialogContents).click(function(){ + layout.infoDialog.modal('hide'); + }); + layout.infoDialog = showDialog('infoDialog',{ 'autoOpen' : false, 'modal' : false, @@ -990,7 +995,7 @@ 'of' : '#canvas' }, 'show' : function(html){ - var body = $('.modal-body', layout.infoDialog); + var body = $('#infoDialogBody', layout.infoDialog); if (layout.infoDialog.hasClass('in')) { body.html(body.html() + '

' + html); } else { @@ -999,10 +1004,9 @@ } } } - }).click(function(){ - $(this).modal('hide').find('.modal-body').empty(); }); + $('.modal-body', layout.infoDialog).empty().append(infoDialogContents.show()); layout.dialogs.push(layout.infoDialog);