diff --git a/js/login.js b/js/login.js
index 9a1c0aa..92b8b8f 100644
--- a/js/login.js
+++ b/js/login.js
@@ -51,33 +51,40 @@ function codelogin(code) {
}
function loadQuickLogin() {
- $.post(accounthubapi, {
- key: apikey,
- gid: 4,
- action: "getusersbygroup",
- get: "detail"
- }, function (resp) {
- if (resp.status == "OK") {
- var userhtml = "";
- for (var user in resp.users) {
- var u = resp.users[user];
- userhtml += '
\n'
- + ' \n'
- + ' \n'
- + u["name"] + "\n"
- + '
\n';
+ if (!isNaN(group)) {
+ $.post(accounthubapi, {
+ key: apikey,
+ gid: group,
+ action: "getusersbygroup",
+ get: "detail"
+ }, function (resp) {
+ if (resp.status == "OK") {
+ var userhtml = "";
+ for (var user in resp.users) {
+ var u = resp.users[user];
+ userhtml += '\n'
+ + ' \n'
+ + ' \n'
+ + u["name"] + "\n"
+ + '
\n';
+ }
+ $("#userlist .row").html(userhtml);
+ $(".quick-user").click(function () {
+ setuser($(this).data("username"));
+ setname($(this).data("name"));
+ setuid($(this).data("uid"));
+ openScreen("home");
+ });
+ } else {
+ $("#quickaccess_tab").tab("dispose");
+ $("#userpass_tab").tab("show");
}
- $("#userlist .row").html(userhtml);
- $(".quick-user").click(function () {
- setuser($(this).data("username"));
- setname($(this).data("name"));
- setuid($(this).data("uid"));
- openScreen("home");
- });
- } else {
- showmsg(resp.msg, "danger");
- }
- }, "json");
+ }, "json");
+ } else {
+ $("#quickaccess_tab").tab("dispose");
+ $("#quickaccess_tab").css("display", "none");
+ $("#userpass_tab").tab("show");
+ }
}
$("#userpassloginbtn").click(function () {
@@ -87,14 +94,6 @@ $("#userpassloginbtn").click(function () {
userpasslogin(user, pass);
}
});
-function quicklogin(uid) {
- var quickuser =
- setuser(resp.data.username);
- setname(resp.data.name);
- setuid(resp.data.uid);
- openScreen("home");
-}
-
$("#mobilecodeloginbtn").click(function () {
var code = $("#code").val();
diff --git a/js/settings.js b/js/settings.js
index 41f84a7..3b301f6 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -7,6 +7,7 @@
var accounthubapi = localStorage.getItem("apiurl");
var apikey = localStorage.getItem("apikey");
+var group = localStorage.getItem("group");
var kioskmode = localStorage.getItem("kioskmode") == "true" ? true : false;
var largebtns = localStorage.getItem("largebtns") == "true" ? true : false;
@@ -41,6 +42,7 @@ function validateSettings(callback) {
function reloadSettings() {
accounthubapi = localStorage.getItem("apiurl");
apikey = localStorage.getItem("apikey");
+ group = localStorage.getItem("group");
kioskmode = localStorage.getItem("kioskmode");
largebtns = localStorage.getItem("largebtns");
}
\ No newline at end of file
diff --git a/js/setup.js b/js/setup.js
index c2b900c..a320dbd 100644
--- a/js/setup.js
+++ b/js/setup.js
@@ -4,11 +4,34 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+function dlGroups() {
+ localStorage.setItem("apiurl", $("#url").val());
+ localStorage.setItem("apikey", $("#key").val());
+ reloadSettings();
+ $.post(accounthubapi, {
+ key: apikey,
+ action: "getgroups"
+ }, function (data) {
+ if (data.status == "OK") {
+ var options = "";
+ for (var group in data.groups) {
+ var g = data.groups[group];
+ options += '' + g["name"] + ' \n';
+ }
+ $("#group").append(options);
+ } else {
+ showmsg("Error", "danger", "Something is wrong. Check the settings you entered.");
+ }
+ }, "json").fail(function () {
+ showmsg("Error", "danger", "Something is wrong. Check the settings you entered.");
+ });
+}
$("#settings_form").submit(function (event) {
event.preventDefault();
localStorage.setItem("apiurl", $("#url").val());
localStorage.setItem("apikey", $("#key").val());
+ localStorage.setItem("group", $("#group").val());
localStorage.setItem("kioskmode", $("#kioskmode").is(":checked") ? true : null);
localStorage.setItem("largebtns", $("#largebtns").is(":checked") ? true : null);
reloadSettings();
diff --git a/pages/login.html b/pages/login.html
index 6b63ac3..45d742c 100644
--- a/pages/login.html
+++ b/pages/login.html
@@ -5,10 +5,10 @@
- Quick Access
+ Quick Access
- Username/Password
+ Username/Password
Mobile Code
diff --git a/pages/setup.html b/pages/setup.html
index f9a67d9..25f1c3d 100644
--- a/pages/setup.html
+++ b/pages/setup.html
@@ -17,11 +17,22 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.