mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move social buttons to the personal settings 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-06-27 19:59:17 +02:00 committed by Roeland Jago Douma
parent a788f49114
commit ff2c819ed3
No known key found for this signature in database
GPG Key ID: F941078878347C0C
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Settings/Manager.php
View File

@ -262,8 +262,6 @@ class Manager implements IManager {
/** @var ISettings $form */ /** @var ISettings $form */
$form = new Admin\Overview($this->config); $form = new Admin\Overview($this->config);
$forms[$form->getPriority()] = [$form]; $forms[$form->getPriority()] = [$form];
$form = new Admin\ServerDevNotice();
$forms[$form->getPriority()] = [$form];
} }
if ($section === 'server') { if ($section === 'server') {
/** @var ISettings $form */ /** @var ISettings $form */
@ -305,6 +303,8 @@ class Manager implements IManager {
$this->l $this->l
); );
$forms[$form->getPriority()] = [$form]; $forms[$form->getPriority()] = [$form];
$form = new Personal\ServerDevNotice();
$forms[$form->getPriority()] = [$form];
} }
if($section === 'security') { if($section === 'security') {
/** @var ISettings $form */ /** @var ISettings $form */

6
lib/private/Settings/Admin/ServerDevNotice.php → lib/private/Settings/Personal/ServerDevNotice.php
View File

@ -21,7 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
namespace OC\Settings\Admin; namespace OC\Settings\Personal;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\Settings\ISettings; use OCP\Settings\ISettings;
@ -31,14 +31,14 @@ class ServerDevNotice implements ISettings {
* @return TemplateResponse * @return TemplateResponse
*/ */
public function getForm() { public function getForm() {
return new TemplateResponse('settings', 'settings/admin/server.development.notice'); return new TemplateResponse('settings', 'settings/personal/development.notice');
} }
/** /**
* @return string the section ID, e.g. 'sharing' * @return string the section ID, e.g. 'sharing'
*/ */
public function getSection() { public function getSection() {
return 'server'; return 'personal-info';
} }
/** /**

6
settings/css/settings.scss
View File

@ -96,14 +96,14 @@ input {
#personal-settings-avatar-container { #personal-settings-avatar-container {
display: inline-grid; display: inline-grid;
grid-template-columns: 1fr; grid-template-columns: 1fr;
grid-template-rows: 2fr 1fr 1fr; grid-template-rows: 2fr 1fr;
vertical-align: top; vertical-align: top;
} }
.profile-settings-container { .profile-settings-container {
display: inline-grid; display: inline-grid;
grid-template-columns: 1fr; grid-template-columns: 1fr;
grid-template-rows: 1fr 1fr 1fr 1fr; grid-template-rows: 1fr 2fr;
} }
.personal-show-container { .personal-show-container {
@ -216,7 +216,7 @@ input {
.personal-settings-container { .personal-settings-container {
display: inline-grid; display: inline-grid;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr 1fr 1fr 1fr; grid-template-rows: 1fr 1fr 1fr;
&:after { &:after {
clear: both; clear: both;
} }

3
settings/templates/settings/admin/server.development.notice.php
View File

@ -1,3 +0,0 @@
<div class="section">
<p><?php include __DIR__ . '/../../settings.development.notice.php'; ?></p>
</div>

2
settings/templates/settings.development.notice.php → settings/templates/settings/personal/development.notice.php
View File

@ -1,3 +1,4 @@
<div class="followupsection">
<p> <p>
<?php print_unescaped(str_replace( <?php print_unescaped(str_replace(
[ [
@ -62,3 +63,4 @@
{newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}' {newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
)); ?> )); ?>
</p> </p>
</div>