krzysiej/paper-pi
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'issue-45' of krzysiej/paper-pi into master

Browse Source
This commit was merged in pull request #55.
This commit is contained in:
krzysiej
2018-08-16 22:08:43 +02:00
committed by krzysiej
parent 0afea8ead6 081aa0f7a4
commit e76edbb531
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Main.php
View File

@@ -241,6 +241,7 @@ class Main extends Controller
return redirect()->route('list'); return redirect()->route('list');
} elseif ($request->exists('print')) { } elseif ($request->exists('print')) {
$this->paper->sendPrint($request->input('title'), $request->input('text'), $request->input('icon')); $this->paper->sendPrint($request->input('title'), $request->input('text'), $request->input('icon'));
$request->session()->flash('print_status', 'Wydrukowano notatkę: ' . (strlen($request->input('title')) ? $request->input('title') : substr($request->input('text'), 0, 20)) . '!');
} }
return redirect()->route('edit', ['id' => $note->id, 'slug' => $note->topic_slug]); return redirect()->route('edit', ['id' => $note->id, 'slug' => $note->topic_slug]);
} else { } else {

13
resources/views/edit.blade.php
View File

@@ -2,10 +2,21 @@
@section('content') @section('content')
<style> <style>
body .column .ui.form textarea:not([rows]) {max-height: inherit; height: 20em} body .column .ui.form textarea:not([rows]) {
max-height: inherit;
height: 20em
}
</style> </style>
<div class="ui container"> <div class="ui container">
@if(Session::has('print_status'))
<div class="ui info message">
<div class="header">
{{ Session::get('print_status') }}
</div>
</div>
@endif
<div class="ui one column middle aligned stackable grid"> <div class="ui one column middle aligned stackable grid">
<div class="ui column"> <div class="ui column">
@if($type == 'template') @if($type == 'template')