diff --git a/LICENSE.md b/LICENSE.md
index bab9d95b..35363c3f 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Lars Jung, http://larsjung.de
+Copyright (c) 2013 Lars Jung, http://larsjung.de
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
index 9c848e40..59f7a38b 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ instructions on the [project page](http://larsjung.de/h5ai/).
## Build
-( there are repositories of the latest [releases](http://release.larsjung.de/h5ai/) and [dev builds](http://release.larsjung.de/h5ai/dev/) )
+( there are repositories for the latest [releases](http://release.larsjung.de/h5ai/) and [dev builds](http://release.larsjung.de/h5ai/dev/) )
If you want to build **h5ai** yourself you need to install the build tool [fQuery](http://larsjung.de/fquery/) first:
@@ -39,6 +39,7 @@ You'll find a new directory `build` including a fresh zipball.
It profits from these great projects:
[Faenza icon set](http://tiheum.deviantart.com/art/Faenza-Icons-173323228) (GPL),
+[Gnome Symbolic Icon Theme](https://git.gnome.org/browse/gnome-icon-theme-symbolic/) (CC BY-SA 3.0),
[HTML5 ★ Boilerplate](http://html5boilerplate.com) (MIT),
[jQuery](http://jquery.com) (MIT),
[jQuery.filedrop](http://www.github.com/weixiyen/jquery-filedrop) (MIT),
@@ -64,6 +65,8 @@ It profits from these great projects:
* removes `aai` mode!
* adds smart browsing
* add line wrap and line highlighting (on hover) to text preview
+* new design (colors, images)
+* now uses `SVG` images for the interface
### v0.22.1 - *2012-10-16*
diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less
index 2c6255fc..58b1c6c5 100644
--- a/src/_h5ai/client/css/inc/general.less
+++ b/src/_h5ai/client/css/inc/general.less
@@ -3,7 +3,7 @@
@col-back: rgb(255,255,255);
@col-hover: rgb(29,119,194);
@col-border: rgba(0,0,0,0.05);
-@col-border-strong: rgba(0,0,0,0.1);
+@col-border-strong: rgba(0,0,0,0.15);
@col-error: rgb(204,51,51);
@@ -16,9 +16,12 @@
@col-widget-back-sel: rgba(255,255,255,0.8);
@col-widget-sep: @col-border;
-@col-sb-back: rgb(210,210,210);
-@col-sb-thumb: rgb(180,180,180);
-@col-sb-thumb-active: rgb(150,150,150);
+// @col-sb-back: rgb(210,210,210);
+// @col-sb-thumb: rgb(180,180,180);
+// @col-sb-thumb-active: rgb(150,150,150);
+@col-sb-back: rgba(0,0,0,0.08);
+@col-sb-thumb: rgba(0,0,0,0.15);
+@col-sb-thumb-active: rgba(0,0,0,0.25);
@border-widget: 1px solid @col-border;
diff --git a/src/_h5ai/client/css/inc/preview-img.less b/src/_h5ai/client/css/inc/preview-img.less
index c3864013..4dc13823 100644
--- a/src/_h5ai/client/css/inc/preview-img.less
+++ b/src/_h5ai/client/css/inc/preview-img.less
@@ -97,7 +97,7 @@
opacity: 1.0;
}
- @bar-sep-border: 1px solid rgba(255,255,255,0.05);
+ @bar-sep-border: 1px solid rgba(255,255,255,0.08);
.bar-button {
.bar-label;
@@ -125,6 +125,7 @@
height: 32px;
left: 0;
bottom: 0;
- .vert-gradient(rgb(27,27,27), rgb(14,14,14));
+ // .vert-gradient(rgb(27,27,27), rgb(14,14,14));
+ background-color: rgb(27,27,27);
border-top: 1px solid rgb(45,45,45);
}
diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less
index 90643624..04b52559 100644
--- a/src/_h5ai/client/css/inc/topbar.less
+++ b/src/_h5ai/client/css/inc/topbar.less
@@ -79,6 +79,8 @@
}
img.hint {
opacity: 0.8;
+ width: 12px;
+ height: 12px;
}
}
.view {
diff --git a/src/_h5ai/client/css/inc/tree.less b/src/_h5ai/client/css/inc/tree.less
index 8f4f2db2..2f258b6f 100644
--- a/src/_h5ai/client/css/inc/tree.less
+++ b/src/_h5ai/client/css/inc/tree.less
@@ -12,15 +12,15 @@
border-right: @border-widget;
.sp-scrollbar {
- margin: 8px 8px 8px 0;
+ // margin: 8px 8px 8px 0;
width: 6px;
background-color: @col-sb-back;
- .border-radius(3px);
+ // .border-radius(3px);
cursor: pointer;
.sp-thumb {
background-color: @col-sb-thumb;
- .border-radius(3px);
+ // .border-radius(3px);
}
&.active .sp-thumb {
background-color: @col-sb-thumb-active;
diff --git a/src/_h5ai/client/css/inc/view-list.less b/src/_h5ai/client/css/inc/view-list.less
index f1a27bba..f2f67c97 100644
--- a/src/_h5ai/client/css/inc/view-list.less
+++ b/src/_h5ai/client/css/inc/view-list.less
@@ -37,7 +37,7 @@
}
.label {
- margin: 0 270px 0 106px;
+ margin: 0 0 0 106px;
}
.date {
diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less
index dd2ab451..f75c44c7 100644
--- a/src/_h5ai/client/css/inc/view.less
+++ b/src/_h5ai/client/css/inc/view.less
@@ -14,7 +14,7 @@
@item-background-col-hover: rgba(0,0,0,0.02);
@item-border-col-hover: @col-border;
-@item-background-col-sel: rgba(0,0,0,0.04);
+@item-background-col-sel: rgba(0,0,0,0.02);
@item-border-col-sel: @col-border-strong;
diff --git a/src/_h5ai/client/images/ascending.png b/src/_h5ai/client/images/ascending.png
deleted file mode 100644
index 4385011f..00000000
Binary files a/src/_h5ai/client/images/ascending.png and /dev/null differ
diff --git a/src/_h5ai/client/images/ascending.svg b/src/_h5ai/client/images/ascending.svg
new file mode 100644
index 00000000..472e31b6
--- /dev/null
+++ b/src/_h5ai/client/images/ascending.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/blank.png b/src/_h5ai/client/images/blank.png
deleted file mode 100644
index bef1f600..00000000
Binary files a/src/_h5ai/client/images/blank.png and /dev/null differ
diff --git a/src/_h5ai/client/images/blank.svg b/src/_h5ai/client/images/blank.svg
new file mode 100644
index 00000000..e0423172
--- /dev/null
+++ b/src/_h5ai/client/images/blank.svg
@@ -0,0 +1,14 @@
+
+
+
diff --git a/src/_h5ai/client/images/crumb.png b/src/_h5ai/client/images/crumb.png
deleted file mode 100644
index 8e19959c..00000000
Binary files a/src/_h5ai/client/images/crumb.png and /dev/null differ
diff --git a/src/_h5ai/client/images/crumb.svg b/src/_h5ai/client/images/crumb.svg
new file mode 100644
index 00000000..662db546
--- /dev/null
+++ b/src/_h5ai/client/images/crumb.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/src/_h5ai/client/images/delete.png b/src/_h5ai/client/images/delete.png
deleted file mode 100644
index 9d8afaef..00000000
Binary files a/src/_h5ai/client/images/delete.png and /dev/null differ
diff --git a/src/_h5ai/client/images/delete.svg b/src/_h5ai/client/images/delete.svg
new file mode 100644
index 00000000..4cc729ef
--- /dev/null
+++ b/src/_h5ai/client/images/delete.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/descending.png b/src/_h5ai/client/images/descending.png
deleted file mode 100644
index f4341b64..00000000
Binary files a/src/_h5ai/client/images/descending.png and /dev/null differ
diff --git a/src/_h5ai/client/images/descending.svg b/src/_h5ai/client/images/descending.svg
new file mode 100644
index 00000000..c99a358f
--- /dev/null
+++ b/src/_h5ai/client/images/descending.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/download.png b/src/_h5ai/client/images/download.png
deleted file mode 100644
index a6754f42..00000000
Binary files a/src/_h5ai/client/images/download.png and /dev/null differ
diff --git a/src/_h5ai/client/images/download.svg b/src/_h5ai/client/images/download.svg
new file mode 100644
index 00000000..0db1eaac
--- /dev/null
+++ b/src/_h5ai/client/images/download.svg
@@ -0,0 +1,21 @@
+
+
+
diff --git a/src/_h5ai/client/images/filter.png b/src/_h5ai/client/images/filter.png
deleted file mode 100644
index 0d55aeec..00000000
Binary files a/src/_h5ai/client/images/filter.png and /dev/null differ
diff --git a/src/_h5ai/client/images/filter.svg b/src/_h5ai/client/images/filter.svg
new file mode 100644
index 00000000..2f6ae6bb
--- /dev/null
+++ b/src/_h5ai/client/images/filter.svg
@@ -0,0 +1,18 @@
+
+
+
diff --git a/src/_h5ai/client/images/folder-page.svg b/src/_h5ai/client/images/folder-page.svg
new file mode 100644
index 00000000..71d42518
--- /dev/null
+++ b/src/_h5ai/client/images/folder-page.svg
@@ -0,0 +1,18 @@
+
+
+
diff --git a/src/_h5ai/client/images/folder.svg b/src/_h5ai/client/images/folder.svg
new file mode 100644
index 00000000..23695227
--- /dev/null
+++ b/src/_h5ai/client/images/folder.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/src/_h5ai/client/images/home.png b/src/_h5ai/client/images/home.png
deleted file mode 100644
index 78d42e7a..00000000
Binary files a/src/_h5ai/client/images/home.png and /dev/null differ
diff --git a/src/_h5ai/client/images/home.svg b/src/_h5ai/client/images/home.svg
new file mode 100644
index 00000000..71f7b645
--- /dev/null
+++ b/src/_h5ai/client/images/home.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/loading.png b/src/_h5ai/client/images/loading.png
deleted file mode 100644
index bac972a4..00000000
Binary files a/src/_h5ai/client/images/loading.png and /dev/null differ
diff --git a/src/_h5ai/client/images/loading.svg b/src/_h5ai/client/images/loading.svg
new file mode 100644
index 00000000..50f18365
--- /dev/null
+++ b/src/_h5ai/client/images/loading.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/page.png b/src/_h5ai/client/images/page.png
deleted file mode 100644
index 4612fd03..00000000
Binary files a/src/_h5ai/client/images/page.png and /dev/null differ
diff --git a/src/_h5ai/client/images/page.svg b/src/_h5ai/client/images/page.svg
new file mode 100644
index 00000000..20a2724f
--- /dev/null
+++ b/src/_h5ai/client/images/page.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/preview/close.png b/src/_h5ai/client/images/preview/close.png
deleted file mode 100644
index 6131af8c..00000000
Binary files a/src/_h5ai/client/images/preview/close.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/close.svg b/src/_h5ai/client/images/preview/close.svg
new file mode 100644
index 00000000..c73fcf93
--- /dev/null
+++ b/src/_h5ai/client/images/preview/close.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/src/_h5ai/client/images/preview/crumb.png b/src/_h5ai/client/images/preview/crumb.png
deleted file mode 100644
index 79ae88f6..00000000
Binary files a/src/_h5ai/client/images/preview/crumb.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/fullscreen.png b/src/_h5ai/client/images/preview/fullscreen.png
deleted file mode 100644
index c12ae48a..00000000
Binary files a/src/_h5ai/client/images/preview/fullscreen.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/fullscreen.svg b/src/_h5ai/client/images/preview/fullscreen.svg
new file mode 100644
index 00000000..539c3f5e
--- /dev/null
+++ b/src/_h5ai/client/images/preview/fullscreen.svg
@@ -0,0 +1,26 @@
+
+
+
diff --git a/src/_h5ai/client/images/preview/home.png b/src/_h5ai/client/images/preview/home.png
deleted file mode 100644
index aaceee0d..00000000
Binary files a/src/_h5ai/client/images/preview/home.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/next.png b/src/_h5ai/client/images/preview/next.png
deleted file mode 100644
index 7c48e145..00000000
Binary files a/src/_h5ai/client/images/preview/next.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/next.svg b/src/_h5ai/client/images/preview/next.svg
new file mode 100644
index 00000000..cb16e28f
--- /dev/null
+++ b/src/_h5ai/client/images/preview/next.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/preview/no-fullscreen.png b/src/_h5ai/client/images/preview/no-fullscreen.png
deleted file mode 100644
index 20da1355..00000000
Binary files a/src/_h5ai/client/images/preview/no-fullscreen.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/no-fullscreen.svg b/src/_h5ai/client/images/preview/no-fullscreen.svg
new file mode 100644
index 00000000..03b7e73d
--- /dev/null
+++ b/src/_h5ai/client/images/preview/no-fullscreen.svg
@@ -0,0 +1,25 @@
+
+
+
diff --git a/src/_h5ai/client/images/preview/play.png b/src/_h5ai/client/images/preview/play.png
deleted file mode 100644
index 79ae88f6..00000000
Binary files a/src/_h5ai/client/images/preview/play.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/prev.png b/src/_h5ai/client/images/preview/prev.png
deleted file mode 100644
index 8c759e26..00000000
Binary files a/src/_h5ai/client/images/preview/prev.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/prev.svg b/src/_h5ai/client/images/preview/prev.svg
new file mode 100644
index 00000000..9d982b94
--- /dev/null
+++ b/src/_h5ai/client/images/preview/prev.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/preview/raw.png b/src/_h5ai/client/images/preview/raw.png
deleted file mode 100644
index cde6412e..00000000
Binary files a/src/_h5ai/client/images/preview/raw.png and /dev/null differ
diff --git a/src/_h5ai/client/images/preview/raw.svg b/src/_h5ai/client/images/preview/raw.svg
new file mode 100644
index 00000000..22d5be55
--- /dev/null
+++ b/src/_h5ai/client/images/preview/raw.svg
@@ -0,0 +1,21 @@
+
+
+
diff --git a/src/_h5ai/client/images/settings.svg b/src/_h5ai/client/images/settings.svg
new file mode 100644
index 00000000..f606f30c
--- /dev/null
+++ b/src/_h5ai/client/images/settings.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/src/_h5ai/client/images/tree.png b/src/_h5ai/client/images/tree.png
deleted file mode 100644
index 8e19959c..00000000
Binary files a/src/_h5ai/client/images/tree.png and /dev/null differ
diff --git a/src/_h5ai/client/images/tree.svg b/src/_h5ai/client/images/tree.svg
new file mode 100644
index 00000000..662db546
--- /dev/null
+++ b/src/_h5ai/client/images/tree.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/src/_h5ai/client/images/view-details.png b/src/_h5ai/client/images/view-details.png
deleted file mode 100644
index d5a6cd33..00000000
Binary files a/src/_h5ai/client/images/view-details.png and /dev/null differ
diff --git a/src/_h5ai/client/images/view-details.svg b/src/_h5ai/client/images/view-details.svg
new file mode 100644
index 00000000..5a2ff7df
--- /dev/null
+++ b/src/_h5ai/client/images/view-details.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/src/_h5ai/client/images/view-grid.png b/src/_h5ai/client/images/view-grid.png
deleted file mode 100644
index a9cb1fe6..00000000
Binary files a/src/_h5ai/client/images/view-grid.png and /dev/null differ
diff --git a/src/_h5ai/client/images/view-grid.svg b/src/_h5ai/client/images/view-grid.svg
new file mode 100644
index 00000000..a28cd682
--- /dev/null
+++ b/src/_h5ai/client/images/view-grid.svg
@@ -0,0 +1,25 @@
+
+
+
diff --git a/src/_h5ai/client/images/view-icons.png b/src/_h5ai/client/images/view-icons.png
deleted file mode 100644
index a9cb1fe6..00000000
Binary files a/src/_h5ai/client/images/view-icons.png and /dev/null differ
diff --git a/src/_h5ai/client/images/view-icons.svg b/src/_h5ai/client/images/view-icons.svg
new file mode 100644
index 00000000..a28cd682
--- /dev/null
+++ b/src/_h5ai/client/images/view-icons.svg
@@ -0,0 +1,25 @@
+
+
+
diff --git a/src/_h5ai/client/images/view-list.png b/src/_h5ai/client/images/view-list.png
deleted file mode 100644
index d5a6cd33..00000000
Binary files a/src/_h5ai/client/images/view-list.png and /dev/null differ
diff --git a/src/_h5ai/client/images/view-list.svg b/src/_h5ai/client/images/view-list.svg
new file mode 100644
index 00000000..5a2ff7df
--- /dev/null
+++ b/src/_h5ai/client/images/view-list.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js
index f89007b7..db012abe 100644
--- a/src/_h5ai/client/js/inc/core/resource.js
+++ b/src/_h5ai/client/js/inc/core/resource.js
@@ -1,9 +1,9 @@
modulejs.define('core/resource', ['core/settings'], function (settings) {
- var image = function (id, noPngExt) {
+ var image = function (id, customExt) {
- return settings.h5aiAbsHref + 'client/images/' + id + (noPngExt ? '' : '.png');
+ return settings.h5aiAbsHref + 'client/images/' + id + (customExt ? '' : '.svg');
},
icon = function (id, big) {
diff --git a/src/_h5ai/client/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js
index 6912b604..69f11414 100644
--- a/src/_h5ai/client/js/inc/ext/tree.js
+++ b/src/_h5ai/client/js/inc/ext/tree.js
@@ -34,7 +34,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
.data('status', item.status);
location.setLink($a, item);
- $img.attr('src', resource.icon(item.type));
+ // $img.attr('src', resource.icon(item.type));
+ $img.attr('src', resource.image('folder'));
$label.text(item.label);
if (item.isFolder()) {
@@ -58,19 +59,21 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
// is it the domain?
if (item.isDomain()) {
$html.addClass('domain');
- $img.attr('src', resource.icon('folder-home'));
+ // $img.attr('src', resource.icon('folder-home'));
+ $img.attr('src', resource.image('home'));
}
// is it the root?
if (item.isRoot()) {
$html.addClass('root');
- $img.attr('src', resource.icon('folder-home'));
+ // $img.attr('src', resource.icon('folder-home'));
+ $img.attr('src', resource.image('home'));
}
// is it the current folder?
if (item.isCurrentFolder()) {
$html.addClass('current');
- $img.attr('src', resource.icon('folder-open'));
+ // $img.attr('src', resource.icon('folder-open'));
}
// does it have subfolders?
@@ -94,7 +97,8 @@ modulejs.define('ext/tree', ['_', '$', 'core/settings', 'core/resource', 'core/e
// reflect folder status
if (_.isNumber(item.status)) {
if (item.status === 200) {
- $img.attr('src', resource.icon('folder-page'));
+ // $img.attr('src', resource.icon('folder-page'));
+ $img.attr('src', resource.image('folder-page'));
} else {
$html.addClass('error');
$a.append($(statusHintTemplate).text(item.status));
diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/items.js
index 529a0437..a5e44f2d 100644
--- a/src/_h5ai/client/js/inc/view/items.js
+++ b/src/_h5ai/client/js/inc/view/items.js
@@ -56,11 +56,20 @@ modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core
$date.data('time', item.time).text(format.formatDate(item.time));
$size.data('bytes', item.size).text(format.formatSize(item.size));
+
+ // if (item.isFolder()) {
+ // $imgSmall.attr('src', resource.image('folder'));
+ // $imgBig.attr('src', resource.image('folder')).width(48);
+ // }
+
+
if (item.isFolder() && _.isNumber(item.status)) {
if (item.status === 200) {
$html.addClass('page');
$imgSmall.attr('src', resource.icon('folder-page'));
$imgBig.attr('src', resource.icon('folder-page', true));
+ // $imgSmall.attr('src', resource.image('folder-page'));
+ // $imgBig.attr('src', resource.image('folder-page')).width(48);
} else {
$html.addClass('error');
$label.append($(hintTemplate).text(' ' + item.status + ' '));