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

Fix #3002 change encounter tabs to bootstrap style #3039

Merged
merged 1 commit into from
Feb 29, 2020
Merged

Fix #3002 change encounter tabs to bootstrap style #3039

merged 1 commit into from
Feb 29, 2020

Conversation

stu01509
Copy link
Member

Fixes #3002

Short description of what this resolves:

Change encounter tabs to bootstrap style
Untitled

@bradymiller
Copy link
Sponsor Member

bradymiller commented Feb 29, 2020

hi @stu01509 ,

Code looks good.

Now the more difficult part. Those tabs at the top are based on jquery-ui using this class:
src/Tabs/TabsWrapper.php
(it brings in the jquery-ui css and js libraries and uses them to style and control the tabs)

The goal is to remove the dependence on those jquery-ui libraries inside TabsWrapper.php.

Sorry, I should of been more clear. I didn't realize it was all hidden away in that TabsWrapper.php class.

-brady

}
$StringEcho .= "<li class=\"encounter-form-category-li\"><a href='JavaScript:void(0);' onClick=\"mopen(" . attr_js($DivId) . ");\" >" . text($new_category) . "</a><div id='" . attr($DivId) . "' ><table border='0' cellspacing='0' cellpadding='0'>";
$StringEcho .= "<div class='dropdown d-inline'><button class='btn btn-secondary dropdown-toggle' type='button' id='menu" . text($new_category) . "' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>" .text($new_category) . "</button>";
Copy link
Sponsor Member

@bradymiller bradymiller Feb 29, 2020

Choose a reason for hiding this comment

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

The fist $new_category on above line should be wrapped in the attr() function (rather than text() function) since it's within html attribute. The text/attr are html escaping functions and are basically shortcuts for htmlspecialchar/ENT_NOQUOTES and htmlspecialchars/ENT_QUOTES respectively.

@stu01509
Copy link
Member Author

stu01509 commented Feb 29, 2020

hi @stu01509 ,

Code looks good.

Now the more difficult part. Those tabs at the top are based on jquery-ui using this class:
src/Tabs/TabsWrapper.php
(it brings in the jquery-ui css and js libraries and uses them to style and control the tabs)

The goal is to remove the dependence on those jquery-ui libraries inside TabsWrapper.php.

Sorry, I should of been more clear. I didn't realize it was all hidden away in that TabsWrapper.php class.

-brady

So I need to remove jquery-UI from TabsWrapper.php?
If that's the case, I think we can create another issue and PR to fix it.

@bradymiller
Copy link
Sponsor Member

hi @stu01509 , Sounds good. This is testing nicely. Will bring this in and start another issue for TabsWrapper.php. Thanks for the code improvement! -brady

@bradymiller bradymiller merged commit 60ff498 into openemr:master Feb 29, 2020
@bradymiller
Copy link
Sponsor Member

lol, just hit me. still gotta fix psr2 issue and the attr() . I'm gonna do that real quick in followup commit to keep travis happy :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change encounter tabs from jquery-ui to bootstrap
2 participants