-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
@@ -492,8 +504,17 @@
<%-- This will be moved to dialog's button pane using JS --%>
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
+
+
+
+
-
+
Index: lams_central/web/css/authoring.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v
diff -u -r1.30.2.8 -r1.30.2.9
--- lams_central/web/css/authoring.css 25 Jul 2016 04:27:27 -0000 1.30.2.8
+++ lams_central/web/css/authoring.css 23 Oct 2016 15:00:29 -0000 1.30.2.9
@@ -12,15 +12,6 @@
/**** Dialog styles ****/
-.ui-dialog {
- font-size: 12px !important;
-}
-
-/* For jQuery Dialogextend */
-.ui-dialog .ui-dialog-titlebar-buttonpane a {
- margin-right: 3px;
-}
-
#loadingOverlay {
width: 99%;
height: 99%;
@@ -34,8 +25,34 @@
margin-top: 35%;
}
-div.dialogContainer, .ldChoiceDependentCanvasElement,
-.dialog-no-title .ui-dialog-titlebar {
+.dialogContainer {
+ -webkit-overflow-scrolling: touch !important;
+}
+
+.dialogContainer .modal-body {
+ height : 100%;
+ max-height: calc(100% - 60px);
+ padding: 0;
+}
+
+.dialogContainer button {
+ cursor: pointer;
+}
+
+.dialogContainer button:focus {
+ outline: none;
+}
+
+.dialogContainer button .fa {
+ font-size: 16px;
+ margin-left: 10px;
+}
+
+.dialogContainer .ui-draggable .modal-header {
+ cursor: move;
+}
+
+div.dialogContainer, .ldChoiceDependentCanvasElement {
display: none;
}
@@ -294,56 +311,23 @@
div#toolbar {
padding: 3px;
- width: 1035px;
- height: 27px;
}
-div#toolbar > div {
- float: left;
- height: 30px;
- margin-right: 10px;
+#cancelLiveEditButton {
+ display: none;
}
-div#toolbar .ui-button, div#toolbar .split-ui-button {
- height: 24px;
- font-size: 11px;
+#groupingButton span {
+ background: url('../images/icons/group.png') no-repeat 3px 3px;
+ padding-left: 25px;
}
-div#toolbar .split-ui-button + ul, div#toolbar .split-ui-button + ul ul {
- font-size: 11px;
- font-weight: bold;
- list-style: none;
- color: #2E6E9E;
- z-index: 1100;
-}
-div#toolbar .split-ui-button + ul li {
- padding: 3px 5px;
- cursor: pointer;
-}
-
-div#toolbar .split-ui-button + ul li:hover {
- background-color: #dfeffc;
-}
-
-div#toolbar .split-ui-button + ul ul {
- white-space: nowrap;
-}
-
table#authoringTable {
table-layout: fixed;
width: 100%;
}
-#groupingButton span {
- background: url('../images/icons/group.png') no-repeat 3px 3px;
- padding-left: 25px;
-}
-
-#cancelLiveEditButton {
- display: none;
-}
-
td#templateContainerCell {
width: 150px;
vertical-align: top;
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringActivity.js,v
diff -u -r1.38.2.25 -r1.38.2.26
--- lams_central/web/includes/javascript/authoring/authoringActivity.js 2 Jun 2016 14:50:41 -0000 1.38.2.25
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js 23 Oct 2016 15:00:29 -0000 1.38.2.26
@@ -1337,19 +1337,18 @@
if (activity.authorURL) {
showDialog("dialogActivity" + activity.toolContentID, {
- 'height' : 800,
+ 'height' : Math.max(200, $(window).height() - 60),
'width' : 1024,
+ 'draggable' : false,
'title' : activity.title + ' ' + LABELS.ACTIVITY_DIALOG_TITLE_SUFFIX,
'beforeClose' : function(event){
// ask the user if he really wants to exit before saving his work
var iframe = $('iframe', this);
// if X button was clicked, currentTarget is set
// if it is not the last Re-Edit/Close page, doCancel() exists
- if (event.currentTarget && iframe[0].contentWindow.doCancel) {
+ if (iframe[0].contentWindow.doCancel) {
iframe[0].contentWindow.doCancel();
return false;
- } else {
- iframe.attr('src', null);
}
},
'open' : function() {
@@ -1358,11 +1357,14 @@
$('iframe', dialog).attr('src', activity.authorURL).load(function(){
// override the close function so it works with the dialog, not window
this.contentWindow.closeWindow = function(){
- dialog.dialog('close');
+ // detach the 'beforeClose' handler above, attach the standard one and close the dialog
+ dialog.off('hide.bs.modal').on('hide.bs.modal', function(){
+ $('iframe', this).attr('src', null);
+ }).modal('hide');
}
});
}
- }, true);
+ }, false);
GeneralLib.setModified(true);
}
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v
diff -u -r1.51.2.40 -r1.51.2.41
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js 25 Jul 2016 09:41:58 -0000 1.51.2.40
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js 23 Oct 2016 15:00:29 -0000 1.51.2.41
@@ -177,7 +177,7 @@
// make some adjustments to layout
var toolName = $('div', this);
if (toolName.text().length > 12){
- toolName.css('padding-top', '8px');
+ toolName.css('padding-top', '5px');
}
}
});
+
+
+
+
+
+