rrs: Add support for Release

Now Recipes and Maintainers page can be access by Release and Milestone,
to support this a url namespace was add also update views/templates
handle new URL's.

rrs/models.py: Add support model for store Release also foregin key in
Milestone.
rrs/admin.py: Add admin site for Release model.
rrs/fixtures/initial_data.json: Add initial data with Release/Milestone
relation.
rrs/{views, urls}.py: Add support for handle Release/Milestone.
templates/rrs: Update to handle new URL's.

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>

4 files changed, 100 insertions, 74 deletions

diff --git a/templates/rrs/base_toplevel.html b/templates/rrs/base_toplevel.html
index f97d92511b..c09a6bed93 100644
--- a/templates/rrs/base_toplevel.html
+++ b/templates/rrs/base_toplevel.html
@@ -14,6 +14,43 @@
 {% endcomment %}
 
 {% block topfunctions %}
+<ul class="nav">
+<li class="divider-vertical" style="display; list-item;"/>
+{% block release_selector %}
+    <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+        Release: <b>{{ release_name }}</b>
+        <b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu">
+            {% for r in all_releases %}
+                <li><a href="{% url this_url_name r.name r.name|add:"All" %}{{ extra_url_param }}">
+                    {% if r.name = release_name %}<b>{% endif %}
+                    {{ r.name }}
+                    {% if r.name = release_name %}</b>{% endif %}
+                </a></li>
+            {% endfor %}
+        </ul>
+    </li>
+{% endblock %}
+{% block milestone_selector %}
+    <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+        Milestone: <b>{{ milestone_name }}</b>
+        <b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu">
+            {% for m in all_milestones %}
+                <li><a href="{% url this_url_name release_name m.name %}{{ extra_url_param }}">
+                    {% if m.name = milestone_name %}<b>{% endif %}
+                    {{ m.name }}
+                    {% if m.name = milestone_name %}</b>{% endif %}
+                </a></li>
+            {% endfor %}
+        </ul>
+    </li>
+{% endblock %}
+</ul>
 {% endblock %}
 
 {% block content %}
@@ -21,24 +58,8 @@
 
             <div class="navbar">
                 <div class="navbar-inner">
+                    <span class="brand">{{ milestone_name }}</span>
                     <ul class="nav">
-                        {% block milestone_selector %}
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            Milestone: <b>{{ milestone_name }}</b>
-                            <b class="caret"></b>
-                            </a>
-                            <ul class="dropdown-menu">
-                                {% for m in all_milestones %}
-                                    <li><a href="{% url this_url_name m.name %}{{ extra_url_param }}">
-                                        {% if m.name = milestone_name %}<b>{% endif %}
-                                        {{ m.name }}
-                                        {% if m.name = milestone_name %}</b>{% endif %}
-                                    </a></li>
-                                {% endfor %}
-                            </ul>
-                        </li>
-                        {% endblock %}
                         <li class="divider-vertical"></li>
                         <li class="lead" id="percentage"><strong>{{ recipes_percentage }}%</strong> done</li>
                         <li class="divider-vertical"></li>
@@ -64,7 +85,7 @@
                 <a href="#">
 		{% else %}
                 <li>
-                <a href="{% url 'recipes' milestone_name %}{{ extra_url_param }}">
+                <a href="{% url 'recipes' release_name milestone_name %}{{ extra_url_param }}">
 		{% endif %}
                 Recipes status</a>
                 </li>
@@ -74,7 +95,7 @@
                 <a href="#">
 		{% else %}
                 <li>
-                <a href="{% url 'maintainers' milestone_name %}">
+                <a href="{% url 'maintainers' release_name milestone_name %}">
 		{% endif %}
                 Maintainer statistics</a>
                 </li>
diff --git a/templates/rrs/maintainers.html b/templates/rrs/maintainers.html
index 4dca3eeea5..d71017cec6 100644
--- a/templates/rrs/maintainers.html
+++ b/templates/rrs/maintainers.html
@@ -24,8 +24,9 @@
             <span class="badge" style="margin-top:11px;"></span>
             </li>
         </ul>    		
-        <form class="navbar-form pull-right">
-            <input type="text" class="input-xxlarge pull-right" placeholder="Search maintainers" id="filter">				
+        <form id="form-search" class="navbar-form pull-right">
+            <input type="text" class="input-xxlarge" placeholder="Search maintainers" id="filter">				
+            <button type="submit" value="Search" class="btn btn-info" id="btn-search">Search</button>
         </form>
     </div>
 </div>
@@ -33,27 +34,27 @@
 <div id="no_maintainers_alert" class="alert">
     No maintainers found <a href="#" id="view-all-maintainers" style="margin-left:10px;">View all maintainers</a>
 </div>
-<table class="table table-bordered table-hovere" id="statistics-table">
-    <thead>
-        <tr>
-            <th class="sorted">Maintainer<b class="caret"/></th>
-            <th class="muted">Assigned recipes</th>
-            <th class="muted">Up-to-date</th>
-            <th>Not updated</th>
-            <th class="muted">Can't be updated</th>
-            <th class="muted">Unknown</th>
-            <th>% done</th>
-
-            {% for w in milestone_weeks %}
-            {% if current_week == forloop.counter0 %}
-            <th class="current-wk">
-            {% else %}
-            <th class="muted">
-            {% endif %}
-            wk{{ w }}
-            </th>
-            {% endfor %}
-        </tr>
+<table class="table table-bordered table-hover" id="statistics-table">
+<thead>
+    <tr>
+        <th class="sorted">Maintainer<b class="caret"/></th>
+        <th class="muted">Assigned recipes</th>
+        <th class="muted">Up-to-date</th>
+        <th>Not updated</th>
+        <th class="muted">Can't be updated</th>
+        <th class="muted">Unknown</th>
+        <th>% done</th>
+
+        {% for w in milestone_weeks %}
+        {% if current_week == forloop.counter0 %}
+        <th class="current-wk">
+        {% else %}
+        <th class="muted">
+        {% endif %}
+        wk{{ w }}
+        </th>
+        {% endfor %}
+    </tr>
 </thead>
 <tbody>
 {% for ml in maintainer_list %}
@@ -62,27 +63,27 @@
             {{ ml.name }}
         </td>
         <td>
-            <a href="{% url 'recipes' milestone_name %}?maintainer_name={{ ml.name|urlencode }}">
+            <a href="{% url 'recipes' release_name milestone_name %}?maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_all }}
             </a>
         </td>
         <td>
-            <a href="{% url 'recipes' milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
+            <a href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Up-to-date"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_up_to_date }}
             </a>
         </td>
         <td>
-            <a href="{% url 'recipes' milestone_name %}?upstream_status={{ "Not updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
+            <a href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Not updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_not_updated }}
             </a>
         </td>
         <td>
-            <a href="{% url 'recipes' milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
+            <a href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Can't be updated"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_cant_be_updated }}
             </a>
         </td>
         <td>
-            <a href="{% url 'recipes' milestone_name %}?upstream_status={{ "Unknown"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
+            <a href="{% url 'recipes' release_name milestone_name %}?upstream_status={{ "Unknown"|urlencode }}&maintainer_name={{ ml.name|urlencode }}">
                 {{ ml.recipes_unknown }}
             </a>
         </td>
@@ -103,7 +104,6 @@
 {% endblock %}
 
 {% block scripts %}
-{% if maintainer_count > 0 %}
 <script src="{% static "js/uitablefilter.js" %}"></script>
 <script src="{% static "js/jquery.tablesorter.js" %}"></script>
 <script>
@@ -131,6 +131,20 @@ $(document).ready(function() {
         }
     }
 
+    $("#form-search").submit(function( event ) {
+        search_text = $("#filter").val()
+        $.uiTableFilter(statisticsTable, search_text);
+        updateMaintainerCount()
+        event.preventDefault();
+    });
+
+    $("#view-all-maintainers").click(function() {
+        $.uiTableFilter(statisticsTable, '');
+        $("#filter").val('')
+        updateMaintainerCount()
+    });
+
+{% if maintainer_count > 0 %}
     $(statisticsTable).tablesorter({
         sortList: [[0,0]],
         headers: {
@@ -150,20 +164,9 @@ $(document).ready(function() {
             14: { sorter: false },
         }
     });
-
-    $("#filter").keyup(function() { 
-        $.uiTableFilter(statisticsTable, this.value);
-        updateMaintainerCount()
-    });
-
-    $("#view-all-maintainers").click(function() {
-        $.uiTableFilter(statisticsTable, '');
-        $("#filter").val('')
-        updateMaintainerCount()
-    });
+{% endif %}
 
     updateMaintainerCount()
 });
 </script>
-{% endif %}
 {% endblock %}
diff --git a/templates/rrs/recipedetail.html b/templates/rrs/recipedetail.html
index 57743c3167..1e24707f02 100644
--- a/templates/rrs/recipedetail.html
+++ b/templates/rrs/recipedetail.html
@@ -45,7 +45,7 @@
             <li class="lead">Upstream version: <strong>{{ upstream_version }}</strong></li>
             {% endif %}
             <li class="divider-vertical"></li>
-            <li class="lead">Maintainer: <strong><a href="{% url recipes milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></strong></li>
+            <li class="lead">Maintainer: <strong><a href="{% url recipes release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></strong></li>
             <li class="divider-vertical"></li>
         </ul>
     </div>
@@ -79,14 +79,14 @@
                     <td>{{ rud.title }}</td>
                     <td>{{ rud.version }}</td>
                     {% if rud.milestone_name %}
-                    <td><a href="{% url recipes rud.milestone_name %}">{{ rud.milestone_name }}</a></td>
+                    <td><a href="{% url recipes rud.release_name rud.milestone_name %}">{{ rud.milestone_name }}</a></td>
                     {% else %}
                     <td>{{ rud.milestone_name }}</td>
                     {% endif %}
                     <td>{{ rud.date }}</td>
 
                     {% if rud.is_recipe_maintainer %} 
-                    <td><a href="{% url recipes rud.milestone_name %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td>
+                    <td><a href="{% url recipes rud.release_name rud.milestone_name %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td>
                     {% else %}
                     <td>{{ rud.maintainer_name }}</a></td>
                     {% endif %}
diff --git a/templates/rrs/recipes.html b/templates/rrs/recipes.html
index 2d971b21f2..d823517bc1 100644
--- a/templates/rrs/recipes.html
+++ b/templates/rrs/recipes.html
@@ -212,17 +212,6 @@ $(document).ready(function() {
         updateMaintainerSelected()
     }
 
-    $(recipesTable).tablesorter({
-        sortList: [[0,0]],
-        headers: {
-            1: { sorter: false },
-            2: { sorter: false },
-            3: { sorter: false },
-            4: { sorter: false },
-            5: { sorter: false },
-        }
-    }); 
-
     $("#form-search").submit(function( event ) {
         upstreamStatus = 'All' 
         maintainer = 'All'
@@ -253,6 +242,19 @@ $(document).ready(function() {
         updateRecipeCount()
     });
 
+{% if recipe_list_count > 0 %}
+    $(recipesTable).tablesorter({
+        sortList: [[0,0]],
+        headers: {
+            1: { sorter: false },
+            2: { sorter: false },
+            3: { sorter: false },
+            4: { sorter: false },
+            5: { sorter: false },
+        }
+    }); 
+{% endif %}
+
     applyFilters()
     updateRecipeCount()
 });