v0.10.15q - Various fixes
This commit is contained in:
parent
c1972e70c8
commit
08362b24cb
skolehjem
app/Http/Controllers
database/seeds
public/css
resources
|
@ -15,7 +15,7 @@ class NewsController extends Controller
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->middleware([ "auth" ]);
|
$this->middleware([ "auth" ]);
|
||||||
$this->middleware(["lang"]);
|
$this->middleware([ "lang" ]);
|
||||||
|
|
||||||
$this->middleware([ "check.auth:news.list" ])->only("index");
|
$this->middleware([ "check.auth:news.list" ])->only("index");
|
||||||
$this->middleware([ "check.auth:news.show" ])->only("show");
|
$this->middleware([ "check.auth:news.show" ])->only("show");
|
||||||
|
|
|
@ -40,7 +40,6 @@ class RoleSeeder extends Seeder
|
||||||
//Bruger Permissions
|
//Bruger Permissions
|
||||||
$brugerPermissions = new Collection();
|
$brugerPermissions = new Collection();
|
||||||
|
|
||||||
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.list")->first());
|
|
||||||
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "link.external.list")->first());
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "link.external.list")->first());
|
||||||
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "contact.list")->first());
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "contact.list")->first());
|
||||||
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "feedback.create")->first());
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "feedback.create")->first());
|
||||||
|
@ -49,6 +48,12 @@ class RoleSeeder extends Seeder
|
||||||
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.delete")->first());
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.delete")->first());
|
||||||
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.list")->first());
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.list")->first());
|
||||||
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "ownuser.edit")->first());
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "ownuser.edit")->first());
|
||||||
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.list")->first());
|
||||||
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.show")->first());
|
||||||
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "guides.list")->first());
|
||||||
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "guides.show")->first());
|
||||||
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "news.list")->first());
|
||||||
|
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "news.show")->first());
|
||||||
|
|
||||||
//Give permissions to Bruger (id: 2)
|
//Give permissions to Bruger (id: 2)
|
||||||
foreach ($brugerPermissions as $permission) {
|
foreach ($brugerPermissions as $permission) {
|
||||||
|
|
|
@ -6658,6 +6658,11 @@ main {
|
||||||
margin: 0.25rem 0rem;
|
margin: 0.25rem 0rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fa-arrow-right:before,
|
||||||
|
.fa-arrow-left:before {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 900px) {
|
@media only screen and (max-width: 900px) {
|
||||||
main {
|
main {
|
||||||
max-width: 460px;
|
max-width: 460px;
|
||||||
|
|
|
@ -6658,6 +6658,11 @@ main {
|
||||||
margin: 0.25rem 0rem;
|
margin: 0.25rem 0rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fa-arrow-right:before,
|
||||||
|
.fa-arrow-left:before {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 900px) {
|
@media only screen and (max-width: 900px) {
|
||||||
main {
|
main {
|
||||||
max-width: 460px;
|
max-width: 460px;
|
||||||
|
|
|
@ -15,6 +15,10 @@ main {
|
||||||
margin: 0.25rem 0rem;
|
margin: 0.25rem 0rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fa-arrow-right:before, .fa-arrow-left:before {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
// Mobile
|
// Mobile
|
||||||
@media only screen
|
@media only screen
|
||||||
and (max-width : 900px)
|
and (max-width : 900px)
|
||||||
|
|
|
@ -421,6 +421,8 @@
|
||||||
|
|
||||||
//The offset from the current week
|
//The offset from the current week
|
||||||
let weekOffset = 0;
|
let weekOffset = 0;
|
||||||
|
var styleElem = document.head.appendChild(document.createElement("style"));
|
||||||
|
styleElem.innerHTML = "#week-previous:before {color: unset;}";
|
||||||
|
|
||||||
//Generate calender and set onclick function on the week changing arrows
|
//Generate calender and set onclick function on the week changing arrows
|
||||||
if(document.getElementById("calendar")) {
|
if(document.getElementById("calendar")) {
|
||||||
|
@ -430,11 +432,18 @@
|
||||||
if(weekOffset > 0)
|
if(weekOffset > 0)
|
||||||
{
|
{
|
||||||
weekOffset--;
|
weekOffset--;
|
||||||
|
if(weekOffset == 0){
|
||||||
|
styleElem.innerHTML = "#week-previous:before {color: unset;}";
|
||||||
|
}
|
||||||
generateCalendar(weekOffset);
|
generateCalendar(weekOffset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
document.getElementById("week-next").onclick = function () {
|
document.getElementById("week-next").onclick = function () {
|
||||||
|
if(weekOffset == 0)
|
||||||
|
{
|
||||||
|
styleElem.innerHTML = "#week-previous:before {color: black;}";
|
||||||
|
}
|
||||||
weekOffset++;
|
weekOffset++;
|
||||||
generateCalendar(weekOffset);
|
generateCalendar(weekOffset);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue