mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restored the tabbing in the settings

Browse Source
This commit is contained in:
Martin Raiber 2014-12-26 18:13:48 +01:00
parent 77b21368a3
commit 8ae72854dc
5 changed files with 126 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
urbackupserver/www/templates.js
View File

File diff suppressed because one or more lines are too long

37
urbackupserver/www/templates/settings_general.htm
View File

@ -1,16 +1,19 @@
<ul class="nav nav-pills" id="settings_tabber" role="tablist">
<li><a href="#server_settings">{tServer}</a></li>
<li><a href="#file_backups">{tFile Backups}</a></li>
<li><a href="#image_backups">{tImage Backups}</a></li>
<li><a href="#permissions">{tPermissions}</a></li>
<li><a href="#client">{tClient}</a></li>
<li><a href="#archive">{tArchive}</a></li>
<li><a href="#internet">{tInternet}</a></li>
<li><a href="#advanced">{tAdvanced}</a></li>
<ul class="nav nav-pills" id="settings_tabber">
<li class="active"><a href="#server_settings" data-toggle="pill">{tServer}</a></li>
<li><a href="#file_backups" data-toggle="pill">{tFile Backups}</a></li>
<li><a href="#image_backups" data-toggle="pill">{tImage Backups}</a></li>
<li><a href="#permissions" data-toggle="pill">{tPermissions}</a></li>
<li><a href="#client" data-toggle="pill">{tClient}</a></li>
<li><a href="#archive" data-toggle="pill">{tArchive}</a></li>
{internet_settings_start|s}
<li><a href="#internet" data-toggle="pill">{tInternet}</a></li>
{internet_settings_end|s}
<li><a href="#advanced" data-toggle="pill">{tAdvanced}</a></li>
</ul>
<div class="panel panel-default" id="server_settings">
<div class="panel-heading">{tServer}</div>
<div class="tab-content">
<div class="tab-pane active" id="server_settings">
<div class="panel panel-default">
<div class="panel-body">
<form class="form-horizontal" role="form">
<div class="form-group">
@ -114,10 +117,16 @@
</div>
</div>
</div>
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveGeneralSettings()" />
</form>
&nbsp;
</div>
</div>
</div>
</div>
{settings_inv|s}
{settings_inv|s}
</div>
<div style="text-align: right">
<input type="button" class="btn btn-primary" value="{tSave}" onClick="saveGeneralSettings()" />
<br />
&nbsp;
</div>

49
urbackupserver/www/templates/settings_inv_row.htm
View File

@ -1,5 +1,9 @@
<div class="panel panel-default" id="file_backups">
<div class="panel-heading">{tFile Backups}</div>
{?client_settings}
<div class="tab-pane active" id="file_backups">
{:else}
<div class="tab-pane" id="file_backups">
{/client_settings}
<div class="panel panel-default">
<div class="panel-body">
<form class="form-horizontal" role="form">
<div class="form-group">
@ -73,13 +77,13 @@
</div>
</div>
</div>
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveGeneralSettings()" />
</form>
</div>
</div>
</div>
<div class="panel panel-default" id="image_backups">
<div class="panel-heading">{tImage backups}</div>
<div class="tab-pane" id="image_backups">
<div class="panel panel-default">
<div class="panel-body">
<form class="form-horizontal" role="form">
<div class="form-group">
@ -155,10 +159,11 @@
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveGeneralSettings()" />
</form>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="permissions">Permissions</div>
<div class="tab-pane" id="permissions">
<div class="panel panel-default">
<div class="panel-body">
<form class="form-horizontal">
<div class="form-group">
@ -215,13 +220,13 @@
<label><input type="checkbox" id="allow_tray_exit" {allow_tray_exit}/></label>
</div>
</div>
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveGeneralSettings()" />
</form>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="client">Client</div>
<div class="tab-pane" id="client">
<div class="panel panel-default">
<div class="panel-body">
<form class="form-horizontal" role="form">
<div class="form-group">
@ -307,13 +312,13 @@
<input type="text" class="form-control" id="client_quota" value="{client_quota}"/>
</div>
</div>
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveGeneralSettings()" />
</form>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="archive">{tArchive}</div>
<div class="tab-pane" id="archive">
<div class="panel panel-default">
<div class="panel-body">
<table class="table" id="archive_table">
<thead>
@ -366,10 +371,12 @@
</tbody>
</table>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="internet">{tInternet}</div>
{internet_settings_start|s}
<div class="tab-pane" id="internet">
<div class="panel panel-default">
<div class="panel-body">
<form class="form-horizontal" role="form">
{global_settings_start_inet|s}
@ -462,15 +469,15 @@
<label><input type="checkbox" id="internet_connect_always" value="false" {internet_connect_always}/></label>
</div>
</div>
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveGeneralSettings()" />
</form>
</div>
</div>
</div>
{internet_settings_end|s}
<div class="panel panel-default">
<div class="panel-heading" id="advanced">{tAdvanced}</div>
<div class="tab-pane" id="advanced">
<div class="panel panel-default">
<div class="panel-body">
<form class="form-horizontal" role="form">
{global_settings_start|s}
@ -588,7 +595,11 @@
<label><input type="checkbox" id="internet_readd_file_entries" value="true" {internet_readd_file_entries}/></label>
</div>
</div>
<input type="button" class="btn btn-default" value="{tSave}" onClick="saveGeneralSettings()" />
</form>
</div>
</div>
</div>
{?client_settings}
</div>
{/client_settings}

21
urbackupserver/www/templates/settings_user.htm
View File

@ -8,11 +8,28 @@
<label><input type="checkbox" onclick="updateUserOverwrite({clientid})" id="overwrite" {overwrite} />
</div>
</div>
{settings_inv|s}
<ul class="nav nav-pills" id="settings_tabber" data-tabs="tabs">
<li class="active"><a href="#file_backups" data-toggle="tab">{tFile Backups}</a></li>
<li><a href="#image_backups" data-toggle="tab">{tImage Backups}</a></li>
<li><a href="#permissions" data-toggle="tab">{tPermissions}</a></li>
<li><a href="#client" data-toggle="tab">{tClient}</a></li>
<li><a href="#archive" data-toggle="tab">{tArchive}</a></li>
{internet_settings_start|s}
<li><a href="#internet" data-toggle="tab">{tInternet}</a></li>
{internet_settings_end|s}
<li><a href="#advanced" data-toggle="tab">{tAdvanced}</a></li>
</ul>
<div class="tab-content">
{settings_inv|s}
</div>
{overwrite_warning_start|s}
<div class="alert alert-warning">{tWarning: The settings configured on the client will overwrite the settings configured here. If you want to change this behaviour do not allow the client to change settings.}</div>
{overwrite_warning_end|s}
<input type="button" class="btn btn-primary" value="{tSave}" onClick="saveClientSettings({clientid})" id="user_submit"/>
<div style="text-align: right">
<input type="button" class="btn btn-primary pull-right clearfix" value="{tSave}" onClick="saveClientSettings({clientid})" id="user_submit"/>
<br />
&nbsp;
</div>
</form>
</div>
</div>

22
urbackupserver/www/urbackup.js
View File

@ -1803,6 +1803,8 @@ function show_settings2(data)
data.settings.no_compname_end_inet="";
}
data.settings.client_settings=false;
data.settings.settings_inv=dustRender("settings_inv_row", data.settings);
ndata+=dustRender("settings_general", data.settings);
@ -1905,6 +1907,8 @@ function show_settings2(data)
data.settings.no_compname_start_inet="";
data.settings.no_compname_end_inet="";
}
data.settings.client_settings=true;
data.settings.settings_inv=dustRender("settings_inv_row", data.settings);
ndata+=dustRender("settings_user", data.settings);
@ -2224,19 +2228,19 @@ g.ldap_settings_list=[
"testpassword"
];
var time_span_regex = /^([\d.]*(@([mon|mo|tu|tue|tues|di|wed|mi|th|thu|thur|thurs|do|fri|fr|sat|sa|sun|so|1-7]\-?[mon|mo|tu|tue|tues|di|wed|mi|th|thu|thur|thurs|do|fri|fr|sat|sa|sun|so|1-7]?\s*[,]?\s*)+\/([0-9][0-9]?:?[0-9]?[0-9]?\-[0-9][0-9]?:?[0-9]?[0-9]?\s*[,]?\s*)+\s*)?[;]?)*$/i;
g.time_span_regex = /^([\d.]*(@([mon|mo|tu|tue|tues|di|wed|mi|th|thu|thur|thurs|do|fri|fr|sat|sa|sun|so|1-7]\-?[mon|mo|tu|tue|tues|di|wed|mi|th|thu|thur|thurs|do|fri|fr|sat|sa|sun|so|1-7]?\s*[,]?\s*)+\/([0-9][0-9]?:?[0-9]?[0-9]?\-[0-9][0-9]?:?[0-9]?[0-9]?\s*[,]?\s*)+\s*)?[;]?)*$/i;
function validateCommonSettings()
{
if(!validate_text_regex([{ id: "update_freq_incr", regexp: time_span_regex },
{ id: "update_freq_full", regexp: time_span_regex },
{ id: "update_freq_image_incr", regexp: time_span_regex },
{ id: "update_freq_image_full", regexp: time_span_regex } ]) ) return false;
if(!validate_text_regex([{ id: "update_freq_incr", regexp: g.time_span_regex },
{ id: "update_freq_full", regexp: g.time_span_regex },
{ id: "update_freq_image_incr", regexp: g.time_span_regex },
{ id: "update_freq_image_full", regexp: g.time_span_regex } ]) ) return false;
if(!validate_text_int(["max_file_incr", "min_file_incr", "max_file_full",
"min_file_full", "max_image_incr", "min_image_incr", "max_image_full", "min_image_full",
"startup_backup_delay"] ) ) return false;
if(!validate_text_regex({ id: "local_speed", regexp: time_span_regex})) return false;
if(I('internet_speed') && !validate_text_regex({id: "internet_speed", regex: time_span_regex })) return false;
if(I('local_speed').value!="-" && !validate_text_regex({ id: "local_speed", regexp: g.time_span_regex})) return false;
if(I('internet_speed') && !validate_text_regex({id: "internet_speed", regex: g.time_span_regex })) return false;
var backup_window_regex = /^(([mon|mo|tu|tue|tues|di|wed|mi|th|thu|thur|thurs|do|fri|fr|sat|sa|sun|so|1-7]\-?[mon|mo|tu|tue|tues|di|wed|mi|th|thu|thur|thurs|do|fri|fr|sat|sa|sun|so|1-7]?\s*[,]?\s*)+\/([0-9][0-9]?:?[0-9]?[0-9]?\-[0-9][0-9]?:?[0-9]?[0-9]?\s*[,]?\s*)+\s*[;]?\s*)*$/i;
if(!validate_text_regex([{ id: "backup_window_incr_file", errid: "backup_window", regexp: backup_window_regex },
{ id: "backup_window_full_file", errid: "backup_window", regexp: backup_window_regex },
@ -2265,8 +2269,8 @@ function saveGeneralSettings()
backupWindowChange();
if(!validate_text_nonempty(["backupfolder"]) ) return;
if(!validate_text_int(["max_sim_backups", "max_active_clients"]) ) return;
if(!validate_text_regex([{id: "global_local_speed", regex: time_span_regex}])) return;
if(I('global_internet_speed') && !validate_text_regex([{id: "global_internet_speed", regex: time_span_regex}])) return;
if(I('global_local_speed').value!="-" && !validate_text_regex([{id: "global_local_speed", regexp: g.time_span_regex}])) return;
if(I('global_internet_speed') && I('global_internet_speed').value!="-" && !validate_text_regex([{id: "global_internet_speed", regexp: g.time_span_regex}])) return;
if(!validateCommonSettings() ) return;
if(!validate_text_regex([{ id: "cleanup_window", regexp: /^(([mon|mo|tu|tue|tues|di|wed|mi|th|thu|thur|thurs|do|fri|fr|sat|sa|sun|so|1-7]\-?[mon|mo|tu|tue|tues|di|wed|mi|th|thu|thur|thurs|do|fri|fr|sat|sa|sun|so|1-7]?\s*[,]?\s*)+\/([0-9][0-9]?:?[0-9]?[0-9]?\-[0-9][0-9]?:?[0-9]?[0-9]?\s*[,]?\s*)+\s*[;]?\s*)*$/i }]) ) return;