Sparkle as WebFTP default, fixes for WebFTP-Templates

templates/Sparkle/index.tpl

@@ -33,7 +33,9 @@
 	<img src="{$header_logo}" alt="Froxlor Server Management Panel" />
 </header>
 
-<nav>{$navigation}</nav>
+<nav><div class="menuelement bradiusodd">
+	<h4>Froxlor WebFTP</h4>
+</div>{$navigation}</nav>
 {/if}
 
 {if $loggedin}

templates/Sparkle/webftp/webftp_main.tpl

@@ -1,9 +1,10 @@
+		<section class="dboarditemfull bradiusodd">
 		<form name="putmForm" method="POST" action="webftp.php">
 			<input type="hidden" name="op" value="delete"/>
 			<input type="hidden" name="action" value="multiple" />
 			<input type="hidden" name="currentDir" value="{$currentDir}" />
 			<input type="hidden" name="mode" value="{$mode}" />
-			<table class="bradius">
+			<table class="bradiusodd">
 				<thead>
 					<tr>
 						<th>&nbsp;</th>
@@ -14,14 +15,14 @@
 						<th>{t}Permissions{/t}</th>
 						<th>{t}User{/t}</th>
 						<th>{t}Group{/t}</th>
-						<th colspan="4">{t}Options{/t}</th>
+						<th>{t}Options{/t}</th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
 						<td>&nbsp;</td>
 						<td>
-							<a href="webftp.php?action=cd&amp;file=..&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/parent.gif" height="20" width="20" align="top" border="0"></a>
+							<a href="webftp.php?action=cd&amp;file=..&amp;currentDir={$currentDir}"><img src="templates/{$theme}/assets/img/icons/parent_20.png" height="20" width="20" align="top" border="0"></a>
 						</td>
 						<td align="left" colspan="10">
 							<a href="webftp.php?action=cd&amp;file=..&amp;currentDir={$currentDir}">..</a>
@@ -33,11 +34,10 @@
 				</tbody>
 				<tfoot>
 					<tr>
-						<td colspan="12">
+						<td colspan="10">
 							{t}Files{/t}: <strong>{$countArray.file}</strong>; {t}Complete filesize{/t}: <strong>{$countArray.filesize}</strong>; {t}Symlinks{/t}: <strong>{$countArray.link}</strong>; {t}Directories{/t}: <strong>{$countArray.dir}</strong>; {t}Complete directorysize{/t}: <strong>{$countArray.dirsize}</strong>
 						</td>
 					</tr>
 				</tfoot>
 			</table>
-			<br />
-			<hr />
+		</section>

templates/Sparkle/webftp/webftp_main_additional.tpl

@@ -1,7 +1,9 @@
 	<article>
-		<section class="dboarditem bradius">
-			<h2>{t}Basic operations{/t}</h2>
+		<section class="dboarditem bradiusodd">
 			<table>
+				<thead>
+					<tr><th>{t}Basic operations{/t}</th></tr>
+				</thead>
 				<tr>
 					<td>
 						<form name="cdDirect" method="POST" action="webftp.php">
@@ -36,13 +38,17 @@
 				</tr>
 			</table>
 		</section>
-		<section class="dboarditem bradius">
-			<h2>{t}Upload files{/t}</h2>
+		<section class="dboarditem bradiusodd">
 			<form name="putForm" enctype="multipart/form-data" method="POST" action="webftp.php">
 				<input type="hidden" name="action" value="put" />
 				<input type="hidden" name="currentDir" value="{$currentDir}" />
 				<input type="hidden" name="mode" value="{$mode}" />
 				<table>
+					<thead>
+						<tr>
+							<th>{t}Upload files{/t}</th>
+						</tr>
+					</thead>
 					<tr>
 						<td valign="top">
 							<input type="file" name="file1" />
@@ -69,7 +75,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td valign="top">
+						<td valign="top" align="right">
 							<input name="submit2" type="submit" style="width: 150;" value="{t}Upload file(s){/t}">
 						</td>
 					</tr>
@@ -77,4 +83,3 @@
 			</form>
 		</section>
 		<br />
-		<section class="dboarditemfull bradius">

templates/Sparkle/webftp/webftp_main_dir_row.tpl

@@ -1,14 +1,18 @@
 <tr {$checked_color}>
 	<td><input type="checkbox" name="file[]" value="{$myDir.name}" {$checked} /></td>
-	<td><a href="webftp.php?action=cd&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/folder.gif" align="top" border="0" /></a></td>
+	<td><a href="webftp.php?action=cd&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="templates/{$theme}/assets/img/icons/folder_20.png" align="top" border="0" /></a></td>
 	<td><a href="webftp.php?action=cd&amp;file={$myDir.name}&amp;currentDir={$currentDir}">{$myDir.name}</a></td>
 	<td align=right>{$myDir.size}</td>
 	<td>{$myDir.date}</td>
 	<td>{$myDir.perms}</td>
 	<td>{$myDir.user}</td>
 	<td>{$myDir.group}</td>
-	<td><a href="webftp.php?action=deldir&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/delete.png" border="0" alt="{t}Delete{/t}" /></a></td>
-	<td><a href="webftp.php?action=rename&amp;op=show&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/rename.gif" border="0" alt="{t}Rename{/t}" /></a></td>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
+	<td>
+		<a href="webftp.php?action=deldir&amp;file={$myDir.name}&amp;currentDir={$currentDir}">
+			<img src="templates/{$theme}/assets/img/icons/delete_20.png" border="0" alt="{t}Delete{/t}" />
+		</a>&nbsp;
+		<a href="webftp.php?action=rename&amp;op=show&amp;file={$myDir.name}&amp;currentDir={$currentDir}">
+			<img src="templates/{$theme}/assets/img/icons/rename_20.png" border="0" alt="{t}Rename{/t}" />
+		</a>
+	</td>
 </tr>

templates/Sparkle/webftp/webftp_main_file_row.tpl

@@ -1,14 +1,23 @@
 <tr {$checked_color}>
 	<td><input type="checkbox" name="file[]" value="{$myDir.name}" {$checked} /></td>
-	<td><a href="webftp.php?action=get&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/file.gif" align="top" border="0" /></a></td>
+	<td><a href="webftp.php?action=get&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="templates/{$theme}/assets/img/icons/file_20.png" align="top" border="0" /></a></td>
 	<td><a href="webftp.php?action=get&amp;file={$myDir.name}&amp;currentDir={$currentDir}">{$myDir.name}</a></td>
 	<td align=right>{$myDir.size}</td>
 	<td>{$myDir.date}</td>
 	<td>{$myDir.perms}</td>
 	<td>{$myDir.user}</td>
 	<td>{$myDir.group}</td>
-	<td><a href="webftp.php?action=delfile&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/delete.png" border="0" alt="{t}Delete{/t}"></a></td>
-	<td><a href="webftp.php?action=rename&amp;op=show&amp;file={$myDir.name}&currentDir={$currentDir}"><img src="{$image_folder}/icons/rename.gif" border="0" alt="{t}Rename{/t}"></a></td>
-	<td>{if $editable}<a href="webftp.php?action=edit&amp;op=open&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/edit.png" border="0" alt="{t}Edit{/t}"></a>{/if}</td>
-	<td>&nbsp;</td>
+	<td>
+		<a href="webftp.php?action=delfile&amp;file={$myDir.name}&amp;currentDir={$currentDir}">
+			<img src="templates/{$theme}/assets/img/icons/delete_20.png" border="0" alt="{t}Delete{/t}">
+		</a>&nbsp;
+		<a href="webftp.php?action=rename&amp;op=show&amp;file={$myDir.name}&currentDir={$currentDir}">
+			<img src="templates/{$theme}/assets/img/icons/rename_20.png" border="0" alt="{t}Rename{/t}">
+		</a>&nbsp;
+		{if $editable}
+		<a href="webftp.php?action=edit&amp;op=open&amp;file={$myDir.name}&amp;currentDir={$currentDir}">
+			<img src="templates/{$theme}/assets/img/icons/edit_20.png" border="0" alt="{t}Edit{/t}">
+		</a>
+		{/if}
+	</td>
 </tr>

templates/Sparkle/webftp/webftp_main_header.tpl

@@ -1,7 +1,7 @@
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/group_edit.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/group_edit_big.png" alt="" />&nbsp;
 				{$connected_to} ({$mode})
 			</h2>
 		</header>

templates/Sparkle/webftp/webftp_main_link_row.tpl

@@ -1,13 +1,19 @@
 <tr {$checked_color}>
 	<td><input type="checkbox" name="file[]" value="{$myDir.name}" {$checked} /></td>
-	<td><a href="webftp.php?action=cd&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/link.gif" align="top" border="0" /></a></td>
+	<td><a href="webftp.php?action=cd&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="templates/{$theme}/assets/img/icons/link_20.png" align="top" border="0" /></a></td>
 	<td><a href="webftp.php?action=cd&amp;file={$myDir.name}&amp;currentDir={$currentDir}">{$myDir.name}</a></td>
 	<td align=right>{$myDir.size}</td>
 	<td>{$myDir.date}</td>
 	<td>{$myDir.perms}</td>
 	<td>{$myDir.user}</td>
 	<td>{$myDir.group}</td>
-	<td><a href="webftp.php?action=deldir&amp;file={$myDir.name}&amp;currentDir={$currentDir}"><img src="{$image_folder}/icons/delete.png" border="0" alt="{t}Delete{/t}"></a></td>
-	<td><a href="webftp.php?action=rename&amp;op=show&amp;file={$myDir.name}&currentDir={$currentDir}"><img src="{$image_folder}/icons/rename.gif" border="0" alt="{t}Rename{/t}"></a></td>
-	<td colspan="2">{t}Symbolic link to{/t}: {$myDir.target}&nbsp;</td>
+	<td>
+		<a href="webftp.php?action=deldir&amp;file={$myDir.name}&amp;currentDir={$currentDir}">
+			<img src="templates/{$theme}/assets/img/icons/delete_20.png" border="0" alt="{t}Delete{/t}">
+		</a>&nbsp;
+		<a href="webftp.php?action=rename&amp;op=show&amp;file={$myDir.name}&currentDir={$currentDir}">
+			<img src="templates/{$theme}/assets/img/icons/rename_20.png" border="0" alt="{t}Rename{/t}">
+		</a><br />
+		<small>{t}Symbolic link to{/t}: {$myDir.target}</small>
+	</td>
 </tr>

templates/Sparkle/webftp/webftp_main_multiple.tpl

@@ -1,7 +1,10 @@
+		<section class="dboarditemfull bradiusodd">
 			<table cellpadding="0" cellspacing="0">
+				<thead>
 				<tr>
-					<td colspan="10" align="left">{t}Selected file(s){/t}:</td>
+					<th colspan="10" align="left">{t}Selected file(s){/t}:</th>
 				</tr>
+				</thead>
 				<tr>
 					<td colspan="10" align="left">
 						<input type="radio" name="op" value="delete" />{t}Delete{/t}
@@ -10,20 +13,22 @@
 				<tr>
 					<td colspan="10" align="left">
 						<input name="op" type="radio" value="chmod" />
-						<input type="text" name="chmod" value="755" maxlength="3" size="5" />{t}Change permission to{/t}
+						{t}Change permission to{/t}<input type="text" name="chmod" value="755" maxlength="3" size="5" />
 					</td>
 				</tr>
 				<tr>
 					<td colspan="10" align="left">
 						<input name="op" type="radio" value="move" checked="checked" />
-						<input name="move_to" type="text" id="move_to" value="{$currentDir}" size="30" />{t}Move to{/t}
+						{t}Move to{/t}<input name="move_to" type="text" id="move_to" value="{$currentDir}" size="30" />
 					</td>
 				</tr>
+				<tfoot>
 				<tr>
 					<td colspan="10" align="left">
 						<input type="submit" name="submit" value="{t}Do it{/t}" />
 					</td>
 				</tr>
+				</tfoot>
 			</table>
 		</form>
 	</section>

templates/Sparkle/webftp/webftp_main_prompt.tpl

@@ -6,7 +6,7 @@ font-weight: bold;
 }
 -->
 </style>
-<table cellpadding="0" cellspacing="0">
+<table cellpadding="0" cellspacing="0" class="bradius">
 	<tr>
 		<td colspan="10" align="left"><span class="Stil1">{$action_text|escape:'htmlall'|nl2br}</span></td>
 	</tr>

templates/Sparkle/webftp/webftp_main_rename.tpl

@@ -1,4 +1,4 @@
-<table border="0" cellspacing="2" cellpadding="2">
+<table border="0" cellspacing="2" cellpadding="2" class="bradius">
 	<form name="rename" method="post" action="webftp.php">
 		<tr>
 			<td>
@@ -17,4 +17,3 @@
 		</tr>
 	</form>
 </table>
-<hr />

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');