Fixed issue #12134: Activation button for active but expired should l…

…ink to expiry options
LimeSurvey · Mar 4, 2017 · 01e9840 · 01e9840
1 parent 7e90f72
commit 01e9840
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/application/views/admin/survey/subview/accordion/_accordion_container.php b/application/views/admin/survey/subview/accordion/_accordion_container.php
@@ -5,6 +5,15 @@
  * @var $data
  */
 ?>
+<!-- Enable aufo-focus on element via url hash -->
+<script>
+    $(document).ready(function () {
+        if(location.hash != null && location.hash != ""){
+            $('.collapse').removeClass('in');
+            $(location.hash + '.collapse').collapse('show');
+        }
+    });
+</script>
 
 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
 

diff --git a/application/views/admin/survey/surveybar_view.php b/application/views/admin/survey/surveybar_view.php
@@ -92,11 +92,11 @@
 
                     <!-- activate expired survey -->
                     <?php if($expired) : ?>
-                        <span class="btntooltip" style="display: inline-block" data-toggle="tooltip" data-placement="bottom" title="<?php eT('This survey is active but expired.'); ?>">
-                            <button type="button" class="btn btn-success btntooltip" disabled="disabled">
+                        <span class="btntooltip" style="display: inline-block" data-toggle="tooltip" data-placement="bottom" data-html="true" title="<?php eT('This survey is active but expired.'); ?><br><?php eT('Click to adjust.'); ?>">
+                            <a href='<?php echo $this->createUrl("admin/survey/editlocalsettings/surveyid/$surveyid#publicationoptions");?>'class="btn btn-success btntooltip" >
                                 <span class="fa fa-ban">&nbsp;</span>
-                                <?php eT("Activate this survey"); ?>
-                            </button>
+                                <?php eT("Expired");?>
+                            </a>
                         </span>
                     <?php elseif($notstarted) : ?>
                         <span class="btntooltip" style="display: inline-block" data-toggle="tooltip" data-placement="bottom" title='<?php eT("This survey is active but has a start date."); ?>'>