Skip to content

D
debomatic-webui
Commit df47cd53 authored by Leo Iannacone's avatar Leo Iannacone
Browse files
Options

Merge branch 'feature/new_header' into develop

parents f0db670a e1ee17f2
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 35 deletions
debomatic-webui/lib/config.coffee
View file @ df47cd53
...@@ -35,9 +35,7 @@ Web template configuration ...@@ -35,9 +35,7 @@ Web template configuration
Title and description for the header Title and description for the header
### ###
config.web.debomatic.architecture = "amd64" config.web.debomatic.architecture = "amd64"
config.web.title = "Deb-o-Matic web.ui" config.web.title = "Deb-o-Matic " + config.web.debomatic.architecture
config.web.description = "This is a web interface for debomatic over " +
config.web.debomatic.architecture
### ###
Admin email and name to show in the home page. Admin email and name to show in the home page.
...@@ -68,7 +66,6 @@ The default user preferences. ...@@ -68,7 +66,6 @@ The default user preferences.
See /preferences page for more info See /preferences page for more info
### ###
config.web.preferences.autoscroll = true config.web.preferences.autoscroll = true
config.web.preferences.header = true
config.web.preferences.sidebar = true config.web.preferences.sidebar = true
config.web.preferences.glossy_theme = true config.web.preferences.glossy_theme = true
config.web.preferences.file_background = true config.web.preferences.file_background = true
......
debomatic-webui/public/javascripts/page_generic.js
View file @ df47cd53
...@@ -134,15 +134,6 @@ function Page_Generic() { ...@@ -134,15 +134,6 @@ function Page_Generic() {
}; };
this.preferences = function () { this.preferences = function () {
if (config.preferences.header) {
$('#pageheader').show();
$('footer .info').hide();
$('.navbar .home-link').hide();
} else {
$('#pageheader').hide();
$('footer .info').show();
$('.navbar .home-link').show();
}
var bootstrap_theme_css = '/external_libs/bootstrap-3.2.0-dist/css/bootstrap-theme.min.css'; var bootstrap_theme_css = '/external_libs/bootstrap-3.2.0-dist/css/bootstrap-theme.min.css';
if (config.preferences.glossy_theme) { if (config.preferences.glossy_theme) {
if ($('head').find('link[href="' + bootstrap_theme_css + '"]').length === 0) if ($('head').find('link[href="' + bootstrap_theme_css + '"]').length === 0)
......
debomatic-webui/public/stylesheets/style.css
View file @ df47cd53
...@@ -11,11 +11,16 @@ ...@@ -11,11 +11,16 @@
margin-top: 20px; margin-top: 20px;
} }
.home-link {
cursor: pointer;
text-shadow: 0 1px 1px black;
}
.navbar .home-link .icon { .navbar .home-link .icon {
background: url('../images/debian-logo-small.png') right no-repeat; background: url('../images/debian-logo-small.png') right no-repeat;
width: 17px; width: 17px;
height: 50px; height: 50px;
margin-left: 10px; margin-left: 14px;
} }
.breadcrumb { .breadcrumb {
......
debomatic-webui/views/footer.ejs
View file @ df47cd53
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<small class="copyright pull-right text-muted"> <small class="copyright pull-right text-muted">
Fork me on <a href="https://github.com/LeoIannacone/debomatic-webui">github</a> Fork me on <a href="https://github.com/LeoIannacone/debomatic-webui">github</a>
</small> </small>
<small class="info pull-right text-muted"><%= web.debomatic.architecture %> (<%= version %>)</small> <small class="info pull-right text-muted">v<%= version %> &bull;</small>
<div id="status" class="clearfix"> <div id="status" class="clearfix">
<span class="label label-default">status:</span> <span class="label label-default">status:</span>
<span class="debomatic idle text-muted">Idle</span> <span class="debomatic idle text-muted">Idle</span>
......
debomatic-webui/views/header.ejs
View file @ df47cd53
...@@ -11,15 +11,10 @@ ...@@ -11,15 +11,10 @@
<body> <body>
<div id="wrapper" class="container-fluid"> <div id="wrapper" class="container-fluid">
<header id="pageheader" onclick="window.location.href='/'">
<h1><%= web.title %> <small><%= version %></small></h1>
<p class="lead"><%= web.description %></p>
</header>
<nav class="navbar navbar-inverse" role="navigation"> <nav class="navbar navbar-inverse" role="navigation">
<div class="navbar-header"> <div onclick="window.location.href='/'" class="navbar-header home-link">
<span class="navbar-brand">Distributions</span> <span class="pull-left icon"></span>
<span class="navbar-brand">Deb-o-Matic <small><%= web.debomatic.architecture %></small></span>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<div id="distributions"> <div id="distributions">
...@@ -33,10 +28,6 @@ ...@@ -33,10 +28,6 @@
<% if (web.paths.preferences) { %> <% if (web.paths.preferences) { %>
<li><a href="<%= web.paths.preferences %>">Preferences</a></li> <li><a href="<%= web.paths.preferences %>">Preferences</a></li>
<% } %> <% } %>
<li class="home-link">
<a class="pull-left" href="/">Home</a>
<span class="pull-right icon"></span>
</li>
</ul> </ul>
</div> </div>
</div> </div>
......
debomatic-webui/views/preferences.ejs
View file @ df47cd53
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
</h4> </h4>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Show header</dt><dd>Hide header to have a minimized interface <span class="text-muted">as much as possible</span>.</dd>
<dt>Enable sidebar</dt><dd>Enable sidebar in <a href="<%= web.paths.distribution %>">distribution</a> page.</dd> <dt>Enable sidebar</dt><dd>Enable sidebar in <a href="<%= web.paths.distribution %>">distribution</a> page.</dd>
<dt>Glossy theme</dt><dd>Use a glossy theme for the interface. Not too much changes, just fancy.</dd> <dt>Glossy theme</dt><dd>Use a glossy theme for the interface. Not too much changes, just fancy.</dd>
...@@ -41,11 +39,6 @@ ...@@ -41,11 +39,6 @@
<h3 class="panel-title">Settings</h3> <h3 class="panel-title">Settings</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="checkbox">
<label>
<input id="header" type="checkbox"> Show header
</label>
</div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input id="sidebar" type="checkbox"> Enable sidebar <input id="sidebar" type="checkbox"> Enable sidebar
......
Markdown is supported
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