Browse Source

add header menu and more semantic-ui updates

pull/5/head
Aaron Parecki 9 years ago
parent
commit
f832313552
7 changed files with 34 additions and 33 deletions
  1. +7
    -1
      compass/app/Http/Controllers/Controller.php
  2. +2
    -2
      compass/public/assets/map.css
  3. +0
    -18
      compass/public/assets/styles.css
  4. +5
    -5
      compass/resources/views/index.blade.php
  5. +1
    -1
      compass/resources/views/map.blade.php
  6. +18
    -5
      compass/resources/views/partials/logged-in.blade.php
  7. +1
    -1
      compass/resources/views/settings.blade.php

+ 7
- 1
compass/app/Http/Controllers/Controller.php View File

@ -91,6 +91,9 @@ class Controller extends BaseController
return view('map', [
'displayURL' => self::displayURL(),
'database' => $db,
'menu' => [
'/settings/'.$name => 'Settings'
]
]);
}
@ -115,7 +118,10 @@ class Controller extends BaseController
return view('settings', [
'displayURL' => self::displayURL(),
'database' => $db,
'users' => $users
'users' => $users,
'menu' => [
'/map/'.$name => 'Map'
]
]);
}

+ 2
- 2
compass/public/assets/map.css View File

@ -9,9 +9,9 @@ html, body {
#calendar {
z-index: 100;
width: 200px;
height: calc(100% - 180px);
height: calc(100% - 240px);
position: absolute;
top: 10px;
top: 60px;
right: 10px;
border: 3px #888 solid;
background: white;

+ 0
- 18
compass/public/assets/styles.css View File

@ -19,24 +19,6 @@
}
.corner-logo {
position: absolute;
z-index: 2000;
top: 6px;
left: 20px;
}
.logged-in {
position: absolute;
z-index: 2000;
top: 6px;
right: 20px;
font-size: 80%;
padding: 4px 16px;
}
.logged-in .logout {
margin-left: 16px;
}
.dashboard {
max-width: 500px;

+ 5
- 5
compass/resources/views/index.blade.php View File

@ -6,13 +6,13 @@
<div class="logo"><img src="/assets/compass.svg" width="200"></div>
<form action="/auth/start" method="post" class="pure-form login">
<fieldset>
<form action="/auth/start" method="post" class="ui form login" style="margin-top: 40px;">
<div class="ui action input">
<input type="url" name="me">
<button type="submit" class="pure-button pure-button-primary">Sign in</button>
</fieldset>
<button type="submit" class="ui button primary">Sign in</button>
</div>
</form>
</div>
@endsection
@endsection

+ 1
- 1
compass/resources/views/map.blade.php View File

@ -2,7 +2,7 @@
@section('content')
<div class="corner-logo"><a href="/"><img src="/assets/compass.svg" height="40"/></a></div>
@include('partials/logged-in')
<div id="calendar">
<div class="scroll">

+ 18
- 5
compass/resources/views/partials/logged-in.blade.php View File

@ -1,6 +1,19 @@
<div class="corner-logo"><a href="/"><img src="/assets/compass.svg" height="40"/></a></div>
<div class="logged-in">
<span>{{ $displayURL }}</span>
<span class="logout"><a href="/auth/logout">sign out</a></span>
<div class="ui fixed menu">
<div class="ui container">
<a href="/" class="header item">
<img class="logo" src="/assets/compass.svg">
<span style="padding-left: 0.7em;">Compass</span>
</a>
@if(isset($menu))
@foreach($menu as $u=>$n)
<a href="{{ $u }}" class="item">{{ $n }}</a>
@endforeach
@endif
<div class="ui simple dropdown item right">
{{ $displayURL }} <i class="dropdown icon"></i>
<div class="menu">
<a class="item" href="/auth/logout">Sign Out</a>
</div>
</div>
</div>
</div>

+ 1
- 1
compass/resources/views/settings.blade.php View File

@ -45,7 +45,7 @@
<div class="error">{{ session('create-error') }}</div>
@endif
<span class="create {{ session('create-error') ? '' : 'hidden' }}">
<form action="/settings/{{ $database->name }}" method="post">
<form action="/settings/{{ $database->name }}" method="post" class="ui form">
<div class="ui action input">
<input type="url" name="add_user" value="{{ session('add-user-url') }}" placeholder="github or indieauth url">
<button type="submit" class="ui button primary">Add User</button>

Loading…
Cancel
Save