summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-01-24 11:35:52 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2014-01-24 11:41:24 +0100
commit2a3cb7ac5ba5a958b212de86dea62735c3f9d503 (patch)
tree4147646a5dd3d8de0197350dde8a322558a0123b /settings
parent9fa788c452403646cc5c2a7c0fe875879e7082fa (diff)
downloadnextcloud-server-2a3cb7ac5ba5a958b212de86dea62735c3f9d503.tar.gz
nextcloud-server-2a3cb7ac5ba5a958b212de86dea62735c3f9d503.zip
remove the form, it isn't needed here
Diffstat (limited to 'settings')
-rw-r--r--settings/js/personal.js5
-rw-r--r--settings/templates/personal.php42
2 files changed, 22 insertions, 25 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index aa55832469c..57b69fd7b69 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -283,10 +283,9 @@ OC.Encryption = {
} else {
OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
}
- }
- );
+ });
}
-}
+};
OC.Encryption.msg={
startDecrypting:function(selector){
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 1518b48b979..a38178e63a9 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -146,29 +146,27 @@ if($_['passwordChangeSupported']) {
};?>
<?php if($_['enableDecryptAll']): ?>
-<form id="decryptAll">
- <fieldset class="personalblock">
- <h2>
- <?php p( $l->t( 'Encryption' ) ); ?>
- </h2>
- <?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?>
- <p>
- <input
- type="password"
- name="privateKeyPassword"
- id="privateKeyPassword" />
- <label for="privateKeyPassword"><?php p($l->t( "Log-in password" )); ?></label>
- <br />
- <button
- type="button"
- disabled
- name="submitDecryptAll"><?php p($l->t( "Decrypt all Files" )); ?>
- </button>
- <span class="msg"></span>
- </p>
+<fieldset class="personalblock" id="decryptAll">
+ <h2>
+ <?php p( $l->t( 'Encryption' ) ); ?>
+ </h2>
+ <?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?>
+ <p>
+ <input
+ type="password"
+ name="privateKeyPassword"
+ id="privateKeyPassword" />
+ <label for="privateKeyPassword"><?php p($l->t( "Log-in password" )); ?></label>
<br />
- </fieldset>
-</form>
+ <button
+ type="button"
+ disabled
+ name="submitDecryptAll"><?php p($l->t( "Decrypt all Files" )); ?>
+ </button>
+ <span class="msg"></span>
+ </p>
+ <br />
+</fieldset>
<?php endif; ?>
<fieldset class="personalblock">