Skip to content
Snippets Groups Projects
Commit b452336b authored by srosse's avatar srosse
Browse files

OO-1068: bootstrapify shibbolet error message

parent 09260c35
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/org/olat/core/gui/components/Window.java
+ 3
− 3
View file @ b452336b
...@@ -761,9 +761,9 @@ public class Window extends AbstractComponent { ...@@ -761,9 +761,9 @@ public class Window extends AbstractComponent {
} }
//to check HTML by reload //to check HTML by reload
System.out.println(); //System.out.println();
System.out.println(result.toString()); //System.out.println(result.toString());
System.out.println(); //System.out.println();
// after rendering we know if some component awaits further async // after rendering we know if some component awaits further async
// calls // calls
......
src/main/java/org/olat/shibboleth/_content/message.html
+ 33
− 32
View file @ b452336b
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<head> <head>
<meta name="description" content="$r.translate("meta.description")" /> <meta name="description" content="$r.translate("meta.description")" />
<meta name="keywords" content="$r.translate("meta.keywords")" /> <meta name="keywords" content="$r.translate("meta.keywords")" />
<meta name="dcterms.creator" content="University of Zurich - http://www.uzh.ch" /> <meta name="dcterms.creator" content="OpenOLAT - http://www.openolat.org" />
<meta name="dcterms.subject" content="OLAT - Online Learning And Training - Your Open Source Learning Management System" /> <meta name="dcterms.subject" content="OpenOLAT - infinite learning - Your Open Source Learning Management System" />
<meta name="dcterms.contributor" content="see http://www.olat.org/website/en/html/download_license.html" /> <meta name="dcterms.contributor" content="see http://www.openolat.org" />
<meta name="dcterms.date" content="2010-03-16" /> <meta name="dcterms.date" content="2010-03-16" />
<meta name="dcterms.type" content="Interactive Resource" /> <meta name="dcterms.type" content="Interactive Resource" />
<meta name="dcterms.identifier" content="http://www.olat.org/" /> <meta name="dcterms.identifier" content="http://www.openolat.org" />
<meta name="dcterms.rights" content="http://www.olat.org/website/en/html/download_license.html" /> <meta name="dcterms.rights" content="http://www.openolat.org" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta http-equiv="content-type" content="text/html; charset=utf-8" />
## <!-- IE cache --> ## <!-- IE cache -->
<script type="text/javascript"> <script type="text/javascript">
...@@ -22,42 +22,43 @@ var o_info = new Object(); ...@@ -22,42 +22,43 @@ var o_info = new Object();
## CSS theme inclusion: first the standard css and second the IE bugfixes ## CSS theme inclusion: first the standard css and second the IE bugfixes
<link rel="icon" href="${theme.getBaseURI()}favicon.ico" type="image/x-icon" /> <link rel="icon" href="${theme.getBaseURI()}favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="${theme.getBaseURI()}favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="${theme.getBaseURI()}favicon.ico" type="image/x-icon" />
<link href="${theme.getBaseURI()}layout.css" rel="stylesheet" type="text/css" /> <link id="o_theme_css" href="${theme.getBaseURI()}theme.css" rel="stylesheet" type="text/css" />
<title>$r.translate("error.shibboleth.head")</title> <title>$r.translate("error.shibboleth.head")</title>
</head> </head>
<body> <body>
<div id="b_page_margins"><div id="b_page"> <div id="o_header_wrapper">
<a name="b_top"></a> <div id="o_header_container">
<div id="b_header"> <div id="o_logo"></div>
<div id="b_logo"></div> <div id="o_right_logo"></div>
<div id="b_topnav"></div> </div>
</div> </div>
<div id="o_main" class="b_hideboth b_exception"> <div id="o_main_wrapper">
<div id="o_main_center"> <div id="o_main_container">
<div id="o_main_center_content" class="clearfix"> <div id="o_main" class="row o_loginscreen">
<a id="o_content"></a> <div id="o_main_center" class="split-pane" style="min-height: 655px; width:480px; margin:100px auto;">
<div id="o_main_center_content_inner" class="o_scrollblock"> <div id="o_main_center_content" class="clearfix">
<a id="o_content"></a>
<div id="o_main_center_content_inner">
## START ERROR AREA ## START ERROR AREA
<center> <center>
<div class="o_important"> <div class="o_important">$detailedmessage</div>
$detailedmessage #if ($supportEmail)
</div> <div class="o_note">
#if ($supportEmail) $r.translate("idp.support.email")
<div class="o_note"> $supportEmail
$r.translate("idp.support.email") </div>
$supportEmail #end
</div> <div class="o_button_group">
#end <a class="btn btn-primary" href="$r.relLink('')"><span>Login</span></a>
<div class="o_button_group"> </div>
<a class="btn" href="$r.relLink('')"><span>Login</span></a>
</div>
</center> </center>
## END ERROR AREA ## END ERROR AREA
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</div>
</body></html> </body></html>
\ No newline at end of file
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