revert panel back to bootstrap, as long as the conversion isnt done yet

8 years ago · 7ac2c7a3e2
parent c704ffcad7
commit 7ac2c7a3e2
6 changed files with 45 additions and 15 deletions
--- a/public/css/bootstrap.min.css
+++ b/public/css/bootstrap.min.css
--- a/views/base_bootstrap.html.twig
+++ b/views/base_bootstrap.html.twig
@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{{ title ?? "Zer.ooo - What is InfoSec?" }}</title>
+    <link rel="stylesheet" href="/css/bootstrap.min.css" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    {% block head %}
+        <script src="/js/jquery.min.js"></script>
+        <script src="/js/bootstrap.js"></script>
+
+    {% endblock %}
+</head>
+<body>
+<nav class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+        <a href="/" class="navbar-brand"><span class="glyphicons glyphicons-lock"></span> Zer.ooo</a>
+
+        <div class="pull-right">
+            {% if user %}
+                <a href="/panel" class="user navbar-brand">{{ user.username }}</a>
+                <a href="/logout" class="navbar-brand">Logout</a>
+            {% else %}
+                <a class="navbar-brand" href="/login">Login</a>
+            {% endif %}
+        </div>
+    </div>
+</nav>
+<div class="div" style="height:50px">&nbsp;</div>
+{% block content %}
+{% endblock %}
+</body>
+</html>
--- a/views/install.html.twig
+++ b/views/install.html.twig
@ -1,4 +1,4 @@
-{% extends "base.html.twig" %}
+{% extends "base_bootstrap.html.twig" %}

 {% block content %}
    <div class="container">
--- a/views/panel.html.twig
+++ b/views/panel.html.twig
@ -1,4 +1,4 @@
-{% extends "base.html.twig" %}
+{% extends "base_bootstrap.html.twig" %}

 {% block head %}
    {{ parent() }}
@ -7,15 +7,6 @@
 {% endblock %}

 {% block content %}
-<div class="login-page">
-  <div class="login-page-logo">Zer.ooo</div>
-  <div class="intro-page-welcome-text">Control Panel</div>
-    <ul class="topnav">
-    <li><a href="/">Home</a></li>
-   </ul>
-</div>
-
-<div class="panel-page">
    <div class="container">
        <div class="row">
            <h2 id="certificates">Certificates</h2>
@ -196,6 +187,5 @@
            </div>
        </div>
    </div>
-    </div>

 {% endblock %}
--- a/views/panel/certificates/new.html.twig
+++ b/views/panel/certificates/new.html.twig
@ -1,4 +1,4 @@
-{% extends "base.html.twig" %}
+{% extends "base_bootstrap.html.twig" %}

 {% block head %}
    {{ parent() }}
@ -14,7 +14,7 @@
        <div class="row">
            <div class="col-md-6 col-md-offset-3">
                <div class="row">
-                    <h2>New Certificate</h2>
+                    <h2>New Certificate for "<span class="user">{{ user.getUsername() }}</span>"</h2>
                </div>
                <div class="form-horizontal">
                    <div class="form-group">
--- a/views/panel/servers/edit.html.twig
+++ b/views/panel/servers/edit.html.twig
@ -1,4 +1,4 @@
-{% extends "base.html.twig" %}
+{% extends "base_bootstrap.html.twig" %}

 {% block head %}
    {{ parent() }}