Update ui a bit more
This commit is contained in:
Jonathan Carter
@@ -1,31 +1,9 @@
|
||||
{% extends "layout.html" %}
|
||||
{% block body %}
|
||||
|
||||
<div style="width: 1000px; font-family: Noto Sans;">
|
||||
<div style="width: 1000px; height: 100%;">
|
||||
|
||||
<div class="pywebview-drag-regioni"> <!-- Header -->
|
||||
<span>
|
||||
<h1 class="is-size-4"> <button class="button is-link"> ☰ </button> System Installer - Disks and Partitions <button class="button is-danger" style="float: right;"> 🗙 </button> </h1>
|
||||
</span>
|
||||
</div> <!-- Header -->
|
||||
|
||||
<div> <!-- Disks and Partitions Content -->
|
||||
|
||||
<br>
|
||||
|
||||
<div class="tabs" style="padding-left: 0px;">
|
||||
<uli>
|
||||
<button class="button is-dark"><a href="/welcome">Welcome</a></button>
|
||||
<button class="button is-dark"><a href="/users">Users</a></button>
|
||||
<button class="button is-success"><a href="/disks">Disks</a></button>
|
||||
<button class="button is-dark"><a href="/software">Software</a></button>
|
||||
<button class="button is-dark"><a href="/summary">Summary</a></button>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<p> How would you like to install Debian?</p>
|
||||
<p><b>How would you like to install Debian?</b></p>
|
||||
|
||||
<br>
|
||||
|
||||
@@ -46,42 +24,11 @@
|
||||
|
||||
<br>
|
||||
|
||||
<p> There are {{ blockdevs["blockdevices"]|count }} block devices detected. </p>
|
||||
<p> They are </p>
|
||||
<br>
|
||||
|
||||
{% for disk in blockdevs["blockdevices"] %}
|
||||
<p> Diskname: {{ disk['name'] }} </p>
|
||||
<p> Model: {{ disk['model'] }} </p>
|
||||
<p> Serial: {{ disk['serial'] }} </p>
|
||||
<p> Removable: {{ disk['rm'] }} </p>
|
||||
<p> Size: {{ (disk['size'] | int) / 1024000000 | round(2) }} GiB </p>
|
||||
<p> ID: {{disk['id'] }} </p>
|
||||
<p> pttype: {{disk['pttype'] }} </p>
|
||||
<p> Maj:min: {{disk['maj:min']}} </p>
|
||||
<p> phy-sec: {{ disk['phy-sec'] }}. log-sec: {{ disk['log-sec'] }} </p>
|
||||
<p> There are {{ disk['children']|count }} Children </p>
|
||||
{% for child in disk['children'] %}
|
||||
<br>
|
||||
<p> Name: {{ child['name'] }}. Path: {{ child['path'] }}. {{ child['size'] }}. Block: {{ child['subsystems'] }} {{ child['maj:min'] }} {{ child['type'] }} </p>
|
||||
<p> Fstype: {{ child['fstype'] }}. Label: {{ child['label'] }}. Rota: {{ child['rota'] }}</p>
|
||||
<p> Parttypename: {{ child['parttypename'] }}
|
||||
<br>
|
||||
{% endfor %}
|
||||
<br>
|
||||
{% endfor %}
|
||||
|
||||
<div class="columns" width="100%">
|
||||
<div class="column"><p> Proposed layout: </p></div>
|
||||
<div class="column is-link"><button> + </button></div>
|
||||
<div class="column is-link"><button class="button iis-info"> <img src="/static/icons/tab-new-symbolic.svg"> Add Disk or Filesystem </button></div>
|
||||
</div>
|
||||
<!-- Add Undetected Disk
|
||||
Add Virtual Filesystem
|
||||
Add Network Filesystem -->
|
||||
|
||||
<div style=""> <!-- partition bars -->
|
||||
|
||||
|
||||
<div style="background-color: gray; padding: 10px; border-radius: 10px;">
|
||||
<p> <span style="width: 100%;" class="tag is-black">Physical disk: TOSHIBA HDWD120 (2000 GB) <br>
|
||||
<div class="columns">
|
||||
@@ -129,11 +76,41 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br><br>
|
||||
|
||||
</div> <!-- end partition bars -->
|
||||
|
||||
|
||||
<br>
|
||||
|
||||
<p> There are {{ blockdevs["blockdevices"]|count }} block devices detected. </p>
|
||||
<p> They are </p>
|
||||
<br>
|
||||
|
||||
{% for disk in blockdevs["blockdevices"] %}
|
||||
<p> Diskname: {{ disk['name'] }} </p>
|
||||
<p> Model: {{ disk['model'] }} </p>
|
||||
<p> Serial: {{ disk['serial'] }} </p>
|
||||
<p> Removable: {{ disk['rm'] }} </p>
|
||||
<p> Size: {{ (disk['size'] | int) / 1024000000 | round(2) }} GiB </p>
|
||||
<p> ID: {{disk['id'] }} </p>
|
||||
<p> pttype: {{disk['pttype'] }} </p>
|
||||
<p> Maj:min: {{disk['maj:min']}} </p>
|
||||
<p> phy-sec: {{ disk['phy-sec'] }}. log-sec: {{ disk['log-sec'] }} </p>
|
||||
<p> There are {{ disk['children']|count }} Children </p>
|
||||
{% for child in disk['children'] %}
|
||||
<br>
|
||||
<p> Name: {{ child['name'] }}. Path: {{ child['path'] }}. {{ child['size'] }}. Block: {{ child['subsystems'] }} {{ child['maj:min'] }} {{ child['type'] }} </p>
|
||||
<p> Fstype: {{ child['fstype'] }}. Label: {{ child['label'] }}. Rota: {{ child['rota'] }}</p>
|
||||
<p> Parttypename: {{ child['parttypename'] }}
|
||||
<br>
|
||||
{% endfor %}
|
||||
<br>
|
||||
{% endfor %}
|
||||
|
||||
<!-- Add Undetected Disk
|
||||
Add Virtual Filesystem
|
||||
Add Network Filesystem -->
|
||||
|
||||
|
||||
<div> <!-- Disks and Partitions Content -->
|
||||
|
||||
<br><br>
|
||||
@@ -151,7 +128,6 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -3,7 +3,7 @@ from flask import Flask, request, session, redirect, \
|
||||
url_for, render_template, flash, Blueprint
|
||||
import dmm.lsblk as lsblk
|
||||
|
||||
@bp.route('/disks/')
|
||||
@bp.route('/disks')
|
||||
def disks():
|
||||
"""
|
||||
Disks screen for the webui.
|
||||
|
||||
@@ -1,24 +1,9 @@
|
||||
{% extends "layout.html" %}
|
||||
{% block body %}
|
||||
|
||||
<h1 class="is-size-3"> Select Software </h1>
|
||||
<div style="width: 1000px; font-family: Noto Sans;">
|
||||
|
||||
<br>
|
||||
|
||||
|
||||
<div class="tabs">
|
||||
<ul>
|
||||
<li><a href="/welcome">Welcome</a></li>
|
||||
<li><a href="/users">Users</a></li>
|
||||
<li><a href="/disks">Disks</a></li>
|
||||
<li class="is-active"><a href="/software">Software</a></li>
|
||||
<li><a href="/summary">Summary</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<p> Would you like fries with that?</p>
|
||||
<p> <b> Would you like fries with that? </b></p>
|
||||
|
||||
<br>
|
||||
|
||||
|
||||
@@ -1,36 +1,9 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link href="/static/bulma.css" rel="stylesheet">
|
||||
<link href="/static/welcome.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
{% extends "layout.html" %}
|
||||
{% block body %}
|
||||
|
||||
<div class="bg"></div>
|
||||
<div style="width: 1000px; height: 100%;">
|
||||
|
||||
<div style="min-height: 80%; left: 22%; right: 22%; top: 50px; bottom: 50px; position: absolute; width:1000px;" class="container">
|
||||
<div class="notification is-dark">
|
||||
|
||||
<h1 class="is-size-3"> Summary </h1>
|
||||
|
||||
<br>
|
||||
|
||||
|
||||
<div class="tabs">
|
||||
<ul>
|
||||
<li><a href="./welcome">Welcome</a></li>
|
||||
<li><a href="./users">Users</a></li>
|
||||
<li><a href="./disks">Disks</a></li>
|
||||
<li><a href="./software">Software</a></li>
|
||||
<li class="is-active"><a href="./summary">Summary</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<p> Ready to install.</p>
|
||||
<p><b> Ready to install! Please review all changes.</b></p>
|
||||
|
||||
<br>
|
||||
|
||||
@@ -41,8 +14,8 @@
|
||||
<a href="./install"><div class="column"><button class="button is-link">Start Install</button></div></a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,43 +1,18 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link href="/static/bulma.css" rel="stylesheet">
|
||||
<link href="/static/welcome.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
{% extends "layout.html" %}
|
||||
{% block body %}
|
||||
|
||||
<div class="bg"></div>
|
||||
<div style="width: 1000px; font-family: Noto Sans;">
|
||||
|
||||
<div style="min-height: 80%; left: 22%; right: 22%; top: 50px; bottom: 50px; position: absolute; width:1000px;" class="container">
|
||||
<div class="notification is-dark">
|
||||
|
||||
<h1 class="is-size-3"> Configure User </h1>
|
||||
<p><b> Let's set up an initial user. </b></p>
|
||||
|
||||
<br>
|
||||
|
||||
<img src="/static/icons/avatar-default.svg" width="160px" style="float: left; position: absolute;" />
|
||||
|
||||
<div class="tabs">
|
||||
<ul>
|
||||
<li><a href="./welcome">Welcome</a></li>
|
||||
<li class="is-active"><a href="./users">Users</a></li>
|
||||
<li><a href="./disks">Disks</a></li>
|
||||
<li><a href="./software">Software</a></li>
|
||||
<li><a href="./summary">Summary</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<p> Let's set up an initial user.</p>
|
||||
|
||||
<br>
|
||||
<div style="margin-left: 180px;">
|
||||
|
||||
<div class="field">
|
||||
<label>Full Name</label>
|
||||
<div class="control">
|
||||
<input class="input" type="text" placeholder="Text input">
|
||||
<label>Full Name</label> <div class="control"><input class="input" type="text" placeholder="Text input">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -69,6 +44,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div> <!-- style 180 -->
|
||||
|
||||
<br><br>
|
||||
|
||||
<div class="columns">
|
||||
@@ -79,5 +56,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,47 +1,19 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link href="/static/bulma.css" rel="stylesheet">
|
||||
<link href="/static/welcome.css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
{% extends "layout.html" %}
|
||||
{% block body %}
|
||||
|
||||
<div class="bg"></div>
|
||||
<div style="width: 1000px; height: 100%; font-family: Noto Sans;">
|
||||
|
||||
|
||||
<div style="min-height: 80%; left: 22%; right: 22%; top: 50px; bottom: 50px; position: absolute; width:1000px;" class="container">
|
||||
<div class="notification is-dark">
|
||||
|
||||
<h1 class="is-size-3"> Welcome to System Installer </h1>
|
||||
<p><b>Welcome! This setup program will install Debian on to your system.</b></p>
|
||||
|
||||
<br>
|
||||
|
||||
|
||||
<div class="tabs">
|
||||
<ul>
|
||||
<li class="is-active"><a href="./welcome">Welcome</a></li>
|
||||
<li><a href="./users">Users</a></li>
|
||||
<li><a href="./disks">Disks</a></li>
|
||||
<li><a href="./software">Software</a></li>
|
||||
<li><a href="./summary">Summary</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<p> Welcome! This setup program will install Debian on to your system.</p>
|
||||
|
||||
<br>
|
||||
|
||||
<div class="columns">
|
||||
<div class="columns" style="text-align: center;">
|
||||
|
||||
<div class="column">
|
||||
<img src="/static/icons/keyboard.svg" width="180px" />
|
||||
<div class="control is-link">
|
||||
<img src="/static/icons/keyboard.svg" style="fill: white;" width="180px" />
|
||||
<div class="control is-link" width="180px">
|
||||
<div class="select">
|
||||
<select>
|
||||
<select style="width: 180px">
|
||||
<option>English</option>
|
||||
<option>Afrikaans</option>
|
||||
</select>
|
||||
@@ -55,7 +27,7 @@
|
||||
<img src="/static/icons/keyboard.svg" width="180px" />
|
||||
<div class="control is-link">
|
||||
<div class="select">
|
||||
<select>
|
||||
<select style="width: 180px">
|
||||
<option>en-us</option>
|
||||
<option>en-uk</option>
|
||||
</select>
|
||||
@@ -69,7 +41,7 @@
|
||||
<img src="/static/icons/keyboard.svg" width="180px" />
|
||||
<div class="control is-link">
|
||||
<div class="select">
|
||||
<select>
|
||||
<select style="width: 180px">
|
||||
<option>Africa/Johannesburg</option>
|
||||
<option>UTC</option>
|
||||
</select>
|
||||
@@ -79,7 +51,7 @@
|
||||
|
||||
</div> <!-- end columns -->
|
||||
|
||||
<br><br><br><br><br><br>
|
||||
<br><br><br><br><br><br<br><br>
|
||||
|
||||
<div class="columns">
|
||||
<div class="column"><button class="button is-light">Quit</button></div>
|
||||
@@ -89,5 +61,4 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user