diff options
| -rw-r--r-- | budget/forms.py | 1 | ||||
| -rw-r--r-- | budget/models.py | 4 | ||||
| -rw-r--r-- | budget/templates/edit_project.html | 7 | ||||
| -rw-r--r-- | budget/templates/forms.html | 5 | ||||
| -rw-r--r-- | budget/templates/layout.html | 8 | ||||
| -rw-r--r-- | budget/templates/list_bills.html | 8 | ||||
| -rw-r--r-- | budget/web.py | 5 |
7 files changed, 30 insertions, 8 deletions
diff --git a/budget/forms.py b/budget/forms.py index 713bcfb..8db90be 100644 --- a/budget/forms.py +++ b/budget/forms.py @@ -56,7 +56,6 @@ class EditProjectForm(Form): name = TextField(_("Project name"), validators=[Required()]) password = TextField(_("Private code"), validators=[Required()]) contact_email = TextField(_("Email"), validators=[Required(), Email()]) - submit = SubmitField(_("Edit the project")) def save(self): """Create a new project with the information given by this form. diff --git a/budget/models.py b/budget/models.py index 152ad34..b889794 100644 --- a/budget/models.py +++ b/budget/models.py @@ -70,6 +70,10 @@ class Project(db.Model): db.session.commit() return person + def remove_project(self): + db.session.delete(self) + db.session.commit() + def __repr__(self): return "<Project %s>" % self.name diff --git a/budget/templates/edit_project.html b/budget/templates/edit_project.html index 0349fe7..e84ad97 100644 --- a/budget/templates/edit_project.html +++ b/budget/templates/edit_project.html @@ -1,5 +1,12 @@ {% extends "layout.html" %} +{% block js %} + $('#delete-project').click(function () + { + $(this).html("<a style='color:red; ' href='{{ url_for('.remove_project') }}' >{{_("you sure?")}}</a>"); + }); +{% endblock %} + {% block content %} <h2>{{ _("Edit this project") }}</h2> <form method="post"> diff --git a/budget/templates/forms.html b/budget/templates/forms.html index 0a06001..9e5ecd6 100644 --- a/budget/templates/forms.html +++ b/budget/templates/forms.html @@ -65,7 +65,10 @@ {{ input(form.name) }} {{ input(form.password) }} {{ input(form.contact_email) }} - {{ submit(form.submit) }} + <div class="actions"> + <button class="btn primary">{{ _("Edit the project") }}</button> + <a id="delete-project" style="color:red; margin-left:10px; cursor:pointer; ">{{ _("delete") }}</a> + </div> {% endmacro %} diff --git a/budget/templates/layout.html b/budget/templates/layout.html index c8f8df8..6ac0a3a 100644 --- a/budget/templates/layout.html +++ b/budget/templates/layout.html @@ -9,6 +9,8 @@ {% block head %}{% endblock %} <script type="text/javascript" charset="utf-8"> $(document).ready(function(){ + var left = window.innerWidth/2-$('.flash').width()/2; + $(".flash").css({ "left": left+"px", "top":"45px" }); setTimeout(function(){ $(".flash").fadeOut("slow", function () { $(".flash").remove(); @@ -80,13 +82,13 @@ <div class="container-fluid" style="height: 100%; padding-left: 10px;"> {% block sidebar %}{% endblock %} <div class="content" style="margin-left: 250px;"> - {% for message in get_flashed_messages() %} - <div class="flash alert-message info"><p>{{ message }}</p></div> - {% endfor %} {% block content %} {% endblock %} </div> </div> + {% for message in get_flashed_messages() %} + <div class="flash alert-message info" style="position:absolute;"><p>{{ message }}</p></div> + {% endfor %} {% endblock %} {% block footer %} <div id="footer"> diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html index 18b3637..d9bbd66 100644 --- a/budget/templates/list_bills.html +++ b/budget/templates/list_bills.html @@ -16,15 +16,17 @@ // display the form when clicking on the "add bill" button var show_form = function(){ - $('#bill-form').show(70); + $('#bill-form').slideDown(1000); + $("#hide-bill-form").show(); $("#new-bill").hide(); return false; } // and provide a mechanism to hide it back var hide_form = function(){ - $("#bill-form").hide(70); + $("#bill-form").slideUp(1000); $("#new-bill").show(); + $("#hide-bill-form").hide(); return false; } @@ -138,7 +140,7 @@ <a id="new-bill" href="{{ url_for(".add_bill") }}" class="btn primary">{{ _("Add a new bill") }}</a> <form id="bill-form" action="{{ url_for(".add_bill") }}" method="post" style="display: none"> - <a id="hide-bill-form" href="#">{{ _("hide this form") }}</a> + <a class="btn primary" id="hide-bill-form" href="#">{{ _("hide this form") }}</a> {{ forms.add_bill(bill_form) }} </form> diff --git a/budget/web.py b/budget/web.py index 9509dec..715a223 100644 --- a/budget/web.py +++ b/budget/web.py @@ -185,6 +185,11 @@ def edit_project(): return render_template("edit_project.html", form=form) +@main.route("/<project_id>/delete", methods=["GET"]) +def remove_project(): + g.project.remove_project() + + return redirect(url_for(".home")) @main.route("/exit") def exit(): |