Move stream views to views_stream.py

 - Legacy-Id: 6266

Author: OleLaursen

ietf/group/stream_urls.py

@@ -2,14 +2,11 @@
 
 from django.conf.urls.defaults import patterns, include
 
-import views
+import views_stream
 
 urlpatterns = patterns('',
-     (r'^$', views.streams),
-     (r'^(?P<acronym>[a-zA-Z0-9-]+)/$', views.stream_documents, None),
-     (r'^(?P<acronym>[a-zA-Z0-9-]+)/edit/$', views.stream_edit),
-#     (r'^(?P<acronym>[a-zA-Z0-9-]+)/history/$', views.stream_history),
-#     (r'^(?P<acronym>[a-zA-Z0-9-]+)/edit/$', views.stream_edit)
+     (r'^$', views_stream.streams),
+     (r'^(?P<acronym>[a-zA-Z0-9-]+)/$', views_stream.stream_documents, None),
+     (r'^(?P<acronym>[a-zA-Z0-9-]+)/edit/$', views_stream.stream_edit),
      (r'^management/', include('ietf.ietfworkflows.urls')),
-
 )

ietf/group/tests.py

@@ -21,7 +21,7 @@ def test_stream_edit(self):
 
         stream_acronym = "ietf"
 
-        url = urlreverse("ietf.group.views.stream_edit", kwargs=dict(acronym=stream_acronym))
+        url = urlreverse("ietf.group.views_stream.stream_edit", kwargs=dict(acronym=stream_acronym))
         login_testing_unauthorized(self, "secretary", url)
 
         # get

ietf/group/views.py ietf/group/views_stream.pyietf/group/views.py renamed to ietf/group/views_stream.py

@@ -88,9 +88,9 @@
   <li><form action="/doc/search/" method="get" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activedrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
   <li>
      <div style="padding: 0 0 0 10px;">Streams:</div>
-     <a style="padding: 0 0 0 20px;" href="{% url ietf.group.views.streams %}iab/">IAB</a>
-     <a style="padding: 0;" href="{% url ietf.group.views.streams %}irtf/">IRTF</a>
-     <a style="padding: 0;" href="{% url ietf.group.views.streams %}ise/">ISE</a>
+     <a style="padding: 0 0 0 20px;" href="{% url ietf.group.views_stream.streams %}iab/">IAB</a>
+     <a style="padding: 0;" href="{% url ietf.group.views_stream.streams %}irtf/">IRTF</a>
+     <a style="padding: 0;" href="{% url ietf.group.views_stream.streams %}ise/">ISE</a>
   </li> 
   <li><a href="{% url submit_index %}">Submit a draft</a></li> 
 {% if user|in_group:"WG Chair" %}

ietf/templates/base/left_menu.html

@@ -2,6 +2,6 @@
 {% if editable_streams %}
 <li class="sect">Streams</li>
   {% for stream in editable_streams %}
-  <li{% if forloop.last %} style="margin-bottom: 2px;"{% endif %}><a href="{% url ietf.group.views.stream_edit stream.slug %}">{{ stream.name }} stream</a></li>
+  <li{% if forloop.last %} style="margin-bottom: 2px;"{% endif %}><a href="{% url ietf.group.views_stream.stream_edit stream.slug %}">{{ stream.name }} stream</a></li>
   {% endfor %}
 {% endif %}

ietf/templates/base/streams_menu.html

@@ -40,7 +40,7 @@ <h1>Manage {{ group.name }} stream</h1>
     <tr>
       <td></td>
       <td class="actions">
-        <a class="button" href="{% url ietf.group.views.streams %}">Cancel</a>
+        <a class="button" href="{% url ietf.group.views_stream.streams %}">Cancel</a>
         <input class="button" type="submit" value="Save"/>
       </td>
     </tr>