commented some buttons and displays for features not yet implemented

6 years ago · 449a1c4d26
parent f1529b3b8e
commit 449a1c4d26
9 changed files with 57 additions and 16 deletions
--- a/public/fonts/fa-dtbl-1-preview.html
+++ b/public/fonts/fa-dtbl-1-preview.html
@ -187,7 +187,8 @@
 .fa-user:before,
 .fa-user-circle-o:before,
 .fa-user-plus:before,
-.fa-users:before {
+.fa-users:before,
+.fa-wrench:before {
        display: inline-block;
  font-family: "fa-dtbl-1";
  font-style: normal;
@ -229,6 +230,7 @@
 .fa-user-circle-o:before { content: "\f118"; }
 .fa-user-plus:before { content: "\f119"; }
 .fa-users:before { content: "\f11a"; }
+.fa-wrench:before { content: "\f11b"; }
    </style>

    <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@ -244,7 +246,7 @@
  <body class="characters-off">
    <div id="page" class="container">
      <header>
-        <h1>fa-dtbl-1 contains 27 glyphs:</h1>
+        <h1>fa-dtbl-1 contains 28 glyphs:</h1>
        <a onclick="toggleCharacters(); return false;" href="#">Toggle Preview Characters</a>
      </header>

@ -602,6 +604,19 @@
        </div>
      </div>
      
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="fa-wrench" class="fa-wrench"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fa-wrench" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11b;" />
+        </div>
+      </div>
+      

      <footer>
        Made with love using <a href="http://fontcustom.com">Font Custom</a>.
--- a/public/fonts/fa-dtbl-1.css
+++ b/public/fonts/fa-dtbl-1.css
@ -65,3 +65,4 @@
 .fa-user-circle-o::before { content: "\f118"; }
 .fa-user-plus::before { content: "\f119"; }
 .fa-users::before { content: "\f11a"; }
+.fa-wrench::before { content: "\f11b"; }
--- a/public/fonts/fa-dtbl-1.eot
+++ b/public/fonts/fa-dtbl-1.eot
--- a/public/fonts/fa-dtbl-1.svg
+++ b/public/fonts/fa-dtbl-1.svg
@ -5,7 +5,7 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20170805 at Sun Jul 29 12:59:14 2018
+Created by FontForge 20170805 at Sun Jul 29 16:55:50 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
 </metadata>
@ -22,7 +22,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
    bbox="-0.14014 -256.168 2048 1536.01"
    underline-thickness="89.6"
    underline-position="-179.2"
-    unicode-range="U+0020-F11A"
+    unicode-range="U+0020-F11B"
  />
    <missing-glyph />
    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
@ -127,5 +127,8 @@ c12 10 23 17 39 17c85 0 160 -32 217 -96h-223c-70 0 -128 -58 -128 -128v-192z" />
 d="M593 640c-104 -3 -198 -48 -265 -128h-134c-100 0 -194 48 -194 159c0 81 -3 353 124 353c21 0 125 -85 260 -85c46 0 90 8 133 23c-3 -22 -5 -44 -5 -66c0 -91 29 -181 81 -256zM1664 3c0 -162 -107 -259 -267 -259h-874c-160 0 -267 97 -267 259c0 226 53 573 346 573
 c34 0 158 -139 358 -139s324 139 358 139c293 0 346 -347 346 -573zM640 1280c0 -141 -115 -256 -256 -256s-256 115 -256 256s115 256 256 256s256 -115 256 -256zM1344 896c0 -212 -172 -384 -384 -384s-384 172 -384 384s172 384 384 384s384 -172 384 -384zM1920 671
 c0 -111 -94 -159 -194 -159h-134c-67 80 -161 125 -265 128c52 75 81 165 81 256c0 22 -2 44 -5 66c43 -15 87 -23 133 -23c135 0 239 85 260 85c127 0 124 -272 124 -353zM1792 1280c0 -141 -115 -256 -256 -256s-256 115 -256 256s115 256 256 256s256 -115 256 -256z" />
+    <glyph glyph-name="wrench" unicode="&#xf11b;" horiz-adv-x="1641" 
+d="M363 64c0 35 -29 64 -64 64s-64 -29 -64 -64s29 -64 64 -64s64 29 64 64zM1007 484l-682 -682c-23 -23 -56 -37 -90 -37s-67 14 -91 37l-106 108c-24 23 -38 56 -38 90s14 67 38 91l681 681c52 -131 157 -236 288 -288zM1641 919c0 -33 -12 -74 -23 -106
+c-63 -178 -234 -301 -423 -301c-247 0 -448 201 -448 448s201 448 448 448c73 0 168 -22 229 -63c10 -7 16 -16 16 -28c0 -11 -7 -22 -16 -28l-293 -169v-224l193 -107c33 19 265 165 285 165s32 -15 32 -35z" />
  </font>
 </defs></svg>
--- a/public/fonts/fa-dtbl-1.ttf
+++ b/public/fonts/fa-dtbl-1.ttf
--- a/public/fonts/fa-dtbl-1.woff2
+++ b/public/fonts/fa-dtbl-1.woff2
--- a/resources/views/profile/_table-list.blade.php
+++ b/resources/views/profile/_table-list.blade.php
@ -22,19 +22,19 @@
            !!}<b>{{ $table->title }}</b>
          </span>{{--
      --}}<div class="d-block col-5 small text-right">{{--
-        --}}<span title="Visits" class="d-inline-block" style="min-width: 60px;">
+        --}}<span title="Visits" class="d-inline-block pl-2" style="min-width: 50px;">
              {{ $table->visits }}@icon(fa-eye fa-pl, ~Visits~~)
            </span>{{--
-        --}}<span title="Forks" class="d-inline-block {{$forks==0?'hidden':''}}" style="min-width: 60px;">
+        --}}{{--<span title="Forks" class="d-inline-block pl-2 {{$forks==0?'hidden':''}}" style="min-width: 50px;">
              {{ $forks }}@icon(fa-code-fork fa-pl, ~Forks~~)
-            </span>{{--
-        --}}<span title="Favourites" class="d-inline-block {{$faves==0?'hidden':''}}" style="min-width: 60px;">
+            </span>--}}{{--
+        --}}{{--<span title="Favourites" class="d-inline-block pl-2 {{$faves==0?'hidden':''}}" style="min-width: 50px;">
              {{ $faves }}@icon(fa-star fa-pl, ~Favourites~~)
-            </span>{{--
-        --}}<span title="Revisions" class="d-inline-block" style="min-width: 60px;">
+            </span>--}}{{--
+        --}}{{--<span title="Revisions" class="d-inline-block pl-2" style="min-width: 50px;">
              {{ $revs }}@icon(fa-history fa-pl, ~Revisions~~)
-            </span>{{--
-        --}}<span title="Rows" class="d-inline-block" style="min-width: 60px;">
+            </span>--}}{{--
+        --}}<span title="Rows" class="d-inline-block pl-2" style="min-width: 50px;">
              {{ $rows }}@icon(fa-th-list fa-pl, ~Rows)
            </span>{{--
        --}}
@ -46,7 +46,7 @@
            @sr(Description:~){{ ellipsis($table->description, 215) }}
          </div>{{--
      --}}<div class="d-inline-block col-4 text-right text-muted">
-            Last change {{ $table->updated_at->diffForHumans() }}@icon(fa-history fa-pl, sr:Owner)
+            Last change {{ $table->updated_at->diffForHumans() }}
          </div>
        </div>
      </a>
--- a/resources/views/table/_action-buttons.blade.php
+++ b/resources/views/table/_action-buttons.blade.php
@ -5,19 +5,28 @@
 <nav aria-label="Table action buttons">
  @sr(Table actions)

+{{-- Disabled until implemented --}}
+@if(false)
+
  @if(guest() || user()->ownsTable($table))
+
+    {{-- Passive fork buttons with counter --}}
    <a href="" class="btn btn-outline-primary py-1 btn-sm" title="Forks"
       data-toggle="tooltip" data-placement="top">
      {{ $table->forks_count ?: '–' }}&nbsp;
      @icon(fa-code-fork, sr:Forks)
    </a>

-    <a href="#" class="btn btn-outline-primary py-1 btn-sm"
+    {{-- Passive favourite buttons with counter --}}
+    <a href="" class="btn btn-outline-primary py-1 btn-sm"
       title="Favourites" data-toggle="tooltip" data-placement="top">
      {{ $table->favourites_count ?: '–' }}&nbsp;
      @icon(fa-star, sr:Favourites)
    </a>
+
  @else
+
+    {{-- Active fork button | counter --}}
    <div class="btn-group" role="group" aria-label="Fork">
      <a href="" class="btn btn-outline-primary py-1 btn-sm btn-square" title="Fork"
         data-toggle="tooltip" data-placement="top">
@ -29,6 +38,7 @@
      </a>
    </div>

+    {{-- Active favourite button | counter --}}
    <div class="btn-group" role="group" aria-label="Favourite">
      @if(user()->favouritesTable($table))
        <a href="" class="btn btn-outline-primary py-1 btn-sm btn-square" title="Un-favourite"
@ -47,11 +57,22 @@
        {{ $table->favourites_count ?: '–' }}
      </a>
    </div>
+
  @endif

+  {{-- Comments button with counter --}}
  <a href="" class="btn btn-outline-primary py-1 btn-sm" title="Comments"
     data-toggle="tooltip" data-placement="top">
    {{ $table->comments_count ?: '–' }}&nbsp;
    @icon(fa-comment, sr:Comments)
  </a>
+
+@endif
+
+  @if(user() && user()->ownsTable($table))
+    <a href="" class="btn btn-outline-primary py-1 btn-sm"
+       title="Table Options" data-toggle="tooltip" data-placement="top">
+      @icon(fa-wrench, sr:Table Options)
+    </a>
+  @endif
 </nav>
--- a/resources/views/table/_panel-metadata.blade.php
+++ b/resources/views/table/_panel-metadata.blade.php
@ -31,13 +31,14 @@
    <table>
      <tbody>

-      <tr>
+      {{-- Commented because the link is already top left --}}
+      {{--<tr>
        <th class="text-right pr-2">Author</th>
        <td>
          {{ $table->owner->title }}
          (<a href="{{route('profile.view', $table->owner->name)}}">{{ $table->owner->handle }}</a>)
        </td>
-      </tr>
+      </tr>--}}

      <tr>
        <th class="text-right pr-2">License</th>