From 551c031c42ebfd3d5f7f3a931acbf5a20e8640ae Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Mon, 15 Dec 2014 00:56:54 +0100 Subject: [PATCH] Update layout. --- src/_h5ai/client/css/inc/download.less | 1 - src/_h5ai/client/css/inc/filter.less | 1 - src/_h5ai/client/css/inc/general.less | 22 +-- src/_h5ai/client/css/inc/preview.less | 58 +++----- src/_h5ai/client/css/inc/sidebar.less | 39 +++-- src/_h5ai/client/css/inc/topbar.less | 136 ++++++++++-------- src/_h5ai/client/css/inc/tree.less | 15 +- src/_h5ai/client/css/inc/view-details.less | 10 +- src/_h5ai/client/css/inc/view.less | 10 +- src/_h5ai/client/images/ascending.svg | 65 ++++++++- src/_h5ai/client/images/crumb.svg | 65 ++++++++- src/_h5ai/client/images/descending.svg | 65 ++++++++- src/_h5ai/client/images/download.svg | 67 +++++++-- src/_h5ai/client/images/fallback/ar.svg | 70 ++++++++- src/_h5ai/client/images/fallback/aud.svg | 69 ++++++++- src/_h5ai/client/images/fallback/bin.svg | 73 +++++++++- src/_h5ai/client/images/fallback/file.png | Bin 667 -> 254 bytes src/_h5ai/client/images/fallback/file.svg | 65 ++++++++- .../client/images/fallback/folder-page.svg | 65 ++++++++- .../client/images/fallback/folder-parent.png | Bin 1546 -> 428 bytes .../client/images/fallback/folder-parent.svg | 80 +++++++++-- src/_h5ai/client/images/fallback/folder.png | Bin 206 -> 268 bytes src/_h5ai/client/images/fallback/folder.svg | 71 ++++++++- src/_h5ai/client/images/fallback/img.svg | 67 ++++++++- src/_h5ai/client/images/fallback/txt.svg | 94 +++++++++++- src/_h5ai/client/images/fallback/vid.svg | 80 ++++++++--- .../client/images/favicon/favicon-152.png | Bin 800 -> 1143 bytes .../client/images/favicon/favicon-16-32.ico | Bin 5430 -> 5430 bytes src/_h5ai/client/images/filter.svg | 65 ++++++++- src/_h5ai/client/images/folder-open.svg | 3 - src/_h5ai/client/images/folder-page.svg | 65 ++++++++- src/_h5ai/client/images/folder.svg | 67 ++++++++- src/_h5ai/client/images/home.svg | 5 - src/_h5ai/client/images/loading.svg | 5 - src/_h5ai/client/images/page.svg | 67 ++++++++- src/_h5ai/client/images/preview/close.svg | 65 ++++++++- .../client/images/preview/fullscreen.svg | 71 +++++++-- src/_h5ai/client/images/preview/next.svg | 63 +++++++- .../client/images/preview/no-fullscreen.svg | 70 +++++++-- src/_h5ai/client/images/preview/prev.svg | 65 ++++++++- src/_h5ai/client/images/preview/raw.svg | 67 +++++++-- src/_h5ai/client/images/selected.svg | 69 ++++++++- src/_h5ai/client/images/settings.svg | 65 ++++++++- src/_h5ai/client/images/size.svg | 13 -- src/_h5ai/client/images/spinner.svg | 38 +---- src/_h5ai/client/images/tree.svg | 65 ++++++++- src/_h5ai/client/images/view-details.svg | 69 ++++++++- src/_h5ai/client/images/view-grid.svg | 73 ++++++++-- src/_h5ai/client/images/view-icons.svg | 71 ++++++++- src/_h5ai/client/js/inc/ext/crumb.js | 38 ++--- src/_h5ai/client/js/inc/ext/preview.js | 2 +- src/_h5ai/client/js/inc/view/ensure.js | 9 +- src/_h5ai/client/js/inc/view/sidebar.js | 12 +- src/_h5ai/conf/options.json | 2 +- 54 files changed, 2064 insertions(+), 428 deletions(-) delete mode 100644 src/_h5ai/client/images/folder-open.svg delete mode 100644 src/_h5ai/client/images/home.svg delete mode 100644 src/_h5ai/client/images/loading.svg delete mode 100644 src/_h5ai/client/images/size.svg diff --git a/src/_h5ai/client/css/inc/download.less b/src/_h5ai/client/css/inc/download.less index 59b6f576..675f71b1 100644 --- a/src/_h5ai/client/css/inc/download.less +++ b/src/_h5ai/client/css/inc/download.less @@ -1,7 +1,6 @@ #download { display: none; - .topbar-right; .transition(all 0.2s ease-in-out); &.failed { diff --git a/src/_h5ai/client/css/inc/filter.less b/src/_h5ai/client/css/inc/filter.less index 9320b630..b717222b 100644 --- a/src/_h5ai/client/css/inc/filter.less +++ b/src/_h5ai/client/css/inc/filter.less @@ -1,6 +1,5 @@ #filter { - .topbar-right; input { border: none; diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index b2117d6a..4b225c91 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -1,5 +1,7 @@ -// @col-blue: #2196F3; -@col-blue: #42a5f5; +@col-blue-400: #42a5f5; +@col-blue-500: #2196F3; +@col-blue-700: #1976D2; +@col-blue-900: #0D47A1; @col-green: #4caf50; @col-red: #f44336; @@ -20,7 +22,9 @@ @col-divider-white: rgba(255,255,255,0.12); @col-text-selected: @col-text-primary-white; -@col-back-selected: @col-blue; +@col-back-selected: @col-blue-400; + +@col-text-highlight: #111111; @col-font-light: @col-light; @col-font-dark: @col-dark; @@ -30,7 +34,7 @@ @col: @col-text-primary-black; @col-back: @col-back-dark; -@col-hover: @col-blue; +@col-hover: @col-blue-400; @col-border: rgba(0,0,0,0.05); @col-border-strong: rgba(0,0,0,0.15); @col-border-stronger: rgba(0,0,0,0.3); @@ -38,8 +42,8 @@ @col-okay: @col-green; @col-error: @col-red; -@col-link: @col-blue; -@col-link-hover: @col-blue; +@col-link: @col-blue-400; +@col-link-hover: @col-blue-400; @col-widget-back: rgb(245,245,245); @col-widget-back-highlight: rgba(255,255,255,0.8); @@ -63,8 +67,8 @@ @font-family-mono: monospace; -::-moz-selection { background: @col-blue; color: @col-text-primary-white; text-shadow: none; } -::selection { background: @col-blue; color: @col-text-primary-white; text-shadow: none; } +::-moz-selection { background: @col-blue-400; color: @col-text-primary-white; text-shadow: none; } +::selection { background: @col-blue-400; color: @col-text-primary-white; text-shadow: none; } .transition (@transition) { -webkit-transition: @transition; @@ -96,7 +100,7 @@ .rounded(); .transition(all 0.2s ease-in-out); color: @col-text-primary-white; - background: @col-blue; + background: @col-blue-400; border-radius: 2px; cursor: pointer; text-decoration: none; diff --git a/src/_h5ai/client/css/inc/preview.less b/src/_h5ai/client/css/inc/preview.less index 64f435bd..357948f8 100644 --- a/src/_h5ai/client/css/inc/preview.less +++ b/src/_h5ai/client/css/inc/preview.less @@ -38,17 +38,20 @@ cursor: pointer; img { + display: block; width: 48px; height: 48px; margin: -36px 0; padding: 12px; opacity: 0.5; + .transition(all 0.2s ease-in-out); } &:hover { img { - background-color: rgba(27,27,27,0.8); opacity: 1; + background-color: rgba(27,27,27,0.8); + box-shadow: 0 0 8px 2px rgba(0,0,0,0.3); } } } @@ -56,8 +59,7 @@ #pv-prev-area { left: 0; img { - border-top-right-radius: 8px; - border-bottom-right-radius: 8px; + border-radius: 0 8px 8px 0; padding-left: 48px; } } @@ -65,8 +67,7 @@ #pv-next-area { right: 0; img { - border-top-left-radius: 8px; - border-bottom-left-radius: 8px; + border-radius: 8px 0 0 8px; padding-right: 48px; } } @@ -79,65 +80,52 @@ img { position: relative; - top: -2px; - width: 16px; - height: 16px; - } - img + span, img + input { - margin-left: 6px; - } - input { - background-color: rgba(255,255,255,0.1); - border: none; - color: #ccc; + width: 24px; + height: 24px; + padding: 12px } .bar-label { display: block; - color: #ccc; - height: 30px; - line-height: 30px; - padding: 0 10px; + color: @col-text-primary-white; + height: 48px; + line-height: 48px; + padding: 0 12px; opacity: 0.7; .transition(all 0.2s ease-in-out); } - .bar-highlight { - background-color: rgba(255,255,255,0.1); - opacity: 1.0; - } - - @bar-sep-border: 1px solid rgba(255,255,255,0.08); - .bar-button { - .bar-label; + display: block; + line-height: 48px; + opacity: 0.7; cursor: pointer; + .transition(all 0.2s ease-in-out); + &:hover { - .bar-highlight; + opacity: 1.0; + background-color: rgba(255,255,255,0.1); } } .bar-left { float: left; - border-right: @bar-sep-border; } .bar-right { float: right; - border-left: @bar-sep-border; } } #pv-bottombar { position: fixed; z-index: 5; - width: 100%; - height: 32px; left: 0; + right: 0; bottom: 0; background-color: rgb(27,27,27); - border-top: 1px solid rgb(45,45,45); - + // box-shadow: 0 0 8px 0 rgba(0,0,0,0.2); + box-shadow: 0 0 8px 2px rgba(0,0,0,0.3); } #pv-overlay.fullscreen { diff --git a/src/_h5ai/client/css/inc/sidebar.less b/src/_h5ai/client/css/inc/sidebar.less index 7a5130ec..f9e45396 100644 --- a/src/_h5ai/client/css/inc/sidebar.less +++ b/src/_h5ai/client/css/inc/sidebar.less @@ -3,13 +3,13 @@ display: none; overflow: auto; flex: 0 0 auto; - order: 99; - width: 200px; - padding: 16px 8px 16px 16px; - border-left: 1px solid @col-border; + order: 0; + width: 264px; + border-right: 1px solid @col-border; } #settings { + padding: 16px 8px 16px 16px; .block { display: block; @@ -29,10 +29,8 @@ .transition(all 0.2s ease-in-out); display: block; - height: 30px; - line-height: 30px; - padding: 0 10px; outline: 0; + border-radius: 2px; &:hover { opacity: 1.0; @@ -49,21 +47,22 @@ } img { - position: relative; - top: -2px; - width: 16px; - height: 16px; + width: 24px; + height: 24px; + padding: 12px; } .view { display: inline-block; - margin: 0 4px 0 0; + margin: 4px; + border-radius: 2px; } .select { background: transparent; width: 175px; overflow: hidden; + border-radius: 2px; outline: 0; &:hover { @@ -99,9 +98,9 @@ input[type='range'] { border-radius: 2px; - width: 50px; - margin: 0 0 4px 12px; - padding: 0 8px; + width: 142px; + margin: 4px; + padding: 9px; vertical-align: middle; } @@ -110,9 +109,9 @@ -ms-appearance: none; -webkit-appearance: none; border-width: 0; - border-radius: 2px; + border-radius: 20px; background: @col-range-back; - height: 2px; + height: 6px; } .range-thumb() { @@ -120,10 +119,10 @@ -ms-appearance: none; -webkit-appearance: none; border-width: 0; - border-radius: 2px; + border-radius: 20px; background: @col-range-thumb; - width: 12px; - height: 12px; + width: 16px; + height: 16px; } input[type='range']::-webkit-slider-runnable-track { .range-track; } diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less index b5f5d5df..f288a01b 100644 --- a/src/_h5ai/client/css/inc/topbar.less +++ b/src/_h5ai/client/css/inc/topbar.less @@ -3,84 +3,94 @@ overflow: hidden; flex: 0 0 auto; order: 1; - min-height: 30px; - font-weight: lighter; - background: #fafafa; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-start; + align-content: flex-start; + align-items: stretch; + + background: @col-lightgray; box-shadow: 0 0 8px 0 rgba(0,0,0,0.2); z-index: 1; } -.topbar-hover { - color: @col-hover; -} - -.topbar-left { - float: left; - // border-right: @border-widget-sep; -} - -.topbar-right { - float: right; - // border-left: @border-widget-sep; -} - - #navbar { - list-style: none; - list-style-image: none; - margin: 0; - padding: 0; + display: none; +} - a, a:active, a:visited, span.element { + +#toolbar { + overflow: hidden; + flex: 0 0 auto; + order: 1; + height: 48px; + + .tool { + display: inline-block; + cursor: pointer; + + img { + display: inline-block; + width: 24px; + height: 24px; + padding: 12px; + } + } +} + + +#crumbbar { + overflow: hidden; + flex: 0 0 auto; + order: 2; + height: 48px; + font-size: 16px; + padding: 0 8px; + border-left: 1px solid rgba(0,0,0,0.05); + + a, a:active, a:visited { color: @col; cursor: pointer; text-decoration: none; - .transition(all 0.2s ease-in-out); - display: block; - height: 48px; - line-height: 48px; - font-size: 15px; - padding: 0 6px; - - &:hover { - .topbar-hover; + &.current { + font-weight: bold; + color: @col-text-highlight; + } + &:hover { + color: @col-hover; + } + &:focus { + outline: 0; } - } - .current { - font-weight: bold; - } - .element { - } - img { - position: relative; - top: -1px; - width: 16px; - height: 16px; - opacity: 0.8; - } - img + span, img + input { - margin-left: 8px; } .crumb { - .topbar-left; - .hint { - margin-left: 8px; - font-style: italic; - color: #999; - } - img.hint { - opacity: 0.8; - width: 12px; - height: 12px; - } - &.root, &.domain { - margin-left: 10px; - } + display: inline-block; + .transition(all 0.2s ease-in-out); } - .view { - .topbar-right; + .sep { + width: 24px; + height: 24px; + padding: 12px 0; + line-height: 48px; + display: inline-block; + vertical-align: top; + } + .label { + line-height: 48px; + display: inline-block; + vertical-align: top; + padding: 0 8px; + } + .hint { + width: 16px; + height: 16px; + padding: 16px 4px 16px 0; + line-height: 48px; + display: inline-block; + vertical-align: top; } } diff --git a/src/_h5ai/client/css/inc/tree.less b/src/_h5ai/client/css/inc/tree.less index 0538abf7..c8a0859e 100644 --- a/src/_h5ai/client/css/inc/tree.less +++ b/src/_h5ai/client/css/inc/tree.less @@ -31,12 +31,12 @@ .indicator { display: inline-block; position: relative; - top: -1px; + top: -2px; cursor: pointer; img { - width: 12px; - height: 12px; + width: 20px; + height: 20px; .transition(all 0.2s ease-in-out); } &.open { @@ -56,14 +56,17 @@ .icon { position: relative; top: -2px; - margin: 0 8px; img { - width: 16px; - height: 16px; + width: 20px; + height: 20px; } } + .label { + margin: 0 0 0 4px; + } + .content { list-style: none; margin: 0; diff --git a/src/_h5ai/client/css/inc/view-details.less b/src/_h5ai/client/css/inc/view-details.less index 34ed58c5..d5801ed7 100644 --- a/src/_h5ai/client/css/inc/view-details.less +++ b/src/_h5ai/client/css/inc/view-details.less @@ -55,9 +55,9 @@ display: none; position: relative; top: -2px; - width: 12px; - height: 12px; - padding: 0 8px; + width: 20px; + height: 20px; + padding: 0 4px; } .ascending .sort.ascending, @@ -109,9 +109,5 @@ top: 0; } - .selector { - left: -5px; - } - .view-details-sized(16px) } diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less index d11a47f8..c493d955 100644 --- a/src/_h5ai/client/css/inc/view.less +++ b/src/_h5ai/client/css/inc/view.less @@ -102,16 +102,14 @@ .selector { display: none; position: absolute; - left: -1px; - top: 4px; + left: 0; + top: 0; width: 22px; height: 22px; - background-color: #fff; + background-color: @col-back-selected; cursor: pointer; - box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.4); - border-radius: 0 2px 2px 0; + border-radius: 0 0 2px 0; opacity: 0.6; - padding: 0 0 0 4px; &:hover { opacity: 0.8; diff --git a/src/_h5ai/client/images/ascending.svg b/src/_h5ai/client/images/ascending.svg index 8218272e..f3126a98 100644 --- a/src/_h5ai/client/images/ascending.svg +++ b/src/_h5ai/client/images/ascending.svg @@ -1,5 +1,60 @@ - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/crumb.svg b/src/_h5ai/client/images/crumb.svg index 3a7f0e1f..3cf99894 100644 --- a/src/_h5ai/client/images/crumb.svg +++ b/src/_h5ai/client/images/crumb.svg @@ -1,7 +1,58 @@ - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/images/descending.svg b/src/_h5ai/client/images/descending.svg index cf80e0fa..3816dc29 100644 --- a/src/_h5ai/client/images/descending.svg +++ b/src/_h5ai/client/images/descending.svg @@ -1,5 +1,60 @@ - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/download.svg b/src/_h5ai/client/images/download.svg index b0e21bc3..18f3dba5 100644 --- a/src/_h5ai/client/images/download.svg +++ b/src/_h5ai/client/images/download.svg @@ -1,9 +1,58 @@ - - - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/ar.svg b/src/_h5ai/client/images/fallback/ar.svg index 1ad5f409..e96fe183 100644 --- a/src/_h5ai/client/images/fallback/ar.svg +++ b/src/_h5ai/client/images/fallback/ar.svg @@ -1,4 +1,66 @@ - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/aud.svg b/src/_h5ai/client/images/fallback/aud.svg index 732c5681..7d4fc587 100644 --- a/src/_h5ai/client/images/fallback/aud.svg +++ b/src/_h5ai/client/images/fallback/aud.svg @@ -1,8 +1,63 @@ - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/bin.svg b/src/_h5ai/client/images/fallback/bin.svg index f11abe44..3c839ce7 100644 --- a/src/_h5ai/client/images/fallback/bin.svg +++ b/src/_h5ai/client/images/fallback/bin.svg @@ -1,4 +1,69 @@ - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/file.png b/src/_h5ai/client/images/fallback/file.png index f44acd917cfe2fcb7f9bc4981a643cf6e4976bca..b3af9777c27ef96a795c131698763635d04254b0 100644 GIT binary patch delta 187 zcmbQu`j1huGr-TCmrII^fq{Y7)59eQNK1e)2OE%lP;UEUqM~nowWo_?h)3t!X$N^5 z6a-kh?a95B*#(C}O?xi5E{S5FZO6?2fdPbmI9;m_Xt?q2d*IZ28>CdS kA39gOI{V>w{82`ZqY{E?Jry?RfbL=NboFyt=akR{0Ft6d`v3p{ literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4`<7^~W?*1^>*?YcQZeW4-IKn|jtnjr zjg&Zy6nGUn{EkoXb9I#HsBPD2b5`ECE79ltl$QVY)2nrCx7wKNwX;@UuQh-mJ{ToQ+-xQWweew00omxxZcvwx_vO8&$&eDui+ZXrlW85}h^{uy6?isbcoYK4sp4;Y! z2%eMLd{V$n&S6rH{VJt7=4q1^7(UE;%O2Wt`q&z4CWiN$YV|YyFNG#w6J>1hzqv2i zbw}QrU5X4Je7EI?3g$^|*5hDUbK+a?tNcT`$=}jh7^H6Q3v%6&edb>a!vX%A`$AlI zRTJm|;1ea~+Lj>nl&E-6BB4@sr)r(R& zhU}EzORh&kJ - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/folder-page.svg b/src/_h5ai/client/images/fallback/folder-page.svg index 4950fa07..38c3c667 100644 --- a/src/_h5ai/client/images/fallback/folder-page.svg +++ b/src/_h5ai/client/images/fallback/folder-page.svg @@ -1,3 +1,62 @@ - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/folder-parent.png b/src/_h5ai/client/images/fallback/folder-parent.png index dcc3e4dd9f9998df266fb7c9436a7e062257f935..b0c1225b17af0bf9ff43db00bfde0a96a381c54d 100644 GIT binary patch delta 363 zcmV-x0hIoV46FkoiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mz@e*q~; zL_t(YiRD$hO~pVEoH2Ak2P8xg(F91owe&0+KqLgDn1Fzo68OkoCscvp6+j1cfxQGg zq?0+@=Vv_$=}olK?agR+cJF9r*d&sTvTu)oh!i4HtRuiNlSQO3vuglf01j03V~W6F z1s-`raxs-00Cr=@%`8_{ok|Y$e^lU;130Vex?G1G2zcO;$KVsdJAgY?U4|0oj_DqN zQvk2dxyw*OaEiJuQq||sa+$ikMkGFUKAi0q_y${Pn@F507q_bZDk-+d2M2EY-wX4Nn>wrAXI2&ZDo$6DXRbg1zbr)K~#90?b~l? zR#hCp@$cEQ>DGotM2Nl8d=Vw71wkf}!=y=Kv3u_N!%ztNgV;YQUnC{{Aq;}F7nMOp z(l$NMHrcRMB#nXyBdj1JBD2V8f2*~kt$ci*=bm0nMMd4c^PGF1w%_OFc7Nyh+xhK0 zyZ4+s5JCtcgb+dqA%qY@2qAoxmiH&E9n79=-zjF8#{ zs~QAMl(t@Vq*gIU*+h0Iq#7>1jGM-zmUebthMOdFuJe%4z1c!H48 zp`oE4y%m&!%o-4e;YQ$zgkih;`}<2C%E?S74G4l@gSGalgkhsm6g}dlpbVwnfG`Z# zE2W-E7*v&2-X2FBn&G7cN$|lJ(QHW)E;WI)(-(MB@8=0 z`FRf|RfJSlKp2K=fGr8bCjI0?3M)WseJ}88!dz2g^1*WhwAS|kuP4kiWhNgyHXsbc zRo2=!NOq@XfvlWZ0QohA?=zz6$Lq4BxV{Aow<+K4|7&cpLJE)Ld*7Njf zxm*sqy1EYeOyaBoVHne_GSh(sH?v!JYmMXliPj-q6s{11xhnZiU!aTU&eGwr$%+T@LE> zHnFd-uTWoKzY^H(a@-1WWuZ`b%=MsNo_SaCsZZS5}Lri7toU=;tie+^9RHhHAF zx_WMVd%Lp-MQ=~St*x!~M~)nM7q~HD=w4u{G3E~sWdWeIf3B;ls+w=Dz1CX$Ffcc6 ztWxUb9Xob7dx60BUQh$@9&kg#Q14AR?$~PG1gs(6eEbf~G{!i2Il${yfiY&JP$)D3 zpCt@k2z;ouzSu)qr|9kN{l^%yRw)(ti1ZSrRMKClv+}-I)6>)QH*gE^dBV`tngB33 zIQTs9MVxD`f3+)JtY1bVgBUUyiHG5-SlVqAKetDLFt z*LQb!4*^SoZxV(svew4^h&Uf{4rc0HCClW%#2E8if2mYz1inoYrA4(D>YM&SFnF;Ns< za1S9x>jrbBxCpgvtx#R+m0II60F16NPGdenY70Kt|xryXI zn@RN_hvyOm!5vDe_VXNOmoes6Cj}i-F&{zye*=Xmiq^XxR2mSIwf2F|&d#Jy@8gmN z#Ire{&%fzoU}?bkULpQAbz&8D7gS-2*4nlCeEv0`Nn{0_*(XsHE%H72AS>W>dx4F{ zn4Yu}PUQw11r7uIl~TKuQr+9PZ~r0fBBo3O>gwuxi^bw>0HxGOdwcs3DZKwLgb+dq sC?SLpLI@#*5JCtcgb+dqAw&lL1Nc9p?~@mr%K!iX07*qoM6N<$f^?Y8pa1{> diff --git a/src/_h5ai/client/images/fallback/folder-parent.svg b/src/_h5ai/client/images/fallback/folder-parent.svg index 21a79fc1..b8eb8ec0 100644 --- a/src/_h5ai/client/images/fallback/folder-parent.svg +++ b/src/_h5ai/client/images/fallback/folder-parent.svg @@ -1,8 +1,72 @@ - - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/folder.png b/src/_h5ai/client/images/fallback/folder.png index a7bf93340d58254503718eeddfc26d167f505ce5..b29d7c4d521b1369e1df53bfc159697d528c6730 100644 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4K)4^-Rsq_QHl8S#$PP;ry0-W@G9P6Te3$fH23QqqYX=@*gY_A?)+=^ zfr;x8*PNFQ>{cJRpS0~w59ihColsN4cs2jk)O6mPs__fX$bH(Ra`6n%Q4F50elF{r G5}E*8U0)0U literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=Jv7|ftIx;Y9?C1WI$O`0h2Ka=y zhK7a$nLskp+^h=7Vk!yp3vOWW6$mW`@{&AV978;gzrD7Rx4}TbIZ*$gkfdrVi*l-f zRY`Er#LW|f*g1FC9?kDfHqvRcJ?7Uqt$_1N%MA%GNA(3P?gu#g9E3y~RWz7916X_$ vT^4lqEZFm)Q$fvGf`_g7A^(Sy>cz}F)wwsTdgk*1ZDa6s^>bP0l+XkKb*DUM diff --git a/src/_h5ai/client/images/fallback/folder.svg b/src/_h5ai/client/images/fallback/folder.svg index 649e9b40..5ddef238 100644 --- a/src/_h5ai/client/images/fallback/folder.svg +++ b/src/_h5ai/client/images/fallback/folder.svg @@ -1,3 +1,68 @@ - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/img.svg b/src/_h5ai/client/images/fallback/img.svg index 5ac43c90..fe2994c6 100644 --- a/src/_h5ai/client/images/fallback/img.svg +++ b/src/_h5ai/client/images/fallback/img.svg @@ -1,4 +1,63 @@ - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/txt.svg b/src/_h5ai/client/images/fallback/txt.svg index a4ff9150..ef8348e7 100644 --- a/src/_h5ai/client/images/fallback/txt.svg +++ b/src/_h5ai/client/images/fallback/txt.svg @@ -1,6 +1,88 @@ - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/_h5ai/client/images/fallback/vid.svg b/src/_h5ai/client/images/fallback/vid.svg index 8867392f..20bc0152 100644 --- a/src/_h5ai/client/images/fallback/vid.svg +++ b/src/_h5ai/client/images/fallback/vid.svg @@ -1,17 +1,63 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/_h5ai/client/images/favicon/favicon-152.png b/src/_h5ai/client/images/favicon/favicon-152.png index 3f8e9fa5ffd7042d7668810ea5719516a00f77a7..f17f7d47e38f030f9a8a3c74ae809a74d42696f5 100644 GIT binary patch literal 1143 zcmeAS@N?(olHy`uVBq!ia0vp^GeDSw4M<8HQcwg^EX7WqAsj$Z!;#Vf4nJ zgs%i)MirxddO$(R64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<{Ozj(Sh zhE&XXd)vBuZm5L&N7H+kc$A%V78QETc5*y@MNz=Po265gB=8->c2 zCmeaeK4DAOwnrY9SX32z&&qVqbmZ3m{BHCAV!d_o`{!>?)W272F}?R@PTQ1EM;4hc z_?ni`Wn|zgIb#uzPaxYe4d&n}jhd$ph@=uP{A%Tq3#)Fi=rKKSG(M0y&G=b(C=o34Af^GKq-tT&^g~bnSUA1f93*R-9->FB0?&Yho zEVK4LtbS7=wlVZ-u}n;_KF|G&pA0rJR;@o#9{GO9f!9SH_YT~X+133tHKlk~jceG| z%?H-&JXim$88>}ymD0_3G22hoOe%fF`Si_)*fng*uP+q4?qjW)cC*j#0#60Q9rii~ zJNCTo*W`L@CjP%2y4*gO;XLzt26z76y{m3X{#0UHw*MAWUf9*^p<8W}7Bs$mAH%e7 z^{Va9Wm6JVe#+k?G|Fg^omseFSD{p9gxqlB&%ROiSTbX%3Q|``h z-g+&Md3)9M?9@9}Hm~(Q*IlR*y)nDEZQ6A?_Vhcs>kdR^_cw4Km|OWQL-Q`9p3J<$ z?ZAX@mSP@S%DRIwhfi{aYbDQ~>ruNclWuG{z_1FQQrArWVEsX~VC&Xzmsc!wX0{Fr zoqfRdflUFMMQ{8X{n@n-7z^Zo2>w{M^;^Z4ZWpG>eLq41NzOJHVZOqi;iUf#*UrPw RS%HNFgQu&X%Q~loCIF{M?Qj49 literal 800 zcmeAS@N?(olHy`uVBq!ia0vp^GeDSw4M<8HQcwg^EX7WqAsj$Z!;#Vf4nJ zG}nSK9gP2NC6eegA|2i zmgJ-|xaZ~PrYZzi<|gImWF{+kCg69igRw&l;8X}P>1{{AB`f2mBf_QQz|PqV%; zO!G}x!s6zIOsqR!nz8-%-5$ezb6(%8f0w!ce*J9QM?yL0KC1ptkKs@5=~tJJ?%Vyh zuHL%(NRGPw#79-vuHVfo2lH6f)`_pR+q9Tj`1VCpO~4UF5k`{I5IW5CgnVv+Pd=1FHZcEnz7^F z-6ZAT$_9nLn@^mmF?Cu*u uo$JpEEY93J&{V19$=NgIfCn;hg+G2mg7?C(IqATJ%HZkh=d#Wzp$P!LM7UbgK_8Du*nS!j`matc z%6D$YnBGAcK^(^sn6^ZuIxco}9+M<7U7$KnAHBSb?ou}Q`gZR0l)u+4^8cBp>5bE0 zH-C_sIhm%mZvK*!+a{gij420*%z~Cc_8F*-LU|?x5l}uVFNo*q%))jIgJ*`5^Zq&a zkaNM>9I@u_Sl=&8?o$5W3Dl&IEjKV6SVu>SOXZ268jq zgYPm{_2vCnxyI+;&p*HZ{+)Y0|FFLuI{#7&T=%&Dd{BG;o{?P~d*J^szWXi9vPZj=$|E=q6(T)FTp_lACE^(vBNH$O9V@T}Et@>fu~LROang{p^!(z}v)^-a zKFI-ASfeOF?{M1!CjidH@q_rC*qIm~84+^!?=N*<5*2IHDNo zs5l@Fhy&t)I3Ny)1LA-<@E;uLyW@@d&O`5oQ`RsvcYCjzqK2`#r>G$}cU!{(J+~bG T7|h)^R%2%`9PER#$r-vYEiUpH diff --git a/src/_h5ai/client/images/filter.svg b/src/_h5ai/client/images/filter.svg index 17584b27..2f4a8608 100644 --- a/src/_h5ai/client/images/filter.svg +++ b/src/_h5ai/client/images/filter.svg @@ -1,5 +1,62 @@ - - - + + + + + + + + + + image/svg+xml + + + + + + + - \ No newline at end of file + diff --git a/src/_h5ai/client/images/folder-open.svg b/src/_h5ai/client/images/folder-open.svg deleted file mode 100644 index fbf534be..00000000 --- a/src/_h5ai/client/images/folder-open.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/_h5ai/client/images/folder-page.svg b/src/_h5ai/client/images/folder-page.svg index 4631c270..38c3c667 100644 --- a/src/_h5ai/client/images/folder-page.svg +++ b/src/_h5ai/client/images/folder-page.svg @@ -1,3 +1,62 @@ - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/folder.svg b/src/_h5ai/client/images/folder.svg index 3aa840c6..cfaf5d04 100644 --- a/src/_h5ai/client/images/folder.svg +++ b/src/_h5ai/client/images/folder.svg @@ -1,3 +1,64 @@ - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/home.svg b/src/_h5ai/client/images/home.svg deleted file mode 100644 index 28077556..00000000 --- a/src/_h5ai/client/images/home.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/_h5ai/client/images/loading.svg b/src/_h5ai/client/images/loading.svg deleted file mode 100644 index fb362b7f..00000000 --- a/src/_h5ai/client/images/loading.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/_h5ai/client/images/page.svg b/src/_h5ai/client/images/page.svg index dc2dd5ca..38c3c667 100644 --- a/src/_h5ai/client/images/page.svg +++ b/src/_h5ai/client/images/page.svg @@ -1,5 +1,62 @@ - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/close.svg b/src/_h5ai/client/images/preview/close.svg index 92e3aef9..7742ac84 100644 --- a/src/_h5ai/client/images/preview/close.svg +++ b/src/_h5ai/client/images/preview/close.svg @@ -1,7 +1,58 @@ - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/fullscreen.svg b/src/_h5ai/client/images/preview/fullscreen.svg index 301b4788..3d7d55ec 100644 --- a/src/_h5ai/client/images/preview/fullscreen.svg +++ b/src/_h5ai/client/images/preview/fullscreen.svg @@ -1,13 +1,58 @@ - - - - - - - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/next.svg b/src/_h5ai/client/images/preview/next.svg index 322f8058..ebfb271c 100644 --- a/src/_h5ai/client/images/preview/next.svg +++ b/src/_h5ai/client/images/preview/next.svg @@ -1,5 +1,58 @@ - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/no-fullscreen.svg b/src/_h5ai/client/images/preview/no-fullscreen.svg index 86ed7217..e00b2dc3 100644 --- a/src/_h5ai/client/images/preview/no-fullscreen.svg +++ b/src/_h5ai/client/images/preview/no-fullscreen.svg @@ -1,12 +1,58 @@ - - - - - - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/prev.svg b/src/_h5ai/client/images/preview/prev.svg index 8d70e0d3..4043bf15 100644 --- a/src/_h5ai/client/images/preview/prev.svg +++ b/src/_h5ai/client/images/preview/prev.svg @@ -1,5 +1,60 @@ - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/preview/raw.svg b/src/_h5ai/client/images/preview/raw.svg index decb5f60..0e7ddb68 100644 --- a/src/_h5ai/client/images/preview/raw.svg +++ b/src/_h5ai/client/images/preview/raw.svg @@ -1,9 +1,58 @@ - - - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/images/selected.svg b/src/_h5ai/client/images/selected.svg index 67ad38d7..033e724b 100644 --- a/src/_h5ai/client/images/selected.svg +++ b/src/_h5ai/client/images/selected.svg @@ -1,3 +1,66 @@ - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/_h5ai/client/images/settings.svg b/src/_h5ai/client/images/settings.svg index 7658d952..4db49002 100644 --- a/src/_h5ai/client/images/settings.svg +++ b/src/_h5ai/client/images/settings.svg @@ -1,5 +1,62 @@ - - - + + + + + + image/svg+xml + + + + + + + + - \ No newline at end of file + diff --git a/src/_h5ai/client/images/size.svg b/src/_h5ai/client/images/size.svg deleted file mode 100644 index 9840633e..00000000 --- a/src/_h5ai/client/images/size.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/_h5ai/client/images/spinner.svg b/src/_h5ai/client/images/spinner.svg index ebe0d921..a5f7a7b6 100644 --- a/src/_h5ai/client/images/spinner.svg +++ b/src/_h5ai/client/images/spinner.svg @@ -1,32 +1,6 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + diff --git a/src/_h5ai/client/images/tree.svg b/src/_h5ai/client/images/tree.svg index 3a7f0e1f..3cf99894 100644 --- a/src/_h5ai/client/images/tree.svg +++ b/src/_h5ai/client/images/tree.svg @@ -1,7 +1,58 @@ - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/_h5ai/client/images/view-details.svg b/src/_h5ai/client/images/view-details.svg index 85d0d458..d83d9c4a 100644 --- a/src/_h5ai/client/images/view-details.svg +++ b/src/_h5ai/client/images/view-details.svg @@ -1,5 +1,64 @@ - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/_h5ai/client/images/view-grid.svg b/src/_h5ai/client/images/view-grid.svg index d9fb7219..6fec7563 100644 --- a/src/_h5ai/client/images/view-grid.svg +++ b/src/_h5ai/client/images/view-grid.svg @@ -1,8 +1,65 @@ - - - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/_h5ai/client/images/view-icons.svg b/src/_h5ai/client/images/view-icons.svg index 56655371..04b27225 100644 --- a/src/_h5ai/client/images/view-icons.svg +++ b/src/_h5ai/client/images/view-icons.svg @@ -1,6 +1,65 @@ - - - - - - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/_h5ai/client/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js index d150d4dd..8ff97cb4 100644 --- a/src/_h5ai/client/js/inc/ext/crumb.js +++ b/src/_h5ai/client/js/inc/ext/crumb.js @@ -4,14 +4,11 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ enabled: false }, allsettings.crumb); var template = - '
  • ' + - '' + - '>' + - '' + - '' + - '
    • '; + '' + + '>' + + '' + + ''; var pageHintTemplate = 'has index page'; - var statusHintTemplate = ''; function update(item, force) { @@ -21,25 +18,16 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ } var $html = $(template); - var $a = $html.find('a'); $html .addClass(item.isFolder() ? 'folder' : 'file') .data('item', item); - location.setLink($a, item); - $a.find('span').text(item.label).end(); + location.setLink($html, item); + $html.find('.label').text(item.label).end(); - if (item.isDomain()) { - $html.addClass('domain'); - // $a.find('img').attr('src', resource.image('home')); - $a.find('img').remove(); - } - - if (item.isRoot()) { - $html.addClass('root'); - // $a.find('img').attr('src', resource.image('home')); - $a.find('img').remove(); + if (item.isDomain() || item.isRoot()) { + $html.find('.sep').remove(); } if (item.isCurrentFolder()) { @@ -47,7 +35,7 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ } if (!item.isManaged) { - $a.append($(pageHintTemplate)); + $html.append($(pageHintTemplate)); } if (item.$crumb) { @@ -61,10 +49,10 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ function onLocationChanged(item) { var crumb = item.getCrumb(); - var $ul = $('#navbar'); + var $crumbbar = $('#crumbbar'); var found = false; - $ul.find('.crumb').each(function () { + $crumbbar.find('.crumb').each(function () { var $html = $(this); if ($html.data('item') === item) { @@ -76,10 +64,10 @@ modulejs.define('ext/crumb', ['_', '$', 'core/settings', 'core/resource', 'core/ }); if (!found) { - $ul.find('.crumb').remove(); + $crumbbar.find('.crumb').remove(); _.each(crumb, function (e) { - $ul.append(update(e, true)); + $crumbbar.append(update(e, true)); }); } } diff --git a/src/_h5ai/client/js/inc/ext/preview.js b/src/_h5ai/client/js/inc/ext/preview.js index 6415ff07..f2ddd777 100644 --- a/src/_h5ai/client/js/inc/ext/preview.js +++ b/src/_h5ai/client/js/inc/ext/preview.js @@ -37,7 +37,7 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor var $container = $('#pv-content'); var $spinner = $('#pv-spinner'); var margin = isFullscreen ? 0 : 20; - var barHeight = isFullscreen ? 0 : 31; + var barHeight = isFullscreen ? 0 : 48; $container.css({ width: winWidth - 2 * margin, diff --git a/src/_h5ai/client/js/inc/view/ensure.js b/src/_h5ai/client/js/inc/view/ensure.js index 051d04cc..0d21eb8d 100644 --- a/src/_h5ai/client/js/inc/view/ensure.js +++ b/src/_h5ai/client/js/inc/view/ensure.js @@ -1,14 +1,15 @@ modulejs.define('view/ensure', ['$', 'config', 'core/event'], function ($, config, event) { var templateTopbar = - '
    ' + - '' + + '
    ' + + '
    ' + + '
    ' + + ''; var templateMainRow = '
    ' + ''; diff --git a/src/_h5ai/client/js/inc/view/sidebar.js b/src/_h5ai/client/js/inc/view/sidebar.js index 44cdbfc5..3cf27012 100644 --- a/src/_h5ai/client/js/inc/view/sidebar.js +++ b/src/_h5ai/client/js/inc/view/sidebar.js @@ -2,11 +2,9 @@ modulejs.define('view/sidebar', ['$', 'core/resource', 'core/store'], function ( var storekey = 'sidebarIsVisible'; var toggleTemplate = - ''; + ''; function update(toggle) { @@ -32,8 +30,8 @@ modulejs.define('view/sidebar', ['$', 'core/resource', 'core/store'], function ( function init() { $(toggleTemplate) - .appendTo('#navbar') - .on('click', 'a', function (ev) { + .appendTo('#toolbar') + .on('click', function (ev) { update(true); ev.preventDefault(); diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index 05f5e788..fde5a4c3 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -35,7 +35,7 @@ Options "hidden": ["^\\.", "^_{{pkg.name}}"], "hideFolders": false, "hideIf403": true, - "hideParentFolder": true, + "hideParentFolder": false, "modes": ["details", "grid", "icons"], "setParentFolderLabels": true, "sizes": [20, 40, 60, 80, 100, 150, 200, 250, 300, 350, 400],