Feature #1431: Move sunstone login to erb template and reuse common html head

(cherry picked from commit 3547a59b5a7d750faab1e6c53ebd6a704ae2d5a5)
This commit is contained in:
Hector Sanjuan authored and Ruben S. Montero committed 2012-08-31 18:52:58 +02:00
1 parent 31e39b128e
commit c50b28fd61
6 files changed
+60 -90

No files matched your search

+1 -7
View File
@@ -246,13 +246,7 @@ end
get '/login' do
if !authorized?
if settings.config[:auth] == "x509"
templ = "login_x509.html"
else
templ = "login.html"
end
return File.read(File.dirname(__FILE__)+'/templates/'+templ)
erb :login
end
end
-52
View File
@@ -1,52 +0,0 @@
<!DOCTYPE html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>OpenNebula Sunstone Login</title>
<link rel="stylesheet" type="text/css" href="css/login.css" />
<link rel="stylesheet" type="text/css" href="vendor/jQueryUI/jquery-ui-1.8.16.custom.css" />
<!-- Vendor Libraries -->
<script type="text/javascript" src="vendor/jQuery/jquery-1.7.2.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="vendor/crypto-js/core-min.js"></script>
<script type="text/javascript" src="vendor/crypto-js/enc-base64-min.js"></script>
<![endif]-->
<!-- End Vendor Libraries -->
<script type="text/javascript" src="js/opennebula.js"></script>
<script type="text/javascript" src="js/login.js"></script>
</head>
<body>
<div id="header">
<div id="logo">
The OpenNebula Cloud Operations Center
</div>
</div>
<div id="wrapper">
<div id="logo_sunstone">
</div>
<div id="error_box" class="error_message ui-state-error ui-corner-all">
</div>
<form id="login_form">
<div class="border" id="login">
<div class="content">
Username
<input type="text" size="15" name="username" id="username" class="box"/>
Password
<input type="password" size="15" name="password" id="password" class="box"/>
<br />
<input type="checkbox" id="check_remember" />
<label id="label_remember" for="check_remember">Remember me</label>
<input type="submit" id="login_btn" value="" />
<img src="images/ajax-loader.gif" alt="retrieving" id="login_spinner" />
</div>
</div>
</form>
</div>
</body>
</html>
+24
View File
@@ -0,0 +1,24 @@
<div id="wrapper">
<div id="logo_sunstone">
</div>
<div id="error_box" class="error_message ui-state-error ui-corner-all">
</div>
<form id="login_form">
<div class="border" id="login">
<div class="content">
Username
<input type="text" size="15" name="username" id="username" class="box"/>
Password
<input type="password" size="15" name="password" id="password" class="box"/>
<br />
<input type="checkbox" id="check_remember" />
<label id="label_remember" for="check_remember">Remember me</label>
<input type="submit" id="login_btn" value="" />
<img src="images/ajax-loader.gif" alt="retrieving" id="login_spinner" />
</div>
</div>
</form>
</div>
@@ -1,26 +1,3 @@
<!DOCTYPE html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>OpenNebula Sunstone Login</title>
<link rel="stylesheet" type="text/css" href="css/login.css" />
<!-- Vendor Libraries -->
<script type="text/javascript" src="vendor/jQuery/jquery-1.7.2.min.js"></script>
<!-- End Vendor Libraries -->
<script type="text/javascript" src="js/opennebula.js"></script>
<script type="text/javascript" src="js/login.js"></script>
</head>
<body>
<div id="header">
<div id="logo">
The OpenNebula Cloud Operations Center
</div>
</div>
<div id="wrapper">
<div id="logo_sunstone">
</div>
@@ -43,5 +20,3 @@
</div>
</form>
</div>
</body>
</html>
+31
View File
@@ -0,0 +1,31 @@
<!DOCTYPE html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>OpenNebula Sunstone Login</title>
<link rel="stylesheet" type="text/css" href="css/login.css" />
<!-- Vendor Libraries -->
<script type="text/javascript" src="vendor/jQuery/jquery-1.7.2.min.js"></script>
<!-- End Vendor Libraries -->
<script type="text/javascript" src="js/opennebula.js"></script>
<script type="text/javascript" src="js/login.js"></script>
</head>
<body>
<div id="header">
<div id="logo">
The OpenNebula Cloud Operations Center
</div>
</div>
<% if settings.config[:auth] == "x509" %>
<%= erb :_login_x509 %>
<% else %>
<%= erb :_login_standard %>
<% end %>
</body>
</html>