summaryrefslogtreecommitdiff
path: root/public/js/lib/editor/toolbar.html
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2019-03-31 15:14:31 +0200
committerGitHub2019-03-31 15:14:31 +0200
commit3a0ff5edd3882cca3751bcfbca1843807ef0c7d7 (patch)
treef14f4411361f789f05d8414378df3c9ea9a07c03 /public/js/lib/editor/toolbar.html
parent948c3367eb07505383367ab722d240fa62ca454a (diff)
parent1544b45af5435fde1190634dc44b65ca6ab55238 (diff)
Merge pull request #9 from SISheogorath/feature/moveUpload
Move upload button into toolbar
Diffstat (limited to '')
-rw-r--r--public/js/lib/editor/toolbar.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/public/js/lib/editor/toolbar.html b/public/js/lib/editor/toolbar.html
index a2ac476f..9ea1aacc 100644
--- a/public/js/lib/editor/toolbar.html
+++ b/public/js/lib/editor/toolbar.html
@@ -34,6 +34,9 @@
<a id="makeImage" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Image">
<i class="fa fa-image fa-fw"></i>
</a>
+ <span id="uploadImage" class="btn btn-sm btn-dark btn-file ui-upload-image" title="Upload Image">
+ <i class="fa fa-upload fa-fw"></i><input type="file" accept="image/*" name="upload" multiple>
+ </span>
<a id="makeTable" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Table">
<i class="fa fa-table fa-fw"></i>
</a>