Skip to content

Commit 8e6a11e

Browse files
committed
Rebranding for mostly non-Java elements; New default webpage
Updated branding in plugin metadata Updated branding in javadoc package files Shortened task names in side-bar menu by excluding the product name Fixed a typo in DicomListener Updated branding on Client API web page Fixed file permissions on a couple graphics that were marked executable Removed webadmin from build and distribution Replaced default webpage Signed-off-by: Tony Germano <tony@germano.name> Issue: #104 Relates-to: #23
1 parent 3954bc5 commit 8e6a11e

File tree

76 files changed

+415
-4657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+415
-4657
lines changed

client/src/com/mirth/connect/client/ui/Frame.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ private void setInitialVisibleTasks() {
10161016
private void createViewPane() {
10171017
// Create View pane
10181018
viewPane = new JXTaskPane();
1019-
viewPane.setTitle(BrandingConstants.PRODUCT_NAME);
1019+
viewPane.setTitle("Engine");
10201020
viewPane.setName(TaskConstants.VIEW_KEY);
10211021
viewPane.setFocusable(false);
10221022

@@ -1260,7 +1260,7 @@ private void createOtherPane() {
12601260
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);
12611261
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);
12621262
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);
1263-
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);
1263+
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);
12641264
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);
12651265
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);
12661266
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);

client/src/com/mirth/connect/connectors/dimse/DICOMListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
427427
}
428428
});
429429

430-
jLabel30.setText("Store Recieved Objects in Directory:");
430+
jLabel30.setText("Store Received Objects in Directory:");
431431

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

server/mirth-build.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727

2828
<!-- WebAdmin -->
2929
<target name="build-webadmin" depends="init">
30+
<!--
3031
<ant antfile="${webadmin}/build.xml" dir="${webadmin}" target="dist"/>
3132
<copy file="${webadmin}/dist/webadmin.war" todir="${server.build}/webapps" />
3233
<copy file="${webadmin}/dist/webadmin.war" todir="${server.setup}/webapps" />
34+
-->
3335
</target>
3436

3537
<!-- Server extensions -->
-2.02 MB
Binary file not shown.
-114 KB
Binary file not shown.
-546 Bytes
Binary file not shown.

server/public_api_html/images/explorer_icons.png

100755100644
File mode changed.

server/public_api_html/images/oie_logo_banner_text.svg

Lines changed: 192 additions & 0 deletions
Loading
3.21 KB
Loading

server/public_api_html/images/throbber.gif

100755100644
File mode changed.

0 commit comments

Comments
 (0)