diff --git a/frontend/index.html b/frontend/index.html index 25f3fe6..cee0bb4 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -161,8 +161,8 @@
@@ -235,8 +235,8 @@ $(document).ready(function() { // code for adding a channel - var ucid = $("#ucid"), - allFields = $([]).add(ucid), + var uuid = $("#uuid"), + allFields = $([]).add(uuid), tips = $(".validateTips"); @@ -283,7 +283,7 @@ $(document).ready(function() { var bValid = true; allFields.removeClass('ui-state-error'); - bValid = bValid && checkLength(ucid,"UCID",36,36); + bValid = bValid && checkLength(uuid,"UUID",36,36); //bValid = bValid && checkRegexp(name,/^[a-z]([0-9a-z_])+$/i,"Username may consist of a-z, 0-9, underscores, begin with a letter."); // From jquery.validate.js (by joern), contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/ @@ -323,9 +323,10 @@ $(document).ready(function() { function loadChannelList() { - $('#debug').append('json'); + $('#debug').append('json'); // load json data - $.getJSON("../backend/index.php",{uuid: myUUID, controller: 'channel', action: 'get', format: 'json'}, function(j){ + $.getJSON("../backend/index.php/data/" + myUUID + {format: 'json'}); + /*$.getJSON("../backend/index.php/data/" + myUUID + {format: 'json'}, function(j){ $('#channelList').empty(); @@ -337,7 +338,7 @@ function loadChannelList() { // initioal load data with all channels getData(); - }); + });*/ } @@ -368,7 +369,7 @@ function moveWindow(mode) { function getData() { if(f.ids.length>0) - $('#loading').empty().html('