name Observation Portal consistently

observation_portal/sciapplications/templates/sciapplications/index.html

@@ -6,7 +6,7 @@
     <div class="col-md-12">
         <h1>Calls for Proposals</h1>
         <p>
-            LCO's year is divided into two observing semesters, each 6 months long. Calls for proposals are issued each semester. Three types of proposals can be submitted through this LCO Observing Portal:
+            LCO's year is divided into two observing semesters, each 6 months long. Calls for proposals are issued each semester. Three types of proposals can be submitted through this LCO Observation Portal:
         </p>
         <ul>
           <li><b>Standard proposals</b> are accepted each semester from astronomers affiliated with LCO and LCO's non-guaranteed-time partners:

static/js/components/drafts.vue

@@ -9,7 +9,7 @@
       :fields="fields" 
       :items="items" 
       :show-empty="tableIsEmpty"
-      empty-text="You have no draft observing requests" 
+      empty-text="You have no draft observation requests"
     >
       <template slot="load" slot-scope="data" class="text-center">
         <b-button 

static/js/components/instrumentconfig.vue

@@ -41,7 +41,7 @@
               :errors="errors.exposure_count" 
               desc="Clicking the 'Fill' button will set the exposure count to the number of 
                     exposures (including overheads) that will fit in the largest observing window. 
-                    This button is disabled until the entire observing request has passed validation."
+                    This button is disabled until the entire observation request has passed validation."
               @input="update"
             >
               <b-input-group-append slot="inline-input">

static/js/components/requestgroup.vue

@@ -32,7 +32,7 @@
       <b-form-row>
         <b-col md="6" v-show="show">
           <h3>
-            Duration of Observing Request:
+            Duration of Observation Request:
             <sup 
               class="text-info"
               v-b-tooltip=tooltipConfig 

static/js/components/sidenav.vue

@@ -46,7 +46,7 @@
           </b-button>
         <span 
           v-b-tooltip=tooltipConfig
-          title="Submit observing request"
+          title="Submit observation request"
         >
           <b-button 
             variant="success" 
@@ -207,7 +207,7 @@
     data: function() {
       return {
         tooltipConfig: tooltipConfig,
-        saveDraftTooltipText: 'Save a draft of this observing request. The request will not be submitted.'
+        saveDraftTooltipText: 'Save a draft of this observation request. The request will not be submitted.'
       }
     },
     computed: {

static/js/compose.vue

@@ -121,7 +121,7 @@
               </p>
               <p>
                 Some sections may be copied using the <i class="fa fa-copy text-success"></i> button. This will duplicate
-                the section and add it to your observing request. Certain sections can also be removed using the
+                the section and add it to your observation request. Certain sections can also be removed using the
                 <i class="fa fa-trash text-danger"></i> button. This button is only displayed if that section is eligible for removal.
               </p>
               <h2>Using the API view</h2>

templates/base.html

@@ -25,7 +25,7 @@
       </div>
       <div class="navbar-header branding pl-md-3">
         <div id="lco-name">
-          <a href="/" class="grey">Observing <br/> Portal</a> {% if user.profile.simple_interface %}<span class="basic">basic mode</span>{% endif %}
+          <a href="/" class="grey">Observation <br/> Portal</a> {% if user.profile.simple_interface %}<span class="basic">basic mode</span>{% endif %}
         </div>
       </div>
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarOptions" aria-controls="navbarOptions" aria-expanded="false" aria-label="Toggle navigation">

templates/help.html

@@ -4,13 +4,13 @@
 <div class="row">
     <div class="col-md-12">
         <h1>Help</h1>
-        <p>The Observing Portal is your access point to Las Cumbres Observatory's global network of telescopes. Registered users can:</p>
+        <p>The Observation Portal is your access point to Las Cumbres Observatory's global network of telescopes. Registered users can:</p>
         <ul class="list-unstyled help-list">
             <li><i class="fa fa-users fa-2x fa-fw" aria-hidden="true"></i>
                 <span><a href="{% url 'sciapplications:index' %}">Write and submit proposals</a> and manage the membership of their research teams.</span>
             </li>
             <li><i class="fab fa-wpexplorer fa-2x fa-fw" aria-hidden="true"></i>
-                <span><a href="{% url 'requestgroups:create' %}">Plan, compose, and submit observing requests</a> for approved proposals.</span>
+                <span><a href="{% url 'requestgroups:create' %}">Plan, compose, and submit observation requests</a> for approved proposals.</span>
             </li>
             <li><i class="fa fa-check fa-2x fa-fw" aria-hidden="true"></i>
                 <span><a href="{% url 'requestgroups:list' %}">Track the status</a> of submitted requests.</span>
@@ -26,7 +26,7 @@ <h1>Help</h1>
             </li>
         </ul>
 
-        <p>If you are a new user of this Observing Portal, we strongly recommend that you read the <a href="https://lco.global/files/User_Documentation/gettingstartedonthelconetwork.latest.pdf">"Getting Started on the LCO Global Telescope Network" Guide.</a>
+        <p>If you are a new user of this Observation Portal, we strongly recommend that you read the <a href="https://lco.global/files/User_Documentation/gettingstartedonthelconetwork.latest.pdf">"Getting Started on the LCO Global Telescope Network" Guide.</a>
         </p>
         <p>If you are a new user of the LCO network, information about the <a href="http://lcogt.net/observatory/telescopes">telescopes</a>,
            <a href="http://lcogt.net/observatory/instruments">instruments</a>, <a href="http://lcogt.net/observatory/data">data handling and quality</a>,

templates/index.html

@@ -7,14 +7,14 @@
     <div class="col-md-8">
     {% if not user.is_authenticated and page_obj.number < 2 %}
     <div class="jumbotron noauth">
-        <h1>Observing Portal</h1>
+        <h1>Observation Portal</h1>
         <p>This is your access point to Las Cumbres Observatory's global network of telescopes. Registered users can:</p>
         <ul class="list-unstyled">
             <li><i class="fa fa-users fa-3x fa-pull-left" aria-hidden="true"></i>
                 <span>Submit proposals and manage the membership of their research teams.</span>
             </li>
             <li><i class="fab fa-wpexplorer fa-3x fa-pull-left" aria-hidden="true"></i>
-                <span>Compose, save, and submit observing requests.</span>
+                <span>Compose, save, and submit observation requests.</span>
             </li>
             <li><i class="fa fa-cloud-download-alt fa-3x fa-pull-left" aria-hidden="true"></i>
                 <span>Check the status of submitted requests, and download data from completed observations.</span>