Skip to content

Commit

Permalink
fixed size of the appt edit/add popup (#313)
Browse files Browse the repository at this point in the history
* fixed size of the appt edit/add popup

* decreased default tab layout popup padding
  • Loading branch information
bradymiller committed Oct 14, 2016
1 parent 899fb90 commit 5908073
Show file tree
Hide file tree
Showing 15 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion contrib/forms/scanned_notes/new.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@

function newEvt() {
dlgopen('../../main/calendar/add_edit_event.php?patientid=<?php echo $pid ?>',
'_blank', 775, 375);
'_blank', 775, 500);
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion contrib/forms/specialist_notes/new.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function cbcell($name, $desc, $colname) {
<script language='JavaScript'>
function newEvt() {
dlgopen('../../main/calendar/add_edit_event.php?patientid=<?php echo $pid ?>',
'_blank', 775, 375);
'_blank', 775, 500);
return false;
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion contrib/forms/specialist_notes/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function cbcell($name, $desc, $colname) {
<script language='JavaScript'>
function newEvt() {
dlgopen('../../main/calendar/add_edit_event.php?patientid=<?php echo $pid ?>',
'_blank', 775, 375);
'_blank', 775, 500);
return false;
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion interface/main/calendar/find_patient.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function newEvt(startampm, starttimeh, starttimem, eventdate, providerid, patien
//'&date=' + eventdate + '&userid=' + providerid +
'&date=' + eventdate +
'&patientid=' + patientid,
'_blank', 550, 310);
'_blank', 775, 500);
}

</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ <h2>[-php-] xl('Searching for appointments','e'); [-/php-]</h2>
var EditEvent = function (eObj) {
objID = eObj.id;
var parts = objID.split("~");
dlgopen('add_edit_event.php?date='+ parts[1] +'&eid=' + parts[0], '_blank', 775, 375);
dlgopen('add_edit_event.php?date='+ parts[1] +'&eid=' + parts[0], '_blank', 775, 500);
}

// show the 'searching...' status and submit the form
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
}
}
[-/php-]
,'_blank', 775, 375);
,'_blank', 775, 500);
}

function oldEvt(eventdate, eventid, pccattype) {
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid+'&prov=' + pccattype, '_blank', 775, 375);
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid+'&prov=' + pccattype, '_blank', 775, 500);
}

function goPid(pid) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@
dlgopen('add_edit_event.php?startampm=' + startampm +
'&starttimeh=' + starttimeh + '&starttimem=' + starttimem +
'&date=' + eventdate + '&userid=' + providerid + '&catid=' + catid,
'_blank', 775, 375);
'_blank', 775, 500);
}

function oldEvt(eventdate, eventid) {
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid, '_blank', 775, 375);
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid, '_blank', 775, 500);
}

function goPid(pid) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@
dlgopen('add_edit_event.php?startampm=' + startampm +
'&starttimeh=' + starttimeh + '&starttimem=' + starttimem +
'&date=' + eventdate + '&userid=' + providerid + '&catid=' + catid,
'_blank', 775, 375);
'_blank', 775, 500);
}

function oldEvt(eventdate, eventid) {
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid, '_blank', 775, 375);
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid, '_blank', 775, 500);
}

function goPid(pid) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
}
}
[-/php-]
,'_blank', 775, 375);
,'_blank', 775, 500);
}

function oldEvt(eventdate, eventid, pccattype) {
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid+'&prov=' + pccattype, '_blank', 775, 375);
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid+'&prov=' + pccattype, '_blank', 775, 500);
}

function goPid(pid) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
}
}
[-/php-]
,'_blank', 775, 375);
,'_blank', 775, 500);
}

function oldEvt(eventdate, eventid, pccattype) {
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid+'&prov=' + pccattype, '_blank', 775, 375);
dlgopen('add_edit_event.php?date='+eventdate+'&eid=' + eventid+'&prov=' + pccattype, '_blank', 775, 500);
}

function goPid(pid) {
Expand Down
4 changes: 2 additions & 2 deletions interface/patient_file/summary/demographics.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ function image_widget($doc_id,$doc_catg)
var mypcc = '<?php echo htmlspecialchars($GLOBALS['phone_country_code'],ENT_QUOTES); ?>';
//////////
function oldEvt(apptdate, eventid) {
dlgopen('../../main/calendar/add_edit_event.php?date=' + apptdate + '&eid=' + eventid, '_blank', 775, 375);
dlgopen('../../main/calendar/add_edit_event.php?date=' + apptdate + '&eid=' + eventid, '_blank', 775, 500);
}

function advdirconfigure() {
Expand All @@ -212,7 +212,7 @@ function imdeleted() {
}

function newEvt() {
dlgopen('../../main/calendar/add_edit_event.php?patientid=<?php echo htmlspecialchars($pid,ENT_QUOTES); ?>', '_blank', 775, 375);
dlgopen('../../main/calendar/add_edit_event.php?patientid=<?php echo htmlspecialchars($pid,ENT_QUOTES); ?>', '_blank', 775, 500);
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion interface/patient_file/summary/summary_title.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

function newEvt() {
dlgopen('../../main/calendar/add_edit_event.php?patientid=<?php echo $pid ?>',
'_blank', 550, 270);
'_blank', 775, 500);
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion interface/reports/appointments_report.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function dosort(orderby) {
}

function oldEvt(eventid) {
dlgopen('../main/calendar/add_edit_event.php?eid=' + eventid, 'blank', 775, 375);
dlgopen('../main/calendar/add_edit_event.php?eid=' + eventid, 'blank', 775, 500);
}

function refreshme() {
Expand Down
16 changes: 8 additions & 8 deletions library/dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ retval=window.open(url, winname, options +
",width=" + width + ",height=" + height +
",left=" + newx + ",top=" + newy +
",screenX=" + newx + ",screenY=" + newy);

return retval;
}
// recursive window focus-event grabber
Expand All @@ -59,7 +59,7 @@ function grabfocus(w) {

// call this when a "modal" dialog is desired


function dlgopen(url, winname, width, height) {
if (top.modaldialog && ! top.modaldialog.closed) {
if (window.focus) top.modaldialog.focus();
Expand Down Expand Up @@ -96,8 +96,8 @@ if(top.tab_mode)
{
return dlgOpenWindow(url,winname,width,height);
}
width=width+80;
height=height+80;
width=width+20;
height=height+20;
var fullURL;
if(url[0]==="/")
{
Expand All @@ -121,7 +121,7 @@ if(top.tab_mode)

dlgIframe=top.$("<iframe></iframe>");
dlgIframe.attr("name",winname);

var dlgDivContainer=top.$("<div class='dialogIframe'></div>");
var closeDlg=top.$("<div class='closeDlgIframe'></div>");
dlgDivContainer.append(closeDlg);
Expand All @@ -131,17 +131,17 @@ if(top.tab_mode)
var closeItems=body.find("[name='"+winname+"']");
closeItems.remove();
if(body.children("div.dialogIframe").length===0)
{
{
dialogDiv.hide();
};
};
})
dlgDivContainer.attr("name",winname);
dlgDivContainer.append(dlgIframe);
dlgDivContainer.css({"left":(top.$("body").width()-width)/2
,"top": "5em"
,"height":height
,"width":width});

top.$("body").append(dlgDivContainer);
top.set_opener(winname,window);
dlgIframe.get(0).src=fullURL;
Expand Down
2 changes: 1 addition & 1 deletion version.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
// Also whenever you change a .js file, make sure that all URLs referencing it
// end with "?v=$v_js_includes". Search the code for examples of doing this.
// All this is to keep browsers from using an older cached version.
$v_js_includes = 11;
$v_js_includes = 12;
?>

0 comments on commit 5908073

Please sign in to comment.