From dc5ec5db95af883373243cb84a265d71eef38a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Sat, 28 Jul 2018 18:37:51 +0200 Subject: [PATCH] placeholder table action buttons --- app/Http/Controllers/TableController.php | 3 +- app/Models/User.php | 5 + app/Providers/AppServiceProvider.php | 13 +- public/fonts/fa-dtbl-1-preview.html | 129 ++++++----- public/fonts/fa-dtbl-1.css | 55 ++--- public/fonts/fa-dtbl-1.eot | Bin 13140 -> 13164 bytes public/fonts/fa-dtbl-1.svg | 67 +++--- public/fonts/fa-dtbl-1.ttf | Bin 12960 -> 12984 bytes public/fonts/fa-dtbl-1.woff2 | Bin 6352 -> 6364 bytes resources/assets/js/app.js | 1 + resources/assets/js/bootstrap.js | 3 +- resources/assets/sass/_bootstrap.scss | 4 +- resources/assets/sass/_helpers.scss | 4 + resources/views/table/view.blade.php | 274 ++++++++++++++++------- 14 files changed, 347 insertions(+), 211 deletions(-) diff --git a/app/Http/Controllers/TableController.php b/app/Http/Controllers/TableController.php index cae1bc7..b1629fe 100644 --- a/app/Http/Controllers/TableController.php +++ b/app/Http/Controllers/TableController.php @@ -22,9 +22,10 @@ class TableController extends Controller /** @var Table $tableModel */ $tableModel = $user->tables()->where('name', $table)->first(); + // make it possible to show other revisions if ($input->has('rev')) { $rev = (int)$input->rev; - $revision = $tableModel->revisions()->orderBy('created_at')->skip($rev)->first(); + $revision = $tableModel->revisions()->orderBy('created_at')->skip($rev - 1)->first(); if ($revision === null) abort(404, "No such revision"); } else { $revision = $tableModel->revision; diff --git a/app/Models/User.php b/app/Models/User.php index 8988e78..ad09db3 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -177,4 +177,9 @@ class User extends Authenticatable return parent::__get($name); } + + public function ownsTable(Table $table) + { + return $table->owner_id == $this->id; + } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 0af6463..44d8fb8 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -49,11 +49,20 @@ class AppServiceProvider extends ServiceProvider $classes = trim($classes); $title = trim($title); + $notooltip = false; + + if (strpos($title, 'sr:') === 0) { + $notooltip = true; + $title = substr($title, 3); + } + $sr = str_replace('~', ' ', e($title)); - $tit = str_replace('~', '', e(trim($title, ' \r\n\t:,'))); + $tit = str_replace('~', '', e(trim($title, " \r\n\t:,"))); return '' . $sr . '' . - ''; + ''; } else { return ''; } diff --git a/public/fonts/fa-dtbl-1-preview.html b/public/fonts/fa-dtbl-1-preview.html index 076266b..e950de0 100644 --- a/public/fonts/fa-dtbl-1-preview.html +++ b/public/fonts/fa-dtbl-1-preview.html @@ -170,7 +170,7 @@ .fa-clock-o:before, .fa-cloud-upload:before, .fa-code-fork:before, -.fa-comments:before, +.fa-comment:before, .fa-download:before, .fa-eye:before, .fa-eye-slash:before, @@ -183,6 +183,7 @@ .fa-globe:before, .fa-google:before, .fa-history:before, +.fa-inbox:before, .fa-key-modern:before, .fa-link:before, .fa-pencil:before, @@ -232,7 +233,7 @@ .fa-clock-o:before { content: "\f106"; } .fa-cloud-upload:before { content: "\f107"; } .fa-code-fork:before { content: "\f108"; } -.fa-comments:before { content: "\f109"; } +.fa-comment:before { content: "\f109"; } .fa-download:before { content: "\f10a"; } .fa-eye:before { content: "\f10b"; } .fa-eye-slash:before { content: "\f10c"; } @@ -245,32 +246,33 @@ .fa-globe:before { content: "\f113"; } .fa-google:before { content: "\f114"; } .fa-history:before { content: "\f115"; } -.fa-key-modern:before { content: "\f116"; } -.fa-link:before { content: "\f117"; } -.fa-pencil:before { content: "\f118"; } -.fa-pencil-square-o:before { content: "\f119"; } -.fa-question-circle:before { content: "\f11a"; } -.fa-quote-left:before { content: "\f11b"; } -.fa-reply:before { content: "\f11c"; } -.fa-rss:before { content: "\f11d"; } -.fa-search:before { content: "\f11e"; } -.fa-share-alt:before { content: "\f11f"; } -.fa-sign-in:before { content: "\f120"; } -.fa-sign-out:before { content: "\f121"; } -.fa-sliders:before { content: "\f122"; } -.fa-sort:before { content: "\f123"; } -.fa-sort-asc:before { content: "\f124"; } -.fa-sort-desc:before { content: "\f125"; } -.fa-star:before { content: "\f126"; } -.fa-star-o:before { content: "\f127"; } -.fa-table:before { content: "\f128"; } -.fa-th-list:before { content: "\f129"; } -.fa-times:before { content: "\f12a"; } -.fa-trash:before { content: "\f12b"; } -.fa-trash-o:before { content: "\f12c"; } -.fa-user-circle-o:before { content: "\f12d"; } -.fa-user-plus:before { content: "\f12e"; } -.fa-wrench:before { content: "\f12f"; } +.fa-inbox:before { content: "\f116"; } +.fa-key-modern:before { content: "\f117"; } +.fa-link:before { content: "\f118"; } +.fa-pencil:before { content: "\f119"; } +.fa-pencil-square-o:before { content: "\f11a"; } +.fa-question-circle:before { content: "\f11b"; } +.fa-quote-left:before { content: "\f11c"; } +.fa-reply:before { content: "\f11d"; } +.fa-rss:before { content: "\f11e"; } +.fa-search:before { content: "\f11f"; } +.fa-share-alt:before { content: "\f120"; } +.fa-sign-in:before { content: "\f121"; } +.fa-sign-out:before { content: "\f122"; } +.fa-sliders:before { content: "\f123"; } +.fa-sort:before { content: "\f124"; } +.fa-sort-asc:before { content: "\f125"; } +.fa-sort-desc:before { content: "\f126"; } +.fa-star:before { content: "\f127"; } +.fa-star-o:before { content: "\f128"; } +.fa-table:before { content: "\f129"; } +.fa-th-list:before { content: "\f12a"; } +.fa-times:before { content: "\f12b"; } +.fa-trash:before { content: "\f12c"; } +.fa-trash-o:before { content: "\f12d"; } +.fa-user-circle-o:before { content: "\f12e"; } +.fa-user-plus:before { content: "\f12f"; } +.fa-wrench:before { content: "\f130"; } @@ -286,7 +288,7 @@
-

fa-dtbl-1 contains 48 glyphs:

+

fa-dtbl-1 contains 49 glyphs:

Toggle Preview Characters
@@ -411,13 +413,13 @@
- PpPpPpPpPpPpPpPpPpPp + PpPpPpPpPpPpPpPpPpPp
12141618212436486072
- +
@@ -580,6 +582,19 @@
+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -589,7 +604,7 @@
- +
@@ -602,7 +617,7 @@
- +
@@ -615,7 +630,7 @@
- +
@@ -629,7 +644,7 @@
- +
@@ -642,7 +657,7 @@
- +
@@ -655,7 +670,7 @@
- +
@@ -668,7 +683,7 @@
- +
@@ -681,7 +696,7 @@
- +
@@ -694,7 +709,7 @@
- +
@@ -707,7 +722,7 @@
- +
@@ -720,7 +735,7 @@
- +
@@ -733,7 +748,7 @@
- +
@@ -746,7 +761,7 @@
- +
@@ -759,7 +774,7 @@
- +
@@ -772,7 +787,7 @@
- +
@@ -785,7 +800,7 @@
- +
@@ -798,7 +813,7 @@
- +
@@ -811,7 +826,7 @@
- +
@@ -824,7 +839,7 @@
- +
@@ -837,7 +852,7 @@
- +
@@ -851,7 +866,7 @@
- +
@@ -864,7 +879,7 @@
- +
@@ -877,7 +892,7 @@
- +
@@ -890,7 +905,7 @@
- +
@@ -903,7 +918,7 @@
- +
@@ -916,7 +931,7 @@
- +
diff --git a/public/fonts/fa-dtbl-1.css b/public/fonts/fa-dtbl-1.css index 4649bcf..70017fb 100644 --- a/public/fonts/fa-dtbl-1.css +++ b/public/fonts/fa-dtbl-1.css @@ -47,7 +47,7 @@ .fa-clock-o::before { content: "\f106"; } .fa-cloud-upload::before { content: "\f107"; } .fa-code-fork::before { content: "\f108"; } -.fa-comments::before { content: "\f109"; } +.fa-comment::before { content: "\f109"; } .fa-download::before { content: "\f10a"; } .fa-eye::before { content: "\f10b"; } .fa-eye-slash::before { content: "\f10c"; } @@ -60,29 +60,30 @@ .fa-globe::before { content: "\f113"; } .fa-google::before { content: "\f114"; } .fa-history::before { content: "\f115"; } -.fa-key-modern::before { content: "\f116"; } -.fa-link::before { content: "\f117"; } -.fa-pencil::before { content: "\f118"; } -.fa-pencil-square-o::before, .fa-edit::before { content: "\f119"; } -.fa-question-circle::before { content: "\f11a"; } -.fa-quote-left::before { content: "\f11b"; } -.fa-reply::before { content: "\f11c"; } -.fa-rss::before { content: "\f11d"; } -.fa-search::before { content: "\f11e"; } -.fa-share-alt::before { content: "\f11f"; } -.fa-sign-in::before { content: "\f120"; } -.fa-sign-out::before { content: "\f121"; } -.fa-sliders::before { content: "\f122"; } -.fa-sort::before { content: "\f123"; } -.fa-sort-asc::before { content: "\f124"; } -.fa-sort-desc::before { content: "\f125"; } -.fa-star::before { content: "\f126"; } -.fa-star-o::before { content: "\f127"; } -.fa-table::before { content: "\f128"; } -.fa-th-list::before { content: "\f129"; } -.fa-times::before, .fa-close::before { content: "\f12a"; } -.fa-trash::before { content: "\f12b"; } -.fa-trash-o::before { content: "\f12c"; } -.fa-user-circle-o::before { content: "\f12d"; } -.fa-user-plus::before { content: "\f12e"; } -.fa-wrench::before { content: "\f12f"; } +.fa-inbox::before { content: "\f116"; } +.fa-key-modern::before { content: "\f117"; } +.fa-link::before { content: "\f118"; } +.fa-pencil::before { content: "\f119"; } +.fa-pencil-square-o::before, .fa-edit::before { content: "\f11a"; } +.fa-question-circle::before { content: "\f11b"; } +.fa-quote-left::before { content: "\f11c"; } +.fa-reply::before { content: "\f11d"; } +.fa-rss::before { content: "\f11e"; } +.fa-search::before { content: "\f11f"; } +.fa-share-alt::before { content: "\f120"; } +.fa-sign-in::before { content: "\f121"; } +.fa-sign-out::before { content: "\f122"; } +.fa-sliders::before { content: "\f123"; } +.fa-sort::before { content: "\f124"; } +.fa-sort-asc::before { content: "\f125"; } +.fa-sort-desc::before { content: "\f126"; } +.fa-star::before { content: "\f127"; } +.fa-star-o::before { content: "\f128"; } +.fa-table::before { content: "\f129"; } +.fa-th-list::before { content: "\f12a"; } +.fa-times::before, .fa-close::before { content: "\f12b"; } +.fa-trash::before { content: "\f12c"; } +.fa-trash-o::before { content: "\f12d"; } +.fa-user-circle-o::before { content: "\f12e"; } +.fa-user-plus::before { content: "\f12f"; } +.fa-wrench::before { content: "\f130"; } diff --git a/public/fonts/fa-dtbl-1.eot b/public/fonts/fa-dtbl-1.eot index f9fe723875666d1dd7bd029cf91f605b29439e1b..601d96391b43b898ca53ca838a18654113260f62 100644 GIT binary patch delta 768 zcmYjOT}YE*6h80!{ks1--P~N_rhY2P+TZ6y=UgOV8VJ^fd68T5uiD(m5lhg8P*)=9 z7m=_ovTn+#zzVOT3#qO`VvvbQc@bTtSS$#^Z@n7?UA!Eg=Q+noz`Zwo4O`F zub$xw~tQ0%ApM9kRQsQm-%NWG(0wz zB3eglDGlaDQ;Vak;T&S`%RG75^DoNpO;Jjq*!1J@s)sgGz3!wlaZr{%Ll!I-UmZ>Ie^1$!ktsLV4Q)yE~KNnJ$&KWC8=0&x#B7T;p-k*dTX+eF%Lb9;O0W8ptok)~3SJt^L5b<rjlOFwv0IE*N>Jn|6&;ji(jYDoIbgM z -Created by FontForge 20170805 at Sat Jul 28 09:08:34 2018 +Created by FontForge 20170805 at Sat Jul 28 18:34:22 2018 By ondra The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io @@ -19,10 +19,10 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/ panose-1="2 0 5 3 0 0 0 0 0 0" ascent="1536" descent="-256" - bbox="-0.0376684 -256 2048 1536.01" + bbox="-0.0376684 -256.168 2048 1536.01" underline-thickness="89.6" underline-position="-179.2" - unicode-range="U+0020-F12F" + unicode-range="U+0020-F130" /> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/fa-dtbl-1.ttf b/public/fonts/fa-dtbl-1.ttf index 41d1c4ecb5e75dba80927258752fbfa351a7d4b5..3df7d2dce8d3e487fa537995ef8e40b956b89235 100644 GIT binary patch delta 744 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 literal 6352 zcmV;>7%%5{Pew8T0RR9102t5!4FCWD05YHe02p@w0RR9100000000000000000000 z0000#Mn+Uk90p(jf=UPk5eN#;WWH((Y5)N?0we>0Py`?ah&u;_6&uwkMF#Bks^t?= z!C8y=zfPdXcP#7kOH8&{2YFlu`X1wVN}ve3to1zQujsjopxF@``y}@Vew+X2 z2BFe6qB2Ch)BWiLlsTPP`Iv}NU}G#2vB2n+E_8{m+udQo|8-04Q07576Nk>4_c7~4A5Pr&>D z3L(om@fUbQDt?tM1^}cEt{*_qB{y5X`!GHsJ0h!r1b{Ecp8&vL=*6)D$VDy!pg_Xl z{TPG=<0~rS%D@Qx_km=v0gRB_-yG56e1?tz&MUJ4Vmb0V8wX-G8E}R+Ms16f3UG?; zS0?_7AmpHs0?MFd>>AR`f0q)Qh0m82h|LCQkwnxA+a5%B1Yms>sq?1;N+|`!LKzbf zl;b6a0SPKXpgPqJL>b0O_fQ2{!0b+Pm6$z{m68&MeI#(4OJyw=5we(>GzLK<@Hb;! zJVIAz8jZ`NiX##EN5{pD!&dFTBau12E*uf=#d2DtqEac&pG@=C&lgIa1$F{~h{7Pz zP*(uSo)thts{cpj^88wn+tjIU?Mjg{##8y&3s_Vr0jf${9kvry3iF{dxDIx7s)Xu= z`2+xXxH(ll&z01RxIU7vjMZd>qq-tWgquR1X!J11c`I z4?$M}Jx!#CKVRuh=y?+XY=PsTGer%MP)Y#|lk=VA@d#QD$@H(@P>Q&Bpb5(@OndQ7 z+s2wvGqN@XaPi|h=N#@kOB#q(F}5aTJ0G1!F^x#w>eisKdTrB&j~)N@mYCLyYo~Pf zKrlkRI&Xq-nK|AFG{JoFMn^`IoPl_(KLk9-8USo$G_oT?wWJshnPJ$xhl+Xeh_HVD zETno!i30)`Yx;>Q*}OPfny{T1OkIL6kO74WNv2bz?*YNl`b!m_IzaaIe&vT_M^WiU z9AsQoqALz*{;fI)YK-TT3a!9nbvue z18&uY*&_0*!BpwrrasahkcWB^E&j_b6FRnDpso!Cs$;-(DewusPGO`v7#HYvTfWWt z`O6&ga}{sej6|Zs4>PT~5VKVK-6L+F&wl;&i-F!aZON8{gbL{|zf7Nvnq>wgV&r1i zMh6l_2k9zio9vt%5@W@FPCG-+VlsN;Yr2sKsL&q43LazIeWz_ibAn4)ZB=Ih+LsJV(zq4IbO8F)dU&B*gM zIgn(=L`7$yK#{6xk035%53eDiKu9>91h4^)!D~u)`jxv(Arpl&NG4aDgP0--h88njGwqfF`Wj9=mqV7%50TCK zwjcK~&AfQrsHMg$Z9R*5Rz^U%bAWwEZLQO<+?{@BDs@N1iC6`_H7{n8h#;QFoK$|c z__s6w+J&44!66n87E(IC#H9iqJ2ub+>sIg<6=|-%>9fuVxgWG(uy^mBcQnH^qtX1u z=bt}*m$7%>B@E!a6Ldl}C5)IAx1;8u5+7!GyFQJhE>feAm7KE(xDw`jMNv%za8t zef-lX8&o&X=2?C+YriAetS-uUp5-b0^i#~bb`8x@V`)t$3qdH2+i8<8oE|l$m0hv5TW_FR^+2@cI6vYQc6kW_e#_zVb5lr$dEcH`R{Ujxt@>FUtFV?f1l= z;P8_SP~SX6TcR)tSXFGtX!UAI@vf&z{Us|Kmu-BBO1T=b|5_@D?!YgQk#n$u38(vs zybZI3?HK1g3TGl~5DvD5GmRa2vH(6DiMC2XW0TB9jS{AFHBi+4l82

6&gD@Bm4{ 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 S6M!O{Fp>tDo_G^x0002HZaPl@ diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 8115045..cde0ca4 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -5,6 +5,7 @@ */ require('./bootstrap') + let url_slug = require('./url-slug') $(function () { diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index e343ab0..c71b30a 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -1,6 +1,6 @@ // window._ = require('lodash'); -// window.Popper = require('popper.js').default; +window.Popper = require('popper.js').default; /** * We'll load jQuery and the Bootstrap jQuery plugin which provides support @@ -10,7 +10,6 @@ try { window.$ = window.jQuery = require('jquery'); - require('bootstrap'); } catch (e) {} diff --git a/resources/assets/sass/_bootstrap.scss b/resources/assets/sass/_bootstrap.scss index bbb5065..53bb168 100644 --- a/resources/assets/sass/_bootstrap.scss +++ b/resources/assets/sass/_bootstrap.scss @@ -19,7 +19,7 @@ @import "~bootstrap/scss/button-group"; @import "~bootstrap/scss/input-group"; @import "~bootstrap/scss/custom-forms"; -//@import "~bootstrap/scss/nav"; +@import "~bootstrap/scss/nav"; @import "~bootstrap/scss/navbar"; @import "~bootstrap/scss/card"; @import "~bootstrap/scss/breadcrumb"; @@ -36,4 +36,4 @@ @import "~bootstrap/scss/popover"; //@import "~bootstrap/scss/carousel"; @import "~bootstrap/scss/utilities"; -//@import "~bootstrap/scss/print"; +@import "~bootstrap/scss/print"; diff --git a/resources/assets/sass/_helpers.scss b/resources/assets/sass/_helpers.scss index bdf5c94..5fe8052 100644 --- a/resources/assets/sass/_helpers.scss +++ b/resources/assets/sass/_helpers.scss @@ -17,6 +17,10 @@ .mobile-only { display: none; } + + .mobile-no-border { + border: 0 none !important; + } } .border-dashed { diff --git a/resources/views/table/view.blade.php b/resources/views/table/view.blade.php index de5a06d..f704726 100644 --- a/resources/views/table/view.blade.php +++ b/resources/views/table/view.blade.php @@ -8,100 +8,200 @@ @section('content')

-

- +
+ {{ $table->owner->handle }}{{-- --}}/{{-- --}}{{ $table->name }} - {{ $table->title }} -

-
- -
-
- @if($table->description) - Description - {!! Widget::collapsible($table->description, 400, '8em') !!} - @endif - - @if($table->origin) -

- Source
- @icon(fa-link){!! Widget::tryLink($table->origin) !!} -

- @endif -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Author - {{ $table->owner->title }} - ({{ $table->owner->handle }}) -
License{{ $table->license ?: 'CC0' }}
Created{{ $table->created_at->format("M j, Y") }}
Updated{{ $table->updated_at->format("M j, Y") }}
Revisions{{ $table->revisions()->count() }}
+

{{ $table->title }}

+ + +
-
- Right Column with buttons etc, maybe + +
+
+ + {{-- Tab pane --}} +
+
+ + {{-- Description field --}} +
+ @if($table->description) + Description + {!! Widget::collapsible($table->description, 400, '8em') !!} + @if($table->origin) +
{{-- spacer --}} + @endif + @endif + + @if($table->origin) +

+ Adapted From
+ {!! Widget::tryLink($table->origin) !!} +

+ @endif +
+ + {{-- Info table --}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Author + {{ $table->owner->title }} + ({{ $table->owner->handle }}) +
License{{ $table->license ?: 'CC0' }}
Created{{ $table->created_at->format("M j, Y") }}
Updated{{ $table->updated_at->format("M j, Y") }}
Revisions{{ $table->revisions()->count() }}
+
+ +
{{-- inner row --}} +
{{-- Tab container --}} + +
+ Column toggles, sort, filtering … coming soon +
+ +
+ Export … coming soon +
+ +
{{-- Tab panel --}} + + {{-- Right column with menu --}} +
+ + + +
+
-
-
-
- +
+
+ +
-
- -
-
- - - - @foreach($columns as $col) - - @endforeach - - - - @foreach($rows as $row) - - @php($rdata = json_decode($row['data'], true)) - @foreach($columns as $col) - - @endforeach - - @endforeach - -
{{ $col->title }}
{{ $rdata[$col->name] }}
+ +
+
+ + + + @foreach($columns as $col) + + @endforeach + + + + @foreach($rows as $row) + + @php($rdata = json_decode($row['data'], true)) + @foreach($columns as $col) + + @endforeach + + @endforeach + +
{{ $col->title }}
{{ $rdata[$col->name] }}
+
-
-@endsection + @endsection