From 7da3b8637a41bbe2bfbc31a155fdd2b248fac024 Mon Sep 17 00:00:00 2001 From: milesimarco Date: Sun, 22 Feb 2015 23:05:35 +0100 Subject: [PATCH 01/25] prova develop con la versione in sviluppo --- footer.php | 1 + functions.php | 87 +- github/CHANGES.md | 34 + github/README.md | 30 +- github/assets/screenshot-1.png | Bin 70185 -> 68928 bytes github/assets/screenshot-2.png | Bin 0 -> 57698 bytes github/composer.json | 28 +- github/github-updater.php | 27 +- github/includes/markdown.php | 3335 ----------------- github/languages/description-i18n-keys.txt | 27 + github/languages/github-updater-fr_FR.mo | Bin 0 -> 4901 bytes github/languages/github-updater-fr_FR.po | 256 ++ github/languages/github-updater-it.mo | Bin 0 -> 4803 bytes github/languages/github-updater-it.po | 259 ++ github/languages/github-updater-pt_BR.mo | Bin 0 -> 3697 bytes github/languages/github-updater-pt_BR.po | 247 ++ github/languages/github-updater-uk.mo | Bin 0 -> 5567 bytes github/languages/github-updater-uk.po | 253 ++ github/languages/github-updater.pot | 180 +- github/mu/ghu-loader.php | 18 +- github/src/GitHub_Updater/Autoloader.php | 78 + .../GitHub_Updater/Base.php} | 214 +- .../GitHub_Updater/Bitbucket_API.php} | 51 +- .../GitHub_Updater/GitHub_API.php} | 39 +- github/src/GitHub_Updater/Install.php | 286 ++ .../GitHub_Updater/Plugin.php} | 28 +- .../GitHub_Updater/Settings.php} | 201 +- .../GitHub_Updater/Theme.php} | 84 +- github/{includes => vendor}/Parsedown.php | 2 + header.php | 30 +- images/cc.png | Bin 0 -> 4733 bytes include/impostazioni-pasw2015.php | 12 +- style.css | 752 ++-- 33 files changed, 2584 insertions(+), 3975 deletions(-) create mode 100644 github/assets/screenshot-2.png delete mode 100644 github/includes/markdown.php create mode 100644 github/languages/description-i18n-keys.txt create mode 100644 github/languages/github-updater-fr_FR.mo create mode 100644 github/languages/github-updater-fr_FR.po create mode 100644 github/languages/github-updater-it.mo create mode 100644 github/languages/github-updater-it.po create mode 100644 github/languages/github-updater-pt_BR.mo create mode 100644 github/languages/github-updater-pt_BR.po create mode 100644 github/languages/github-updater-uk.mo create mode 100644 github/languages/github-updater-uk.po create mode 100644 github/src/GitHub_Updater/Autoloader.php rename github/{includes/class-github-updater.php => src/GitHub_Updater/Base.php} (82%) rename github/{includes/class-bitbucket-api.php => src/GitHub_Updater/Bitbucket_API.php} (86%) rename github/{includes/class-github-api.php => src/GitHub_Updater/GitHub_API.php} (92%) create mode 100644 github/src/GitHub_Updater/Install.php rename github/{includes/class-plugin-updater.php => src/GitHub_Updater/Plugin.php} (88%) rename github/{includes/class-github-updater-settings.php => src/GitHub_Updater/Settings.php} (63%) rename github/{includes/class-theme-updater.php => src/GitHub_Updater/Theme.php} (86%) rename github/{includes => vendor}/Parsedown.php (99%) create mode 100644 images/cc.png diff --git a/footer.php b/footer.php index 0663852..d206ce1 100644 --- a/footer.php +++ b/footer.php @@ -62,6 +62,7 @@ } ?> + From 4cba1326c8e052eedaae013219db9d48f23373d6 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sat, 28 Mar 2015 23:35:28 +0100 Subject: [PATCH 14/25] Update style.css --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index e7d78f1..8d4f66d 100644 --- a/style.css +++ b/style.css @@ -495,7 +495,7 @@ max-height:125px; padding:10px; } -#header-interno a, #header img.logo { +#header-interno a, #header img.logo, #header-interno span { float:left; } From 2dc75142f64314d1bc8dce6a77690cf57028f2e8 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sat, 28 Mar 2015 23:55:03 +0100 Subject: [PATCH 15/25] Update header.php --- header.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/header.php b/header.php index be6e57b..a30ff70 100644 --- a/header.php +++ b/header.php @@ -2,16 +2,16 @@ - + + -<?php if ( function_exists('optimal_title') ) { ?><?php optimal_title(); ?><?php bloginfo('name'); ?><?php } else { ?><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> » Blog Archive <?php } ?> <?php wp_title(); ?><?php } ?> + + - - Date: Sun, 29 Mar 2015 00:00:27 +0100 Subject: [PATCH 16/25] Update functions.php --- functions.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/functions.php b/functions.php index aa61064..e9c5115 100644 --- a/functions.php +++ b/functions.php @@ -73,8 +73,6 @@ function reg_set_p() { } -add_action( 'after_setup_theme', 'pasw2015_setup' ); - add_action('admin_notices', 'pasw_alerts'); function pasw_alerts() { @@ -90,7 +88,22 @@ function pasw2015_setup() { } else { delete_option('pasw_wrongdirectory'); } -} + + $args = array( + 'width' => 1150, + 'height' => 125, + 'flex-height' => true, + 'flex-width' => true, + 'default-image' => get_template_directory_uri() . '/images/header-default-pasw2015.jpg', + 'default-repeat'=> 'repeat', + 'default-text-color' => '#00004d' +); +add_theme_support( 'custom-header', $args ); + +add_theme_support('post-thumbnails'); +add_theme_support( 'title-tag' ); +} +add_action( 'after_setup_theme', 'pasw2015_setup' ); function get_pasw2015_version() { $p2015_theme = wp_get_theme( 'pasw2015' ); From ee5955ae13c993d60b4ced5dc8ec8684b2b5b0d0 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sun, 29 Mar 2015 00:06:33 +0100 Subject: [PATCH 17/25] Update style.css --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index 8d4f66d..6681a16 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ Description: Pasw2015 è il tema trasparente e accessibile promosso dalla Comunità di Pratica "Porte Aperte sul Web". Bello, accessibile e innovativo, con supporto continuo e volontario offerto dalla comunità. Author: Porte Aperte sul Web Author URI: http://www.porteapertesulweb.it - Version: 1.3.8 + Version: 1.4beta Tags: pasw, scuole, pubblica amministrazione, accessibile, trasparente, personalizzabile GitHub Theme URI: https://github.com/PorteAperteSulWeb/pasw2015 GitHub Branch: develop From a95340c5b9f2b4b2c2876263283bf6d257d2a4a5 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sun, 29 Mar 2015 00:06:44 +0100 Subject: [PATCH 18/25] Update style.css --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index 6681a16..51d5938 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ Description: Pasw2015 è il tema trasparente e accessibile promosso dalla Comunità di Pratica "Porte Aperte sul Web". Bello, accessibile e innovativo, con supporto continuo e volontario offerto dalla comunità. Author: Porte Aperte sul Web Author URI: http://www.porteapertesulweb.it - Version: 1.4beta + Version: 1.4 Tags: pasw, scuole, pubblica amministrazione, accessibile, trasparente, personalizzabile GitHub Theme URI: https://github.com/PorteAperteSulWeb/pasw2015 GitHub Branch: develop From 269d0563d7afbdd662e6eca786f80d2ad3d2b95d Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sun, 29 Mar 2015 23:34:45 +0200 Subject: [PATCH 19/25] Update pasw2015.js --- include/js/pasw2015.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/js/pasw2015.js b/include/js/pasw2015.js index 17f69f4..c9269ac 100644 --- a/include/js/pasw2015.js +++ b/include/js/pasw2015.js @@ -1,16 +1,16 @@ jQuery("document").ready(function($){ - if (pasw2015_javascript_params.fixedmenu) { + //if (pasw2015_javascript_params.fixedmenu) { var nav = $('#topbar'); $(window).scroll(function () { - if ( $(window).width() > 1024 && $(this).scrollTop() > pasw2015_javascript_params.headersizeh ) { + if ( pasw2015_javascript_params.fixedmenu && $(window).width() > 1024 && $(this).scrollTop() > pasw2015_javascript_params.headersizeh ) { nav.addClass("f-nav"); } else { nav.removeClass("f-nav"); } }); - } + //} if (pasw2015_javascript_params.responsive) { $("#responsive-controls").click(function(){ @@ -49,4 +49,4 @@ jQuery("document").ready(function($){ })(jQuery); } -}); \ No newline at end of file +}); From 485752c7e883452612afc71aecd4277774b7321a Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sun, 29 Mar 2015 23:40:58 +0200 Subject: [PATCH 20/25] Update pasw2015.js --- include/js/pasw2015.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/js/pasw2015.js b/include/js/pasw2015.js index c9269ac..6224c8b 100644 --- a/include/js/pasw2015.js +++ b/include/js/pasw2015.js @@ -1,6 +1,6 @@ jQuery("document").ready(function($){ - //if (pasw2015_javascript_params.fixedmenu) { + if (pasw2015_javascript_params.fixedmenu) { var nav = $('#topbar'); $(window).scroll(function () { @@ -10,7 +10,7 @@ jQuery("document").ready(function($){ nav.removeClass("f-nav"); } }); - //} + } if (pasw2015_javascript_params.responsive) { $("#responsive-controls").click(function(){ From cd62cefe8d80a9e93d956b71eac42c1c2f34cf95 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sun, 29 Mar 2015 23:42:52 +0200 Subject: [PATCH 21/25] Update functions.php --- functions.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/functions.php b/functions.php index e9c5115..2160631 100644 --- a/functions.php +++ b/functions.php @@ -137,17 +137,13 @@ function pasw2015_stili() { wp_enqueue_style( 'pasw2015_styles', get_stylesheet_uri() , array()); wp_enqueue_style( 'pasw2015_styles-print', get_template_directory_uri() . '/include/css/print.css', null, null, 'print' ); - if ( get_option('pasw_responsive_layout') ) { - wp_enqueue_style( 'pasw2015_styles-responsive', get_template_directory_uri() . '/include/css/responsive.css', array() ); - $enqueue_pasw2015_java = true; - } - - if ( get_option('pasw_fixedmenu') || get_option('pasw_eulaw') ) { - $enqueue_pasw2015_java = true; + if ( get_option('pasw_fixedmenu') || get_option('pasw_eulaw') || get_option('pasw_responsive_layout') ) { + if ( get_option('pasw_responsive_layout') ) { + wp_enqueue_style( 'pasw2015_styles-responsive', get_template_directory_uri() . '/include/css/responsive.css', array() ); + } + pasw2015_enqueuejavascript(); } - if ($enqueue_pasw2015_java) { pasw2015_enqueuejavascript(); } - } add_action( 'wp_enqueue_scripts', 'pasw2015_stili' ); From ba5b5cf868665a96954b0327aa589a944b566f23 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sun, 29 Mar 2015 23:45:37 +0200 Subject: [PATCH 22/25] Update pasw2015.js --- include/js/pasw2015.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/js/pasw2015.js b/include/js/pasw2015.js index 6224c8b..5ca32d8 100644 --- a/include/js/pasw2015.js +++ b/include/js/pasw2015.js @@ -2,6 +2,8 @@ jQuery("document").ready(function($){ if (pasw2015_javascript_params.fixedmenu) { var nav = $('#topbar'); + + alert(pasw2015_javascript_params.fixedmenu); $(window).scroll(function () { if ( pasw2015_javascript_params.fixedmenu && $(window).width() > 1024 && $(this).scrollTop() > pasw2015_javascript_params.headersizeh ) { From f12aeb78319e9db8689fc2fb3969cb8c08ced166 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sun, 29 Mar 2015 23:47:03 +0200 Subject: [PATCH 23/25] Update pasw2015.js --- include/js/pasw2015.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/js/pasw2015.js b/include/js/pasw2015.js index 5ca32d8..fcd908b 100644 --- a/include/js/pasw2015.js +++ b/include/js/pasw2015.js @@ -1,9 +1,7 @@ jQuery("document").ready(function($){ - if (pasw2015_javascript_params.fixedmenu) { + if (pasw2015_javascript_params.fixedmenu != 0) { var nav = $('#topbar'); - - alert(pasw2015_javascript_params.fixedmenu); $(window).scroll(function () { if ( pasw2015_javascript_params.fixedmenu && $(window).width() > 1024 && $(this).scrollTop() > pasw2015_javascript_params.headersizeh ) { From c8803e5b2d2b5f13aa1fb76f1ee54d1b4caf6091 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sat, 4 Apr 2015 10:33:29 +0200 Subject: [PATCH 24/25] Update functions.php --- functions.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/functions.php b/functions.php index 2160631..7b94a65 100644 --- a/functions.php +++ b/functions.php @@ -383,6 +383,10 @@ function pasw2015_customizer_css() { ?> $c_principale = get_theme_mod( 'pasw2015_colore_principale', '#00004d'); $c_secondario = get_theme_mod( 'pasw2015_colore_secondario', '#C2E2ED'); + if ( ! display_header_text() ) { + echo '.site-title, .site-description { display:none; }'; + } + if (get_option('pasw_fixedmenu') == 1 && is_user_logged_in() ) { echo '.f-nav { top:30px; }'; } From dcb0f0fdb22e012336857b3301f8c5b4f2a53a42 Mon Sep 17 00:00:00 2001 From: Marco Milesi Date: Sat, 4 Apr 2015 10:46:56 +0200 Subject: [PATCH 25/25] Update header.php --- header.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/header.php b/header.php index a30ff70..aaec011 100644 --- a/header.php +++ b/header.php @@ -41,18 +41,17 @@ -

+

- - -
- - - - +
+
+ + + +