From f3cd552797d16c407172e00aaa7edd3f3421c90e Mon Sep 17 00:00:00 2001 From: Volker E Date: Tue, 17 Mar 2015 22:35:20 +0100 Subject: [PATCH 1/6] addressing #14978 - remove html root classes targeting IE6/IE7 --- core/templates/layout.base.php | 8 ++------ core/templates/layout.guest.php | 9 ++------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 7069c0c2634..272ce3607a1 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -1,11 +1,7 @@ - - - + - - - + <?php p($theme->getTitle()); ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 8deda443d98..1af35b7cd55 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -1,11 +1,7 @@ <!DOCTYPE html> -<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]--> -<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> +<!--[if lte IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> <!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> - +<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> <head data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> <?php p($theme->getTitle()); ?> @@ -44,7 +40,6 @@ <div class="push"></div><!-- for sticky footer --> </div> </div> - <footer> <p class="info"> <?php print_unescaped($theme->getLongFooter()); ?> From e8c99a60ec2019ab96c0011dd580a2fdffebf994 Mon Sep 17 00:00:00 2001 From: Volker E <volker.e@temporaer.net> Date: Tue, 17 Mar 2015 23:16:42 +0100 Subject: [PATCH 2/6] addressing #14978 - remove html root classes targeting IE6/IE7 --- core/templates/layout.user.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 7ae4b2e3df7..d8d3ee92ef0 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -1,11 +1,7 @@ <!DOCTYPE html> -<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]--> -<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> +<!--[if lte IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> <!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> -<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> - +<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> <?php From 25b77159c453f72efd1e2c622fc4c4046816ca84 Mon Sep 17 00:00:00 2001 From: Volker E <volker.e@temporaer.net> Date: Tue, 17 Mar 2015 23:36:05 +0100 Subject: [PATCH 3/6] adressing #14979 meta charset declaration should be first in head --- core/templates/layout.base.php | 2 +- core/templates/layout.guest.php | 2 +- core/templates/layout.user.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 272ce3607a1..743d4dd3d34 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -3,10 +3,10 @@ <!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> <!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> <head data-requesttoken="<?php p($_['requesttoken']); ?>"> + <meta charset="utf-8"> <title> <?php p($theme->getTitle()); ?> - diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 1af35b7cd55..2113f88594e 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -3,10 +3,10 @@ + <?php p($theme->getTitle()); ?> - diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index d8d3ee92ef0..9f8daa5cad3 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -3,13 +3,13 @@ + <?php p(!empty($_['application'])?$_['application'].' - ':''); p($theme->getTitle()); ?> - From 6ad76b5cc2a31545c7466ec1d6c18ac2bbf0dd09 Mon Sep 17 00:00:00 2001 From: Volker E Date: Tue, 17 Mar 2015 23:57:23 +0100 Subject: [PATCH 4/6] addressing #14982 self-closing tags ending slash doesn't have a purpose & should be removed --- core/templates/403.php | 2 +- core/templates/404.php | 2 +- core/templates/error.php | 2 +- core/templates/installation.php | 28 ++++++++++++++-------------- core/templates/layout.base.php | 8 ++++---- core/templates/layout.guest.php | 8 ++++---- core/templates/layout.user.php | 10 +++++----- core/templates/login.php | 12 ++++++------ core/templates/singleuser.user.php | 8 ++++---- core/templates/tags.html | 4 ++-- core/templates/untrustedDomain.php | 6 +++--- core/templates/update.user.php | 8 ++++---- 12 files changed, 49 insertions(+), 49 deletions(-) diff --git a/core/templates/403.php b/core/templates/403.php index 6e910fd2e82..a19009c3546 100644 --- a/core/templates/403.php +++ b/core/templates/403.php @@ -9,7 +9,7 @@ if(!isset($_)) {//also provide standalone error page ?> diff --git a/core/templates/404.php b/core/templates/404.php index 90912844ef9..c8d16e3e8f7 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -14,7 +14,7 @@ if(!isset($_)) {//also provide standalone error page