From d6fd5fb10974c3ffcd678a5a536df32aa8698367 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Wed, 27 Jan 2016 19:46:10 -0500
Subject: [PATCH 1/3] Added highlight effect when removing an item from a list
 - Uses jQuery UI

---
 footer.html |  1 +
 list.php    | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/footer.html b/footer.html
index baf263be..c63e72f2 100644
--- a/footer.html
+++ b/footer.html
@@ -11,6 +11,7 @@
 </div>
 <!-- ./wrapper -->
 <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
+<script src="https://code.jquery.com/ui/1.11.3/jquery-ui.min.js"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" type="text/javascript"></script>
 <script src="./js/app.min.js" type="text/javascript"></script>
 
diff --git a/list.php b/list.php
index 80a3b9d4..5b32fa76 100644
--- a/list.php
+++ b/list.php
@@ -31,7 +31,7 @@ function getFullName() {
     Adding to the <?php getFullName(); ?>...
 </div>
 <div id="alSuccess" class="alert alert-success" role="alert" hidden="true">
-    Success! It will probably take 2-10 minutes until the changes take effect. The list will refresh.
+    Success! The list will refresh.
 </div>
 <div id="alFailure" class="alert alert-danger" role="alert" hidden="true">
     Failure! Something went wrong.
@@ -62,10 +62,10 @@ require "footer.html";
                         '<div class="alert alert-info" role="alert">Your <?php getFullName(); ?> is empty!</div>';
                 }
                 else {
-                    data.forEach(function (entry) {
+                    data.forEach(function (entry, index) {
                         list.innerHTML +=
-                            '<li id="' + entry + '" class="list-group-item clearfix">' + entry +
-                            '<button class="btn btn-danger btn-xs pull-right" type="button" onclick="sub(\'' + entry + '\')">' +
+                            '<li id="' + index + '" class="list-group-item clearfix">' + entry +
+                            '<button class="btn btn-danger btn-xs pull-right" type="button" onclick="sub(\'' + index + '\', \'' + entry + '\')">' +
                             '<span class="glyphicon glyphicon-trash"></span></button></li>';
                     })
                 }
@@ -98,13 +98,14 @@ require "footer.html";
         });
     }
     
-    function sub(entry) {
+    function sub(index, entry) {
+        $("#"+index).hide("highlight");
         $.ajax({
             url: "php/sub.php",
             method: "get",
             data: {"domain":entry, "list":"<?php echo $list ?>"},
             success: function(response) {
-                document.getElementById("list").removeChild(document.getElementById(entry));
+                document.getElementById("list").removeChild(document.getElementById(index));
             },
             error: function(jqXHR, exception) {
                 alert("Failed to remove the domain!");

From e19b584e297ef77deea59bc17a6478ff9f22d557 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sat, 30 Jan 2016 11:26:18 -0500
Subject: [PATCH 2/3] Dynamic versions in footer - Shows Pi-hole and Web
 Interface versions

---
 footer.html => footer.php | 3 ++-
 index.php                 | 2 +-
 list.php                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename footer.html => footer.php (76%)

diff --git a/footer.html b/footer.php
similarity index 76%
rename from footer.html
rename to footer.php
index c63e72f2..0070e614 100644
--- a/footer.html
+++ b/footer.php
@@ -4,7 +4,8 @@
     <!-- /.content-wrapper -->
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Pi-hole Version</b> 2.2
+            <b>Pi-hole Version </b> <?php echo exec("cd /etc/.pihole/ && git describe --tags --abbrev=0"); ?>
+            <b>Web Interface Version </b> <?php echo exec("cd /var/www/html/admin/ && git describe --tags --abbrev=0"); ?>
         </div>
         <i class="fa fa-github"></i> <strong><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=3J2L3Z4DHW9UY">Donate</a></strong> if you found this useful.
     </footer>
diff --git a/index.php b/index.php
index f603c986..909961ab 100644
--- a/index.php
+++ b/index.php
@@ -93,7 +93,7 @@
 </div><!-- /.box -->
 
 <?php
-    require "footer.html";
+    require "footer.php";
 ?>
 
 <script src="https://cdn.datatables.net/1.10.10/js/jquery.dataTables.min.js" type="text/javascript"></script>
diff --git a/list.php b/list.php
index 5b32fa76..ecc38a85 100644
--- a/list.php
+++ b/list.php
@@ -41,7 +41,7 @@ function getFullName() {
 <ul class="list-group" id="list"></ul>
 
 <?php
-require "footer.html";
+require "footer.php";
 ?>
 
 <script>

From 3627421a66bcd78074f5638cbb59e478ca760c2a Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Fri, 5 Feb 2016 12:21:16 -0500
Subject: [PATCH 3/3] Moved contributor info

---
 CONTRIBUTING.md |  9 +++++++++
 README.md       | 13 -------------
 2 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..64e702f8
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+This is a basic checklist for now, We will update it in the future.
+
+* Fork the repo and create your new branch based on the `devel` (development) branch.
+* Use 4 spaces instead of tabs
+* Commit Unix line endings
+* If you want, try to keep to the theme of black holes/gravity. This can add some fun to your submission.
+* Submit Pull Requests to the development branch only.
+* Before Submitting your Pull Request, merge `devel` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
+* Be patient. We will review all submitted pull requests, but our focus is on stability.. please don't be offended if we reject your PR, or it appears we're doing nothing with it! We'll get around to it..
diff --git a/README.md b/README.md
index 19a091ea..7f782af9 100644
--- a/README.md
+++ b/README.md
@@ -19,16 +19,3 @@ A basic read-only API can be accessed at `/admin/api.php`. It returns the follow
 	"ads_percentage_today": 80.892423238348
 }
 ```
-
-## Contributing
-If you would like to add to the project, please make sure to follow these guidelines:
-
-1. Branch off of ```devel``` into your own feature branch (ex. ```feature```).
-2. When you are finished, make a pull request to merge your ```feature``` branch into ```devel```.
-
-Keep these things in mind:
-
-* Use 4 spaces instead of tabs
-* Commit Unix line endings
-* If you want, try to keep to the theme of black holes/gravity. This can add some fun to your submission.
-