nis auth added, login/logout link added to templates

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2462 ce84e21b-d406-0410-9b95-82705330c041

17 files changed, 25 insertions, 2 deletions

diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html b/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html
index f1f90939e..bc3e7f447 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html
@@ -9,6 +9,7 @@
 
 {% block sidebar %}
 {% include "navbar" %}
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html
index 1db012852..5d5a31b95 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html
@@ -14,6 +14,7 @@
    <li><a href="/hostbase/{{ host.id }}/edit/" class="sidebar">edit host info</a></li>
    <li><a href="edit/" class="sidebar">edit dns info</a></li>
 </ul>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
index 1d6245e81..0385daa86 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html
@@ -14,6 +14,7 @@
    <li><a href="/hostbase/{{ host.id }}/edit/" class="sidebar">edit host info</a></li>
    <li><a href="edit/" class="sidebar">edit dns info</a></li>
 </ul>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
index 0785b64e8..49e054e8a 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html
@@ -14,6 +14,7 @@
 <li><a href="/hostbase/{{ host.id }}/dns/" class="sidebar">detailed dns info</a></li>
 <li><a href="/hostbase/{{ host.id }}/dns/edit/" class="sidebar">edit dns info</a></li>
 </ul>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html b/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html
index d321c529f..724bf9c34 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html
@@ -9,6 +9,7 @@
 
 {% block sidebar %}
 {% include "navbar" %}
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
index 088befe88..2f557cf73 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/host.html
@@ -14,6 +14,7 @@
    <li><a href="edit/" class="sidebar">edit host info</a></li>
    <li><a href="dns/edit/" class="sidebar">edit dns info</a></li>
 </ul>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/login.html b/src/lib/Server/Hostbase/hostbase/webtemplates/login.html
index 5a5650d22..e46ccc086 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/login.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/login.html
@@ -21,7 +21,11 @@
   <input name="password" type="password">
   <br />
   <input type="submit" value="Login">
+  {% if next %}
   <input type="hidden" name="next" value="{{ next }}" />
+  {% else %}
+  <input type="hidden" name="next" value="/hostbase/" />
+  {% endif %}
 
   </form>
   {% endif %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logout b/src/lib/Server/Hostbase/hostbase/webtemplates/logout
new file mode 100644
index 000000000..9fa46236f
--- /dev/null
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/logout
@@ -0,0 +1,5 @@
+{% if logged_in %}
+<p> <a href="/logout/" class="sidebar">logout</a>
+{% else %}
+<p> <a href="/login/" class="sidebar">login</a>
+{% endif %}
\ No newline at end of file
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar b/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
index 32ef99177..6efcee7a1 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/navbar
@@ -1,4 +1,4 @@
 <a href="/hostbase/" class="sidebar">new search</a><br>
 <a href="/hostbase/new" class="sidebar">add a new host</a><br>
-<a href="/hostbase/zones" class="sidebar">zone file information</a>
+<a href="/hostbase/zones" class="sidebar">zone file information</a><br>
 
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
index bcec42404..c965d5af4 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/new.html
@@ -9,6 +9,7 @@
 
 {% block sidebar %}
 <a href="/hostbase/" class="sidebar">search hostbase</a>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html
index 19c73b4f9..6dfe5aa18 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html
@@ -14,6 +14,7 @@
    <li><a href="edit/" class="sidebar">edit host info</a></li>
    <li><a href="dns/edit/" class="sidebar">edit dns info</a></li>
 </ul>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
index 584453f98..43cb78f67 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/results.html
@@ -9,6 +9,7 @@
 
 {% block sidebar %}
 {% include "navbar" %}
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
index 31f9d5184..1c869f0d7 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/search.html
@@ -10,7 +10,8 @@
 
 {% block sidebar %}
 <a href="/hostbase/new" class="sidebar">add a new host</a><br>
-<a href="/hostbase/zones" class="sidebar">zone file information</a>
+<a href="/hostbase/zones" class="sidebar">zone file information</a><br>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
index c86268614..d1cf08f17 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html
@@ -14,6 +14,7 @@
 <li><a href="/hostbase/zones/{{ zone.id }}/" class="sidebar">view zone</a><br>
 </li>
 </ul>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
index 12ea3e484..b3d12f9f8 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html
@@ -10,6 +10,7 @@
 
 {% block sidebar %}
 {% include "navbar" %}
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
index dcf9a3431..b8808f8a8 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html
@@ -10,6 +10,7 @@
 
 {% block sidebar %}
 {% include "navbar" %}
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
index 712ec98bc..e4a3a3fde 100644
--- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
+++ b/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html
@@ -14,6 +14,7 @@
 <li><a href="/hostbase/zones/{{ zone.id }}/edit/" class="sidebar">edit zone</a><br>
 </li>
 </ul>
+{% include "logout" %}
 {% endblock %}
 
 {% block content %}