Move client documentation to fron page

Signed-off-by: Florian Pritz <bluewind@xinu.at>

4 files changed, 27 insertions, 47 deletions

diff --git a/application/controllers/file.php b/application/controllers/file.php
index 77e7c0413..7c7b5de2d 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -594,32 +594,6 @@ class File extends MY_Controller {
 		}
 	}
 
-	function client()
-	{
-		$this->data['title'] .= ' - Client';
-
-		if (file_exists(FCPATH.'data/client/latest')) {
-			$this->var->latest_client = trim(file_get_contents(FCPATH.'data/client/latest'));
-			$this->data['client_link'] = base_url().'data/client/fb-'.$this->var->latest_client.'.tar.gz';
-		} else {
-			$this->data['client_link'] = false;
-		}
-
-		if (preg_match('#^https?://(.*?)/.*$#', site_url(), $matches) === 1) {
-			$this->data["domain"] = $matches[1];
-		} else {
-			$this->data["domain"] = "unknown domain";
-		}
-
-		if (!is_cli_client()) {
-			$this->load->view('header', $this->data);
-		}
-		$this->load->view($this->var->view_dir.'/client', $this->data);
-		if (!is_cli_client()) {
-			$this->load->view('footer', $this->data);
-		}
-	}
-
 	function upload_form()
 	{
 		$this->data['title'] .= ' - Upload';
@@ -640,6 +614,13 @@ class File extends MY_Controller {
 			}
 		}
 
+		if (file_exists(FCPATH.'data/client/latest')) {
+			$this->var->latest_client = trim(file_get_contents(FCPATH.'data/client/latest'));
+			$this->data['client_link'] = base_url().'data/client/fb-'.$this->var->latest_client.'.tar.gz';
+		} else {
+			$this->data['client_link'] = false;
+		}
+
 		$this->load->view('header', $this->data);
 		$this->load->view($this->var->view_dir.'/upload_form', $this->data);
 		if (is_cli_client()) {
diff --git a/application/views/file/client.php b/application/views/file/client.php
deleted file mode 100644
index 78a4d6a58..000000000
--- a/application/views/file/client.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1>Client</h1>
-
-<p>
-	Development (git): <?php echo anchor("https://git.server-speed.net/users/flo/fb/"); ?><br />
-	Latest release: <?php echo $client_link ? anchor($client_link) : "unknown"; ?><br />
-	GPG sigs, older versions: <?php echo anchor("https://paste.xinu.at/data/client"); ?>
-</p>
-
-<h2>Linux</h2>
-<p>
-	Arch Linux: pacman -S fb-client<br />
-	Gentoo: Add <a href="https://git.holgersson.xyz/holgersson-overlay/tree/README">this overlay</a> and run <code>emerge -a fb-client</code><br />
-</p>
-
diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index 3d2837bdf..fd4f3feb8 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -88,9 +88,6 @@
 <div class="row">
 	<div class="col-lg-6">
 		<div class="page-header"><h1>Features</h1></div>
-		<p>For shell uploading/pasting and download information for the client go to <a href="<?php echo site_url("file/client"); ?>"><?php echo site_url("file/client"); ?></a></p>
-		<p>You can use the <?php echo anchor("file/upload_history", "history"); ?> to find old uploads.</p>
-
 		<h3>How to link your pastes:</h3>
 		<dl class="dl-horizontal">
 			<dt>/&lt;ID&gt;/</dt><dd>automatically highlight the paste</dd>
@@ -128,5 +125,25 @@
 			<p>If you want an account, ask someone who is already using this service to <a href="<?php echo site_url("user/invite"); ?>">invite</a> you.</p>
 			<p>Invitations are used to control abuse and encourage users to "be nice". They are not intended as a means of exclusivity. In case of abuse reports, involved accounts may be banned and the user who invited them may also be banned. The invitation tree will be followed upwards if necessary.</p>
 		<?php } ?>
+
+		<h3>Clients</h3>
+			<h4>Linux</h4>
+				<p>
+					Development: <?php echo anchor("https://git.server-speed.net/users/flo/fb/"); ?><br />
+					Latest release: <?php echo $client_link ? anchor($client_link) : "unknown"; ?><br />
+					GPG sigs, older versions: <?php echo anchor("https://paste.xinu.at/data/client"); ?>
+				</p>
+
+				<p>
+					Arch Linux: pacman -S fb-client<br />
+					Gentoo: Add <a href="https://git.holgersson.xyz/holgersson-overlay/tree/README">this overlay</a> and run <code>emerge -a fb-client</code><br />
+				</p>
+
+			<h4>Android</h4>
+				<p>
+					Development: <a href="https://github.com/sebastianrakel/fb-client-android">sebastianrakel/fb-client-android @ Github</a><br>
+					Google Playstore: <a href="https://play.google.com/store/apps/details?id=eu.devunit.fb_client">fb-client Android @ Google Play</a><br>
+					F-Droid Store:<a href="https://f-droid.org/repository/browse/?fdid=eu.devunit.fb_client">fb-client Android @ F-Droid</a><br>
+				</p>
 	</div>
 </div>
diff --git a/application/views/file_plaintext/client.php b/application/views/file_plaintext/client.php
deleted file mode 100644
index 4147ae032..000000000
--- a/application/views/file_plaintext/client.php
+++ /dev/null
@@ -1,4 +0,0 @@
-Client:
-Development (git): https://git.server-speed.net/users/flo/fb
-Latest release: <?php echo $client_link."\n"; ?>
-GPG sigs, older versions: https://paste.xinu.at/data/client