Put some panels into rows

This commit is contained in:
Martin 2015-12-16 16:34:23 +01:00
parent 2bafaf9f3e
commit 97d37330c1
7 changed files with 181 additions and 139 deletions

View File

@ -7,4 +7,9 @@ cursor:wait !important;
.progress {
border: 1px solid black;
margin-bottom: 0px;
}
@media (min-width: 1200px) {
.container {
width: 1200px;
}
}

File diff suppressed because one or more lines are too long

View File

@ -1175,10 +1175,12 @@ function show_status2(data)
}
var status_client_download="";
var has_client_download=false;
if(data.client_downloads)
{
var client_download_data=build_client_download_select(data.client_downloads);
status_client_download=dustRender("status_client_download", {download_clients: client_download_data});
has_client_download=true;
}
ndata=dustRender("status_detail", {rows: rows, ses: g.session, dir_error: dir_error, tmpdir_error: tmpdir_error,
@ -1188,7 +1190,8 @@ function show_status2(data)
server_identity: data.server_identity, modify_clients: modify_clients,
dlt_mod_start: dlt_mod_start, dlt_mod_end: dlt_mod_end, internet_client_added: internet_client_added,
status_client_download: status_client_download,
database_error: database_error, removed_clients_table: removed_clients.length>0, removed_clients: removed_clients});
database_error: database_error, removed_clients_table: removed_clients.length>0, removed_clients: removed_clients,
has_client_download: has_client_download});
if(g.data_f!=ndata)
{
@ -3388,6 +3391,7 @@ function show_logs2(data)
}
$("#live_log_clientid").selectpicker();
$("#live_log_clientid").prop('selectedIndex', -1);
if(g.has_logfilter && I('logfilter'))
{

View File

@ -20,62 +20,69 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">{tLive Log}</div>
<div class="panel-body">
<form class="form form-inline">
<div class="form-group">
<select class="form-control" id="live_log_clientid" class="selectpicker" data-live-search="true" onChange="show_live_log()">
{live_log_clients|s}
</select>
</div>
</form>
<div class="row">
<div class="col-md-2">
<div class="panel panel-default">
<div class="panel-heading">{tLive Log}</div>
<div class="panel-body">
<form class="form form-inline">
<div class="form-group">
<select class="form-control" id="live_log_clientid" class="selectpicker" data-live-search="true" onChange="show_live_log()">
{live_log_clients|s}
</select>
</div>
</form>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">{tReports}</div>
<div class="panel-body">
{?has_user}
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{tSend reports to}:</label>
<p class="form-control-static" id="s_report_mails"></p>
</div>
<div class="form-group">
<div class="col-sm-2">&nbsp;</div>
<input type="hidden" id="report_mail" value="{report_mail}"/>
<div class="col-sm-4">
<input type="text" class="form-control" id="report_new_mail" value="" placeholder="{tAdd Email Address}"/>
<div class="col-md-10">
<div class="panel panel-default">
<div class="panel-heading">{tReports}</div>
<div class="panel-body">
{?has_user}
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{tSend reports to}:</label>
<p class="form-control-static" id="s_report_mails"></p>
</div>
<a href="javascript: logs_add_mail()" class="btn btn-default">+</a>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{tSend}</label>
<div class="col-sm-4">
<select class="form-control" id="report_sendonly">
<option value="0" {sel_all}>{tAll}</option>
<option value="1" {sel_failed}>{tFailed}</option>
<option value="2" {sel_succ}>{tSuccessfull}</option>
</select>
<div class="form-group">
<div class="col-sm-2">&nbsp;</div>
<input type="hidden" id="report_mail" value="{report_mail}"/>
<div class="col-sm-4">
<input type="text" class="form-control" id="report_new_mail" value="" placeholder="{tAdd Email Address}"/>
</div>
<a href="javascript: logs_add_mail()" class="btn btn-default">+</a>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{tMinimum log level}</label>
<div class="col-sm-4">
<select class="form-control" id="report_loglevel">
<option value="0" {sel_info}>{tInfo}</option>
<option value="1" {sel_warn}>{tWarning}</option>
<option value="2" {sel_error}>{tError}</option>
</select>
<div class="form-group">
<label class="col-sm-2 control-label">{tSend}</label>
<div class="col-sm-4">
<select class="form-control" id="report_sendonly">
<option value="0" {sel_all}>{tAll}</option>
<option value="1" {sel_failed}>{tFailed}</option>
<option value="2" {sel_succ}>{tSuccessfull}</option>
</select>
</div>
</div>
</div>
<div class="col-sm-offset-2">
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveReportSettings()" />
</div>
</form>
{:else}
{tYou need to create a user to be able to send reports}
{/has_user}
<div class="form-group">
<label class="col-sm-2 control-label">{tMinimum log level}</label>
<div class="col-sm-4">
<select class="form-control" id="report_loglevel">
<option value="0" {sel_info}>{tInfo}</option>
<option value="1" {sel_warn}>{tWarning}</option>
<option value="2" {sel_error}>{tError}</option>
</select>
</div>
</div>
<div class="col-sm-offset-2">
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveReportSettings()" />
</div>
</form>
{:else}
{tYou need to create a user to be able to send reports}
{/has_user}
</div>
</div>
</div>
</div>
</div> <!-- row -->

View File

@ -20,8 +20,12 @@
<input type="password" class="form-control" id="password2" value=""/>
</div>
</div>
{tRights for}
{rights|s}
<div class="form-group">
<label class="col-sm-3 control-label">{tRights for}:</label>
<div class="col-sm-6">
{rights|s}
</div>
</div>
<input type="button" class="btn btn-default" value="{tAbort}" onclick="userSettings()"> <input type="submit" class="btn btn-default" value="{tCreate}" />
</form>
</div>

View File

@ -1,29 +1,33 @@
<div class="panel panel-default">
<div class="panel-heading">{tBackup Statistics}</div>
<div class="panel-body">
<table id="statistics_table" class="table table-striped">
<thead>
<tr>
<th>{tComputer name}</th>
<th>{tImages}</th>
<th>{tFiles}</th>
<th>{tAll}</th>
</tr>
</thead>
<tbody>
{rows|s}
</tbody>
</table>
<div class="panel panel-primary">
<div class="panel-heading">{tSum}</div>
<div class="panel-body">
<table class="table table-striped">
<tr><td>{tImages}</td><td>{images_total}</td></tr>
<tr><td>{tFiles}</td><td>{files_total}</td></tr>
<tr><td>{tAll}</td><td>{used_total}</td></tr>
<div class="row">
<div class="col-lg-8">
<table id="statistics_table" class="table table-striped">
<thead>
<tr>
<th>{tComputer name}</th>
<th>{tImages}</th>
<th>{tFiles}</th>
<th>{tAll}</th>
</tr>
</thead>
<tbody>
{rows|s}
</tbody>
</table>
<button class="btn btn-default" onclick="recalculateStatistics()">{tRecalculate statistics}</button>
<div class="panel panel-primary">
<div class="panel-heading">{tSum}</div>
<div class="panel-body">
<table class="table table-striped">
<tr><td>{tImages}</td><td>{images_total}</td></tr>
<tr><td>{tFiles}</td><td>{files_total}</td></tr>
<tr><td>{tAll}</td><td>{used_total}</td></tr>
</table>
<button class="btn btn-default" onclick="recalculateStatistics()">{tRecalculate statistics}</button>
</div>
</div>
</div>
</div>
</div>

View File

@ -76,55 +76,73 @@
</div>
</div>
<div class="panel panel-default">
{status_client_download|s}
<div class="row">
{?has_client_download}
<div class="col-lg-2">
<div class="panel panel-default">
{status_client_download|s}
</div>
</div>
{/has_client_download}
<div class="col-lg-4">
<div class="panel panel-default">
<div class="panel-heading">{tInternet clients}</div>
<div class="panel-body">
{internet_client_added|s}
<form class="form" action="#" onsubmit="addInternetClient(); return false;" role="form">
<div class="form-group">
<label for="clientname">{tAdd additional internet clients}:</label>
<input type="text" class="form-control" id="clientname" placeholder="{tClient name}" value=""/>
</div>
<input type="submit" class="btn btn-default" value="{tAdd}"/>
</form>
</div>
</div>
</div>
{?status_extra_clients}
<div class="panel panel-default">
<div class="panel-heading">{tInternet clients}</div>
<div class="panel-body">
{internet_client_added|s}
<form class="form" action="#" onsubmit="addInternetClient(); return false;" role="form">
<div class="form-group">
<label for="clientname">{tAdd additional internet clients}:</label>
<input type="text" class="form-control" id="clientname" placeholder="{tClient name}" value=""/>
</div>
<input type="submit" class="btn btn-default" value="{tAdd}"/>
</form>
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-default">
<div class="panel-heading">
{tExtra clients}
</div>
<div class="panel-body">
<table class="table table-hover">
<thead>
<tr>
<th>{tHostname/IP}</th>
<th>{tOnline}</th>
<th>{tActions}</th>
</tr>
</thead>
<tbody>
{extra_clients_rows|s}
</tbody>
</table>
<div class="panel panel-default">
<div class="panel-heading">
{tExtra clients}
</div>
<div class="panel-body">
<table class="table table-hover">
<thead>
<tr>
<th>{tHostname/IP}</th>
<th>{tOnline}</th>
<th>{tActions}</th>
</tr>
</thead>
<tbody>
{extra_clients_rows|s}
</tbody>
</table>
<form class="form" action="#" onsubmit="addExtraClient(); return false;" role="form">
<div class="form-group">
<label for="hostname">{tAdd extra client}:</label>
<input type="text" class="form-control" id="hostname" value="" placeholder="{tHostname/IP}"/>
</div>
<input type="submit" class="btn btn-default" value="{tAdd}"/>
</form>
<form class="form" action="#" onsubmit="addExtraClient(); return false;" role="form">
<div class="form-group">
<label for="hostname">{tAdd extra client}:</label>
<input type="text" class="form-control" id="hostname" value="" placeholder="{tHostname/IP}"/>
</div>
<input type="submit" class="btn btn-default" value="{tAdd}"/>
</form>
</div>
</div>
</div>
{/status_extra_clients}
<div class="panel panel-default">
<div class="panel-heading">{tServer identity}</div>
<div class="panel-body">{server_identity}</div>
{?has_client_download}
<div class="col-lg-2">
{:else}
<div class="col-lg-4">
{/has_client_download}
<div class="panel panel-default">
<div class="panel-heading">{tServer identity}</div>
<div class="panel-body" style="word-wrap:break-word;">{server_identity}</div>
</div>
</div>
</div>