ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
feat(manifest): wizard summary, Settings section, project status strip (Phase 5 frontend)
Juan Denis57ca8617dadb
diff --git a/frontend/src/components/service-detail/SettingsTab.jsx b/frontend/src/components/service-detail/SettingsTab.jsxindex a5f4965a..851c3863 100644--- a/frontend/src/components/service-detail/SettingsTab.jsx+++ b/frontend/src/components/service-detail/SettingsTab.jsx@@ -71,6 +71,7 @@ function buildSettingsGroups(app) {items: [{ id: 'git', label: 'Git & Deploy', icon: GitBranch },{ id: 'build', label: 'Build', icon: Hammer },+ { id: 'manifest', label: 'Manifest', icon: Zap },],},...((isDocker || isPython) ? [{@@ -370,6 +371,16 @@ const SettingsTab = ({ app, deployConfig, domains, primaryDomain, onUpdate }) =></div>)}+ {/* Manifest — declarative serverkit.yaml: shows manifest status+ when the app's project is manifest-managed, plus scaffold /+ plan / apply actions. */}+ {section === 'manifest' && (+ <div className="svc-settings__section">+ <h3 className="svc-settings__section-title">Manifest</h3>+ <ManifestSection app={app} />+ </div>+ )}+{/* WAF (Docker + Python) — per-app ModSecurity policy + matches. */}{section === 'waf' && (<div className="svc-settings__section">@@ -765,4 +776,217 @@ const DomainSslPanel = ({ app, domains, primaryDomain, onUpdate }) => {);};+// Manifest panel for a service. When the app belongs to a manifest-managed+// project it shows the current manifest status; either way it exposes the+// scaffold / plan / apply actions for the declarative serverkit.yaml workflow.+const ManifestSection = ({ app }) => {+ const toast = useToast();+ const projectId = app.project_id;+ const [manifest, setManifest] = useState(null);+ const [loading, setLoading] = useState(Boolean(projectId));+ const [scaffold, setScaffold] = useState(null);+ const [scaffolding, setScaffolding] = useState(false);+ const [plan, setPlan] = useState(null);+ const [planning, setPlanning] = useState(false);+ const [applyResult, setApplyResult] = useState(null);+ const [applying, setApplying] = useState(false);++ useEffect(() => {+ if (!projectId) { setLoading(false); return; }+ let cancelled = false;+ (async () => {+ setLoading(true);+ try {+ const res = await api.getManifest(projectId);+ if (!cancelled) setManifest(res?.manifest || null);+ } catch (err) {+ if (!cancelled) setManifest(null);+ } finally {+ if (!cancelled) setLoading(false);+ }+ })();+ return () => { cancelled = true; };+ }, [projectId]);++ const statusLabels = {+ applied: 'Applied',+ pending: 'Pending',+ drifted: 'Drifted',+ error: 'Error',+ };++ async function handleScaffold() {+ setScaffolding(true);+ try {+ const res = await api.scaffoldManifest(app.id);+ const yaml = res?.yaml || res?.manifest || '';+ setScaffold(yaml);+ } catch (err) {+ toast.error(err.message || 'Failed to generate scaffold');+ } finally {+ setScaffolding(false);+ }+ }++ function handleDownloadScaffold() {+ if (!scaffold) return;+ const blob = new Blob([scaffold], { type: 'text/yaml' });+ const url = URL.createObjectURL(blob);+ const link = document.createElement('a');+ link.href = url;+ link.download = 'serverkit.yaml';+ document.body.appendChild(link);+ link.click();+ document.body.removeChild(link);+ URL.revokeObjectURL(url);+ }++ async function handlePlan() {+ if (!projectId) return;+ setPlanning(true);+ setApplyResult(null);+ try {+ const res = await api.planManifest(projectId, {});+ setPlan(res?.plan || null);+ } catch (err) {+ toast.error(err.message || 'Failed to plan manifest');+ } finally {+ setPlanning(false);+ }+ }++ async function handleApply() {+ if (!projectId) return;+ if (!window.confirm('Apply the manifest to this project? This will create or update services to match serverkit.yaml.')) return;+ setApplying(true);+ try {+ const res = await api.applyManifest(projectId, {});+ setApplyResult(res || null);+ if (res?.success) {+ toast.success(`Applied ${res.applied ?? 0} change(s)`);+ const refreshed = await api.getManifest(projectId).catch(() => null);+ setManifest(refreshed?.manifest || manifest);+ } else {+ toast.error('Apply finished with errors');+ }+ } catch (err) {+ toast.error(err.message || 'Failed to apply manifest');+ } finally {+ setApplying(false);+ }+ }++ if (loading) {+ return <div className="card settings-section"><p className="hint">Loading manifest…</p></div>;+ }++ const source = manifest?.source || {};+ const shortCommit = source.commit ? String(source.commit).slice(0, 7) : null;++ return (+ <div className="card settings-section svc-manifest">+ {manifest ? (+ <div className="svc-manifest__status">+ <span className="svc-manifest__badge">+ <Zap size={13} />+ Managed by manifest+ </span>+ <span className={`svc-manifest__pill svc-manifest__pill--${manifest.status || 'pending'}`}>+ {statusLabels[manifest.status] || manifest.status || 'Pending'}+ </span>+ {(source.repo || shortCommit) && (+ <span className="svc-manifest__source mono">+ {source.repo || ''}{source.repo && shortCommit ? '@' : ''}{shortCommit || ''}+ </span>+ )}+ </div>+ ) : (+ <div className="svc-manifest__empty">+ <p className="hint">+ This project is not managed by a <code>serverkit.yaml</code> manifest. A manifest lets you+ declare services, domains, databases and environment requirements in one file so ServerKit+ can create and reconcile them for you.+ </p>+ <p className="hint">+ <Link to="/docs/SERVERKIT_YAML.md">Learn about serverkit.yaml</Link>+ </p>+ </div>+ )}++ <div className="svc-manifest__actions">+ <Button variant="outline" onClick={handleScaffold} disabled={scaffolding}>+ {scaffolding ? 'Generating…' : 'Download scaffold'}+ </Button>+ {projectId && (+ <>+ <Button variant="outline" onClick={handlePlan} disabled={planning}>+ {planning ? 'Planning…' : 'Plan'}+ </Button>+ <Button onClick={handleApply} disabled={applying}>+ {applying ? 'Applying…' : 'Apply'}+ </Button>+ </>+ )}+ </div>++ {scaffold && (+ <div className="svc-manifest__block">+ <div className="svc-manifest__block-head">+ <h4 className="svc-manifest__block-title">Scaffolded serverkit.yaml</h4>+ <Button variant="outline" className="btn-icon" onClick={handleDownloadScaffold}>Download</Button>+ </div>+ <pre className="svc-manifest__pre">{scaffold}</pre>+ </div>+ )}++ {plan && (+ <div className="svc-manifest__block">+ <h4 className="svc-manifest__block-title">Plan ({plan.step_count ?? (plan.steps || []).length} step(s))</h4>+ {plan.summary && <p className="hint">{plan.summary}</p>}+ {(plan.steps || []).length > 0 && (+ <ul className="svc-manifest__steps">+ {plan.steps.map((step, i) => (+ <li key={`${step.type}-${step.service}-${i}`}>+ <span className="svc-manifest__step-type">{step.type}</span>+ {step.service && <span className="svc-manifest__step-service mono">{step.service}</span>}+ <span className="svc-manifest__step-desc">{step.description}</span>+ </li>+ ))}+ </ul>+ )}+ {(plan.issues || []).length > 0 && (+ <ul className="svc-manifest__issues">+ {plan.issues.map((issue, i) => (+ <li key={`${issue.service}-${issue.key}-${i}`}>+ {issue.service ? `${issue.service}.` : ''}{issue.key} — {issue.kind}+ {issue.secret ? ' (secret)' : ''}+ </li>+ ))}+ </ul>+ )}+ </div>+ )}++ {applyResult && (+ <div className="svc-manifest__block">+ <h4 className="svc-manifest__block-title">+ Apply result — {applyResult.applied ?? 0} applied+ </h4>+ {(applyResult.results || []).length > 0 && (+ <ul className="svc-manifest__steps">+ {applyResult.results.map((res, i) => (+ <li key={`${res.type}-${res.service}-${i}`}>+ <span className={`svc-manifest__step-type ${res.status === 'error' ? 'is-error' : ''}`}>{res.status}</span>+ {res.service && <span className="svc-manifest__step-service mono">{res.service}</span>}+ {res.error && <span className="svc-manifest__step-desc">{res.error}</span>}+ </li>+ ))}+ </ul>+ )}+ </div>+ )}+ </div>+ );+};+export default SettingsTab;diff --git a/frontend/src/pages/NewService.jsx b/frontend/src/pages/NewService.jsxindex a5a7b7ba..6014cc41 100644--- a/frontend/src/pages/NewService.jsx+++ b/frontend/src/pages/NewService.jsx@@ -4,9 +4,11 @@ import {ArrowRight,CheckCircle2,ChevronDown,+ Database,FileArchive,FolderOpen,GitBranch,+ Globe,Link2,Lock,Network,@@ -938,39 +940,104 @@ const NewService = () => {<strong>{repoManifestLoading ? 'Inspecting' : activeManifest?.strategy?.replace('_', ' ') || 'Detected'}</strong></div>{!repoManifestLoading && activeManifest && (- <>- <div className="new-service-page__manifest-grid">- <div>- <span>Type</span>- <strong>{formatAppType(recommended.app_type)}</strong>- </div>- <div>- <span>Build</span>- <strong>{formatBuildMethod(recommended.build_method)}</strong>- </div>- <div>- <span>Port</span>- <strong>{recommended.port || 'Auto'}</strong>+ activeManifest.manifest_v1 ? (+ <div className="new-service-page__manifest-v1">+ <div className="new-service-page__manifest-services">+ {(activeManifest.manifest_v1.services || []).map(svc => (+ <div key={svc.name} className="new-service-page__manifest-service">+ <span className="new-service-page__manifest-service-name">{svc.name}</span>+ {(svc.type || svc.kind) && (+ <span className="new-service-page__manifest-badge">{svc.type || svc.kind}</span>+ )}+ {svc.port ? <span className="new-service-page__manifest-port">:{svc.port}</span> : null}+ {svc.auto_deploy && (+ <span className="new-service-page__manifest-chip">auto-deploy</span>+ )}+ </div>+ ))}</div>+ {(activeManifest.manifest_v1.databases || []).length > 0 && (+ <div className="new-service-page__manifest-row">+ <span className="new-service-page__manifest-row-label">+ <Database size={13} />+ Databases+ </span>+ <div className="new-service-page__manifest-tags">+ {activeManifest.manifest_v1.databases.map(db => (+ <span key={db}>{db}</span>+ ))}+ </div>+ </div>+ )}+ {(activeManifest.manifest_v1.domains || []).length > 0 && (+ <div className="new-service-page__manifest-row">+ <span className="new-service-page__manifest-row-label">+ <Globe size={13} />+ Domains+ </span>+ <div className="new-service-page__manifest-tags">+ {activeManifest.manifest_v1.domains.map(domain => (+ <span key={domain.host}>+ {domain.host}{domain.ssl ? ' · SSL' : ''}+ </span>+ ))}+ </div>+ </div>+ )}+ {(activeManifest.manifest_v1.env_required || []).length > 0 && (+ <div className="new-service-page__manifest-row">+ <span className="new-service-page__manifest-row-label">+ <Lock size={13} />+ Env requirements+ </span>+ <div className="new-service-page__env-preview">+ {activeManifest.manifest_v1.env_required.map(env => (+ <span+ key={`${env.service || ''}.${env.key}`}+ className={env.source === 'secret' ? 'new-service-page__env-preview-secret' : ''}+ >+ {env.service ? `${env.service}.` : ''}{env.key}+ </span>+ ))}+ </div>+ </div>+ )}</div>- <div className="new-service-page__manifest-files">- {(activeManifest.manifests || []).slice(0, 5).map(manifest => (- <span key={manifest.file}>- <CheckCircle2 size={13} />- {manifest.file}- </span>- ))}- </div>- {(activeManifest.env || []).length > 0 && (- <div className="new-service-page__env-preview">- {(activeManifest.env || []).slice(0, 6).map(env => (- <span key={env.key} className={env.secret ? 'new-service-page__env-preview-secret' : ''}>- {env.key}+ ) : (+ <>+ <div className="new-service-page__manifest-grid">+ <div>+ <span>Type</span>+ <strong>{formatAppType(recommended.app_type)}</strong>+ </div>+ <div>+ <span>Build</span>+ <strong>{formatBuildMethod(recommended.build_method)}</strong>+ </div>+ <div>+ <span>Port</span>+ <strong>{recommended.port || 'Auto'}</strong>+ </div>+ </div>+ <div className="new-service-page__manifest-files">+ {(activeManifest.manifests || []).slice(0, 5).map(manifest => (+ <span key={manifest.file}>+ <CheckCircle2 size={13} />+ {manifest.file}</span>))}</div>- )}- </>+ {(activeManifest.env || []).length > 0 && (+ <div className="new-service-page__env-preview">+ {(activeManifest.env || []).slice(0, 6).map(env => (+ <span key={env.key} className={env.secret ? 'new-service-page__env-preview-secret' : ''}>+ {env.key}+ </span>+ ))}+ </div>+ )}+ </>+ ))}</div>)}diff --git a/frontend/src/pages/ProjectDetail.jsx b/frontend/src/pages/ProjectDetail.jsxindex eec92e1d..b32e2c69 100644--- a/frontend/src/pages/ProjectDetail.jsx+++ b/frontend/src/pages/ProjectDetail.jsx@@ -40,14 +40,17 @@ const ProjectDetail = () => {const [error, setError] = useState(null);const [showCreateEnv, setShowCreateEnv] = useState(false);const [deleteEnv, setDeleteEnv] = useState(null);+ const [manifest, setManifest] = useState(null);const loadProject = useCallback(async () => {setLoading(true);try {- const [projectData, appsData] = await Promise.all([+ const [projectData, appsData, manifestData] = await Promise.all([api.getProject(id),api.getApps(),+ api.getManifest(id).catch(() => null),]);+ setManifest(manifestData?.manifest || null);const p = projectData?.project || null;setProject(p);const envs = Array.isArray(p?.environments) ? p.environments : [];@@ -151,6 +154,25 @@ const ProjectDetail = () => {<p className="project-detail-page__description">{project.description}</p>)}+ {manifest && (() => {+ const src = manifest.source || {};+ const commit = src.commit ? String(src.commit).slice(0, 7) : null;+ const status = manifest.status || 'pending';+ return (+ <div className="project-manifest-strip">+ <span className="project-manifest-strip__label">Manifest</span>+ <span className={`project-manifest-strip__pill project-manifest-strip__pill--${status}`}>+ {status}+ </span>+ {(src.repo || commit) && (+ <span className="project-manifest-strip__source">+ {src.repo || ''}{src.repo && commit ? '@' : ''}{commit || ''}+ </span>+ )}+ </div>+ );+ })()}+<div className="project-env-tabs" role="tablist" aria-label="Environments">{environments.map((env, index) => (<divdiff --git a/frontend/src/services/api/index.js b/frontend/src/services/api/index.jsindex 9292e15e..57feb3f2 100644--- a/frontend/src/services/api/index.js+++ b/frontend/src/services/api/index.js@@ -39,6 +39,7 @@ import * as importMethods from './imports.js';import * as doctorMethods from './doctor.js';import * as bandwidthMethods from './bandwidth.js';import * as htaccessToolMethods from './htaccessTools.js';+import * as manifestMethods from './manifests.js';class ApiService extends ApiClient {constructor() {@@ -85,6 +86,7 @@ class ApiService extends ApiClient {doctorMethods,bandwidthMethods,htaccessToolMethods,+ manifestMethods,];for (const mod of modules) {for (const [key, fn] of Object.entries(mod)) {diff --git a/frontend/src/services/api/manifests.js b/frontend/src/services/api/manifests.jsnew file mode 100644index 00000000..66026df1--- /dev/null+++ b/frontend/src/services/api/manifests.js@@ -0,0 +1,24 @@+// Declarative serverkit.yaml manifests (plan/apply/scaffold).+// Mounted by the backend at /api/v1/manifests.++export async function getManifest(projectId) {+ return this.request(`/manifests?project_id=${projectId}`);+}++export async function planManifest(projectId, body = {}) {+ return this.request('/manifests/plan', {+ method: 'POST',+ body: { project_id: projectId, ...body },+ });+}++export async function applyManifest(projectId, body = {}) {+ return this.request('/manifests/apply', {+ method: 'POST',+ body: { project_id: projectId, ...body },+ });+}++export async function scaffoldManifest(appId) {+ return this.request(`/manifests/scaffold?app_id=${appId}`);+}diff --git a/frontend/src/styles/pages/_new-service.scss b/frontend/src/styles/pages/_new-service.scssindex 2ea2babd..8eeb8390 100644--- a/frontend/src/styles/pages/_new-service.scss+++ b/frontend/src/styles/pages/_new-service.scss@@ -779,6 +779,107 @@color: $warning !important;}+ &__manifest-v1 {+ display: grid;+ gap: $space-3;+ }++ &__manifest-services {+ display: grid;+ gap: $space-2;+ }++ &__manifest-service {+ display: flex;+ align-items: center;+ gap: $space-2;+ flex-wrap: wrap;+ min-height: 32px;+ padding: $space-2 $space-3;+ background: $bg-card;+ border: 1px solid $border-subtle;+ border-radius: $radius-sm;+ }++ &__manifest-service-name {+ color: $text-primary;+ font-size: $font-size-sm;+ font-weight: $font-weight-semibold;+ overflow-wrap: anywhere;+ }++ &__manifest-badge {+ display: inline-flex;+ align-items: center;+ min-height: 20px;+ padding: 0 $space-2;+ background: rgba(99, 102, 241, 0.12);+ border-radius: $radius-full;+ color: $accent-primary;+ font-size: $font-size-xs;+ font-weight: $font-weight-medium;+ text-transform: capitalize;+ }++ &__manifest-port {+ color: $text-tertiary;+ font-size: $font-size-xs;+ font-family: $font-mono;+ }++ &__manifest-chip {+ display: inline-flex;+ align-items: center;+ min-height: 20px;+ padding: 0 $space-2;+ margin-left: auto;+ background: rgba(16, 185, 129, 0.1);+ border-radius: $radius-full;+ color: $success;+ font-size: $font-size-xs;+ font-weight: $font-weight-medium;+ }++ &__manifest-row {+ display: grid;+ gap: $space-2;+ }++ &__manifest-row-label {+ display: flex;+ align-items: center;+ gap: $space-2;+ color: $text-tertiary;+ font-size: $font-size-xs;+ font-weight: $font-weight-medium;+ text-transform: uppercase;+ letter-spacing: 0.03em;++ svg {+ color: $accent-primary;+ }+ }++ &__manifest-tags {+ display: flex;+ align-items: center;+ gap: $space-2;+ flex-wrap: wrap;++ span {+ display: inline-flex;+ align-items: center;+ min-height: 24px;+ padding: 0 $space-2;+ background: $bg-card;+ border: 1px solid $border-subtle;+ border-radius: $radius-full;+ color: $text-secondary;+ font-size: $font-size-xs;+ overflow-wrap: anywhere;+ }+ }+&__advanced-toggle {display: flex;align-items: center;diff --git a/frontend/src/styles/pages/_projects.scss b/frontend/src/styles/pages/_projects.scssindex 6204e091..e4584c8b 100644--- a/frontend/src/styles/pages/_projects.scss+++ b/frontend/src/styles/pages/_projects.scss@@ -158,6 +158,52 @@}}+// Compact manifest status strip — only rendered when the project is managed by+// a serverkit.yaml manifest.+.project-manifest-strip {+ display: flex;+ align-items: center;+ gap: $space-3;+ flex-wrap: wrap;+ padding: $space-2 $space-3;+ background: $bg-elevated;+ border: 1px solid $border-subtle;+ border-radius: $radius-md;++ &__label {+ color: $text-secondary;+ font-size: $font-size-xs;+ font-weight: $font-weight-semibold;+ text-transform: uppercase;+ letter-spacing: 0.06em;+ }++ &__pill {+ display: inline-flex;+ align-items: center;+ min-height: 20px;+ padding: 0 10px;+ border-radius: $radius-full;+ font-size: $font-size-xs;+ font-weight: $font-weight-semibold;+ text-transform: capitalize;+ background: $bg-card;+ color: $text-secondary;++ &--applied { background: rgba(61, 220, 151, 0.14); color: $success; }+ &--pending { background: rgba(245, 185, 69, 0.14); color: $warning; }+ &--drifted,+ &--error { background: rgba(251, 111, 111, 0.14); color: $danger; }+ }++ &__source {+ color: $text-tertiary;+ font-size: $font-size-xs;+ font-family: $font-mono;+ overflow-wrap: anywhere;+ }+}+.project-env-tabs {display: flex;flex-wrap: wrap;diff --git a/frontend/src/styles/pages/_service-detail.scss b/frontend/src/styles/pages/_service-detail.scssindex 51ef37f5..5ce4c5cd 100644--- a/frontend/src/styles/pages/_service-detail.scss+++ b/frontend/src/styles/pages/_service-detail.scss@@ -837,6 +837,149 @@ h3.svc-eyebrow {min-width: auto !important;}+// ============================================+// MANIFEST PANEL (service settings → Manifest)+// Declarative serverkit.yaml status + scaffold / plan / apply actions.+// ============================================+.svc-manifest {+ display: flex;+ flex-direction: column;+ gap: $space-4;++ &__status {+ display: flex;+ align-items: center;+ gap: $space-3;+ flex-wrap: wrap;+ }++ &__badge {+ display: inline-flex;+ align-items: center;+ gap: 6px;+ color: var(--text-dim);+ font-size: 13px;+ font-weight: $font-weight-medium;++ svg { color: var(--accent-bright); }+ }++ &__pill {+ display: inline-flex;+ align-items: center;+ min-height: 22px;+ padding: 0 10px;+ border-radius: $radius-full;+ font-size: 11px;+ font-weight: $font-weight-semibold;+ text-transform: uppercase;+ letter-spacing: 0.04em;+ background: var(--surface-hover);+ color: var(--text-dim);++ &--applied { background: rgba(61, 220, 151, 0.14); color: $success; }+ &--pending { background: rgba(245, 185, 69, 0.14); color: $warning; }+ &--drifted,+ &--error { background: rgba(239, 68, 68, 0.14); color: $danger; }+ }++ &__source {+ color: var(--text-faint);+ font-size: 12px;+ overflow-wrap: anywhere;+ }++ &__empty {+ display: flex;+ flex-direction: column;+ gap: $space-2;++ .hint { margin: 0; }+ }++ &__actions {+ display: flex;+ align-items: center;+ gap: $space-2;+ flex-wrap: wrap;+ }++ &__block {+ padding-top: $space-3;+ border-top: 1px solid var(--border-soft);+ }++ &__block-head {+ display: flex;+ align-items: center;+ justify-content: space-between;+ gap: $space-3;+ }++ &__block-title {+ margin: 0 0 $space-2;+ font-family: var(--mono);+ font-size: 11px;+ font-weight: $font-weight-semibold;+ letter-spacing: 0.08em;+ text-transform: uppercase;+ color: var(--text-faint);+ }++ &__pre {+ max-height: 320px;+ margin: $space-2 0 0;+ padding: $space-3;+ overflow: auto;+ background: var(--surface-sunken, var(--surface-hover));+ border: 1px solid var(--border-soft);+ border-radius: 8px;+ font-family: var(--mono);+ font-size: 12px;+ line-height: 1.5;+ color: var(--text);+ }++ &__steps,+ &__issues {+ display: flex;+ flex-direction: column;+ gap: 6px;+ margin: $space-2 0 0;+ padding: 0;+ list-style: none;++ li {+ display: flex;+ align-items: center;+ gap: $space-2;+ flex-wrap: wrap;+ font-size: 13px;+ color: var(--text-dim);+ }+ }++ &__issues li { color: $warning; }++ &__step-type {+ display: inline-flex;+ align-items: center;+ min-height: 20px;+ padding: 0 8px;+ border-radius: $radius-full;+ background: var(--accent-bg);+ color: var(--accent-bright);+ font-size: 11px;+ font-weight: $font-weight-semibold;+ text-transform: capitalize;++ &.is-error { background: rgba(239, 68, 68, 0.14); color: $danger; }+ }++ &__step-service { color: var(--text); font-size: 12px; }+ &__step-desc { color: var(--text-dim); }+}+// ============================================// DOMAIN & SSL PANEL (service settings)// Mirrors the WordPress SiteSSLPanel layout so both detail pages feel the same.