[PATCH conductor] Bug 865559 - [IE] every page seems displays unsecured content being delievered error
9:27 a.m.
New subject: [PATCH] Remove security error on every page in IE
---
src/app/views/layouts/application.html.haml | 2 +-
src/app/views/user_sessions/new.html.haml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/views/layouts/application.html.haml
b/src/app/views/layouts/application.html.haml
index 26ad06f..1a00936 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -6,7 +6,7 @@
= stylesheet_link_tag '/stylesheets/compiled/layout.css'
= stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css'
/[if lt IE 9]
- = javascript_include_tag
'http://html5shiv.googlecode.com/svn/trunk/html5.js'
+ = javascript_include_tag
'https://html5shiv.googlecode.com/svn/trunk/html5.js'
= stylesheet_link_tag '/stylesheets/layout_ie8.css'
/[if lt IE 8]
= stylesheet_link_tag '/stylesheets/layout_ie7.css'
diff --git a/src/app/views/user_sessions/new.html.haml
b/src/app/views/user_sessions/new.html.haml
index fdf8b08..4fb5d0b 100644
--- a/src/app/views/user_sessions/new.html.haml
+++ b/src/app/views/user_sessions/new.html.haml
@@ -1,7 +1,7 @@
= content_for(:stylesheets_block) do
= stylesheet_link_tag '/stylesheets/compiled/login.css'
/[if lt IE 9]
- = javascript_include_tag
'http://html5shiv.googlecode.com/svn/trunk/html5.js'
+ = javascript_include_tag
'https://html5shiv.googlecode.com/svn/trunk/html5.js'
= stylesheet_link_tag '/stylesheets/login_ie8.css'
/[if lt IE 8]
= stylesheet_link_tag '/stylesheets/layout_ie7.css'
--
1.7.11.7
1:45 p.m.
New subject: [PATCH] Remove security error on every page in IE
On Fri, Oct 12, 2012 at 10:27:22AM -0400, Brian McLaughlin wrote:
---
src/app/views/layouts/application.html.haml | 2 +-
src/app/views/user_sessions/new.html.haml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/views/layouts/application.html.haml
b/src/app/views/layouts/application.html.haml
index 26ad06f..1a00936 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -6,7 +6,7 @@
= stylesheet_link_tag '/stylesheets/compiled/layout.css'
= stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css'
/[if lt IE 9]
- = javascript_include_tag
'http://html5shiv.googlecode.com/svn/trunk/html5.js'
+ = javascript_include_tag
'https://html5shiv.googlecode.com/svn/trunk/html5.js'
We actually did one better and put this into converge-ui:
https://github.com/Katello/converge-ui/blob/master/javascripts/vendor/htm...
It's pulled in from the MIT-licensed Google repo, and allows us to
function without requiring external Internet access for this. But
serving it ourselves would fix this issue too.
This hasn't been pulled into Conductor yet, but it's in the version of
converge-ui we use. I'll send a quick patch adding this instead, if you
don't object.
= stylesheet_link_tag '/stylesheets/layout_ie8.css'
/[if lt IE 8]
= stylesheet_link_tag '/stylesheets/layout_ie7.css'
diff --git a/src/app/views/user_sessions/new.html.haml
b/src/app/views/user_sessions/new.html.haml
index fdf8b08..4fb5d0b 100644
--- a/src/app/views/user_sessions/new.html.haml
+++ b/src/app/views/user_sessions/new.html.haml
@@ -1,7 +1,7 @@
= content_for(:stylesheets_block) do
= stylesheet_link_tag '/stylesheets/compiled/login.css'
/[if lt IE 9]
- = javascript_include_tag
'http://html5shiv.googlecode.com/svn/trunk/html5.js'
+ = javascript_include_tag
'https://html5shiv.googlecode.com/svn/trunk/html5.js'
= stylesheet_link_tag '/stylesheets/login_ie8.css'
/[if lt IE 8]
= stylesheet_link_tag '/stylesheets/layout_ie7.css'
--
1.7.11.7
3:05 p.m.
New subject: [PATCH] Remove security error on every page in IE
On Fri, Oct 12, 2012 at 02:45:25PM -0400, Matt Wagner wrote:
On Fri, Oct 12, 2012 at 10:27:22AM -0400, Brian McLaughlin wrote:
> ---
> src/app/views/layouts/application.html.haml | 2 +-
> src/app/views/user_sessions/new.html.haml | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/app/views/layouts/application.html.haml
b/src/app/views/layouts/application.html.haml
> index 26ad06f..1a00936 100644
> --- a/src/app/views/layouts/application.html.haml
> +++ b/src/app/views/layouts/application.html.haml
> @@ -6,7 +6,7 @@
> = stylesheet_link_tag '/stylesheets/compiled/layout.css'
> = stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css'
> /[if lt IE 9]
> - = javascript_include_tag
'http://html5shiv.googlecode.com/svn/trunk/html5.js'
> + = javascript_include_tag
'https://html5shiv.googlecode.com/svn/trunk/html5.js'
We actually did one better and put this into converge-ui:
https://github.com/Katello/converge-ui/blob/master/javascripts/vendor/htm...
It's pulled in from the MIT-licensed Google repo, and allows us to
function without requiring external Internet access for this. But
serving it ourselves would fix this issue too.
This hasn't been pulled into Conductor yet, but it's in the version of
converge-ui we use. I'll send a quick patch adding this instead, if you
don't object.
Oh, drat. That won't work on 1.1, which is using an older converge-ui.
I'm going to go ahead and ACK your patch. It works a heck of a lot
better on 1.1. O:-)
In theory we can tackle this differently upstream, but let's not worry
about that now.
I'll push this momentarily.
-- Matt
4229
days inactive
4229
days old
aeolus-devel@lists.fedorahosted.org
3 comments
2 participants
participants (2)
-
Brian McLaughlin -
Matt Wagner