Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inco… (

#2039) * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] * Changed modal title in Themes -> upload & install * Fixed issue: 8 Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Renamed Apply to Resend in Resend Login Data modal * Fixed issue: 8. Titles - Optimize titles of modals - [XLS - Inconsistencies] - Renamed Apply to Add in add to usergroup modal * Fixed issue: 8. Titles - Optimize titles of modals - [XLS - Design Inconsistencies] Renamed Apply to Add Button in add user role modal * Fixed issue: 8. Titles - Optimize titles of modal - [XLS - Design Inconsistencies] Renamed Save to Add Button in Add user modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Renamed title and button in add dummy users modal * Fixed issue: Titles Optimize titles of modals - [XLS - Design Inconsistencies] Renamed button for import (csv) and import (json) modals * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Renamed button to Create in Create permission role modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Moved previous change to variable and changed title for edit role modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Renamed Button in import xml modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Changed Button in Batch Edit Participants Modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Renamed Button in Export participant to CSV modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Renamed Button in Share Participant(s) modal * Dev: Removed unused code * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Renamed button in Add participants to survey modal * Dev: Removed unused code * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] Renamed button in Add Participant modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Survey Menu - Renamed Button in Selected Menues - Batch edit modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Survey Menu entries - Selected menu entries - Batch edit modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Surveys - Survey lists - Survey archive .lsa - Renamed button to Export * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Surveys - Survey lists - Survey archive .lss - Renamed button to Export * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Surveys - Survey lists - Printable survey (.html) - Renamed button to Export * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Survey menu - Survey participants - Batch-edit participants - Renamed Button in batch-edit participants modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Assessments - Add new assessment rule - Changed Button * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - E-Mail templates - Add file - Changed heading in add file modal * Fixed issue: 8. Titles Optimize titles of modals - [XLS - Design Inconsistencies] - Edit Question - Quick Add - Changed title in quick add modal * Dev: Changed wording in edit role modal
LimeSurvey · Sep 28, 2021 · 140c696 · 140c696
1 parent 58dbdd6
commit 140c696
Show file tree

Hide file tree

Showing 28 changed files with 410 additions and 36 deletions.
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php b/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php
@@ -25,7 +25,11 @@ class massiveActionsWidget extends CWidget
             'yes-no-lg',
             'empty-lg',
             'cancel-apply',
-            'cancel-delete'
+            'cancel-resend',
+            'cancel-add',
+            'cancel-save',
+            'cancel-delete',
+            'cancel-export',
         ];
 
         // Selector variables

diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php
@@ -0,0 +1,80 @@
+<?php
+
+if (isset($aAction['showSelected'])) {
+    $showSelected = $aAction['showSelected'];
+} else {
+    $showSelected = 'no';
+}
+
+if (isset($aAction['selectedUrl'])) {
+    $selectedUrl = $aAction['selectedUrl'];
+} else {
+    $selectedUrl = '#';
+}
+
+if (isset($aAction['largeModalView']) && $aAction['largeModalView']) {
+    $largeModalView = 'modal-lg';
+}else{
+    $largeModalView = '';
+}
+?>
+
+<!-- Modal confirmation for <?php
+echo $aAction['action']; ?> -->
+
+<div id="massive-actions-modal-<?php
+echo $this->gridid; ?>-<?php
+echo $aAction['action']; ?>-<?php
+echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen']; ?>"
+     data-show-selected="<?php echo $showSelected; ?>"
+     data-selected-url="<?php echo $selectedUrl ?>"
+>
+    <div class="modal-dialog <?php echo $largeModalView?>">
+        <!-- Modal content-->
+        <div class="modal-content" style="text-align:left; color:#000">
+            <?php
+            Yii::app()->getController()->renderPartial(
+                '/layouts/partial_modals/modal_header',
+                ['modalTitle' => $aAction['sModalTitle']]
+            );
+            ?>
+            <div class="modal-body">
+                <div class='modal-body-text'><?php
+                    echo $aAction['htmlModalBody']; ?></div>
+
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
+                <?php
+                if (isset($aAction['aCustomDatas'])) { ?>
+                    <!--
+                        Custom datas needed for action defined directly in the widget call.
+                        Always hidden in Yes/No case.
+                        For specific input (like text, selector, etc) that should be filled by user
+                        parse a form to htmlModalBody and attribute to the wanted input the class "custom-data"
+                    -->
+                    <div class="custom-modal-datas hidden">
+                        <?php
+                        foreach ($aAction['aCustomDatas'] as $aCustomData) { ?>
+                            <input
+                                    class="custom-data"
+                                    type="hidden"
+                                    name="<?php
+                                    echo $aCustomData['name']; ?>"
+                                    value="<?php
+                                    echo $aCustomData['value']; ?>"/>
+                        <?php
+                        } ?>
+                    </div>
+                <?php
+                } ?>
+            </div>
+            <?php
+            Yii::app()->getController()->renderPartial('/layouts/partial_modals/modal_footer_canceladd');
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-export.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-export.php
@@ -0,0 +1,80 @@
+<?php
+
+if (isset($aAction['showSelected'])) {
+    $showSelected = $aAction['showSelected'];
+} else {
+    $showSelected = 'no';
+}
+
+if (isset($aAction['selectedUrl'])) {
+    $selectedUrl = $aAction['selectedUrl'];
+} else {
+    $selectedUrl = '#';
+}
+
+if (isset($aAction['largeModalView']) && $aAction['largeModalView']) {
+    $largeModalView = 'modal-lg';
+}else{
+    $largeModalView = '';
+}
+?>
+
+<!-- Modal confirmation for <?php
+echo $aAction['action']; ?> -->
+
+<div id="massive-actions-modal-<?php
+echo $this->gridid; ?>-<?php
+echo $aAction['action']; ?>-<?php
+echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen']; ?>"
+     data-show-selected="<?php echo $showSelected; ?>"
+     data-selected-url="<?php echo $selectedUrl ?>"
+>
+    <div class="modal-dialog <?php echo $largeModalView?>">
+        <!-- Modal content-->
+        <div class="modal-content" style="text-align:left; color:#000">
+            <?php
+            Yii::app()->getController()->renderPartial(
+                '/layouts/partial_modals/modal_header',
+                ['modalTitle' => $aAction['sModalTitle']]
+            );
+            ?>
+            <div class="modal-body">
+                <div class='modal-body-text'><?php
+                    echo $aAction['htmlModalBody']; ?></div>
+
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
+                <?php
+                if (isset($aAction['aCustomDatas'])) { ?>
+                    <!--
+                        Custom datas needed for action defined directly in the widget call.
+                        Always hidden in Yes/No case.
+                        For specific input (like text, selector, etc) that should be filled by user
+                        parse a form to htmlModalBody and attribute to the wanted input the class "custom-data"
+                    -->
+                    <div class="custom-modal-datas hidden">
+                        <?php
+                        foreach ($aAction['aCustomDatas'] as $aCustomData) { ?>
+                            <input
+                                    class="custom-data"
+                                    type="hidden"
+                                    name="<?php
+                                    echo $aCustomData['name']; ?>"
+                                    value="<?php
+                                    echo $aCustomData['value']; ?>"/>
+                        <?php
+                        } ?>
+                    </div>
+                <?php
+                } ?>
+            </div>
+            <?php
+            Yii::app()->getController()->renderPartial('/layouts/partial_modals/modal_footer_cancelexport');
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-resend.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-resend.php
@@ -0,0 +1,80 @@
+<?php
+
+if (isset($aAction['showSelected'])) {
+    $showSelected = $aAction['showSelected'];
+} else {
+    $showSelected = 'no';
+}
+
+if (isset($aAction['selectedUrl'])) {
+    $selectedUrl = $aAction['selectedUrl'];
+} else {
+    $selectedUrl = '#';
+}
+
+if (isset($aAction['largeModalView']) && $aAction['largeModalView']) {
+    $largeModalView = 'modal-lg';
+}else{
+    $largeModalView = '';
+}
+?>
+
+<!-- Modal confirmation for <?php
+echo $aAction['action']; ?> -->
+
+<div id="massive-actions-modal-<?php
+echo $this->gridid; ?>-<?php
+echo $aAction['action']; ?>-<?php
+echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen']; ?>"
+     data-show-selected="<?php echo $showSelected; ?>"
+     data-selected-url="<?php echo $selectedUrl ?>"
+>
+    <div class="modal-dialog <?php echo $largeModalView?>">
+        <!-- Modal content-->
+        <div class="modal-content" style="text-align:left; color:#000">
+            <?php
+            Yii::app()->getController()->renderPartial(
+                '/layouts/partial_modals/modal_header',
+                ['modalTitle' => $aAction['sModalTitle']]
+            );
+            ?>
+            <div class="modal-body">
+                <div class='modal-body-text'><?php
+                    echo $aAction['htmlModalBody']; ?></div>
+
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
+                <?php
+                if (isset($aAction['aCustomDatas'])) { ?>
+                    <!--
+                        Custom datas needed for action defined directly in the widget call.
+                        Always hidden in Yes/No case.
+                        For specific input (like text, selector, etc) that should be filled by user
+                        parse a form to htmlModalBody and attribute to the wanted input the class "custom-data"
+                    -->
+                    <div class="custom-modal-datas hidden">
+                        <?php
+                        foreach ($aAction['aCustomDatas'] as $aCustomData) { ?>
+                            <input
+                                    class="custom-data"
+                                    type="hidden"
+                                    name="<?php
+                                    echo $aCustomData['name']; ?>"
+                                    value="<?php
+                                    echo $aCustomData['value']; ?>"/>
+                        <?php
+                        } ?>
+                    </div>
+                <?php
+                } ?>
+            </div>
+            <?php
+            Yii::app()->getController()->renderPartial('/layouts/partial_modals/modal_footer_cancelresend');
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-save.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-save.php
@@ -0,0 +1,80 @@
+<?php
+
+if (isset($aAction['showSelected'])) {
+    $showSelected = $aAction['showSelected'];
+} else {
+    $showSelected = 'no';
+}
+
+if (isset($aAction['selectedUrl'])) {
+    $selectedUrl = $aAction['selectedUrl'];
+} else {
+    $selectedUrl = '#';
+}
+
+if (isset($aAction['largeModalView']) && $aAction['largeModalView']) {
+    $largeModalView = 'modal-lg';
+}else{
+    $largeModalView = '';
+}
+?>
+
+<!-- Modal confirmation for <?php
+echo $aAction['action']; ?> -->
+
+<div id="massive-actions-modal-<?php
+echo $this->gridid; ?>-<?php
+echo $aAction['action']; ?>-<?php
+echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen']; ?>"
+     data-show-selected="<?php echo $showSelected; ?>"
+     data-selected-url="<?php echo $selectedUrl ?>"
+>
+    <div class="modal-dialog <?php echo $largeModalView?>">
+        <!-- Modal content-->
+        <div class="modal-content" style="text-align:left; color:#000">
+            <?php
+            Yii::app()->getController()->renderPartial(
+                '/layouts/partial_modals/modal_header',
+                ['modalTitle' => $aAction['sModalTitle']]
+            );
+            ?>
+            <div class="modal-body">
+                <div class='modal-body-text'><?php
+                    echo $aAction['htmlModalBody']; ?></div>
+
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
+                <?php
+                if (isset($aAction['aCustomDatas'])) { ?>
+                    <!--
+                        Custom datas needed for action defined directly in the widget call.
+                        Always hidden in Yes/No case.
+                        For specific input (like text, selector, etc) that should be filled by user
+                        parse a form to htmlModalBody and attribute to the wanted input the class "custom-data"
+                    -->
+                    <div class="custom-modal-datas hidden">
+                        <?php
+                        foreach ($aAction['aCustomDatas'] as $aCustomData) { ?>
+                            <input
+                                    class="custom-data"
+                                    type="hidden"
+                                    name="<?php
+                                    echo $aCustomData['name']; ?>"
+                                    value="<?php
+                                    echo $aCustomData['value']; ?>"/>
+                        <?php
+                        } ?>
+                    </div>
+                <?php
+                } ?>
+            </div>
+            <?php
+            Yii::app()->getController()->renderPartial('/layouts/partial_modals/modal_footer_cancelsave');
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php
@@ -106,7 +106,7 @@
 
                     // modal
                     'actionType'  => 'modal',
-                    'modalType'   => 'cancel-apply',
+                    'modalType'   => 'cancel-export',
                     'keepopen'    => 'yes',
                     'showSelected'  => 'yes',
                     'selectedUrl'   => App()->createUrl('/surveyAdministration/renderItemsSelected/'),
@@ -126,7 +126,7 @@
 
                     // modal
                     'actionType'  => 'modal',
-                    'modalType'   => 'cancel-apply',
+                    'modalType'   => 'cancel-export',
                     'keepopen'    => 'yes',
                     'showSelected'  => 'yes',
                     'selectedUrl'   => App()->createUrl('/surveyAdministration/renderItemsSelected/'),
@@ -144,7 +144,7 @@
                     'text'        =>  gT("Printable survey (*.html)"),
                     // modal
                     'actionType'  => 'modal',
-                    'modalType'   => 'cancel-apply',
+                    'modalType'   => 'cancel-export',
                     'keepopen'    => 'yes',
                     'showSelected'  => 'yes',
                     'selectedUrl'   => App()->createUrl('/surveyAdministration/renderItemsSelected/'),

diff --git a/application/views/admin/emailtemplates/emailtemplates_view.php b/application/views/admin/emailtemplates/emailtemplates_view.php
@@ -75,7 +75,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title"><?=gT("Choose file")?></h4>
+        <h4 class="modal-title"><?=gT("Choose file to add")?></h4>
       </div>
       <div class="modal-body" style="padding: 0;">
         <iframe frameBorder="0" style="min-height: 600px; height:100%; width: 100%;" src="about:blank"></iframe>
@@ -101,7 +101,7 @@
             </div>
             <div class='modal-footer'>
                 <button type="button" class='btn btn-default' data-dismiss='modal'><?php eT("Close");?></button>
-                <button type="button" class='btn btn-success'><?php eT("Apply");?></button>
+                <button type="button" class='btn btn-success'><?php eT("Add");?></button>
             </div>
         </div>
     </div>

diff --git a/application/views/admin/participants/massive_actions/_selector.php b/application/views/admin/participants/massive_actions/_selector.php
@@ -51,10 +51,9 @@
                 'grid-reload' => 'yes',
                 //modal
                 'actionType' => 'modal',
-                'modalType' => 'cancel-apply',
+                'modalType' => 'cancel-save',
                 'keepopen' => 'yes',
-                'yes' => gT('Apply'),
-                'no' => gT('Cancel'),
+
                 'sModalTitle' => gT('Batch edit the participants'),
                 'htmlModalBody' => $this->renderPartial('./participants/massive_actions/_update', [], true)
             ],