diff --git a/templates/Sparkle/assets/img/icons/delete_20.png b/templates/Sparkle/assets/img/icons/delete_20.png new file mode 100644 index 00000000..940bee43 Binary files /dev/null and b/templates/Sparkle/assets/img/icons/delete_20.png differ diff --git a/templates/Sparkle/assets/img/icons/edit_20.png b/templates/Sparkle/assets/img/icons/edit_20.png new file mode 100644 index 00000000..3016771f Binary files /dev/null and b/templates/Sparkle/assets/img/icons/edit_20.png differ diff --git a/templates/Sparkle/assets/img/icons/file_20.png b/templates/Sparkle/assets/img/icons/file_20.png new file mode 100644 index 00000000..902dd1a3 Binary files /dev/null and b/templates/Sparkle/assets/img/icons/file_20.png differ diff --git a/templates/Sparkle/assets/img/icons/folder_20.png b/templates/Sparkle/assets/img/icons/folder_20.png new file mode 100644 index 00000000..56e194d0 Binary files /dev/null and b/templates/Sparkle/assets/img/icons/folder_20.png differ diff --git a/templates/Sparkle/assets/img/icons/parent_20.png b/templates/Sparkle/assets/img/icons/parent_20.png new file mode 100644 index 00000000..21bf554d Binary files /dev/null and b/templates/Sparkle/assets/img/icons/parent_20.png differ diff --git a/templates/Sparkle/assets/img/icons/rename_20.png b/templates/Sparkle/assets/img/icons/rename_20.png new file mode 100644 index 00000000..5c17d0b0 Binary files /dev/null and b/templates/Sparkle/assets/img/icons/rename_20.png differ diff --git a/templates/Sparkle/index.tpl b/templates/Sparkle/index.tpl index 88d3fac4..b3f4a79a 100644 --- a/templates/Sparkle/index.tpl +++ b/templates/Sparkle/index.tpl @@ -18,9 +18,9 @@ {$title}Froxlor Server Management Panel @@ -33,7 +33,9 @@ Froxlor Server Management Panel - + {/if} {if $loggedin} diff --git a/templates/Sparkle/webftp/webftp_edit.tpl b/templates/Sparkle/webftp/webftp_edit.tpl index c3edd9b1..7b83e4aa 100644 --- a/templates/Sparkle/webftp/webftp_edit.tpl +++ b/templates/Sparkle/webftp/webftp_edit.tpl @@ -1,33 +1,33 @@ -
-
-

-   - {t}Editing{/t}: {$currentDir}/{$file} ({$mode}) -

-
- {if isset($successmessage)} -
-
{t}Success{/t}
-
{$successmessage}
-
- {/if} - {if isset($errormessage)} -
-
{t}Error{/t}
-
{$errormessage}
-
- {/if} -
-
- - - - - - -
- - -
-
-
+
+
+

+   + {t}Editing{/t}: {$currentDir}/{$file} ({$mode}) +

+
+ {if isset($successmessage)} +
+
{t}Success{/t}
+
{$successmessage}
+
+ {/if} + {if isset($errormessage)} +
+
{t}Error{/t}
+
{$errormessage}
+
+ {/if} +
+
+ + + + + + +
+ + +
+
+
diff --git a/templates/Sparkle/webftp/webftp_edit_new.tpl b/templates/Sparkle/webftp/webftp_edit_new.tpl index 6673144d..0cb1e7b1 100644 --- a/templates/Sparkle/webftp/webftp_edit_new.tpl +++ b/templates/Sparkle/webftp/webftp_edit_new.tpl @@ -1,34 +1,34 @@ -
-
-

-   - {t}Creating a file in{/t}: {$currentDir} ({$mode}) -

-
- {if isset($successmessage)} -
-
{t}Success{/t}
-
{$successmessage}
-
- {/if} - {if isset($errormessage)} -
-
{t}Error{/t}
-
{$errormessage}
-
- {/if} -
-
- - - - - -
- {t}Filename{/t}: - - - -
-
-
+
+
+

+   + {t}Creating a file in{/t}: {$currentDir} ({$mode}) +

+
+ {if isset($successmessage)} +
+
{t}Success{/t}
+
{$successmessage}
+
+ {/if} + {if isset($errormessage)} +
+
{t}Error{/t}
+
{$errormessage}
+
+ {/if} +
+
+ + + + + +
+ {t}Filename{/t}: + + + +
+
+
diff --git a/templates/Sparkle/webftp/webftp_main.tpl b/templates/Sparkle/webftp/webftp_main.tpl index dbd36c36..5582f6b3 100644 --- a/templates/Sparkle/webftp/webftp_main.tpl +++ b/templates/Sparkle/webftp/webftp_main.tpl @@ -1,43 +1,43 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - {$output_dir} - {$output_link} - {$output_file} - - - - - - -
  {t}Filename{/t}{t}Size{/t}{t}Date{/t}{t}Permissions{/t}{t}User{/t}{t}Group{/t}{t}Options{/t}
  - - - .. -
- {t}Files{/t}: {$countArray.file}; {t}Complete filesize{/t}: {$countArray.filesize}; {t}Symlinks{/t}: {$countArray.link}; {t}Directories{/t}: {$countArray.dir}; {t}Complete directorysize{/t}: {$countArray.dirsize} -
-
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + {$output_dir} + {$output_link} + {$output_file} + + + + + + +
  {t}Filename{/t}{t}Size{/t}{t}Date{/t}{t}Permissions{/t}{t}User{/t}{t}Group{/t}{t}Options{/t}
  + + + .. +
+ {t}Files{/t}: {$countArray.file}; {t}Complete filesize{/t}: {$countArray.filesize}; {t}Symlinks{/t}: {$countArray.link}; {t}Directories{/t}: {$countArray.dir}; {t}Complete directorysize{/t}: {$countArray.dirsize} +
+
diff --git a/templates/Sparkle/webftp/webftp_main_additional.tpl b/templates/Sparkle/webftp/webftp_main_additional.tpl index 3a247f7f..3176f8a0 100644 --- a/templates/Sparkle/webftp/webftp_main_additional.tpl +++ b/templates/Sparkle/webftp/webftp_main_additional.tpl @@ -1,80 +1,85 @@ -
-
-

{t}Basic operations{/t}

- - - - - - - - - - -
- - - - - - -
-
- - - - - -
-
-
- - - - - -
-
-
-
-

{t}Upload files{/t}

-
- - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
-
-
-
-
+
+
+ + + + + + + + + + + + + +
{t}Basic operations{/t}
+
+ + + + +
+
+
+ + + + + +
+
+
+ + + + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
{t}Upload files{/t}
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
diff --git a/templates/Sparkle/webftp/webftp_main_dir_row.tpl b/templates/Sparkle/webftp/webftp_main_dir_row.tpl index 4dcf10b7..2b289524 100644 --- a/templates/Sparkle/webftp/webftp_main_dir_row.tpl +++ b/templates/Sparkle/webftp/webftp_main_dir_row.tpl @@ -1,14 +1,18 @@ - - - - {$myDir.name} - {$myDir.size} - {$myDir.date} - {$myDir.perms} - {$myDir.user} - {$myDir.group} - {t}Delete{/t} - {t}Rename{/t} -   -   - + + + + {$myDir.name} + {$myDir.size} + {$myDir.date} + {$myDir.perms} + {$myDir.user} + {$myDir.group} + + + {t}Delete{/t} +   + + {t}Rename{/t} + + + diff --git a/templates/Sparkle/webftp/webftp_main_file_row.tpl b/templates/Sparkle/webftp/webftp_main_file_row.tpl index 07e03452..4972787c 100644 --- a/templates/Sparkle/webftp/webftp_main_file_row.tpl +++ b/templates/Sparkle/webftp/webftp_main_file_row.tpl @@ -1,14 +1,23 @@ - - - - {$myDir.name} - {$myDir.size} - {$myDir.date} - {$myDir.perms} - {$myDir.user} - {$myDir.group} - {t}Delete{/t} - {t}Rename{/t} - {if $editable}{t}Edit{/t}{/if} -   + + + + {$myDir.name} + {$myDir.size} + {$myDir.date} + {$myDir.perms} + {$myDir.user} + {$myDir.group} + + + {t}Delete{/t} +   + + {t}Rename{/t} +   + {if $editable} + + {t}Edit{/t} + + {/if} + \ No newline at end of file diff --git a/templates/Sparkle/webftp/webftp_main_header.tpl b/templates/Sparkle/webftp/webftp_main_header.tpl index 6b726d60..eb680e10 100644 --- a/templates/Sparkle/webftp/webftp_main_header.tpl +++ b/templates/Sparkle/webftp/webftp_main_header.tpl @@ -1,19 +1,19 @@ -
-
-

-   - {$connected_to} ({$mode}) -

-
- {if isset($successmessage)} -
-
{t}Success{/t}
-
{$successmessage|escape:'htmlall'|nl2br}
-
- {/if} - {if isset($errormessage)} -
-
{t}Error{/t}
-
{$errormessage|escape:'htmlall'|nl2br}
-
- {/if} +
+
+

+   + {$connected_to} ({$mode}) +

+
+ {if isset($successmessage)} +
+
{t}Success{/t}
+
{$successmessage|escape:'htmlall'|nl2br}
+
+ {/if} + {if isset($errormessage)} +
+
{t}Error{/t}
+
{$errormessage|escape:'htmlall'|nl2br}
+
+ {/if} diff --git a/templates/Sparkle/webftp/webftp_main_link_row.tpl b/templates/Sparkle/webftp/webftp_main_link_row.tpl index 1e6ded93..2e004c37 100644 --- a/templates/Sparkle/webftp/webftp_main_link_row.tpl +++ b/templates/Sparkle/webftp/webftp_main_link_row.tpl @@ -1,13 +1,19 @@ - - - - {$myDir.name} - {$myDir.size} - {$myDir.date} - {$myDir.perms} - {$myDir.user} - {$myDir.group} - {t}Delete{/t} - {t}Rename{/t} - {t}Symbolic link to{/t}: {$myDir.target}  + + + + {$myDir.name} + {$myDir.size} + {$myDir.date} + {$myDir.perms} + {$myDir.user} + {$myDir.group} + + + {t}Delete{/t} +   + + {t}Rename{/t} +
+ {t}Symbolic link to{/t}: {$myDir.target} + \ No newline at end of file diff --git a/templates/Sparkle/webftp/webftp_main_multiple.tpl b/templates/Sparkle/webftp/webftp_main_multiple.tpl index eab2bab0..5e17e319 100644 --- a/templates/Sparkle/webftp/webftp_main_multiple.tpl +++ b/templates/Sparkle/webftp/webftp_main_multiple.tpl @@ -1,30 +1,35 @@ - - - - - - - - - - - - - - - - -
{t}Selected file(s){/t}:
- {t}Delete{/t} -
- - {t}Change permission to{/t} -
- - {t}Move to{/t} -
- -
- -
+
+ + + + + + + + + + + + + + + + + + + + +
{t}Selected file(s){/t}:
+ {t}Delete{/t} +
+ + {t}Change permission to{/t} +
+ + {t}Move to{/t} +
+ +
+ +
\ No newline at end of file diff --git a/templates/Sparkle/webftp/webftp_main_prompt.tpl b/templates/Sparkle/webftp/webftp_main_prompt.tpl index ee31d538..ffcfdf44 100644 --- a/templates/Sparkle/webftp/webftp_main_prompt.tpl +++ b/templates/Sparkle/webftp/webftp_main_prompt.tpl @@ -1,26 +1,26 @@ - - - - - - - - - - - - -
{$action_text|escape:'htmlall'|nl2br}
-   - - - -
- + + + + + + + + + + + + +
{$action_text|escape:'htmlall'|nl2br}
+   + + + +
+ diff --git a/templates/Sparkle/webftp/webftp_main_rename.tpl b/templates/Sparkle/webftp/webftp_main_rename.tpl index 1eca8558..bd4df797 100644 --- a/templates/Sparkle/webftp/webftp_main_rename.tpl +++ b/templates/Sparkle/webftp/webftp_main_rename.tpl @@ -1,20 +1,19 @@ - - - - - - - - -
- - - - - {$rename_text} - - - - -
-
+ + + + + + + + +
+ + + + + {$rename_text} + + + + +
diff --git a/webftp.php b/webftp.php index f16b461b..f1fc319c 100644 --- a/webftp.php +++ b/webftp.php @@ -70,7 +70,7 @@ if(function_exists("date_default_timezone_set") && function_exists("date_default // Load the database - connection parameters if(!file_exists('./lib/userdata.inc.php')) { - $config_hint = file_get_contents('./templates/Froxlor/misc/configurehint.tpl'); + $config_hint = file_get_contents('./templates/Sparkle/misc/configurehint.tpl'); die($config_hint); } @@ -83,7 +83,7 @@ require ('./lib/userdata.inc.php'); if(!isset($sql) || !is_array($sql)) { - $config_hint = file_get_contents('./templates/Froxlor/misc/configurehint.tpl'); + $config_hint = file_get_contents('./templates/Sparkle/misc/configurehint.tpl'); die($config_hint); } @@ -114,7 +114,7 @@ else } */ // Until we have other themes: enforce the Froxlor - layout -$settings['panel']['default_theme'] = 'Froxlor'; +$settings['panel']['default_theme'] = 'Sparkle'; // Initialize Smarty include('./lib/classes/Smarty/Smarty.class.php');