Fixed issue #10506 : added import group/question button in 'add new' …

…related views
LimeSurvey · Feb 17, 2016 · 0d15ce6 · 0d15ce6
1 parent bffa05f
commit 0d15ce6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/application/controllers/admin/questiongroups.php b/application/controllers/admin/questiongroups.php
@@ -158,6 +158,7 @@ function add($surveyid)
             $aData['sidemenu']['state'] = false;
             $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
             $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
+            $aData['surveybar']['importquestiongroup'] = true;
             $aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/listquestiongroups/surveyid/'.$surveyid;
             $aData['surveybar']['savebutton']['form'] = true;
             $this->_renderWrappedTemplate('survey/QuestionGroups', 'addGroup_view', $aData);

diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -870,6 +870,7 @@ public function newquestion($surveyid)
         App()->getClientScript()->registerPackage('qTip2');
         $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
         $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
+        $aData['surveybar']['importquestion'] = true;
         $aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
         $aData['surveybar']['closebutton']['url'] = '/admin/survey/sa/listquestions/surveyid/'.$iSurveyID;
 

diff --git a/application/views/admin/survey/surveybar_view.php b/application/views/admin/survey/surveybar_view.php
@@ -6,7 +6,7 @@
 ?>
 <div class='menubar surveybar' id="surveybarid">
     <div class='row container-fluid'>
-        <div class="col-md-12 col-xs-6">
+        <div class="col-md-8 col-xs-6">
 
             <!-- Add a new group -->
             <?php if(isset($surveybar['buttons']['newgroup'])):?>
@@ -548,11 +548,23 @@
 
 
             <?php endif;?>
+            <?php if(isset($surveybar['importquestion'])):?>
+                <a class="btn btn-default" href="<?php echo Yii::App()->createUrl('admin/questions/sa/importview/surveyid/'.$surveyid);?>" role="button">
+                    <span class="icon-import"></span>
+                    <?php eT('Import a question'); ?>
+                </a>
+            <?php endif;?>
 
+            <?php if(isset($surveybar['importquestiongroup'])):?>
+                <a class="btn btn-default" href="<?php echo Yii::App()->createUrl('admin/questiongroups/sa/importview/surveyid/'.$surveyid);?>" role="button">
+                    <span class="icon-import"></span>
+                    <?php eT('Import a group'); ?>
+                </a>
+            <?php endif;?>
         </div>
 
         <!-- right action buttons -->
-        <div class="col-md-offset-8 col-md-4 text-right">
+        <div class=" col-md-4 text-right">
             <?php if(isset($surveybar['savebutton']['form'])):?>
 
                 <!-- Save -->