Self-Hosted
/
changedetection.io
mirror of https://github.com/dgtlmoon/changedetection.io.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui-improvement changes and fixes 12/28

Browse Source
pull/317/head
ntmmfts 3 years ago
parent 37842e6ea6
commit b5c2e13285
5 changed files with 143 additions and 130 deletions
Show Stats Download Patch File Download Diff File

BIN
changedetectionio/static/images/search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

43
changedetectionio/static/js/tbltools.js
Unescape View File

@ -2,6 +2,8 @@
// must be a var for keyChar and keyCode use
var CONSTANT_ESCAPE_KEY = 27;
var CONSTANT_S_KEY = 83;
var CONSTANT_s_KEY = 115;
// global sorting vars (new window is always last_changed, descending)
var loading;
@ -29,6 +31,14 @@ function storeScrollAndSearch() {
sessionStorage.setItem('scrollpos', window.pageYOffset);
sessionStorage.setItem('searchtxt', document.getElementById("txtInput").value);
}
// (ctl)-alt-s search hotkey
document.onkeyup=function(e){
var e = e || window.event; // for IE to cover IEs window event-object
if(e.altKey && (e.which == CONSTANT_S_KEY || e.which == CONSTANT_s_KEY)) {
document.getElementById("txtInput").focus();
return false;
}
}
// page load functions
function load_functions() {
@ -85,11 +95,7 @@ function sortTable(n) {
x = parseFloat(x);
y = parseFloat(y);
}
if (n == 1) { // handle the checkbox column
x = rows[i].querySelector('input[type=checkbox]').checked;
y = rows[i + 1].querySelector('input[type=checkbox]').checked;
}
if (n == 2 || n == 3) { // handle the play/pause and viewed/unviewed columns
if (n == 1) { // handle play/pause column
x = rows[i].getElementsByTagName("TD")[n].getElementsByTagName("img")[0].src;
y = rows[i + 1].getElementsByTagName("TD")[n].getElementsByTagName("img")[0].src;
}
@ -147,7 +153,7 @@ function sortTable(n) {
// save sorting
sessionStorage.setItem("sort_column", n);
sessionStorage.setItem("sort_order", (dir == "asc") ? 0 : 1);
// restripe
// restripe rows
restripe();
}
@ -209,8 +215,8 @@ function tblSearch(evt) {
filter = input.value.toUpperCase();
table = document.getElementById("watch-table");
tr = table.getElementsByTagName("tr");
for (i = 0; i < tr.length; i++) {
td = tr[i].getElementsByTagName("td")[5]; // col 5 is the hidden title/url column
for (i = 1; i < tr.length; i++) { // skip header
td = tr[i].getElementsByTagName("td")[3]; // col 3 is the hidden title/url column
if (td) {
txtValue = td.textContent || td.innerText;
if (txtValue.toUpperCase().indexOf(filter) > -1) {
@ -221,7 +227,11 @@ function tblSearch(evt) {
}
}
}
// restripe rows
restripe();
if (code == CONSTANT_ESCAPE_KEY) {
document.getElementById("watch-table-wrapper").focus();
}
}
// restripe after searching or sorting
@ -230,22 +240,31 @@ function restripe () {
var table = document.getElementById("watch-table");
var rows = table.getElementsByTagName("tr");
for (i = 0; i < rows.length; i++) { // skip thead row 0
for (i = 1; i < rows.length; i++) { // skip header
if (rows[i].style.display !== "none") {
visrows.push(rows[i]);
}
}
for (i=0 ; i<visrows.length; i++) {
var row = visrows[i];
if( i%2==0 ) {
row.classList.remove('pure-table-odd');
row.classList.add('pure-table-even');
}
else {
row.classList.remove('pure-table-even');
row.classList.add('pure-table-odd');
}
var cells = row.getElementsByTagName("td");
for(var j=0; j<cells.length; j++) {
if( i%2==0 ) {
cells[j].style.background = "#ffffff";
} else {
cells[j].style.background = "#f2f2f2";
} else {
cells[j].style.background = "#ffffff";
}
}
//uncomment to re-number rows ascending: cells[0].innerText = i+1;
// uncomment to renumber rows ascending: var cells = row.getElementsByTagName("td");
// uncomment to renumber rows ascending: cells[0].innerText = i+1;
}
}

115
changedetectionio/static/styles/styles.css
Unescape View File

@ -3,6 +3,9 @@ body {
background: #262626;
}
.pure-table-even {
background: #f2f2f2;
}
.pure-table-odd {
background: #fff;
}
a {
@ -31,7 +34,7 @@ section.content {
.search-box input {
width: 32px;
border: none;
background-image: url(/static/images/search.png);
background-image: url(/static/images/search.svg);
background-position: 10px 10px;
background-repeat: no-repeat;
padding: 16px 0px 16px 16px;
@ -100,7 +103,6 @@ section.content {
width: 100%;
}
#header {
text-align: center;
vertical-align: middle;
-webkit-touch-callout: none; /* iOS Safari */
-webkit-user-select: none; /* Safari */
@ -114,16 +116,13 @@ section.content {
color: #fff;
font-weight: normal;
}
.watch-table td.title-col, #actions {
text-align: center;
}
.watch-table .clickable {
cursor: pointer;
}
.watch-table .sortarrow {
color: #0078e7;
}
.watch-table .hidden {
.watch-table .hidden-col {
display: none;
}
.watch-table tr.unviewed {
@ -135,7 +134,6 @@ section.content {
.watch-table td {
font-size: 80%;
white-space: nowrap;
text-align: center;
}
.watch-table td.title-col {
word-break: break-all;
@ -162,7 +160,7 @@ section.content {
display: flex;
justify-content: center;
}
#post-list-buttons {
/* #post-list-buttons {
padding: 0;
margin: 0;
}
@ -173,11 +171,7 @@ section.content {
#post-list-buttons li {
display: inline-block;
}
#flexlayout {
display: flex;
justify-content: space-between;
}
#flexlayout-bottom {
*/#flexlayout {
float: right;
}
#categories {
@ -188,7 +182,28 @@ section.content {
text-align: right;
margin-top: auto;
}
#post-list-buttons-top a {
#post-list-buttons {
text-align:right;
padding:0;
margin:0
}
#post-list-buttons li {
display:inline-block
}
#post-list-buttons a {
border-top-left-radius:initial;
border-top-right-radius:initial;
border-bottom-left-radius:5px;
border-bottom-right-radius:5px
}
/* #post-list-buttons-top a {
border-top-left-radius: 5px;
border-top-right-radius: 5px;
border-bottom-left-radius: initial;
@ -204,13 +219,13 @@ section.content {
display: grid;
display: -ms-grid;
}
#checkbox-functions ul {
*/#checkbox-functions ul {
padding-left: 0px;
}
#post-list-buttons-top-grid li {
/* #post-list-buttons-top-grid li {
list-style-type: none;
}
#checkbox-functions {
*/#checkbox-functions {
position: fixed;
left: 10%;
text-align: left;
@ -253,10 +268,6 @@ section.content {
margin-bottom: auto;
direction: rtl;
}
.watch-table tfoot {
bottom: 0;
position: fixed;
}
body:after {
content: "";
background: linear-gradient(130deg, #ff7a18, #af002d 41.07%, #319197 76.05%);
@ -590,10 +601,6 @@ body:before {
border-radius: 10px;
margin-bottom: 1em;
}
#new-watch-form input {
width: auto !important;
display: inline-block;
}
#new-watch-form .label {
display: none;
}
@ -626,7 +633,6 @@ footer {
padding: 10px;
background: #fff;
color: #444;
text-align: center;
}
#feed-icon {
vertical-align: middle;
@ -647,10 +653,25 @@ footer {
#new-version-text a {
color: #e07171;
}
.paused-state.state-False img {
.chkbox, .chkbox-header {
padding-right: 0px !important;
}
.chkbox {
text-align: center;
padding-left: 0px !important;
}
.pause-resume-header {
opacity: 0.8;
}
.pause-resume, .pause-resume-header {
padding-left: 0px !important;
padding-right: 0px !important;
text-align: center;
}
.pause-resume img {
opacity: 0.2;
}
.paused-state.state-False:hover img {
.pause-resume:hover img {
opacity: 0.8;
}
.monospaced-textarea textarea {
@ -702,7 +723,7 @@ footer {
.box {
max-width: 95%;
}
.watch-table td.low-res {
.watch-table {
display: inline-block;
padding: 5px;
}
@ -719,15 +740,19 @@ footer {
#nav-menu {
overflow-x: scroll;
}
.hover-img img {
opacity: 1;
}
.hover-img:hover img {
opacity: 1;
.pause-resume img {
opacity: 0.8;
}
#watch-actions {
margin-top: 3px;
}
.watch-table thead {
border-bottom: 1px solid #cbcbcb;
}
.chkbox, .chkbox-header, .pause-resume, .pause-resume-header{
padding: .5em 1em !important;
text-align: left;
}
}
@media only screen and (max-width: 760px), (min-device-width: 768px) and (max-device-width: 1024px) {
input[type="text"] {
@ -752,7 +777,7 @@ footer {
content: "Changed ";
}
.watch-table th:nth-child(0) {
display: inline-block;
display: none;
}
.watch-table th:nth-child(1) {
display: inline-block;
@ -760,11 +785,17 @@ footer {
.watch-table th:nth-child(2) {
display: inline-block;
}
.watch-table td:nth-child(1) {
display: inline-block;
}
.watch-table td:nth-child(2) {
display: inline-block;
}
.watch-table th:nth-child(3) {
display: inline-block;
}
.watch-table th:nth-child(4) {
display: inline-block;
display: none;
}
.watch-table th:nth-child(5) {
display: inline-block;
@ -779,12 +810,6 @@ footer {
display: none;
}
.watch-table th:nth-child(9) {
display: inline-block;
}
.watch-table th:nth-child(10) {
display: none;
}
.watch-table th:nth-child(11) {
display: none;
}
.watch-table .pure-table td,
@ -802,12 +827,6 @@ footer {
padding-right: 10px;
white-space: nowrap;
}
.watch-table.pure-table-striped tr:nth-child(2n-1) {
background-color: #eee;
}
.watch-table.pure-table-striped tr:nth-child(2n-1) td {
background-color: inherit;
}
}
@media only screen and (min-width: 761px) {
.m-d {

67
changedetectionio/templates/watch-overview.html
Unescape View File

@ -17,8 +17,7 @@
<!-- add extra stuff, like do a http POST and send headers -->
<!-- user/pass r = requests.get('https://api.github.com/user', auth=('user', 'pass')) -->
</form>
<div id="watch-table-wrapper">
<div id="flexlayout">
<div id="watch-table-wrapper" tabindex="-1">
<div id="categories">
<a href="{{url_for('index')}}" class="pure-button button-tag {{'active' if not active_tag }}">All</a>
{% for tag in tags %}
@ -27,18 +26,6 @@
{% endif %}
{% endfor %}
</div>
<div id="recheck-and-rss">
<ul id="post-list-buttons">
<li>
<a href="{{ url_for('api_watch_checknow', tag=active_tag) }}" class="pure-button button-tag ">Recheck
All {% if active_tag%}in "{{active_tag}}"{%endif%}</a>
</li>
<li>
<a href="{{ url_for('index', tag=active_tag , rss=true)}}"><img id="feed-icon" src="{{url_for('static_content', group='images', filename='Generic_Feed-icon.svg')}}" height="15px"></a>
</li>
</ul>
</div>
</div>
<div id="controls-top">
<div id="checkbox-functions" style="display: none;">
@ -63,16 +50,14 @@
<table class="pure-table pure-table-striped watch-table" id="watch-table">
<thead>
<tr id="header">
<th>#</th>
<th onclick="sortTable(1)"><span class="clickable" title="Sort by Checked"><input type="checkbox" name="showhide" onchange="checkAll(this)" title="Check/Uncheck All">&nbsp;&nbsp;<span id="sortable-1"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-1a" style="display:none;">&#9650;</span><span id="sort-1d" style="display:none;">&#9660;</span></span></span></th>
<th onclick="sortTable(2)"><span class="clickable" title="Sort by Pause/Resume"><a href="{{url_for('index', pause='pause-all', tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="Pause" title="Pause All {%if active_tag%}in &quot;{{active_tag}}&quot; {%endif%}"/></a>&nbsp;<a href="{{url_for('index', pause='resume-all', tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='play.svg')}}" alt="Resume" title="Resume All {%if active_tag%}in &quot;{{active_tag}}&quot; {%endif%}"/></a>&nbsp;&nbsp;<span id="sortable-2"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-2a" style="display:none;">&#9650;</span><span id="sort-2d" style="display:none;">&#9660;</span></span></span></th>
<th onclick="sortTable(3)"><span class="clickable" title="Sort by Viewed/Unviewed"><a href="javascript:processChecked('mark_all_notviewed', '{{ active_tag }}');"><img src="{{url_for('static_content', group='images', filename='notviewed.svg')}}" alt="Uniewed" title="Mark All{%if active_tag%} in &quot;{{active_tag}}&quot;{%endif%} as Unviewed"/></a>&nbsp;<a href="{{url_for('mark_all_viewed', tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='viewed.svg')}}" alt="Viewed" title="Mark All{%if active_tag%} in &quot;{{active_tag}}&quot;{%endif%} as Viewed"/></a>&nbsp;&nbsp;<span id="sortable-3"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-3a" style="display:none;">&#9650;</span><span id="sort-3d" style="display:none;">&#9660;</span></span></span></th>
<th onclick="sortTable(5)"><span class="clickable" title="Sort by Title">Title&nbsp;&nbsp;<span id="sortable-5"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-5a" style="display:none;">&#9650;</span><span id="sort-5d" style="display:none;">&#9660;</span></span></span></th>
<th class="hidden"></th>
<th onclick="sortTable(7)"><span class="clickable" title="Sort by Last Checked">Checked&nbsp;&nbsp;<span id="sortable-7"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-7a" style="display:none;">&#9650;</span><span id="sort-7d" style="display:none;">&#9660;</span></span></span></th>
<th class="hidden"></th>
<th onclick="sortTable(9)"><span class="clickable" title="Sort by Last Changed">Changed&nbsp;&nbsp;<span id="sortable-9" style="display:none;"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-9a" style="display:none;">&#9650;</span><span id="sort-9d">&#9660;</span></span></span></th>
<th class="hidden"></th>
<th class="inline chkbox-header"><input type="checkbox" name="showhide" onchange="checkAll(this)" title="Check/Uncheck All">&nbsp;&nbsp;#</th>
<th class="pause-resume-header" onclick="sortTable(1)"><span class="clickable" title="Sort by Pause/Resume"><a href="{{url_for('index', pause='pause-all', tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="Pause" title="Pause All {%if active_tag%}in &quot;{{active_tag}}&quot; {%endif%}"/></a>&nbsp;<a href="{{url_for('index', pause='resume-all', tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='play.svg')}}" alt="Resume" title="Resume All {%if active_tag%}in &quot;{{active_tag}}&quot; {%endif%}"/></a>&nbsp;&nbsp;<span id="sortable-1"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-1a" style="display:none;">&#9650;</span><span id="sort-1d" style="display:none;">&#9660;</span></span></span></th>
<th onclick="sortTable(3)"><span class="clickable" title="Sort by Title">Title&nbsp;&nbsp;<span id="sortable-3"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-3a" style="display:none;">&#9650;</span><span id="sort-3d" style="display:none;">&#9660;</span></span></span></th>
<th class="hidden-col"></th>
<th onclick="sortTable(5)"><span class="clickable" title="Sort by Last Checked">Checked&nbsp;&nbsp;<span id="sortable-5"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-5a" style="display:none;">&#9650;</span><span id="sort-5d" style="display:none;">&#9660;</span></span></span></th>
<th class="hidden-col"></th>
<th onclick="sortTable(7)"><span class="clickable" title="Sort by Last Changed">Changed&nbsp;&nbsp;<span id="sortable-7" style="display:none;"><img src="{{url_for('static_content', group='images', filename='sortable.svg')}}" /></span><span class="sortarrow"><span id="sort-7a" style="display:none;">&#9650;</span><span id="sort-7d">&#9660;</span></span></span></th>
<th class="hidden-col"></th>
<th>Actions</th>
</tr>
</thead>
@ -83,26 +68,17 @@
{% if watch.last_error is defined and watch.last_error != False %}error{% endif %}
{% if watch.paused is defined and watch.paused != False %}paused{% endif %}
{% if watch.newest_history_key| int > watch.last_viewed| int %}unviewed{% endif %}">
<td class="inline low-res">{{ loop.index }}</td> <!-- col 0, sort by index -->
<td class="inline low-res"><input id="{{watch.uuid}}" type="checkbox" name="check" onchange="checkChange();"></td>
<td class="inline low-res">
<td class="inline chkbox"><input id="{{watch.uuid}}" type="checkbox" name="check" onchange="checkChange();">&nbsp;&nbsp;{{ loop.index }}</td>
<td class="inline pause-resume">
{% if watch.paused %}
<a href="{{url_for('index', pause=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='play.svg')}}" alt="Resume" title="Resume"/></a>
{% else %}
<a href="{{url_for('index', pause=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="Pause" title="Pause"/></a>
{% endif %}
</td>
<td class="inline low-res">
{% if watch.newest_history_key| int > watch.last_viewed| int %}
<a href="{{url_for('process_selected', func='mark_selected_viewed', uuids=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='viewed.svg')}}" alt="Viewed" title="Mark as Viewed"/></a>
{% else %}
<a href="{{url_for('process_selected', func='mark_selected_notviewed', uuids=watch.uuid, tag=active_tag)}}"><img src="{{url_for('static_content', group='images', filename='notviewed.svg')}}" alt="Unviewed" title="Mark as Unviewed"/></a>
{% endif %}
</td>
<td class="title-col inline">{{watch.title if watch.title is not none and watch.title|length > 0 else watch.url}}
<a class="external inline-hover-img" target="_blank" rel="noopener" href="{{ watch.url }}"></a>
{%if watch.fetch_backend == "html_webdriver" %}<img style="height: 1em; display:inline-block;" src="/static/images/Google-Chrome-icon.png" />{% endif %}
{% if watch.last_error is defined and watch.last_error != False %}
<div class="fetch-error">{{ watch.last_error }}</div>
{% endif %}
@ -110,16 +86,16 @@
<span class="watch-tag-list">{{ watch.tag}}</span>
{% endif %}
</td>
<td class="hidden">{{ watch.title if watch.title else watch.url }}</td> <!-- col 5, title sorting -->
<td class="hidden-col">{{ watch.title if watch.title else watch.url }}</td> <!-- col 5, title sorting -->
<td class="last-checked">{{watch|format_last_checked_time}}</td>
<td class="hidden">{{ watch.last_checked }}</td> <!-- col 7, last_checked sorting -->
<td class="hidden-col">{{ watch.last_checked }}</td> <!-- col 7, last_checked sorting -->
<td class="last-changed">{% if watch.history|length >= 2 and watch.last_changed %}
{{watch.last_changed|format_timestamp_timeago}}
{% else %}
Not yet
{% endif %}
</td>
<td class="hidden">{{ watch.last_changed }}</td> <!-- col 9, last_changed sorting -->
<td class="hidden-col">{{ watch.last_changed }}</td> <!-- col 9, last_changed sorting -->
<td id="actions">
<a href="{{ url_for('api_watch_checknow', uuid=watch.uuid, tag=request.args.get('tag')) }}"
class="pure-button button-small pure-button-primary">Recheck</a>
@ -136,23 +112,22 @@
{% endfor %}
</tbody>
</table>
</div>
<div id="flexlayout-bottom">
<div id="controls-bottom">
<ul id="post-list-buttons">
{% if has_unviewed %}
<li>
<a href="{{ url_for('index', tag=active_tag , rss=true)}}"><img id="feed-icon" src="{{url_for('static_content', group='images', filename='Generic_Feed-icon.svg')}}" height="15px"></a>
<a href="{{url_for('mark_all_viewed', tag=request.args.get('tag')) }}" class="pure-button button-tag ">Mark all viewed</a>
</li>
{% endif %}
<li>
<a href="{{ url_for('api_watch_checknow', tag=active_tag) }}" class="pure-button button-tag ">Recheck
All {% if active_tag%}in "{{active_tag}}"{%endif%}</a>
all {% if active_tag%}in "{{active_tag}}"{%endif%}</a>
</li>
<li>
<a href="{{ url_for('rss', tag=active_tag , token=app_rss_token)}}"><img id="feed-icon" src="{{url_for('static_content', group='images', filename='Generic_Feed-icon.svg')}}" height="15px"></a>
</li>
</ul>
</div>
</div>
</div>
</div>
{% endblock %}

Write Preview
Loading…
Cancel
Save