Make it easier to switch between v1/v2 layout.

This commit is contained in:
James Cole
2021-01-31 20:35:54 +01:00
parent fd8a59924d
commit ffe18c63a5
88 changed files with 176 additions and 176 deletions

View File

@@ -74,7 +74,7 @@ class ConfigurationController extends Controller
$isDemoSite = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$siteOwner = config('firefly.site_owner');
return view(
return prefixView(
'admin.configuration.index',
compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
);

View File

@@ -66,7 +66,7 @@ class HomeController extends Controller
}
Log::debug('Email is ', [$email]);
return view('admin.index', compact('title', 'mainTitleIcon','email'));
return prefixView('admin.index', compact('title', 'mainTitleIcon','email'));
}
/**

View File

@@ -80,7 +80,7 @@ class LinkController extends Controller
$this->rememberPreviousUri('link-types.create.uri');
}
return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
return prefixView('admin.link.create', compact('subTitle', 'subTitleIcon'));
}
/**
@@ -116,7 +116,7 @@ class LinkController extends Controller
// put previous url in session
$this->rememberPreviousUri('link-types.delete.uri');
return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
return prefixView('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
}
/**
@@ -166,7 +166,7 @@ class LinkController extends Controller
}
$request->session()->forget('link-types.edit.fromUpdate');
return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
return prefixView('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
}
/**
@@ -187,7 +187,7 @@ class LinkController extends Controller
}
);
return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
return prefixView('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
}
/**
@@ -205,7 +205,7 @@ class LinkController extends Controller
Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id));
return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
return prefixView('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
}
/**

View File

@@ -106,7 +106,7 @@ class TelemetryController extends Controller
$count = $this->repository->count();
return view('admin.telemetry.index', compact('version', 'enabled', 'count'));
return prefixView('admin.telemetry.index', compact('version', 'enabled', 'count'));
}
/**
@@ -120,6 +120,6 @@ class TelemetryController extends Controller
$size = 100;
$records = $this->repository->paginated($size);
return view('admin.telemetry.view', compact('records', 'format'));
return prefixView('admin.telemetry.view', compact('records', 'format'));
}
}

View File

@@ -85,7 +85,7 @@ class UpdateController extends Controller
'alpha' => (string) trans('firefly.update_channel_alpha'),
];
return view('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
return prefixView('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
}
/**

View File

@@ -75,7 +75,7 @@ class UserController extends Controller
$subTitle = (string) trans('firefly.delete_user', ['email' => $user->email]);
return view('admin.users.delete', compact('user', 'subTitle'));
return prefixView('admin.users.delete', compact('user', 'subTitle'));
}
/**
@@ -128,7 +128,7 @@ class UserController extends Controller
'email_changed' => (string) trans('firefly.block_code_email_changed'),
];
return view('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
return prefixView('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
}
/**
@@ -150,7 +150,7 @@ class UserController extends Controller
}
);
return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
return prefixView('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
}
/**
@@ -168,7 +168,7 @@ class UserController extends Controller
$subTitleIcon = 'fa-user';
$information = $this->repository->getUserData($user);
return view(
return prefixView(
'admin.users.show',
compact(
'title',