diff --git a/rpcd/onion-console.sh b/rpcd/onion-console.sh index 8ed268f..ae60bb6 100755 --- a/rpcd/onion-console.sh +++ b/rpcd/onion-console.sh @@ -126,7 +126,7 @@ ShellinaboxCtrl () { ######################## ##### Main Program ##### -appLocation="/www/apps" +appLocation="/www/console/apps" cmdAppList="app-list" cmdShellinabox="shellinabox" diff --git a/www/apps/onion-app-template/onion-app-template.html b/www/apps/onion-app-template/onion-app-template.html index 712f087..482a142 100644 --- a/www/apps/onion-app-template/onion-app-template.html +++ b/www/apps/onion-app-template/onion-app-template.html @@ -1,6 +1,6 @@ - - - + + + + + + + + diff --git a/www/apps/onion-editor/onion-editor.html b/www/apps/onion-editor/onion-editor.html index 7d90acb..623b105 100644 --- a/www/apps/onion-editor/onion-editor.html +++ b/www/apps/onion-editor/onion-editor.html @@ -1,12 +1,12 @@ - - - - - - - - - + + + + + + + + + + + + diff --git a/www/apps/onion-terminal/onion-terminal.html b/www/apps/onion-terminal/onion-terminal.html index 032fbd7..a350cc4 100644 --- a/www/apps/onion-terminal/onion-terminal.html +++ b/www/apps/onion-terminal/onion-terminal.html @@ -1,5 +1,5 @@ - - + + + + + diff --git a/www/apps/onion-webcam/onion-webcam.html b/www/apps/onion-webcam/onion-webcam.html index 5aa179d..f38054b 100644 --- a/www/apps/onion-webcam/onion-webcam.html +++ b/www/apps/onion-webcam/onion-webcam.html @@ -1,8 +1,8 @@ -e - - - - +e + + + + @@ -92,7 +92,7 @@
- +
diff --git a/www/elements/bootstrap-button/bootstrap-button.html b/www/elements/bootstrap-button/bootstrap-button.html index 7b884d7..c28dd30 100644 --- a/www/elements/bootstrap-button/bootstrap-button.html +++ b/www/elements/bootstrap-button/bootstrap-button.html @@ -1,5 +1,5 @@ - - + + diff --git a/www/elements/bootstrap-dropdown/bootstrap-dropdown.html b/www/elements/bootstrap-dropdown/bootstrap-dropdown.html index 5b7f78d..df786d3 100644 --- a/www/elements/bootstrap-dropdown/bootstrap-dropdown.html +++ b/www/elements/bootstrap-dropdown/bootstrap-dropdown.html @@ -1,5 +1,5 @@ - - + + + diff --git a/www/elements/onion-taskbar/onion-taskbar.html b/www/elements/onion-taskbar/onion-taskbar.html index 82819c7..a332bae 100644 --- a/www/elements/onion-taskbar/onion-taskbar.html +++ b/www/elements/onion-taskbar/onion-taskbar.html @@ -116,9 +116,9 @@ var _computeIconUrl = function (item) { if (item.path) { - return '../..' + item.path + '/'+ item.id + '/icon.png'; + return '../../console' + item.path + '/'+ item.id + '/icon.png'; } else { - return '../../apps/' + item.id + '/icon.png'; + return '../../console/apps/' + item.id + '/icon.png'; } }; @@ -170,7 +170,7 @@ currentApp: { type: String, notify: true, - value: 'onion-launcher', + value: 'onion-settings', } }, }); diff --git a/www/index.html b/www/index.html index f34dffb..bfa320c 100644 --- a/www/index.html +++ b/www/index.html @@ -7,19 +7,22 @@ - + - - + + - + + + + diff --git a/www/lib/Onion-Console/bootstrap-modal/bootstrap-modal.html b/www/lib/Onion-Console/bootstrap-modal/bootstrap-modal.html new file mode 100644 index 0000000..7163cc5 --- /dev/null +++ b/www/lib/Onion-Console/bootstrap-modal/bootstrap-modal.html @@ -0,0 +1,95 @@ + + + + + + + + + + \ No newline at end of file diff --git a/www/services/onion-apps-provider/onion-apps-provider.html b/www/services/onion-apps-provider/onion-apps-provider.html index ba5b88f..0585f97 100644 --- a/www/services/onion-apps-provider/onion-apps-provider.html +++ b/www/services/onion-apps-provider/onion-apps-provider.html @@ -1,4 +1,4 @@ - + import shared service @@ -44,7 +44,7 @@ // this.getApps(function(){}); }; - var getApps = function(callback) { + var getApps = function(callback) { this.ubus.request('onion-console', 'app-list', {}, function (result) { if (result.length === 2 && result[1].exists) { diff --git a/www/services/onion-device-provider/onion-device-provider.html b/www/services/onion-device-provider/onion-device-provider.html index 3d4c640..d5a6469 100644 --- a/www/services/onion-device-provider/onion-device-provider.html +++ b/www/services/onion-device-provider/onion-device-provider.html @@ -1,4 +1,4 @@ - +