cleanup

lessamess · Apr 14, 2015 · 015ed2c · 015ed2c
1 parent 0abbc3a
commit 015ed2c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/.htaccess b/.htaccess
@@ -12,7 +12,7 @@ Allow from all
 Deny from env=passreq
 Satisfy any
 
-# This redirects any links that do not work to the file missing.php
+# This redirects any links that do not work to the file fileNotFound.php
 RewriteCond %{SCRIPT_FILENAME} !-f
 RewriteCond %{SCRIPT_FILENAME} !-d
 RewriteRule ^(.*)$ fileNotFound.php/$1

diff --git a/addons/sublime/box.sublime-snippet b/addons/sublime/box.sublime-snippet
@@ -1,5 +1,5 @@
 <snippet>
-    <content><![CDATA[ box("${1}", "${2:info}", "${3:inherit}" , "${4:boxid}" , "${5:dismiss}" )]]></content>
+    <content><![CDATA[ ${1:<?php} box("${2}", "${3:info}", "${4:inherit}" , "${5:boxid}" , "${6:dismiss}" ); ${1:?>} ]]></content>
     <!-- Optional: Tab trigger to activate the snippet -->
     <tabTrigger>box</tabTrigger>
     <!-- Optional: Description to show in the menu -->

diff --git a/core/protostrap.php b/core/protostrap.php
@@ -17,7 +17,6 @@
 include($csd.'/spyc.php');
 include($csd.'/dataParse.php');
 
-
 // Handle request ID
 $reqId = false;
 if (!empty($_POST['id'])) {

diff --git a/fileNotFound.php b/fileNotFound.php
@@ -39,7 +39,7 @@
     <div class="container">
 
 <?php // this includes the footer
-//include('./snippets/header.php');?>
+//include('./snippets/navBarTop.php');?>
         <br>
         <div class="well">
             <h1>End of Prototype</h1>

diff --git a/index.php b/index.php
@@ -31,7 +31,7 @@
 
             <?php
             // this includes the header
-            include('./snippets/header.php');?>
+            include('./snippets/navBarTop.php');?>
 
             <h4 class="text-muted"> <i class="fa fa-level-down fa-rotate-180"></i> Change this in snippets/navBarTop.php </h4>
             <br><br>

diff --git a/snippets/header.php b/snippets/header.php
diff --git a/snippets/navBarTop.php b/snippets/navBarTop.php
@@ -71,7 +71,7 @@
           <ul class="nav navbar-nav navbar-right">
               <li>
 
-                <a href="login.php">Login</a>
+                <a href="testpage.php#login">Sign in</a>
               </li>
           </ul>
           <?php }?>

diff --git a/testpage.php b/testpage.php
@@ -12,7 +12,7 @@
 
 
 ?><!DOCTYPE html>
-<html lang="en">
+<html >
     <head>
         <title><?php echo $application . " - " . $brand ;?></title>
         <?php
@@ -32,6 +32,8 @@
             <div class="row">
                 <div class="col-md-4">
 
+                    <a href="index.php"><i class="fa fa-long-arrow-left"></i> Back to site</a>
+
                     <h3>Testpage</h3>
 
                     <h4>Icons</h4>
@@ -129,6 +131,7 @@
             <br>
             <div class="row">
                 <div class="col-md-12">
+                    <a name="login"></a>
                     <?php include ('./snippets/loginForm.php'); ?>
                 </div>
             </div>