{% for file in files %}
diff --git a/comic/util.py b/comic/util.py
index 4ef1e5b..c0da52a 100644
--- a/comic/util.py
+++ b/comic/util.py
@@ -86,6 +86,9 @@ class DirFile:
item_type: str = ''
percent: int = 0
selector: str = ''
+ total: int = None
+ total_read: int = None
+ total_unread: int = None
def __post_init__(self):
self.item_type = type(self.obj).__name__
@@ -94,10 +97,14 @@ class DirFile:
total_adjustment = 1
if isinstance(self.obj, Directory):
total_adjustment = 0
+ self.total = self.obj.total - total_adjustment
+ self.total_read = self.obj.total_read
+ self.total_unread = self.total - self.total_read
try:
- self.percent = int((self.obj.total_read / (self.obj.total - total_adjustment)) * 100)
+ self.percent = int((self.obj.total_read / self.total) * 100)
except ZeroDivisionError:
self.percent = 0
+
self.selector = self.obj.url_safe_selector
if isinstance(self.obj, Directory):
self.name = self.obj.name
diff --git a/static/css/base.css b/static/css/base.css
index b7c91be..10bee81 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -1,46 +1,14 @@
-/*.navbar {*/
-/* margin: 0px;*/
-/*}*/
-/*.starter-template {*/
-/* padding: 40px 15px;*/
-/* text-align: center;*/
-/*}*/
-/*!* Sticky footer styles*/
-/*-------------------------------------------------- *!*/
-/*html {*/
-/* position: relative;*/
-/* min-height: 100%;*/
-/*}*/
-/*body {*/
-/* !* Margin bottom by footer height *!*/
-/* margin-bottom: 80px;*/
-/*}*/
-/*.footer {*/
-/* position: absolute;*/
-/* bottom: 0;*/
-/* width: 100%;*/
-/* !* Set the fixed height of the footer here *!*/
-/* height: 80px;*/
-/* background-color: #f5f5f5;*/
-/*}*/
-/*.comic_box {*/
-/* width: 100%;*/
-/*}*/
-
-/*#dropdown-list{*/
-/* max-height: 300px;*/
-/* overflow: auto;*/
-/* box-shadow: none;*/
-/* }*/
-
-/* td a {*/
-/* display:block;*/
-/* width:100%;*/
-/* }*/
-/* tr.clickable-row {*/
-/* cursor: pointer;*/
-/* }*/
-
#comic_list caption {
caption-side: top;
+}
+
+.card_list_card {
+ width: 200px;
+}
+.card .card-badge {
+ position:absolute;
+ top:10px;
+ left:10px;
+ padding:5px;
+ color:white;
}
\ No newline at end of file
diff --git a/static/css/base.min.css b/static/css/base.min.css
new file mode 100644
index 0000000..1f052ac
--- /dev/null
+++ b/static/css/base.min.css
@@ -0,0 +1 @@
+#comic_list caption{caption-side:top}.card_list_card{width:200px}.card .card-badge{position:absolute;top:10px;left:10px;padding:5px;color:#fff}
\ No newline at end of file
diff --git a/static/img/ccbysa.png b/static/img/ccbysa.png
new file mode 100644
index 0000000..12229ac
Binary files /dev/null and b/static/img/ccbysa.png differ
diff --git a/static/js/comic_list.js b/static/js/comic_list.js
index 80f59ac..bf2abbc 100644
--- a/static/js/comic_list.js
+++ b/static/js/comic_list.js
@@ -11,9 +11,13 @@ var buttonFilter;
}
});
$('#filters').on( 'click', 'button', function() {
- buttonFilter = $( this ).attr('data-filter');
- sessionStorage.setItem(window.location.href+"button", buttonFilter);
- $grid.isotope();
+ if (typeof $( this ).attr('data-filter') === "undefined") {
+
+ }else {
+ buttonFilter = $( this ).attr('data-filter');
+ sessionStorage.setItem(window.location.href+"button", buttonFilter);
+ $grid.isotope();
+ }
});
var $quicksearch = $('#quicksearch').keyup( debounce( function() {
@@ -65,3 +69,18 @@ function comic_action(selector, item_type, action) {
})
}
+
+$( ".progress-bar" ).each(function( index ) {
+ let bar = $(this)
+ bar.css('width', bar.attr('aria-valuenow') + '%')
+});
+
+let comic_action_elements = document.getElementsByClassName('comic_action')
+
+comic_action_elements.forEach(el => el.addEventListener('click', event => {
+ let target = $(event.target).closest('button')
+ let selector = target.attr('selector')
+ let item_type = target.attr('itemtype')
+ let action = target.attr('comic_action')
+ comic_action(selector, item_type, action)
+}));
\ No newline at end of file
diff --git a/static/js/comic_list.min.js b/static/js/comic_list.min.js
index 77ed1bd..d3b780e 100644
--- a/static/js/comic_list.min.js
+++ b/static/js/comic_list.min.js
@@ -1 +1 @@
-var qsRegex;var buttonFilter;var $grid=$(".comic-container").isotope({itemSelector:".grid-item",layoutMode:"fitRows",filter:function(){var $this=$(this);var searchResult=qsRegex?$this.text().match(qsRegex):true;var buttonResult=buttonFilter?$this.is(buttonFilter):true;return searchResult&&buttonResult}});$("#filters").on("click","button",function(){buttonFilter=$(this).attr("data-filter");sessionStorage.setItem(window.location.href+"button",buttonFilter);$grid.isotope()});var $quicksearch=$("#quicksearch").keyup(debounce(function(){qsRegex=new RegExp($quicksearch.val(),"gi");sessionStorage.setItem(window.location.href+"text",$quicksearch.val());$grid.isotope()}));function debounce(fn,threshold){var timeout;threshold=threshold||100;return function debounced(){clearTimeout(timeout);var args=arguments;var _this=this;function delayed(){fn.apply(_this,args)}timeout=setTimeout(delayed,threshold)}}setInterval(function(){$grid.isotope()},1e3);let field=document.getElementById("quicksearch");if(sessionStorage.getItem(window.location.href+"text")||sessionStorage.getItem(window.location.href+"button")){field.value=sessionStorage.getItem(window.location.href+"text");qsRegex=new RegExp($quicksearch.val(),"gi");buttonFilter=sessionStorage.getItem(window.location.href+"button");$grid.isotope()}field.addEventListener("change",function(){});function comic_action(selector,item_type,action){$.ajax({url:"/comic/action/"+action+"/"+item_type+"/"+selector+"/",success:function(){window.location.reload()}})}
\ No newline at end of file
+var qsRegex;var buttonFilter;var $grid=$(".comic-container").isotope({itemSelector:".grid-item",layoutMode:"fitRows",filter:function(){var $this=$(this);var searchResult=qsRegex?$this.text().match(qsRegex):true;var buttonResult=buttonFilter?$this.is(buttonFilter):true;return searchResult&&buttonResult}});$("#filters").on("click","button",function(){if(typeof $(this).attr("data-filter")==="undefined"){}else{buttonFilter=$(this).attr("data-filter");sessionStorage.setItem(window.location.href+"button",buttonFilter);$grid.isotope()}});var $quicksearch=$("#quicksearch").keyup(debounce(function(){qsRegex=new RegExp($quicksearch.val(),"gi");sessionStorage.setItem(window.location.href+"text",$quicksearch.val());$grid.isotope()}));function debounce(fn,threshold){var timeout;threshold=threshold||100;return function debounced(){clearTimeout(timeout);var args=arguments;var _this=this;function delayed(){fn.apply(_this,args)}timeout=setTimeout(delayed,threshold)}}setInterval(function(){$grid.isotope()},1e3);let field=document.getElementById("quicksearch");if(sessionStorage.getItem(window.location.href+"text")||sessionStorage.getItem(window.location.href+"button")){field.value=sessionStorage.getItem(window.location.href+"text");qsRegex=new RegExp($quicksearch.val(),"gi");buttonFilter=sessionStorage.getItem(window.location.href+"button");$grid.isotope()}field.addEventListener("change",function(){});function comic_action(selector,item_type,action){$.ajax({url:"/comic/action/"+action+"/"+item_type+"/"+selector+"/",success:function(){window.location.reload()}})}$(".progress-bar").each(function(index){let bar=$(this);bar.css("width",bar.attr("aria-valuenow")+"%")});let comic_action_elements=document.getElementsByClassName("comic_action");comic_action_elements.forEach(el=>el.addEventListener("click",event=>{let target=$(event.target).closest("button");let selector=target.attr("selector");let item_type=target.attr("itemtype");let action=target.attr("comic_action");comic_action(selector,item_type,action)}));
\ No newline at end of file