From 5f693fdf84a3f6e7978b0107a5432f16ce62e103 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 14 2016 18:24:20 +0000
Subject: [PATCH 1/4] Adjust the routes so that we support both url with and without a trailing slash


---

diff --git a/hubs/app.py b/hubs/app.py
index 47099c4..6d3e2e6 100755
--- a/hubs/app.py
+++ b/hubs/app.py
@@ -100,15 +100,16 @@ def groups():
     )
 
 
-@app.route('/<name>')
 @app.route('/<name>/')
+@app.route('/<name>')
 def hub(name):
     hub = get_hub(session, name)
     return flask.render_template(
         'hubs.html', hub=hub, session=session, edit=False)
 
-@app.route('/<name>/json')
+
 @app.route('/<name>/json/')
+@app.route('/<name>/json')
 def hub_json(name):
     hub = get_hub(session, name)
     response = flask.jsonify(hub.__json__(session))
@@ -116,16 +117,16 @@ def hub_json(name):
     return response
 
 
-@app.route('/<name>/edit', methods=['GET'])
 @app.route('/<name>/edit/', methods=['GET'])
+@app.route('/<name>/edit', methods=['GET'])
 def hub_edit_get(name):
     hub = get_hub(session, name)
     return flask.render_template(
         'hubs.html', hub=hub, session=session, edit=True)
 
 
-@app.route('/<name>/edit', methods=['POST'])
 @app.route('/<name>/edit/', methods=['POST'])
+@app.route('/<name>/edit', methods=['POST'])
 def hub_edit_post(name):
     #hub = get_hub(session, name)
     # TODO -- save things to the db ... and then redirect
@@ -134,8 +135,8 @@ def hub_edit_post(name):
     flask.redirect(flask.url_for('hub', name=name))
 
 
-@app.route('/<hub>/<idx>')
 @app.route('/<hub>/<idx>/')
+@app.route('/<hub>/<idx>')
 def widget_render(hub, idx):
     widget = get_widget(session, hub, idx)
     return widget.render(session)#, edit=False)
@@ -151,8 +152,8 @@ def widget_json(hub, idx):
     return response
 
 
-@app.route('/<hub>/<idx>/edit', methods=['GET'])
 @app.route('/<hub>/<idx>/edit/', methods=['GET'])
+@app.route('/<hub>/<idx>/edit', methods=['GET'])
 def widget_edit_get(hub, idx):
     widget = get_widget(session, hub, idx)
     raise NotImplementedError('next step is to get the widgets to render '
@@ -161,8 +162,8 @@ def widget_edit_get(hub, idx):
     return widget.render(session, edit=True)
 
 
-@app.route('/<hub>/<idx>/edit', methods=['POST'])
 @app.route('/<hub>/<idx>/edit/', methods=['POST'])
+@app.route('/<hub>/<idx>/edit', methods=['POST'])
 def widget_edit_post(hub, idx):
     #widget = get_widget(session, hub, idx)
     # TODO -- save things to the db ... and then redirect
@@ -171,8 +172,8 @@ def widget_edit_post(hub, idx):
     flask.redirect(flask.url_for('hub', name=hub))
 
 
-@app.route('/source/<name>')
 @app.route('/source/<name>/')
+@app.route('/source/<name>')
 def widget_source(name):
     from hubs.widgets import registry
     base = '/hubs/'
@@ -319,6 +320,7 @@ def hub_subscribe(hub):
     session.commit()
     return flask.redirect(flask.url_for('hub', name=hub.name))
 
+
 @app.route('/api/hub/<hub>/unsubscribe', methods=['POST'])
 @login_required
 def hub_unsubscribe(hub):
@@ -331,6 +333,7 @@ def hub_unsubscribe(hub):
     session.commit()
     return flask.redirect(flask.url_for('hub', name=hub.name))
 
+
 @app.route('/api/hub/<hub>/star', methods=['POST'])
 @login_required
 def hub_star(hub):
@@ -340,6 +343,7 @@ def hub_star(hub):
     session.commit()
     return flask.redirect(flask.url_for('hub', name=hub.name))
 
+
 @app.route('/api/hub/<hub>/unstar', methods=['POST'])
 @login_required
 def hub_unstar(hub):
@@ -352,6 +356,7 @@ def hub_unstar(hub):
     session.commit()
     return flask.redirect(flask.url_for('hub', name=hub.name))
 
+
 @app.route('/api/hub/<hub>/join', methods=['POST'])
 @login_required
 def hub_join(hub):
@@ -361,6 +366,7 @@ def hub_join(hub):
     session.commit()
     return flask.redirect(flask.url_for('hub', name=hub.name))
 
+
 @app.route('/api/hub/<hub>/leave', methods=['POST'])
 @login_required
 def hub_leave(hub):

From d6883063b276e38ae9732f9094c642f8d7b2e2fb Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 14 2016 18:24:20 +0000
Subject: [PATCH 2/4] Adjust indentation in the html


---

diff --git a/hubs/templates/groups.html b/hubs/templates/groups.html
index a26fd17..230e54a 100644
--- a/hubs/templates/groups.html
+++ b/hubs/templates/groups.html
@@ -9,12 +9,15 @@
 <body>
 <div class="super-header">
   <div class="row">
-	  <div class="col-xs-4" id="logo"><img src="{{ url_for('static', filename='img/logo-hubs.png') }}" alt="Fedora Hubs"></div>
+    <div class="col-xs-4" id="logo">
+      <img src="{{ url_for('static', filename='img/logo-hubs.png') }}" alt="Fedora Hubs">
+    </div>
     <div class="col-sm-4 col-sm-push-4 col-xs-8">
       {% if g.auth.logged_in %}
         <div class="dropdown pull-right">
           <img class = "icon" src="{{ url_for('static', filename='img/irc_icon.png') }}" alt="IRC Chats">
-        <span class="dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+        <span class="dropdown-toggle" type="button" id="dropdownMenu1"
+            data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
           <img src="{{ g.auth.avatar }}" class="avatar" alt="User Icon"/>
           {# Logged in as #} {{ g.auth.nickname }}
           <span class="glyphicon glyphicon-chevron-down" aria-hidden="true"></span>
@@ -46,7 +49,9 @@
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+        <button type="button" class="navbar-toggle collapsed"
+            data-toggle="collapse"
+            data-target="#bs-example-navbar-collapse-1">
           <span class="sr-only">Toggle navigation</span>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
@@ -83,7 +88,10 @@
     <div class="col-md-12">
       {% for group in promoted %}
         <a href="{{ url_for('hub', name=group.name)}}">{{group.name}}</a>
-        is a promoted group, and it has {{ group.subscribers | length }} subscribers and {{ group.members | length }} members, and {{group.owners | length }} owners
+        is a promoted group, and it has {{
+            group.subscribers | length }} subscribers and {{
+            group.members | length }} members, and {{
+            group.owners | length }} owners
       {% endfor %}
     </div>
   </div>
@@ -93,7 +101,9 @@
   <div class="row">
     <div class="col-md-12">
       ZOMG - {{ hub_of_the_month.name }} is the Hub Of The Month! <br/>
-      It has {{ hub_of_the_month.subscribers | length }} subscribers and {{ hub_of_the_month.members | length }} members, and {{hub_of_the_month.owners | length }} owners
+      It has {{ hub_of_the_month.subscribers | length }} subscribers and {{
+        hub_of_the_month.members | length }} members, and {{
+        hub_of_the_month.owners | length }} owners
       <h6>group owners</h6>
       {% for owner in hub_of_the_month.owners %}
           <div class="col-sm-6">
@@ -111,7 +121,9 @@
       {% for group in secondary %}
         <a href="{{ url_for('hub', name=group.name)}}">{{group.name}}</a>
         is not a promoted group
-        but it has {{ group.subscribers | length }} subscribers and {{ group.members | length }} members, and {{group.owners | length }} owners
+        but it has {{ group.subscribers | length }} subscribers and {{
+            group.members | length }} members, and {{
+            group.owners | length }} owners
         <br/>
       {% endfor %}
     </div>
@@ -120,4 +132,5 @@
 
 <script src="{{ url_for('static', filename='js/jquery-1.10.2.min.js') }}"></script>
 <script src="{{ url_for('static', filename='bootstrap/js/bootstrap.min.js') }}"></script>
-</body></html>
+</body>
+</html>
diff --git a/hubs/templates/hubs.html b/hubs/templates/hubs.html
index 02a7a02..fecf7f1 100644
--- a/hubs/templates/hubs.html
+++ b/hubs/templates/hubs.html
@@ -75,7 +75,9 @@
 <div class="header">
   {% if g.auth.logged_in and not edit and hub.is_admin(g.auth.user) %}
     <div class="dropdown edit">
-      <span class="dropdown-toggle edit-this-page" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+      <span class="dropdown-toggle edit-this-page" type="button"
+            id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true"
+            aria-expanded="true">
         <span class="glyphicon glyphicon-edit"></span> edit this page
       </span>
       <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
@@ -116,24 +118,24 @@
       -->
       {% if hub.archived or hub.last_refreshed | days_since > 31 %}
       <ul class="media-list">
-          <li class="media">
-              <div class="media-left">
-              {% if hub.archived %}
-                  <img class="media-object square-32"
-                       src="{{flask.url_for('static', filename='img/archived.png')}}"/>
-              {% else %}
-                  <img class="media-object square-32"
-                       src="{{flask.url_for('static', filename='img/cobweb.png')}}"/>
-              {% endif %}
-              </div>
-              <div class="media-body">
-              {% if hub.archived %}
-                  This hub has been archived and locked.
-              {% else %}
-                  Cobweb alert!  This hub was last active {{ hub.last_refreshed | days_since }} days ago.
-              {% endif %}
-              </div>
-          </li>
+        <li class="media">
+          <div class="media-left">
+          {% if hub.archived %}
+            <img class="media-object square-32"
+              src="{{flask.url_for('static', filename='img/archived.png')}}"/>
+          {% else %}
+            <img class="media-object square-32"
+              src="{{flask.url_for('static', filename='img/cobweb.png')}}"/>
+          {% endif %}
+          </div>
+          <div class="media-body">
+          {% if hub.archived %}
+            This hub has been archived and locked.
+          {% else %}
+            Cobweb alert!  This hub was last active {{ hub.last_refreshed | days_since }} days ago.
+          {% endif %}
+          </div>
+        </li>
       </ul>
       {% endif %}
 

From c226963e082b797bac5507b3a7c7a6729712c933 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 14 2016 18:24:20 +0000
Subject: [PATCH 3/4] Redirects from /user to /user/ as otherwise it breaks quite a bit of JS


---

diff --git a/hubs/app.py b/hubs/app.py
index 6d3e2e6..c57cdb4 100755
--- a/hubs/app.py
+++ b/hubs/app.py
@@ -100,8 +100,8 @@ def groups():
     )
 
 
-@app.route('/<name>/')
 @app.route('/<name>')
+@app.route('/<name>/')
 def hub(name):
     hub = get_hub(session, name)
     return flask.render_template(

From 7b2035ff24118ff08276f591dd0bea6032db6c95 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 14 2016 18:24:20 +0000
Subject: [PATCH 4/4] More style changes (line length)


---

diff --git a/hubs/templates/hubs.html b/hubs/templates/hubs.html
index fecf7f1..3b04247 100644
--- a/hubs/templates/hubs.html
+++ b/hubs/templates/hubs.html
@@ -9,12 +9,15 @@
 <body>
 <div class="super-header">
   <div class="row">
-	  <div class="col-xs-4" id="logo"><img src="{{ url_for('static', filename='img/logo-hubs.png') }}" alt="Fedora Hubs"></div>
+    <div class="col-xs-4" id="logo">
+      <img src="{{ url_for('static', filename='img/logo-hubs.png') }}" alt="Fedora Hubs">
+    </div>
     <div class="col-sm-4 col-sm-push-4 col-xs-8">
       {% if g.auth.logged_in %}
         <div class="dropdown pull-right">
           <img class = "icon" src="{{ url_for('static', filename='img/irc_icon.png') }}" alt="IRC Chats">
-        <span class="dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+        <span class="dropdown-toggle" type="button" id="dropdownMenu1"
+          data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
           <img src="{{ g.auth.avatar }}" class="avatar" alt="User Icon"/>
           {# Logged in as #} {{ g.auth.nickname }}
           <span class="glyphicon glyphicon-chevron-down" aria-hidden="true"></span>
@@ -46,7 +49,8 @@
   <nav class="navbar navbar-default">
     <div class="container-fluid">
       <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+        <button type="button" class="navbar-toggle collapsed"
+            data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
           <span class="sr-only">Toggle navigation</span>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
diff --git a/hubs/widgets/chrome.py b/hubs/widgets/chrome.py
index f74b32c..f5a40a9 100755
--- a/hubs/widgets/chrome.py
+++ b/hubs/widgets/chrome.py
@@ -1,8 +1,10 @@
 from hubs.widgets.base import wraps
 from hubs.widgets import templating
 
-_panel_template = templating.environment.get_template('templates/panel.html')
-_panel_heading_template = templating.environment.get_template('templates/panel_heading.html')
+_panel_template = templating.environment.get_template(
+    'templates/panel.html')
+_panel_heading_template = templating.environment.get_template(
+    'templates/panel_heading.html')
 
 
 def panel(title=None, klass="panel-default", key=None):
diff --git a/hubs/widgets/workflow/updates2stable.py b/hubs/widgets/workflow/updates2stable.py
index 64a8316..668fcc7 100644
--- a/hubs/widgets/workflow/updates2stable.py
+++ b/hubs/widgets/workflow/updates2stable.py
@@ -10,7 +10,8 @@ from hubs.widgets.chrome import panel
 # If 'updates' is empty, then don't render any chrome.
 chrome = panel('Updates Ready for Stable', key='updates')
 # TODO -- add approve/deny buttons or just link through to pkgdb
-template = templating.environment.get_template('templates/workflow/updates2stable.html')
+template = templating.environment.get_template(
+    'templates/workflow/updates2stable.html')
 
 # TODO - the bodhi api exposes a new flag we can use instead of scraping comments...
 giveaway = 'can be pushed to stable now'