summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-09-05 21:30:31 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2013-09-05 21:30:31 +0200
commitf6a51c7ec69d060ab21987ba9be74b202edc1ff0 (patch)
treeaa0e0cbd68af2857739a15ef2d86162e854dbbc9
parent7ca77d248bed85e6d5affce1fde613737063eec1 (diff)
downloadvyos-live-build-f6a51c7ec69d060ab21987ba9be74b202edc1ff0.tar.gz
vyos-live-build-f6a51c7ec69d060ab21987ba9be74b202edc1ff0.zip
Updating cgi templates for current bootstrap version 3.0.0 based theme on live-systems.org.
-rw-r--r--templates/cgi/debian/footer.html12
-rw-r--r--templates/cgi/debian/form.html1
-rw-r--r--templates/cgi/debian/header.html79
3 files changed, 40 insertions, 52 deletions
diff --git a/templates/cgi/debian/footer.html b/templates/cgi/debian/footer.html
index 5bf349452..4723c1f30 100644
--- a/templates/cgi/debian/footer.html
+++ b/templates/cgi/debian/footer.html
@@ -1,14 +1,16 @@
- <hr>
+ <hr />
<footer>
- <a href="http://live-systems.org/devel/live-build/">live-build</a> VERSION <a class="muted pull-right" href="http://live-systems.org/project/legal/">Legal Information</a></p>
+ <p><div class="muted">2006-2013 <a class="muted" href="mailto:debian-live@lists.debian.org?subject=Live Systems Project:%20Feedback">Live Systems Project</a> <a class="muted pull-right" href="http://live-systems.org/project/legal/">Legal Information</a></p>
</footer>
-
</div> <!-- /container -->
- <!-- Le javascript -->
+
+ <!-- Bootstrap core JavaScript
+ ================================================== -->
+ <!-- Placed at the end of the document so the pages load faster -->
<script src="http://live-systems.org/stuff/jquery/jquery.min.js"></script>
<script src="http://live-systems.org/stuff/bootstrap/js/bootstrap.min.js"></script>
-
+ <script src="http://live-systems.org/stuff/bootstrap/table.js"></script>
</body>
</html>
diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html
index e8c934859..7d80b4187 100644
--- a/templates/cgi/debian/form.html
+++ b/templates/cgi/debian/form.html
@@ -1,4 +1,3 @@
-
<h3>Submit your parameters (<b>working</b> email address is required) to generate your very own live system.</h3>
<form action="live-build" method="post">
diff --git a/templates/cgi/debian/header.html b/templates/cgi/debian/header.html
index 3a4513734..383e2abd6 100644
--- a/templates/cgi/debian/header.html
+++ b/templates/cgi/debian/header.html
@@ -2,26 +2,28 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>Live Systems</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="Live Systems">
+ <meta name="description" content="Live Systems Project">
<meta name="author" content="Live Systems Project <debian-live@lists.debian.org>">
+ <!-- <meta name="keywords" content="Live Systems, free software, open source software, Debian, GNU, Linux"> -->
+ <link rel="shortcut icon" href="http://live-systems.org/images/logo-32.png">
+
+ <title>Live Systems Project</title>
+
+ <!-- Bootstrap core CSS -->
+ <link href="http://live-systems.org/stuff/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+ <link href="http://live-systems.org/stuff/bootstrap/css/bootstrap-theme.min.css" rel="stylesheet">
+
+ <!-- Custom styles for this template -->
+ <link href="http://live-systems.org/stuff/bootstrap/navbar.css" rel="stylesheet">
+ <link href="http://live-systems.org/stuff/bootstrap/label.css" rel="stylesheet">
+
+ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!--[if lt IE 9]>
+ <script src="http://live-systems.org/stuff/html5shiv/html5shiv.min.js"></script>
+ <script src="http://live-systems.org/stuff/respond/respond.min.js"></script>
+ <![endif]-->
- <!-- Le styles -->
- <link href="http://live-systems.org/stuff/spacelab/bootstrap.min.css" rel="stylesheet">
- <style type="text/css">
- body {
- padding-top: 60px;
- padding-bottom: 40px;
- }
- .label a:active, .label a:hover, .label a:link, .label a:visited {
- color: #ffffff;
- text-decoration: none;
- }
- label {
- cursor:pointer;
- }
- </style>
<script type="text/javascript" language="JavaScript">
function collapse(x, txt) {
var oTemp=document.getElementById("text_"+x);
@@ -36,41 +38,26 @@
}
}
</script>
-
- <link href="http://live-systems.org/stuff/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
-
- <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://live-systems.org/stuff/html5shiv/html5shiv.min.js"></script>
- <![endif]-->
-
- <!-- Fav and touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="http://live-systems.org/stuff/images/logo-144.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://live-systems.org/stuff/images/logo-114.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="http://live-systems.org/stuff/images/logo-72.png">
- <link rel="apple-touch-icon-precomposed" href="http://live-systems.org/stuff/images/logo-57.png">
- <link rel="shortcut icon" href="http://live-systems.org/stuff/images/logo-16.png">
</head>
<body>
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <div class="container">
+
+ <!-- Static navbar -->
+ <div class="navbar navbar-default">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
- </a>
- <a class="brand" href="/">Live Systems</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active"><a href="http://live-build.debian.net/">Build</a></li>
- <li><a href="http://live-systems.org/">WWW</a></li>
- </ul>
- </div><!--/.nav-collapse -->
+ </button>
+ <a class="navbar-brand" href="/"><strong>Live</strong> Systems</a>
</div>
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav navbar-right">
+ <li class="active"><a href="/">Build</a></li>
+ <li><a href="http://live-systems.org/">WWW</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
</div>
- </div>
-
- <div class="container">