Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A fix In Message And Reminder Center Button #1614

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion interface/patient_file/summary/demographics.php
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ function setMyPatient() {
$widgetLabel = "amendments";
$widgetButtonLabel = xlt("Edit");
$widgetButtonLink = $GLOBALS['webroot'] . "/interface/patient_file/summary/main_frameset.php?feature=amendment";
$widgetButtonClass = "iframe rx_modal";
$widgetButtonClass = " iframe rx_modal";
ahanipeitra1994 marked this conversation as resolved.
Show resolved Hide resolved
$linkMethod = "html";
$bodyClass = "summary_item small";
$widgetAuth = true;
Expand Down
2 changes: 1 addition & 1 deletion interface/patient_file/summary/stats.php
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ function load_location( location ) {
$widgetTitle = xl('Prescription');
$widgetButtonLabel = xl("Edit");
$widgetButtonLink = $GLOBALS['webroot'] . "/interface/patient_file/summary/rx_frameset.php";
$widgetButtonClass = "iframe rx_modal";
$widgetButtonClass = " iframe rx_modal";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why you added a space here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this is because when this variable was used in a function it coincides with another causing the button to be white.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why you added a space here?

OK testing.

}
$bodyClass = "summary_item small";
$widgetAuth = true;
Expand Down
30 changes: 21 additions & 9 deletions interface/themes/style_purple.css
Original file line number Diff line number Diff line change
Expand Up @@ -617,9 +617,9 @@ font-weight: bold;
* CSS BUTTONS
*/
.css_button_small {
background: transparent url( 'theme_assets/bg_button_a_small.gif' ) no-repeat scroll top right;
color: #444;
display: block;
color: white;
float: left;
font: bold 9px arial, sans-serif;
height: 19px;
Expand All @@ -629,31 +629,33 @@ font-weight: bold;
}

.css_button_small span {
background: transparent url( 'theme_assets/bg_button_span_small.gif' ) no-repeat;
display: block;
line-height: 20px;
padding: 0px 0px 0px 10px;
color: white;
}

.css_button, a[role="button"] {
background: transparent url( 'theme_assets/bg_button_a.gif' ) no-repeat scroll top right;
color: #444;
display: block;
color:white;
display: flex;
align-items: center;
border-radius:7px;
padding-left: 5px;
float: left;
font: bold 10px arial, sans-serif;
font: bold 12px arial, sans-serif;
height: 24px;
margin-right: 3px;
padding-right: 10px; /* sliding doors padding */
text-decoration: none;
text-decoration: none;
}
.css_button[href*="deleter"], input[type="button"][href*="deleter"], button[href*="deleter"], input[type="button"][class="deleter"], button[href*="deleter"], a[class="deleter"] {
background: red !important;
}
.css_button span {
background: transparent url( 'theme_assets/bg_button_span.gif' ) no-repeat;
display: block;
line-height: 14px;
padding: 5px 0 5px 10px;
color:black;
}
.sellistclass {
float:left;
Expand Down Expand Up @@ -757,7 +759,7 @@ div.notab-right {

#report_results table {
border-top: 1px solid black;
border-bottom: 1px solid black;
border-bottom: 1px solid black
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing a semi-colon

border-left: 1px solid black;
border-right: 1px solid black;
width: 100%;
Expand Down Expand Up @@ -1000,3 +1002,13 @@ font-size:9pt;
.iziModal.isFullscreen .iziModal-iframe {
height: 100% !important;
}
.css_button{
background-color:#ccc;
}
.cp-positive{
background-color: green !important;
}

.cp-positive span, .cp-submit span, .cp-negative span, .cp-misc span, .cp-output span{
background-color: unset;
}