diff --git a/api/L10n.scripts.js.php b/api/L10n.scripts.js.php
index 7db730c..362a9df 100755
--- a/api/L10n.scripts.js.php
+++ b/api/L10n.scripts.js.php
@@ -1,36 +1,38 @@
.
require '../load.php';
+// TODO: convert this page into a simple register_js_var()
header('Content-Type: application/javascript');
?>
-/* Localized using GNU Gettext. Help translate using Poedit: /l10n/ */
-var L10N = {
- errorSent: "",
- addedToFavorites: "",
- noLocation: "",
- pleaseZoomIn: "",
- errorTooStations: "",
- noStations: "",
- tooStations: "",
- litersEuros: "",
- actionFavorites: "",
- actionError: "",
- noAddressFound: ""
-};
+/* Localized using GNU Gettext. Help translate using Poedit: = URL ?>/l10n/ */
+var L10N = = json_encode( [
+ 'errorSent' => __("La tua segnalazione è preziosa. Per ora però sara ignorata <_<"),
+ 'addedToFavorites' => __("Aggiunta ai preferiti... Se funzionassero <_<"),
+ 'noLocation' => __("Posizione non disponibile."),
+ 'pleaseZoomIn' => __("Avvicinati al suolo"),
+ 'errorTooStations' => __("Vedo molte stazioni. Fai zoom per scoprirle"),
+ 'noStations' => __("Nessuna pompa di benzina in questa zona"),
+ 'tooStations' => __("Fai zoom! Qui ci sono {n} stazioni"),
+ 'litersEuros' => __("Litri ogni {euro} € per {station}"),
+ 'actionFavorites' => __("Preferiti"),
+ 'actionError' => __("Segnala errore"),
+ 'noAddressFound' => __("Nessun indirizzo trovato. Riprova con parole più semplici."),
+] ); ?>;
diff --git a/includes/header.php b/includes/header.php
index de601d8..b6c3cd1 100755
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,72 +1,72 @@
.
*/
function get_header($uid, $args = []) {
$args = array_replace( [
'theme' => 'default'
], $args );
switch($args['theme']) {
case 'default':
enqueue_css('materialize');
enqueue_css('materialize.icons');
enqueue_js('jquery');
enqueue_js('materialize');
break;
}
header("Content-Type: text/html; charset=utf-8");
?>
- - name ?>
+ = SITE_NAME ?> - = menu_entry($uid)->name ?>
-
-
-
+
+
+
-
+
" . HTML::a(
$menuEntry->url,
$menuEntry->name,
$menuEntry->get('description')
) . "\n";
}
diff --git a/load-post.php b/load-post.php
index ff1b601..2012806 100755
--- a/load-post.php
+++ b/load-post.php
@@ -1,129 +1,134 @@
.
-// Customizing Boz PHP - Another PHP framework
-expect('menu');
+// this file should not be visited directly
+if( !defined( 'URL' ) ) {
+ exit;
+}
-define('INCLUDES', 'includes');
-define('IMAGES', 'images');
-define('MATERIALIZE', INCLUDES . _ . 'materialize');
-define('LEAFLET', INCLUDES . _ . 'leaflet');
+// customizing suckless-php
+define( 'INCLUDES', 'includes' );
+define( 'IMAGES', 'images' );
+define( 'MATERIALIZE', INCLUDES . _ . 'materialize' );
+define( 'LEAFLET', INCLUDES . _ . 'leaflet' );
$JQUERY_UI_PARTS = [
'core',
+];
+
+$JQUERY_UI_WIDGETS = [
'widget',
'mouse',
'position',
'autocomplete',
'button',
'dialog',
'effect',
'effect-drop'
];
// Load functions
-require ABSPATH . _ . INCLUDES . '/functions.php';
-require ABSPATH . _ . INCLUDES . '/classes.php';
-require ABSPATH . _ . INCLUDES . '/header.php';
-require ABSPATH . _ . INCLUDES . '/footer.php';
+require ABSPATH . __ . INCLUDES . '/functions.php';
+require ABSPATH . __ . INCLUDES . '/classes.php';
+require ABSPATH . __ . INCLUDES . '/header.php';
+require ABSPATH . __ . INCLUDES . '/footer.php';
// Choose language
switch( $lang = @$_GET['l'] ) {
case 'en_US':
case 'it_IT':
- gettext_rocks($lang);
+ apply_language( $lang );
break;
default:
- // Choose from browser settings
- switch( substr(@$_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) ) {
- case 'it':
- gettext_rocks('it_IT');
- break;
- case 'en':
- gettext_rocks('en_US');
- break;
- default:
- gettext_rocks('en_US');
- }
+ apply_language();
}
-define('SITE_NAME', _("Compara carburanti") );
-define('SITE_DESCRIPTION', _("Confronta i prezzi dei carburanti") );
+define('SITE_NAME', __("Compara carburanti") );
+define('SITE_DESCRIPTION', __("Confronta i prezzi dei carburanti") );
// libjs-jquery
register_js(
'jquery',
- ROOT . '/javascript/jquery/jquery.min.js'
+ '/javascript/jquery/jquery.min.js'
);
-// libjs-jquery-ui
-foreach($JQUERY_UI_PARTS as $part) {
+// apt install libjs-jquery-ui
+foreach( $JQUERY_UI_PARTS as $part ) {
+ register_js(
+ "jquery.ui.$part",
+ "/javascript/jquery-ui/ui/$part.min.js"
+ );
+}
+
+// apt install libjs-jquery-ui
+foreach( $JQUERY_UI_WIDGETS as $part ) {
register_js(
"jquery.ui.$part",
- ROOT . "/javascript/jquery-ui/ui/jquery.ui.$part.min.js"
+ "/javascript/jquery-ui/ui/widgets/$part.min.js"
);
}
register_js(
'materialize',
- ROOT . _ . MATERIALIZE . '/js/materialize.min.js'
+ MATERIALIZE . '/js/materialize.min.js'
);
register_js(
'leaflet',
'/javascript/leaflet/leaflet.js'
);
register_js(
'leaflet.bouncemarker',
- ROOT . _ . INCLUDES . '/leaflet.bouncemarker/bouncemarker.js'
+ INCLUDES . '/leaflet.bouncemarker/bouncemarker.js'
);
register_js(
'my-fuel-map.l10n',
- ROOT . '/api/L10n.scripts.js.php'
+ 'api/L10n.scripts.js.php'
);
register_js(
'my-fuel-map',
- ROOT . _ . INCLUDES . '/scripts.js'
+ INCLUDES . '/scripts.js'
);
register_css(
'materialize',
- ROOT . _ . MATERIALIZE . '/css/materialize.min.css'
+ MATERIALIZE . '/css/materialize.min.css'
);
register_css(
'leaflet',
'/javascript/leaflet/leaflet.css'
);
register_css(
'my-fuel-map',
- ROOT . _ . INCLUDES . '/style.css'
+ INCLUDES . '/style.css'
);
register_css(
'materialize.icons',
- ROOT . _ . INCLUDES . '/googlefonts/material-icons.css'
+ INCLUDES . '/googlefonts/material-icons.css'
);
-add_menu_entries([
- new MenuEntry('map', URL, _("Mappa carburanti") ),
- new MenuEntry('about', URL . '/about.php', _("Informazioni sulla piattaforma") )
-]);
+add_menu_entries( [
+ new MenuEntry( 'map', '', __("Mappa carburanti") ),
+ new MenuEntry( 'about', 'about.php', __("Informazioni sulla piattaforma") ),
+] );