From fa2af5a2f7724cedcd537713e38bf5b7a5d14360 Mon Sep 17 00:00:00 2001 From: Martin Raiber Date: Mon, 21 Feb 2011 14:49:25 +0100 Subject: [PATCH] Use select boxes instead of links for clients in statistics and settings --- urbackup/serverinterface/status.cpp | 5 +- urbackup/serverinterface/templ.cpp | 1 - urbackup/www/templates.js | 1 - urbackup/www/templates/stat_nav_pos.htm | 1 - urbackup/www/translation.js | 6 +- urbackup/www/urbackup.js | 81 +++++++++++++++++-------- 6 files changed, 64 insertions(+), 31 deletions(-) delete mode 100644 urbackup/www/templates/stat_nav_pos.htm diff --git a/urbackup/serverinterface/status.cpp b/urbackup/serverinterface/status.cpp index 25253589..4bd2edd0 100644 --- a/urbackup/serverinterface/status.cpp +++ b/urbackup/serverinterface/status.cpp @@ -133,7 +133,10 @@ ACTION_IMPL(status) unsigned char *ips=(unsigned char*)&client_status[j].ip_addr; ip=nconvert(ips[0])+"."+nconvert(ips[1])+"."+nconvert(ips[2])+"."+nconvert(ips[3]); - i_status=client_status[j].statusaction; + if(!client_status[j].wrong_ident) + i_status=client_status[j].statusaction; + else + i_status=11; } } diff --git a/urbackup/serverinterface/templ.cpp b/urbackup/serverinterface/templ.cpp index 824d23a8..2a77715f 100644 --- a/urbackup/serverinterface/templ.cpp +++ b/urbackup/serverinterface/templ.cpp @@ -48,7 +48,6 @@ ACTION_IMPL(generate_templ) templates.push_back("lastacts_row"); templates.push_back("stat_general"); templates.push_back("stat_general_row"); - templates.push_back("stat_nav_pos"); templates.push_back("stat_user"); templates.push_back("status"); templates.push_back("status_row"); diff --git a/urbackup/www/templates.js b/urbackup/www/templates.js index f1c85f14..0edec4ca 100755 --- a/urbackup/www/templates.js +++ b/urbackup/www/templates.js @@ -8,7 +8,6 @@ tmpls.lastacts_table=new Template("

#{tLast activities}

\r\n\r\n\r\n\t\r\n\t\r\n\t\r\n\t\r\n\t\r\n\t\r\n"); tmpls.stat_general=new Template("

#{tStorage allocation}

\r\n\r\n
#{tLoading}...

\r\n\r\n
#{id}#{name}#{action}#{backuptime}#{duration}#{size}
\r\n\t\t\t\r\n\t\r\n\t\r\n\t\r\n\t\r\n\r\n#{rows}\r\n\r\n\t\r\n\r\n\r\n\t\r\n\t\r\n\t\r\n\t\r\n\r\n
#{tComputer name}#{tImages}#{tFiles}#{tAll}
#{tAll}#{images_total}#{files_total}#{used_total}
\r\n\r\n

#{tStorage usage}

\r\n\r\n
#{tLoading}...
"); tmpls.stat_general_row=new Template("\r\n\t#{name}\r\n\t#{images}\r\n\t#{files}\r\n\t#{used}\r\n"); -tmpls.stat_nav_pos=new Template("#{name}"); tmpls.stat_user=new Template("

#{tStorage usage of} #{clientname}

\r\n\r\n
#{tLoading}...
"); tmpls.status=new Template("

#{tBackup status}

\r\n\r\n#{dir_error}\r\n\r\n\r\n\t\t\t\r\n\t\r\n\t\r\n\t\r\n\t\r\n\t\r\n\t\r\n\r\n#{rows}\r\n
#{tComputer name}#{tLast seen}#{tLast file backup}#{tLast image backup}#{tFile backup status}#{tImage backup status}
\r\n

\r\n#{tShow details}"); tmpls.status_row=new Template("\r\n\t#{name}\r\n\t#{lastseen}\r\n\t#{lastbackup}\r\n\t#{lastbackup_image}\r\n\t
#{file_ok_t}
\r\n\t
#{image_ok_t}
\r\n"); diff --git a/urbackup/www/templates/stat_nav_pos.htm b/urbackup/www/templates/stat_nav_pos.htm deleted file mode 100644 index b576a9c3..00000000 --- a/urbackup/www/templates/stat_nav_pos.htm +++ /dev/null @@ -1 +0,0 @@ -#{name} \ No newline at end of file diff --git a/urbackup/www/translation.js b/urbackup/www/translation.js index 624548c7..21f1854c 100644 --- a/urbackup/www/translation.js +++ b/urbackup/www/translation.js @@ -47,7 +47,8 @@ translations.en={ "tdir_error_text": "The directory where UrBackup will save backups is inaccessible. Please fix that by modifying this folder in 'Settings' or by giving UrBackup rights to access this directory.", "starting": "Starting", "ident_err": "Server rejected", -"enter_hostname": "Please enter a hostname or IP address" +"enter_hostname": "Please enter a hostname or IP address", +"clients": "Clients" } translations.de={ "action_1": "Inkrementelles Datei Backup", @@ -185,5 +186,6 @@ translations.de={ "tNo extra clients": "Keine zusätzlichen Clients", "tShow details": "Details anzeigen", "tAutoupdate clients": "Clientprogramme automatisch aktualisieren", -"enter_hostname": "Bitte geben Sie eine IP-Adresse oder einen Hostenamen ein" +"enter_hostname": "Bitte geben Sie eine IP-Adresse oder einen Hostenamen ein", +"clients": "Clients" } \ No newline at end of file diff --git a/urbackup/www/urbackup.js b/urbackup/www/urbackup.js index 35ab7f90..90c5c850 100644 --- a/urbackup/www/urbackup.js +++ b/urbackup/www/urbackup.js @@ -256,6 +256,7 @@ function show_statistics1() new getJSON("usage", "", show_statistics3); g.main_nav_pos=2; + g.settings_nav_pos=0; build_main_nav(); } function show_statistics2(data) @@ -264,17 +265,28 @@ function show_statistics2(data) if(g.main_nav_pos!=2) return; var ndata=""+trans["overview"]+""; - if(data.users.length>0) + if(g.settings_nav_pos==0) { - ndata+=" |  "; + ndata=""+trans["overview"]+""; } - for(var i=0;i0) + { + ndata+=" |  "; + ndata+=""; + if(g.settings_nav_pos"; + n+="" } - else - { - n+=""+nav.clients[i].name+""; + for(var i=0;i"+nav.clients[i].name+""; + ++idx; } - - ++idx; } } I('nav_pos').innerHTML=n; @@ -875,11 +900,17 @@ function saveGeneralSettings() } new getJSON("settings", "sa=general_save"+pars, show_settings2); } -function clientSettings(clientid, idx) +function clientSettings() { - if(!startLoading()) return; - g.settings_nav_pos=idx; - new getJSON("settings", "sa=clientsettings&t_clientid="+clientid, show_settings2); + var selidx=I('settingsclient').selectedIndex; + if(selidx!=-1 && I('settingsclient').value!="n") + { + if(!startLoading()) return; + clientid=I('settingsclient').value.split("-")[0]; + idx=clientid=I('settingsclient').value.split("-")[1]; + g.settings_nav_pos=idx*1; + new getJSON("settings", "sa=clientsettings&t_clientid="+clientid, show_settings2); + } } function generalSettings() {