summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--module/web/static/css/default/dashboard.less6
-rw-r--r--module/web/static/css/fontawesome.css79
-rw-r--r--module/web/static/fonts/fontawesome-webfont.eotbin22914 -> 26950 bytes
-rw-r--r--module/web/static/fonts/fontawesome-webfont.ttfbin10852 -> 12664 bytes
-rw-r--r--module/web/static/fonts/fontawesome-webfont.woffbin16344 -> 19800 bytes
-rw-r--r--module/web/static/fonts/fontawesome.txt7
-rw-r--r--module/web/static/js/views/packageView.js10
-rw-r--r--module/web/templates/default/base.html13
-rw-r--r--module/web/templates/default/dashboard.html17
9 files changed, 69 insertions, 63 deletions
diff --git a/module/web/static/css/default/dashboard.less b/module/web/static/css/default/dashboard.less
index 2677b4035..72758959c 100644
--- a/module/web/static/css/default/dashboard.less
+++ b/module/web/static/css/default/dashboard.less
@@ -101,14 +101,10 @@
height: @frame-top;
line-height: @frame-top;
- i:hover {
+ & > i:hover {
color: @green;
}
- i.iconf-trash:hover {
- color: @red;
- }
-
.dropdown-menu {
text-shadow: none;
}
diff --git a/module/web/static/css/fontawesome.css b/module/web/static/css/fontawesome.css
index 64aa5fc64..ca7a8ed83 100644
--- a/module/web/static/css/fontawesome.css
+++ b/module/web/static/css/fontawesome.css
@@ -274,39 +274,46 @@ ul.icons li [class*=" iconf-"] {
.iconf-remove:before { content: "\f024"; }
.iconf-cog:before { content: "\f025"; }
.iconf-trash:before { content: "\f026"; }
-.iconf-refresh:before { content: "\f027"; }
-.iconf-list-alt:before { content: "\f028"; }
-.iconf-tag:before { content: "\f029"; }
-.iconf-tags:before { content: "\f02a"; }
-.iconf-list:before { content: "\f02b"; }
-.iconf-edit:before { content: "\f02c"; }
-.iconf-share:before { content: "\f02d"; }
-.iconf-check:before { content: "\f02e"; }
-.iconf-play:before { content: "\f02f"; }
-.iconf-pause:before { content: "\f030"; }
-.iconf-stop:before { content: "\f031"; }
-.iconf-eye-open:before { content: "\f032"; }
-.iconf-eye-close:before { content: "\f033"; }
-.iconf-check-empty:before { content: "\f034"; }
-.iconf-globe:before { content: "\f035"; }
-.iconf-tasks:before { content: "\f036"; }
-.iconf-filter:before { content: "\f037"; }
-.iconf-plus-sign:before { content: "\f038"; }
-.iconf-chevron-left:before { content: "\f039"; }
-.iconf-chevron-right:before { content: "\f03a"; }
-.iconf-chevron-up:before { content: "\f03b"; }
-.iconf-chevron-down:before { content: "\f03c"; }
-.iconf-key:before { content: "\f03d"; }
-.iconf-inbox:before { content: "\f03e"; }
-.iconf-share:before { content: "\f03f"; }
-.iconf-hdd:before { content: "\f040"; }
-.iconf-group:before { content: "\f041"; }
-.iconf-cloud:before { content: "\f042"; }
-.iconf-carret-left:before { content: "\f043"; }
-.iconf-sort-down:before { content: "\f044"; }
-.iconf-sort-up:before { content: "\f045"; }
-.iconf-sitemap:before { content: "\f046"; }
-.iconf-folder-open:before { content: "\f047"; }
-.iconf-folder-open-alt:before { content: "\f048"; }
-.iconf-folder-close:before { content: "\f049"; }
-.iconf-folder-close-alt:before { content: "\f04a"; }
+.iconf-repeat:before { content: "\f027"; }
+.iconf-refresh:before { content: "\f028"; }
+.iconf-list-alt:before { content: "\f029"; }
+.iconf-lock:before { content: "\f02a"; }
+.iconf-tag:before { content: "\f02b"; }
+.iconf-tags:before { content: "\f02c"; }
+.iconf-list:before { content: "\f02d"; }
+.iconf-pencil:before { content: "\f02e"; }
+.iconf-edit:before { content: "\f02f"; }
+.iconf-share:before { content: "\f030"; }
+.iconf-check:before { content: "\f031"; }
+.iconf-play:before { content: "\f032"; }
+.iconf-pause:before { content: "\f033"; }
+.iconf-stop:before { content: "\f034"; }
+.iconf-eye-open:before { content: "\f035"; }
+.iconf-eye-close:before { content: "\f036"; }
+.iconf-check-empty:before { content: "\f037"; }
+.iconf-globe:before { content: "\f038"; }
+.iconf-tasks:before { content: "\f039"; }
+.iconf-filter:before { content: "\f03a"; }
+.iconf-plus-sign:before { content: "\f03b"; }
+.iconf-chevron-left:before { content: "\f03c"; }
+.iconf-chevron-right:before { content: "\f03d"; }
+.iconf-chevron-up:before { content: "\f03e"; }
+.iconf-chevron-down:before { content: "\f03f"; }
+.iconf-key:before { content: "\f040"; }
+.iconf-cogs:before { content: "\f041"; }
+.iconf-signout:before { content: "\f042"; }
+.iconf-signin:before { content: "\f043"; }
+.iconf-wrench:before { content: "\f044"; }
+.iconf-inbox:before { content: "\f045"; }
+.iconf-share:before { content: "\f046"; }
+.iconf-hdd:before { content: "\f047"; }
+.iconf-group:before { content: "\f048"; }
+.iconf-cloud:before { content: "\f049"; }
+.iconf-carret-left:before { content: "\f04a"; }
+.iconf-sort-down:before { content: "\f04b"; }
+.iconf-sort-up:before { content: "\f04c"; }
+.iconf-sitemap:before { content: "\f04d"; }
+.iconf-folder-open:before { content: "\f04e"; }
+.iconf-folder-open-alt:before { content: "\f04f"; }
+.iconf-folder-close:before { content: "\f050"; }
+.iconf-folder-close-alt:before { content: "\f051"; }
diff --git a/module/web/static/fonts/fontawesome-webfont.eot b/module/web/static/fonts/fontawesome-webfont.eot
index 2fe20b6db..93036359a 100644
--- a/module/web/static/fonts/fontawesome-webfont.eot
+++ b/module/web/static/fonts/fontawesome-webfont.eot
Binary files differ
diff --git a/module/web/static/fonts/fontawesome-webfont.ttf b/module/web/static/fonts/fontawesome-webfont.ttf
index 9211ba40d..6ac56d409 100644
--- a/module/web/static/fonts/fontawesome-webfont.ttf
+++ b/module/web/static/fonts/fontawesome-webfont.ttf
Binary files differ
diff --git a/module/web/static/fonts/fontawesome-webfont.woff b/module/web/static/fonts/fontawesome-webfont.woff
index 12c2755d3..f877b672a 100644
--- a/module/web/static/fonts/fontawesome-webfont.woff
+++ b/module/web/static/fonts/fontawesome-webfont.woff
Binary files differ
diff --git a/module/web/static/fonts/fontawesome.txt b/module/web/static/fonts/fontawesome.txt
index e93b01db7..c60ebeef4 100644
--- a/module/web/static/fonts/fontawesome.txt
+++ b/module/web/static/fonts/fontawesome.txt
@@ -6,11 +6,14 @@ ok 00c
remove 00d
cog 013
trash 014
+repeat 01e
refresh 021
list-alt 022
+lock 023
tag 02b
tags 02c
list 03a
+pencil 040
edit 044
share 045
check 046
@@ -29,6 +32,10 @@ chevron-right 054
chevron-up 077
chevron-down 078
key 084
+cogs 085
+signout 08b
+signin 090
+wrench 0ad
inbox 01c
share 045
hdd 0a0
diff --git a/module/web/static/js/views/packageView.js b/module/web/static/js/views/packageView.js
index 93ebfb7e4..7bb4bb472 100644
--- a/module/web/static/js/views/packageView.js
+++ b/module/web/static/js/views/packageView.js
@@ -9,7 +9,6 @@ define(['jquery', 'app', 'views/abstract/itemView', 'underscore'],
template: _.compile($("#template-package").html()),
events: {
'click .package-name': 'open',
- 'click .iconf-trash': 'deleteItem',
'click .iconf-refresh': 'restart',
'click .select': 'select'
},
@@ -25,10 +24,10 @@ define(['jquery', 'app', 'views/abstract/itemView', 'underscore'],
this.listenTo(this.model, 'change', this.render);
this.listenTo(this.model, 'remove', this.unrender);
- // Clear drop down menu
+// // Clear drop down menu
var self = this;
this.$el.on('mouseleave', function() {
- self.$('.dropdown-menu').hide();
+ self.$('.dropdown-menu').parent().removeClass('open');
});
},
@@ -41,10 +40,7 @@ define(['jquery', 'app', 'views/abstract/itemView', 'underscore'],
this.$el.initTooltips();
// Init the dropdown-menu
- var self = this;
- this.$('.iconf-chevron-down').click(function() {
- self.$('.dropdown-menu').stop(true, true).delay(200).animate({opacity: 'toggle'});
- });
+ this.$('.iconf-chevron-down').dropdown();
return this;
},
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index fddbf219c..6ec187440 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -44,9 +44,8 @@
{# <a class="header-link" href="/settings"><i class="icon-cog icon-white"></i> Settings</a>#}
{# <a class="header-link" href="#"><i class="icon-list-alt icon-white"></i> Accounts</a>#}
<span class="iconbar">
- <i class="iconf-play iconf-large"></i>&nbsp;
- <i class="iconf-pause iconf-large"></i>&nbsp;
- <i class="iconf-cog iconf-large"></i>
+ <i class="iconf-play iconf-large"></i>&nbsp; Running&nbsp;&nbsp;
+ <i class="iconf-repeat iconf-large"></i>&nbsp; Reconnect
</span>
<br>
<a class="btn btn-success btn-grabber" href="#"><i class="icon-plus icon-white"></i> Add</a>
@@ -56,11 +55,11 @@
<a class="btn btn-blue dropdown-toggle" data-toggle="dropdown" href="#"><span
class="caret"></span></a>
<ul class="dropdown-menu" style="right: 0; left: -100%">
- <li><a href="#"><i class="icon-pencil"></i> Edit</a></li>
- <li><a href="#"><i class="icon-trash"></i> Delete</a></li>
+ <li><a href="/"><i class="iconf-list-alt"></i> Dashboard</a></li>
+ <li><a href="/settings"><i class="iconf-wrench"></i> Settings</a></li>
+ <li><a href="/admin"><i class="iconf-cogs"></i> Admin</a></li>
<li class="divider"></li>
- <li><a href="/admin"><i class="icon-star"></i> Admin</a></li>
- <li><a href="/settings"><i class="icon-wrench"></i> Settings</a></li>
+ <li><a href="/logout"><i class="iconf-signout"></i> Logout</a></li>
</ul>
</div>
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 2de3a999d..5c15186df 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -35,13 +35,15 @@
<% else %>
<i class="iconf-eye-close" data-toggle="tooltip" title="Package is private"></i>
<%/if%>
- <i class="iconf-trash" data-toggle="tooltip" title="Delete Package"></i>
<i class="iconf-chevron-down" data-toggle="dropdown">
</i>
<ul class="dropdown-menu">
- <li><a>Link</a></li>
- <li><a>Link</a></li>
- <li><a>Link</a></li>
+ <li><a href="#"><i class="iconf-share"></i> Show</a></li>
+ <li><a href="#"><i class="iconf-edit"></i> Details</a></li>
+ <li><a href="#"><i class="iconf-trash"></i> Delete</a></li>
+ <li><a href="#"><i class="iconf-refresh"></i> Recheck</a></li>
+ <li class="divider"></li>
+ <li><a>Addons</a></li>
</ul>
</div>
<div class="progress">
@@ -83,11 +85,10 @@
<script type="text/template" id="template-select">
<i class="iconf-check" data-toggle="tooltip" title="Deselect"></i>&nbsp;
- <%= if packs %>
- <% packs %> packages
- <%/if %>
+ <%= if packs %><% packs %> package(s)<%/if %>
<%= if files %>
- <% files %> files
+ <%= if packs %>, <%/if %>
+ <% files %> file(s)
<%/if %>
selected
&nbsp;|&nbsp;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-30 09:20:44 +0100