Merge lp:~milo/linaro-ci-dashboard/views-refactoring into lp:linaro-ci-dashboard

[Milo Casagrande]

Here there is all the refactoring work trying to unify the various views with a more hierarchical structure.
The diff here might be really huge!

Work done so far:
- refactored the create, update and detail views of each sub-application, creating a generic super class for each views, and inheriting from it. The generic classes are stored in `frontend/views'.
- created generic HTML templates for the views, to be used as super class always for inheritance. All the generic templates are stored in `frontend/templates'.
- the HTML templates have been created using a "<div>" approach, defining also some CSS class that might be used for visual layout.
- refactored the code where necessary, adding also some tests.

[Milo Casagrande (milo)]

This is moslty all that there is.

For the "build" part, I tried a couple of different approaches, but none really worked. Using even the get_model static method, we need to recunstruct the model from the class, so or we override __init__ or create some custom methods for each loop. I still think that defining for each loop the build URL and a basic build_view is probably better than having the heavily depend on getattr.

There might still be some tweaks to do in the future if we insert ManyToMany fields or other relationship fields in the model and we need to show them, since we will need to traverse the PK and get the real values.

[lp:~milo/linaro-ci-dashboard/views-refactoring]

70. By Milo Casagrande on 2012-09-10

Fixed test regression.

71. By Milo Casagrande on 2012-09-11

Merged from trunk.

[Stevan Radaković (stevanr)]

Thanks for the extensive refactoring Milo !!1!

Couple of things to fix while I go further through the code:

1. 'Schedule build' does not work on kernel loops (no appropriate javascript handler on the page).
2. 'Next loop in chain' on detail page (at least one, textfield loop) is not a link as suggested, but it just states 'Loop object'
3. 'Schedule build' breaks if the loop has chained loop. This is because the AndroidLoop model has overriden method schedule_build with only one parameter instead of two like the parent model (I know this is not of your doing, at least not in this branch) but this looks like a good place to fix it).

review: Needs Fixing

[Milo Casagrande (milo)]

On Tue, Sep 11, 2012 at 1:48 PM, Stevan Radaković
<email address hidden> wrote:
>
> 1. 'Schedule build' does not work on kernel loops (no appropriate javascript handler on the page).
> 2. 'Next loop in chain' on detail page (at least one, textfield loop) is not a link as suggested, but it just states 'Loop object'
> 3. 'Schedule build' breaks if the loop has chained loop. This is because the AndroidLoop model has overriden method schedule_build with only one parameter instead of two like the parent model (I know this is not of your doing, at least not in this branch) but this looks like a good place to fix it).

2.5 fixed.
The only missing part is the link part for the chainable loop,
deliberately left out from this, since I wanted to find a better way
to do it (otherwise I will have to check if the value comes from the
"next_loop" field). The "Loop object" thing was a regression, it
should have been the name anyway.

The point 3, was it broken only in AndroidLoop? The others seem to
work for me locally.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[Stevan Radaković (stevanr)]

3. happens when you chain AndroidLoop on the AndroidTextFieldLoop create page. I'll double check if it's something on my side but you can include the proposed fix for now. (it makes sense that other modules work because the broken method definition is in the AndroidLoop model only)

[Stevan Radaković (stevanr)]

Also, didn't we agreed to have the Build detail view page as well as part of this WI? :/

[Milo Casagrande (milo)]

On Tue, Sep 11, 2012 at 3:00 PM, Stevan Radaković
<email address hidden> wrote:
> Also, didn't we agreed to have the Build detail view page as well as part of this WI? :/

Yep, but I left it out of the refactoring. Will probably split the WI
if I can't land it by today.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[Stevan Radaković (stevanr)]

The code looks great. Two small comments:

1 === modified file 'HACKING'
2 --- HACKING 2012-09-07 10:39:47 +0000
3 +++ HACKING 2012-09-11 07:31:18 +0000
4 @@ -49,6 +49,66 @@
5
6 Tests should be written and defined inside each sub-application.
7
8 +== Class Hierarchy ==
9 +
10 +=== Templates & Views ===
11 +
12 +The `frotend' base application includes the general HTML Django templates that
13 +each sub-application should base itself on. These templates are stored in the
14 +`frontend/templates/' directory.

Small typo on the froNtend application name.

131 raise ValidationError("With build of type 'Android Toolchain "
132 - "Linaro, it is necessary to specify "
133 + "Linaro', it is necessary to specify "
134 "GCC URL.")

I think this here single quote is to necessary because of the first on wich opens up at the 'Android Toolchain Linaro'.
Or the one before Android should be deleted as well.

[lp:~milo/linaro-ci-dashboard/views-refactoring]

72. By Milo Casagrande on 2012-09-11

Fixed kernel build scheduling.

73. By Milo Casagrande on 2012-09-11

Fixed name and method signature.

74. By Milo Casagrande on 2012-09-11

Fixed typos.

[Stevan Radaković (stevanr)]

Good to go :)
Approve +1

review: Approve

=== modified file 'HACKING'
--- HACKING	2012-09-07 10:39:47 +0000
+++ HACKING	2012-09-11 14:48:19 +0000
@@ -49,6 +49,66 @@
 
 Tests should be written and defined inside each sub-application.
 
+== Class Hierarchy ==
+
+=== Templates & Views ===
+
+The `frontend' base application includes the general HTML Django templates that
+each sub-application should base itself on. These templates are stored in the
+`frontend/templates/' directory.
+
+The `base.html' template is the basic structures for all the HTML pages in the
+application.
+The `login.html' template is the one used for login capabilities.
+The `home.html' template is empty for the moment.
+The `list_chainable' template is used for defining chainability of a loop.
+
+The templates with `create', `update', `detail' and `build' words in them are
+used to implement the views of each loop. These are the templates each loop
+templates should inherit from.
+
+This is the inheritance hierarchy for the HTML templates, in this case for the
+`create' view:
+
+base.html
+   ^
+   |
+   ^
+   |
+loop_create_view.html
+   ^
+   |
+   ^
+   |
+android_build_create_view.html
+
+In a sub-application template, if nothing particular is needed, it is only
+necessary to specify the correct URL name, as defined in each sup-application
+`urls.py' file.
+
+This is the inheritance hierarchy for the Python view classes, always for a
+`create' view:
+
+loop_create_view.py
+   ^
+   |
+   ^
+   |
+android_build_create_view.py
+
+Based on the view Python class, in each sub-application, if nothing special is
+needed, it is only necessary to override the following variables:
+ * template_name
+ * form_class
+ * model
+ * reverse_url or build_path
+
+What should never be overridden is:
+ * context_object_name
+ * slug_field
+
+
+
 = Loop Chaining =
 
 Loop chaining in the linaro-ci-dashboard is a mechanism to use output from one

=== modified file 'dashboard/frontend/android_build/forms/android_loop_form.py'
--- dashboard/frontend/android_build/forms/android_loop_form.py	2012-09-04 11:23:32 +0000
+++ dashboard/frontend/android_build/forms/android_loop_form.py	2012-09-11 14:48:19 +0000
@@ -15,44 +15,33 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.forms import CharField
-from django.forms import IntegerField
-from django.forms import ModelForm
-from django.forms.widgets import HiddenInput
-from django.forms import ValidationError
+from django.forms import (
+    CharField,
+    HiddenInput,
+    ValidationError
+    )
 from frontend.android_build.models.android_loop import (
     AndroidLoop,
     BUILD_ANDROID_TOOLCHAIN_LINARO,
     )
-from frontend.widgets.chain_loop_widget import ChainLoopWidget
-
-
-class AndroidLoopForm(ModelForm):
-
-    next_loop = IntegerField(widget=ChainLoopWidget, required=False)
+from frontend.forms.loop_form import LoopForm
+
+
+class AndroidLoopForm(LoopForm):
+    """
+    Form class for the android_build application.
+    """
+    class Meta(LoopForm.Meta):
+        model = AndroidLoop
+
     type = CharField(widget=HiddenInput, initial=AndroidLoop.__name__,
                      required=False)
 
-    class Meta:
-        model = AndroidLoop
-        exclude = ('server')
-
-    def save(self, *args, **kwargs):
-        instance = super(AndroidLoopForm, self).save(commit=False)
-
-        if self.data["next_loop_0"]:
-            next_loop = Loop.objects.get(id=self.data["next_loop_0"])
-            instance.next_loop = next_loop
-
-        instance.save()
-
-        return instance
-
     def clean(self):
         cleaned_data = super(AndroidLoopForm, self).clean()
         if cleaned_data.get('build_type') == BUILD_ANDROID_TOOLCHAIN_LINARO[0]:
             if cleaned_data['gcc_url'] == '':
-                raise ValidationError("With build of type 'Android Toolchain "
+                raise ValidationError("With build of type Android Toolchain "
                                         "Linaro, it is necessary to specify "
                                         "GCC URL.")
         return cleaned_data

=== modified file 'dashboard/frontend/android_build/models/android_loop.py'
--- dashboard/frontend/android_build/models/android_loop.py	2012-08-30 21:49:13 +0000
+++ dashboard/frontend/android_build/models/android_loop.py	2012-09-11 14:48:19 +0000
@@ -125,6 +125,17 @@
             # TODO: Log error.
             pass
 
-    def schedule_build(self):
+    def schedule_build(self, parameters=None):
         parameters = {'parameter': [{'delay': '0'}]}
         return super(self.__class__, self).schedule_build(parameters)
+
+    def base64_config(self,
+                      include=None,
+                      exclude=None,
+                      capitalize=False,
+                      upper=False):
+        exclude = ['id', 'server', 'loop_ptr', 'next_loop', 'name', 'type']
+        return super(AndroidLoop, self).base64_config(include=include,
+                                                      exclude=exclude,
+                                                      capitalize=capitalize,
+                                                      upper=True)

=== modified file 'dashboard/frontend/android_build/templates/android_loop_create.html'
--- dashboard/frontend/android_build/templates/android_loop_create.html	2012-08-31 15:21:11 +0000
+++ dashboard/frontend/android_build/templates/android_loop_create.html	2012-09-11 14:48:19 +0000
@@ -1,26 +1,10 @@
-{% extends "base.html" %}
-
-{% block content %}
-
-{% block create_form %}
-<form name="{{ form_name }}" action="{% url AndroidLoopCreate %}" method="post">
-{% csrf_token %}
-{% endblock create_form %}
-
-{% if form.non_field_errors %}
-    <div class="form_error">
-    {% for err in form.non_field_errors %}
-        <div class="error_message">{{ err }}</div>
-    {% endfor %}
-    </div>
-{% endif %}
-{{ form.as_p }}
-    <div><input type="submit" value="Submit" /></div>
-</form>
-{% endblock %}
+{% extends "loop_create.html" %}
+{% block content_form %}
+<form action="{% url AndroidLoopCreate %}" method="post">{% csrf_token %}
+{% endblock content_form %}
 
 {% block scripts %}
-<script type="text/javascript">
+{{ block.super }}
 $('#id_lava_submit').attr('onclick', 'disable_enable_lava()');
 
 disable_enable_lava()
@@ -36,5 +20,4 @@
     $('#id_lava_submit_fatal').attr('disabled', disable);
     $('#id_lava_android_binaries').attr('disabled', disable);
 }
-</script>
-{% endblock %}
+{% endblock scripts %}

=== modified file 'dashboard/frontend/android_build/templates/android_loop_detail.html'
--- dashboard/frontend/android_build/templates/android_loop_detail.html	2012-08-27 15:14:06 +0000
+++ dashboard/frontend/android_build/templates/android_loop_detail.html	2012-09-11 14:48:19 +0000
@@ -1,48 +1,7 @@
-{% extends "base.html" %}
-{% load dashboard_extras %}
-
-{% block breadcrumbs %}
-<div><a href="{% url Index %}">Index</a></div>
-{% endblock %}
-
-{% block content %}
-    <h2>Loop {{ android_loop_detail.name }}</h2>
-
-    <h4>Details</h4>
-    {% for instance in data %}
-      {% for field, value in instance.fields.items %}
-        <div>
-          {{ android_loop_detail|verbose_name:field }}: {{ value }}
-        </div>
-      {% endfor %}
-    {% endfor %}
-
-    <div>
-    <button type="button" id="update_button">Update loop configuration</button>
-    </div>
-
-    <h4>Builds</h4>
-    <div id="builds">
-      {% for build in builds %}
-        {% include "build.html" %}
-      {% endfor %}
-    </div>
-
-    <div>
-    <button type="button" id="schedule_button">Schedule new build</button>
-    </div>
-{% endblock %}
-
+{% extends "loop_detail.html" %}
 {% block scripts %}
-<script type="text/javascript">
-$("#schedule_button").click(function() {
-  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/android/build/{{ android_loop_detail.name }}/", function(data) {
-    $(data).prependTo($("#builds"));
-  });
-});
-
+{{ block.super }}
 $("#update_button").click(function() {
-  window.location.href = "{% url AndroidLoopUpdate android_loop_detail.name %}";
+    window.location.href = "{% url AndroidLoopUpdate loop_detail.name %}";
 });
-</script>
-{% endblock %}
+{% endblock scripts %}

=== modified file 'dashboard/frontend/android_build/templates/android_loop_update.html'
--- dashboard/frontend/android_build/templates/android_loop_update.html	2012-08-14 12:07:33 +0000
+++ dashboard/frontend/android_build/templates/android_loop_update.html	2012-09-11 14:48:19 +0000
@@ -1,6 +1,8 @@
 {% extends "android_loop_create.html" %}
-
-{% block create_form %}
-    <form name="{{ form_name }}" action="{% url AndroidLoopUpdate android_loop_update.name %}" method="post">
-    {% csrf_token %}
-{% endblock create_form %}
\ No newline at end of file
+{% comment %}
+We inherit from android_loop_create.html in this case, since we need a small
+JavaScript that has been written in the android_loop_create.html template.
+{% endcomment %}
+{% block content_form %}
+<form action="{% url AndroidLoopUpdate loop_update.name %}" method="post">{% csrf_token %}
+{% endblock content_form %}

=== modified file 'dashboard/frontend/android_build/tests/test_android_build_clientresponse.py'
--- dashboard/frontend/android_build/tests/test_android_build_clientresponse.py	2012-09-04 11:23:32 +0000
+++ dashboard/frontend/android_build/tests/test_android_build_clientresponse.py	2012-09-11 14:48:19 +0000
@@ -42,6 +42,7 @@
         template_names = [template.name for template in
                           response.templates]
         self.assertEquals(template_names, ["android_loop_create.html",
+                                           "loop_create.html",
                                            "base.html",
                                            "login.html",
                                            ])
@@ -66,6 +67,7 @@
         template_names = [template.name for template in
                           response.templates]
         self.assertEquals(template_names, ["android_loop_detail.html",
+                                           "loop_detail.html",
                                            "base.html",
                                            "login.html",
                                            ])

=== modified file 'dashboard/frontend/android_build/tests/test_android_build_views.py'
--- dashboard/frontend/android_build/tests/test_android_build_views.py	2012-08-23 10:17:07 +0000
+++ dashboard/frontend/android_build/tests/test_android_build_views.py	2012-09-11 14:48:19 +0000
@@ -41,7 +41,6 @@
         context = AndroidLoopCreateView.get_context_data(
             android_loop_create_view)
         self.assertEqual(context['request'], "some request data")
-        self.assertEqual(context['form_name'], AndroidLoopCreateView.form_name)
 
     def test_detail_view_get_context_data(self):
         android_loop_detail_view = AndroidLoopDetailView()
@@ -51,7 +50,6 @@
             android_loop_detail_view)
         self.assertEqual(context['request'], "some request data")
         self.assertEqual(context['builds'].__class__.__name__, "MagicMock")
-        self.assertEqual(context['data'].__class__.__name__, "list")
 
     def test_update_view_get_context_data(self):
         android_loop_update_view = AndroidLoopUpdateView()
@@ -60,4 +58,3 @@
         context = AndroidLoopUpdateView.get_context_data(
             android_loop_update_view)
         self.assertEqual(context['request'], "some request data")
-        self.assertEqual(context['form_name'], AndroidLoopUpdateView.form_name)

=== modified file 'dashboard/frontend/android_build/views/android_loop_create_view.py'
--- dashboard/frontend/android_build/views/android_loop_create_view.py	2012-08-17 09:25:34 +0000
+++ dashboard/frontend/android_build/views/android_loop_create_view.py	2012-09-11 14:48:19 +0000
@@ -16,39 +16,14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-from django.views.generic.edit import CreateView
-from django.utils.decorators import method_decorator
 from frontend.android_build.models.android_loop import AndroidLoop
 from frontend.android_build.forms.android_loop_form import AndroidLoopForm
-
-
-class AndroidLoopCreateView(CreateView):
+from frontend.views.loop_create_view import LoopCreateView
+
+
+class AndroidLoopCreateView(LoopCreateView):
 
     template_name = "android_loop_create.html"
     form_class = AndroidLoopForm
     model = AndroidLoop
-    form_name = 'android_loop'
-
-    def form_valid(self, form):
-        """This method is called when valid form data has been POSTed.
-
-        It should return an HttpResponse."""
-        return super(AndroidLoopCreateView, self).form_valid(form)
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(AndroidLoopCreateView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(AndroidLoopCreateView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        context['form_name'] = self.form_name
-        return context
-
-    def get_success_url(self):
-        '''Return the URL when the form is valid.'''
-        return reverse('AndroidLoopDetail', args=[self.object.name])
+    reverse_url = 'AndroidLoopDetail'

=== modified file 'dashboard/frontend/android_build/views/android_loop_detail_view.py'
--- dashboard/frontend/android_build/views/android_loop_detail_view.py	2012-08-24 12:35:00 +0000
+++ dashboard/frontend/android_build/views/android_loop_detail_view.py	2012-09-11 14:48:19 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2012 Linaro
 #
 # This file is part of linaro-ci-dashboard.
@@ -16,37 +15,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.views.generic.detail import DetailView
-from django.utils.decorators import method_decorator
-from frontend.models.loop import Loop
 from frontend.android_build.models.android_loop import AndroidLoop
-from django.core import serializers
-from itertools import chain
-
-
-class AndroidLoopDetailView(DetailView):
+from frontend.views.loop_detail_view import LoopDetailView
+
+
+class AndroidLoopDetailView(LoopDetailView):
 
     model = AndroidLoop
-    context_object_name = 'android_loop_detail'
-    slug_field = "name"
     template_name = "android_loop_detail.html"
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(AndroidLoopDetailView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(AndroidLoopDetailView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        context['builds'] = self.object.loop_ptr.loopbuild_set.all()
-
-        # Need to "merge" the two queryset for all the fields to appear
-        querysets = list(chain(AndroidLoop.objects.filter(
-                               pk=self.object.loop_ptr.id),
-                               Loop.objects.filter(pk=self.object.loop_ptr.id)))
-        context['data'] = serializers.serialize("python", querysets)
-
-        return context
+    build_path = 'android'

=== modified file 'dashboard/frontend/android_build/views/android_loop_update_view.py'
--- dashboard/frontend/android_build/views/android_loop_update_view.py	2012-08-20 10:25:27 +0000
+++ dashboard/frontend/android_build/views/android_loop_update_view.py	2012-09-11 14:48:19 +0000
@@ -15,41 +15,14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-from django.views.generic.edit import UpdateView
-from django.utils.decorators import method_decorator
 from frontend.android_build.forms.android_loop_form import AndroidLoopForm
 from frontend.android_build.models.android_loop import AndroidLoop
-
-
-class AndroidLoopUpdateView(UpdateView):
-
-    template_name = "android_loop_update.html"
+from frontend.views.loop_update_view import LoopUpdateView
+
+
+class AndroidLoopUpdateView(LoopUpdateView):
+
+    template_name = 'android_loop_update.html'
     form_class = AndroidLoopForm
-    context_object_name = 'android_loop_update'
     model = AndroidLoop
-    slug_field = "name"
-    form_name = 'android_loop'
-
-    def form_valid(self, form):
-        """This method is called when valid form data has been POSTed.
-
-        It should return an HttpResponse."""
-        return super(AndroidLoopUpdateView, self).form_valid(form)
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(AndroidLoopUpdateView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(AndroidLoopUpdateView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        context['form_name'] = self.form_name
-        return context
-
-    def get_success_url(self):
-        '''Return the URL when the form is valid.'''
-        return reverse('AndroidLoopDetail', args=[self.object.name])
+    reverse_url = 'AndroidLoopDetail'

=== modified file 'dashboard/frontend/android_textfield_loop/forms/android_textfield_loop_form.py'
--- dashboard/frontend/android_textfield_loop/forms/android_textfield_loop_form.py	2012-09-04 14:29:53 +0000
+++ dashboard/frontend/android_textfield_loop/forms/android_textfield_loop_form.py	2012-09-11 14:48:19 +0000
@@ -15,31 +15,21 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.forms import CharField
-from django.forms import IntegerField
-from django.forms.widgets import HiddenInput
-from frontend.models.loop import Loop
-from frontend.widgets.chain_loop_widget import ChainLoopWidget
+from django.forms import (
+    CharField,
+    HiddenInput,
+    )
 from frontend.forms.textfield_loop_form import TextFieldLoopForm
 from frontend.android_textfield_loop.models.android_textfield_loop \
     import AndroidTextFieldLoop
 
 
 class AndroidTextFieldLoopForm(TextFieldLoopForm):
+    """
+    Form for the AndroidTextFieldLoop model.
+    """
     class Meta(TextFieldLoopForm.Meta):
         model = AndroidTextFieldLoop
 
-    next_loop = IntegerField(widget=ChainLoopWidget, required=False)
     type = CharField(widget=HiddenInput, initial=AndroidTextFieldLoop.__name__,
                      required=False)
-
-    def save(self, *args, **kwargs):
-        instance = super(AndroidTextFieldLoopForm, self).save(commit=False)
-
-        if self.data["next_loop_0"]:
-            next_loop = Loop.objects.get(id=self.data["next_loop_0"])
-            instance.next_loop = next_loop
-
-        instance.save()
-
-        return instance

=== modified file 'dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_create.html'
--- dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_create.html	2012-09-06 08:31:57 +0000
+++ dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_create.html	2012-09-11 14:48:19 +0000
@@ -1,12 +1,4 @@
-{% extends "base.html" %}
-
-{% block content %}
-
-{% block create_form %}
-    <form name="{{ form_name }}" action="{% url AndroidTextFieldLoopCreate %}" method="post">
-    {% csrf_token %}
-{% endblock create_form %}
-{{ form.as_p }}
-        <div><input type="submit" value="Submit" /></div>
-    </form>
-{% endblock %}
+{% extends "loop_create.html" %}
+{% block content_form %}
+<form action="{% url AndroidTextFieldLoopCreate %}" method="post">{% csrf_token %}
+{% endblock content_form %}

=== modified file 'dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_detail.html'
--- dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_detail.html	2012-08-30 15:46:41 +0000
+++ dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_detail.html	2012-09-11 14:48:19 +0000
@@ -1,42 +1,7 @@
-{% extends "base.html" %}
-
-{% block breadcrumbs %}
-    <div><a href="{% url Index %}">Index</a></div>
-{% endblock %}
-
-{% block content %}
-    <h2>Loop {{ android_loop_detail.name }}</h2>
-
-    <h4>Details</h4>
-    <div>
-        {{ android_loop_detail.values }}
-    </div>
-    <div>
-        <button type="button" id="update_button">Update loop configuration</button>
-    </div>
-
-    <h4>Builds</h4>
-    <div id="builds">
-        {% for build in builds %}
-            {% include "build.html" %}
-        {% endfor %}
-    </div>
-
-    <div>
-        <button type="button" id="schedule_button">Schedule new build</button>
-    </div>
-{% endblock %}
-
+{% extends "textfield_loop_detail.html" %}
 {% block scripts %}
-    <script type="text/javascript">
-        $("#schedule_button").click(function() {
-            $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/android-text/build/{{ android_loop_detail.name }}/", function(data) {
-                $(data).prependTo($("#builds"));
-            });
-        });
-
-        $("#update_button").click(function() {
-            window.location.href = "{% url AndroidTextFieldLoopUpdate android_loop_detail.name %}";
-        });
-    </script>
-{% endblock %}
+{{ block.super }}
+$("#update_button").click(function() {
+    window.location.href = "{% url AndroidTextFieldLoopUpdate loop_detail.name %}";
+});
+{% endblock scripts %}

=== modified file 'dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_update.html'
--- dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_update.html	2012-08-31 12:25:57 +0000
+++ dashboard/frontend/android_textfield_loop/templates/android_textfield_loop_update.html	2012-09-11 14:48:19 +0000
@@ -1,6 +1,4 @@
-{% extends "android_textfield_loop_create.html" %}
-
-{% block create_form %}
-    <form name="{{ form_name }}" action="{% url AndroidTextFieldLoopUpdate android_loop_update.name %}" method="post">
-        {% csrf_token %}
-{% endblock create_form %}
+{% extends "loop_create.html" %}
+{% block content_form %}
+<form action="{% url AndroidTextFieldLoopUpdate loop_update.name %}" method="post">{% csrf_token %}
+{% endblock content_form %}

=== modified file 'dashboard/frontend/android_textfield_loop/tests/test_android_textfield_clientresponse.py'
--- dashboard/frontend/android_textfield_loop/tests/test_android_textfield_clientresponse.py	2012-09-04 14:32:49 +0000
+++ dashboard/frontend/android_textfield_loop/tests/test_android_textfield_clientresponse.py	2012-09-11 14:48:19 +0000
@@ -40,6 +40,7 @@
                           response.templates]
         self.assertEquals(template_names,
             ["android_textfield_loop_create.html",
+             "loop_create.html",
              "base.html",
              "login.html",
              ])
@@ -65,6 +66,8 @@
                           response.templates]
         self.assertEquals(template_names,
             ["android_textfield_loop_detail.html",
+             "textfield_loop_detail.html",
+             "loop_detail.html",
              "base.html",
              "login.html",
              ])

=== modified file 'dashboard/frontend/android_textfield_loop/tests/test_android_textfield_loop_model.py'
--- dashboard/frontend/android_textfield_loop/tests/test_android_textfield_loop_model.py	2012-09-07 10:39:47 +0000
+++ dashboard/frontend/android_textfield_loop/tests/test_android_textfield_loop_model.py	2012-09-11 14:48:19 +0000
@@ -22,7 +22,11 @@
 
 
 class AndroidTextFieldLoopModelTest(TestCase):
-
+    """
+    Test class for the AndroidTextFieldLoop model. It is mostly used also for
+    tests for the general TextFieldLoop class, since it is an abstract model
+    class and we cannot create object for it.
+    """
     A_NAME = 'a-build'
     B_NAME = 'b-build'
     VALID_VALUES = u'a=2\nb=3'
@@ -47,8 +51,8 @@
         self.assertEqual({}, self.non_valid_android_loop.values_to_dict())
 
     def test_valid_values_correct(self):
-        self.assertEqual(AndroidTextFieldLoop.valid_values(self.VALID_VALUES),
-                         (True, self.VALID_LINES))
+        self.assertEqual((True, self.VALID_LINES),
+                         AndroidTextFieldLoop.valid_values(self.VALID_VALUES))
 
     def test_valid_values_wrong(self):
         self.assertEqual((False, self.NON_VALID_LINES),

=== modified file 'dashboard/frontend/android_textfield_loop/tests/test_android_textfield_views.py'
--- dashboard/frontend/android_textfield_loop/tests/test_android_textfield_views.py	2012-09-03 15:44:47 +0000
+++ dashboard/frontend/android_textfield_loop/tests/test_android_textfield_views.py	2012-09-11 14:48:19 +0000
@@ -37,8 +37,6 @@
         context = AndroidTextFieldLoopCreateView.get_context_data(
             android_textfield_create_view)
         self.assertEqual(context['request'], "some request data")
-        self.assertEqual(context['form_name'],
-                         AndroidTextFieldLoopCreateView.form_name)
 
     def test_detail_view_get_context_data(self):
         android_textfield_detail_view = AndroidTextFieldLoopDetailView()
@@ -56,5 +54,3 @@
         context = AndroidTextFieldLoopUpdateView.get_context_data(
             android_textfield_update_view)
         self.assertEqual(context['request'], "some request data")
-        self.assertEqual(context['form_name'],
-                         AndroidTextFieldLoopUpdateView.form_name)

=== modified file 'dashboard/frontend/android_textfield_loop/views/android_textfield_loop_create_view.py'
--- dashboard/frontend/android_textfield_loop/views/android_textfield_loop_create_view.py	2012-09-03 14:12:10 +0000
+++ dashboard/frontend/android_textfield_loop/views/android_textfield_loop_create_view.py	2012-09-11 14:48:19 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2012 Linaro
 #
 # This file is part of linaro-ci-dashboard.
@@ -16,42 +15,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-from django.views.generic.edit import CreateView
-from django.utils.decorators import method_decorator
 from frontend.android_textfield_loop.models.android_textfield_loop \
     import AndroidTextFieldLoop
 from frontend.android_textfield_loop.forms.android_textfield_loop_form \
     import AndroidTextFieldLoopForm
-
-
-class AndroidTextFieldLoopCreateView(CreateView):
+from frontend.views.loop_create_view import LoopCreateView
+
+
+class AndroidTextFieldLoopCreateView(LoopCreateView):
 
     template_name = "android_textfield_loop_create.html"
     form_class = AndroidTextFieldLoopForm
     model = AndroidTextFieldLoop
-    form_name = 'android_textfield_loop'
-
-    def form_valid(self, form):
-        """This method is called when valid form data has been POSTed.
-
-        It should return an HttpResponse."""
-        return super(AndroidTextFieldLoopCreateView, self).form_valid(form)
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(AndroidTextFieldLoopCreateView,
-                     self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(AndroidTextFieldLoopCreateView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        context['form_name'] = self.form_name
-        return context
-
-    def get_success_url(self):
-        '''Return the URL when the form is valid.'''
-        return reverse('AndroidTextFieldLoopDetail', args=[self.object.name])
+    reverse_url = 'AndroidTextFieldLoopDetail'

=== modified file 'dashboard/frontend/android_textfield_loop/views/android_textfield_loop_detail_view.py'
--- dashboard/frontend/android_textfield_loop/views/android_textfield_loop_detail_view.py	2012-08-30 15:46:41 +0000
+++ dashboard/frontend/android_textfield_loop/views/android_textfield_loop_detail_view.py	2012-09-11 14:48:19 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2012 Linaro
 #
 # This file is part of linaro-ci-dashboard.
@@ -16,30 +15,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.views.generic.detail import DetailView
-from django.utils.decorators import method_decorator
 from frontend.android_textfield_loop.models.android_textfield_loop \
     import AndroidTextFieldLoop
-
-
-class AndroidTextFieldLoopDetailView(DetailView):
+from frontend.views.loop_detail_view import LoopDetailView
+
+
+class AndroidTextFieldLoopDetailView(LoopDetailView):
 
     model = AndroidTextFieldLoop
-    context_object_name = 'android_loop_detail'
-    slug_field = "name"
-    template_name = "android_textfield_loop_detail.html"
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(AndroidTextFieldLoopDetailView,
-                     self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(AndroidTextFieldLoopDetailView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        context['builds'] = self.object.loop_ptr.loopbuild_set.all()
-
-        return context
+    template_name = 'android_textfield_loop_detail.html'
+    build_path = 'android-text'

=== modified file 'dashboard/frontend/android_textfield_loop/views/android_textfield_loop_update_view.py'
--- dashboard/frontend/android_textfield_loop/views/android_textfield_loop_update_view.py	2012-09-03 14:12:10 +0000
+++ dashboard/frontend/android_textfield_loop/views/android_textfield_loop_update_view.py	2012-09-11 14:48:19 +0000
@@ -15,44 +15,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-from django.views.generic.edit import UpdateView
-from django.utils.decorators import method_decorator
 from frontend.android_textfield_loop.models.android_textfield_loop \
     import AndroidTextFieldLoop
 from frontend.android_textfield_loop.forms.android_textfield_loop_form \
     import AndroidTextFieldLoopForm
-
-
-class AndroidTextFieldLoopUpdateView(UpdateView):
-
-    template_name = "android_textfield_loop_update.html"
+from frontend.views.loop_update_view import LoopUpdateView
+
+
+class AndroidTextFieldLoopUpdateView(LoopUpdateView):
+
+    template_name = 'android_textfield_loop_update.html'
     form_class = AndroidTextFieldLoopForm
-    context_object_name = 'android_loop_update'
     model = AndroidTextFieldLoop
-    slug_field = "name"
-    form_name = 'android_textfield_loop'
-
-    def form_valid(self, form):
-        """This method is called when valid form data has been POSTed.
-
-        It should return an HttpResponse."""
-        return super(AndroidTextFieldLoopUpdateView, self).form_valid(form)
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(AndroidTextFieldLoopUpdateView,
-                     self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(AndroidTextFieldLoopUpdateView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        context['form_name'] = self.form_name
-        return context
-
-    def get_success_url(self):
-        '''Return the URL when the form is valid.'''
-        return reverse('AndroidTextFieldLoopDetail', args=[self.object.name])
+    reverse_url = 'AndroidTextFieldLoopDetail'

=== added file 'dashboard/frontend/forms/loop_form.py'
--- dashboard/frontend/forms/loop_form.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/forms/loop_form.py	2012-09-11 14:48:19 +0000
@@ -0,0 +1,48 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.forms import (
+    CharField,
+    IntegerField,
+    ModelForm,
+    HiddenInput,
+    )
+from frontend.models.loop import Loop
+from frontend.widgets.chain_loop_widget import ChainLoopWidget
+
+
+class LoopForm(ModelForm):
+    """
+    Generic loop form class that all loop should inherit from.
+    """
+    class Meta:
+        model = Loop
+        exclude = ('server')
+
+    next_loop = IntegerField(widget=ChainLoopWidget, required=False)
+    type = CharField(widget=HiddenInput, initial=Loop.__name__,
+                     required=False)
+
+    def save(self, *args, **kwargs):
+        instance = super(LoopForm, self).save(commit=False)
+        if self.data["next_loop_0"]:
+            next_loop = Loop.objects.get(id=self.data["next_loop_0"])
+            instance.next_loop = next_loop
+
+        instance.save()
+
+        return instance

=== modified file 'dashboard/frontend/forms/textfield_loop_form.py'
--- dashboard/frontend/forms/textfield_loop_form.py	2012-09-03 15:44:21 +0000
+++ dashboard/frontend/forms/textfield_loop_form.py	2012-09-11 14:48:19 +0000
@@ -15,24 +15,30 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.forms import ModelForm
 from django.forms import ValidationError
 from frontend.models.textfield_loop import (
     TextFieldLoop,
     DEFAULT_DELIMITER,
     )
 
-
-class TextFieldLoopForm(ModelForm):
-    class Meta:
+from frontend.forms.loop_form import LoopForm
+
+
+class TextFieldLoopForm(LoopForm):
+    """
+    General loop form for loops of the textfield kind.
+
+    A textfield loop should inherit from this class, that in turn inherits from
+    the LoopForm one.
+    """
+    class Meta(LoopForm.Meta):
         model = TextFieldLoop
-        exclude = ('server', 'type')
 
     def clean(self):
         cleaned_data = super(TextFieldLoopForm, self).clean()
         values = cleaned_data.get('values')
         if values:
-            valid , _ = self.instance.valid_values(values)
+            valid, _ = self.instance.valid_values(values)
             if not valid:
                 raise ValidationError("Wrong delimiter used: please use the "
                                       "%s character as delimiter." %

=== modified file 'dashboard/frontend/integration_loop/forms/integration_loop_form.py'
--- dashboard/frontend/integration_loop/forms/integration_loop_form.py	2012-09-04 11:23:32 +0000
+++ dashboard/frontend/integration_loop/forms/integration_loop_form.py	2012-09-11 14:48:19 +0000
@@ -16,32 +16,20 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.forms import CharField
-from django.forms import IntegerField
-from django.forms import ModelForm
-from django.forms.widgets import HiddenInput
+from django.forms import (
+    CharField,
+    HiddenInput,
+    )
+from frontend.forms.loop_form import LoopForm
 from frontend.integration_loop.models.integration_loop import IntegrationLoop
-from frontend.models.loop import Loop
-from frontend.widgets.chain_loop_widget import ChainLoopWidget
-
-
-class IntegrationLoopForm(ModelForm):
-
-    next_loop = IntegerField(widget=ChainLoopWidget, required=False)
+
+
+class IntegrationLoopForm(LoopForm):
+    """
+    Form for the IntegrationLoop model.
+    """
+    class Meta(LoopForm.Meta):
+        model = IntegrationLoop
+
     type = CharField(widget=HiddenInput, initial=IntegrationLoop.__name__,
                      required=False)
-
-    class Meta:
-        model = IntegrationLoop
-        exclude = ('server')
-
-    def save(self, *args, **kwargs):
-        instance = super(IntegrationLoopForm, self).save(commit=False)
-
-        if self.data["next_loop_0"]:
-            next_loop = Loop.objects.get(id=self.data["next_loop_0"])
-            instance.next_loop = next_loop
-
-        instance.save()
-
-        return instance

=== modified file 'dashboard/frontend/integration_loop/templates/integration_loop_create.html'
--- dashboard/frontend/integration_loop/templates/integration_loop_create.html	2012-08-16 15:12:10 +0000
+++ dashboard/frontend/integration_loop/templates/integration_loop_create.html	2012-09-11 14:48:19 +0000
@@ -1,8 +1,4 @@
-{% extends "base.html" %}
-
-{% block content %}
+{% extends "loop_create.html" %}
+{% block content_form %}
 <form action="{% url IntegrationLoopCreate %}" method="post">{% csrf_token %}
-{{ form.as_p }}
-<div><input type="submit" value="Submit" /></div>
-</form>
-{% endblock %}
+{% endblock content_form %}

=== modified file 'dashboard/frontend/integration_loop/templates/integration_loop_detail.html'
--- dashboard/frontend/integration_loop/templates/integration_loop_detail.html	2012-08-31 13:34:41 +0000
+++ dashboard/frontend/integration_loop/templates/integration_loop_detail.html	2012-09-11 14:48:19 +0000
@@ -1,54 +1,7 @@
-{% extends "base.html" %}
-
-{% block breadcrumbs %}
-<div>
-<a href="{% url Index %}">Index</a>
-</div>
-{% endblock %}
-
-{% block content %}
-    <h2>Loop {{ integration_loop_detail.name }}</h2>
-
-    <h4>Details</h4>
-    <div>
-    Next loop in chain: {{ integration_loop_detail.next_loop.name }}
-    </div>
-    <div>
-    Branch: {{ integration_loop_detail.branch }}
-    </div>
-    <div>
-    Pre-command: {{ integration_loop_detail.precommand }}
-    </div>
-    <div>
-    Test Command: {{ integration_loop_detail.command }}
-    </div>
-
-    <div>
-    <button type="button" id="update_button">Update loop configuration</button>
-    </div>
-
-    <h4>Builds</h4>
-    <div id="builds">
-      {% for build in builds %}
-        {% include "build.html" %}
-      {% endfor %}
-    </div>
-
-    <div>
-    <button type="button" id="schedule_button">Schedule new build</button>
-    </div>
-{% endblock %}
-
+{% extends "loop_detail.html" %}
 {% block scripts %}
-<script type="text/javascript">
-$("#schedule_button").click(function() {
-  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/integration_loop/build/{{ integration_loop_detail.name }}/", function(data) {
-    $(data).prependTo($("#builds"));
-  });
-});
-
+{{ block.super }}
 $("#update_button").click(function() {
-  window.location.href = "{% url IntegrationLoopUpdate integration_loop_detail.name %}";
+    window.location.href = "{% url IntegrationLoopUpdate loop_detail.name %}";
 });
-</script>
-{% endblock %}
+{% endblock scripts %}

=== modified file 'dashboard/frontend/integration_loop/templates/integration_loop_update.html'
--- dashboard/frontend/integration_loop/templates/integration_loop_update.html	2012-08-16 15:12:10 +0000
+++ dashboard/frontend/integration_loop/templates/integration_loop_update.html	2012-09-11 14:48:19 +0000
@@ -1,8 +1,4 @@
-{% extends "base.html" %}
-
-{% block content %}
-<form action="{% url IntegrationLoopUpdate integration_loop_update.name %}" method="post">{% csrf_token %}
-{{ form.as_p }}
-<div><input type="submit" value="Submit" /></div>
-</form>
-{% endblock %}
+{% extends "loop_create.html" %}
+{% block content_form %}
+<form action="{% url IntegrationLoopUpdate loop_update.name %}" method="post">{% csrf_token %}
+{% endblock content_form %}

=== modified file 'dashboard/frontend/integration_loop/views/integration_loop_create_view.py'
--- dashboard/frontend/integration_loop/views/integration_loop_create_view.py	2012-08-16 15:12:10 +0000
+++ dashboard/frontend/integration_loop/views/integration_loop_create_view.py	2012-09-11 14:48:19 +0000
@@ -16,39 +16,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-from django.views.generic.edit import CreateView
-from django.utils.decorators import method_decorator
 from frontend.integration_loop.forms.integration_loop_form \
     import IntegrationLoopForm
 from frontend.integration_loop.models.integration_loop import IntegrationLoop
-
-
-class IntegrationLoopCreateView(CreateView):
+from frontend.views.loop_create_view import LoopCreateView
+
+
+class IntegrationLoopCreateView(LoopCreateView):
 
     template_name = "integration_loop_create.html"
     form_class = IntegrationLoopForm
     model = IntegrationLoop
-
-    def form_valid(self, form):
-        """This method is called when valid form data has been POSTed.
-
-        It should return an HttpResponse."""
-
-        return super(IntegrationLoopCreateView, self).form_valid(form)
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(IntegrationLoopCreateView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(IntegrationLoopCreateView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        return context
-
-    def get_success_url(self):
-        '''Return the URL when the form is valid.'''
-        return reverse('IntegrationLoopDetail', args=[self.object.name])
+    reverse_url = 'IntegrationLoopDetail'

=== modified file 'dashboard/frontend/integration_loop/views/integration_loop_detail_view.py'
--- dashboard/frontend/integration_loop/views/integration_loop_detail_view.py	2012-08-16 15:12:10 +0000
+++ dashboard/frontend/integration_loop/views/integration_loop_detail_view.py	2012-09-11 14:48:19 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2012 Linaro
 #
 # This file is part of linaro-ci-dashboard.
@@ -16,27 +15,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.views.generic.detail import DetailView
-from django.utils.decorators import method_decorator
 from frontend.integration_loop.models.integration_loop import IntegrationLoop
-
-
-class IntegrationLoopDetailView(DetailView):
+from frontend.views.loop_detail_view import LoopDetailView
+
+
+class IntegrationLoopDetailView(LoopDetailView):
 
     model = IntegrationLoop
-    context_object_name = 'integration_loop_detail'
-    slug_field = "name"
     template_name = "integration_loop_detail.html"
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(IntegrationLoopDetailView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(IntegrationLoopDetailView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        context['builds'] = self.object.loop_ptr.loopbuild_set.all()
-        return context
+    build_path = 'integration_loop'

=== modified file 'dashboard/frontend/integration_loop/views/integration_loop_update_view.py'
--- dashboard/frontend/integration_loop/views/integration_loop_update_view.py	2012-08-16 15:12:10 +0000
+++ dashboard/frontend/integration_loop/views/integration_loop_update_view.py	2012-09-11 14:48:19 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2012 Linaro
 #
 # This file is part of linaro-ci-dashboard.
@@ -16,41 +15,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-from django.views.generic.edit import UpdateView
-from django.utils.decorators import method_decorator
 from frontend.integration_loop.forms.integration_loop_form \
     import IntegrationLoopForm
 from frontend.integration_loop.models.integration_loop import IntegrationLoop
-
-
-class IntegrationLoopUpdateView(UpdateView):
-
-    template_name = "integration_loop_update.html"
+from frontend.views.loop_update_view import LoopUpdateView
+
+
+class IntegrationLoopUpdateView(LoopUpdateView):
+
+    template_name = 'integration_loop_update.html'
     form_class = IntegrationLoopForm
-    context_object_name = 'integration_loop_update'
     model = IntegrationLoop
-    slug_field = "name"
-
-    def form_valid(self, form):
-        """This method is called when valid form data has been POSTed.
-
-        It should return an HttpResponse."""
-
-        return super(IntegrationLoopUpdateView, self).form_valid(form)
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(IntegrationLoopUpdateView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(IntegrationLoopUpdateView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        return context
-
-    def get_success_url(self):
-        '''Return the URL when the form is valid.'''
-        return reverse('IntegrationLoopDetail', args=[self.object.name])
+    reverse_url = 'IntegrationLoopDetail'

=== modified file 'dashboard/frontend/kernel_build/forms/kernel_loop_form.py'
--- dashboard/frontend/kernel_build/forms/kernel_loop_form.py	2012-09-04 11:23:32 +0000
+++ dashboard/frontend/kernel_build/forms/kernel_loop_form.py	2012-09-11 14:48:19 +0000
@@ -16,31 +16,20 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.forms import CharField
-from django.forms import IntegerField
-from django.forms import ModelForm
-from django.forms.widgets import HiddenInput
+from django.forms import (
+    CharField,
+    HiddenInput,
+)
+from frontend.forms.loop_form import LoopForm
 from frontend.kernel_build.models.kernel_loop import KernelLoop
-from frontend.widgets.chain_loop_widget import ChainLoopWidget
-
-
-class KernelLoopForm(ModelForm):
-
-    next_loop = IntegerField(widget=ChainLoopWidget, required=False)
+
+
+class KernelLoopForm(LoopForm):
+    """
+    Form class for the KernelLoop model.
+    """
+    class Meta(LoopForm.Meta):
+        model = KernelLoop
+
     type = CharField(widget=HiddenInput, initial=KernelLoop.__name__,
                      required=False)
-
-    class Meta:
-        model = KernelLoop
-        exclude = ('server')
-
-    def save(self, *args, **kwargs):
-        instance = super(KernelLoopForm, self).save(commit=False)
-
-        if self.data["next_loop_0"]:
-            next_loop = Loop.objects.get(id=self.data["next_loop_0"])
-            instance.next_loop = next_loop
-
-        instance.save()
-
-        return instance

=== modified file 'dashboard/frontend/kernel_build/templates/kernel_loop_create.html'
--- dashboard/frontend/kernel_build/templates/kernel_loop_create.html	2012-08-17 11:58:18 +0000
+++ dashboard/frontend/kernel_build/templates/kernel_loop_create.html	2012-09-11 14:48:19 +0000
@@ -1,8 +1,4 @@
-{% extends "base.html" %}
-
-{% block content %}
+{% extends "loop_create.html" %}
+{% block content_form %}
 <form action="{% url KernelLoopCreate %}" method="post">{% csrf_token %}
-{{ form.as_p }}
-<div><input type="submit" value="Submit" /></div>
-</form>
-{% endblock %}
+{% endblock content_form %}

=== modified file 'dashboard/frontend/kernel_build/templates/kernel_loop_detail.html'
--- dashboard/frontend/kernel_build/templates/kernel_loop_detail.html	2012-08-27 15:14:06 +0000
+++ dashboard/frontend/kernel_build/templates/kernel_loop_detail.html	2012-09-11 14:48:19 +0000
@@ -1,49 +1,7 @@
-{% extends "base.html" %}
-
-{% block breadcrumbs %}
-<div>
-<a href="{% url Index %}">Index</a>
-</div>
-{% endblock %}
-
-{% block content %}
-    <h2>Loop {{ kernel_loop_detail.name }}</h2>
-
-    <h4>Details</h4>
-    <div>
-    <table>
-    {% for k, v in kernel_loop_detail.json.items %}
-        <tr><td>{{ k }}</td><td>{{ v }}</td></tr>
-    {% endfor %}
-    </table>
-    </div>
-
-    <div>
-    <button type="button" id="update_button">Update loop configuration</button>
-    </div>
-
-    <h4>Builds</h4>
-    <div id="builds">
-      {% for build in builds %}
-        {% include "build.html" %}
-      {% endfor %}
-    </div>
-
-    <div>
-    <button type="button" id="schedule_button">Schedule new build</button>
-    </div>
-{% endblock %}
-
+{% extends "loop_detail.html" %}
 {% block scripts %}
-<script type="text/javascript">
-$("#schedule_button").click(function() {
-  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/kernel/build/{{ kernel_loop_detail.name }}/", function(data) {
-    $(data).prependTo($("#builds"));
-  });
-});
-
+{{ block.super }}
 $("#update_button").click(function() {
-  window.location.href = "{% url KernelLoopUpdate kernel_loop_detail.name %}";
+    window.location.href = "{% url KernelLoopUpdate loop_detail.name %}";
 });
-</script>
-{% endblock %}
+{% endblock scripts %}

=== modified file 'dashboard/frontend/kernel_build/templates/kernel_loop_update.html'
--- dashboard/frontend/kernel_build/templates/kernel_loop_update.html	2012-08-20 20:12:55 +0000
+++ dashboard/frontend/kernel_build/templates/kernel_loop_update.html	2012-09-11 14:48:19 +0000
@@ -1,8 +1,4 @@
-{% extends "base.html" %}
-
-{% block content %}
-<form action="{% url KernelLoopUpdate kernel_loop_update.name %}" method="post">{% csrf_token %}
-{{ form.as_p }}
-<div><input type="submit" value="Submit" /></div>
-</form>
-{% endblock %}
+{% extends "loop_create.html" %}
+{% block content_form %}
+<form action="{% url KernelLoopUpdate loop_update.name %}" method="post">{% csrf_token %}
+{% endblock content_form %}

=== modified file 'dashboard/frontend/kernel_build/tests/test_kernel_build_clientresponse.py'
--- dashboard/frontend/kernel_build/tests/test_kernel_build_clientresponse.py	2012-09-04 14:32:49 +0000
+++ dashboard/frontend/kernel_build/tests/test_kernel_build_clientresponse.py	2012-09-11 14:48:19 +0000
@@ -46,6 +46,7 @@
         template_names = [template.name for template in
                           response.templates]
         self.assertEquals(template_names, ["kernel_loop_create.html",
+                                           "loop_create.html",
                                            "base.html",
                                            "login.html",
                                            ])
@@ -70,6 +71,7 @@
         template_names = [template.name for template in
                           response.templates]
         self.assertEquals(template_names, ["kernel_loop_detail.html",
+                                           "loop_detail.html",
                                            "base.html",
                                            "login.html",
                                            ])

=== modified file 'dashboard/frontend/kernel_build/views/kernel_loop_create_view.py'
--- dashboard/frontend/kernel_build/views/kernel_loop_create_view.py	2012-08-20 20:12:55 +0000
+++ dashboard/frontend/kernel_build/views/kernel_loop_create_view.py	2012-09-11 14:48:19 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2012 Linaro
 #
 # This file is part of linaro-ci-dashboard.
@@ -16,39 +15,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-from django.views.generic.edit import CreateView
-from django.utils.decorators import method_decorator
 from frontend.kernel_build.forms.kernel_loop_form \
     import KernelLoopForm
 from frontend.kernel_build.models.kernel_loop import KernelLoop
-
-
-class KernelLoopCreateView(CreateView):
+from frontend.views.loop_create_view import LoopCreateView
+
+
+class KernelLoopCreateView(LoopCreateView):
 
     template_name = "kernel_loop_create.html"
     form_class = KernelLoopForm
     model = KernelLoop
-
-    def form_valid(self, form):
-        """This method is called when valid form data has been POSTed.
-
-        It should return an HttpResponse."""
-
-        return super(KernelLoopCreateView, self).form_valid(form)
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(KernelLoopCreateView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(KernelLoopCreateView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        return context
-
-    def get_success_url(self):
-        '''Return the URL when the form is valid.'''
-        return reverse('KernelLoopDetail', args=[self.object.name])
+    reverse_url = 'KernelLoopDetail'

=== modified file 'dashboard/frontend/kernel_build/views/kernel_loop_detail_view.py'
--- dashboard/frontend/kernel_build/views/kernel_loop_detail_view.py	2012-08-20 20:12:55 +0000
+++ dashboard/frontend/kernel_build/views/kernel_loop_detail_view.py	2012-09-11 14:48:19 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2012 Linaro
 #
 # This file is part of linaro-ci-dashboard.
@@ -16,27 +15,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.views.generic.detail import DetailView
-from django.utils.decorators import method_decorator
 from frontend.kernel_build.models.kernel_loop import KernelLoop
-
-
-class KernelLoopDetailView(DetailView):
+from frontend.views.loop_detail_view import LoopDetailView
+
+
+class KernelLoopDetailView(LoopDetailView):
 
     model = KernelLoop
-    context_object_name = 'kernel_loop_detail'
-    slug_field = "name"
-    template_name = "kernel_loop_detail.html"
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(KernelLoopDetailView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(KernelLoopDetailView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        context['builds'] = self.object.loop_ptr.loopbuild_set.all()
-        return context
+    template_name = 'kernel_loop_detail.html'
+    build_path = 'kernel'

=== modified file 'dashboard/frontend/kernel_build/views/kernel_loop_update_view.py'
--- dashboard/frontend/kernel_build/views/kernel_loop_update_view.py	2012-08-20 20:12:55 +0000
+++ dashboard/frontend/kernel_build/views/kernel_loop_update_view.py	2012-09-11 14:48:19 +0000
@@ -16,41 +16,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
-from django.views.generic.edit import UpdateView
-from django.utils.decorators import method_decorator
 from frontend.kernel_build.forms.kernel_loop_form \
     import KernelLoopForm
 from frontend.kernel_build.models.kernel_loop import KernelLoop
-
-
-class KernelLoopUpdateView(UpdateView):
-
-    template_name = "kernel_loop_update.html"
+from frontend.views.loop_update_view import LoopUpdateView
+
+
+class KernelLoopUpdateView(LoopUpdateView):
+
+    template_name = 'kernel_loop_update.html'
     form_class = KernelLoopForm
-    context_object_name = 'kernel_loop_update'
     model = KernelLoop
-    slug_field = "name"
-
-    def form_valid(self, form):
-        """This method is called when valid form data has been POSTed.
-
-        It should return an HttpResponse."""
-
-        return super(KernelLoopUpdateView, self).form_valid(form)
-
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(KernelLoopUpdateView, self).dispatch(*args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        '''Get the context data passed to template.'''
-        context = super(KernelLoopUpdateView,
-                        self).get_context_data(**kwargs)
-        context['request'] = self.request
-        return context
-
-    def get_success_url(self):
-        '''Return the URL when the form is valid.'''
-        return reverse('KernelLoopDetail', args=[self.object.name])
+    reverse_url = 'KernelLoopDetail'

=== modified file 'dashboard/frontend/models/loop.py'
--- dashboard/frontend/models/loop.py	2012-09-10 15:23:53 +0000
+++ dashboard/frontend/models/loop.py	2012-09-11 14:48:19 +0000
@@ -31,7 +31,7 @@
                                default=None,
                                null=True,
                                on_delete=models.SET_NULL)
-    type = models.CharField(max_length=50, editable=False)
+    type = models.CharField(max_length=50, editable=False, blank=True)
     is_restricted = models.BooleanField(default=False,
                                         verbose_name='Build is restricted')
     is_official = models.BooleanField(default=False,
@@ -41,11 +41,6 @@
                                      related_name='previous_loop',
                                      verbose_name='Next loop in chain')
 
-    # List of fields to be excluded by default from the base64 encoded config.
-    # If a subclass needs different fields, it is necessary to override this
-    # variable.
-    EXCLUDE_LIST = ['id', 'server', 'loop_ptr', 'next_loop', 'name', 'type']
-
     def __init__(self, *args, **kwargs):
         self.log = Logger.getClassLogger(self)
         super(Loop, self).__init__(*args, **kwargs)
@@ -125,16 +120,32 @@
         return []
 
     def __repr__(self):
-        return "%s(id=%s, ...)" % (self.__class__.__name__, self.id)
+        return "%s(id=%s)" % (self.__class__.__name__, self.id)
 
-    def base64_config(self):
+    def base64_config(self,
+                      include=None,
+                      exclude=None,
+                      capitalize=False,
+                      upper=False):
         """ Return loop configuration as base64 encoded string.
+
+        :param include: the list of fields, as string, to get.
+        :type include list
+        :param exclude: the list of fields, as string, to exclude.
+        :type exclude list
+        :param capitalize: whether the field name should be capitalized (the
+        first letter should be a capital one).
+        :type capitalize bool
+        :param upper: whether the field name should be all capital letter.
+        :type upper bool
+        :return A base64 encoded string composed of 'key=value'
         """
         text_config = u''
-        for field in self._meta.fields:
-            if not field.name in self.EXCLUDE_LIST:
-                text_config += u'%s=%s\n' % (field.name.upper(),
-                                             field.value_to_string(self))
+        for field in self._get_wanted_fields(include=include,
+                                             exclude=exclude,
+                                             capitalize=capitalize,
+                                             upper=upper):
+            text_config += u'%s=%s\n' % (field[0], str(field[1]))
         return base64.b64encode(text_config)
 
     def get_child_object(self):
@@ -150,6 +161,87 @@
             result.extend(Loop.objects.filter(type=loop_type))
         return result
 
+    def _get_wanted_fields(self,
+                           include=None,
+                           exclude=None,
+                           verbose_name=False,
+                           capitalize=False,
+                           upper=False):
+        """
+        Gets the wanted fields, as a list of tuples with
+        (field.name, field.value). By default retrieves all the fields
+        associated with the loop instance.
+
+        There is some control over the results: it is possible to retrieve only
+        a subset of the fields, to retrieve the verbose name associated with
+        the fields, and either to capitalize or make all capital letters
+        the name.
+
+        The parameters used to retrieve a subset of fields are 'include' and
+        'exclude'. If both are used, 'exclude' has precedence, meaning that if
+        a field is specified both in 'exclude' and in 'include', that result
+        will not include that field.
+
+        :param include: the list of fields, as string, to get.
+        :type include list
+        :param exclude: the list of fields, as string, to exclude.
+        :type exclude list
+        :param verbose_name: whether to retrieve the verbose name associated
+        with the field. Default False.
+        :type verbose_name bool
+        :param capitalize: whether the field name should be capitalized (the
+        first letter should be a capital one).
+        :type capitalize bool
+        :param upper: whether the field name should be all capital letter.
+        :type upper bool
+        :return a list of tuples, in which each tuple consists of
+        (field.name, field.value).
+        """
+        wanted_fields = []
+        for field in self._meta.fields:
+            # First check if field is excluded, in case both 'include'
+            # and 'exclude' are passed. Exclude wins.
+            if exclude and field.name in exclude:
+                continue
+            if include and not field.name in include:
+                continue
+
+            # Consider OneToOneField, since we do not have the value stored,
+            # we need to retrieve it.
+            value = None
+            if isinstance(field, models.related.OneToOneField):
+                pk = field.value_from_object(self)
+                if pk:
+                    value = Loop.objects.get(pk=pk).name
+            else:
+                value = field._get_val_from_obj(self)
+
+            if verbose_name:
+                name = field.verbose_name
+            else:
+                name = field.name
+            if capitalize:
+                name = name.capitalize()
+            if upper:
+                name = name.upper()
+
+            wanted_fields.append((name, value))
+        return wanted_fields
+
+    def get_details(self):
+        """
+        Retrieves the necessary fields for the detail view.
+        This is mostly and probably only needed in the detail HTML template.
+
+        The fields retrieved here are not all the fields in the model.
+
+        :return A list of tuples.
+        """
+        excluded_fields = ['name', 'server', 'type', 'id', 'loop_ptr']
+        return self._get_wanted_fields(exclude=excluded_fields,
+                                       verbose_name=True,
+                                       capitalize=True)
+
     def continue_down_the_chain(self, configuration=None):
         """Invokes the build of the next loop in chain.
 

=== modified file 'dashboard/frontend/models/textfield_loop.py'
--- dashboard/frontend/models/textfield_loop.py	2012-09-10 12:25:33 +0000
+++ dashboard/frontend/models/textfield_loop.py	2012-09-11 14:48:19 +0000
@@ -83,11 +83,22 @@
 
         if valid:
             for line in lines:
-                key, value = line.split(DEFAULT_DELIMITER)
-                text_to_dict[key.lower()] = value
+                key, value = self.split_line(line)
+                text_to_dict[key] = value
 
         return text_to_dict
 
+    def split_line(self, line):
+        """
+        Splits the line on the default delimiter defined in
+        'DEFAULT_DELIMITER'.
+
+        :param line: the line to split.
+        :type line str
+        return A tuple with (name, value).
+        """
+        return line.split(DEFAULT_DELIMITER)
+
     @staticmethod
     def valid_values(values):
         """
@@ -97,10 +108,11 @@
         :param values: the string with all the key<>value pairs, separated with
         a newline character.
         :type values unicode
-        :return a boolean for the validity, and the list of lines.
+        :return A tuple with the first element a boolean for the validity, the
+        second element the list of all the lines.
         """
         valid = True
-        lines = values.splitlines()
+        lines = TextFieldLoop._get_all_lines(values)
         for line in lines:
             if DEFAULT_DELIMITER in line:
                 continue
@@ -109,12 +121,21 @@
                 break
         return valid, lines
 
+    @staticmethod
+    def _get_all_lines(values):
+        """
+        Returns all the lines in the textfield as a single list.
+
+        :return The list of lines in the textfield.
+        """
+        return values.splitlines()
+
     def values_to_xml(self):
         """
         Converts the necessary values into an XML tree.
 
-        :return The XML tree as a string, or an empty string if the inserted
-        values are not valid.
+        :return The XML tree as a string, or an empty string if there are no
+        valid values.
         """
         xml_string = ""
         valid, lines = self.valid_values(self.values)
@@ -125,4 +146,25 @@
             if other_values:
                 values.update(other_values)
             xml_string = DictToXml(values).dict_to_tree()
+
         return xml_string
+
+    def get_details(self):
+        # We need to override this here, since we want each value inserted in
+        # the textfield to appear on a single line. We skip the field here
+        # and define a separate functions to retrieve the lines from the
+        # HTML template.
+        excluded_fields = ['name', 'server', 'type', 'id', 'loop_ptr',
+                           'values']
+        return self._get_wanted_fields(exclude=excluded_fields,
+                                       verbose_name=True,
+                                       capitalize=True)
+
+    def get_values(self):
+        """
+        This method is mostly used in the detail view for the textfield loops.
+        It returns the list of single string entered in the textfield.
+
+        :return A list of strings.
+        """
+        return self._get_all_lines(self.values)

=== added file 'dashboard/frontend/templates/__init__.py'
=== modified file 'dashboard/frontend/templates/base.html'
--- dashboard/frontend/templates/base.html	2012-09-03 12:04:52 +0000
+++ dashboard/frontend/templates/base.html	2012-09-11 14:48:19 +0000
@@ -2,35 +2,27 @@
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<title>
-{% block title %}
-{% endblock %}
-</title>
+<title>{% block title %} {% endblock title %}</title>
 <script type="text/javascript" src="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/js/jquery-1.7.2.js"></script>
 <script type="text/javascript" src="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/js/jquery-ui-1.8.23.custom.min.js"></script>
 <link rel="stylesheet" type="text/css" href="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/css/ui-lightness/jquery-ui-1.8.23.custom.css" />
 {% block extrahead %}
-  {{ form.media }}
-{% endblock %}
+{{ form.media }}
+{% endblock extrahead %}
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
 {% block style %}
-{% endblock %}
-
+{% endblock style %}
 {% block headcontent %}
-{% endblock %}
+{% endblock headcontent %}
 </head>
 <body>
-{% block login %}
-{% include "login.html" %}
-{% endblock %}
-
-{% block breadcrumbs %}
-{% endblock %}
-
-{% block content %}
-{% endblock %}
-
-{% block scripts %}
-{% endblock %}
+{% block login %}{% include "login.html" %}{% endblock login %}
+{% block breadcrumbs %} {% endblock breadcrumbs %}
+<div class="content">
+{% block content %}{% endblock content %}
+</div>
+<script type="text/javascript">
+{% block scripts %} {% endblock scripts %}
+</script>
 </body>
 </html>

=== modified file 'dashboard/frontend/templates/index.html'
--- dashboard/frontend/templates/index.html	2012-09-03 14:12:10 +0000
+++ dashboard/frontend/templates/index.html	2012-09-11 14:48:19 +0000
@@ -66,7 +66,6 @@
 {% endblock %}
 
 {% block scripts %}
-<script type="text/javascript">
 $("#create_button").click(function() {
   window.location.href = "{% url IntegrationLoopCreate %}";
 });
@@ -79,5 +78,4 @@
 $("#create_android_textfield").click(function() {
     window.location.href = "{% url AndroidTextFieldLoopCreate %}";
 });
-</script>
 {% endblock %}

=== added file 'dashboard/frontend/templates/loop_create.html'
--- dashboard/frontend/templates/loop_create.html	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/templates/loop_create.html	2012-09-11 14:48:19 +0000
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% block breadcrumbs %}
+    <div><a href="{% url Index %}">Index</a></div>
+{% endblock %}
+{% block content %}
+    {% block content_form %}
+    {% comment %}
+    This is where the Django default csrf_token stuff has to go. Each sub-app
+    extending the base classes and templates has to override only this part
+    in the template.
+    {% endcomment %}
+    {% endblock content_form %}
+    {% if form.non_field_errors %}
+        <div class="form_error">
+            {% for err in form.non_field_errors %}
+                <span class="error_message">{{ err }}</span>
+            {% endfor %}
+        </div>
+    {% endif %}
+    {% for field in form %}
+        {% if field.is_hidden %}
+            <div style="display:none;">{{ field }}</div>
+        {% else %}
+            <div class="form_field">
+                {{ field.label_tag }}&#58;&nbsp;{{ field }}
+                {% for err in field.errors %}
+                    <span class="error_message">{{ err }}</span>
+                {% endfor %}
+            </div>
+        {% endif %}
+    {% endfor %}
+<div><input type="submit" value="Submit" /></div>
+</form>
+{% endblock content %}

=== added file 'dashboard/frontend/templates/loop_detail.html'
--- dashboard/frontend/templates/loop_detail.html	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/templates/loop_detail.html	2012-09-11 14:48:19 +0000
@@ -0,0 +1,32 @@
+{% extends "base.html" %}
+{% block breadcrumbs %}
+    <div><a href="{% url Index %}">Index</a></div>
+{% endblock %}
+{% block content %}
+    <div class="header"><h2>Loop {{ loop_detail.name }}</h2></div>
+    <div class="header"><h4>Details</h4></div>
+    <div>
+        {% for name, value in loop_detail.get_details %}
+            <div>{{ name }}&#58;&nbsp;{{ value }}</div>
+        {% endfor %}
+    </div>
+    <div>
+        <button type="button" id="update_button">Update loop configuration</button>
+    </div>
+    <div class="header"><h4>Builds</h4></div>
+    <div id="builds">
+        {% for build in builds %}
+            {% include "build.html" %}
+        {% endfor %}
+    </div>
+    <div>
+        <button type="button" id="schedule_button">Schedule new build</button>
+    </div>
+{% endblock content %}
+{% block scripts %}
+$("#schedule_button").click(function() {
+    $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/{{ build_path }}/build/{{ loop_detail.name }}/", function(data) {
+    $(data).prependTo($("#builds"));
+    });
+});
+{% endblock scripts %}
\ No newline at end of file

=== added file 'dashboard/frontend/templates/textfield_loop_detail.html'
--- dashboard/frontend/templates/textfield_loop_detail.html	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/templates/textfield_loop_detail.html	2012-09-11 14:48:19 +0000
@@ -0,0 +1,28 @@
+{% extends "loop_detail.html" %}
+{% block content %}
+    <div class="header"><h2>Loop {{ loop_detail.name }}</h2></div>
+    <div class="header"><h4>Details</h4></div>
+    <div>
+        {% for name, value in loop_detail.get_details %}
+            <div>{{ name }}&#58;&nbsp;{{ value }}</div>
+        {% endfor %}
+    </div>
+    <div class="header"><h4>Values</h4></div>
+    <div class="textfield">
+        {% for value in loop_detail.get_values %}
+            <div>{{ value }}</div>
+        {% endfor %}
+    </div>
+    <div>
+        <button type="button" id="update_button">Update loop configuration</button>
+    </div>
+    <div class="header"><h4>Builds</h4></div>
+    <div id="builds">
+        {% for build in builds %}
+            {% include "build.html" %}
+        {% endfor %}
+    </div>
+    <div>
+        <button type="button" id="schedule_button">Schedule new build</button>
+    </div>
+{% endblock content %}

=== modified file 'dashboard/frontend/templatetags/dashboard_extras.py'
--- dashboard/frontend/templatetags/dashboard_extras.py	2012-08-08 09:21:46 +0000
+++ dashboard/frontend/templatetags/dashboard_extras.py	2012-09-11 14:48:19 +0000
@@ -1,10 +1,7 @@
 from django import template
-from django.template.defaultfilters import stringfilter
-
 
 register = template.Library()
 
 @register.filter
 def verbose_name(value, field):
     return value._meta.get_field(field).verbose_name
-

=== modified file 'dashboard/frontend/tests/test_clientresponse.py'
--- dashboard/frontend/tests/test_clientresponse.py	2012-09-04 11:23:32 +0000
+++ dashboard/frontend/tests/test_clientresponse.py	2012-09-11 14:48:19 +0000
@@ -82,6 +82,7 @@
         template_names = [template.name for template in
                           response.templates]
         self.assertEquals(template_names, ["integration_loop_create.html",
+                                           "loop_create.html",
                                            "base.html",
                                            "login.html",
                                            ])
@@ -108,6 +109,7 @@
         template_names = [template.name for template in
                           response.templates]
         self.assertEquals(template_names, ["integration_loop_detail.html",
+                                           "loop_detail.html",
                                            "base.html",
                                            "login.html",
                                            ])

=== modified file 'dashboard/frontend/tests/test_models.py'
--- dashboard/frontend/tests/test_models.py	2012-09-10 12:25:33 +0000
+++ dashboard/frontend/tests/test_models.py	2012-09-11 14:48:19 +0000
@@ -93,6 +93,66 @@
         self.assertEqual(expected_out,
                          self.loop.dict_for_xml(exclude=exclude_list))
 
+    def test_wanted_fields_one_field_included(self):
+        include = ['type']
+        expected_out = [('type', Loop.__class__.__name__)]
+        self.assertEqual(expected_out,
+                         self.loop._get_wanted_fields(include=include))
+
+    def test_wanted_fields_two_fields_included(self):
+        include = ['type', 'is_restricted']
+        expected_out = [
+            ('type', Loop.__class__.__name__),
+            ('is_restricted', False)
+        ]
+        self.assertEqual(expected_out,
+                         self.loop._get_wanted_fields(include=include))
+
+    def test_wanted_fields_one_field_excluded(self):
+        exclude = ['type']
+        expected_out = [
+            ('id', self.loop.id),
+            ('name', 'a-loop'),
+            ('server', None),
+            ('is_restricted', False),
+            ('is_official', False),
+            ('next_loop', None)
+        ]
+        self.assertEqual(expected_out,
+                         self.loop._get_wanted_fields(exclude=exclude))
+
+    def test_wanted_fields_two_fields_excluded(self):
+        exclude = ['type', 'id']
+        expected_out = [
+            ('name', 'a-loop'),
+            ('server', None),
+            ('is_restricted', False),
+            ('is_official', False),
+            ('next_loop', None)
+        ]
+        self.assertEqual(expected_out,
+                         self.loop._get_wanted_fields(exclude=exclude))
+
+    def test_wanted_fields_include_and_exclude(self):
+        exclude = ['type']
+        include = ['type', 'id']
+        expected_out = [
+            ('id', self.loop.id)
+        ]
+        self.assertEqual(expected_out,
+                         self.loop._get_wanted_fields(include=include,
+                                                      exclude=exclude))
+
+    def test_convert_to_base64(self):
+        from base64 import b64encode
+        exclude = ['type', 'id']
+        fields = self.loop._get_wanted_fields(exclude=exclude, upper=True)
+        encoded_string = u''
+        for field in fields:
+            encoded_string += u'%s=%s\n' % (field[0], str(field[1]))
+        self.assertEqual(b64encode(encoded_string),
+                         self.loop.base64_config(exclude=exclude, upper=True))
+
     def test_continue_down_the_chain_no_next_loop(self):
         self.loop.continue_down_the_chain()
         self.assertEqual(0, len(self.integration_loop.loopbuild_set.all()))

=== modified file 'dashboard/frontend/urls.py'
--- dashboard/frontend/urls.py	2012-08-31 15:21:11 +0000
+++ dashboard/frontend/urls.py	2012-09-11 14:48:19 +0000
@@ -31,5 +31,4 @@
         LoopBuildView.as_view(), name='LoopBuild'),
     url(r'^loop/get_chainable/$',
         LoopGetChainableView.as_view(), name='LoopGetChainable'),
-
 )

=== modified file 'dashboard/frontend/views/loop_build_view.py'
--- dashboard/frontend/views/loop_build_view.py	2012-08-27 16:00:38 +0000
+++ dashboard/frontend/views/loop_build_view.py	2012-09-11 14:48:19 +0000
@@ -26,8 +26,10 @@
 
 class LoopBuildView(DetailView):
 
+    # This field should *never* be overridden.
+    slug_field = "name"
+    # The following field has to be overridden in each sub-class.
     model = Loop
-    slug_field = "name"
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):

=== added file 'dashboard/frontend/views/loop_create_view.py'
--- dashboard/frontend/views/loop_create_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/views/loop_create_view.py	2012-09-11 14:48:19 +0000
@@ -0,0 +1,52 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.contrib.auth.decorators import login_required
+from django.core.urlresolvers import reverse
+from django.views.generic.edit import CreateView
+from django.utils.decorators import method_decorator
+from frontend.models.loop import Loop
+from frontend.forms.loop_form import LoopForm
+
+
+class LoopCreateView(CreateView):
+
+    # All these fields have to be overridden in each sub-class.
+    template_name = 'loop_create.html'
+    form_class = LoopForm
+    model = Loop
+    reverse_url = 'LoopDetail'
+
+    def form_valid(self, form):
+        """This method is called when valid form data has been POSTed.
+
+        It should return an HttpResponse."""
+        return super(LoopCreateView, self).form_valid(form)
+
+    @method_decorator(login_required)
+    def dispatch(self, *args, **kwargs):
+        return super(LoopCreateView, self).dispatch(*args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        """Get the context data passed to template."""
+        context = super(LoopCreateView, self).get_context_data(**kwargs)
+        context['request'] = self.request
+        return context
+
+    def get_success_url(self):
+        """Return the URL when the form is valid."""
+        return reverse(self.reverse_url, args=[self.object.name])

=== added file 'dashboard/frontend/views/loop_detail_view.py'
--- dashboard/frontend/views/loop_detail_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/views/loop_detail_view.py	2012-09-11 14:48:19 +0000
@@ -0,0 +1,46 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.contrib.auth.decorators import login_required
+from django.views.generic.detail import DetailView
+from django.utils.decorators import method_decorator
+from frontend.models.loop import Loop
+
+class LoopDetailView(DetailView):
+
+    # These two fields should *never* be overridden.
+    context_object_name = 'loop_detail'
+    slug_field = 'name'
+    # The following fields have to be overridden in each sub-class.
+    model = Loop
+    template_name = 'loop_detail.html'
+    # This is necessary for each loop to define the URL path for the build
+    # view. This must be overridden.
+    build_path = 'loop'
+
+    @method_decorator(login_required)
+    def dispatch(self, *args, **kwargs):
+        return super(LoopDetailView, self).dispatch(*args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        '''Get the context data passed to template.'''
+        context = super(LoopDetailView, self).get_context_data(**kwargs)
+        loop_pointer = self.object.loop_ptr
+        context['request'] = self.request
+        context['builds'] = loop_pointer.loopbuild_set.all()
+        context['build_path'] = self.build_path
+        return context

=== modified file 'dashboard/frontend/views/loop_get_chainable_view.py'
--- dashboard/frontend/views/loop_get_chainable_view.py	2012-09-04 11:56:22 +0000
+++ dashboard/frontend/views/loop_get_chainable_view.py	2012-09-11 14:48:19 +0000
@@ -25,27 +25,27 @@
 from frontend.models.loop import Loop
 from lib.model_getter import ModelGetter
 
+
 class LoopGetChainableView(ListView):
 
     model = Loop
+    template = "list_chainable.html"
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):
         return super(LoopGetChainableView, self).dispatch(*args, **kwargs)
 
     def render_to_response(self, context):
-
         if self.request.is_ajax():
-
             request_data = self.request.GET
 
             type = request_data.get('type')
+            page = request_data.get('page')
+
             loop_cls = ModelGetter.get_model(type)
             chainable_loops_all = loop_cls.get_all_chainable()
-
             paginator = Paginator(chainable_loops_all, 10)
 
-            page = request_data.get('page')
             try:
                 chainable_loops = paginator.page(page)
             except PageNotAnInteger:
@@ -57,10 +57,8 @@
                 "chainable_loops": chainable_loops,
             }
 
-            template = "list_chainable.html"
-            return render_to_response(template, data,
-                                        context_instance=RequestContext(
-                                        self.request))
-
+            return render_to_response(self.template, data,
+                                      context_instance=RequestContext(
+                                          self.request))
         else:
             raise NotImplementedError

=== added file 'dashboard/frontend/views/loop_update_view.py'
--- dashboard/frontend/views/loop_update_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/views/loop_update_view.py	2012-09-11 14:48:19 +0000
@@ -0,0 +1,55 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.contrib.auth.decorators import login_required
+from django.core.urlresolvers import reverse
+from django.views.generic.edit import UpdateView
+from django.utils.decorators import method_decorator
+from frontend.models.loop import Loop
+from frontend.forms.loop_form import LoopForm
+
+
+class LoopUpdateView(UpdateView):
+
+    # These two fields should *never* be overridden.
+    context_object_name = 'loop_update'
+    slug_field = 'name'
+    # The following fields have to be overridden in each sub-class.
+    template_name = 'loop_create.html'
+    form_class = LoopForm
+    model = Loop
+    reverse_url = 'LoopDetail'
+
+    def form_valid(self, form):
+        """This method is called when valid form data has been POSTed.
+
+        It should return an HttpResponse."""
+        return super(LoopUpdateView, self).form_valid(form)
+
+    @method_decorator(login_required)
+    def dispatch(self, *args, **kwargs):
+        return super(LoopUpdateView, self).dispatch(*args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        """Get the context data passed to template."""
+        context = super(LoopUpdateView, self).get_context_data(**kwargs)
+        context['request'] = self.request
+        return context
+
+    def get_success_url(self):
+        """Return the URL when the form is valid."""
+        return reverse(self.reverse_url, args=[self.object.name])

=== modified file 'dashboard/frontend/widgets/chain_loop_widget.py'
--- dashboard/frontend/widgets/chain_loop_widget.py	2012-09-04 11:23:32 +0000
+++ dashboard/frontend/widgets/chain_loop_widget.py	2012-09-11 14:48:19 +0000
@@ -18,8 +18,6 @@
 
 from django.forms.widgets import HiddenInput
 from django.forms.widgets import MultiWidget
-from django.template import loader
-from django.template.base import Context
 from frontend.models.loop import Loop
 from frontend.widgets.link_widget import LinkWidget
 
@@ -34,14 +32,14 @@
             HiddenInput(attrs=attrs),
             LinkWidget(attrs=attrs),
             )
-
         super(ChainLoopWidget, self).__init__(_widgets, attrs)
 
     def decompress(self, value):
+        rtn_list = [None, None]
         if value:
             name = Loop.objects.get(id=value).name
-            return [value, name]
-        return [None, None]
+            rtn_list = [value, name]
+        return rtn_list
 
     def format_output(self, rendered_widgets):
         return u''.join(rendered_widgets)

=== modified file 'dashboard/jenkinsserver/models/jenkins_server.py'
--- dashboard/jenkinsserver/models/jenkins_server.py	2012-08-24 13:00:02 +0000
+++ dashboard/jenkinsserver/models/jenkins_server.py	2012-09-11 14:48:19 +0000
@@ -102,7 +102,6 @@
         "Prepare the config.xml to be used for the job."
         # Get generic serialization data.
         loop_params = loop.json()
-
         template_name = loop.__class__.__name__
 
         # We need to handle the CONFIG parameter as a base64 encoded string.