1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00

Added initial settings interface, Fixes #9.

This commit is contained in:
Dan Brown
2015-08-30 15:31:16 +01:00
parent 8af012bc2a
commit 17f4aa4300
17 changed files with 275 additions and 35 deletions

View File

@@ -10,7 +10,7 @@
color: #222;
width: 250px;
max-width: 100%;
-webkit-appearance:none;
//-webkit-appearance:none;
&.neg, &.invalid {
border: 1px solid $negative;
}
@@ -25,9 +25,10 @@
label {
display: block;
line-height: 1.4em;
font-size: 0.9em;
font-size: 0.94em;
font-weight: 500;
color: #333;
color: #666;
padding-bottom: 2px;
}
label.radio, label.checkbox {

View File

@@ -485,4 +485,19 @@ body.dragging, body.dragging * {
background-color: $negative;
color: #EEE;
}
}
.setting-nav {
margin-top: $-l;
border-top: 1px solid #DDD;
border-bottom: 1px solid #DDD;
a {
padding: $-m;
display: inline-block;
//color: #666;
&.selected {
//color: $primary;
background-color: #f8f8f8;
}
}
}

View File

@@ -54,7 +54,7 @@
<header>
<div class="padded row clearfix">
<div class="col-md-12 logo-container">
<a href="/" class="logo">BookStack</a>
<a href="/" class="logo">{{ Setting::get('app-name', 'BookStack') }}</a>
<div class="user-overview">
<img class="avatar" src="{{Auth::user()->getAvatar(50)}}" alt="{{ Auth::user()->name }}">
<span class="user-name">

View File

@@ -78,8 +78,6 @@
</div>
<script>
$(function() {

View File

@@ -0,0 +1,23 @@
@extends('base')
@section('content')
@include('settings/navbar', ['selected' => 'settings'])
<div class="page-content">
<h1>Settings</h1>
<form action="/settings" method="POST">
{!! csrf_field() !!}
<div class="form-group">
<label for="setting-app-name">Application Name</label>
<input type="text" value="{{ Setting::get('app-name') }}" name="setting-app-name" id="setting-app-name">
</div>
<div class="form-group">
<button type="submit" class="button pos">Update Settings</button>
</div>
</form>
</div>
@stop

View File

@@ -0,0 +1,6 @@
<div class="row">
<div class="col-md-6 col-md-offset-3 setting-nav">
<a href="/settings" @if($selected == 'settings') class="selected" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
<a href="/users" @if($selected == 'users') class="selected" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
</div>
</div>

View File

@@ -17,7 +17,7 @@
<div class="row">
<div class="col-md-6">
<h1>Edit User</h1>
<h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
<form action="/users/{{$user->id}}" method="post">
{!! csrf_field() !!}
<input type="hidden" name="_method" value="put">

View File

@@ -3,21 +3,15 @@
@section('content')
<div class="row faded-small">
<div class="col-md-6"></div>
<div class="col-md-6 faded">
<div class="action-buttons">
@if($currentUser->can('user-create'))
<a href="/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>New User</a>
@endif
</div>
</div>
</div>
@include('settings/navbar', ['selected' => 'users'])
<div class="page-content">
<h1>Users</h1>
@if($currentUser->can('user-create'))
<p>
<a href="/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add New User</a>
</p>
@endif
<table class="table">
<tr>
<th></th>