diff --git a/404.html b/404.html deleted file mode 100644 index 1378359..0000000 --- a/404.html +++ /dev/null @@ -1,20 +0,0 @@ - - - ERROR - 404 - - - - - - - - diff --git a/404.png b/404.png deleted file mode 100644 index f9166bd..0000000 Binary files a/404.png and /dev/null differ diff --git a/license-terminal.txt b/LICENSE-TERMINAL similarity index 100% rename from license-terminal.txt rename to LICENSE-TERMINAL diff --git a/ambient.mp3 b/ambient.mp3 deleted file mode 100644 index a61a41d..0000000 Binary files a/ambient.mp3 and /dev/null differ diff --git a/apps/about/index.html b/apps/about/index.html index 6efbaab..885f532 100644 --- a/apps/about/index.html +++ b/apps/about/index.html @@ -47,7 +47,16 @@ +File Manager
+Notepad
+A right-click context menu
- -Removed ambient music on most applications
+ +Added new folders
+  + /etc - Used for holding configuration files
+  + /assets - Holds assets for use by DremJS
+  + /assets/media/images - Holds specifically images
+ Spring cleaning
+  -Removed ambient music on all applications
+  -Removed 404 error screen (since it wasn't used anyway)
+  -Removed background.png (same reason as the above)
+  -Removed the old favicon
+ ~Made the terminal portable
~General system stability improvements to enhance the user's experience.

Version 0.1.6b
+Widget support (see wiki for more information)
diff --git a/apps/howto/ambient.mp3 b/apps/howto/ambient.mp3 deleted file mode 100644 index 5a381f0..0000000 Binary files a/apps/howto/ambient.mp3 and /dev/null differ diff --git a/apps/howto/index.html b/apps/howto/index.html index 55aba41..05b447a 100644 --- a/apps/howto/index.html +++ b/apps/howto/index.html @@ -18,7 +18,6 @@ -

How to Install Applications On DremJS

diff --git a/css/dark.css b/apps/terminal/css/dark.css similarity index 100% rename from css/dark.css rename to apps/terminal/css/dark.css diff --git a/css/lite.css b/apps/terminal/css/lite.css similarity index 100% rename from css/lite.css rename to apps/terminal/css/lite.css diff --git a/apps/terminal/index.html b/apps/terminal/index.html index 7d6f1cd..e2d90b0 100644 --- a/apps/terminal/index.html +++ b/apps/terminal/index.html @@ -1,9 +1,112 @@ - - - - - - - \ No newline at end of file + + + + + + DremJS Terminal + + + + + + + + + + + + DremJS + + + + + +
+ +
+
+
+
+ + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + diff --git a/modules/hello_world-0.0.0.djsm b/apps/terminal/modules/hello_world-0.0.0.djsm similarity index 100% rename from modules/hello_world-0.0.0.djsm rename to apps/terminal/modules/hello_world-0.0.0.djsm diff --git a/terminal/configs/theme.conf b/apps/terminal/terminal/configs/theme.conf old mode 100755 new mode 100644 similarity index 100% rename from terminal/configs/theme.conf rename to apps/terminal/terminal/configs/theme.conf diff --git a/terminal/index.js b/apps/terminal/terminal/index.js similarity index 100% rename from terminal/index.js rename to apps/terminal/terminal/index.js diff --git a/terminal/scripts/cowsay.php b/apps/terminal/terminal/scripts/cowsay.php similarity index 100% rename from terminal/scripts/cowsay.php rename to apps/terminal/terminal/scripts/cowsay.php diff --git a/terminal/scripts/swapTheme.php b/apps/terminal/terminal/scripts/swapTheme.php similarity index 95% rename from terminal/scripts/swapTheme.php rename to apps/terminal/terminal/scripts/swapTheme.php index 1d82204..1e4cdc7 100644 --- a/terminal/scripts/swapTheme.php +++ b/apps/terminal/terminal/scripts/swapTheme.php @@ -1,10 +1,10 @@ - + diff --git a/spin.gif b/apps/terminal/terminal/spin.gif similarity index 100% rename from spin.gif rename to apps/terminal/terminal/spin.gif diff --git a/terminal/terminal.js b/apps/terminal/terminal/terminal.js similarity index 96% rename from terminal/terminal.js rename to apps/terminal/terminal/terminal.js index d225540..3210b54 100644 --- a/terminal/terminal.js +++ b/apps/terminal/terminal/terminal.js @@ -188,7 +188,7 @@ var Terminal = Terminal || function(cmdLineContainer, outputContainer) { break; case 'spin': //show_image('spin.gif', 100, 100, 'Spinny'); - output(''); + output(''); break; case 'procman': var arguments = args.join(' '); @@ -410,9 +410,9 @@ var Terminal = Terminal || function(cmdLineContainer, outputContainer) { init: function() { jQuery.get('terminal/configs/theme.conf', function(data) { if(data == "1") { - output('

DremJS Terminal

' + new Date() + '

Enter "help" for more information.

'); + output('

DremJS Terminal

' + new Date() + '

Enter "help" for more information.

'); } else { - output('

DremJS Terminal

' + new Date() + '

Enter "help" for more information.

'); + output('

DremJS Terminal

' + new Date() + '

Enter "help" for more information.

'); } }); }, diff --git a/apps/widgets-settings/addwidget.php b/apps/widgets-settings/addwidget.php index bbd6470..304262b 100644 --- a/apps/widgets-settings/addwidget.php +++ b/apps/widgets-settings/addwidget.php @@ -14,7 +14,7 @@ echo $temp[sizeof($temp)-1].' '; } echo "

Currently enabled widgets:
"; - $enabledWidgets = explode("\n", file_get_contents(getenv('DOCUMENT_ROOT')."/enabled_widgets")); + $enabledWidgets = explode("\n", file_get_contents(getenv('DOCUMENT_ROOT')."/etc/enabled_widgets")); for($i = 0; $i<=sizeof($enabledWidgets)-1; $i++) echo $enabledWidgets[$i].' '; echo "
"; @@ -24,12 +24,12 @@ function addWidget() { $widget = $_REQUEST['widget']; $widgets = array_filter(glob(getenv('DOCUMENT_ROOT').'/widgets/*'), 'is_dir'); - $enabledWidgets = explode("\n", file_get_contents(getenv('DOCUMENT_ROOT')."/enabled_widgets")); + $enabledWidgets = explode("\n", file_get_contents(getenv('DOCUMENT_ROOT')."/etc/enabled_widgets")); //print($widget.'
'); //print_r($widgets); //print_r($enabledWidgets); if(in_array(getenv('DOCUMENT_ROOT').'/widgets/'.$widget, $widgets) && !(in_array($widget, $enabledWidgets))) { - $file = fopen(getenv('DOCUMENT_ROOT').'/enabled_widgets', 'a'); + $file = fopen(getenv('DOCUMENT_ROOT').'/etc/enabled_widgets', 'a'); fwrite($file, $widget."\n"); fclose($file); echo "Added ".$widget; diff --git a/apps/widgets-settings/index.php b/apps/widgets-settings/index.php index 11d23cf..54ddf81 100644 --- a/apps/widgets-settings/index.php +++ b/apps/widgets-settings/index.php @@ -14,7 +14,7 @@ echo $temp[sizeof($temp)-1].' '; } echo "

Currently enabled widgets:
"; - $enabledWidgets = explode("\n", file_get_contents(getenv('DOCUMENT_ROOT')."/enabled_widgets")); + $enabledWidgets = explode("\n", file_get_contents(getenv('DOCUMENT_ROOT')."/etc/enabled_widgets")); for($i = 0; $i<=sizeof($enabledWidgets)-1; $i++) echo $enabledWidgets[$i].' '; echo "
"; diff --git a/apps/widgets-settings/removewidget.php b/apps/widgets-settings/removewidget.php index aa2efcf..190bddf 100644 --- a/apps/widgets-settings/removewidget.php +++ b/apps/widgets-settings/removewidget.php @@ -1,4 +1,4 @@ diff --git a/goodbye.gif b/assets/media/images/goodbye.gif similarity index 100% rename from goodbye.gif rename to assets/media/images/goodbye.gif diff --git a/load.gif b/assets/media/images/load.gif similarity index 100% rename from load.gif rename to assets/media/images/load.gif diff --git a/logo.png b/assets/media/images/logo.png similarity index 100% rename from logo.png rename to assets/media/images/logo.png diff --git a/shutdown.png b/assets/media/images/shutdown.png similarity index 100% rename from shutdown.png rename to assets/media/images/shutdown.png diff --git a/assets/media/images/termlogo-dark.png b/assets/media/images/termlogo-dark.png new file mode 100644 index 0000000..321dd4c Binary files /dev/null and b/assets/media/images/termlogo-dark.png differ diff --git a/assets/media/images/termlogo-lite.png b/assets/media/images/termlogo-lite.png new file mode 100644 index 0000000..321dd4c Binary files /dev/null and b/assets/media/images/termlogo-lite.png differ diff --git a/shutdown.mp3 b/assets/media/music/shutdown.mp3 similarity index 100% rename from shutdown.mp3 rename to assets/media/music/shutdown.mp3 diff --git a/startup.mp3 b/assets/media/music/startup.mp3 similarity index 100% rename from startup.mp3 rename to assets/media/music/startup.mp3 diff --git a/background.png b/background.png deleted file mode 100644 index 546994a..0000000 Binary files a/background.png and /dev/null differ diff --git a/error.ico b/error.ico deleted file mode 100644 index a9c1b60..0000000 Binary files a/error.ico and /dev/null differ diff --git a/enabled_widgets b/etc/enabled_widgets old mode 100755 new mode 100644 similarity index 100% rename from enabled_widgets rename to etc/enabled_widgets diff --git a/favicon_old.ico b/favicon_old.ico deleted file mode 100644 index 0af508d..0000000 Binary files a/favicon_old.ico and /dev/null differ diff --git a/index.php b/index.php index 71d1ec9..e23b241 100644 --- a/index.php +++ b/index.php @@ -2,7 +2,7 @@ - + DremJS @@ -97,8 +97,18 @@ text-align: center; float: left; margin-left: 5px; - margin-top: 2px; + padding: 2px; + border-radius: 6px; + //border: 2px solid #FFFFFF; } + .taskbarAppOpen { + border: 2px solid #FFFFFF; + //border-style: solid; + //border-color: white; + //border-width: 2px; + //background-color: white; + //border: 2px solid #FFFFFF; + } .startbtn { background-color: transparent; color: black; @@ -170,7 +180,7 @@
- +

About DremJS

How to Install Applications

 @@ -183,7 +193,7 @@

Server Status

Widgets Settings
-

Shutdown DremJS

 +

Shutdown DremJS
@@ -193,14 +203,14 @@
|
-
+
- - + + - -
- -
-
-
-
- - - - - -
- - - - - - - - -
- - - - - - - - - - - - - - diff --git a/termlogo-dark.png b/termlogo-dark.png deleted file mode 100644 index 4fc5f25..0000000 Binary files a/termlogo-dark.png and /dev/null differ diff --git a/termlogo-lite.png b/termlogo-lite.png deleted file mode 100644 index d047c45..0000000 Binary files a/termlogo-lite.png and /dev/null differ diff --git a/termlogo_old.png b/termlogo_old.png deleted file mode 100644 index 7c00315..0000000 Binary files a/termlogo_old.png and /dev/null differ