summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
Diffstat (limited to 'module')
-rw-r--r--module/web/static/css/default/dashboard.less17
-rw-r--r--module/web/static/css/fontawesome.css7
-rw-r--r--module/web/static/fonts/fontawesome-webfont.eotbin14957 -> 18832 bytes
-rw-r--r--module/web/static/fonts/fontawesome-webfont.ttfbin7440 -> 10084 bytes
-rw-r--r--module/web/static/fonts/fontawesome-webfont.woffbin4404 -> 6048 bytes
-rw-r--r--module/web/static/fonts/fontawesome.txt7
-rw-r--r--module/web/templates/default/base.html3
-rw-r--r--module/web/templates/default/dashboard.html72
8 files changed, 90 insertions, 16 deletions
diff --git a/module/web/static/css/default/dashboard.less b/module/web/static/css/default/dashboard.less
index 7f504ebdf..bfca80bc2 100644
--- a/module/web/static/css/default/dashboard.less
+++ b/module/web/static/css/default/dashboard.less
@@ -12,6 +12,10 @@
.sidebar-header {
font-size: 25px;
line-height: 25px;
+ margin: 4px 0;
+ border-bottom: 1px dashed @grey;
+// text-shadow: 1px 0px @grey;
+// box-shadow: 10px 10px 5px @grey;
}
/*
@@ -28,6 +32,9 @@
margin-bottom: 4px;
position: relative;
overflow: hidden;
+ -webkit-hyphens: auto;
+ -moz-hyphens: auto;
+ hyphens: auto;
i {
cursor: move;
@@ -54,10 +61,14 @@
}
.package-indicator {
-// position: absolute;
-// top: 1px;
-// right: 0;
+ color: @light;
+ position: absolute;
+ padding: 2px;
+ bottom: 5px;
+ border-radius: 5px;
+ right: 0;
float: right;
+ .gradient(top, @blue, @blueDark);
}
/*
diff --git a/module/web/static/css/fontawesome.css b/module/web/static/css/fontawesome.css
index 8ca8bbfbb..d314e7d68 100644
--- a/module/web/static/css/fontawesome.css
+++ b/module/web/static/css/fontawesome.css
@@ -279,9 +279,16 @@ ul.icons li [class*=" iconf-"] {
.iconf-tags:before { content: "\f02c"; }
.iconf-list:before { content: "\f03a"; }
.iconf-check:before { content: "\f046"; }
+.iconf-play:before { content: "\f04b"; }
+.iconf-pause:before { content: "\f04c"; }
+.iconf-stop:before { content: "\f04d"; }
.iconf-check-empty:before { content: "\f096"; }
+.iconf-globe:before { content: "\f0ac"; }
+.iconf-tasks:before { content: "\f0ae"; }
.iconf-filter:before { content: "\f0b0"; }
.iconf-plus-sign:before { content: "\f055"; }
+.iconf-chevron-left:before { content: "\f053"; }
+.iconf-chevron-right:before { content: "\f054"; }
.iconf-chevron-up:before { content: "\f077"; }
.iconf-chevron-down:before { content: "\f078"; }
.iconf-key:before { content: "\f084"; }
diff --git a/module/web/static/fonts/fontawesome-webfont.eot b/module/web/static/fonts/fontawesome-webfont.eot
index 4bdee495f..ffeb5c0d1 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 b98525105..e9b0d3fd3 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 9d753b3e1..d8d28851b 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 ee36a3130..dcc11c11b 100644
--- a/module/web/static/fonts/fontawesome.txt
+++ b/module/web/static/fonts/fontawesome.txt
@@ -11,9 +11,16 @@ tag 02b
tags 02c
list 03a
check 046
+play 04b
+pause 04c
+stop 04d
check-empty 096
+globe 0ac
+tasks 0ae
filter 0b0
plus-sign 055
+chevron-left 053
+chevron-right 054
chevron-up 077
chevron-down 078
key 084
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 48b18e368..d6aeb7b6b 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
-<html>
+{# TODO: set language from config #}
+<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index e512a87d8..00e3a5b17 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -73,7 +73,7 @@
{% endblock %}
{% block actionbar %}
- <ul class="actionbar nav nav-pills span9">
+ <ul class="actionbar nav nav-pills span8 offset1">
<li>
<ul class="breadcrumb">
<li><a href="#">{{ _("Home") }}</a> <span class="divider">/</span></li>
@@ -130,9 +130,9 @@
{% block content %}
- <div class="span3">
+ <div class="span4">
<div class="sidebar-header">
- <i class="iconf-hdd"></i> Packages
+ <i class="iconf-hdd"></i> Local
<div class="pull-right" style="font-size: medium; line-height: normal">
<i class="iconf-chevron-down" style="font-size: 20px"></i>
</div>
@@ -140,27 +140,65 @@
</div>
<ul class="package-list">
<li class="package-item">
- <i class="iconf-folder-close-alt"></i>
+ <i class="iconf-check-empty"></i>
Package
{# <div class="package-info">#}
{# 1/2 5MIB 100 MIB#}
{# </div>#}
<div class="package-indicator">
- <i class="iconf-check-empty"></i>
+ <i class="iconf-tags"></i>
+ <i class="iconf-pause"></i>
+ <i class="iconf-remove"></i>
+ <i class="iconf-tasks"></i>
<i class="iconf-chevron-down"></i>
</div>
<div class="progress">
- <div class="bar bar-info" style="width: 50%"></div>
- <div class="bar bar-danger" style="width: 20%"></div>
+ <div class="bar bar-info" style="width: 50%">
+ 10 MB
+ </div>
+ <div class="bar bar-danger" style="width: 20%">
+ 20 MB
+ </div>
</div>
</li>
<li class="package-item">
- <i class="iconf-folder-close-alt"></i>
+ <i class="iconf-check-empty"></i>
many many More packages with really long names, some
even don't fit on the screen
<div class="package-indicator">
- <i class="iconf-check-empty"></i>
- <i class="iconf-list"></i>
+ <i class="iconf-tags"></i>
+ <i class="iconf-remove"></i>
+ <i class="iconf-pause"></i>
+ <i class="iconf-tasks"></i>
+ <i class="iconf-chevron-down"></i>
+ </div>
+ <div class="progress">
+ <div class="bar bar-info" style="width: 50%"></div>
+ </div>
+ </li>
+ <li class="package-item">
+ <i class="iconf-check-empty"></i>
+ Some.Movie.Title.2011.Language.DTS-HD.DL.1080p.BluRay.AVC.REMUX-xyzHD
+ <div class="package-indicator">
+ <i class="iconf-tags"></i>
+ <i class="iconf-remove"></i>
+ <i class="iconf-pause"></i>
+ <i class="iconf-tasks"></i>
+ <i class="iconf-chevron-down"></i>
+ </div>
+ <div class="progress">
+ <div class="bar bar-info" style="width: 50%"></div>
+ </div>
+ </li>
+ <li class="package-item">
+ <i class="iconf-check-empty"></i>
+ A.Movie.with.a.slightly.larger.Title.2012.720p.DTS.Bluray.x264-ReleaseGrp
+ <div class="package-indicator">
+ <i class="iconf-tags"></i>
+ <i class="iconf-remove"></i>
+ <i class="iconf-pause"></i>
+ <i class="iconf-tasks"></i>
+ <i class="iconf-chevron-down"></i>
</div>
<div class="progress">
<div class="bar bar-info" style="width: 50%"></div>
@@ -186,7 +224,7 @@
<li>other pyloads</li>
</ul>
</div>
- <div class="span9">
+ <div class="span8">
<div id="dashboard">
{# Build up by js #}
</div>
@@ -196,7 +234,17 @@
<script src="static/js/libs/select2-3.2.js"></script>
{# <script src="static/js/libs/jquery.transit-0.9.9.js"></script>#}
<script type="text/javascript">
- $("#filter").select2({tags: ["red", "green", "blue"]});
+ $('.package-item').on('mouseover', function() {
+{# $(this).children('.progress').css('height', '15px');#}
+ $(this).children('.package-indicator').css('display', 'block');
+ });
+
+ $('.package-item').on('mouseout', function() {
+{# $(this).children('.progress').css('height', '4px');#}
+ $(this).children('.package-indicator').css('display', 'none');
+ });
+
+
{# $('.package-indicator').on('mouseenter', function(el) {#}
{# $(this).parent().transition({#}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 06:23:52 +0100