@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Update Settings to use TwoColumn fixed layout
Summary: Simplifies the page, adds base support for PHUITwoColumn fixed from Instances (which I'll delete css there).
Test Plan:
click on every settings page, UI seems in tact, check mobile, desktop, mobile menus.
{F5102572}
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D18436
+65
-15
+3
-3
resources/celerity/map.php
+3
-3
resources/celerity/map.php
···
9
9
'names' => array(
10
10
'conpherence.pkg.css' => 'e68cf1fa',
11
11
'conpherence.pkg.js' => 'b5b51108',
12
-
'core.pkg.css' => 'dd8bcea0',
12
+
'core.pkg.css' => 'cf953851',
13
13
'core.pkg.js' => '5d80e0db',
14
14
'darkconsole.pkg.js' => '1f9a31bc',
15
15
'differential.pkg.css' => '45951e9e',
···
178
178
'rsrc/css/phui/phui-status.css' => 'd5263e49',
179
179
'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
180
180
'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca',
181
-
'rsrc/css/phui/phui-two-column-view.css' => '81b0f3ce',
181
+
'rsrc/css/phui/phui-two-column-view.css' => '76dcd3d4',
182
182
'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
183
183
'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
184
184
'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
···
874
874
'phui-tag-view-css' => 'b4719c50',
875
875
'phui-theme-css' => '9f261c6b',
876
876
'phui-timeline-view-css' => 'f21db7ca',
877
-
'phui-two-column-view-css' => '81b0f3ce',
877
+
'phui-two-column-view-css' => '76dcd3d4',
878
878
'phui-workboard-color-css' => '783cdff5',
879
879
'phui-workboard-view-css' => '3bc85455',
880
880
'phui-workcard-view-css' => 'cca5fa92',
+4
-4
src/applications/settings/controller/PhabricatorSettingsMainController.php
+4
-4
src/applications/settings/controller/PhabricatorSettingsMainController.php
···
121
121
}
122
122
123
123
$header = id(new PHUIHeaderView())
124
-
->setHeader($header_text)
125
-
->setHeaderIcon('fa-pencil');
124
+
->setHeader($header_text);
126
125
127
126
$title = $panel->getPanelName();
128
127
129
128
$view = id(new PHUITwoColumnView())
130
129
->setHeader($header)
131
-
->setFooter($response);
130
+
->setFixed(true)
131
+
->setNavigation($nav)
132
+
->setMainColumn($response);
132
133
133
134
return $this->newPage()
134
135
->setTitle($title)
135
-
->setNavigation($nav)
136
136
->setCrumbs($crumbs)
137
137
->appendChild($view);
138
138
+1
-1
src/applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php
+1
-1
src/applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php
+6
-7
src/applications/transactions/editengine/PhabricatorEditEngine.php
+6
-7
src/applications/transactions/editengine/PhabricatorEditEngine.php
···
1141
1141
1142
1142
if ($this->getIsCreate()) {
1143
1143
$header_text = $this->getFormHeaderText($object);
1144
-
$header_icon = 'fa-plus-square';
1145
1144
} else {
1146
1145
$header_text = $this->getObjectEditTitleText($object);
1147
-
$header_icon = 'fa-pencil';
1148
1146
}
1149
1147
1150
1148
$show_preview = !$request->isAjax();
···
1185
1183
$crumbs = $this->buildCrumbs($object, $final = true);
1186
1184
1187
1185
$header = id(new PHUIHeaderView())
1188
-
->setHeader($header_text)
1189
-
->setHeaderIcon($header_icon);
1186
+
->setHeader($header_text);
1190
1187
$crumbs->setBorder(true);
1191
1188
1192
1189
if ($action_button) {
···
1215
1212
if ($header) {
1216
1213
$view->setHeader($header);
1217
1214
}
1218
-
1219
-
$view->setFooter($content);
1220
1215
1221
1216
$page = $controller->newPage()
1222
1217
->setTitle($header_text)
···
1225
1220
1226
1221
$navigation = $this->getNavigation();
1227
1222
if ($navigation) {
1228
-
$page->setNavigation($navigation);
1223
+
$view->setFixed(true);
1224
+
$view->setNavigation($navigation);
1225
+
$view->setMainColumn($content);
1226
+
} else {
1227
+
$view->setFooter($content);
1229
1228
}
1230
1229
1231
1230
return $page;
+51
webroot/rsrc/css/phui/phui-two-column-view.css
+51
webroot/rsrc/css/phui/phui-two-column-view.css
···
244
244
.phui-document-view {
245
245
margin: 0 0 20px 0;
246
246
}
247
+
248
+
/*- Fixed Styles with Navigation -------------------------------------------- */
249
+
250
+
.phui-two-column-fixed.phui-two-column-view .phui-two-column-header {
251
+
background: transparent;
252
+
border: none;
253
+
margin-bottom: 0;
254
+
}
255
+
256
+
.phui-two-column-fixed.phui-two-column-view .phui-side-column
257
+
.phui-box-border {
258
+
background: transparent;
259
+
border: none;
260
+
padding: 0;
261
+
width: 180px;
262
+
}
263
+
264
+
.device-desktop
265
+
.phui-two-column-fixed.phui-two-column-view.phui-side-column-left
266
+
.phui-side-column {
267
+
width: 200px;
268
+
}
269
+
270
+
.device-desktop
271
+
.phui-two-column-fixed.phui-two-column-view.phui-side-column-left
272
+
.phui-main-column {
273
+
width: calc(100% - 200px)
274
+
}
275
+
276
+
.phui-two-column-fixed.phui-two-column-view .phui-basic-nav
277
+
.phabricator-side-menu {
278
+
background: transparent;
279
+
}
280
+
281
+
.phui-two-column-fixed.phui-two-column-view
282
+
.phui-basic-nav .phabricator-side-menu .phui-list-item-selected {
283
+
border-radius: 3px;
284
+
background-color: #f5f9ff;
285
+
border: 1px solid {$sky};
286
+
padding-left: 3px;
287
+
}
288
+
289
+
.phui-two-column-fixed.phui-two-column-view .phui-basic-nav
290
+
.phabricator-side-menu .phui-list-item-href {
291
+
border-radius: 3px;
292
+
}
293
+
294
+
.phui-two-column-fixed.phui-two-column-view .phui-header-action-links
295
+
.phui-mobile-menu {
296
+
display: block;
297
+
}