From 7bbfefe1e645dd244568538cd3c2371bc6fb2b1b Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Tue, 25 Jan 2022 09:58:57 -0500
Subject: [PATCH] Minor tweaks

---
 coreplugins/dronedb/README.md                             | 2 --
 coreplugins/dronedb/plugin.py                             | 2 +-
 coreplugins/dronedb/public/ImportView.jsx                 | 5 ++---
 coreplugins/dronedb/public/ImportView.scss                | 3 +++
 coreplugins/dronedb/public/ShareButton.jsx                | 2 +-
 coreplugins/dronedb/public/components/SelectUrlDialog.jsx | 2 +-
 coreplugins/dronedb/templates/app.html                    | 6 ++----
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/coreplugins/dronedb/README.md b/coreplugins/dronedb/README.md
index 67d413e8..d43bda86 100644
--- a/coreplugins/dronedb/README.md
+++ b/coreplugins/dronedb/README.md
@@ -1,7 +1,5 @@
 <h1 align="center">DroneDB</h1>
 
-Welcome to DroneDB Plugin!
-
 DroneDB is a WebODM add-on that enables you to import and export your files to DroneDB.
 
 
diff --git a/coreplugins/dronedb/plugin.py b/coreplugins/dronedb/plugin.py
index bc8c009a..49eddb0f 100644
--- a/coreplugins/dronedb/plugin.py
+++ b/coreplugins/dronedb/plugin.py
@@ -21,9 +21,9 @@ from django.contrib.auth.decorators import login_required
 from django import forms
 
 class SettingsForm(forms.Form):
-    registry_url = forms.CharField(label='Registry Url', required=False, max_length=1024, widget=forms.TextInput(attrs={'placeholder': 'Registry Url'}))
     username = forms.CharField(label='Username', required=False, max_length=1024, widget=forms.TextInput(attrs={'placeholder': 'Username'}))
     password = forms.CharField(label='Password', required=False, max_length=1024, widget=forms.PasswordInput(attrs={'placeholder': 'Password'}))
+    registry_url = forms.CharField(label='Registry URL', required=False, max_length=1024, widget=forms.TextInput(attrs={'placeholder': 'Registry Url'}))
 
 class Plugin(PluginBase):
     def __init__(self, *args, **kwargs):
diff --git a/coreplugins/dronedb/public/ImportView.jsx b/coreplugins/dronedb/public/ImportView.jsx
index 874df95a..9b9550ac 100644
--- a/coreplugins/dronedb/public/ImportView.jsx
+++ b/coreplugins/dronedb/public/ImportView.jsx
@@ -87,13 +87,12 @@ export default class TaskView extends Component {
 			<Fragment>
 				{error ? <ErrorDialog errorMessage={error} /> : ""}				
 				<Button
-					id={"dronedbButton"}
 					bsStyle={"default"}
 					bsSize={"small"}
 					className={"platform-btn"}
 					onClick={this.handleClick}>
-						<i className={"fas fa-cloud"} />
-						DroneDB
+						<i className={"ddb-icon fa-fw"} />
+						DroneDB Import
 				</Button>
 				<SelectUrlDialog
 						  show={isDialogOpen}						  
diff --git a/coreplugins/dronedb/public/ImportView.scss b/coreplugins/dronedb/public/ImportView.scss
index 1a02ba14..f9432378 100644
--- a/coreplugins/dronedb/public/ImportView.scss
+++ b/coreplugins/dronedb/public/ImportView.scss
@@ -1,4 +1,7 @@
 .platform-btn {
+    .ddb-icon{
+        margin-right: 8px;
+    }
 	.fa-cloud {
 		margin-right: 0.5em;
 	}
diff --git a/coreplugins/dronedb/public/ShareButton.jsx b/coreplugins/dronedb/public/ShareButton.jsx
index 7a6cab58..8f3282fa 100644
--- a/coreplugins/dronedb/public/ShareButton.jsx
+++ b/coreplugins/dronedb/public/ShareButton.jsx
@@ -126,7 +126,7 @@ export default class ShareButton extends React.Component{
 
         const getButtonLabel = () => {
 
-            if (taskInfo == null) return "Share on DroneDB";
+            if (taskInfo == null) return "Share to DroneDB";
             if (taskInfo.error) return "DroneDB plugin error";
 
             var text = BUTTON_TEXT_MAPPER[taskInfo.status];
diff --git a/coreplugins/dronedb/public/components/SelectUrlDialog.jsx b/coreplugins/dronedb/public/components/SelectUrlDialog.jsx
index 462f45bc..04d935c2 100644
--- a/coreplugins/dronedb/public/components/SelectUrlDialog.jsx
+++ b/coreplugins/dronedb/public/components/SelectUrlDialog.jsx
@@ -249,7 +249,7 @@ export default class SelectUrlDialog extends Component {
 				<Modal.Body bsClass="my-modal">		
 					{this.state.organizations!= null && this.state.organizations.length > 0 ? 		
 					<div style={{'marginBottom': '20px'}}>
-						<p>Import the images from your DroneDB account</p>
+						<p>Import images from your DroneDB account</p>
 						<div className={"select-row"}>
 							<div className={"icon-cell"}>
 								<i className={"fas fa-sitemap"}></i>
diff --git a/coreplugins/dronedb/templates/app.html b/coreplugins/dronedb/templates/app.html
index 4f171d49..78b12d5a 100644
--- a/coreplugins/dronedb/templates/app.html
+++ b/coreplugins/dronedb/templates/app.html
@@ -1,13 +1,11 @@
 {% extends "app/plugins/templates/base.html" %}
 {% load bootstrap_extras %}
 {% block content %}
-<h3>Welcome to DroneDB!</h3>
-<h5><strong>Instructions</strong></h5>
-On this screen, you can provide the registry url and credentials to access DroneDB
+<h3>DroneDB Plugin</h3>
+Provide your credentials to access <a href="https://dronedb.app" target="_blank">DroneDB</a>:
 <br/>
 <br/>
 <form action="" method="post" class="oam-form oam-token-form">
-	<h4>Settings</h4>
 	{% csrf_token %}
 	{% include "app/plugins/templates/form.html" %}
 	<button id="btnVerify" type="button" class="btn btn-success" disabled><i class="fas fa-user-check"></i>&nbsp;&nbsp;Verify Configuration</button>