From 2a3cb7ac5ba5a958b212de86dea62735c3f9d503 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 24 Jan 2014 11:35:52 +0100
Subject: [PATCH] remove the form, it isn't needed here
---
settings/js/personal.js | 5 ++--
settings/templates/personal.php | 42 ++++++++++++++++-----------------
2 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/settings/js/personal.js b/settings/js/personal.js
index aa55832469..57b69fd7b6 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 1518b48b97..a38178e63a 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">
--
GitLab