compat NC14

2 files changed, 47 insertions, 67 deletions

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index 3c02d23..3f61e70 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -4,43 +4,28 @@ style('orcid', 'admin');
 
 ?>
 
-<fieldset id="orcidAdminSettings" class="section">
-	<h2>
-		<img src="/apps/orcid/img/orcid.png"> ORCID
-	</h2>
-	<table style="width: 650px;">
-		<tr class="orcid_admin_head">
-			<td>
-				<div id="orcid_saving"><?php p($l->t('Saving')); ?></div>
-			</td>
-			<td class="orcid_admin_head">ORCID API Credentials</td>
-		</tr>
-
-		<tr>
-			<td class="orcid_admin_left orcid_moremargin">Redirect URL:</td>
-			<td id="redirecturl"></td>
-		</tr>
-		<tr>
-			<td class="orcid_admin_left">Client ID:</td>
-			<td><input type='text' style="width: 300px" name='orcid_client_appid'
-					   id='orcid_client_appid' original-title=''
-					   title='Set the Client app ID for OAuth'></td>
-		</tr>
-		<tr>
-			<td class="orcid_admin_left">Client Secret:</td>
-			<td><input type='text' name='orcid_client_secret' style="width: 300px"
-					   id='orcid_client_secret' original-title=''
-					   title='Set the Client secret for OAuth'></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input type='submit' value='Store ORCID Credentials'
-					   style="width: 250px" original-title='' style="width: 300px"
-					   id='clientsubmit' name='clientsubmit'
-					   title='Store ORCID Credentials'></input></td>
-		</tr>
-	</table>
-	<div id='clientstatus' style="font-size: .8em;"></div>
-
-</fieldset>
+
+
+<div class="section" id="orcid">
+	<h2><?php p($l->t('ORCID API Credentials')) ?></h2>
+
+	<p>
+		<label><?php p($l->t('Redirect URL:')); ?></label><br />
+		<label id="redirecturl"></label>
+	</p>
+
+	<p>
+		<label><?php p($l->t('Client ID')); ?></label><br />
+		<input type="text" id="orcid_client_appid" />
+	</p>
+
+	<p>
+		<label><?php p($l->t('Client Secret')); ?></label><br />
+		<input type="text" id="orcid_client_secret" />
+	</p>
+
+	<p>
+		<input type="submit" id="clientsubmit" value="<?php p($l->t('Store ORCID Credentials')); ?>">
+	</p>
+</div>
 
diff --git a/templates/settings.personal.php b/templates/settings.personal.php
index f44e88d..6cf1094 100644
--- a/templates/settings.personal.php
+++ b/templates/settings.personal.php
@@ -4,32 +4,27 @@ style('orcid', 'personal');
 
 ?>
 
-<fieldset id="orcidPersonalSettings" class="section">
-	<h2 id="orcid-info" style="width: 100px">ORCID</h2>
-
-	<div class='orcid-popup'>
-		<p>
-			ORCID provides you with digital identifier that uniquely identifies you as a researcher.
-			Learn more at <a href="https://orcid.org">orcid.org</a>.<br/>
-			Connecting an ORCID identifier allows seamless publication of datasets and
-			attribution of these datasets to you.
-		</p>
-	</div>
-	<br/>
-	<div id="orcid_user_content">
-		Your ORCID: <strong id="orcid_id"></strong>
-		<a title="" data-original-title="Copy Orcid" class="clipboardButton icon icon-clippy"
-		   data-clipboard-target="#orcid_id" style="width: 16px; height: 16px;"></a>
-		<br />
-	</div>
-
-	<div>
-		<button id="orcid_request_button">
-			<img id="orcid-id-logo"
-				 src="https://orcid.org/sites/default/files/images/orcid_24x24.png"
-				 width='24' height='24' alt="ORCID logo"/>Create or Connect your
-			ORCID iD
-		</button>
-	</div>
-</fieldset>
+
+
+<div class="section" id="orcid">
+	<h2><?php p($l->t('ORCID')) ?></h2>
+
+	<p>
+		ORCID provides you with digital identifier that uniquely identifies you as a researcher.
+		Learn more at <a href="https://orcid.org">orcid.org</a>.<br/>
+		Connecting an ORCID identifier allows seamless publication of datasets and
+		attribution of these datasets to you.
+	</p>
+<br />
+	<p id="orcid_user_content">
+				<label><?php p($l->t('Your ORCID:')); ?></label><br />
+		<strong id="orcid_id"></strong>
+	<label id="orcid_id"></label>
+	</p>
+
+	<p>
+		<input type="submit" id="orcid_request_button" value="<?php p($l->t('Connect to ORCID')); ?>">
+	</p>
+</div>
+