Skip to content

Additional branding #112

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.

Sign up for GitHub

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

Merged
tonygermano merged 1 commit into from
Jun 11, 2025
Merged

Additional branding #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions client/src/com/mirth/connect/client/ui/Frame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ private void setInitialVisibleTasks() {
private void createViewPane() {
// Create View pane
viewPane = new JXTaskPane();
viewPane.setTitle(BrandingConstants.PRODUCT_NAME);
viewPane.setTitle("Engine");
viewPane.setName(TaskConstants.VIEW_KEY);
viewPane.setFocusable(false);

Expand Down Expand Up @@ -1260,7 +1260,7 @@ private void createOtherPane() {
addTask(TaskConstants.OTHER_VIEW_USER_API, "View User API", String.format("View documentation for the %s User API.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/page_white_text.png")), otherPane, null);
addTask(TaskConstants.OTHER_VIEW_CLIENT_API, "View Client API", String.format("View documentation for the %s Client API.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/page_white_text.png")), otherPane, null);
addTask(TaskConstants.OTHER_HELP, "Help", String.format("View help for %s.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/help.png")), otherPane, null);
addTask(TaskConstants.OTHER_ABOUT, String.format("About %s", BrandingConstants.PRODUCT_NAME), String.format("View the about page for %s.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/information.png")), otherPane, null);
addTask(TaskConstants.OTHER_ABOUT, "About", String.format("View the about page for %s.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/information.png")), otherPane, null);
addTask(TaskConstants.OTHER_VISIT_MIRTH, "Visit homepage", String.format("View %s's homepage.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/house.png")), otherPane, null);
addTask(TaskConstants.OTHER_REPORT_ISSUE, "Report Issue", String.format("Visit %s's issue tracker.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/bug.png")), otherPane, null);
addTask(TaskConstants.OTHER_LOGOUT, "Logout", "Logout and return to the login screen.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/disconnect.png")), otherPane, null);
Expand Down
2 changes: 1 addition & 1 deletion client/src/com/mirth/connect/connectors/dimse/DICOMListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});

jLabel30.setText("Store Recieved Objects in Directory:");
jLabel30.setText("Store Received Objects in Directory:");

destField.setToolTipText("Store received objects into files in specified directory <dir>. Do not store received objects by default.");

Expand Down
2 changes: 2 additions & 0 deletions server/mirth-build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@

<!-- WebAdmin -->
<target name="build-webadmin" depends="init">
<!--
<ant antfile="${webadmin}/build.xml" dir="${webadmin}" target="dist"/>
<copy file="${webadmin}/dist/webadmin.war" todir="${server.build}/webapps" />
<copy file="${webadmin}/dist/webadmin.war" todir="${server.setup}/webapps" />
-->
</target>

<!-- Server extensions -->
Expand Down
Binary file removed server/public_api_html/images/MirthConnect_Logo_WordMark_Big.png
View file
Open in desktop
Binary file not shown.
Binary file removed server/public_api_html/images/MirthConnect_Logo_WordMark_RGB.png
View file
Open in desktop
Binary file not shown.
Binary file removed server/public_api_html/images/NG_MC_Icon_16x16.png
View file
Open in desktop
Binary file not shown.
Empty file modified server/public_api_html/images/explorer_icons.png
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
192 changes: 192 additions & 0 deletions server/public_api_html/images/oie_logo_banner_text.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added server/public_api_html/images/oie_logo_only_white_background_48x48.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified server/public_api_html/images/throbber.gif
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions server/public_api_html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<meta charset="UTF-8">
<title>Mirth Connect Client API</title>
<link rel="shortcut icon" type="image/x-icon" href="images/NG_MC_Icon_16x16.png" />
<title>Open Integration Engine Client API</title>
<link rel="icon" type="image/png" href="images/oie_logo_only_white_background_48x48.png" />
<link rel="stylesheet" type="text/css" href="css/swagger-ui.css" >
<link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
<link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
Expand Down Expand Up @@ -221,8 +221,8 @@

<div id='header'>
<div class="swagger-ui-wrap">
<a id="mirthLogo" href="https://www.nextgen.com/products-and-services/integration-engine">
<img src="images/MirthConnect_Logo_WordMark_RGB.png" style="height:40px" />
<a id="mirthLogo" href="https://openintegrationengine.org">
<img src="images/oie_logo_banner_text.svg" style="height:40px" />
</a>
<img id="loginImage" src="images/throbber.gif"/>
<form id='loginForm' style="display:none">
Expand All @@ -244,4 +244,4 @@
<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
<script src="lib/swagger-ui-bundle.js" type='text/javascript'></script>
</body>
</html>
</html>
Loading