Commit 1760f728 authored by MariaV's avatar MariaV
Browse files

Merge branch 'cleanup_templates' into 'master'

Cleanup templates

See merge request !65
parents 18254055 8b3abf8b
Loading
Loading
Loading
Loading
+14 −14
Original line number Diff line number Diff line
{% extends 'shared/layout.html' %}
{% load static %}
{% block h3 %}
  Anon Ticket
  Anon-Ticket
{% endblock %}
{% block subheader %} 
  Generate an Anonymous Identifier
  Generate Anonymous Identifier
{% endblock %}

{% block content %}
  <div class="row">
    <div class="col-12">
      <p> Tor's anonymous GitLab ticketing system uses code-phrase user identifer composed of 
    <div class="col-11 pr-5">
      <p class="pr-5"> Anon-Ticket identifiers are code-phrases consisting of
        six words randomly chosen from a dictionary.</p>
      <p>A code-phrase has been generated for you below. If you don't like this identifer 
        and want a different one, you can <a href="{% url 'create-identifier' %}">reload the page</a>,
      and another identifier will be generated for you.</p>
      <p>When you have a code-phrase you like, make sure to <mark>save</mark> the below code-phrase somewhere. 
      <p class="pr-5"> A user identifier has been generated for you below. 
        If you don't like this identifier, you 
        can <a href="{% url 'create-identifier' %}">reload the page</a>,
      and another one will be generated for you.</p>
      <p>When you have a code-phrase you like, make sure to save it somewhere. 
         A lost code-phrase <mark>cannot be looked up.</mark></p>
      <p>Identifier code-phrases are not saved in the database until either an issue or comment is opened.</p>
    </div>
  </div>
  <div class="row justify-content-center bg-light p-1 mt-3 mb-3 ml-3 mr-3">
  <div class="row justify-content-center bg-light p-1 mt-3 mb-3 ml-3 mr-3 col-10">
    {% for word in chosen_words %}
      <div class="col-auto p-2">
        {{word}}
      <div class="col-auto p-2 mb-2">
        <h4 class="text-primary">{{word}}</h4>
      </div>
    {% endfor %}
  </div>
  <div class="row justify-content-start">
  <div class="row justify-content-start mb-3 col-10">
    <form action="{% url 'create-identifier' %}" class="col-sm-auto mt-2">
      <button type="submit" class="btn btn-lg btn-primary mr-2">
        Choose a Different Identifier
+5 −7
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@
<div class="row">
  <div class="col-12">
    <p class="p-3">
      This form will allow you to create an issue/ticket and assign it to 
      a specific project. Please note that not all TorProject's GitLab 
      projects are currently using this anonymous portal--so if you 
      This form will allow you to create an issue/ticket for 
      a specific project. Please note that not all of TorProject's GitLab 
      repos are currently using this anonymous portal--so if you 
      don't find the project in the dropdown below, you will not be
      able to create a ticket for it using this system.
    </p>
@@ -26,12 +26,10 @@
      a moderator. You can check the status of your issue at any time
      on 
      {% url 'user-landing' results.user_identifier as landing_url %}
      <a href="{{landing_url}}">your landing page,</a>
      where it will be marked with asterisks
      (***) if it is still pending.
      <a href="{{landing_url}}">your landing page</a>.
    </p>
    <p class="p-3">
      Before creating a ticket, please try 
      Before creating a new issue report, please try 
      {% url 'issue-search' results.user_identifier as issue_url %}
      <a href="{{issue_url}}">searching the for the issue</a> 
      first, to avoid duplication.
+9 −12
Original line number Diff line number Diff line
@@ -9,18 +9,15 @@

{% block content %}
<div class="row">
  <div class="col-12">
    <p>Welcome to Tor's Anonymous Issue Reporting system for GitLab.</p>
    <p>This interface allows
      Tor users to report bugs and issues anonymous through the usage of code-phrases made of
      common words.</p>
      <p>
        To get started, create a user-identifier code phrase below. This process
  <div class="col-12 pr-5">
    <p class="pr-5">Welcome to Anon-Ticket, Tor's anonymous ticket reporting system for GitLab.</p>
    <p class="pr-5">
      To get started, please create a user identifier below. This process
      is instant and requires no data from you.</p>
      <p>
        Once you've created a user identifier, you must write it down or save it if you 
        want to be able to login and update the issue later, or you can bookmark the 
        user identifier's landing page.
    <p class="pr-5">
      If you want to be able to check the status of your ticket later,
      record your identifier in a safe place. You can also bookmark the 
      landing page after logging in.
      </p>
  </div>
</div>
+4 −5
Original line number Diff line number Diff line
{% extends 'shared/layout.html' %}
{% load static %}
{% block h3 %}
  Anon Ticket
  Anon-Ticket
{% endblock %}
{% block subheader %} 
  Search for an issue on GitLab.
@@ -18,14 +18,13 @@
    <p class="p-3 mb-0">
      This form uses the GitLab API to search the projects in the dropdown 
      below for issues matching a search string. You can see all of Tor's 
      public projects and issues, on the 
      public projects and issues on the 
      <a href="https://gitlab.torproject.org/tpo">
        TorProject GitLab site</a>.
    </p>
    <p class="p-3">
      You can create new comments on an issue's detail page. If your comment
      is still pending mod approval, it will be marked with asterisks (***)
      on
      You can also create new notes on an issue's detail page. If your note
      is waiting for moderator approval, it will be marked as pending on
      {% url 'user-landing' results.user_identifier as landing_url %}
      <a href="{{landing_url}}">your landing page</a>.
    </p>
+7 −7
Original line number Diff line number Diff line
{% extends 'shared/layout.html' %}
{% load static %}
{% block h3 %}
  Anon Ticket
  Anon-Ticket
{% endblock %}
{% block subheader %} 
  Items Awaiting Staff Moderation
  Moderator Portal
  <p>
    The following items below are pending and awaiting staff moderation.
    You can approve and/or reject multiple items at once by
    changing status fields in the right-hand column
    The below items are awaiting staff moderation.
    You can approve/reject multiple items at once by
    changing the status in the right-hand column
    to "approved" or "rejected" and then clicking on the 
    <span class="btn btn-primary p-1 mr-1 ml-1">Save All Changes</span>
    button at the bottom.
@@ -211,7 +211,7 @@
<!-- Render GLAccountRequest Table -->
<div class="row">
  <div class="col-12 mt-5">
    <h2>Pending Gitlab Account Requests</h2>
    <h2>Pending Gitlab Account Requests (***Coming Soon***)</h2>
      <!-- If there are pending notes, render them here. -->
      {% if gitlab_formset %}
      {{ gitlab_formset.management_form }}
Loading