From 7d54fbcf0937dd5582fd1f4da3d52ee3bf4d2109 Mon Sep 17 00:00:00 2001
From: Bob <bobevans999@gmail.com>
Date: Thu, 4 Nov 2021 10:50:21 -0700
Subject: [PATCH] fix #1680 - update labels for cues

---
 Paco-Server/ear/default/web/js/services.js    |  54 ++---
 .../ear/default/web/partials/basics.html      | 192 +++++++++---------
 2 files changed, 127 insertions(+), 119 deletions(-)

diff --git a/Paco-Server/ear/default/web/js/services.js b/Paco-Server/ear/default/web/js/services.js
index bfff001e2..820691d41 100755
--- a/Paco-Server/ear/default/web/js/services.js
+++ b/Paco-Server/ear/default/web/js/services.js
@@ -435,33 +435,33 @@ pacoApp.service('config', function() {
   ];
 
   this.cueTypes = [
-    'HANGUP (deprecated)',
-    'USER_PRESENT',
-    'Paco action',
-    'App Started',
-    'App Stopped',
-    'Music Started',
-    'Music Stopped',
-    'Incoming call started',
-    'Incoming call ended',
-    'Outgoing call started',
-    'Outgoing call ended',
-    'Missed call',
-    'Call Started (in or out)',
-    'Call Ended (in or out)',
-    "Experiment joined",
-    "Experiment ended",
-    "Response received",
-    "App removed",
-    "App installed",
-    "Permission changed",
-    "View Clicked",
-    "Notification created", 
-    "Notification shade opened",
-    "Notification shade dismiss all",
-    "Notification shade dismiss notification",
-    "Notification shade closed",
-    "Notification tapped in shade",
+    'Android HANGUP (deprecated)',
+    'Android USER_PRESENT',
+    'Android Paco action',
+    'Android App Started',
+    'Android App Stopped',
+    'Android Music Started',
+    'Android Music Stopped',
+    'Android Incoming call started',
+    'Android Incoming call ended',
+    'Android Outgoing call started',
+    'Android Outgoing call ended',
+    'Android Missed call',
+    'Android Call Started (in or out)',
+    'Android Call Ended (in or out)',
+    "Paco Experiment joined",
+    "Paco Experiment ended",
+    "Paco Response received",
+    "Android App removed (Deprecated)",
+    "Android App installed (Deprecated)",
+    "Android Permission changed (Deprecated)",
+    "Android View Clicked",
+    "Android Notification created", 
+    "Android Notification shade opened",
+    "Android Notification shade dismiss all",
+    "Android Notification shade dismiss notification",
+    "Android Notification shade closed",
+    "Android Notification tapped in shade",
     "App Started on Desktop",
     "App Stopped on Desktop",
     "App Started in Shell",
diff --git a/Paco-Server/ear/default/web/partials/basics.html b/Paco-Server/ear/default/web/partials/basics.html
index 99b98e921..bf30f8767 100644
--- a/Paco-Server/ear/default/web/partials/basics.html
+++ b/Paco-Server/ear/default/web/partials/basics.html
@@ -1,104 +1,112 @@
 <div class="basics">
-  <p>Define descriptions of your experiment.</p>
-  <md-card>
-    <md-card-content>
-      <h2>Experiment Listing</h2>
+    <p>Define your experiment</p>
+    <md-card>
+        <md-card-content>
+            <h2>Experiment Listing</h2>
 
-      <div layout="column"  layout-padding>
-        <div layout="row">
-          <md-input-container flex=85>
-            <label>Title</label>
-            <input ng-model="experiment.title" md-maxlength=100 md-no-resize>
-            <div ng-messages>
-              <div ng-message>Your experiment title should be simple, specific and memorable.</div>
-            </div>
-          </md-input-container>
-          <div flex></div>
-          <md-input-container flex=10>
-            <label>Version</label>
-            <input type="text" ng-model="experiment.version" ng-disabled="true"></input>
-          </md-input-container>
-        </div>
+            <div layout="column" layout-padding>
+                <div layout="row">
+                    <md-input-container flex=85>
+                        <label>Title</label>
+                        <input ng-model="experiment.title" md-maxlength=100 md-no-resize>
+                        <div ng-messages>
+                            <div ng-message>Your experiment title should be simple, specific and
+                                memorable.
+                            </div>
+                        </div>
+                    </md-input-container>
+                    <div flex></div>
+                    <md-input-container flex=10>
+                        <label>Version</label>
+                        <input type="text" ng-model="experiment.version" ng-disabled="true"></input>
+                    </md-input-container>
+                </div>
 
-<div layout="row">
-        <md-input-container  flex=50>
-          <label>Contact Email</label>
-          <input type="text" ng-model="experiment.contactEmail"></input>
-        </md-input-container>
-</div>
-<div layout="row">
-        <md-input-container flex=50>
-          <label>Organization</label>
-          <input type="text" ng-model="experiment.organization">
-          <div ng-messages>
-            <div ng-message>Organization or person running this experiment.</div>
-          </div>
-        </md-input-container>
-</div>
-<div layout="row">
-        <md-input-container  flex=100>
-          <label>Description</label>
-          <textarea ng-model="experiment.description" md-maxlength=500></textarea>
-          <div ng-messages>
-            <div ng-message>Our search tools run through the title and description sections of your
-              project, so be sure to incorporate any keywords here.</div>
-          </div>
-        </md-input-container>
-</div>
-<div layout="row">
-        <md-input-container flex=100>
-          <label>Informed Consent</label>
-          <textarea ng-model="experiment.informedConsentForm"></textarea>
-        </md-input-container>
-</div>
-       <div layout="row">
-          <div flex=40>
-          <div>Ringtone</div>
-            <md-input-container>
-            <md-select ng-model="experiment.ringtoneUri" placeholder="Select">
-              <md-option ng-repeat="ringtone in ringtones" value="/assets/ringtone/{{ringtone}}">
-                {{ringtone}}
-              </md-option>
-            </md-select>
-            </md-input-container>
-          </div>
+                <div layout="row">
+                    <md-input-container flex=50>
+                        <label>Contact Email</label>
+                        <input type="text" ng-model="experiment.contactEmail"></input>
+                    </md-input-container>
+                </div>
+                <div layout="row">
+                    <md-input-container flex=50>
+                        <label>Organization</label>
+                        <input type="text" ng-model="experiment.organization">
+                        <div ng-messages>
+                            <div ng-message>Organization or person running this experiment.</div>
+                        </div>
+                    </md-input-container>
+                </div>
+                <div layout="row">
+                    <md-input-container flex=100>
+                        <label>Description</label>
+                        <textarea ng-model="experiment.description" md-maxlength=500></textarea>
+                        <div ng-messages>
+                            <div ng-message>Our search tools run through the title and description
+                                sections of your
+                                project, so be sure to incorporate any keywords here.
+                            </div>
+                        </div>
+                    </md-input-container>
+                </div>
+                <div layout="row">
+                    <md-input-container flex=100>
+                        <label>Informed Consent</label>
+                        <textarea ng-model="experiment.informedConsentForm"></textarea>
+                    </md-input-container>
+                </div>
+                <div layout="row">
+                    <md-input-container flex=100>
+                        <div class="instructions">Participation Instructions (shown after the user joins)
+                        </div>
 
-       
-<div layout="row">
-        <div class="instructions"  flex=100>Instructions
+                        <div class="source-frame">
+                            <div class="ace_editor"
+                                 ng-model="experiment.postInstallInstructions"
+                                 ui-ace="{onLoad: aceInfinity,
+                                          rendererOptions: {
+                                            minLines: 5,
+                                            maxLines: 100
+                                          }
+                                          }">
 
-          <div class="source-frame">
-            <div class="ace_editor" ng-model="experiment.postInstallInstructions" ui-ace="{
-                onLoad: aceInfinity,
-                rendererOptions: {
-                  minLines: 5,
-                  maxLines: 100
-                }
-              }">
-            </div>
-          </div>
-          <div class="message">
-            These instructions will be shown to the user immediately after they join the experiment.
-          </div>
-        </div>
-      </div>
-      </div>
-    </md-card-content>
-    <md-divider></md-divider>
-    <md-card-content expandable=true expanded=false class="disclosures">
-      <div ng-click="toggleExpand()" class="section">
-        Advanced: Disclose Data Collected by Custom Scripts
-      </div>
-      <div expander class="padded">
+                            </div>
+                        </div>
+                    </md-input-container>
+                </div>
+                <div layout="row">
+                    <div flex=40>
+                        <div>Ringtone</div>
+                        <md-input-container>
+                            <md-select ng-model="experiment.ringtoneUri" placeholder="Select">
+                                <md-option ng-repeat="ringtone in ringtones"
+                                           value="/assets/ringtone/{{ringtone}}">
+                                    {{ringtone}}
+                                </md-option>
+                            </md-select>
+                        </md-input-container>
+                    </div>
+                </div>
+
+
+
+</md-card-content>
+<md-divider></md-divider>
+<md-card-content expandable=true expanded=false class="disclosures">
+    <div ng-click="toggleExpand()" class="section">
+        Advanced: Add Disclosures for data collected by custom scripts
+    </div>
+    <div expander class="padded">
         <div ng-repeat="(id, declare) in dataDeclarations">
 
             <label>
-              <md-checkbox ng-checked="inList(id)" value="{{id}}"
-                ng-click="toggleDeclaration(id)"> {{declare}}</md-checkbox>
+                <md-checkbox ng-checked="inList(id)" value="{{id}}"
+                             ng-click="toggleDeclaration(id)"> {{declare}}
+                </md-checkbox>
             </label>
-          </div>
         </div>
-      </md-card-content>
+    </div>
+</md-card-content>
 
-  </md-card>
+</md-card>
 </div>