From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 26 Mar 2015 20:14:59 +0000 (+0100)
Subject: Merge pull request #15234 from owncloud/encryption2_core
X-Git-Tag: v8.1.0alpha1~154
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=232518ac548a1d8f99c51fe391eb6132c1154dba;p=nextcloud-server.git

Merge pull request #15234 from owncloud/encryption2_core

core part of encryption 2.0
---

232518ac548a1d8f99c51fe391eb6132c1154dba
diff --cc settings/admin.php
index 9f5f36b2210,34e26c60d86..4416af1fe37
--- a/settings/admin.php
+++ b/settings/admin.php
@@@ -142,9 -135,9 +159,10 @@@ $formsAndMore = array_merge($formsAndMo
  // add bottom hardcoded forms from the template
  $formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron'));
  $formsAndMore[] = array('anchor' => 'shareAPI', 'section-name' => $l->t('Sharing'));
+ $formsAndMore[] = array('anchor' => 'encryptionAPI', 'section-name' => $l->t('Server Side Encryption'));
  $formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server'));
  $formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log'));
 +$formsAndMore[] = array('anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks'));
  
  $template->assign('forms', $formsAndMore);
  
diff --cc settings/css/settings.css
index 050914beef6,75acaf5f727..869a113762b
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@@ -400,10 -374,24 +400,19 @@@ doesnotexist:-o-prefocus, .strengthify-
  	background-position: left center;
  }
  
 -#postsetupchecks .hint {
 -	margin-top: 15px;
 -}
 -
 -#postsetupchecks .setupwarning {
 +#admin-tips li {
  	list-style: initial;
 -	font-weight: normal;
 -	margin-top: 5px;
 +}
 +#admin-tips li a {
 +	display: inline-block;
 +	padding: 3px 0;
  }
+ 
+ #selectEncryptionModules {
+ 	margin-left: 30px;
+ 	padding: 10px;
+ }
+ 
+ #encryptionModules {
+ 	padding: 10px;
+ }