diff --git a/README.md b/README.md index d2c11e1..35f2fba 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,12 @@ With no command line use needed, you can: # Installation ## From Github Release ### Ubuntu -1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator_0.4.1-1focal_all.deb` -1. `# apt install ./cockpit-navigator_0.4.1-1focal_all.deb` +1. `$ wget https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator_0.4.2-1focal_all.deb` +1. `# apt install ./cockpit-navigator_0.4.2-1focal_all.deb` ### EL7 -1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator-0.4.1-1.el7.noarch.rpm` +1. `# yum install https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator-0.4.2-1.el7.noarch.rpm` ### EL8 -1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator-0.4.1-1.el8.noarch.rpm` +1. `# dnf install https://github.com/45Drives/cockpit-navigator/releases/download/v0.4/cockpit-navigator-0.4.2-1.el8.noarch.rpm` ## From Source 1. Ensure dependencies are installed: `cockpit`, `python3`, `rsync`, `zip`. 1. `$ git clone https://github.com/45Drives/cockpit-navigator.git` diff --git a/debian/changelog b/debian/changelog index ce78205..92b4327 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cockpit-navigator (0.4.2-1focal) focal; urgency=low + + * Implement list view. + * Fix opening symlinks to files for editing. + + -- Josh Boudreau Mon, 07 Jun 2021 17:27:00 -0300 + cockpit-navigator (0.4.1-1focal) focal; urgency=low * Use smaller chunk size while uploading for older versions of Cockpit. diff --git a/el/cockpit-navigator.spec b/el/cockpit-navigator.spec index 678ad9b..6d52d36 100644 --- a/el/cockpit-navigator.spec +++ b/el/cockpit-navigator.spec @@ -1,5 +1,5 @@ Name: cockpit-navigator -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: A File System Browser for Cockpit. License: GPL-3.0+ @@ -32,6 +32,9 @@ rm -rf %{buildroot} /usr/share/cockpit/navigator/* %changelog +* Mon Jun 07 2021 Josh Boudreau 0.4.2-1 +- Implement list view. +- Fix opening symlinks to files for editing. * Mon Jun 07 2021 Josh Boudreau 0.4.1-1 - Use smaller chunk size while uploading for older versions of Cockpit. * Mon Jun 07 2021 Josh Boudreau 0.4.0-1 diff --git a/navigator/navigator.css b/navigator/navigator.css index ba3852c..aa6c666 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -22,7 +22,7 @@ --border: #bebebe; --navigation: #fff; --font: #1c1c1c; - --selected: #f8f8f8; + --selected: #eeeeee; --toggle-light: #151515; --toggle-dark: #ccc; --scrollbar-thumb: var(--border); @@ -34,6 +34,7 @@ --nav-entry-color: #555F6E; --nav-border-radius: 4px; --symlink-symbol-color: var(--navigation); + --list-view-header: var(--selected); } [data-theme="dark"] { @@ -51,6 +52,7 @@ --logo-45: #fff; --nav-entry-color: #555F6E; --symlink-symbol-color: var(--navigation); + --list-view-header: var(--container); } html { @@ -200,17 +202,25 @@ input[type="text"] { background-color: var(--navigation); border: 1px solid var(--border); border-radius: var(--nav-border-radius); - padding: 0.5em; display: flex; - flex-flow: row wrap; justify-content: flex-start; - align-items: flex-start; align-content: flex-start; overflow: auto; position: relative; } -.nav-item { +.contents-view-grid { + flex-flow: row wrap; + align-items: flex-start; + padding: 0.5em; +} + +.contents-view-list { + flex-flow: column nowrap; + align-items: stretch; +} + +.contents-view-grid > .nav-item { margin: 2px; padding: 3px; flex: 0; @@ -221,20 +231,12 @@ input[type="text"] { box-sizing: border-box; } -.nav-item-selected { - background-color: var(--selected); - border: 1px solid var(--border); - border-radius: var(--nav-border-radius); - box-sizing: border-box; - padding: 2px; -} - -.nav-item .nav-item-title { +.contents-view-grid > .nav-item > .nav-item-title { text-align: center; overflow-wrap: anywhere; } -.nav-item .nav-item-icon { +.contents-view-grid > .nav-item > .nav-item-icon { position: relative; text-align: center; width: 100px; @@ -242,22 +244,103 @@ input[type="text"] { color: var(--nav-entry-color); } -.nav-item-symlink-symbol-dir { +.contents-view-grid > .nav-item-selected { + background-color: var(--selected); + border: 1px solid var(--border); + border-radius: var(--nav-border-radius); + box-sizing: border-box; + padding: 2px; +} + +.contents-view-grid > .nav-item > .nav-item-icon > .nav-item-symlink-symbol-dir { position: absolute; color: var(--symlink-symbol-color); - font-size: 12pt; + font-size: 20%; bottom: 19%; right: 15%; } -.nav-item-symlink-symbol-file { +.contents-view-grid > .nav-item > .nav-item-icon > .nav-item-symlink-symbol-file { position: absolute; color: var(--symlink-symbol-color); - font-size: 12pt; + font-size: 20%; bottom: 6%; right: 25%; } +.contents-view-grid > .contents-view-list-header { + display: none; +} + +.contents-view-list-header { + background-color: var(--list-view-header); + cursor: default !important; +} + +.contents-view-list > .nav-item { + padding: 3px; + flex: 0; + display: flex; + flex: row nowrap; + align-items: baseline; + justify-content: flex-start; + cursor: pointer; + box-sizing: border-box; +} + +.contents-view-list > .nav-item:nth-child(even) { + background-color: var(--selected); +} + +.contents-view-list > .nav-item > .nav-item-title { + margin-left: 5px; + padding-right: 5px; +} + +.contents-view-list > .nav-item > .nav-item-icon { + position: relative; + text-align: center; + width: 20px; + color: var(--nav-entry-color); +} + +.contents-view-list > .nav-item-selected { + background-color: var(--selected); + border: 1px solid var(--border); + border-radius: var(--nav-border-radius); + box-sizing: border-box; + padding: 2px; +} + +.contents-view-list > .nav-item > .nav-item-icon > .nav-item-symlink-symbol-dir { + position: absolute; + color: var(--symlink-symbol-color); + font-size: 40%; + bottom: 19%; + right: 15%; +} + +.contents-view-list > .nav-item > .nav-item-icon > .nav-item-symlink-symbol-file { + position: absolute; + color: var(--symlink-symbol-color); + font-size: 40%; + bottom: 6%; + right: 25%; +} + +.contents-view-list > .nav-item > div { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + flex-basis: 0; + flex-grow: 1; +} + +.contents-view-list > .nav-item > div:first-of-type { + flex-basis: 0; + flex-grow: 2; +} + .nav-info-column { background-color: var(--container); flex-basis: 0; @@ -471,6 +554,10 @@ input:checked + .slider:before { left: -30%; } +.clickable { + cursor: pointer; +} + .nav-context-menu { display: none; position: absolute; diff --git a/navigator/navigator.html b/navigator/navigator.html index af53ca4..4689cb3 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -64,7 +64,15 @@
-