From f4e8248d126921603280dffab0e907366391bb72 Mon Sep 17 00:00:00 2001
From: maxbr <maxbr@mi.fu-berlin.de>
Date: Mon, 22 Aug 2016 18:59:47 +0200
Subject: Create Jira issue for new booking

JIRA: RELENG-12

The issue is assigned to the lab owner and to the POD Access Request
Component. The pgp and ssh keys are uploaded to jira as an attachement.

Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
---
 .../templates/account/userprofile_update_form.html |  4 +-
 .../templates/booking/booking_form.html            | 21 ---------
 pharos-dashboard/templates/registration/login.html | 51 ----------------------
 .../templates/registration/registration_form.html  | 30 -------------
 4 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 pharos-dashboard/templates/booking/booking_form.html
 delete mode 100644 pharos-dashboard/templates/registration/login.html
 delete mode 100644 pharos-dashboard/templates/registration/registration_form.html

(limited to 'pharos-dashboard/templates')

diff --git a/pharos-dashboard/templates/account/userprofile_update_form.html b/pharos-dashboard/templates/account/userprofile_update_form.html
index 0a921d5..542ea81 100644
--- a/pharos-dashboard/templates/account/userprofile_update_form.html
+++ b/pharos-dashboard/templates/account/userprofile_update_form.html
@@ -13,12 +13,12 @@
                         </h3>
                     </div>
                     <div class="panel-body">
-                        <form method="post" action="">
+                        <form enctype="multipart/form-data" method="post">
                             {% csrf_token %}
                             {% bootstrap_form form %}
                             {% buttons %}
                                 <button type="submit" class="btn btn btn-success">
-                                    Submit
+                                    Save
                                 </button>
                             {% endbuttons %}
                         </form>
diff --git a/pharos-dashboard/templates/booking/booking_form.html b/pharos-dashboard/templates/booking/booking_form.html
deleted file mode 100644
index f13c4b4..0000000
--- a/pharos-dashboard/templates/booking/booking_form.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% load bootstrap3 %}
-
-
-{% bootstrap_form_errors form type='non_fields' %}
-<form method="post" action="" class="form" id="bookingform">
-    {% csrf_token %}
-
-    <div class='input-group' id='starttimepicker'>
-        {% bootstrap_field form.start addon_after='<span class="glyphicon glyphicon-calendar"></span>' %}
-    </div>
-    <div class='input-group' id='endtimepicker'>
-        {% bootstrap_field form.end addon_after='<span class="glyphicon glyphicon-calendar"></span>' %}
-    </div>
-    {% bootstrap_field form.purpose %}
-
-    {% buttons %}
-        <button type="submit" class="btn btn btn-success">
-            Book
-        </button>
-    {% endbuttons %}
-</form>
\ No newline at end of file
diff --git a/pharos-dashboard/templates/registration/login.html b/pharos-dashboard/templates/registration/login.html
deleted file mode 100644
index 45b9d45..0000000
--- a/pharos-dashboard/templates/registration/login.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends "layout.html" %}
-{% load bootstrap3 %}
-
-{% block basecontent %}
-    <div class="container">
-        <div class="row">
-            <div class="col-md-4 col-md-offset-4">
-                {% if next %}
-                    <div class="alert alert-dismissable alert-info">
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                        {% if user.is_authenticated %}
-                            Your account doesn't have access to this page. To proceed,
-                            please login with an account that has access.
-                        {% else %}
-                            Please login to see this page.
-                        {% endif %}
-                    </div>
-                {% endif %}
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-4 col-md-offset-4">
-                <div class="login-panel panel panel-default">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">
-                            Login
-                        </h3>
-                    </div>
-                    <div class="panel-body">
-                        <form method="post">
-                            {% csrf_token %}
-                            {% bootstrap_form form %}
-                            {% buttons %}
-                                <button type="submit" class="btn btn btn-success">
-                                    Login
-                                </button>
-                                <a href="{% url 'account:registration' %}" class="btn btn-info"
-                                   role="button">Register</a>
-                            {% endbuttons %}
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    {# Assumes you setup the password_reset view in your URLconf #}
-    {# <p><a href="{% url 'password_reset' %}">Lost password?</a></p>#}
-{% endblock basecontent %}
diff --git a/pharos-dashboard/templates/registration/registration_form.html b/pharos-dashboard/templates/registration/registration_form.html
deleted file mode 100644
index 0a921d5..0000000
--- a/pharos-dashboard/templates/registration/registration_form.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "layout.html" %}
-{% load bootstrap3 %}
-
-{% block basecontent %}
-    <div class="container">
-        <div class="row">
-            <div class="col-md-4 col-md-offset-4">
-                {% bootstrap_messages %}
-                <div class="login-panel panel panel-default">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">
-                            {{ title }}
-                        </h3>
-                    </div>
-                    <div class="panel-body">
-                        <form method="post" action="">
-                            {% csrf_token %}
-                            {% bootstrap_form form %}
-                            {% buttons %}
-                                <button type="submit" class="btn btn btn-success">
-                                    Submit
-                                </button>
-                            {% endbuttons %}
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock basecontent %}
-- 
cgit 1.2.3-korg