diff --git a/hubsrht/blueprints/mailing_lists.py b/hubsrht/blueprints/mailing_lists.py index 2cab1e2..17bb892 100644 --- a/hubsrht/blueprints/mailing_lists.py +++ b/hubsrht/blueprints/mailing_lists.py @@ -67,13 +67,13 @@ def new_POST(owner, project_name): break if not list_name: search = valid.optional("search") - mls = lists.get_list(owner) + mls = lists.get_lists(owner) # TODO: Search properly mls = filter(lambda r: search.lower() in r["name"].lower(), mls) mls = sorted(mls, key=lambda r: r["updated"], reverse=True) return render_template("mailing-list-new.html", view="new-resource", owner=owner, project=project, - lists=mls) + lists=mls, search=search) mailing_list = lists.get_list(owner, list_name) ml = MailingList() diff --git a/hubsrht/blueprints/trackers.py b/hubsrht/blueprints/trackers.py index bc541f2..064cee1 100644 --- a/hubsrht/blueprints/trackers.py +++ b/hubsrht/blueprints/trackers.py @@ -59,9 +59,10 @@ def new_POST(owner, project_name): if not tracker_name: search = valid.optional("search") trackers = todo.get_trackers(owner) - # TODO: Search properly - tracker = filter(lambda r: search.lower() in r["name"].lower(), trackers) - tracker = sorted(trackers, key=lambda r: r["updated"], reverse=True) + trackers = filter(lambda r: + search.lower() in r["name"].lower() + or search.lower() in r["description"].lower(), trackers) + trackers = sorted(trackers, key=lambda r: r["updated"], reverse=True) return render_template("tracker-new.html", view="new-resource", owner=owner, project=project, trackers=trackers, search=search) diff --git a/hubsrht/templates/mailing-list-new.html b/hubsrht/templates/mailing-list-new.html index 7191efa..cd74624 100644 --- a/hubsrht/templates/mailing-list-new.html +++ b/hubsrht/templates/mailing-list-new.html @@ -1,151 +1,154 @@ {% extends "resource-new.html" %} {% block content %} -
- {{csrf_token()}} -
- {# TODO: Hide this option for any projects which already have lists #} -
-

Use a common template

-
-
- -
-
- -
-
- -
-
- -
- -
-
-
-
-
-

- Or create a new mailing list -

-
- - - {{ valid.summary("name") }} -
- - - - Markdown supported +
+ {# TODO: Hide this option for any projects which already have lists #} + + {{csrf_token()}} +

Use a common template

+
+
+
+
-
- +
+
+
+ +
+ + +
+
-
- {% if any(lists) %} -
-
-

- Or add an existing mailing list -

- {# TODO: Pagination #} + +
+
+ {{csrf_token()}} +
+

+ Or create a new mailing list +

+
+ + + {{ valid.summary("name") }}
- {# TODO: How exactly should this work #} - Description + + + Markdown supported + + {{valid.summary("description")}}
+
+ +
- {% endif %}
+{% if any(lists) or search %} +
+
+

+ Or add an existing mailing list +

+ {# TODO: Pagination #} +
+ {{csrf_token()}} + + {% if search_error %} +
{{ search_error }}
+ {% endif %} +
+
+ {{csrf_token()}} + {% for list in lists %} +
+

+ + {{ list["name"] }} +

+
+ {% endfor %} +
+
+
+{% endif %} {% endblock %} diff --git a/hubsrht/templates/mailing-lists.html b/hubsrht/templates/mailing-lists.html index 23e04b7..2931ea0 100644 --- a/hubsrht/templates/mailing-lists.html +++ b/hubsrht/templates/mailing-lists.html @@ -5,7 +5,7 @@

{{tracker.owner.canonical_name}}/{{mailing_list.name}} + >{{mailing_list.owner.canonical_name}}/{{mailing_list.name}}

{% if mailing_list.description %} {{ mailing_list.description | md }} diff --git a/hubsrht/templates/sources-select.html b/hubsrht/templates/sources-select.html index 93044e4..38111dc 100644 --- a/hubsrht/templates/sources-select.html +++ b/hubsrht/templates/sources-select.html @@ -1,76 +1,78 @@ {% extends "resource-new.html" %} {% block content %} -
+
+
+

Create a new {{vcs}} repository

+
+
+ {{csrf_token()}} -
-
-

Create a new {{vcs}} repository

-
-
-
-
+
+
+ + + {{ valid.summary("name") }}
- + - {{ valid.summary("name") }} -
- - - {{valid.summary("description")}} -
-
- -
-
- {% if any(repos) %} -
-
-

- Or add an existing {{vcs}} repository -

- {# TODO: Pagination #} -
- {# TODO: How exactly should this work #} - -
-
- {% for repo in repos %} -
-

- - {{ repo["name"] }} -

-
- {% endfor %} + name="description" + id="description" + class="form-control {{valid.cls("description")}}" + value="{{ description or project.description }}" /> + {{valid.summary("description")}}
+
- {% endif %} +{% if any(repos) or search %} +
+
+

+ Or add an existing {{vcs}} repository +

+ {# TODO: Pagination #} +
+ {{csrf_token()}} + + {% if search_error %} +
{{ search_error }}
+ {% endif %} +
+
+ {{csrf_token()}} + {% for repo in repos %} +
+

+ + {{ repo["name"] }} +

+
+ {% endfor %} +
+
+
+{% endif %} {% endblock %} diff --git a/hubsrht/templates/tracker-new.html b/hubsrht/templates/tracker-new.html index 84e8048..d9cb7d0 100644 --- a/hubsrht/templates/tracker-new.html +++ b/hubsrht/templates/tracker-new.html @@ -1,84 +1,86 @@ {% extends "resource-new.html" %} {% block content %} -
- {{csrf_token()}} -
-
-

- Create a new ticket tracker -

+
+ + {{csrf_token()}} +

+ Create a new ticket tracker +

+
+ + + {{ valid.summary("name") }}
- - Description + - - Markdown supported - - {{valid.summary("description")}} -
-
-
- + name="description" + id="description" + class="form-control {{valid.cls("description")}}" + rows="5" + aria-describedby="description-help-text" + placeholder="Give users an idea of how to submit a good ticket for this tracker." + >{{ description or "" }} + + Markdown supported + + {{valid.summary("description")}}
-
- {% if any(trackers) %} -
-
-

- Or add an existing tracker -

- {# TODO: Pagination #} -
- {# TODO: How exactly should this work #} - -
-
- {% for tracker in trackers %} -
-

- - {{ tracker["name"] }} -

-
- {% endfor %} -
+
+
+ +
+{% if any(trackers) or search %} +
+
+

+ Or add an existing tracker +

+ {# TODO: Pagination #} +
+ {{csrf_token()}} + + {% if search_error %} +
{{ search_error }}
+ {% endif %} +
+
+ {{csrf_token()}} + {% for tracker in trackers %} +
+

+ + {{ tracker["name"] }} +

+
+ {% endfor %} +
- {% endif %} - +
+{% endif %} {% endblock %}