Commit 7d251e7a authored by yPhil's avatar yPhil
Browse files

Conflic resolution

parents b28140a9 d3ccaf7f
Pipeline #386204 passed with stage
in 39 seconds
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?31467284');
src: url('../font/fontello.eot?31467284#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?31467284') format('woff2'),
url('../font/fontello.woff?31467284') format('woff'),
url('../font/fontello.ttf?31467284') format('truetype'),
url('../font/fontello.svg?31467284#fontello') format('svg');
src: url('../font/fontello.eot?906477');
src: url('../font/fontello.eot?906477#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?906477') format('woff2'),
url('../font/fontello.woff?906477') format('woff'),
url('../font/fontello.ttf?906477') format('truetype'),
url('../font/fontello.svg?906477#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?31467284#fontello') format('svg');
src: url('../font/fontello.svg?906477#fontello') format('svg');
}
}
*/
......@@ -55,27 +55,28 @@
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
.icon-globe:before { content: '\0805'; } /* 'ࠅ' */
.icon-cloud:before { content: '\0808'; } /* 'ࠈ' */
.icon-refresh:before { content: '\e800'; } /* '' */
.icon-audio:before { content: '\e801'; } /* '' */
.icon-cog:before { content: '\e802'; } /* '' */
.icon-pencil:before { content: '\e803'; } /* '' */
.icon-petrolette:before { content: '\e801'; } /* '' */
.icon-download:before { content: '\e802'; } /* '' */
.icon-upload:before { content: '\e803'; } /* '' */
.icon-up:before { content: '\e804'; } /* '' */
.icon-petrolette:before { content: '\e805'; } /* '' */
.icon-pin:before { content: '\e806'; } /* '' */
.icon-checked:before { content: '\e807'; } /* '' */
.icon-trash-empty:before { content: '\e80a'; } /* '' */
.icon-right:before { content: '\e80c'; } /* '' */
.icon-down:before { content: '\e80d'; } /* '' */
.icon-cancel:before { content: '\e80f'; } /* '' */
.icon-minus:before { content: '\e810'; } /* '' */
.icon-plus:before { content: '\e813'; } /* '' */
.icon-help:before { content: '\e81c'; } /* '' */
.icon-download:before { content: '\f02e'; } /* '' */
.icon-upload:before { content: '\f02f'; } /* '' */
.icon-checkbox:before { content: '\f096'; } /* '' */
.icon-menu:before { content: '\f0c9'; } /* '' */
.icon-rss:before { content: '\f143'; } /* '' */
.icon-comments:before { content: '\f27b'; } /* '' */
.icon-search:before { content: '\f50d'; } /* '' */
\ No newline at end of file
.icon-down:before { content: '\e805'; } /* '' */
.icon-right:before { content: '\e806'; } /* '' */
.icon-rss:before { content: '\e807'; } /* '' */
.icon-checked:before { content: '\e808'; } /* '' */
.icon-checkbox:before { content: '\e809'; } /* '' */
.icon-trash-empty:before { content: '\e810'; } /* '' */
.icon-plus:before { content: '\e811'; } /* '' */
.icon-minus:before { content: '\e812'; } /* '' */
.icon-search:before { content: '\e813'; } /* '' */
.icon-help:before { content: '\e814'; } /* '' */
.icon-menu:before { content: '\e815'; } /* '' */
.icon-cancel:before { content: '\e816'; } /* '' */
.icon-refresh:before { content: '\e817'; } /* '' */
.icon-pencil:before { content: '\e818'; } /* '' */
.icon-cog:before { content: '\e819'; } /* '' */
.icon-pin:before { content: '\e820'; } /* '' */
.icon-audio:before { content: '\e821'; } /* '' */
.icon-comments:before { content: '\e822'; } /* '' */
.icon-globe:before { content: '\e823'; } /* '' */
.icon-cloud:before { content: '\e824'; } /* '' */
.icon-error:before { content: '\e825'; } /* '' */
\ No newline at end of file
......@@ -427,13 +427,13 @@ input#feed-guess {
margin-right: .4em;
}
div#searchUrlString {
div#searchPrefix {
display:flex;
/* flex-wrap: nowrap; */
/* flex-direction: row; */
}
#search-url-string-input {
#searchPrefixInput {
/* flex-wrap: nowrap; */
/* flex-grow: 4; */
box-sizing: border-box;
......@@ -479,7 +479,7 @@ legend {
/* visibility: hidden; */
}
nav#side-menu {
nav#sideMenu {
border: none;
height: 100%;
left: var(--side-menu-width);
......@@ -492,7 +492,7 @@ nav#side-menu {
overflow: auto;
}
nav#side-menu.expanded {
nav#sideMenu.expanded {
left: 0px;
}
......@@ -535,7 +535,7 @@ nav#side-menu.expanded {
text-shadow: #FC0 1px 0 10px;
}
nav#side-menu,
nav#sideMenu,
#topnav,
.ui-dialog,
.ui-dialog .ui-dialog-buttonpane {
......@@ -815,11 +815,11 @@ label#killFeed:active {
flex: 1;
}
nav#side-menu .flex-box > * {
nav#sideMenu .flex-box > * {
margin-bottom: .4em;
}
nav#side-menu #gallerySlideTransition {
nav#sideMenu #gallerySlideTransition {
margin-top: 2px;
}
......
......@@ -9,7 +9,7 @@
{
"uid": "fb598151d4f3bbb37861ac6fdfabb383",
"css": "petrolette",
"code": 59397,
"code": 59393,
"src": "custom_icons",
"selected": true,
"svg": {
......@@ -23,13 +23,13 @@
{
"uid": "348b04ea17f646fbc6a46e20ebe4fe12",
"css": "download",
"code": 61486,
"code": 59394,
"src": "mfglabs"
},
{
"uid": "4f3b31017c63ba04dc4f78ce7a8f02b1",
"css": "upload",
"code": 61487,
"code": 59395,
"src": "mfglabs"
},
{
......@@ -41,122 +41,128 @@
{
"uid": "616b755d0f4c7d2dc7a1dcc2e5427039",
"css": "down",
"code": 59405,
"code": 59397,
"src": "elusive"
},
{
"uid": "dc4a03854ef986d64565143bea4241aa",
"css": "right",
"code": 59404,
"code": 59398,
"src": "elusive"
},
{
"uid": "de5f0a564ccf8816325330e292e11533",
"css": "rss",
"code": 61763,
"code": 59399,
"src": "fontawesome"
},
{
"uid": "b90d80c250a9bbdd6cd3fe00e6351710",
"css": "checked",
"code": 59399,
"code": 59400,
"src": "iconic"
},
{
"uid": "4b900d04e8ab8c82f080c1cfbac5772c",
"css": "checkbox",
"code": 61590,
"code": 59401,
"src": "fontawesome"
},
{
"uid": "f48ae54adfb27d8ada53d0fd9e34ee10",
"css": "trash-empty",
"code": 59402,
"code": 59408,
"src": "fontawesome"
},
{
"uid": "70370693ada58ef0a60fa0984fe8d52a",
"css": "plus",
"code": 59411,
"code": 59409,
"src": "entypo"
},
{
"uid": "1256e3054823e304d7e452a589cf8bb8",
"css": "minus",
"code": 59408,
"code": 59410,
"src": "entypo"
},
{
"uid": "ec21fe3492bb04d9e29103c319556ed8",
"css": "search",
"code": 62733,
"code": 59411,
"src": "mfglabs"
},
{
"uid": "3a230e539a4f3b904debd04c6c155034",
"css": "help",
"code": 59420,
"code": 59412,
"src": "entypo"
},
{
"uid": "559647a6f430b3aeadbecd67194451dd",
"css": "menu",
"code": 61641,
"code": 59413,
"src": "fontawesome"
},
{
"uid": "06301c50d89b5d3e651bd07ebd6d7de7",
"css": "cancel",
"code": 59407,
"code": 59414,
"src": "mfglabs"
},
{
"uid": "a73c5deb486c8d66249811642e5d719a",
"css": "refresh",
"code": 59392,
"code": 59415,
"src": "fontawesome"
},
{
"uid": "c77fd2fd065b5fe16d6f2b41e190b266",
"css": "pencil",
"code": 59395,
"code": 59416,
"src": "entypo"
},
{
"uid": "6083c8aa5e3345476a24a28ac1afaa61",
"css": "cog",
"code": 59394,
"code": 59417,
"src": "elusive"
},
{
"uid": "c91522256a4c3972e9a2765b995b7252",
"css": "pin",
"code": 59424,
"src": "zocial"
},
{
"uid": "5d9730dc93976d27eb07914eab50a507",
"css": "audio",
"code": 59393,
"code": 59425,
"src": "elusive"
},
{
"uid": "9cc990bbcac7aa8504078b3f49df79b1",
"css": "comments",
"code": 62075,
"code": 59426,
"src": "fontawesome"
},
{
"uid": "1e89103762be72b0720eda0468e62b90",
"css": "globe",
"code": 2053,
"code": 59427,
"src": "linecons"
},
{
"uid": "e9bce795d01ef5a058c63cab0a03dc66",
"css": "cloud",
"code": 2056,
"code": 59428,
"src": "typicons"
},
{
"uid": "c91522256a4c3972e9a2765b995b7252",
"css": "pin",
"code": 59398,
"src": "zocial"
"uid": "3c0ef77f5fbb5c933c23f2c437d8cab8",
"css": "error",
"code": 59429,
"src": "elusive"
}
]
}
\ No newline at end of file
No preview for this file type
......@@ -6,53 +6,55 @@
<font id="fontello" horiz-adv-x="1000" >
<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
<missing-glyph horiz-adv-x="1000" />
<glyph glyph-name="globe" unicode="&#x805;" d="M0 366q0 201 142 342t342 142 343-142 142-342-142-343-343-142-342 142-142 343z m63-16q7-166 125-283 52 37 109 60-43 106-47 223l-187 0z m0 31l187 0q4 104 37 196-62 25-117 68-102-113-107-264z m128 287q51-39 108-62 43 101 117 176-131-22-225-114z m20-623q88-76 205-95-64 64-105 148-53-19-100-53z m70 305q4-111 45-213 69 22 143 26l0 187-188 0z m0 31l188 0 0 157q-78 3-153 29-31-88-35-186z m47 215q69-23 141-27l0 218-2 0q-90-76-139-191z m12-486q49-100 127-166l2 0 0 187q-69-4-129-21z m160-166l2 0q78 66 127 166-61 17-129 21l0-187z m0 219q74-4 143-26 41 102 45 213l-188 0 0-187z m0 218l188 0q-4 98-36 186-74-26-152-29l0-157z m0 188q72 4 141 27-49 115-139 191l-2 0 0-218z m53-619q117 19 205 95-47 34-100 53-41-84-105-148z m0 832q74-75 117-176 57 23 107 62-93 92-224 114z m119-655q57-23 109-60 117 117 125 283l-187 0q-4-117-47-223z m10 450q33-92 37-196l187 0q-6 151-107 264-55-43-117-68z" horiz-adv-x="969" />
<glyph glyph-name="petrolette" unicode="&#xe801;" d="M54 850c-18 0-36-10-46-27l0 0c-16-26-7-60 19-75l252-149 0-432c0-30 24-55 55-55 30 0 55 25 55 55l0 463c0 17-8 32-21 42-3 3-5 5-9 7l-276 163c-9 6-19 8-29 8z m892 0c-10 0-20-2-29-8l-276-163c-3-2-6-4-9-7-13-10-20-25-20-42l0-463c0-30 24-55 54-55 31 0 55 25 55 55l0 432 252 149c26 15 35 49 19 75l0 0c-10 17-28 27-46 27z m-446-48c-30 0-55-24-55-55l0-842c0-31 25-55 55-55 30 0 55 24 55 55l0 842c0 31-25 55-55 55z" horiz-adv-x="1000" />
<glyph glyph-name="cloud" unicode="&#x808;" d="M794 506q107 0 184-76t77-184-77-184-184-77l-573 0q-87 0-154 62t-67 147q0 66 48 122t96 79l0 8q0 128 97 220t228 92q102 0 189-59t118-151q4 0 9 1t9 0z m0-416q65 0 110 46t46 110-45 111-110 46q-17 0-42-8l-57-15-10 56q-13 75-71 125t-134 49q-86 0-147-61t-60-146q0-23 4-43l12-62-74 1q-40 0-69-31t-29-74q0-44 30-74t73-30l287 0 0 198-112-113q-7-7-18-7-17 0-24 16t5 29l156 156q6 6 18 7t20-7l156-156q12-13 5-29t-24-16q-11 0-19 7l-111 113 0-198 234 0z" horiz-adv-x="1055" />
<glyph glyph-name="download" unicode="&#xe802;" d="M0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-144 60t-59 143z m155 359q0 33 24 57 23 23 56 23t57-23l105-106v344q0 33 24 57t56 23 57-23 24-57v-344l110 110q24 24 57 24t56-24q24-23 24-56t-24-57l-247-247q-24-25-57-25-32 0-56 25l-242 242q-24 24-24 57z" horiz-adv-x="937.5" />
<glyph glyph-name="refresh" unicode="&#xe800;" d="M843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-36 90-57t105-20q74 0 139 37t104 99q6 10 30 66 4 13 16 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" />
<glyph glyph-name="upload" unicode="&#xe803;" d="M0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-143 59t-60 144z m155 407q0 33 24 57l247 247q23 23 57 23 33 0 56-23l243-242q23-24 23-57t-23-57q-24-23-57-23t-57 23l-105 105v-344q0-33-24-57t-56-24q-33 0-57 24t-24 57v344l-110-110q-24-23-57-23t-56 23-24 57z" horiz-adv-x="937.5" />
<glyph glyph-name="audio" unicode="&#xe801;" d="M0 141l0 418 236 0 358 291 0-1000-358 291-236 0z m656 37q74 74 74 174 0 104-74 180l73 74q103-106 107-256 0-144-107-246z" horiz-adv-x="836" />
<glyph glyph-name="up" unicode="&#xe804;" d="M366 790l334-334q31-31 31-73t-31-74-74-31-73 31l-83 82 0-377q0-44-31-74t-73-30q-43 0-74 31t-31 73l0 377-82-82q-31-31-74-31t-74 31-31 74 31 73z" horiz-adv-x="731" />
<glyph glyph-name="cog" unicode="&#xe802;" d="M0 272l0 156 150 16q14 45 38 88l-96 117 109 109 117-95q41 23 88 37l16 150 156 0 16-150q45-14 88-37l117 95 109-109-96-117q24-43 38-88l150-16 0-156-150-16q-14-47-38-88l96-117-109-109-117 96q-43-24-88-38l-16-150-156 0-16 150q-47 14-88 38l-117-96-109 109 96 117q-24 41-38 88z m355 78q0-60 42-102t103-42 103 42 42 102-42 103-103 42-103-42-42-103z" horiz-adv-x="1000" />
<glyph glyph-name="down" unicode="&#xe805;" d="M0 526l148 148 352-351 352 351 148-148-352-352-148-148-148 148z" horiz-adv-x="1000" />
<glyph glyph-name="pencil" unicode="&#xe803;" d="M718 680q32-32 47-64t15-48l0-16-252-252-290-288-238-52 50 240 290 288 252 252q54 12 126-60z m-494-640l24 24q-2 44-52 94-22 22-45 35t-35 13l-14 2-22-24-18-80q28-16 46-34 24-24 36-48z" horiz-adv-x="780" />
<glyph glyph-name="right" unicode="&#xe806;" d="M0-2l352 352-352 352 148 148 352-351 148-149-148-148-352-352z" horiz-adv-x="648" />
<glyph glyph-name="up" unicode="&#xe804;" d="M366 790l334-334q31-31 31-73t-31-74-74-31-73 31l-83 82 0-377q0-44-31-74t-73-30q-43 0-74 31t-31 73l0 377-82-82q-31-31-74-31t-74 31-31 74 31 73z" horiz-adv-x="731" />
<glyph glyph-name="rss" unicode="&#xe807;" d="M286 136q0 29-21 50t-51 21-50-21-21-50 21-51 50-21 51 21 21 51z m196-53q-8 130-99 222t-221 98q-8 1-14-5t-5-13v-71q0-7 5-12t12-6q86-6 147-68t67-147q1-7 6-12t12-5h72q7 0 13 6t5 13z m214 0q-3 86-31 166t-78 145-115 114-145 78-166 31q-7 1-13-5-5-5-5-13v-71q0-7 5-12t12-6q114-4 211-62t156-155 62-211q0-8 5-13t13-5h71q7 0 13 6 6 5 5 13z m161 535v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" />
<glyph glyph-name="checked" unicode="&#xe808;" d="M352-10l-334 333 158 160 176-174 400 401 159-160z" horiz-adv-x="928" />
<glyph glyph-name="petrolette" unicode="&#xe805;" d="M54 850c-18 0-36-10-46-27l0 0c-16-26-7-60 19-75l252-149 0-432c0-30 24-55 55-55 30 0 55 25 55 55l0 463c0 17-8 32-21 42-3 3-5 5-9 7l-276 163c-9 6-19 8-29 8z m892 0c-10 0-20-2-29-8l-276-163c-3-2-6-4-9-7-13-10-20-25-20-42l0-463c0-30 24-55 54-55 31 0 55 25 55 55l0 432 252 149c26 15 35 49 19 75l0 0c-10 17-28 27-46 27z m-446-48c-30 0-55-24-55-55l0-842c0-31 25-55 55-55 30 0 55 24 55 55l0 842c0 31-25 55-55 55z" horiz-adv-x="1000" />
<glyph glyph-name="checkbox" unicode="&#xe809;" d="M625 707h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v464q0 37-26 63t-63 26z m161-89v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q66 0 114-48t47-113z" horiz-adv-x="785.7" />
<glyph glyph-name="pin" unicode="&#xe806;" d="M0 527l316 323 0-123 301-277 187 46-195-208 391-438-444 392-188-192 30 169-255 316z" horiz-adv-x="1000" />
<glyph glyph-name="trash-empty" unicode="&#xe810;" d="M286 439v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m143 0v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m142 0v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q7 0 12-5t5-13z m72-404v529h-500v-529q0-12 4-22t8-15 6-5h464q2 0 6 5t8 15 4 22z m-375 601h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q23 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" />
<glyph glyph-name="checked" unicode="&#xe807;" d="M352-10l-334 333 158 160 176-174 400 401 159-160z" horiz-adv-x="928" />
<glyph glyph-name="plus" unicode="&#xe811;" d="M550 400q30 0 30-50t-30-50l-210 0 0-210q0-30-50-30t-50 30l0 210-210 0q-30 0-30 50t30 50l210 0 0 210q0 30 50 30t50-30l0-210 210 0z" horiz-adv-x="580" />
<glyph glyph-name="trash-empty" unicode="&#xe80a;" d="M286 439v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m143 0v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m142 0v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q7 0 12-5t5-13z m72-404v529h-500v-529q0-12 4-22t8-15 6-5h464q2 0 6 5t8 15 4 22z m-375 601h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q23 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" />
<glyph glyph-name="minus" unicode="&#xe812;" d="M550 400q30 0 30-50t-30-50l-520 0q-30 0-30 50t30 50l520 0z" horiz-adv-x="580" />
<glyph glyph-name="right" unicode="&#xe80c;" d="M0-2l352 352-352 352 148 148 352-351 148-149-148-148-352-352z" horiz-adv-x="648" />
<glyph glyph-name="search" unicode="&#xe813;" d="M11 375q-23 87 0 173t87 150q48 49 110 74t128 25q65 0 127-25t110-74q52-52 77-119t21-137-36-132q28-8 49-29l174-173q35-35 35-85t-35-85q-35-35-85-35t-85 35l-173 174q-22 20-30 49-70-35-149-35-66 0-128 25t-110 73q-64 64-87 151z m101 86q0-93 65-158 66-65 159-65 92 0 157 65t66 158-66 158q-66 66-157 66-92 0-159-66-65-65-65-158z" horiz-adv-x="892.6" />
<glyph glyph-name="down" unicode="&#xe80d;" d="M0 526l148 148 352-351 352 351 148-148-352-352-148-148-148 148z" horiz-adv-x="1000" />
<glyph glyph-name="help" unicode="&#xe814;" d="M494 740q86-62 86-184 0-64-42-124-12-20-88-80l-46-30q-40-34-48-60-6-16-8-44 0-14-16-14l-128 0q-16 0-16 12 4 98 28 124 16 22 48 48t56 42l24 14q22 16 34 34 28 44 28 70 0 40-26 78-28 36-92 36-68 0-94-44-28-42-28-92l-166 0q6 162 114 232 70 42 166 42 130 0 214-60z m-216-636q44 0 73-30t27-74q-2-46-32-73t-74-25q-44 0-73 29t-27 75 32 73 74 25z" horiz-adv-x="580" />
<glyph glyph-name="cancel" unicode="&#xe80f;" d="M0 90q0 36 26 62l195 195-195 196q-26 25-26 61t26 61 61 25 61-25l196-196 195 196q25 25 61 25t61-25 25-61-25-61l-195-196 195-195q25-26 25-62t-25-61q-25-25-61-25t-61 25l-195 195-196-195q-25-25-61-25t-61 25q-26 26-26 61z" horiz-adv-x="686.5" />
<glyph glyph-name="menu" unicode="&#xe815;" d="M857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-14-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
<glyph glyph-name="minus" unicode="&#xe810;" d="M550 400q30 0 30-50t-30-50l-520 0q-30 0-30 50t30 50l520 0z" horiz-adv-x="580" />
<glyph glyph-name="cancel" unicode="&#xe816;" d="M0 90q0 36 26 62l195 195-195 196q-26 25-26 61t26 61 61 25 61-25l196-196 195 196q25 25 61 25t61-25 25-61-25-61l-195-196 195-195q25-26 25-62t-25-61q-25-25-61-25t-61 25l-195 195-196-195q-25-25-61-25t-61 25q-26 26-26 61z" horiz-adv-x="686.5" />
<glyph glyph-name="plus" unicode="&#xe813;" d="M550 400q30 0 30-50t-30-50l-210 0 0-210q0-30-50-30t-50 30l0 210-210 0q-30 0-30 50t30 50l210 0 0 210q0 30 50 30t50-30l0-210 210 0z" horiz-adv-x="580" />
<glyph glyph-name="refresh" unicode="&#xe817;" d="M843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-36 90-57t105-20q74 0 139 37t104 99q6 10 30 66 4 13 16 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" />
<glyph glyph-name="help" unicode="&#xe81c;" d="M494 740q86-62 86-184 0-64-42-124-12-20-88-80l-46-30q-40-34-48-60-6-16-8-44 0-14-16-14l-128 0q-16 0-16 12 4 98 28 124 16 22 48 48t56 42l24 14q22 16 34 34 28 44 28 70 0 40-26 78-28 36-92 36-68 0-94-44-28-42-28-92l-166 0q6 162 114 232 70 42 166 42 130 0 214-60z m-216-636q44 0 73-30t27-74q-2-46-32-73t-74-25q-44 0-73 29t-27 75 32 73 74 25z" horiz-adv-x="580" />
<glyph glyph-name="pencil" unicode="&#xe818;" d="M718 680q32-32 47-64t15-48l0-16-252-252-290-288-238-52 50 240 290 288 252 252q54 12 126-60z m-494-640l24 24q-2 44-52 94-22 22-45 35t-35 13l-14 2-22-24-18-80q28-16 46-34 24-24 36-48z" horiz-adv-x="780" />
<glyph glyph-name="download" unicode="&#xf02e;" d="M0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-144 60t-59 143z m155 359q0 33 24 57 23 23 56 23t57-23l105-106v344q0 33 24 57t56 23 57-23 24-57v-344l110 110q24 24 57 24t56-24q24-23 24-56t-24-57l-247-247q-24-25-57-25-32 0-56 25l-242 242q-24 24-24 57z" horiz-adv-x="937.5" />
<glyph glyph-name="cog" unicode="&#xe819;" d="M0 272l0 156 150 16q14 45 38 88l-96 117 109 109 117-95q41 23 88 37l16 150 156 0 16-150q45-14 88-37l117 95 109-109-96-117q24-43 38-88l150-16 0-156-150-16q-14-47-38-88l96-117-109-109-117 96q-43-24-88-38l-16-150-156 0-16 150q-47 14-88 38l-117-96-109 109 96 117q-24 41-38 88z m355 78q0-60 42-102t103-42 103 42 42 102-42 103-103 42-103-42-42-103z" horiz-adv-x="1000" />
<glyph glyph-name="upload" unicode="&#xf02f;" d="M0 84v73q0 33 24 56t57 24 56-24 24-56v-73q0-17 12-29t30-13h531q18 0 30 13t12 29v73q0 33 24 56t56 24 57-24 24-56v-73q0-84-59-143t-144-60h-531q-84 0-143 59t-60 144z m155 407q0 33 24 57l247 247q23 23 57 23 33 0 56-23l243-242q23-24 23-57t-23-57q-24-23-57-23t-57 23l-105 105v-344q0-33-24-57t-56-24q-33 0-57 24t-24 57v344l-110-110q-24-23-57-23t-56 23-24 57z" horiz-adv-x="937.5" />
<glyph glyph-name="pin" unicode="&#xe820;" d="M0 527l316 323 0-123 301-277 187 46-195-208 391-438-444 392-188-192 30 169-255 316z" horiz-adv-x="1000" />
<glyph glyph-name="checkbox" unicode="&#xf096;" d="M625 707h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v464q0 37-26 63t-63 26z m161-89v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q66 0 114-48t47-113z" horiz-adv-x="785.7" />
<glyph glyph-name="audio" unicode="&#xe821;" d="M0 141l0 418 236 0 358 291 0-1000-358 291-236 0z m656 37q74 74 74 174 0 104-74 180l73 74q103-106 107-256 0-144-107-246z" horiz-adv-x="836" />
<glyph glyph-name="menu" unicode="&#xf0c9;" d="M857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-14-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
<glyph glyph-name="comments" unicode="&#xe822;" d="M357 350q0-30-21-50t-50-21-51 21-21 50 21 51 51 20 50-20 21-51z m214 0q0-30-20-50t-51-21-50 21-21 50 21 51 50 20 51-20 20-51z m215 0q0-30-21-50t-51-21-50 21-21 50 21 51 50 20 51-20 21-51z m-286 286q-114 0-213-39t-157-105-59-142q0-62 40-119t113-98l48-28-15-53q-13-51-39-97 85 36 154 96l24 21 32-3q38-5 72-5 114 0 213 39t157 105 59 142-59 142-157 105-213 39z m500-286q0-97-67-179t-182-130-251-48q-39 0-81 4-110-97-257-135-27-8-63-12h-3q-8 0-15 6t-9 15v1q-2 2 0 6t1 6 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157q0 73 40 139t106 114 160 76 194 28 194-28 160-76 106-114 40-139z" horiz-adv-x="1000" />
<glyph glyph-name="rss" unicode="&#xf143;" d="M286 136q0 29-21 50t-51 21-50-21-21-50 21-51 50-21 51 21 21 51z m196-53q-8 130-99 222t-221 98q-8 1-14-5t-5-13v-71q0-7 5-12t12-6q86-6 147-68t67-147q1-7 6-12t12-5h72q7 0 13 6t5 13z m214 0q-3 86-31 166t-78 145-115 114-145 78-166 31q-7 1-13-5-5-5-5-13v-71q0-7 5-12t12-6q114-4 211-62t156-155 62-211q0-8 5-13t13-5h71q7 0 13 6 6 5 5 13z m161 535v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" />
<glyph glyph-name="globe" unicode="&#xe823;" d="M0 366q0 201 142 342t342 142 343-142 142-342-142-343-343-142-342 142-142 343z m63-16q7-166 125-283 52 37 109 60-43 106-47 223l-187 0z m0 31l187 0q4 104 37 196-62 25-117 68-102-113-107-264z m128 287q51-39 108-62 43 101 117 176-131-22-225-114z m20-623q88-76 205-95-64 64-105 148-53-19-100-53z m70 305q4-111 45-213 69 22 143 26l0 187-188 0z m0 31l188 0 0 157q-78 3-153 29-31-88-35-186z m47 215q69-23 141-27l0 218-2 0q-90-76-139-191z m12-486q49-100 127-166l2 0 0 187q-69-4-129-21z m160-166l2 0q78 66 127 166-61 17-129 21l0-187z m0 219q74-4 143-26 41 102 45 213l-188 0 0-187z m0 218l188 0q-4 98-36 186-74-26-152-29l0-157z m0 188q72 4 141 27-49 115-139 191l-2 0 0-218z m53-619q117 19 205 95-47 34-100 53-41-84-105-148z m0 832q74-75 117-176 57 23 107 62-93 92-224 114z m119-655q57-23 109-60 117 117 125 283l-187 0q-4-117-47-223z m10 450q33-92 37-196l187 0q-6 151-107 264-55-43-117-68z" horiz-adv-x="969" />
<glyph glyph-name="comments" unicode="&#xf27b;" d="M357 350q0-30-21-50t-50-21-51 21-21 50 21 51 51 20 50-20 21-51z m214 0q0-30-20-50t-51-21-50 21-21 50 21 51 50 20 51-20 20-51z m215 0q0-30-21-50t-51-21-50 21-21 50 21 51 50 20 51-20 21-51z m-286 286q-114 0-213-39t-157-105-59-142q0-62 40-119t113-98l48-28-15-53q-13-51-39-97 85 36 154 96l24 21 32-3q38-5 72-5 114 0 213 39t157 105 59 142-59 142-157 105-213 39z m500-286q0-97-67-179t-182-130-251-48q-39 0-81 4-110-97-257-135-27-8-63-12h-3q-8 0-15 6t-9 15v1q-2 2 0 6t1 6 2 5l4 5t4 5 4 5q4 5 17 19t20 22 17 22 18 28 15 33 15 42q-88 50-138 123t-51 157q0 73 40 139t106 114 160 76 194 28 194-28 160-76 106-114 40-139z" horiz-adv-x="1000" />
<glyph glyph-name="cloud" unicode="&#xe824;" d="M794 506q107 0 184-76t77-184-77-184-184-77l-573 0q-87 0-154 62t-67 147q0 66 48 122t96 79l0 8q0 128 97 220t228 92q102 0 189-59t118-151q4 0 9 1t9 0z m0-416q65 0 110 46t46 110-45 111-110 46q-17 0-42-8l-57-15-10 56q-13 75-71 125t-134 49q-86 0-147-61t-60-146q0-23 4-43l12-62-74 1q-40 0-69-31t-29-74q0-44 30-74t73-30l287 0 0 198-112-113q-7-7-18-7-17 0-24 16t5 29l156 156q6 6 18 7t20-7l156-156q12-13 5-29t-24-16q-11 0-19 7l-111 113 0-198 234 0z" horiz-adv-x="1055" />
<glyph glyph-name="search" unicode="&#xf50d;" d="M11 375q-23 87 0 173t87 150q48 49 110 74t128 25q65 0 127-25t110-74q52-52 77-119t21-137-36-132q28-8 49-29l174-173q35-35 35-85t-35-85q-35-35-85-35t-85 35l-173 174q-22 20-30 49-70-35-149-35-66 0-128 25t-110 73q-64 64-87 151z m101 86q0-93 65-158 66-65 159-65 92 0 157 65t66 158-66 158q-66 66-157 66-92 0-159-66-65-65-65-158z" horiz-adv-x="892.6" />
<glyph glyph-name="error" unicode="&#xe825;" d="M0 350q0 207 147 354t353 146 354-146 146-354-146-354-354-146-353 146-147 354z m164-133l672 0 0 266-672 0 0-266z" horiz-adv-x="1000" />
</font>
</defs>
</svg>
\ No newline at end of file
No preview for this file type
......@@ -162,7 +162,7 @@ PTL.dialog = {
function guessError () {
$guessSpinner.removeClass('icon-cog spin ui-state-success')
.addClass('icon-cancel-circled');
.addClass('icon-error');
$guessButton
.addClass('ui-state-error')
......@@ -207,17 +207,20 @@ PTL.dialog = {
$guessButton.click(function() {
$guessSpinner
.removeClass('icon-checked icon-cancel-circled icon-search ui-state-success ui-state-error')
.removeClass('icon-checked icon-error icon-search ui-state-success ui-state-error')
.addClass('spin icon-cog');
$guessButton.removeClass('icon-checked ui-state-success ui-state-error');
$.get('/discover', {
url: $guessField.val(),
dataType: 'json',
timeout: 800
}, function() {
$guessSpinner.removeClass('spin icon-cog');
url: $guessField.val(),
searchPrefix: PTL.prefs.readConfig('searchPrefix'),
timeout: 2000
}).fail(function(req, status, xhr) {
console.log('fail!!');
guessError();
}).done(function(feed) {
$guessSpinner.removeClass('spin icon-cog');
$guessField.val(feed);
......@@ -229,8 +232,13 @@ PTL.dialog = {
.addClass('ui-state-success')
.attr('title', PTL.tr('Valid feed found! Now just press OK')) ;
}).fail(function() {
guessError();
}).always(function(req, status, xhr) {
if (status === 'error')
guessError();
console.log('status: %s', status);
});
});
......
......@@ -8,7 +8,7 @@ var PTL = (function() {
language: 'en',
start : function() {
var $menu = $('nav#side-menu'),
var $menu = $('nav#sideMenu'),
$overlay = $('#overlay'),
$feedCodeButton = $('button#feedCode'),
$importButton = $("button#fileImport"),
......@@ -16,8 +16,24 @@ var PTL = (function() {
$saveButton = $('#saveTabs'),
$langMenu = $('select#language'),
$slider = $('div#gallerySpeedSlider'),
$searchPrefixOkButton = $('button#searchPrefixOkButton'),
$searchPrefixRestoreButton = $('button#searchPrefixRestoreButton'),
$searchPrefixInput = $('input#searchPrefixInput'),
$spinner = $('#gallerySpeedSpinner');
$searchPrefixInput.val(PTL.prefs.readConfig('searchPrefix'));
$searchPrefixRestoreButton.click(function(){
console.log('val %s', $searchPrefixInput.val());
$searchPrefixInput.val(PTL.prefs.readConfig('searchPrefixDefault'));
});
$searchPrefixOkButton.click(function(){
PTL.prefs.writeConfig('searchPrefix', $searchPrefixInput.val());
console.log('val %s', $searchPrefixInput.val());
});
$('noscript').hide();
$('.js-enabled-only').show();
......@@ -241,7 +257,7 @@ var PTL = (function() {
sideMenu: function(action) {
var $overlay = $('#overlay'),
$sideMenu = $('nav#side-menu');
$sideMenu = $('nav#sideMenu');
if (action == 'open') {
$overlay.removeClass('hidden');
......
......@@ -9,8 +9,8 @@ PTL.prefs = (function() {
{"url":"http://rss.nytimes.com/services/xml/rss/nyt/World.xml","type":"mixed","limit": 4,"status":"on"}
],
[
{"url":"https://www.reddit.com/r/worldnews.rss","type":"mixed","limit": 8,"status":"on"},
{"url":"http://feeds.reuters.com/Reuters/worldNews","type":"text","limit": 16,"status":"on"}
{"url":"https://www.reddit.com/r/worldnews.rss","type":"mixed","limit": 6,"status":"off"},
{"url":"https://www.npr.org/rss/rss.php?id=1001","type":"mixed","limit": 4,"status":"on"}
],
[
{"url":"http://www.lemonde.fr/rss/une.xml","type":"mixed","limit": 4,"status":"on"}
......@@ -25,19 +25,19 @@ PTL.prefs = (function() {
],
[
{"url":"https://hacks.mozilla.org/feed/","type":"mixed","limit": 4,"status":"on"},
{"url":"https://thepiratebay.org/rss/top100/202","type":"text","limit": 12,"status":"on"}
{"url":"http://feeds.arstechnica.com/arstechnica/index","type":"text","limit": 12,"status":"on"}
],
[
{"url":"https://www.reddit.com/.rss","type":"mixed","limit": 4,"status":"on"},
{"url":"http://feeds.feedburner.com/thechangelog","type":"text","limit": 4,"status":"on"}
{"url":"http://feeds.feedburner.com/thechangelog","type":"text","limit": 4,"status":"off"}
]
]
},
{"name":"img",
"columns": [
[
{"url":"http://cabinporn.com/rss/","type":"photo","limit": 16,"status":"on"},
{"url":"https://www.reddit.com/r/EarthPorn.rss","type":"photo","limit": 16,"status":"on"}
{"url":"http://cabinporn.com/rss/","type":"photo","limit": 3,"status":"off"},
{"url":"http://www.nasa.gov/rss/dyn/lg_image_of_the_day.rss","type":"photo","limit": 3,"status":"on"}
]
]
},
......@@ -62,7 +62,7 @@ PTL.prefs = (function() {
{"url":"http://planet.linuxaudio.org/rss20.xml","type":"mixed","limit": 12,"status":"on"}
],
[
{"url":"https://dangerousminds.net/atom","type":"photo","mixed": 12,"status":"on"}
{"url":"https://feeds.feedburner.com/dangerousminds/dot/net","type":"photo","mixed": 12,"status":"on"}
]
]
}
......@@ -72,6 +72,8 @@ PTL.prefs = (function() {
'gallerySlideTransition': 'fade',
'gallerySlideshowSpeed': 3000,
'lang': 'en',
'searchPrefix': 'https://trouvons.org/?format=rss&categories=news&q=',
'searchPrefixDefault': 'https://trouvons.org/?format=rss&categories=news&q=',
'feeds': JSON.stringify(newList),
'tabDropActivate': true,
'theme': 'night',
......
......@@ -4,6 +4,7 @@ const express = require('express'),
FeedParser = require('feedparser'),
request = require('request'),
feedrat = require('feedrat'),
// feedrat = require(__dirname + '/../../feedrat/'),
fs = require('fs'),
path = require('path'),
crypto = require('crypto'),
......@@ -132,14 +133,12 @@ function getFeed (urlfeed, callback) {
router.get('/feed', function(req, res) {
console.log('GET');
var dnsreq = request(req.query.feedurl);
dnsreq
.on('error', function(error) {
// The only way so far to catch a DNS error
console.log('Err: %s (%s)', {error:error.code}, req.query.feedurl);
// console.log('Err: %s (%s)', {error:error.code}, req.query.feedurl);
res.send({error:error.code});
})
.on('response', function(response) {
......@@ -193,10 +192,14 @@ router.get('/favicon', function(req, res) {
router.get('/discover', function(req, res) {
feedrat(req.query.url, function(err, feed) {
feedrat(req.query.url, req.query.searchPrefix, function(err, feed) {
if (feed) {
res.send(feed);
} else if (err) {
console.log('err: %s', err);
res.status(500).send(err.code);
} else {
res.status(500).send('No feed found');
}
......
......@@ -130,8 +130,8 @@
</div>
</nav>