Change publisher texts (#695)

* Change publisher texts * Change labels for site status change * Change publisher texts * Unify text case
adshares · Sep 30, 2019 · 93926fb · 93926fb
1 parent d3663b1
commit 93926fb
Show file tree

Hide file tree

Showing 24 changed files with 125 additions and 121 deletions.
diff --git a/src/app/admin/dashboard/dashboard.component.ts b/src/app/admin/dashboard/dashboard.component.ts
@@ -16,7 +16,7 @@ export class DashboardComponent extends HandleSubscription implements OnInit {
   licenseDetailUrl: string = null;
   settings = [
     {
-      title: 'General Settings',
+      title: 'General settings',
       description: '',
       link: '/admin/dashboard/general',
       values: [
@@ -27,7 +27,7 @@ export class DashboardComponent extends HandleSubscription implements OnInit {
       ],
     },
     {
-      title: 'Finance Settings',
+      title: 'Finance settings',
       description: '',
       link: '/admin/dashboard/finance',
       values: [
@@ -37,7 +37,7 @@ export class DashboardComponent extends HandleSubscription implements OnInit {
       ],
     },
     {
-      title: 'Privacy Settings',
+      title: 'Privacy settings',
       description: '',
       link: '/admin/dashboard/privacy',
       values: [
@@ -54,11 +54,11 @@ export class DashboardComponent extends HandleSubscription implements OnInit {
       ],
     },
     {
-      title: 'Account Settings',
+      title: 'Account settings',
       description: '',
       link: '/admin/dashboard/account',
       values: [
-        {name: 'Email & Password', icon: 'assets/images/preferences.svg'},
+        {name: 'Email & password', icon: 'assets/images/preferences.svg'},
         {name: 'Referrer', icon: 'assets/images/preferences.svg'},
       ],
     },

diff --git a/src/app/advertiser/dashboard/dashboard.component.html b/src/app/advertiser/dashboard/dashboard.component.html
@@ -113,7 +113,7 @@
               dwmth-heading
               dwmth-heading--primary"
           >
-            Create your First Campaign
+            Create your first campaign
           </h2>
         </div>
         <a

diff --git a/src/app/common/components/header/header.component.html b/src/app/common/components/header/header.component.html
@@ -107,8 +107,8 @@
             dwmth-icon--prepend"
         src="assets/images/plus-circle.svg"
       >
-      <span *ngIf="activeUserType === userRolesEnum.ADVERTISER">Create new Campaign</span>
-      <span *ngIf="activeUserType === userRolesEnum.PUBLISHER">Add new Site</span>
+      <span *ngIf="activeUserType === userRolesEnum.ADVERTISER">Create new campaign</span>
+      <span *ngIf="activeUserType === userRolesEnum.PUBLISHER">Add new site</span>
     </button>
     <div
       *ngIf="activeUserType !== userRolesEnum.ADMIN"
@@ -187,22 +187,22 @@
                 close"
               src="assets/images/plus-circle.svg"
             >
-            Add Funds
+            Deposit funds
           </button>
         </li>
         <li
           class="settings-menu__item"
           routerLink="/settings/general"
           data-test="header-account-settings-button"
         >
-          Account Settings
+          Account settings
         </li>
         <li
           class="settings-menu__item"
           routerLink="/settings/billing"
           data-test="header-billing-payments-button"
         >
-          Billing & Payments
+          Billing & payments
         </li>
         <li class="settings-menu__item">
           <span

diff --git a/src/app/common/components/table-navigation/table-navigation.component.ts b/src/app/common/components/table-navigation/table-navigation.component.ts
@@ -27,7 +27,7 @@ export class TableNavigationComponent implements OnInit {
 
   campaignListNavigationItems = [
     {title: 'Status', columnWidth: 'status-cell-width', keys: ['basicInformation', 'status'], sortAsc: true},
-    {title: 'Campaign Title', columnWidth: 'col-xs-2', keys: ['basicInformation', 'name'], sortAsc: true},
+    {title: 'Campaign title', columnWidth: 'col-xs-2', keys: ['basicInformation', 'name'], sortAsc: true},
     {title: 'Budget', columnWidth: 'col-xs-1', keys: ['basicInformation', 'budget'], sortAsc: true},
     {title: 'Cost', columnWidth: 'col-xs-1', keys: ['cost'], sortAsc: true},
     {title: 'Clicks', columnWidth: 'col-xs-1', keys: ['clicks'], sortAsc: true},
@@ -40,8 +40,8 @@ export class TableNavigationComponent implements OnInit {
 
   siteListNavigationItems = [
     {title: 'Status', columnWidth: 'status-cell-width', keys: ['status'], sortAsc: true},
-    {title: 'Website Name', columnWidth: 'col-xs-3', keys: ['name'], sortAsc: true},
-    {title: 'Est. Revenue', columnWidth: 'col-xs-1', keys: ['revenue'], sortAsc: true},
+    {title: 'Website name', columnWidth: 'col-xs-3', keys: ['name'], sortAsc: true},
+    {title: 'Est. revenue', columnWidth: 'col-xs-1', keys: ['revenue'], sortAsc: true},
     {title: 'Clicks', columnWidth: 'col-xs-1', keys: ['clicks'], sortAsc: true},
     {title: 'Views', columnWidth: 'col-xs-1', keys: ['impressions'], sortAsc: true},
     {title: 'CTR', columnWidth: 'col-xs-1', keys: ['ctr'], sortAsc: true},
@@ -59,7 +59,7 @@ export class TableNavigationComponent implements OnInit {
     {title: 'Name', columnWidth: 'col-xs-1', keys: ['name'], sortAsc: true},
     {title: 'Size', columnWidth: 'col-xs-1', hideArrows: true},
     {title: 'Tags', columnWidth: 'col-xs-2', hideArrows: true},
-    {title: 'Est. Revenue', columnWidth: 'col-xs-1', keys: ['revenue'], sortAsc: true},
+    {title: 'Est. revenue', columnWidth: 'col-xs-1', keys: ['revenue'], sortAsc: true},
     {title: 'Clicks', columnWidth: 'col-xs-1', keys: ['clicks'], sortAsc: true},
     {title: 'Views', columnWidth: 'col-xs-1', keys: ['impressions'], sortAsc: true},
     {title: 'CTR', columnWidth: 'col-xs-1', keys: ['ctr'], sortAsc: true},

diff --git a/src/app/common/dialog/add-funds-dialog/add-funds-dialog.component.html b/src/app/common/dialog/add-funds-dialog/add-funds-dialog.component.html
@@ -12,7 +12,7 @@
       dwmth-heading
       dwmth-heading--primary"
   >
-    Deposit Funds
+    Deposit funds
   </h1>
 
   <p

diff --git a/src/app/common/dialog/withdraw-funds-dialog/withdraw-funds-dialog.component.html b/src/app/common/dialog/withdraw-funds-dialog/withdraw-funds-dialog.component.html
@@ -12,7 +12,7 @@
       dwmth-heading
       dwmth-heading--primary"
   >
-    Withdraw Funds
+    Withdraw funds
   </h1>
 
   <p
@@ -79,7 +79,7 @@
 
       <div class="total-funds">
         <p class="dwmth-form-label">
-          Total Balance:
+          Total balance:
         </p>
         <h1
           class="
@@ -96,7 +96,7 @@
           for="amount"
           class="dwmth-form-label"
         >
-          Withdrawal Amount ({{cryptoCode}})
+          Withdrawal amount ({{cryptoCode}})
         </label>
         <input
           id="amount"
@@ -139,7 +139,7 @@
                 (click)="getMaxWithdrawAmount()"
                 data-test="common-withdraw-funds-form-btn-withdraw-max"
         >
-          Withdraw Max
+          Withdraw max
         </button>
       </div>
 
@@ -171,7 +171,7 @@
           dwmth-copy--semi"
       >
         <p>
-          Transaction Fee:
+          Transaction fee:
           <span
             class="fee"
             data-test="common-withdraw-funds-form-fee"
@@ -180,7 +180,7 @@
           </span>
         </p>
         <p>
-          Total Withdrawal Amount:
+          Total withdrawal amount:
           <span
             class="total-amount"
             data-test="common-withdraw-funds-form-total-withdraw-amount"

diff --git a/src/app/models/enum/site.enum.ts b/src/app/models/enum/site.enum.ts
@@ -1,10 +1,5 @@
-export enum primaryLanguageEnum {
-  POLISH,
-  ENGLISH
-}
-
 export enum siteStatusEnum {
   DRAFT,
   INACTIVE,
-  ACTIVE
+  ACTIVE,
 }
diff --git a/src/app/publisher/dashboard/dashboard.component.html b/src/app/publisher/dashboard/dashboard.component.html
@@ -47,7 +47,7 @@
             dwmth-btn
             dwmth-btn--bordered-light"
           >
-            Reject banners
+            Reject banner ads
           </button>
         </a>
       </div>
@@ -131,7 +131,7 @@
               dwmth-heading
               dwmth-heading--primary"
           >
-            Add your First Site
+            Add your first site
           </h2>
         </div>
         <a

diff --git a/...er/edit-site/edit-site-additional-targeting/edit-site-additional-targeting.component.html b/...er/edit-site/edit-site-additional-targeting/edit-site-additional-targeting.component.html
@@ -79,15 +79,17 @@
             dwmth-heading--secondary"
         >
           <mat-panel-title>
-            2. Excludes
+            Exclusions
           </mat-panel-title>
         </mat-expansion-panel-header>
 
         <div class="row">
           <div class="col-xs-6">
             <p class="dwmth-copy"
             >
-              In this window you can select the keywords prohibited on your site.
+              Please select banner ad categories that you don’t want to display on your site.
+              If you don’t exclude any categories, all available ads will be displayed on your site - e.g. adult, gambling, investment etc.
+              You can also exclude specific banner ad types.
             </p>
 
             <div class="targeting-select-wrapper">
@@ -154,7 +156,7 @@
           save-as-draft"
         data-test="publisher-edit-site-save-as-draft"
       >
-        Save as Draft
+        Save as draft
       </button>
       <button
         (click)="onSubmit()"
@@ -164,7 +166,7 @@
           dwmth-btn--blue"
         data-test="publisher-edit-site-save-and-continue"
       >
-        <span *ngIf="!changesSaved; else loading">{{createSiteMode ? "Save & Continue" : "Update" }}</span>
+        <span *ngIf="!changesSaved; else loading">{{createSiteMode ? "Save & continue" : "Update" }}</span>
         <ng-template #loading>
           <mat-spinner [diameter]="20" [strokeWidth]="2" color="accent"></mat-spinner>
         </ng-template>

diff --git a/src/app/publisher/edit-site/edit-site-basic-info/edit-site-basic-information.component.html b/src/app/publisher/edit-site/edit-site-basic-info/edit-site-basic-information.component.html
@@ -30,7 +30,15 @@
           for="siteUrl"
           class="dwmth-form-label"
         >
-          Website address
+          Website name
+          <fa-icon
+            matTooltipClass="dwmth-mat-tooltip"
+            matTooltip="
+              Enter your primary website name or an URL.
+              If you are placing ad units on multiple sites it is good to use URLs as website names to make the navigation easier."
+            matTooltipPosition="right"
+            [icon]="faQuestionCircle"
+          ></fa-icon>
         </label>
 
         <input
@@ -50,7 +58,7 @@
           class="error-msg"
           *ngIf="!siteBasicInfoForm.get('name').valid && siteBasicInfoSubmitted"
         >
-          Please provide a valid URL.
+          Please provide a valid name.
         </span>
         <span
           class="error-msg"
@@ -65,7 +73,7 @@
           dwmth-copy
           dwmth-copy--light"
       >
-        Enter the URL of your website. Please note that we support only HTTPS websites. 
+        Please note that we support HTTPS websites only.
       </span>
 
       <div
@@ -75,7 +83,7 @@
           for="languageInput"
           class="dwmth-form-label dwmth-form-label--shorter"
         >
-          Content Language
+          Content language
         </label>
         <mat-form-field appearance="standard" class="col">
           <input matInput
@@ -110,7 +118,7 @@
           class="error-msg"
           *ngIf="siteBasicInfoForm.hasError('required', ['primaryLanguage']) && siteBasicInfoSubmitted"
         >
-          Content Language required
+          Content language required
         </span>
       </div>
     </div>
@@ -132,7 +140,7 @@
         (click)="onStepBack()"
         [disabled]="changesSaved"
       >
-        {{createSiteMode ? 'Back to Dashboard' : 'Back'}}
+        {{createSiteMode ? 'Back to dashboard' : 'Back'}}
       </button>
 
       <button
@@ -143,7 +151,7 @@
         data-test="publisher-edit-site-save-and-continue"
         [disabled]="changesSaved || siteBasicInfoSubmitted"
       >
-        <span *ngIf="!changesSaved; else loading">{{createSiteMode ? "Save & Continue" : "Update" }}</span>
+        <span *ngIf="!changesSaved; else loading">{{createSiteMode ? "Save & continue" : "Update" }}</span>
         <ng-template #loading>
           <mat-spinner [diameter]="20" [strokeWidth]="2" color="accent"></mat-spinner>
         </ng-template>

diff --git a/src/app/publisher/edit-site/edit-site-basic-info/edit-site-basic-information.component.ts b/src/app/publisher/edit-site/edit-site-basic-info/edit-site-basic-information.component.ts
@@ -14,6 +14,7 @@ import { Site, SiteLanguage } from 'models/site.model';
 import { PublisherService } from 'publisher/publisher.service';
 import { ErrorResponseDialogComponent } from 'common/dialog/error-response-dialog/error-response-dialog.component';
 import { HandleSubscription } from 'common/handle-subscription';
+import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
   selector: 'app-edit-site-basic-information',
@@ -22,6 +23,7 @@ import { HandleSubscription } from 'common/handle-subscription';
 })
 export class EditSiteBasicInformationComponent extends HandleSubscription implements OnInit {
   private static readonly WEBSITE_NAME_LENGTH_MAX: number = 64;
+  faQuestionCircle = faQuestionCircle;
   siteBasicInfoForm: FormGroup;
   languages: SiteLanguage[];
   siteBasicInfoSubmitted = false;