Commit daae99e6 authored by yPhil's avatar yPhil

Sys: mv public/lib/js/ public/

parent 08ba5b24
......@@ -234,12 +234,6 @@
"repeat-element": "1.1.2"
}
},
"browser-stdout": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
"dev": true
},
"bytes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
......@@ -439,12 +433,6 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
"diff": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
"integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
"dev": true
},
"dom-serializer": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
......@@ -1585,12 +1573,6 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
},
"growl": {
"version": "1.10.3",
"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
"integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
"dev": true
},
"har-schema": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
......@@ -1613,12 +1595,6 @@
"ansi-regex": "2.1.1"
}
},
"has-flag": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
"dev": true
},
"hawk": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
......@@ -1630,12 +1606,6 @@
"sntp": "2.0.2"
}
},
"he": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
"dev": true
},
"hoek": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
......@@ -1711,12 +1681,6 @@
"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
"integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ="
},
"intro.js": {
"version": "2.8.0-alpha.1",
"resolved": "https://registry.npmjs.org/intro.js/-/intro.js-2.8.0-alpha.1.tgz",
"integrity": "sha1-CDh4OviPbVIlT4bBGOYKXUo58f4=",
"dev": true
},
"ipaddr.js": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
......@@ -1984,35 +1948,6 @@
"minimist": "0.0.8"
}
},
"mocha": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz",
"integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==",
"dev": true,
"requires": {
"browser-stdout": "1.3.0",
"commander": "2.11.0",
"debug": "3.1.0",
"diff": "3.3.1",
"escape-string-regexp": "1.0.5",
"glob": "7.1.2",
"growl": "1.10.3",
"he": "1.1.1",
"mkdirp": "0.5.1",
"supports-color": "4.4.0"
},
"dependencies": {
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"dev": true,
"requires": {
"ms": "2.0.0"
}
}
}
},
"moment": {
"version": "2.19.3",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz",
......@@ -2563,60 +2498,6 @@
"resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.0.tgz",
"integrity": "sha512-xTCx2vohXC2EWWDqY/zb4+5Mu28D+HYNSOuFzsyRDRvI/e1ICb69afwaUwfjr+25ZXldbOLyp+iDUZHq8UnTag=="
},
"should": {
"version": "13.2.0",
"resolved": "https://registry.npmjs.org/should/-/should-13.2.0.tgz",
"integrity": "sha512-DWrmYTHzvfaIRZhgVqEjGwzuYgowiiFxsvRViNv2HviAlRofWvGnkaDITLu6omAq5cBjZ9dk/Sn4tI06vE/+iw==",
"dev": true,
"requires": {
"should-equal": "2.0.0",
"should-format": "3.0.3",
"should-type": "1.4.0",
"should-type-adaptors": "1.1.0",
"should-util": "1.0.0"
}
},
"should-equal": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
"integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
"dev": true,
"requires": {
"should-type": "1.4.0"
}
},
"should-format": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
"integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
"dev": true,
"requires": {
"should-type": "1.4.0",
"should-type-adaptors": "1.1.0"
}
},
"should-type": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
"integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
"dev": true
},
"should-type-adaptors": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
"integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
"dev": true,
"requires": {
"should-type": "1.4.0",
"should-util": "1.0.0"
}
},
"should-util": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
"integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
"dev": true
},
"sntp": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
......@@ -2684,15 +2565,6 @@
"ansi-regex": "2.1.1"
}
},
"supports-color": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
"dev": true,
"requires": {
"has-flag": "2.0.0"
}
},
"tough-cookie": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
......@@ -2744,6 +2616,24 @@
}
}
},
"uglify-js": {
"version": "3.3.13",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.13.tgz",
"integrity": "sha512-7rdn/bDOG1ElSTPdh7AI5TCjLv63ZD4k8BBadN3ssIkhlaQL2c0yRxmXCyOYhZK0wZTgGgUSnYQ4CGu+Jos5cA==",
"dev": true,
"requires": {
"commander": "2.14.1",
"source-map": "0.6.1"
},
"dependencies": {
"commander": {
"version": "2.14.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
"integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
"dev": true
}
}
},
"unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
......
......@@ -17,9 +17,7 @@
"postinstall": "bower install"
},
"devDependencies": {
"intro.js": "2.8.0-alpha.1",
"mocha": "4.1.0",
"should": "13.2.0"
"uglify-js": "3.3.13"
},
"dependencies": {
"bower": "1.8.2",
......
......@@ -979,7 +979,6 @@ li.feedItem {
-moz-hyphens: auto;
-ms-hyphens: auto;
-webkit-hyphens: auto;
background-color: var(--bg-color-sec);
color: var(--color-pri);
font-size: 10pt;
hyphens: auto;
......@@ -999,10 +998,22 @@ div.itemDiv img.full {
min-width:100%;
}
table tr,
li.feedItem {
background-color: var(--bg-color-sec);
}
table tr:nth-child(even),
li.feedItem:nth-child(even) {
background-color: var(--bg-color-qua);
}
table tr:nth-child(even),
li.feedItem:nth-child(even) {
background-color: var(--bg-color-qua);
}
table tr:hover,
li.feedItem:hover {
color: var(--bg-color-sec) !important;
background-color: var(--bg-color-pri) !important;
......@@ -1152,12 +1163,12 @@ div.introjs-helperLayer {
color: var(--ui-color-sec);
}
.topnav > div#logoTitle {
div#logoTitle {
display:flex;
float: right;
}
.topnav i.icon-petrolette {
i.icon-petrolette {
display:block;
cursor: pointer;
font-size:24pt;
......@@ -1166,24 +1177,24 @@ div.introjs-helperLayer {
transition: all .3s linear;
}
.topnav i.icon-petrolette:hover,
.topnav i.icon-petrolette.writing {
i.icon-petrolette:hover,
i.icon-petrolette.writing {
color: var(--ui-color-sec);
}
.topnav i.icon-petrolette:before {
i.icon-petrolette:before {
font-style:italic !important;
}
.topnav i.icon-petrolette:hover {
i.icon-petrolette:hover {
font-style:normal !important;
}
.topnav > div#logoTitle > div {
div#logoTitle > div {
flex: 1 0 ;
}
.topnav > div#logoTitle > .logoTitle {
div#logoTitle > .logoTitle {
color: var(--ui-color-pri);
display:var(--logo-display);
font-family: LobsterRegular, Helvetica, Arial, sans-serif;
......@@ -1191,13 +1202,13 @@ div.introjs-helperLayer {
margin: -6px 0 0 0;
}
.topnav > div#logoTitle > .logoTitle > a:link,
.topnav > div#logoTitle > .logoTitle > a:visited {
div#logoTitle > .logoTitle > a:link,
div#logoTitle > .logoTitle > a:visited {
color: var(--ui-color-pri);
transition: all 0.3s linear;
}
.topnav > div#logoTitle > .logoTitle > a:hover {
div#logoTitle > .logoTitle > a:hover {
color: var(--ui-color-sec) !important;
}
......@@ -1248,3 +1259,36 @@ div.introjs-helperLayer {
color: var(--ui-color-sec);
top: 5px;
}
/* Javascript */
table {
border-collapse: collapse;
width: 90vw;
margin: auto;
}
table td, table th {
border: 1px solid #ddd;
padding: 8px;
}
table th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
background-color: #4CAF50;
color: white;
}
#js {
background: var(--ui-color-qua);
}
#js h1 {
padding-top: 2em;
}
#js h1,
#js p {
margin-left: 40px;
}
public/images/petrolette.png

10.7 KB | W: | H:

public/images/petrolette.png

868 Bytes | W: | H:

public/images/petrolette.png
public/images/petrolette.png
public/images/petrolette.png
public/images/petrolette.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -206,7 +206,7 @@ PTL.i18n.translations = {
"When you click an image, you can view it in a gallery, and start a slideshow." : { fr: "Un clic sur une image l'affiche dans une galerie." , ja: "イメージをクリックすると、ギャラリーでそのイメージを表示し、スライドショーを開始できます", es: "Cuando hace clic en una imagen, puede verla en una galería." },
"Help Pétrolette according to your spiritual mood of the day." : { fr: "Aider (en vrai) Pétrolette." , ja: "あなたの精神的な日の気分に応じてPétroletteを助けてください", es: "Ayuda a Pétrolette de acuerdo con tu estado de ánimo espiritual del día." },
"This file is bad" : { fr: "Ce fichier est chelou" , ja: "このファイルは悪いです", es: "Este archivo es malo" },
"This file is bad [%1]" : { fr: "Ce fichier est chelou [%1]" , ja: "[%1]このファイルは悪いです", es: "Este archivo es malo [%1]" },
"Loading of [%1] OK" : { fr: "Lecture de [%1] OK" , ja: "[%1]をロードしました。OK", es: "Cargado [%1] bien" },
"Erase all" : { fr: "Tout effacer" , ja: "すべてを消去する", es: "Borrar todo" },
......
......@@ -43,7 +43,6 @@ PTL.menu = {
$newSourceButton.click(function() {
var $openGroupPanel = $($('.ui-tabs-active').find('a').attr('href')).find('.tabSort');
console.log('$openGroupPanel: ', $openGroupPanel.attr('class'));
$overlay.removeClass('visible');
$menu.removeClass('expanded');
PTL.feed.make($openGroupPanel, 'New Feed', 'mixed', 8, true);
......@@ -114,7 +113,6 @@ PTL.menu = {
.checkboxradio('refresh');
$('.themeSwitcher').change(function() {
console.log('Theme: ' + '/static/css/themes/' + $(this).attr('value') + '.css');
$("#mobStyle").attr({href : '/static/css/themes/' + $(this).attr('value') + '.css'});
......@@ -130,7 +128,6 @@ PTL.menu = {
$.fancybox.defaults.slideShow.speed = gallerySlideshowSpeed;
$menu.find('select#gallerySlideTransition').change(function() {
console.log('New FX: %s', $(this).val());
$.fancybox.defaults.transitionEffect = $(this).val();
PTL.prefs.writeConfig('gallerySlideTransition', $(this).val());
});
......@@ -228,14 +225,14 @@ PTL.menu = {
if (isJsonString(y)) {
p = JSON.parse(y);
} else {
console.error('Pétrolette | ' + PTL.tr('This file is bad'));
console.error('Pétrolette | ' + PTL.tr('This file is bad [%1]', f.name));
}
if (p && isOk(p) === true){
console.info('Pétrolette | ' + PTL.tr('Loading of [%s] OK', f.name));
console.info('Pétrolette | ' + PTL.tr('Loading of [%1] OK', f.name));
PTL.tab.populate(p, true);
} else {
console.error('Pétrolette | ' + PTL.tr('This file is bad'));
console.error('Pétrolette | ' + PTL.tr('This file is bad [%1]', f.name));
}
};
......
......@@ -221,4 +221,6 @@
</fieldset>
<a href="/about/javascript" data-jslicense="1">JavaScript license information</a>
</form>
......@@ -11,6 +11,10 @@ router.get('/', function(req, res) {
res.render('index', {qstring:req.query.source});
});
router.get('/about/javascript', function(req, res) {
res.render('javascript');
});
router.use(function(req,res,next){
var _send = res.send;
var sent = false;
......
......@@ -41,9 +41,9 @@
<script src="/bower/remotestorage/release/remotestorage.js"></script>
<script src="/bower/rs-widget/build/widget.js"></script>
<script src="/static/lib/js/PTL.main.js"></script>
<script src="/static/lib/js/PTL.prefs.js"></script>
<script src="/static/lib/js/PTL.i18n.js"></script>
<script src="/static/js/PTL.main.js"></script>
<script src="/static/js/PTL.prefs.js"></script>
<script src="/static/js/PTL.i18n.js"></script>
<script>
......@@ -62,9 +62,7 @@
<i class="fontello"></i>
<i class="logoTitle">.</i>
<i class="feedTitle">.</i>
<i class="feedIcon"></i>
<i class="ui-icon"></i>
<i class="feedToggleArrow"></i>
</div>
<header></header>
......@@ -90,12 +88,12 @@
</span>
</footer>
<script src="/static/lib/js/PTL.utilities.js"></script>
<script src="/static/lib/js/PTL.tab.js"></script>
<script src="/static/lib/js/PTL.feed.js"></script>
<script src="/static/lib/js/PTL.dialog.js"></script>
<script src="/static/lib/js/PTL.sync.js"></script>
<script src="/static/lib/js/PTL.menu.js"></script>
<script src="/static/js/PTL.utilities.js"></script>
<script src="/static/js/PTL.tab.js"></script>
<script src="/static/js/PTL.feed.js"></script>
<script src="/static/js/PTL.dialog.js"></script>
<script src="/static/js/PTL.sync.js"></script>
<script src="/static/js/PTL.menu.js"></script>
<script>
......@@ -107,16 +105,8 @@
setTimeout(
function() {
PTL.tab.init(qstring);
// if (qstring) {
// var $openGroupPanel = $('#sortable1');
// console.log('qstring: %s, $openGroupPanel: ', qstring, $openGroupPanel.get())
// }
}, 500);
</script>
</body>
......
Markdown is supported
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