Skip to content

Restore Noty messages, comment out datepicker javascript (until repla #6

Merged
merged 1 commit into from
Jan 14, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions app/templates/element/javascript.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@
that approach doesn't work well with Material Design Light (MDL). If you do not
do this, the datepicker will float up to the top of the browser window. See
app/View/CoGroupMembers for an example. */ ?>


/* XXX CFM-107 Hide datepickers until replaced with new approach
$(".datepicker-f").datepicker({
changeMonth: true,
changeYear: true,
Expand Down Expand Up @@ -207,22 +208,7 @@
}).bind('click',function () {
$("#ui-datepicker-div").appendTo($(this).closest('.modelbox-data'));
});

// Dialog
// This generic dialog gets modified by the calling function
$("#dialog").dialog({
autoOpen: false,
resizable: false,
modal: true,
buttons: {
'<?php print __d('operation', 'cancel'); ?>': function() {
$(this).dialog('close');
},
'<?php print __d('operation', 'ok'); ?>': function() {
$(this).dialog('close');
}
}
});
*/

// Add loading animation when a form is submitted, when any item with a "spin" class is clicked,
// or on any button or anchor tag lacking the .nospin class.
Expand All @@ -236,13 +222,7 @@
}

});

// Flash Messages
<?php
print $this->Flash->render('error');
print $this->Flash->render('success');
print $this->Flash->render('information');
?>

});

// Define default text for confirm dialog
Expand All @@ -251,3 +231,5 @@
var defaultConfirmTitle = "<?php print __d('operation', 'confirm'); ?>";

</script>

<?= $this->Flash->render() ?>