diff --git a/apps/portal/templates/portal/base.html b/apps/portal/templates/portal/base.html index 312d60ed..6aa94f4c 100644 --- a/apps/portal/templates/portal/base.html +++ b/apps/portal/templates/portal/base.html @@ -23,6 +23,13 @@ - -
- -
-
-

Portal

+ +
+ + +
+ +
+
+ {% block content %}{% endblock content %} +
-
- -
  • -
    - +
    + + +
    + +
    +

    Portal

    +
    +
    -
  • - {% if can_manage_org and current_organisation %} -
  • - - - - - Create Product - -
  • {% endif %} - {% else %} - - {% endif %} - - - -
  • - - - - - Organisations - -
  • - - -
    - - -
    -
    - {% block content %}{% endblock content %} + + + +
  • + + + + + Organisations + +
  • + +
    diff --git a/apps/portal/templates/portal/dashboard.html b/apps/portal/templates/portal/dashboard.html index 02a332f4..658a31b9 100644 --- a/apps/portal/templates/portal/dashboard.html +++ b/apps/portal/templates/portal/dashboard.html @@ -9,18 +9,18 @@

    {{ current_organisation.name }} Dashboard
    -
    +

    Organisation Products

    {% if can_manage_org and current_organisation %} + class="btn btn-primary w-full sm:w-auto"> Create Product {% endif %}
    {% if organisation_products %} -
    +
    {% for product in organisation_products %}
    diff --git a/apps/portal/templates/portal/organisation/list.html b/apps/portal/templates/portal/organisation/list.html index 47c14d43..059ba0fd 100644 --- a/apps/portal/templates/portal/organisation/list.html +++ b/apps/portal/templates/portal/organisation/list.html @@ -1,64 +1,78 @@ {% extends "portal/base.html" %} {% block content %} -
    -
    -

    My Organisations

    - - Create Organisation - +
    + +
    +
    +
    +

    My Organisations

    +

    Manage and switch between your organisations

    +
    + + + + + Create Organisation + +
    {% if user_organisations %} -
    +
    {% for assignment in user_organisations %} -
    -
    -
    +
    +
    + +
    {% if assignment.organisation.logo %} - {{ assignment.organisation.name }} + {{ assignment.organisation.name }} {% else %} -
    - {{ assignment.organisation.name|first }} +
    + {{ assignment.organisation.name|first }}
    {% endif %} -

    {{ assignment.organisation.name }}

    -
    - -
    - Role: {{ assignment.get_role_display }} +
    +

    {{ assignment.organisation.name }}

    +
    {{ assignment.get_role_display }}
    +
    -
    -
    - - View Details - -
    - {% csrf_token %} - -
    -
    + +
    + + View Details + +
    + {% csrf_token %} + +
    {% endfor %}
    {% else %} -
    - - - -
    -

    No organisations yet

    -
    Create your first organisation to get started!
    +
    +
    +
    +

    No organisations yet

    +

    Create your first organisation to get started!

    +
    + + Create Organisation +
    - - Create Organisation -
    {% endif %}
    diff --git a/apps/portal/templates/portal/product/summary.html b/apps/portal/templates/portal/product/summary.html index cb2ffa73..42e662c5 100644 --- a/apps/portal/templates/portal/product/summary.html +++ b/apps/portal/templates/portal/product/summary.html @@ -2,123 +2,111 @@ {% block content %}
    - -
    -

    - {{ product.name }} -

    - {% if product.description %} -

    - {{ product.description }} -

    - {% endif %} -
    + +
    + +
    +

    {{ product.name }}

    + {% if product.description %} +

    {{ product.description }}

    + {% endif %} +
    - -
    - - {% if debug %} -
    -
    -

    Debug Values

    -
    -

    active_challenges_count: {{ active_challenges_count }}

    -

    open_bounties_count: {{ open_bounties_count }}

    -

    active_contributors_count: {{ active_contributors_count }}

    -
    + +
    +

    Quick Actions

    +
    - {% endif %} +
    - -
    -
    -
    Available Points
    -
    1,000
    -
    + +
    +
    +
    Available Points
    +
    1,000
    - -
    -
    -
    Active Challenges
    -
    {{ active_challenges_count }}
    -
    +
    +
    Active Challenges
    +
    {{ active_challenges_count }}
    - -
    -
    -
    Open Bounties
    -
    {{ open_bounties_count }}
    -
    +
    +
    Open Bounties
    +
    {{ open_bounties_count }}
    - -
    -
    -
    Active Contributors
    -
    {{ active_contributors_count }}
    -
    +
    +
    Active Contributors
    +
    {{ active_contributors_count }}
    - -
    - -
    -
    -

    Product Team

    - {% if product_roles %} -
    - - - - - - - - - - {% for role in product_roles %} - - - - - - {% endfor %} - -
    NameRoleJoined
    {{ role.person.full_name }} -
    - {{ role.get_role_display }} -
    -
    - {{ role.created_at|date:"M j, Y" }} -
    -
    - {% else %} -

    No team members yet

    - {% endif %} + +
    +

    Product Team

    + {% if product_roles %} +
    + + + + + + + + + + {% for role in product_roles %} + + + + + + {% endfor %} + +
    NameRoleJoined
    {{ role.person.full_name }} +
    + {{ role.get_role_display }} +
    +
    + {{ role.created_at|date:"M j, Y" }} +
    -
    + {% else %} +

    No team members yet

    + {% endif %} +
    - -
    -
    -

    Quick Actions

    - -
    + {% if debug %} +
    +

    Debug Values

    +
    +

    active_challenges_count: {{ active_challenges_count }}

    +

    open_bounties_count: {{ open_bounties_count }}

    +

    active_contributors_count: {{ active_contributors_count }}

    + {% endif %}
    {% endblock %} \ No newline at end of file