Move social buttons to the personal settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
parent
a788f49114
commit
ff2c819ed3
|
@ -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 */
|
||||||
|
|
|
@ -18,10 +18,10 @@
|
||||||
* GNU Affero General Public License for more details.
|
* GNU Affero General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* 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';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
<div class="section">
|
|
||||||
<p><?php include __DIR__ . '/../../settings.development.notice.php'; ?></p>
|
|
||||||
</div>
|
|
|
@ -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>
|
Loading…
Reference in New Issue