diff --git a/modules/core/templates/frontpage_federation.tpl.php b/modules/core/templates/frontpage_federation.tpl.php index 2d4c8495735af6e4da17c55338136e31dab7adb0..f6e1596c560a6e76e12f3e109bedcdaf0e51265d 100644 --- a/modules/core/templates/frontpage_federation.tpl.php +++ b/modules/core/templates/frontpage_federation.tpl.php @@ -10,9 +10,8 @@ if ($this->data['isadmin']) { $this->t('{core:frontpage:login_as_admin}').'</a></p>'; } -$now = time(); -echo '<dl>'; if (is_array($this->data['metaentries']['hosted']) && count($this->data['metaentries']['hosted']) > 0) { + echo '<dl>'; foreach ($this->data['metaentries']['hosted'] as $hm) { echo '<dt>'.$this->t($this->data['mtype'][$hm['metadata-set']]).'</dt>'; echo '<dd>'; @@ -38,10 +37,11 @@ if (is_array($this->data['metaentries']['hosted']) && count($this->data['metaent echo '</p></dd>'; } + echo '</dl>'; } -echo '</dl>'; if (is_array($this->data['metaentries']['remote']) && count($this->data['metaentries']['remote']) > 0) { + $now = time(); foreach ($this->data['metaentries']['remote'] as $setkey => $set) { echo '<fieldset class="fancyfieldset"><legend>'.$this->t($this->data['mtype'][$setkey]).' (Trusted)</legend>'; diff --git a/modules/core/templates/loginuserpass.php b/modules/core/templates/loginuserpass.php index b60e9bbe833b42b13f7635b7e9d1f0f3720afa1d..f9d739c6205f33ceb4636a7196d8c77d519e5c87 100644 --- a/modules/core/templates/loginuserpass.php +++ b/modules/core/templates/loginuserpass.php @@ -163,7 +163,7 @@ if ($this->data['errorcode'] !== null) { </td> </tr> <tr id="mobilesubmit"> - <td></td> + <td></td><td></td> <td> <button class="btn" tabindex="6"> <?php echo $this->t('{login:login_button}'); ?> diff --git a/modules/core/templates/show_metadata.tpl.php b/modules/core/templates/show_metadata.tpl.php index 9d5a7c3bd5ae13ccb7dc54ddcdf7ef7e6befdd96..9c5977e58480ddd9274b4d6c9914b47917d577ca 100644 --- a/modules/core/templates/show_metadata.tpl.php +++ b/modules/core/templates/show_metadata.tpl.php @@ -4,7 +4,7 @@ $this->includeAtTemplateBase('includes/header.php'); <div class="metadatabox"> <button data-clipboard-target="#metadata" id="btncp" class="btn topright" style="margin-right: 0.5em;"> <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" - alt="Copy to clipboard"> + alt="Copy to clipboard" /> </button> <pre id="metadata"> $metadata['<?php echo $this->data['m']['metadata-index']; unset($this->data['m']['metadata-index']) ?>'] => <?php diff --git a/templates/error.php b/templates/error.php index 9231c2b28230467e49c22d3b775776c0ccdb38ae..fc0b145a0f92e05e7c51b20cf49eb1bf0aea355e 100644 --- a/templates/error.php +++ b/templates/error.php @@ -23,7 +23,7 @@ if (isset($this->data['includeTemplate'])) { <pre id="trackid" class="input-left"><?php echo $this->data['error']['trackId']; ?></pre> <button data-clipboard-target="#trackid" id="btntrackid" class="btnaddonright"> <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" - alt="Copy to clipboard"> + alt="Copy to clipboard" /> </button> </div> </div> @@ -54,7 +54,7 @@ if (isset($this->data['errorReportAddress'])) { <input type="email" size="25" name="email" value="<?php echo htmlspecialchars($this->data['email']); ?>" /> </p> <p> - <textarea class="metadatabox" name="text" rows="6" style="width: 100%; padding: 0.5em;"><?php + <textarea class="metadatabox" name="text" rows="6" cols="50" style="width: 100%; padding: 0.5em;"><?php echo $this->t('report_explain'); ?></textarea> </p> <p> diff --git a/templates/login.php b/templates/login.php index 1112a3f3193a3af0be42c873bba6cfe33cc388b5..fc4e8b28dce39a9518ab7da50c8a418ea224c34f 100644 --- a/templates/login.php +++ b/templates/login.php @@ -53,9 +53,9 @@ <td style="padding: .3em;"><?php echo $this->t('password'); ?></td> <td><input id="password" type="password" tabindex="2" name="password" /></td> </tr> - <tr><td></td><td> - <button type="submit" tabindex="5" id="mobilesubmit" class="btn"><?php echo $this->t('login_button'); ?></button> - </td></tr> + <tr><td></td><td></td><td> + <button type="submit" tabindex="5" id="mobilesubmit" class="btn"><?php echo $this->t('login_button'); ?></button> + </td></tr> </table> diff --git a/templates/metadata-converter.php b/templates/metadata-converter.php index 19fac27e4c415ed88ccb75fc927e32ec8bcb5a85..e784cea2e5039405cabf76d5d9d53552da40d83c 100644 --- a/templates/metadata-converter.php +++ b/templates/metadata-converter.php @@ -11,7 +11,7 @@ $this->includeAtTemplateBase('includes/header.php'); </p> <p> <?php echo $this->t('metaconv_selectfile'); ?> - <input type="file" name="xmlfile"/></p> + <input type="file" name="xmlfile" /></p> <p> <button type="submit" class="btn"><?php echo $this->t('metaconv_parse'); ?></button> </p> @@ -34,7 +34,7 @@ if (!empty($output)) { <button data-clipboard-target="#metadata<?php echo $i; ?>" id="btn<?php echo $i; ?>" class="btn topright" style="margin-right: 0.5em;"> <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" - alt="Copy to clipboard"> + alt="Copy to clipboard" /> </button> <pre id="metadata<?php echo $i; ?>"><?php echo htmlspecialchars($text); diff --git a/templates/metadata.php b/templates/metadata.php index 483a321be67cd6e78d33211d9f08d9a18ff4ceb5..6f58bad2cecdcaf43cee0724b18660662dba0095 100644 --- a/templates/metadata.php +++ b/templates/metadata.php @@ -9,7 +9,7 @@ $this->includeAtTemplateBase('includes/header.php'); ?> <pre id="metadataurl" class="input-left"><?php echo htmlspecialchars($this->data['metaurl']); ?></pre> <button data-clipboard-target="#metadataurl" id="btnurl" class="btnaddonright"> <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" - alt="Copy to clipboard"> + alt="Copy to clipboard" /> </button> </div> <?php } ?> @@ -18,7 +18,7 @@ $this->includeAtTemplateBase('includes/header.php'); ?> <div class="metadatabox"> <button data-clipboard-target="#xmlmetadata" id="btnxml" class="btn topright" style="margin-right: 0.5em;"> <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" - alt="Copy to clipboard"> + alt="Copy to clipboard" /> </button> <pre id="xmlmetadata"><?php echo $this->data['metadata']; ?></pre> </div> @@ -27,7 +27,7 @@ $this->includeAtTemplateBase('includes/header.php'); ?> <div class="metadatabox"> <button data-clipboard-target="#phpmetadata" id="btnphp" class="btn topright" style="margin-right: 0.5em;"> <img src="/<?php echo $this->data['baseurlpath'].'resources/icons/clipboard.svg'; ?>" - alt="Copy to clipboard"> + alt="Copy to clipboard" /> </button> <pre id="phpmetadata"><?php echo $this->data['metadataflat']; ?></pre> </div>