From 08f3b8c3930ecc009f3473d9cae9e26ad17fb23d Mon Sep 17 00:00:00 2001
From: root
Date: Thu, 27 Nov 2014 17:59:00 +0100
Subject: Small improvements.

---
 header/index.php                 | 4 ++--
 linkshorter/index.php            | 2 ++
 linkshorter/view/templ-head.php  | 1 -
 linkshorter/view/templ-index.php | 8 ++++----
 tools/style.css                  | 4 ++++
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/header/index.php b/header/index.php
index b57643d..056cde5 100644
--- a/header/index.php
+++ b/header/index.php
@@ -161,7 +161,7 @@ Host: "<u><?php echo strtolower(htmlentities($header_info[2])); ?></u>"</pre></h
 
 <!-- Text input-->
 <div class="form-group">
-  <label class="col-md-4 control-label" for="header[]">(optional)</label>  
+  <label class="col-md-4 control-label grey" for="header[]">(optional)</label>  
   <div class="col-md-4">
   <div class="input-group">
   <input name="header[]" placeholder="Custom request header here." class="form-control input-md" type="text">
@@ -201,7 +201,7 @@ Host: "<u><?php echo strtolower(htmlentities($header_info[2])); ?></u>"</pre></h
 function addInput(divName){
 	var newdiv = document.createElement('div');
 	newdiv.className = newdiv.className + "form-group"
-        newdiv.innerHTML = "<label class='col-md-4 control-label' for='header[]'></label><div class='col-md-4'> <input type='text' name='header[]' placeholder='More header.' class='form-control input-md' ></input></div>";
+        newdiv.innerHTML = "<label class='col-md-4 control-label' for='header[]'></label><div class='col-md-4'> <input type='text' name='header[]' placeholder='Add more header.' class='form-control input-md' ></input></div>";
         document.getElementById(divName).appendChild(newdiv);
 }
 </script>
diff --git a/linkshorter/index.php b/linkshorter/index.php
index 8d05977..3f96ee3 100644
--- a/linkshorter/index.php
+++ b/linkshorter/index.php
@@ -48,6 +48,8 @@ if ( ! isset($_REQUEST['url']) || $_REQUEST['url'] == "" ){
 			_do_output("Failure!", "Your Lifetime doesn't look like a valid number.");
 		}
 		$options["ttl"] = $_REQUEST["ttl"];
+		if ( $options["ttl"] == 0 )
+			$options["ttl"] = "";
 	}
 
 	if ( ! isset($_REQUEST["password"]) || $_REQUEST["password"] == "" )
diff --git a/linkshorter/view/templ-head.php b/linkshorter/view/templ-head.php
index 4dd76d5..fad0fb8 100644
--- a/linkshorter/view/templ-head.php
+++ b/linkshorter/view/templ-head.php
@@ -10,7 +10,6 @@
 	<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
 	<style>
 	<?php echo file_get_contents("../tools/style.css"); ?>
-	.grey { color: #737373;}
 	</style>
 	<link rel='shortcut icon' href='<?php echo __domain_; ?>/tools/favicon.ico' type='image/x-icon'>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/linkshorter/view/templ-index.php b/linkshorter/view/templ-index.php
index 46ff6a8..619e763 100644
--- a/linkshorter/view/templ-index.php
+++ b/linkshorter/view/templ-index.php
@@ -21,13 +21,13 @@
 					</div>
 
 					<div class="form-group">
-						<h4>Options:</h4>
+						<h4>Options:<br>-</h4><span class="grey">Everything below is optional.</span>
 					</div>
 
 					<div class="form-group">
 					  <label class="col-md-4 control-label grey" for="short">Query String</label>  
 					  <div class="col-md-4">
-					  <input id="short" name="short" placeholder="Your own query string here. (optional)" class="form-control input-md" type="text">
+					  <input id="short" name="short" placeholder="Your own query string here." class="form-control input-md" type="text">
 					  </div>
 					</div>
 
@@ -42,8 +42,8 @@
 					<div class="form-group">
 					  <label class="col-md-4 control-label grey" for="ttl">Expires</label>  
 					  <div class="col-md-4">
-					  <input id="ttl" name="ttl" class="form-control input-md" type="number" min="0">
-					  <span class="help-block text-left">Choose how long the shortlink should be valid. (In seconds)</span>
+					  <input id="ttl" name="ttl" class="form-control input-md" type="number" min="0" value="0">
+					  <span class="help-block text-left">Choose how long the shortlink should be valid. (In seconds, 0 = never)</span>
 					  </div>
 					</div>
 
diff --git a/tools/style.css b/tools/style.css
index b5aa321..304eff7 100644
--- a/tools/style.css
+++ b/tools/style.css
@@ -66,3 +66,7 @@ a {
 	text-decoration: underline;
 	font-weight: bold;
 }
+
+.grey { 
+	color: #737373;
+}
-- 
cgit v1.2.3