Merge branch 'release/1.9.28'

Author: kymni

Dashboard/app/css/main.scss

@@ -3338,7 +3338,6 @@ div.chooseSurveyData {
 }
 
 .filterData {
-    border: thin solid rgb(224, 224, 224);
     border-top: 1px solid white;
     .dataDeviceId {
         display: block;

Dashboard/app/js/lib/controllers/permissions.js

@@ -271,7 +271,6 @@ FLOW.dialogControl = Ember.Object.create({
   delDeviceGroup: "delDeviceGroup",
   delSI: "delSI",
   delSI2: "delSI2",
-  delSL: "delSL",
   delCR: "delCR",
   delForm: "delForm",
   showDialog: false,
@@ -336,12 +335,6 @@ FLOW.dialogControl = Ember.Object.create({
       this.set('showDialog', true);
       break;
 
-    case "delSL":
-        this.set('header', Ember.String.loc('_delete_data_point_header'));
-        this.set('message', Ember.String.loc('_are_you_sure_delete_this_data_point'));
-        this.set('showDialog', true);
-        break;
-
     case "delForm":
       this.set('header', "Delete form");
       this.set('message', "Are you sure you want to delete this form?");
@@ -402,12 +395,7 @@ FLOW.dialogControl = Ember.Object.create({
       this.set('showDialog', false);
       view.deleteSI.apply(view, arguments);
       break;
-
-    case "delSL":
-        this.set('showDialog', false);
-        view.deleteSL.apply(view, arguments);
-        break;
-
+      
     case "delForm":
       this.set('showDialog', false);
       FLOW.surveyControl.deleteForm();

Dashboard/app/js/lib/controllers/survey-controllers.js

@@ -585,6 +585,7 @@ FLOW.projectControl = Ember.ArrayController.create({
       currentForm.set('code', name);
       var path = this.get('currentProjectPath') + "/" + name;
       currentForm.set('path', path);
+      currentForm.set('status', 'NOT_PUBLISHED');
     }
 
     FLOW.store.commit();

Dashboard/app/js/lib/views/data/monitoring-data-table-view.js

@@ -110,10 +110,6 @@ FLOW.DataPointView = FLOW.View.extend({
 
     showDataApprovalBlock: false,
 
-    showSurveyedLocaleDeleteButton: function() {
-        return FLOW.router.surveyedLocaleController.get('userCanDelete');
-    }.property(),
-
     showApprovalStatusColumn: function () {
         return this.get('parentView').get('showApprovalStatusColumn');
     }.property(),

Dashboard/app/js/lib/views/surveys/question-view.js

@@ -300,7 +300,7 @@ FLOW.QuestionView = FLOW.View.extend({
     var path, anyActive, first, dependentQuestionAnswer, minVal, maxVal, options, found, optionsToDelete;
 
     if (this.questionIdValidationFailure) {
-      this.showMessageDialog(Ember.String.loc('_question_id_must_be_valid_and_unique'), this.questionIdValidationFailureReason);
+      this.showMessageDialog(Ember.String.loc('_variable_name_must_be_valid_and_unique'), this.questionIdValidationFailureReason);
       return;
     }
 
@@ -458,9 +458,9 @@ FLOW.QuestionView = FLOW.View.extend({
     var questionKeyId = selectedQuestion.get('keyId');
     var questionId = this.get('questionId') || "";
     if (FLOW.Env.mandatoryQuestionID && questionId.match(/^\s*$/)) {
-      args.failure(Ember.String.loc('_question_id_mandatory'));
+      args.failure(Ember.String.loc('_variable_name_mandatory'));
     } else if (!questionId.match(/^[A-Za-z0-9_\-]*$/)) {
-      args.failure(Ember.String.loc('_question_id_only_alphanumeric'))
+      args.failure(Ember.String.loc('_variable_name_only_alphanumeric'))
     } else {
       var monitoring = this.isPartOfMonitoringGroup(questionKeyId);
       if (monitoring) {
@@ -477,7 +477,7 @@ FLOW.QuestionView = FLOW.View.extend({
               }
             },
             error: function() {
-              args.failure(Ember.String.loc('_could_not_validate_question_id_with_server'));
+              args.failure(Ember.String.loc('_could_not_validate_variable_name_with_server'));
             }
           });
         }, 1000);
@@ -495,7 +495,7 @@ FLOW.QuestionView = FLOW.View.extend({
         if (isUnique) {
           args.success();
         } else {
-          args.failure('the question id is not unique');
+          args.failure(Ember.String.loc('_variable_name_not_unique'));
         }
       }
     }

Dashboard/app/js/templates/navData/data-subnav.handlebars

@@ -2,6 +2,11 @@
     {{#view view.NavItemView item="inspectData" }}
     <a {{action doInspectData}}>{{t _inspect_data}}</a>
     {{/view}}
+    {{#if FLOW.Env.showMonitoringFeature}}
+      {{#view view.NavItemView item="monitoringData" }}
+        <a {{action doMonitoringData}}>{{t _monitoring}}</a>
+      {{/view}}
+    {{/if}}
     {{#view view.NavItemView item="bulkUpload" }}
     <a {{action doBulkUpload}}>{{t _bulk_upload_data}}</a>
     {{/view}} 
@@ -10,11 +15,6 @@
         <a {{action doDataCleaning}}>{{t _data_cleaning}}</a>
         {{/if}}
     {{/view}}
-    {{#if FLOW.Env.showMonitoringFeature}}
-      {{#view view.NavItemView item="monitoringData" }}
-        <a {{action doMonitoringData}}>{{t _monitoring}}</a>
-      {{/view}}
-    {{/if}}
     {{#view view.NavItemView item="cascadeResources" }}
         {{#if view.showCascadeResourcesButton}}
         <a {{action doCascadeResources}}>{{t _cascade_resources}}</a>

Dashboard/app/js/templates/navData/monitoring-data-row.handlebars

@@ -14,12 +14,6 @@
 
     <td class="action">
         <a {{action showDetailsDialog this target="view.parentView" }}>{{t _view_details}}</a>
-
-        {{#if view.showSurveyedLocaleDeleteButton }}
-        {{#view FLOW.DataLocaleItemView contentBinding="this"}}
-            <a {{action confirm FLOW.dialogControl.delSL target="FLOW.dialogControl" }}>{{t _delete}}</a>
-        {{/view}}
-        {{/if}}
     </td>
 </tr>
 

Dashboard/app/js/templates/navData/monitoring-data.handlebars

@@ -93,9 +93,6 @@
                 <a {{action showSurveyInstanceDetails SI target="this"}}>
                   {{t _view_details}}
                 </a>
-                {{#if view.showSurveyedLocaleDeleteButton }} {{#view FLOW.DataItemView contentBinding="SI"}}<a {{action confirm FLOW.dialogControl.delSI2 target="FLOW.dialogControl" }}>
-                  {{t _delete}}
-                </a>{{/view}} {{/if}}
               </td>
             </tr>
             <tr class="si_details" style="background: #fff; display:none;" data-flow-id="si_details_{{unbound SI.id}}">

Dashboard/app/js/templates/navSurveys/question-view.handlebars

@@ -14,7 +14,7 @@
       {{/if}}
       {{view Ember.TextField valueBinding="view.tip" size=100 }} </label>
     <label>
-      {{t _question_id}}: <span class="fadedText">({{t _optional}})</span> {{tooltip _question_id_tooltip}}
+      {{t _variable_name}}: <span class="fadedText">({{t _optional}})</span> {{tooltip _variable_name_tooltip}}
       {{#if view.questionIdValidationFailure }}
       <span style="color:red">{{view.questionIdValidationFailureReason}}</span>
       {{/if}}
@@ -167,7 +167,11 @@
     <!-- End question specific material -->
     <nav>
       <ul>
+        {{#if view.questionIdValidationFailure }}
+        <li><a class="button noChanges" id="standardBtn_01">{{t _save_question}}</a> </li>
+        {{else}}
         <li><a class="button" id="standardBtn_01" {{action "doSaveEditQuestion" target="this"}}>{{t _save_question}}</a> </li>
+        {{/if}}
         <li><a class="cancel" id="standardBtn_01" {{action "doCancelEditQuestion" target="this"}}>{{t _cancel}}</a> </li>
       </ul>
     </nav>