Commit ccf0b491 authored by yPhil's avatar yPhil
Browse files

Merge branch 'server' into dev

parents 5f333c17 353bb108
Pipeline #395644 passed with stage
in 1 minute and 10 seconds
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?9875755');
src: url('../font/fontello.eot?9875755#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?9875755') format('woff2'),
url('../font/fontello.woff?9875755') format('woff'),
url('../font/fontello.ttf?9875755') format('truetype'),
url('../font/fontello.svg?9875755#fontello') format('svg');
src: url('../font/fontello.eot?37133991');
src: url('../font/fontello.eot?37133991#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?37133991') format('woff2'),
url('../font/fontello.woff?37133991') format('woff'),
url('../font/fontello.ttf?37133991') format('truetype'),
url('../font/fontello.svg?37133991#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
......@@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?9875755#fontello') format('svg');
src: url('../font/fontello.svg?37133991#fontello') format('svg');
}
}
*/
......@@ -83,4 +83,5 @@
.icon-note:before { content: '\e826'; } /* '' */
.icon-help:before { content: '\e827'; } /* '' */
.icon-buoy:before { content: '\e828'; } /* '' */
.icon-video:before { content: '\e829'; } /* '' */
\ No newline at end of file
.icon-video:before { content: '\e829'; } /* '' */
.icon-w3c:before { content: '\e830'; } /* '' */
\ No newline at end of file
......@@ -109,12 +109,6 @@ a:active {
color: var(--color-fg2);
}
/* div.questionDialog > div { */
/* flex: 1 1 auto; */
/* } */
.feed-header .feed-controls div {
margin: 0 2px 0 0;
}
......@@ -135,6 +129,7 @@ a:active {
.fold {
display: inline-block;
/* transition: all 0.2s linear; */
transform: rotate(-90deg);
}
......@@ -172,6 +167,24 @@ a:active {
z-index: 10;
}
.introjs-tooltiptext a {
color: var(--color-ui-sen) !important;
}
.introjs-tooltiptext a:hover {
color: var(--color-ui-sec) !important;
}
.ui-tab.ui-state-active a,
.ui-tab.ui-state-active i,
.ui-tab.ui-state-default a {
color: var(--color-fg1);
}
.ui-tab.ui-state-active i {
color: var(--color-fg1);
}
.topnav > div.menuBarItem > i {
color: var(--color-ui-qua);
font-size: 32pt;
......@@ -181,6 +194,10 @@ a:active {
z-index: 5;
}
.ui-tab.ui-state-active i:hover {
color: var(--color-fg2);
}
.topnav > div.menuBarItem:hover .text {
/* display: none; */
visibility: hidden;
......@@ -389,16 +406,6 @@ ul.help li {
filter: brightness(0.9);
}
.ui-tab.ui-state-active a,
.ui-tab.ui-state-active i,
.ui-tab.ui-state-default a {
color: var(--color-fg1);
}
.ui-tab.ui-state-active i:hover {
color: var(--color-fg2);
}
/* .ui-tab.ui-state-active { */
/* border-top: 1px solid var(--color-ui-danger) !important; */
/* } */
......@@ -447,10 +454,6 @@ i.item-icon {
color: var(--color-danger);
}
.ui-tab.ui-state-active i {
color: var(--color-fg1);
}
.dangerous:hover {
color: var(--color-ui-danger);
}
......@@ -599,6 +602,14 @@ nav#sideMenu {
scrollbar-color: var(--color-ui-oct) var(--color-ui-qua);
}
nav#sideMenu,
#topnav,
.ui-dialog,
.ui-dialog .ui-dialog-buttonpane {
background: var(--color-ui-qua);
border-color: var(--color-ui-qua);
}
nav#sideMenu:hover {
scrollbar-color: var(--color-ui-sec) var(--color-ui-qua);
}
......@@ -633,15 +644,18 @@ nav#sideMenu.expanded {
}
#console {
border: 3px solid var(--color-ui-qui);
border: 3px solid var(--color-ui-pri);
resize: vertical;
height: 200px;
min-height: 2.5em;
max-width: 250px;
scrollbar-width: thin;
border-radius: 3px;
background-color: var(--color-ui-console-bg);
/* background-color: var(--color-ui-console-bg); */
color: var(--color-ui-console-fg);
font-family: monospace;
min-height: 2.5em;
overflow-wrap: break-word;
overflow: auto; /* something other than visible */
overflow: auto;
padding: 0 0.2em;
text-align: left;
}
......@@ -649,7 +663,7 @@ nav#sideMenu.expanded {
#console > div > span.prompt {
margin-right: 3px;
font-weight: 900;
color: var(--color-ui-console-fg);
color: var(--color-ui-console-bg);
}
#console div.normal {
......@@ -668,14 +682,6 @@ nav#sideMenu.expanded {
color: var(--color-ui-console-warning);
}
nav#sideMenu,
#topnav,
.ui-dialog,
.ui-dialog .ui-dialog-buttonpane {
background: var(--color-ui-qua);
border-color: var(--color-ui-qua);
}
.ui-dialog .ui-dialog-buttonpane {
margin: 0;
}
......@@ -707,6 +713,14 @@ button#feedGuessButton {
margin-left: 0.4em;
}
a.feedErrorReportButton,
a.validateFeedButton {
/* box-sizing: border-box; */
/* width: 100%; */
/* padding:0; */
flex: 1;
}
fieldset.menuForm {
display: flex;
height: 100%;
......@@ -718,9 +732,9 @@ fieldset.feedsMenuForm {
background-color: var(--color-ui-qua) !important;
}
.ui-button:not(.ui-spinner-button) {
margin-right: 0.4em;
}
/* .ui-button:not(.ui-spinner-button, .feedGuessButton, .feedErrorReportButton) { */
/* margin-right: 0.4em; */
/* } */
.rs-button {
margin-right: 0;
......@@ -734,10 +748,6 @@ fieldset.feedsMenuForm {
flex: 1 0 auto !important;
}
#console:hover {
border: 3px solid var(--color-ui-sec);
}
.ui-widget-header,
th {
background: none;
......@@ -773,7 +783,6 @@ button.ui-state-success {
.dialog button.help-button {
background-color: var(--color-ui-success);
/* border-color: var(--color-ui-success); */
color: var(--color-ui-pri);
padding: 0.4em;
......@@ -1057,9 +1066,9 @@ ul.column div.buttons {
z-index: 1 !important;
}
ul.column div.buttons > button {
margin-bottom: 0.2em;
}
/* ul.column div.buttons > button { */
/* margin-bottom: 0.2em; */
/* } */
/* Feed */
......@@ -1212,20 +1221,19 @@ li.feed div.feed-body:hover {
}
/* Works on Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 12px;
}
*::-webkit-scrollbar-track {
background: var(--color-ui-qua);
}
/* *::-webkit-scrollbar { */
/* width: 12px; */
/* } */
*::-webkit-scrollbar-thumb {
background-color: var(--color-ui-pri);
border-radius: 20px;
border: 3px solid var(--color-ui-qua);
}
/* *::-webkit-scrollbar-track { */
/* background: var(--color-ui-qua); */
/* } */
/* *::-webkit-scrollbar-thumb { */
/* background-color: var(--color-ui-pri); */
/* border-radius: 20px; */
/* border: 3px solid var(--color-ui-qua); */
/* } */
.folded {
height: 0 !important;
......@@ -1272,15 +1280,6 @@ h1.introjs-tooltip-title {
color: var(--color-ui-sec) !important;
}
.introjs-tooltiptext a {
color: var(--color-ui-sen) !important;
/* text-decoration: underline !important; */
}
.introjs-tooltiptext a:hover {
color: var(--color-ui-sec) !important;
}
.introjs-skipbutton:hover {
color: var(--color-ui-sec) !important;
}
......@@ -1289,7 +1288,6 @@ h1.introjs-tooltip-title {
border-top: none;
}
span.introjs-helperNumberLayer {
/* background: linear-gradient(to bottom,#ff3019 0,#cf0404 100%); */
background: var(--color-ui-sec);
......@@ -1451,46 +1449,46 @@ div#logo-title > .logo-title > a:hover {
}
#beggar a.beggarLink:link,
#beggar a.beggarLink:visited {
text-decoration: underline !important;
color: var(--color-ui-pri);
}
#beggar a.beggarLink:hover {
color: var(--color-ui-sec);
}
/* #beggar > h4 { */
/* margin-top: 0; */
/* } */
#notify {
background-color: var(--color-ui-qua);
border: 1px solid var(--color-ui-sec);
border-radius: 5px;
width: 200px;
/* height: 220px; */
/* max-width: 100%; */
padding: 1em;
position: sticky;
bottom: 16px;
left: 16px;
z-index: 30;
/* flex-direction: column; */
}
audio {
background-color: var(--color-ui-pri);
border-radius: 0;
height: 24px;
width: 100% !important;
}
video {
width: 100% !important;
height: auto !important;
}
div.itemDiv {
max-width: auto;
}
#beggar a.beggarLink:visited {
text-decoration: underline !important;
color: var(--color-ui-pri);
}
#beggar a.beggarLink:hover {
color: var(--color-ui-sec);
}
/* #beggar > h4 { */
/* margin-top: 0; */
/* } */
#notify {
background-color: var(--color-ui-qua);
border: 1px solid var(--color-ui-sec);
border-radius: 5px;
width: 200px;
/* height: 220px; */
/* max-width: 100%; */
padding: 1em;
position: sticky;
bottom: 16px;
left: 16px;
z-index: 30;
/* flex-direction: column; */
}
audio {
background-color: var(--color-ui-pri);
border-radius: 0;
height: 24px;
width: 100% !important;
}
video {
width: 100% !important;
height: auto !important;
}
div.itemDiv {
max-width: auto;
}
......@@ -187,6 +187,12 @@
"css": "video",
"code": 59433,
"src": "entypo"
},
{
"uid": "e8ac3bb8871f23096fcab025ba5373cb",
"css": "w3c",
"code": 59440,
"src": "elusive"
}
]
}
\ No newline at end of file
No preview for this file type
......@@ -63,6 +63,8 @@
<glyph glyph-name="buoy" unicode="&#xe828;" d="M454 810q190 2 326-130t140-322q2-190-131-327t-323-141q-190-2-327 131t-139 323q-4 190 130 327t324 139z m0-60q-94 0-178-44l62-104q56 28 122 28t122-28l62 104q-88 46-190 44z m-246-522q-28 60-28 122 0 64 28 124l-102 62q-46-88-46-190 2-96 46-180z m258-278q98 4 178 46l-62 104q-60-30-122-30t-122 30l-62-104q86-46 190-46z m-6 180q92 0 156 65t64 155q0 92-64 156t-156 64-156-64-64-156q0-90 64-155t156-65z m252 98l104-62q46 96 44 190 0 96-44 180l-104-62q28-60 28-124 0-62-28-122z" horiz-adv-x="920" />
<glyph glyph-name="video" unicode="&#xe829;" d="M980 600l-100 0 0-100 100 0 0-100-100 0 0-100 100 0 0-100-100 0 0-100 100 0 0-60q0-16-12-28t-28-12l-900 0q-16 0-28 12t-12 28l0 60 100 0 0 100-100 0 0 100 100 0 0 100-100 0 0 100 100 0 0 100-100 0 0 60q0 18 12 29t28 11l900 0q16 0 28-11t12-29l0-60z m-600-400l250 150-250 150 0-300z" horiz-adv-x="980" />
<glyph glyph-name="w3c" unicode="&#xe830;" d="M0 84l0 766 1000 0 0-766-500-234z m84 461l63-275q3-14 17-14l47 0q14 0 18 14l23 113 21-113q4-14 18-14l49 0q14 0 17 14l61 275q2 10-3 16t-13 6l-50 0q-14 0-16-14l-23-121-26 121q-4 14-17 14l-38 0q-13 0-15-14l-26-121-25 121q-2 14-16 14l-50 0q-20 0-16-22z m344-242q37-51 103-53 45 2 76 30t32 68q-2 43-34 68 30 28 30 63-2 45-32 68t-72 24q-64 0-99-51-8-12 2-23l27-26q14-12 25 2 18 24 41 24 20 0 24-10 6-12 0-26-8-9-45-9-20 0-20-16l0-41q2-21 20-18 45 0 49-9t4-16q0-25-28-25-29 0-47 25-11 16-25 2l-29-29q-10-10-2-22z m232 108q0-73 36-117t95-44q70 0 104 75 3 19-10 23l-37 18q-6 2-14-1t-10-9q-12-29-33-29t-35 23-14 62 14 61 35 24q21-2 33-28 8-13 24-10l37 18q17 10 10 25-34 71-104 71-59 0-95-45t-36-117z" horiz-adv-x="1000" />
</font>
</defs>
</svg>
\ No newline at end of file
No preview for this file type
......@@ -105,6 +105,7 @@ PTL.dialog = {
var $dialog = $(this),
$dataStore = $button.parent().parent(),
$feed = $dataStore.parent().parent(),
$feedBody = $dataStore.parent().next('div.feed-body'),
allGroups = PTL.tab.list('all'),
$thisGroup = $feed.parent().parent(),
$groupMenu = $dialog.find('select#feedGroup');
......@@ -309,6 +310,7 @@ PTL.dialog = {
slide: function( event, ui ) {
$(this).val(ui.value);
$(this).find('.ui-slider-handle').text(ui.value);
$feedBody.css('height', ui.value + 'px');
$('input#feedLimitSpinner').val(ui.value);
},
change: function( event, ui ) {
......
......@@ -243,6 +243,14 @@ PTL.feed = {
.addClass('translate danger')
.data('content', PTL.tr('Error'));
var $feedErrorReportButton = $('<a>')
.attr('href', 'https://framagit.org/yphil/petrolette/-/issues/new?issue[title]=Feed%20error&issue[description]=' + feedUrl + ' (' + message + ')')
.attr('class', 'translate ui-button ui-widget ui-corner-all feedErrorReportButton')
.attr('title', PTL.tr('Report feed error'))
.data('title', PTL.tr('Report feed error'))
.data('content', PTL.tr('Report'))
.text(PTL.tr('Report'));
var $key = $('<strong>')
.attr('class', 'translate key')
.data('content', PTL.tr('Type'))
......@@ -256,19 +264,27 @@ PTL.feed = {
.attr('href', feedUrl)
.text(feedUrl);
var $validateLink = $('<a>')
var $errorButtonsFlexBox = $('<a>')
.attr('class', 'translate flex-box');
var $validateFeedButton = $('<a>')
.attr('class', 'translate ui-button ui-widget ui-corner-all validateFeedButton')
.attr('href', 'https://validator.w3.org/feed/check.cgi?url=' + feedUrl)
.text(PTL.tr('validate'));
.attr('title', PTL.tr('Validate /verify this feed file with the W3C'))
.data('title', PTL.tr('Validate /verify this feed file with the W3C'))
.data('content', PTL.tr('Validate'))
.text(PTL.tr('Validate'));
$errorButtonsFlexBox.append($validateFeedButton, $feedErrorReportButton);
var $errorItem = $('<li>')
.attr('class', 'feed-item error')
.append($errorLink)
.append('&nbsp; (')
.append($validateLink)
.append(')<br/>')
.append($key)
// .append($errorLink)
.append('&nbsp;')
.append($value);
.append($key)
.append(':&nbsp;')
.append($value)
.append($errorButtonsFlexBox);
$feedBodyUl
.append($errorItem);
......@@ -424,7 +440,7 @@ PTL.feed = {
audioPlayer.controls = 'controls';
audioPlayer.src = item.enclosures[0].url;
audioPlayer.type = item.enclosures[0].type;
// audioPlayer.preload = 'metadata';
audioPlayer.preload = 'none';
$itemDiv.append(audioPlayer);
......
......@@ -384,6 +384,10 @@ PTL.i18n.translations = {
"To synchronize the feeds across devices" : { fr: "Pour synchroniser les flux sur plusieurs appareils" , ja: "デバイス間でソースを同期するには", es: "Para sincronizar las fuentes en todos los dispositivos" },
"Remote file validation NOT OK (error [%1]) now reading from browser cache" : { fr: "Validation de fichier à distance NOT OK (erreur [%1]) lecture depuis le cache du navigateur" , ja: "リモートファイルの検証NOT OK(エラー[%1])がブラウザのキャッシュから読み込み中です", es: "La validación remota de archivos NO está OK (error [%1]) leyendo desde el caché del navegador" },
"Reading feeds and preferences from browser cache" : { fr: "Lecture des flux et des préférences depuis le cache du navigateur" , ja: "ブラウザのキャッシュからソースと設定を読み込む", es: "Leer las fuentes y preferencias de la memoria caché del navegador" },
......@@ -459,6 +463,12 @@ PTL.i18n.translations = {
"Validate /verify this feed file with the W3C" : { fr: "Valider / vérifier ce fichier flux avec le W3C", ja: "このソースファイルをW3Cで検証/検証する", es: "Validar / verificar este archivo fuente con el W3C" },
"Validate" : { fr: "Valider", ja: "検証", es: "Validar" },
"Report" : { fr: "Signaler" , ja: "報告する", es: "Reporte" },
"Report feed error" : { fr: "Signaler un flux en erreur" , ja: "レポートソースエラー", es: "Informe de error de la fuente" },
"No valid feed found at this address" : { fr: "Aucun flux valide découverte à cette adresse", ja: "このアドレスに有効なソースが見つかりません", es: "No se encontró una fuente válida en esta dirección" },
"Valid feed found! Now just press OK" : { fr: "Flux valide trouvée ! Maintenant, appuyez simplement sur OK", ja: "有効なソースが見つかりました! OKを押すだけです", es: "¡Se ha encontrado una fuente válida! Ahora solo presione OK" },
......
......@@ -58,16 +58,28 @@
<tr>
<td><a href="/bower/jquery/dist/jquery.min.js">jquery.min.js</a></td>
<td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
<td><a href="https://code.jquery.com/jquery-3.1.1.js">jquery-3.1.1.js</a></td>
<td><a href="https://jquery.org/license/">MIT Expat</a></td>
<td><a href="bower_components/jquery/dist/jquery.js">jquery-3.1.1.js</a></td>
</tr>
<tr>
<td><a href="/bower/jquery-ui/jquery-ui.min.js">jquery-ui.min.js</a></td>
<td><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU-GPL-2.0-or-later</a></td>
<td><a href="https://jquery.org/license/">MIT Expat</a></td>
<td><a href="/bower/jquery-ui/jquery-ui.js">jquery-ui.js</a></td>
</tr>
<tr>
<td><a href="/bower/DOMPurify/dist/purify.min.js">purify.min.js</a></td>
<td><a href="/bower/DOMPurify/LICENSE">Apache License Version 2.0 / Mozilla Public License Version 2.0</a></td>
<td><a href="/bower/DOMPurify/src/purify.js">remotestorage.js</a></td>
</tr>
<tr>
<td><a href="/bower/responsively-lazy/responsivelyLazy.min.js">responsivelyLazy.min.js</a></td>
<td><a href="http://opensource.org/licenses/MIT">MIT</a></td>
<td><a href="/bower/responsively-lazy/responsivelyLazy.min.js">responsivelyLazy.js</a></td>
</tr>
<tr>
<td><a href="/bower/remotestorage/release/remotestorage.js">remotestorage.js</a></td>
<td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment