Move create and work queue to user drop down

diff --git a/app/models.py b/app/models.py
index 544a14ec5450d002b693866bfc0a09613875478b..f3ab06a4cb9b895ffc37e26154f904175cea7ff1 100644 (file)
--- a/app/models.py
+++ b/app/models.py
@@ -120,6 +120,11 @@ class User(db.Model, UserMixin):
                self.display_name = username
                self.rank = UserRank.NOT_JOINED
 
+       def canAccessTodoList(self):
+               return Permission.APPROVE_NEW.check(self) or \
+                               Permission.APPROVE_RELEASE.check(self) or \
+                               Permission.APPROVE_CHANGES.check(self)
+
        def isClaimed(self):
                return self.rank.atLeast(UserRank.NEW_MEMBER)
 

diff --git a/app/templates/base.html b/app/templates/base.html
index 025bf8207a26a530873e75c234e32da681a92280..504563efd22f1de3c939aa10222f50b7cebf94a5 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -41,6 +41,7 @@
                <ul class="nav navbar-nav navbar-right">
                        {% if current_user.is_authenticated %}
                                <li><a href="{{ url_for('notifications_page') }}">({{ current_user.notifications | length }})</a></li>
+                               <li><a href="{{ url_for('create_edit_package_page') }}">+</a></li>
                                <li class="dropdown">
                                        <a href="{{ url_for('user_profile_page', username=current_user.username) }}"
                                                class="dropdown-toggle"
@@ -53,6 +54,9 @@
                                                <li>
                                                        <a href="{{ url_for('user_profile_page', username=current_user.username) }}">Profile</a>
                                                </li>
+                                               {% if current_user.canAccessTodoList() %}
+                                                       <li><a href="{{ url_for('todo_page') }}">Work Queue</a></li>
+                                               {% endif %}
                                                {% if current_user.rank == current_user.rank.ADMIN %}
                                                        <li><a href="{{ url_for('admin_page') }}">Admin</a></li>
                                                {% endif %}

diff --git a/app/views/packages.py b/app/views/packages.py
index 70c36cf3773d7a525de27cd73942b4c63b5d6868..087a83fea3baaa4537e989f5ffb6541e5a8a8565 100644 (file)
--- a/app/views/packages.py
+++ b/app/views/packages.py
@@ -63,13 +63,6 @@ def packages_page():
                return render_template("packages/list.html", title=title, packages=query.all(), \
                                query=search, tags=tags, type=None if type is None else type.toName())
 
-
-def canSeeWorkQueue():
-       return Permission.APPROVE_NEW.check(current_user) or \
-               Permission.APPROVE_RELEASE.check(current_user) or \
-                       Permission.APPROVE_CHANGES.check(current_user)
-
-@menu.register_menu(app, ".todo", "Work Queue", order=20, visible_when=canSeeWorkQueue)
 @app.route("/todo/")
 @login_required
 def todo_page():
@@ -138,7 +131,6 @@ class PackageForm(FlaskForm):
        forums       = IntegerField("Forum Topic ID", [InputRequired(), NumberRange(0,999999)])
        submit       = SubmitField("Save")
 
-@menu.register_menu(app, ".new", "Create", order=21, visible_when=lambda: current_user.is_authenticated)
 @app.route("/packages/new/", methods=["GET", "POST"])
 @app.route("/packages/<author>/<name>/edit/", methods=["GET", "POST"])
 @login_required