Make event wikis required; submit buttons blue; help dropdown in nav

Delete icons gray, red on hover Show retention as the 3rd column in tables Bug: https://phabricator.wikimedia.org/T190074
wikimedia · Mar 28, 2018 · 7c69a0e · 7c69a0e
1 parent ac9e794
commit 7c69a0e
Show file tree

Hide file tree

Showing 81 changed files with 131 additions and 72 deletions.
diff --git a/app/Resources/assets/css/application.scss b/app/Resources/assets/css/application.scss
@@ -70,8 +70,14 @@ body {
     }
 }
 
-.logged-in {
-    margin-right: 10px;
+.logged-in,
+.help-dropdown {
+    margin-right: 6px;
+}
+
+.help-dropdown .glyphicon {
+    font-size: 14px;
+    top: 2px;
 }
 
 .lang-group {
@@ -191,6 +197,14 @@ a.disabled {
     text-decoration: none;
 }
 
+.glyphicon-trash {
+    color: $bootstrap-gray;
+
+    &:hover {
+        color: inherit;
+    }
+}
+
 @media (max-width: $bootstrap-sm) {
     .footer-links {
         display: block;

diff --git a/app/Resources/assets/css/events.scss b/app/Resources/assets/css/events.scss
@@ -1,7 +1,7 @@
 .event,
 .eventdata {
     .wiki-row {
-        margin-bottom: 0;
+        margin-bottom: 13px;
 
         &:first-child .remove-wiki {
             display: none;

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -73,6 +73,33 @@
                             (<a href="{{ path('logout') }}">{{ msg('logout') }}</a>)
                         </span>
                     {% endif %}
+                    <div class="btn-group dropdown help-dropdown">
+                        <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
+                            <span class="glyphicon glyphicon-question-sign"></span>
+                            {{ msg('help') }}
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-right">
+                            <li>
+                                <a target="_blank" href="https://meta.wikimedia.org/wiki/Grant_Metrics">
+                                    <span class="font-awesome">&#xf05a;</span>
+                                    {{ msg('documentation') }}
+                                </a>
+                            </li>
+                            <li>
+                                <a target="_blank" href="https://phabricator.wikimedia.org/maniphest/task/create?projects=grant-metrics">
+                                    <span class="font-awesome">&#xf188;</span>
+                                    {{ msg('report-issue') }}
+                                </a>
+                            </li>
+                            <li>
+                                <a target="_blank" href="https://meta.wikimedia.org/wiki/Talk:Grant_Metrics">
+                                    <span class="font-awesome">&#xf086;</span>
+                                    {{ msg('feedback') }}
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
                     {% if exception is not defined %}
                         <div class="lang-group btn-group dropdown">
                             <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">

diff --git a/app/Resources/views/events/_form.html.twig b/app/Resources/views/events/_form.html.twig
@@ -19,8 +19,6 @@
                 {{ form_label(wiki, msg('wikis'),
                     {'attr': {'class': form_errors(form.wikis) ? ' text-danger'}})
                 }}
-                <br/>
-                <small class="text-muted">({{ msg('optional')|lower }})</small>
             </div>
             <div class="col-sm-8">
                 {{ form_widget(wiki, {'attr': {'class': 'event-wiki-input', 'autocomplete': 'off'}}) }}
@@ -72,4 +70,4 @@
 </fieldset>
 
 {{ form_row(form._token) }}
-{{ form_widget(form.submit, {'label': msg('submit')}) }}
+{{ form_widget(form.submit, {'label': msg('submit'), 'attr': {'class': 'btn-primary'}}) }}
diff --git a/app/Resources/views/events/show.html.twig b/app/Resources/views/events/show.html.twig
@@ -33,7 +33,7 @@
 
         <div class="pull-right text-right">
             {% if isOrganizer and event.numParticipants > 0 %}
-                <button type="button" class="btn btn-default event-process-btn" data-event-id="{{ event.id }}">
+                <button type="button" class="btn btn-primary event-process-btn" data-event-id="{{ event.id }}">
                     {% if event.updated == null %}
                         {{ msg('calculate-totals') }}
                     {% else %}
@@ -69,14 +69,17 @@
                             <div>{{ msg('participants') }}</div>
                         </th>
                         {% set sortableMetrics = ['pages-created', 'pages-improved'] %}
-                        {% for stat in event.statistics %}
-                            {% set metricOrder = metricOrder|merge([stat.metric]) %}
-                            {% set hasDesc = msgExists(stat.metric ~ '-desc', [stat.offset]) %}
-                            <th>
-                                <div class="{% if stat.metric in sortableMetrics %} sort-link sort-link--{{ stat.metric }}{% endif %}{% if hasDesc %} event-metric-desc{% endif %}" {% if hasDesc %} data-toggle="tooltip" data-placement="top" title="{{ msg(stat.metric ~ '-desc', [stat.offset]) }}"{% endif %} data-column="{{ stat.metric }}">
-                                    {{ msg(stat.metric, [stat.offset]) }}
-                                </div>
-                            </th>
+                        {% for metric, offset in event.availableMetrics %}
+                            {% if event.statistic(metric) is defined %}
+                                {% set stat = event.statistic(metric) %}
+                                {% set metricOrder = metricOrder|merge([stat.metric]) %}
+                                {% set hasDesc = msgExists(stat.metric ~ '-desc', [stat.offset]) %}
+                                <th>
+                                    <div class="{% if stat.metric in sortableMetrics %} sort-link sort-link--{{ stat.metric }}{% endif %}{% if hasDesc %} event-metric-desc{% endif %}" {% if hasDesc %} data-toggle="tooltip" data-placement="top" title="{{ msg(stat.metric ~ '-desc', [stat.offset]) }}"{% endif %} data-column="{{ stat.metric }}">
+                                        {{ msg(stat.metric, [stat.offset]) }}
+                                    </div>
+                                </th>
+                            {% endif %}
                         {% endfor %}
                     </tr>
                     <tr>
@@ -163,7 +166,7 @@
                     {% endfor %}
 
                     <div class="col-sm-6 col-sm-offset-6 save-participants-btn">
-                        {{ form_widget(form.submit, {'label': msg('save-participants')}) }}
+                        {{ form_widget(form.submit, {'label': msg('save-participants'), 'attr': {'class': 'btn-primary'}}) }}
                     </div>
 
                     <div class="form-group col-sm-6 event-add-participants">
@@ -172,7 +175,7 @@
                     </div>
                     {% if form.participants|length == 0 %}
                         <div class="col-sm-6">
-                            {{ form_widget(form.submit, {'label': msg('save-participants')}) }}
+                            {{ form_widget(form.submit, {'label': msg('save-participants'), 'attr': {'class': 'btn-primary'}}) }}
                         </div>
                     {% endif %}
 

diff --git a/app/Resources/views/programs/_form.html.twig b/app/Resources/views/programs/_form.html.twig
@@ -58,4 +58,4 @@
     </div>
 </div>
 
-{{ form_widget(form.submit, {'label': msg('submit')}) }}
+{{ form_widget(form.submit, {'label': msg('submit'), 'attr': {'class': 'btn-primary'}}) }}
diff --git a/i18n/af.json b/i18n/af.json
@@ -4,5 +4,6 @@
 	"cancel": "Kanselleer",
 	"date": "Datum",
 	"documentation": "Dokumentasie",
+	"help": "Hulp",
 	"page": "Bladsy"
 }
diff --git a/i18n/ar.json b/i18n/ar.json
@@ -10,6 +10,7 @@
 	"error-server-message": "قال الخادم: $1",
 	"error-service-overload": "Grant Metrics حاليا تحت ضغط كبير لتلبية طلبات أخرى. من فضلك حاول مرة أخرى بعد دقائق قليلة.",
 	"fatal-error": "خطأ فادح",
+	"help": "المساعدة",
 	"help-translate": "المساهمة في الترجمة",
 	"logout": "تسجيل الخروج",
 	"no-results": "لم يتم العثور على نتائج",
@@ -18,7 +19,6 @@
 	"num-minutes": "{{PLURAL:$1|دقيقة|دقائق}}",
 	"num-revisions": "{{PLURAL:$1|مراجعة|مراجعات}}",
 	"num-seconds": "{{PLURAL:$1|ثانية|ثواني}}",
-	"optional": "اختياري",
 	"page": "صفحة",
 	"pager-newer-n": "{{PLURAL:$1|أجدد 1|أجدد $1}}",
 	"pager-older-n": "{{PLURAL:$1|أقدم 1|أقدم $1}}",

diff --git a/i18n/ast.json b/i18n/ast.json
@@ -13,7 +13,6 @@
 	"num-minutes": "{{PLURAL: $1|minutu|minutos}}",
 	"num-revisions": "{{PLURAL: $1|Revisión|Revisiones}}",
 	"num-seconds": "{{PLURAL: $1|segundu|segundos}}",
-	"optional": "opcional",
 	"pager-newer-n": "{{PLURAL:$1|1 siguiente|$1 siguientes}}",
 	"pager-older-n": "{{PLURAL:$1|1 anterior|$1 anteriores}}",
 	"submit": "Unviar",

diff --git a/i18n/az.json b/i18n/az.json
@@ -1,4 +1,5 @@
 {
 	"error-server-message": "Server deyib: $1",
-	"fatal-error": "Ölümcül xəta"
+	"fatal-error": "Ölümcül xəta",
+	"help": "Kömək"
 }
diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json
@@ -6,6 +6,7 @@
 	"diff": "Зьмена",
 	"documentation": "Дакумэнтацыя",
 	"fatal-error": "Крытычная памылка",
+	"help": "Дапамога",
 	"help-translate": "Дапамога зь перакладамі",
 	"no-results": "Нічога ня знойдзена",
 	"page": "Старонка",

diff --git a/i18n/be.json b/i18n/be.json
@@ -7,6 +7,7 @@
 	"documentation": "Дакументацыя",
 	"fatal-error": "Фатальная памылка",
 	"feedback": "Зваротная сувязь",
+	"help": "Даведка",
 	"help-translate": "Дапамажыце перакласці",
 	"no-results": "Нічога не знойдзена",
 	"page": "Старонка",

diff --git a/i18n/bg.json b/i18n/bg.json
@@ -5,6 +5,7 @@
 	"date": "Дата",
 	"documentation": "Документация",
 	"fatal-error": "Фатална грешка",
+	"help": "Помощ",
 	"help-translate": "Помощ с превода",
 	"no-results": "Не бяха открити резултати",
 	"page": "Страница",

diff --git a/i18n/bn.json b/i18n/bn.json
@@ -10,6 +10,7 @@
 	"error-server-message": "সার্ভারটি জানিয়েছে: $1",
 	"fatal-error": "মারাত্মক ত্রুটি",
 	"feedback": "প্রতিক্রিয়া",
+	"help": "সাহায্য",
 	"help-translate": "অনুবাদে সাহায্য করুন",
 	"logout": "প্রস্থান",
 	"no-results": "কোনো ফলাফল পাওয়া যায়নি",
@@ -18,7 +19,6 @@
 	"num-minutes": "{{PLURAL: $1|মিনিট}}",
 	"num-revisions": "টি {{PLURAL:$1|সংশোধন}}",
 	"num-seconds": "$1 {{PLURAL:$1|সেকেন্ড}}",
-	"optional": "ঐচ্ছিক",
 	"page": "পাতা",
 	"pager-newer-n": "{{PLURAL:$1|নতুনতর ১টি|নতুনতর $1টি}}",
 	"pager-older-n": "{{PLURAL:$1|আরও পুরনো ১টি|আরও পুরনো $1টি}}",

diff --git a/i18n/br.json b/i18n/br.json
@@ -7,6 +7,7 @@
 	"documentation": "Teuliadur",
 	"fatal-error": "Fazi diremed",
 	"feedback": "Sonjoù",
+	"help": "Skoazell",
 	"help-translate": "Sikour da dreiñ",
 	"no-results": "N'eus bet kavet disoc'h ebet",
 	"page": "Pajenn",

diff --git a/i18n/bs.json b/i18n/bs.json
@@ -9,6 +9,7 @@
 	"edit-summary": "Sažetak izmjene",
 	"fatal-error": "Fatalna greška",
 	"feedback": "Povratne informacije",
+	"help": "Pomoć",
 	"help-translate": "Pomozite s prijevodima",
 	"logout": "Odjavi me",
 	"no-results": "Nema rezultata",
@@ -17,7 +18,6 @@
 	"num-minutes": "{{PLURAL:$1|minut|minute|minuta}}",
 	"num-revisions": "{{PLURAL:$1|izmjena|izmjene|izmjena}}",
 	"num-seconds": "{{PLURAL:$1|sekunda|sekunde|sekundi}}",
-	"optional": "Neobavezno",
 	"page": "Stranica",
 	"pager-newer-n": "{{PLURAL:$1|novija 1|novije $1}}",
 	"pager-older-n": "{{PLURAL:$1|starija $1|starijih $1}}",

diff --git a/i18n/ca.json b/i18n/ca.json
@@ -5,6 +5,7 @@
 	"date": "Data",
 	"documentation": "Documentació",
 	"fatal-error": "Error fatal",
+	"help": "Ajuda",
 	"help-translate": "Ajudeu a traduir",
 	"no-results": "No s'han trobat resultats.",
 	"page": "Pàgina",

diff --git a/i18n/ce.json b/i18n/ce.json
@@ -6,7 +6,6 @@
 	"num-minutes": "{{PLURAL:$1|минут}}",
 	"num-revisions": "{{PLURAL:$1|верси|версеш}}",
 	"num-seconds": "{{PLURAL:$1|секунд}}",
-	"optional": "(опционал)",
 	"pager-newer-n": "{{PLURAL:$1|алсамо керла 1|алсамо керланаш $1}}",
 	"pager-older-n": "{{PLURAL:$1|алсамо шира 1|алсамо ширниш $1}}",
 	"submit": "ДӀадахьийта",

diff --git a/i18n/ckb.json b/i18n/ckb.json
@@ -7,6 +7,7 @@
 	"documentation": "بەڵگەنامە",
 	"edit-summary": "کورتەی دەستکاری",
 	"error-server-message": "سێرڤەرەکە وتی: $1",
+	"help": "یارمەتی",
 	"help-translate": "یارمەتیی وەرگێڕان",
 	"logout": "چوونە دەرەوە",
 	"no-results": "ھیچ ئەنجامێک نەدۆزرایەوە",
@@ -15,7 +16,6 @@
 	"num-minutes": "{{PLURAL: $1|خولەک|خولەک}}",
 	"num-revisions": "{{PLURAL:$1|پیاچوونەوە|پیاچوونەوە}}",
 	"num-seconds": "{{PLURAL: $1|چرکە|چرکە}}",
-	"optional": "دڵخوازانە",
 	"page": "پەڕە",
 	"pager-newer-n": "{{PLURAL:$1|یەکێکی نوێتر|$1ی نوێتر}}",
 	"pager-older-n": "{{PLURAL:$1|یەکێک کۆنتر|$1ی کۆنتر}}",

diff --git a/i18n/cs.json b/i18n/cs.json
@@ -10,6 +10,7 @@
 	"error-service-overload": "Grant Metrics je momentálně příliš zatížen mnoha jinými požadavky. Počkejte prosím několik minut a poté zkuste znovu.",
 	"fatal-error": "Kritická chyba",
 	"feedback": "Zpětná vazba",
+	"help": "Nápověda",
 	"help-translate": "Pomozte s překladem",
 	"logout": "Odhlásit se",
 	"no-results": "Nenalezeny žádné výsledky",
@@ -18,7 +19,6 @@
 	"num-minutes": "{{PLURAL:$1|minuta|minuty|minut}}",
 	"num-revisions": "{{PLURAL:$1|revize|revize|revizí}}",
 	"num-seconds": "{{PLURAL: $1|sekunda|sekundy|sekund}}",
-	"optional": "nepovinné",
 	"page": "Stránka",
 	"pager-newer-n": "{{PLURAL:$1|1 novější|$1 novější|$1 novějších}}",
 	"pager-older-n": "{{PLURAL:$1|1 starší|$1 starší|$1 starších}}",

diff --git a/i18n/da.json b/i18n/da.json
@@ -12,6 +12,7 @@
 	"error-service-overload": "Grant Metrics er i øjeblikket overbelastet af andre forespørgsler. Prøv igen om nogle minutter.",
 	"fatal-error": "Fatal fejl",
 	"feedback": "Tilbagemelding",
+	"help": "Hjælp",
 	"help-translate": "Hjælp til med at oversætte",
 	"logout": "Log ud",
 	"no-results": "Ingen resultater blev fundet",
@@ -20,7 +21,6 @@
 	"num-minutes": "{{PLURAL: $1|minut|minutter}}",
 	"num-revisions": "{{PLURAL: $1|Revision|Revisioner}}",
 	"num-seconds": "{{PLURAL: $1|sekund|sekunder}}",
-	"optional": "valgfri",
 	"page": "Side",
 	"pager-newer-n": "{{PLURAL:$1|1 nyere|$1 nyere}}",
 	"pager-older-n": "{{PLURAL:$1|1 ældre|$1 ældre}}",

diff --git a/i18n/de.json b/i18n/de.json
@@ -12,6 +12,7 @@
 	"error-service-overload": "Grant Metrics ist derzeit mit der Bedienung anderer Anfragen überladen. Bitte in einigen Minuten erneut versuchen.",
 	"fatal-error": "Fataler Fehler",
 	"feedback": "Rückmeldung",
+	"help": "Hilfe",
 	"help-translate": "Hilf beim Übersetzen",
 	"logout": "Abmelden",
 	"no-results": "Keine Ergebnisse gefunden",
@@ -20,7 +21,6 @@
 	"num-minutes": "{{PLURAL: $1|Minute|Minuten}}",
 	"num-revisions": "{{PLURAL: $1|Bearbeitung|Bearbeitungen}}",
 	"num-seconds": "{{PLURAL: $1|Sekunde|Sekunden}}",
-	"optional": "optional",
 	"page": "Seite",
 	"pager-newer-n": "{{PLURAL:$1|nächster|nächste $1}}",
 	"pager-older-n": "{{PLURAL:$1|vorheriger|vorherige $1}}",

diff --git a/i18n/diq.json b/i18n/diq.json
@@ -5,6 +5,7 @@
 	"close": "Racın",
 	"date": "Dem",
 	"feedback": "Peyşınasnayış.",
+	"help": "Peşti",
 	"help-translate": "Destegê tadayışi",
 	"no-results": "Peyniye nêvêniyaya",
 	"page": "Pele",

diff --git a/i18n/el.json b/i18n/el.json
@@ -11,6 +11,7 @@
 	"error-server-message": "Ο διακομιστής είπε: $1",
 	"error-service-overload": "Το Grant Metrics είναι υπερφορτωμένο εξυπηρετώντας άλλα αιτήματα αυτή τη στιγμή. Παρακαλώ προσπαθήστε ξανά σε λίγα λεπτά.",
 	"feedback": "Ανατροφοδότηση",
+	"help": "Βοήθεια",
 	"help-translate": "Βοηθήστε στη μετάφραση",
 	"no-results": "Δεν βρέθηκαν αποτελέσματα",
 	"num-revisions": "{{PLURAL:$1|αναθεώρηση|αναθεωρήσεις}}",

diff --git a/i18n/en.json b/i18n/en.json
@@ -57,6 +57,7 @@
 	"fatal-error": "Fatal error",
 	"feedback": "Feedback",
 	"grant-metrics": "Grant Metrics",
+	"help": "Help",
 	"help-translate": "Help translate",
 	"last-updated": "Last updated $1",
 	"login-with-oauth": "Login with OAuth",
@@ -74,7 +75,6 @@
 	"num-revisions": "{{PLURAL:$1|revision|revisions}}",
 	"num-seconds": "{{PLURAL:$1|second|seconds}}",
 	"num-wikis": "{{PLURAL:$1|wiki|wikis}}",
-	"optional": "Optional",
 	"organizers": "Organizers",
 	"page": "Page",
 	"pager-newer-n": "{{PLURAL:$1|Newer $1|Newer $1}}",

diff --git a/i18n/es.json b/i18n/es.json
@@ -10,6 +10,7 @@
 	"error-server-message": "El servidor respondió: $1",
 	"fatal-error": "Error grave",
 	"feedback": "Comentarios",
+	"help": "Ayuda",
 	"help-translate": "Ayúdanos a traducir",
 	"logout": "Salir",
 	"no-results": "No se han encontrado resultados",
@@ -18,7 +19,6 @@
 	"num-minutes": "{{PLURAL: $1|minuto|minutos}}",
 	"num-revisions": "{{PLURAL: $1|Revisión|Revisiones}}",
 	"num-seconds": "{{PLURAL: $1|segundo|segundos}}",
-	"optional": "opcional",
 	"page": "Página",
 	"pager-newer-n": "{{PLURAL:$1|1 siguiente|$1 siguientes}}",
 	"pager-older-n": "{{PLURAL:$1|1 anterior|$1 anteriores}}",

diff --git a/i18n/et.json b/i18n/et.json
@@ -7,7 +7,6 @@
 	"num-minutes": "{{PLURAL: $1|minut|minutit}}",
 	"num-revisions": "{{PLURAL:$1|Redaktsioon|Redaktsioonid}}",
 	"num-seconds": "{{PLURAL: $1|sekund|sekundit}}",
-	"optional": "valikuline",
 	"pager-newer-n": "{{PLURAL:$1|uuem 1|uuemad $1}}",
 	"pager-older-n": "{{PLURAL:$1|vanem 1|vanemad $1}}",
 	"submit": "Saada",

diff --git a/i18n/eu.json b/i18n/eu.json
@@ -12,6 +12,7 @@
 	"error-service-overload": "Grant Metrics orain gainkargatuta dago beste eskaera batzuekin. Mesedez, saia ezazu berriro minutu gutxiren buruan.",
 	"fatal-error": "Fatal error",
 	"feedback": "Atzeraelikadura",
+	"help": "Laguntza",
 	"help-translate": "Lagundu euskaratzen",
 	"no-results": "Ez da emaitzarik aurkitu",
 	"num-revisions": "{{PLURAL:$1|berrikuspen 1|$1 berrikuspen}}",