arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-26 09:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Added buttons to detail & edit view

Browse Source
This commit is contained in:
David Taylor
2015-08-10 18:45:42 +03:00
committed by Tom Price
parent 45c020828f
commit bdb7941579
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
rigForms/templates/rigForms/form_form.html
View File

@@ -1,25 +1,40 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %} {% extends "base.html" %}
{% load widget_tweaks %} {% load widget_tweaks %}
{% load static %} {% load static %}
{% block title %}"{{object.schema.schema_type.name}}" for "N{{object.event.pk|stringformat:"05d"}} | {{object.event.name}}"{% endblock %}
{% block title %}An event checklist{% endblock %}
{% block content %} {% block content %}
<div class="col-sm-12"> <div class="col-sm-12">
<h2>"{{object.schema.schema_type.name}}" for "<a href="{% url 'event_detail' object.event.pk %}">N{{object.event.pk|stringformat:"05d"}} | {{object.event.name}}</a>"</h2> <h2>"{{object.schema.schema_type.name}}" for "<a href="{% url 'event_detail' object.event.pk %}">N{{object.event.pk|stringformat:"05d"}} | {{object.event.name}}</a>"</h2>
<a href="{% url 'form_list' object.event.pk %}" class="btn btn-default" title="Rig Forms"><span class="glyphicon glyphicon-chevron-left"></span> <span class="hidden-xs">Other forms for N{{object.event.pk|stringformat:"05d"}}</span></a>
<hr/>
</div> </div>
{% include 'form_errors.html' %}
<div ng-controller="FormController" class="col-sm-12"> <div ng-controller="FormController" class="col-sm-12">
<form name="theForm" ng-submit="onSubmit(theForm)"> <form name="theForm" ng-submit="onSubmit(theForm)">
<div class="col-sm-12">
<a href="{% url 'form_list' object.event.pk %}" class="btn btn-default" title="Rig Forms"><span class="glyphicon glyphicon-chevron-left"></span> Other forms for N{{object.event.pk|stringformat:"05d"}}</a>
<div class="btn-group btn-page pull-right">
{% if not edit %}
<a href="{% url 'update_form' object.pk %}" class="btn btn-default"><span class="glyphicon glyphicon-edit"></span> <span class="hidden-xs">Edit</span></a>
<a href="{% url 'form_print' object.pk %}" class="btn btn-default"><span class="glyphicon glyphicon-print"></span> <span class="hidden-xs">Print</span></a>
{% endif %}
{% if edit %}
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span> <span class="hidden-xs">Save</button>
{% endif %}
</div>
<hr/>
</div>
{% include 'form_errors.html' %}
<div sf-schema="schema" sf-form="form" sf-model="model" <div sf-schema="schema" sf-form="form" sf-model="model"
sf-options=" { formDefaults: { startEmpty: true, sf-options=" { formDefaults: { startEmpty: true,
{% if not edit %} {% if not edit %}
@@ -28,20 +43,15 @@
} }"></div> } }"></div>
{% if edit %} {% if edit %}
<input class="btn btn-primary" type="submit" value="Save"> <div class="btn-group btn-page pull-right">
<button type="submit" class="btn btn-default" title="Save"><span class="glyphicon glyphicon-floppy-disk"></span> <span class="hidden-xs">Save</button>
</div>
{% endif %} {% endif %}
</form> </form>
</div> </div>
{% endblock %} {% endblock %}
{% if request.is_ajax %}
{% block footer %}
An AJAX request footer
{% endblock %}
{% endif %}
{% block js %} {% block js %}
<script type="text/javascript" src="{% static "js/angular-schema-form/angular.min.js"%}"></script> <script type="text/javascript" src="{% static "js/angular-schema-form/angular.min.js"%}"></script>
@@ -52,8 +62,6 @@
<script type="text/javascript" src="{% static "js/angular-schema-form/bootstrap-decorator.min.js"%}"></script> <script type="text/javascript" src="{% static "js/angular-schema-form/bootstrap-decorator.min.js"%}"></script>
<link rel="stylesheet" type="text/css" href="{% static "js/angular-schema-form/bootstrap.vertical-tabs.min.css"%}"/> <link rel="stylesheet" type="text/css" href="{% static "js/angular-schema-form/bootstrap.vertical-tabs.min.css"%}"/>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
angular.module('myModule', ['schemaForm']).controller('FormController', function($scope) { angular.module('myModule', ['schemaForm']).controller('FormController', function($scope) {

4
rigForms/views.py
View File

@@ -59,7 +59,7 @@ class FormCreate(generic.CreateView):
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())
def get_success_url(self): def get_success_url(self):
return reverse_lazy('update_form', kwargs={ return reverse_lazy('form_detail', kwargs={
'pk': self.object.pk, 'pk': self.object.pk,
}) })
@@ -84,7 +84,7 @@ class FormUpdate(generic.UpdateView):
fields = ['data'] fields = ['data']
def get_success_url(self): def get_success_url(self):
return reverse_lazy('update_form', kwargs={ return reverse_lazy('form_detail', kwargs={
'pk': self.object.pk, 'pk': self.object.pk,
}) })