diff --git a/Website/Views/Account/Login.cshtml b/Website/Views/Account/Login.cshtml
index 533be7f..5adabbc 100644
--- a/Website/Views/Account/Login.cshtml
+++ b/Website/Views/Account/Login.cshtml
@@ -13,8 +13,28 @@
}
+ @if (Model.Page > 1) {
+

+ }
+ @if (Model.Page < Model.MaxPages) {
+

+ }
+
\ No newline at end of file
diff --git a/Website/Views/Shared/_Layout.cshtml b/Website/Views/Shared/_Layout.cshtml
index e74d672..16f3f19 100644
--- a/Website/Views/Shared/_Layout.cshtml
+++ b/Website/Views/Shared/_Layout.cshtml
@@ -1,125 +1,47 @@
-@{
- var angularSource = "ajax.googleapis.com/ajax/libs/angularjs";
- var angularVersion = "1.5.0";
-
- var jsFiles = new[]{
- "javascript.js",
- "controllers/main.js",
- "directives/equalHeightWidth.js",
- "directives/scopeInit.js",
- };
-}
-
-
-
-
-
-
-
- The following errors were encountered:
-
- Please rectify them and try again.
-
-
-
@RenderSection("ButtonsLeft", required: false)
-
@RenderSection("ButtonsRight", required: false)
-
- Loading chart...
\ No newline at end of file
diff --git a/Website/wwwroot/js/javascript.js b/Website/wwwroot/js/javascript.js
index 2ce34f5..360afc5 100644
--- a/Website/wwwroot/js/javascript.js
+++ b/Website/wwwroot/js/javascript.js
@@ -6,7 +6,7 @@ function CreateCookie(name, value, days) {
var expires;
if (days) {
var date = new Date();
- date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
expires = "; expires=" + date.toGMTString();
}
else {
@@ -57,89 +57,4 @@ Number.prototype.toString=function(input, shouldRound){
return this.oldToString(input);
return round(this, input);
-};
-
-$(function() {
- var panels = $("nav > dl > .sub-pages");
- var goIndicators = $("nav > dl > dt .go");
- var expandIndicators = $("nav > dl > dt .expand");
- panels.hide();
- expandIndicators.show();
-
- $("nav > dl > dt").click(function(e) {
- var next = $(this).next();
- if (!next.hasClass("sub-pages")) {
- Navigate($(this).children("a").attr("href"));
- return;
- }
- panels.slideUp();
- goIndicators.hide();
- expandIndicators.show();
- if (next.is(":visible")) {
- return;
- }
- next.slideDown();
- $(this).children(".go").show();
- $(this).children(".expand").hide();
- });
-
- $("nav dd").click(function(e) {
- Navigate($(this).children("a").attr("href"));
- });
-
- $("nav a").click(function(e) {
- $(this).parent().click();
- return false;
- });
-
- $("#body").css("padding-bottom", window.innerHeight - $("#buttons-right").offset().top);
-
- $("form[ajaxForm]").submit(function(e) {
- e.preventDefault();
- form = $(this);
- $.ajax({
- url: form.attr("action"),
- method: form.attr("method"),
- data: form.serialize(),
- success: function(data) {
- var successFunction = form.attr("onsuccess");
- if (successFunction !== undefined && window[successFunction] !== undefined)
- window[successFunction](data);
- },
- error: function() {
- var errorFunction = form.attr("onerror");
- if (errorFunction !== undefined && window[errorFunction] !== undefined)
- window[errorFunction]();
- },
- });
- var postFunction = form.attr("onpost");
- if (postFunction !== undefined && window[postFunction] !== undefined)
- window[postFunction]();
- });
-
- $("td").each(function() {
- var elem = $(this);
- if (/^[+-]?\d+(\.\d+)?$/.test(elem.text())) {
- elem.addClass("number");
- }
- });
-});
-
-$(document).delegate('.allowTabInput', 'keydown', function(e) {
- var keyCode = e.keyCode || e.which;
- console.log(e);
- if (keyCode == 9) {
- e.preventDefault();
- var start = $(this).get(0).selectionStart;
- var end = $(this).get(0).selectionEnd;
-
- // set textarea value to: text before caret + tab + text after caret
- $(this).val($(this).val().substring(0, start)
- + "\t"
- + $(this).val().substring(end));
-
- // put caret at right position again
- $(this).get(0).selectionStart =
- $(this).get(0).selectionEnd = start + 1;
- }
-});
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/Website/wwwroot/js/services/statusService.js b/Website/wwwroot/js/services/statusService.js
deleted file mode 100644
index d5bcc32..0000000
--- a/Website/wwwroot/js/services/statusService.js
+++ /dev/null
@@ -1,60 +0,0 @@
-angular.module("robware").service('statusService', ["$http", function($http) {
- function parseProcessData(data) {
- var headers = data.shift();
- var cpuIndex = -1;
- var ignoreColNames = ["user", "pid", "vsz", "rss", "tty", "stat"];
- var ignoreCols = [];
-
- var processHeaders = []
- for (var col in headers) {
- if (headers[col].toLowerCase() === "%cpu")
- cpuIndex = col;
-
- if (ignoreColNames.indexOf(headers[col].toLowerCase()) > -1)
- ignoreCols.push(col);
- else
- processHeaders.push(headers[col]);
- }
-
- data.sort(function (a, b) {
- cpuA = parseFloat(a[cpuIndex]);
- cpuB = parseFloat(b[cpuIndex]);
- if (cpuA > cpuB)
- return -1;
- if (cpuA < cpuB)
- return 1
- return 0;
- });
-
- var processData = [];
- for (var row in data) {
- var obj = {};
- for (var col in data[row]) {
- if (ignoreCols.indexOf(col) === -1)
- obj[headers[col]] = data[row][col];
- }
- processData.push(obj);
- }
-
- return [processHeaders, processData];
- }
-
- this.getProcesses = function() {
- return $http.get('/status/getprocesses').then(function(response) {
- parsedData = parseProcessData(response.data);
- return {headers: parsedData[0], data: parsedData[1]};
- });
- };
-
- this.getSystemInfo=function(){
- return $http.get('/status/getsysteminfo').then(function(response){
- return response.data;
- });
- };
-
- this.getUptime=function(){
- return $http.get('/status/getuptime').then(function(response){
- return response.data;
- })
- };
-}]);
\ No newline at end of file
diff --git a/Website/wwwroot/js/services/temperatureService.js b/Website/wwwroot/js/services/temperatureService.js
deleted file mode 100644
index 5f5d2a0..0000000
--- a/Website/wwwroot/js/services/temperatureService.js
+++ /dev/null
@@ -1,13 +0,0 @@
-angular.module("robware").service('temperatureService', ["$http", function($http) {
- this.getReadings = function() {
- return $http.get('/temperature/getreadings', {dontShowSpinner:true}).then(function(response) {
- return response.data;
- });
- };
-
- this.getCurrentTemperatureData = function() {
- return $http.get("/temperature/GetTemperatureData", {dontShowSpinner:true}).then(function(response) {
- return response.data;
- });
- }
-}]);
\ No newline at end of file
diff --git a/Website/wwwroot/js/services/weightService.js b/Website/wwwroot/js/services/weightService.js
deleted file mode 100644
index 27d810b..0000000
--- a/Website/wwwroot/js/services/weightService.js
+++ /dev/null
@@ -1,31 +0,0 @@
-angular.module("robware").service('weightService', ["$http", function($http) {
- this.addWeight=function(weight, fat){
- return $http({
- method:'post',
- url:'/weight/add',
- data:{weight:weight, fat:fat},
- showSpinner:true
- }).then(function(response){
- return response.data;
- });
- };
- this.deleteWeight=function(id){
- return $http({
- method:'post',
- url:'/weight/delete',
- data:{id:id},
- showSpinner:true
- }).then(function(response){
- return response.data;
- });
- };
- this.getReadings=function(){
- return $http({
- method:'post',
- url:'/weight/getreadings',
- showSpinner:true
- }).then(function(response){
- return response.data;
- });
- };
-}]);
\ No newline at end of file