Use icons for all buttons
@@ -65,7 +65,7 @@ export default Controller.extend({
|
||||
|
||||
deleteDocuments () {
|
||||
const documentCount = this.get('documentCount');
|
||||
const msg = `This will delete all ${documentCount} documents/files in the current directory. Are you sure?`;
|
||||
const msg = `Delete all ${documentCount} documents/files in the current directory?`;
|
||||
if (! window.confirm(msg)) { return false; }
|
||||
|
||||
const client = this.get('storage.client');
|
||||
|
||||
@@ -41,7 +41,7 @@ export default Controller.extend({
|
||||
},
|
||||
|
||||
deleteItem () {
|
||||
if (window.confirm('Sure?')) {
|
||||
if (window.confirm('Delete?')) {
|
||||
this.get('storage.client')
|
||||
.remove(this.get('path')).then(() => {
|
||||
this.transitionToRoute('index', {
|
||||
|
||||
@@ -9,17 +9,31 @@ div.button-group + div.button-group {
|
||||
|
||||
header {
|
||||
button {
|
||||
padding: 0.4rem 0.8rem 0.3rem;
|
||||
padding: 0.4rem 0 0.3rem;
|
||||
border: 1px solid $dark-grey-2;
|
||||
border-radius: 0.2em;
|
||||
background-color: #fff;
|
||||
color: $dark-grey-2;
|
||||
font-size: 0.8rem;
|
||||
text-transform: uppercase;
|
||||
width: 3rem;
|
||||
|
||||
svg {
|
||||
height: 1rem;
|
||||
path {
|
||||
fill: $dark-grey-2;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: $dark-grey-2;
|
||||
color: #fff;
|
||||
|
||||
svg {
|
||||
path {
|
||||
fill: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&:disabled,
|
||||
@@ -27,6 +41,12 @@ header {
|
||||
border-color: $dark-grey-3;
|
||||
background-color: #fff;
|
||||
color: $dark-grey-3;
|
||||
|
||||
svg {
|
||||
path {
|
||||
fill: $dark-grey-3;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,6 +77,7 @@
|
||||
nav.actions {
|
||||
grid-column-start: 3;
|
||||
text-align: right;
|
||||
margin-top: -0.4rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
body {
|
||||
background-color: white;
|
||||
font-size: 16px;
|
||||
font-size: 15px;
|
||||
font-family: Open Sans, sans-serif;
|
||||
color: $dark-grey-1;
|
||||
margin: 0;
|
||||
|
||||
6
app/styles/vendor/_json-tree-view.scss
vendored
@@ -1,8 +1,8 @@
|
||||
.jsonView{
|
||||
margin-left: 20px;
|
||||
font-family: Consolas, "Lucida Console", Menlo, "dejavu sans mono", monospace;
|
||||
font-size: 16px;
|
||||
line-height: 16px;
|
||||
font-size: 15px;
|
||||
line-height: 15px;
|
||||
padding: 2px;
|
||||
cursor: default;
|
||||
color: rgb(66, 66, 66);
|
||||
@@ -146,4 +146,4 @@
|
||||
.jsonView>.insert:hover{
|
||||
color: rgb(0, 0, 0);
|
||||
background: rgb(220, 220, 220);
|
||||
}
|
||||
}
|
||||
|
||||
1
app/templates/icons/arrow-from-left.hbs
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M296 99.5l148.5 148c4.7 4.7 4.7 12.3 0 17L296 412.5c-4.7 4.7-12.3 4.7-17 0l-7.1-7.1c-4.7-4.7-4.7-12.3 0-17l116-115.4H76c-6.6 0-12-5.4-12-12v-10c0-6.6 5.4-12 12-12h311.9L272 123.6c-4.7-4.7-4.7-12.3 0-17l7.1-7.1c4.6-4.7 12.2-4.7 16.9 0zM12 448h8c6.6 0 12-5.4 12-12V76c0-6.6-5.4-12-12-12h-8C5.4 64 0 69.4 0 76v360c0 6.6 5.4 12 12 12z"/></svg>
|
||||
|
After Width: | Height: | Size: 410 B |
1
app/templates/icons/arrow-from-right.hbs
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M152 412.5L3.5 264.5c-4.7-4.7-4.7-12.3 0-17L152 99.5c4.7-4.7 12.3-4.7 17 0l7.1 7.1c4.7 4.7 4.7 12.3 0 17L60.1 239H372c6.6 0 12 5.4 12 12v10c0 6.6-5.4 12-12 12H60.1L176 388.4c4.7 4.7 4.7 12.3 0 17l-7.1 7.1c-4.6 4.7-12.2 4.7-16.9 0zM436 64h-8c-6.6 0-12 5.4-12 12v360c0 6.6 5.4 12 12 12h8c6.6 0 12-5.4 12-12V76c0-6.6-5.4-12-12-12z"/></svg>
|
||||
|
After Width: | Height: | Size: 407 B |
1
app/templates/icons/arrow-to-left.hbs
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M216 412.5l-148.5-148c-4.7-4.7-4.7-12.3 0-17L216 99.5c4.7-4.7 12.3-4.7 17 0l7.1 7.1c4.7 4.7 4.7 12.3 0 17L124.1 239H436c6.6 0 12 5.4 12 12v10c0 6.6-5.4 12-12 12H124.1L240 388.4c4.7 4.7 4.7 12.3 0 17l-7.1 7.1c-4.6 4.7-12.2 4.7-16.9 0zM12 448h8c6.6 0 12-5.4 12-12V76c0-6.6-5.4-12-12-12h-8C5.4 64 0 69.4 0 76v360c0 6.6 5.4 12 12 12z"/></svg>
|
||||
|
After Width: | Height: | Size: 409 B |
1
app/templates/icons/arrow-to-right.hbs
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M215 99.5l-7.1 7.1c-4.7 4.7-4.7 12.3 0 17l116 115.4H12c-6.6 0-12 5.4-12 12v10c0 6.6 5.4 12 12 12h311.9L208 388.4c-4.7 4.7-4.7 12.3 0 17l7.1 7.1c4.7 4.7 12.3 4.7 17 0l148.5-148c4.7-4.7 4.7-12.3 0-17L232 99.5c-4.7-4.7-12.3-4.7-17 0zM448 76v360c0 6.6-5.4 12-12 12h-8c-6.6 0-12-5.4-12-12V76c0-6.6 5.4-12 12-12h8c6.6 0 12 5.4 12 12z"/></svg>
|
||||
|
After Width: | Height: | Size: 407 B |
1
app/templates/icons/code.hbs
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M228.5 511.8l-25-7.1c-3.2-.9-5-4.2-4.1-7.4L340.1 4.4c.9-3.2 4.2-5 7.4-4.1l25 7.1c3.2.9 5 4.2 4.1 7.4L235.9 507.6c-.9 3.2-4.3 5.1-7.4 4.2zm-75.6-125.3l18.5-20.9c1.9-2.1 1.6-5.3-.5-7.1L49.9 256l121-102.5c2.1-1.8 2.4-5 .5-7.1l-18.5-20.9c-1.8-2.1-5-2.3-7.1-.4L1.7 252.3c-2.3 2-2.3 5.5 0 7.5L145.8 387c2.1 1.8 5.3 1.6 7.1-.5zm277.3.4l144.1-127.2c2.3-2 2.3-5.5 0-7.5L430.2 125.1c-2.1-1.8-5.2-1.6-7.1.4l-18.5 20.9c-1.9 2.1-1.6 5.3.5 7.1l121 102.5-121 102.5c-2.1 1.8-2.4 5-.5 7.1l18.5 20.9c1.8 2.1 5 2.3 7.1.4z"/></svg>
|
||||
|
After Width: | Height: | Size: 582 B |
1
app/templates/icons/list.hbs
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M506 114H134a6 6 0 0 1-6-6V84a6 6 0 0 1 6-6h372a6 6 0 0 1 6 6v24a6 6 0 0 1-6 6zm6 154v-24a6 6 0 0 0-6-6H134a6 6 0 0 0-6 6v24a6 6 0 0 0 6 6h372a6 6 0 0 0 6-6zm0 160v-24a6 6 0 0 0-6-6H134a6 6 0 0 0-6 6v24a6 6 0 0 0 6 6h372a6 6 0 0 0 6-6zM84 120V72c0-6.627-5.373-12-12-12H24c-6.627 0-12 5.373-12 12v48c0 6.627 5.373 12 12 12h48c6.627 0 12-5.373 12-12zm0 160v-48c0-6.627-5.373-12-12-12H24c-6.627 0-12 5.373-12 12v48c0 6.627 5.373 12 12 12h48c6.627 0 12-5.373 12-12zm0 160v-48c0-6.627-5.373-12-12-12H24c-6.627 0-12 5.373-12 12v48c0 6.627 5.373 12 12 12h48c6.627 0 12-5.373 12-12z"/></svg>
|
||||
|
After Width: | Height: | Size: 654 B |
1
app/templates/icons/sitemap.hbs
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path d="M616 320h-72v-48c0-26.468-21.532-48-48-48H336v-32h56c13.255 0 24-10.745 24-24V24c0-13.255-10.745-24-24-24H248c-13.255 0-24 10.745-24 24v144c0 13.255 10.745 24 24 24h56v32H144c-26.467 0-48 21.532-48 48v48H24c-13.255 0-24 10.745-24 24v144c0 13.255 10.745 24 24 24h144c13.255 0 24-10.745 24-24V344c0-13.255-10.745-24-24-24h-40v-48c0-8.822 7.178-16 16-16h160v64h-56c-13.255 0-24 10.745-24 24v144c0 13.255 10.745 24 24 24h144c13.255 0 24-10.745 24-24V344c0-13.255-10.745-24-24-24h-56v-64h160c8.822 0 16 7.178 16 16v48h-40c-13.255 0-24 10.745-24 24v144c0 13.255 10.745 24 24 24h144c13.255 0 24-10.745 24-24V344c0-13.255-10.745-24-24-24zm-456 32v128H32V352h128zm224 0v128H256V352h128zM256 160V32h128v128H256zm352 320H480V352h128v128z"/></svg>
|
||||
|
After Width: | Height: | Size: 806 B |
1
app/templates/icons/trash.hbs
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M336 64l-33.6-44.8C293.3 7.1 279.1 0 264 0h-80c-15.1 0-29.3 7.1-38.4 19.2L112 64H24C10.7 64 0 74.7 0 88v2c0 3.3 2.7 6 6 6h26v368c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V96h26c3.3 0 6-2.7 6-6v-2c0-13.3-10.7-24-24-24h-88zM184 32h80c5 0 9.8 2.4 12.8 6.4L296 64H152l19.2-25.6c3-4 7.8-6.4 12.8-6.4zm200 432c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V96h320v368zm-176-44V156c0-6.6 5.4-12 12-12h8c6.6 0 12 5.4 12 12v264c0 6.6-5.4 12-12 12h-8c-6.6 0-12-5.4-12-12zm-80 0V156c0-6.6 5.4-12 12-12h8c6.6 0 12 5.4 12 12v264c0 6.6-5.4 12-12 12h-8c-6.6 0-12-5.4-12-12zm160 0V156c0-6.6 5.4-12 12-12h8c6.6 0 12 5.4 12 12v264c0 6.6-5.4 12-12 12h-8c-6.6 0-12-5.4-12-12z"/></svg>
|
||||
|
After Width: | Height: | Size: 734 B |
@@ -2,7 +2,8 @@
|
||||
{{breadcrumb-nav currentDirPath=currentDirPath}}
|
||||
<nav class="actions">
|
||||
{{#if currentListingContainsDocuments}}
|
||||
<button class="delete-all" {{action "deleteDocuments"}}>delete all</button>
|
||||
<button class="delete-all" title="Delete documents/files"
|
||||
{{action "deleteDocuments"}}>{{partial 'icons/trash'}}</button>
|
||||
{{/if}}
|
||||
</nav>
|
||||
</header>
|
||||
|
||||
@@ -3,16 +3,35 @@
|
||||
<nav class="actions">
|
||||
{{#if documentIsJSON}}
|
||||
<div class="button-group json-view">
|
||||
<button disabled={{jsonShowTree}} class="{{if jsonShowTree "active"}}" {{action "showJsonTree"}}>tree view</button>
|
||||
<button disabled={{jsonShowSource}} class="{{if jsonShowSource "active"}}" {{action "showJsonSource"}}>source</button>
|
||||
{{#if metadataHidden}}
|
||||
<button {{action "toggleMetadata"}}
|
||||
title="Show metadata">
|
||||
{{partial "icons/arrow-from-right"}}
|
||||
</button>
|
||||
{{else}}
|
||||
<button {{action "toggleMetadata"}}
|
||||
title="Hide metadata">
|
||||
{{partial "icons/arrow-to-right"}}
|
||||
</button>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="button-group json-view">
|
||||
<button {{action "toggleMetadata"}}>
|
||||
{{if metadataHidden "show" "hide"}} metadata
|
||||
<button disabled={{jsonShowTree}}
|
||||
class="{{if jsonShowTree "active"}}"
|
||||
title="Tree view"
|
||||
{{action "showJsonTree"}}>
|
||||
{{partial "icons/list"}}
|
||||
</button>
|
||||
<button disabled={{jsonShowSource}}
|
||||
class="{{if jsonShowSource "active"}}"
|
||||
title="Show source"
|
||||
{{action "showJsonSource"}}>
|
||||
{{partial "icons/code"}}
|
||||
</button>
|
||||
</div>
|
||||
{{/if}}
|
||||
<button class="delete" {{action "deleteItem"}}>delete</button>
|
||||
<button class="delete" title="Delete"
|
||||
{{action "deleteItem"}}>{{partial "icons/trash"}}</button>
|
||||
</nav>
|
||||
</header>
|
||||
|
||||
|
||||