diff options
| -rw-r--r-- | lib/private/Settings/Manager.php | 4 | ||||
| -rw-r--r-- | lib/private/Settings/Personal/ServerDevNotice.php (renamed from lib/private/Settings/Admin/ServerDevNotice.php) | 8 | ||||
| -rw-r--r-- | settings/css/settings.scss | 6 | ||||
| -rw-r--r-- | settings/templates/settings/admin/server.development.notice.php | 3 | ||||
| -rw-r--r-- | settings/templates/settings/personal/development.notice.php (renamed from settings/templates/settings.development.notice.php) | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 4ee594c090f..7040f87261f 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -262,8 +262,6 @@ class Manager implements IManager { /** @var ISettings $form */ $form = new Admin\Overview($this->config); $forms[$form->getPriority()] = [$form]; - $form = new Admin\ServerDevNotice(); - $forms[$form->getPriority()] = [$form]; } if ($section === 'server') { /** @var ISettings $form */ @@ -305,6 +303,8 @@ class Manager implements IManager { $this->l ); $forms[$form->getPriority()] = [$form]; + $form = new Personal\ServerDevNotice(); + $forms[$form->getPriority()] = [$form]; } if($section === 'security') { /** @var ISettings $form */ diff --git a/lib/private/Settings/Admin/ServerDevNotice.php b/lib/private/Settings/Personal/ServerDevNotice.php index 22637729b0f..fa5a736cded 100644 --- a/lib/private/Settings/Admin/ServerDevNotice.php +++ b/lib/private/Settings/Personal/ServerDevNotice.php @@ -18,10 +18,10 @@ * GNU Affero General Public License for more details. * * 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\Settings\ISettings; @@ -31,14 +31,14 @@ class ServerDevNotice implements ISettings { * @return TemplateResponse */ 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' */ public function getSection() { - return 'server'; + return 'personal-info'; } /** diff --git a/settings/css/settings.scss b/settings/css/settings.scss index cfca22d5bbb..a573f94d491 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -96,14 +96,14 @@ input { #personal-settings-avatar-container { display: inline-grid; grid-template-columns: 1fr; - grid-template-rows: 2fr 1fr 1fr; + grid-template-rows: 2fr 1fr; vertical-align: top; } .profile-settings-container { display: inline-grid; grid-template-columns: 1fr; - grid-template-rows: 1fr 1fr 1fr 1fr; + grid-template-rows: 1fr 2fr; } .personal-show-container { @@ -216,7 +216,7 @@ input { .personal-settings-container { display: inline-grid; grid-template-columns: 1fr 1fr; - grid-template-rows: 1fr 1fr 1fr 1fr; + grid-template-rows: 1fr 1fr 1fr; &:after { clear: both; } diff --git a/settings/templates/settings/admin/server.development.notice.php b/settings/templates/settings/admin/server.development.notice.php deleted file mode 100644 index 42599c54459..00000000000 --- a/settings/templates/settings/admin/server.development.notice.php +++ /dev/null @@ -1,3 +0,0 @@ -<div class="section"> - <p><?php include __DIR__ . '/../../settings.development.notice.php'; ?></p> -</div> diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings/personal/development.notice.php index 855c4dc26c7..41f70c0a822 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings/personal/development.notice.php @@ -1,3 +1,4 @@ +<div class="followupsection"> <p> <?php print_unescaped(str_replace( [ @@ -62,3 +63,4 @@ {newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}' )); ?> </p> +</div>
\ No newline at end of file |