Skip to content
This repository has been archived by the owner on Jan 10, 2020. It is now read-only.

Commit

Permalink
Bootstrap updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@mlantz
mlantz committed Apr 8, 2016
1 parent 980246e commit eed2d27
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 50 deletions.
4 changes: 2 additions & 2 deletions src/Bootstrap/resources/assets/sass/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ html, body {
width: 100%;
min-height: 100%;
overflow: hidden;
padding: 0;
padding: 0px !important;
}

/*
Expand Down Expand Up @@ -42,7 +42,7 @@ html, body {

@media (min-width: 768px) {
.main {
padding-right: 40px;
padding-right: 20px;
padding-left: 20px;
}
}
Expand Down
54 changes: 28 additions & 26 deletions src/Bootstrap/resources/views/admin/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,34 @@
</div>
</div>
<div class="row">
<form method="POST" action="/admin/users/{{ $user->id }}">
<input name="_method" type="hidden" value="PATCH">
{!! csrf_field() !!}

<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Email')
@input_maker_create('email', ['type' => 'string'], $user)
</div>

<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Name')
@input_maker_create('name', ['type' => 'string'], $user)
</div>

@include('user.meta')

<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Role')
@input_maker_create('roles', ['type' => 'relationship', 'model' => 'App\Repositories\Role\Role', 'label' => 'label'], $user)
</div>

<div class="col-md-12 raw-margin-top-24">
<a class="btn btn-default pull-left" href="{{ URL::previous() }}">Cancel</a>
<button class="btn btn-primary pull-right" type="submit">Save</button>
</div>
</form>
<div class="col-md-12">
<form method="POST" action="/admin/users/{{ $user->id }}">
<input name="_method" type="hidden" value="PATCH">
{!! csrf_field() !!}

<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Email')
@input_maker_create('email', ['type' => 'string'], $user)
</div>

<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Name')
@input_maker_create('name', ['type' => 'string'], $user)
</div>

@include('user.meta')

<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Role')
@input_maker_create('roles', ['type' => 'relationship', 'model' => 'App\Repositories\Role\Role', 'label' => 'label'], $user)
</div>

<div class="col-md-12 raw-margin-top-24">
<a class="btn btn-default pull-left" href="{{ URL::previous() }}">Cancel</a>
<button class="btn btn-primary pull-right" type="submit">Save</button>
</div>
</form>
</div>
</div>

@stop
46 changes: 24 additions & 22 deletions src/Bootstrap/resources/views/user/settings.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,36 @@
</div>
</div>
<div class="row">
<form method="POST" action="/user/settings">
{!! csrf_field() !!}
<div class="col-md-12">
<form method="POST" action="/user/settings">
{!! csrf_field() !!}

<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Email')
@input_maker_create('email', ['type' => 'string'], $user)
</div>
<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Email')
@input_maker_create('email', ['type' => 'string'], $user)
</div>

<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Name')
@input_maker_create('name', ['type' => 'string'], $user)
</div>
<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Name')
@input_maker_create('name', ['type' => 'string'], $user)
</div>

@include('user.meta')

@include('user.meta')
@if ($user->roles->first()->name === 'admin' || $user->id == 1)
<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Role')
@input_maker_create('roles', ['type' => 'relationship', 'model' => 'App\Repositories\Role\Role', 'label' => 'label', 'value' => 'name'], $user)
</div>
@endif

@if ($user->roles->first()->name === 'admin' || $user->id == 1)
<div class="col-md-12 raw-margin-top-24">
@input_maker_label('Role')
@input_maker_create('roles', ['type' => 'relationship', 'model' => 'App\Repositories\Role\Role', 'label' => 'label'], $user)
<a class="btn btn-default pull-left" href="{{ URL::previous() }}">Cancel</a>
<button class="btn btn-primary pull-right" type="submit">Save</button>
<a class="btn btn-info pull-right raw-margin-right-16" href="/user/password">Change Password</a><br>
</div>
@endif

<div class="col-md-12 raw-margin-top-24">
<a class="btn btn-default pull-left" href="{{ URL::previous() }}">Cancel</a>
<button class="btn btn-primary pull-right" type="submit">Save</button>
<a class="btn btn-info pull-right raw-margin-right-16" href="/user/password">Change Password</a><br>
</div>
</form>
</form>
</div>
</div>

@stop

0 comments on commit eed2d27

Please sign in to comment.