Skip to content

Commit 23ea7ba

Browse files
committed
refactor: consolidate OC.Settings
1. Remove unused legacy parts (no code match in the whole github organization). 2. Consolidate `OC.Settings` in `core/src/OC` for consistency. Signed-off-by: Ferdinand Thiessen <[email protected]>
1 parent 89166cb commit 23ea7ba

File tree

14 files changed

+36
-288
lines changed

14 files changed

+36
-288
lines changed

apps/settings/css/settings.scss

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -239,75 +239,6 @@ select {
239239
}
240240
}
241241

242-
.federation-menu {
243-
position: relative;
244-
cursor: pointer;
245-
width: var(--default-clickable-area);
246-
height: var(--default-clickable-area);
247-
padding: calc(2 * var(--default-grid-baseline));
248-
margin: 0;
249-
background: none;
250-
border: none;
251-
252-
&:hover,
253-
&:focus {
254-
background-color: var(--color-background-hover);
255-
border-radius: var(--border-radius-element);
256-
257-
.icon-federation-menu {
258-
opacity: 0.8;
259-
}
260-
}
261-
262-
.icon-federation-menu {
263-
padding-inline-start: 16px;
264-
background-size: 16px;
265-
background-position: left center;
266-
opacity: .3;
267-
cursor: inherit;
268-
269-
.icon-triangle-s {
270-
display: inline-block;
271-
vertical-align: middle;
272-
cursor: inherit;
273-
}
274-
}
275-
276-
.federationScopeMenu {
277-
top: var(--default-clickable-area);
278-
279-
&.popovermenu {
280-
.menuitem {
281-
// override h3 heading font size
282-
font-size: 12.8px;
283-
line-height: 1.6em;
284-
285-
.menuitem-text-detail {
286-
opacity: .75;
287-
}
288-
289-
&.active {
290-
box-shadow: inset 2px 0 var(--color-primary-element);
291-
292-
.menuitem-text {
293-
font-weight: bold;
294-
}
295-
}
296-
297-
&.disabled {
298-
opacity: .5;
299-
300-
cursor: default;
301-
302-
* {
303-
cursor: default;
304-
}
305-
}
306-
}
307-
}
308-
}
309-
}
310-
311242
.clientsbox img {
312243
height: 60px;
313244
}

apps/settings/js/templates.js

Lines changed: 0 additions & 91 deletions
This file was deleted.

apps/settings/js/templates/federationscopemenu.handlebars

Lines changed: 0 additions & 27 deletions
This file was deleted.

apps/settings/js/usersettings.js

Lines changed: 0 additions & 60 deletions
This file was deleted.

apps/settings/src/apps.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

apps/settings/src/main-admin-ai.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,5 @@ __webpack_nonce__ = getCSPNonce()
1010

1111
Vue.prototype.t = t
1212

13-
// Not used here but required for legacy templates
14-
window.OC = window.OC || {}
15-
window.OC.Settings = window.OC.Settings || {}
16-
1713
const View = Vue.extend(ArtificialIntelligence)
1814
new View().$mount('#ai-settings')

apps/settings/src/main-admin-security.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ __webpack_nonce__ = getCSPNonce()
1313

1414
Vue.prototype.t = t
1515

16-
// Not used here but required for legacy templates
17-
window.OC = window.OC || {}
18-
window.OC.Settings = window.OC.Settings || {}
19-
2016
store.replaceState(loadState('settings', 'mandatory2FAState'))
2117

2218
const View = Vue.extend(AdminTwoFactor)

apps/settings/templates/settings/admin/ai.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
* SPDX-License-Identifier: AGPL-3.0-or-later
55
*/
66

7-
script('settings', [
8-
'vue-settings-admin-ai',
9-
]);
7+
\OCP\Util::addScript('settings', 'vue-settings-admin-ai');
108
?>
119

1210
<div id="ai-settings">

apps/settings/templates/settings/admin/server.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
/** @var \OCP\IL10N $l */
88
/** @var array $_ */
99

10-
script('settings', [
11-
'vue-settings-admin-basic-settings',
12-
]);
10+
\OCP\Util::addScript('settings', 'vue-settings-admin-basic-settings');
1311
?>
1412

1513
<div id="vue-admin-background-job"></div>

apps/settings/templates/settings/frame.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
*/
66

77
style('settings', 'settings');
8-
\OCP\Util::addScript('settings', 'settings', 'core');
98
\OCP\Util::addScript('settings', 'legacy-admin');
10-
119
?>
1210

1311
<div id="app-navigation">

0 commit comments

Comments
 (0)