From 9f65a6849197a4bc44e7d7beb93e0c6bd531413e Mon Sep 17 00:00:00 2001
From: markusfluer <fluer.markus@googlemail.com>
Date: Tue, 4 Jul 2017 18:29:28 +0200
Subject: [PATCH] Dev: Recreated create new survey. Did a Wizard like styling.
 Not final but working solution. Still to be redesigned.

---
 application/config/packages.php               |   3 +
 application/controllers/admin/surveyadmin.php |  93 ++--
 .../admin/survey/editLocalSettings_view.php   |  55 +-
 .../survey/subview/_create_survey_text.php    | 160 ++++++
 .../accordion/_generaloptions_panel.php       |  26 +-
 .../admin/survey/subview/tabCreate_view.php   | 177 +++---
 .../admin/survey/subview/tab_edit_view.php    |   4 +-
 .../adminpanel/build/lsadminpanel.css         | 192 ++++++-
 .../packages/adminpanel/build/lsadminpanel.js | 502 +-----------------
 assets/packages/adminpanel/gulpfile.js        |   2 +-
 assets/packages/adminpanel/scss/lsflex.scss   |  11 +-
 assets/packages/adminpanel/scss/lsspaces.scss |  44 ++
 assets/packages/adminpanel/scss/main.scss     |   1 +
 assets/packages/adminpanel/webpack.config.js  |   2 +-
 14 files changed, 611 insertions(+), 661 deletions(-)
 create mode 100644 application/views/admin/survey/subview/_create_survey_text.php
 create mode 100644 assets/packages/adminpanel/scss/lsspaces.scss

diff --git a/application/config/packages.php b/application/config/packages.php
index 45adb871952..a704a2681a8 100644
--- a/application/config/packages.php
+++ b/application/config/packages.php
@@ -112,6 +112,9 @@
         'position' =>CClientScript::POS_END,
         'js' => array(
             'lsadminpanel.js'
+        ),
+        'css' => array(
+            'lsadminpanel.css'
         )
     )
 
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
index 42bb40f0282..3a978e08597 100644
--- a/application/controllers/admin/surveyadmin.php
+++ b/application/controllers/admin/surveyadmin.php
@@ -146,11 +146,17 @@ public function newsurvey()
 
         $aViewUrls['output']  = PrepareEditorScript(false, $this->getController());
         $aData                = $this->_generalTabNewSurvey();
+        $aData                = array_merge($aData, $this->_getGeneralTemplateData(0));
         $aData['esrow']       = $esrow;
-        $aData                = array_merge($aData, $this->_tabPresentationNavigation($esrow));
-        $aData                = array_merge($aData, $this->_tabPublicationAccess($esrow));
-        $aData                = array_merge($aData, $this->_tabNotificationDataManagement($esrow));
-        $aData                = array_merge($aData, $this->_tabTokens($esrow));
+        
+        //Prepare the edition panes
+
+        $aData['edittextdata']              = array_merge($aData, $this->_getTextEditData(0,$esrow));
+        $aData['generalsettingsdata']       = array_merge($aData, $this->_generalTabEditSurvey(0,$esrow));
+        $aData['presentationsettingsdata']  = array_merge($aData, $this->_tabPresentationNavigation(0,$esrow));
+        $aData['publicationsettingsdata']   = array_merge($aData, $this->_tabPublicationAccess(0,$esrow));
+        $aData['notificationsettingsdata']  = array_merge($aData, $this->_tabNotificationDataManagement(0,$esrow));
+        $aData['tokensettingsdata']         = array_merge($aData, $this->_tabTokens(0,$esrow));
 
         $aViewUrls[]          = 'newSurvey_view';
 
@@ -1100,7 +1106,7 @@ public function editlocalsettings($iSurveyID)
                 // this one is created to get the right default texts fo each language
                 Yii::app()->loadHelper('database');
                 Yii::app()->loadHelper('surveytranslator');
-
+                
                 $esrow = SurveyLanguageSetting::model()->findByPk(array('surveyls_survey_id' => $iSurveyID, 'surveyls_language' => $sLang))->getAttributes();
                 $aTabTitles[$sLang] = getLanguageNameFromCode($esrow['surveyls_language'], false);
 
@@ -1606,39 +1612,60 @@ private function _getGeneralTemplateData($iSurveyID){
 
     private function _getTextEditData($iSurveyID, $esrow){
         Yii::app()->loadHelper("admin/htmleditor");
-        $aTabTitles = $aTabContents=  array();
-        $grplangs = Survey::model()->findByPk($iSurveyID)->additionalLanguages;
-        $baselang = Survey::model()->findByPk($iSurveyID)->language;
-        array_unshift($grplangs, $baselang);
-
+        $aData = $aTabTitles = $aTabContents = array();
+        
         $aData['scripts'] = PrepareEditorScript(false, $this->getController());
-        foreach ($grplangs as $i => $sLang)
-        {
-            $aLanguageData = $this->_getGeneralTemplateData($iSurveyID);
+        
+        if($iSurveyID !== 0){
+            $grplangs = Survey::model()->findByPk($iSurveyID)->additionalLanguages;
+            $baselang = Survey::model()->findByPk($iSurveyID)->language;
+            array_unshift($grplangs, $baselang);
 
-            // this one is created to get the right default texts fo each language
-            Yii::app()->loadHelper('database');
-            Yii::app()->loadHelper('surveytranslator');
+            foreach ($grplangs as $i => $sLang)
+            {
+                $aLanguageData = $this->_getGeneralTemplateData($iSurveyID);
+                // this one is created to get the right default texts fo each language
+                Yii::app()->loadHelper('database');
+                Yii::app()->loadHelper('surveytranslator');
+                
+                $aSurveyLanguageSettings = SurveyLanguageSetting::model()->findByPk(array('surveyls_survey_id' => $iSurveyID, 'surveyls_language' => $sLang))->getAttributes();
 
-            $aSurveyLanguageSettings = SurveyLanguageSetting::model()->findByPk(array('surveyls_survey_id' => $iSurveyID, 'surveyls_language' => $sLang))->getAttributes();
-            $aTabTitles[$sLang] = getLanguageNameFromCode($aSurveyLanguageSettings['surveyls_language'], false);
+                $aTabTitles[$sLang] = getLanguageNameFromCode($aSurveyLanguageSettings['surveyls_language'], false);
 
-            if ($aSurveyLanguageSettings['surveyls_language'] == Survey::model()->findByPk($iSurveyID)->language)
-            {
-                $aTabTitles[$sLang] .= ' (' . gT("Base language") . ')';
-            }
+                if ($aSurveyLanguageSettings['surveyls_language'] == Survey::model()->findByPk($iSurveyID)->language)
+                {
+                    $aTabTitles[$sLang] .= ' (' . gT("Base language") . ')';
+                }
 
-            $aLanguageData['aSurveyLanguageSettings'] = $aSurveyLanguageSettings;
-            $aLanguageData['action'] = "surveygeneralsettings";
-            $aLanguageData['i'] = $i;
-            $aLanguageData['dateformatdetails'] = getDateFormatData(Yii::app()->session['dateformat']);
-            $aTabContents[$sLang] = $this->getController()->renderPartial('/admin/survey/editLocalSettings_view', $aLanguageData, true);
+                $aLanguageData['aSurveyLanguageSettings'] = $aSurveyLanguageSettings;
+                $aLanguageData['action'] = "surveygeneralsettings";
+                $aLanguageData['i'] = $i;
+                $aLanguageData['dateformatdetails'] = getDateFormatData(Yii::app()->session['dateformat']);
+                $aTabContents[$sLang] = $this->getController()->renderPartial('/admin/survey/editLocalSettings_view', $aLanguageData, true);
+            }
+        } else {
+
+            $baseLang = Yii::app()->session['adminlang'];
+            $aTabTitles[$baseLang] = getLanguageNameFromCode($baseLang,false).' (' . gT("Base language") . ')';
+            $aLanguageData['aSurveyLanguageSettings'] = [
+                'surveyls_language' => $baseLang,
+                'surveyls_title' => '',
+                'surveyls_description' => '',
+                'surveyls_url' => '',
+                'surveyls_urldescription' => '',
+                'surveyls_numberformat' => '',
+                'surveyls_welcometext' => '',
+                'surveyls_endtext' => '',
+                'surveyls_dateformat' => Yii::app()->session['dateformat'],
+            ];
+            $aLanguageData['surveyid'] = 0;
+
+            $aTabContents = $aLanguageData;
         }
 
         $aData['aTabContents'] = $aTabContents;
         $aData['aTabTitles'] = $aTabTitles;
         return $aData;
-
     }
 
     /**
@@ -1915,7 +1942,7 @@ function insert($iSurveyID=null)
             if (Yii::app()->request->getPost('surveyls_title')=='')
             {
                 Yii::app()->session['flashmessage'] = gT("Survey could not be created because it did not have a title");
-                redirect($this->getController()->createUrl('admin'));
+                $this->getController()->redirect($this->getController()->createUrl('admin'));
                 return;
             }
 
@@ -1962,7 +1989,7 @@ function insert($iSurveyID=null)
             'faxto' => App()->request->getPost('faxto'),
             'format' => App()->request->getPost('format'),
             'savetimings' => App()->request->getPost('savetimings')=='1'?'Y':'N',
-            'language' => App()->request->getPost('language'),
+            'language' => App()->request->getPost('language', Yii::app()->session['adminlang']),
             'datestamp' => App()->request->getPost('datestamp')=='1'?'Y':'N',
             'ipaddr' => App()->request->getPost('ipaddr')=='1'?'Y':'N',
             'refurl' => App()->request->getPost('refurl')=='1'?'Y':'N',
@@ -1994,6 +2021,7 @@ function insert($iSurveyID=null)
             'emailresponseto' => App()->request->getPost('emailresponseto'),
             'tokenlength' => $iTokenLength,
             );
+            //var_dump($aInsertData);
 
             $warning = '';
             // make sure we only update emails if they are valid
@@ -2018,9 +2046,10 @@ function insert($iSurveyID=null)
             }
 
             $iNewSurveyid = Survey::model()->insertNewSurvey($aInsertData);
-            if (!$iNewSurveyid)
+            if (!$iNewSurveyid){
                 die('Survey could not be created.');
-
+                App()->end();
+            }
             // Prepare locale data for surveys_language_settings table
             $sTitle          = Yii::app()->request->getPost('surveyls_title');
             $sDescription    = Yii::app()->request->getPost('description');
diff --git a/application/views/admin/survey/editLocalSettings_view.php b/application/views/admin/survey/editLocalSettings_view.php
index bbbaa7bb43c..f13842b44cf 100644
--- a/application/views/admin/survey/editLocalSettings_view.php
+++ b/application/views/admin/survey/editLocalSettings_view.php
@@ -17,7 +17,7 @@
 <div id="edittxtele-<?php echo $i;?>" class="tab-pane fade in <?php if($i==0){echo "active";}?> center-box">
     <div class="container-fluid">
         <div class="row">
-            <div class="col-sm-12 col-md-6">
+            <div class="col-sm-6">
                 <!-- Survey title -->
                 <div class="form-group">
                     <label class="col-sm-2 question-group-title control-label" for="short_title_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>">
@@ -27,7 +27,11 @@
                         <?php echo CHtml::textField("short_title_{$aSurveyLanguageSettings['surveyls_language']}",$aSurveyLanguageSettings['surveyls_title'],array('class'=>'form-control','size'=>"80",'id'=>"short_title_{$aSurveyLanguageSettings['surveyls_language']}")); ?>
                     </div>
                 </div>
-
+            </div>
+            <hr class="col-sm-12"></hr>
+        </div>
+        <div class="row">
+            <div class="col-sm-12 col-md-6">
                 <!-- Description -->
                 <div class="form-group">
                     <label class="col-sm-2 control-label"  for="description_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>"><?php eT("Description:"); ?></label>
@@ -38,29 +42,8 @@
                     </div>
                     </div>
                 </div>
-
-                <!-- Welcome message -->
-                <div class="form-group">
-                    <label class="col-sm-2 control-label" for='welcome_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>'><?php eT("Welcome message:"); ?></label>
-                    <div class="col-sm-9">
-                    <div class="htmleditor input-group">
-                        <?php echo CHtml::textArea("welcome_{$aSurveyLanguageSettings['surveyls_language']}",$aSurveyLanguageSettings['surveyls_welcometext'],array('class'=>'form-control','cols'=>'80','rows'=>'15','id'=>"welcome_{$aSurveyLanguageSettings['surveyls_language']}")); ?>
-                        <?php echo getEditor("survey-welc","welcome_".$aSurveyLanguageSettings['surveyls_language'], "[".gT("Welcome:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
-                    </div>
-                    </div>
-                </div>
             </div>
             <div class="col-sm-12 col-md-6">
-                <!-- End message -->
-                <div class="form-group">
-                    <label class="col-sm-2 control-label" for='endtext_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>'><?php eT("End message:"); ?></label>
-                    <div class="col-sm-9">
-                    <div class="htmleditor input-group">
-                        <?php echo CHtml::textArea("endtext_{$aSurveyLanguageSettings['surveyls_language']}",$aSurveyLanguageSettings['surveyls_endtext'],array('class'=>'form-control','cols'=>'80','rows'=>'15','id'=>"endtext_{$aSurveyLanguageSettings['surveyls_language']}")); ?>
-                        <?php echo getEditor("survey-endtext","endtext_".$aSurveyLanguageSettings['surveyls_language'], "[".gT("End message:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
-                    </div>
-                    </div>
-                </div>
                 <!-- End URL -->
                 <div class="form-group">
                     <label class="control-label col-sm-2"><?php eT("End URL:"); ?></label>
@@ -117,5 +100,31 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="col-sm-12 col-md-6">
+                <!-- Welcome message -->
+                <div class="form-group">
+                    <label class="col-sm-2 control-label" for='welcome_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>'><?php eT("Welcome message:"); ?></label>
+                    <div class="col-sm-9">
+                    <div class="htmleditor input-group">
+                        <?php echo CHtml::textArea("welcome_{$aSurveyLanguageSettings['surveyls_language']}",$aSurveyLanguageSettings['surveyls_welcometext'],array('class'=>'form-control','cols'=>'80','rows'=>'15','id'=>"welcome_{$aSurveyLanguageSettings['surveyls_language']}")); ?>
+                        <?php echo getEditor("survey-welc","welcome_".$aSurveyLanguageSettings['surveyls_language'], "[".gT("Welcome:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
+                    </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-12 col-md-6">
+                <!-- End message -->
+                <div class="form-group">
+                    <label class="col-sm-2 control-label" for='endtext_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>'><?php eT("End message:"); ?></label>
+                    <div class="col-sm-9">
+                    <div class="htmleditor input-group">
+                        <?php echo CHtml::textArea("endtext_{$aSurveyLanguageSettings['surveyls_language']}",$aSurveyLanguageSettings['surveyls_endtext'],array('class'=>'form-control','cols'=>'80','rows'=>'15','id'=>"endtext_{$aSurveyLanguageSettings['surveyls_language']}")); ?>
+                        <?php echo getEditor("survey-endtext","endtext_".$aSurveyLanguageSettings['surveyls_language'], "[".gT("End message:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
+                    </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
diff --git a/application/views/admin/survey/subview/_create_survey_text.php b/application/views/admin/survey/subview/_create_survey_text.php
new file mode 100644
index 00000000000..4a2576cc3fb
--- /dev/null
+++ b/application/views/admin/survey/subview/_create_survey_text.php
@@ -0,0 +1,160 @@
+<?php
+/**
+* General container for create survey action
+*/
+?>
+
+  <script type="text/javascript">
+    var standardtemplaterooturl = '<?php echo Yii::app()->getConfig('
+    standardtemplaterooturl ');?>';
+    var templaterooturl = '<?php echo Yii::app()->getConfig('
+    usertemplaterooturl ');?>';
+    var jsonUrl = '';
+    var sAction = '';
+    var sParameter = '';
+    var sTargetQuestion = '';
+    var sNoParametersDefined = '';
+    var sAdminEmailAddressNeeded = '<?php  eT("If you are using token functions or notifications emails you need to set an administrator email address.",'
+    js '); ?>'
+    var sURLParameters = '';
+    var sAddParam = '';
+  </script>
+
+<?php
+$count = 0;
+if(isset($scripts))
+echo $scripts;
+
+$aSurveyLanguageSettings = $aTabContents['aSurveyLanguageSettings'];
+$surveyid = $aTabContents['surveyid'];
+?>
+
+
+<!-- Edition container -->
+<div class="container-fluid">
+    <div class="row">
+    <div class="col-sm-6">
+        <!-- Survey title -->
+        <div class="form-group">
+        <label class="col-sm-2 question-group-title control-label" for="surveyls_title">
+            <?php eT("Survey title:"); ?>
+        </label>
+        <div class="col-sm-9">
+            <?php echo CHtml::textField("surveyls_title",$aSurveyLanguageSettings['surveyls_title'],array('class'=>'form-control','size'=>"80",'id'=>"surveyls_title")); ?>
+        </div>
+        </div>
+    </div>
+    <hr class="col-sm-12"></hr>
+    </div>
+    <div class="row">
+    <div class="col-sm-12 col-md-6">
+        <!-- Description -->
+        <div class="form-group">
+        <label class="col-sm-2 control-label" for="description">
+            <?php eT("Description:"); ?>
+        </label>
+        <div class="col-sm-9">
+            <div class="htmleditor input-group">
+            <?php echo CHtml::textArea("description",$aSurveyLanguageSettings['surveyls_description'],array('class'=>'form-control','cols'=>'80','rows'=>'15','id'=>"description")); ?>
+                <?php echo getEditor("survey-desc","description", "[".gT("Description:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
+            </div>
+        </div>
+        </div>
+    </div>
+    <div class="col-sm-12 col-md-6">
+        <!-- End URL -->
+        <div class="form-group">
+        <label class="control-label col-sm-2">
+            <?php eT("End URL:"); ?>
+        </label>
+        <div class="col-sm-9">
+            <?php echo CHtml::textField("url",$aSurveyLanguageSettings['surveyls_url'],array('class'=>'form-control','size'=>"80",'placeholder'=>'http://','id'=>"url")); ?>
+        </div>
+        </div>
+
+        <!-- URL description -->
+        <div class="form-group">
+        <label class="control-label col-sm-2">
+            <?php eT("URL description:"); ?>
+        </label>
+        <div class="col-sm-9">
+            <?php echo CHtml::textField("urldescrip",$aSurveyLanguageSettings['surveyls_urldescription'],array('class'=>'form-control','size'=>"80",'id'=>"urldescrip")); ?>
+        </div>
+        </div>
+
+        <!-- Date format -->
+        <div class="form-group">
+        <label class="control-label col-sm-2">
+            <?php eT("Date format:"); ?>
+        </label>
+
+        <div class="col-sm-3">
+            <select size='1' id='dateformat' name='dateformat' class="form-control">
+            <?php foreach (getDateFormatData(0,Yii::app()->session['adminlang']) as $index=>$dateformatdata): ?>
+                <option value='<?php echo $index; ?>' <?php if ($aSurveyLanguageSettings[ 'surveyls_dateformat']==$index): ?>
+                selected='selected'
+                <?php endif; ?>
+                    >
+                    <?php echo $dateformatdata['dateformat']; ?>
+                </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+        </div>
+
+        <!-- Decimal mark -->
+        <div class="form-group">
+        <label class="control-label col-sm-2">
+            <?php eT("Decimal mark:"); ?>
+        </label>
+        <div class="col-sm-3">
+            <?php
+            $aRadixPoint=array();
+            foreach (getRadixPointData() as $index=>$radixptdata)
+            {
+                $aRadixPoint[$index]=html_entity_decode($radixptdata['desc']);
+            }
+            $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
+            'name' => 'numberformat_'.$aSurveyLanguageSettings['surveyls_language'],
+            'value'=> $aSurveyLanguageSettings['surveyls_numberformat'] ,
+            'selectOptions'=>$aRadixPoint,
+            'htmlOptions' => array(
+            "style" => "z-index:0"
+            )
+            ));
+            ?>
+        </div>
+        </div>
+    </div>
+    </div>
+    <div class="row">
+    <div class="col-sm-12 col-md-6">
+        <!-- Welcome message -->
+        <div class="form-group">
+        <label class="col-sm-2 control-label" for='welcome'>
+            <?php eT("Welcome message:"); ?>
+        </label>
+        <div class="col-sm-9">
+            <div class="htmleditor input-group">
+            <?php echo CHtml::textArea("welcome",$aSurveyLanguageSettings['surveyls_welcometext'],array('class'=>'form-control','cols'=>'80','rows'=>'15','id'=>"welcome")); ?>
+                <?php echo getEditor("survey-welc","welcome", "[".gT("Welcome:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
+            </div>
+        </div>
+        </div>
+    </div>
+    <div class="col-sm-12 col-md-6">
+        <!-- End message -->
+        <div class="form-group">
+        <label class="col-sm-2 control-label" for='endtext'>
+            <?php eT("End message:"); ?>
+        </label>
+        <div class="col-sm-9">
+            <div class="htmleditor input-group">
+            <?php echo CHtml::textArea("endtext",$aSurveyLanguageSettings['surveyls_endtext'],array('class'=>'form-control','cols'=>'80','rows'=>'15','id'=>"endtext")); ?>
+                <?php echo getEditor("survey-endtext","endtext", "[".gT("End message:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
+            </div>
+        </div>
+        </div>
+    </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/application/views/admin/survey/subview/accordion/_generaloptions_panel.php b/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
index 8b62c2ee5c1..716606aa4b2 100644
--- a/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
+++ b/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
@@ -56,7 +56,9 @@ function checkSelect2Languages(mylangs)
     return true;
     };";
     Yii::app()->getClientScript()->registerScript('confirmLanguage',$sConfirmLanguage,CClientScript::POS_BEGIN);
+    // var_dump($owner);
     ?>
+
 <!-- Container -->
 <div class="container-fluid">
     <div class="row">
@@ -65,7 +67,7 @@ function checkSelect2Languages(mylangs)
             <div class="form-group">
                 <label class="col-sm-3 control-label" ><?php  eT("Base language:") ; ?></label>
                 <div class="col-sm-9" style="padding-top: 7px;">
-                    <?php echo getLanguageNameFromCode($esrow['language'],false) ?>
+                    <?php echo getLanguageNameFromCode($esrow['language'],false); ?>
                 </div>
             </div>
 
@@ -75,7 +77,8 @@ function checkSelect2Languages(mylangs)
                 <div class="col-sm-9">
                     <?php
                     $aAllLanguages=getLanguageDataRestricted (false,'short');
-                    foreach(Survey::model()->findByPk($surveyid)->additionalLanguages as $sSurveyLang)
+                    $aAdditionalLanguages = (isset($surveyid) && $surveyid!=0) ?  Survey::model()->findByPk($surveyid)->additionalLanguages : [];
+                    foreach( $aAdditionalLanguages as $sSurveyLang)
                     {
                         if(!array_key_exists($sSurveyLang,$aAllLanguages))
                         {
@@ -88,13 +91,13 @@ function checkSelect2Languages(mylangs)
                         'asDropDownList' => true,
                         'htmlOptions'=>array('multiple'=>'multiple','style'=>"width: 100%"),
                         'data' => $aAllLanguages,
-                        'value' => Survey::model()->findByPk($surveyid)->additionalLanguages,
+                        'value' =>  $aAdditionalLanguages,
                         'name' => 'additional_languages',
                         'pluginOptions' => array(
                             'placeholder' => gt('Select additional languages','unescaped'),
                     )));
                     ?>
-                    <input type='hidden' name='oldlanguages' id='oldlanguages' value='<?php echo implode(' ',Survey::model()->findByPk($surveyid)->additionalLanguages); ?>'>
+                    <input type='hidden' name='oldlanguages' id='oldlanguages' value='<?php echo implode(' ', $aAdditionalLanguages); ?>'>
                 </div>
             </div>
 
@@ -107,7 +110,7 @@ function checkSelect2Languages(mylangs)
                         Yii::app()->getController()->widget('yiiwheels.widgets.select2.WhSelect2', array(
                             'asDropDownList' => true,
                             'htmlOptions'=>array('style'=>"width: 80%"),
-                            'data' => $users,
+                            'data' => isset($users) ?  $users : [],
                             'value' => $esrow['owner_id'],
                             'name' => 'owner_id',
                             'pluginOptions' => array(
@@ -118,28 +121,33 @@ function checkSelect2Languages(mylangs)
                 </div>
                 <?php endif;?>
 
-
             <!-- Administrator -->
             <div class="form-group">
+                <?php //Switch for creation/editing ?>
+                <?php $admin = empty($esrow['admin']) ? $owner['full_name'] : $esrow['admin']; ?>
                 <label class="col-sm-3 control-label"  for='admin'><?php  eT("Administrator:"); ?></label>
                 <div class="col-sm-9">
-                    <input class="form-control" type='text' size='50' id='admin' name='admin' value="<?php echo htmlspecialchars($esrow['admin']); ?>" />
+                    <input class="form-control" type='text' size='50' id='admin' name='admin' value="<?php echo htmlspecialchars($admin); ?>" />
                 </div>
             </div>
 
             <!-- Admin email -->
             <div class="form-group">
+                <?php //Switch for creation/editing ?>
+                <?php $admin_email = empty($esrow['adminemail']) ? $owner['email'] : $esrow['adminemail']; ?>
                 <label class="col-sm-3 control-label"  for='adminemail'><?php  eT("Admin email:"); ?></label>
                 <div class="col-sm-9">
-                    <input class="form-control" type='email' size='50' id='adminemail' name='adminemail' value="<?php echo htmlspecialchars($esrow['adminemail']); ?>" />
+                    <input class="form-control" type='email' size='50' id='adminemail' name='adminemail' value="<?php echo htmlspecialchars($admin_email); ?>" />
                 </div>
             </div>
 
             <!-- Bounce email -->
             <div class="form-group">
+                <?php //Switch for creation/editing ?>
+                <?php $bounce_email = empty($esrow['bounce_email']) ? $owner['bounce_email'] : $esrow['bounce_email']; ?>
                 <label class="col-sm-3 control-label"  for='bounce_email'><?php  eT("Bounce email:"); ?></label>
                 <div class="col-sm-9">
-                    <input class="form-control" type='email' size='50' id='bounce_email' name='bounce_email' value="<?php echo htmlspecialchars($esrow['bounce_email']); ?>" />
+                    <input class="form-control" type='email' size='50' id='bounce_email' name='bounce_email' value="<?php echo htmlspecialchars($bounce_email); ?>" />
                 </div>
             </div>
 
diff --git a/application/views/admin/survey/subview/tabCreate_view.php b/application/views/admin/survey/subview/tabCreate_view.php
index 0d4a6baa3c1..9251adb93b9 100755
--- a/application/views/admin/survey/subview/tabCreate_view.php
+++ b/application/views/admin/survey/subview/tabCreate_view.php
@@ -9,101 +9,106 @@
 Yii::app()->loadHelper('admin/htmleditor');
 PrepareEditorScript(false, $this);
 ?>
-<!-- Form submited by save buton menu bar -->
-<?php echo CHtml::form(array('admin/survey/sa/insert'), 'post', array('id'=>'addnewsurvey', 'name'=>'addnewsurvey', 'class'=>'form-horizontal')); ?>
-<div class='col-sm-12 col-md-6'>
-
-    <!-- Text elements -->
-    <div class="row">
+<script type="text/javascript">
+    var jsonUrl = '';
+    var sAction = '';
+    var sParameter = '';
+    var sTargetQuestion = '';
+    var sNoParametersDefined = '';
+    var sAdminEmailAddressNeeded = '<?php  eT("If you are using token functions or notifications emails you need to set an administrator email address.",'js'); ?>'
+    var sURLParameters = '';
+    var sAddParam = '';
+    var standardtemplaterooturl='<?php echo Yii::app()->getConfig('standardtemplaterooturl');?>';
+    var templaterooturl='<?php echo Yii::app()->getConfig('usertemplaterooturl');?>';
+    var formId = 'addnewsurvey';
 
-        <!-- base language -->
-        <div class="form-group">
-            <label class="col-sm-2 control-label" for='language' title='<?php  eT("This is the base language of your survey and it can't be changed later. You can add more languages after you have created the survey."); ?>'><?php  eT("Base language:"); ?><span class='annotationasterisk'>*</span></label>
-            <div class="col-sm-5">
-                <select id='language' name='language'  class="form-control">
-                    <?php foreach (getLanguageDataRestricted (false) as $langkey2 => $langname) { ?>
-                        <option value='<?php echo $langkey2; ?>'
-                            <?php if (Yii::app()->getConfig('defaultlang') == $langkey2) { ?>
-                                selected='selected'
-                                <?php } ?>
-                            ><?php echo $langname['description']; ?> </option>
-                        <?php } ?>
-                </select>
-            </div>
-            <span class='text-warning'> <?php  eT("*This setting cannot be changed later!"); ?></span>
+</script>
+<!-- Form submited by save button menu bar -->
+<?php echo CHtml::form(array('admin/survey/sa/insert'), 'post', array('id'=>'addnewsurvey', 'name'=>'addnewsurvey', 'class'=>'form-horizontal')); ?>
+    <div class="ls-flex-row align-items-center align-content-center">
+        <div class="grow-1 ls-flex-column fill align-items-center align content-center">
+            <!-- Previous pane button -->
+            <button class="btn" name="navigation_back" id="navigation_back" value="navigation_back"><i class="fa fa-chevron-left" style="font-size:82;"></i></button>
         </div>
-
-        <!-- Title -->
-        <div class="form-group">
-            <label class="col-sm-2 control-label"  for='surveyls_title'><?php  eT("Survey title:"); ?></label>
-            <div class="col-sm-6">
-                <?php echo CHtml::textField("surveyls_title","",array('class'=>'form-control','maxlength'=>"200",'required'=>'required','autofocus'=>'autofocus','id'=>"surveyls_title")); ?>
-            </div>
-            <span class='text-warning'><?php  eT("Required"); ?> </span>
+        <div class="grow-10 ls-space padding left-10 right-10">
+            <ul class="nav nav-tabs" role="tablist" id="create_survey_tablist">
+                <li class="active"><a class="create_survey_wizard_tabs" data-count="1" href="#general-settings" data-toggle="tab"><?=gT("General settings")?></a></li>
+                <li><a class="create_survey_wizard_tabs" data-count="2" href="#texts" data-toggle="tab"><?=gT("Survey texts")?></a></li>
+                <li><a class="create_survey_wizard_tabs" data-count="3" href="#presentation" data-toggle="tab"><?=gT("Presentation & navigation")?></a></li>
+                <li><a class="create_survey_wizard_tabs" data-count="4" href="#publication" data-toggle="tab"><?=gT("Publication & access control")?></a></li>
+                <li><a class="create_survey_wizard_tabs" data-count="5" href="#data-management" data-toggle="tab"><?=gT("Notification & data management")?></a></li>
+                <li><a class="create_survey_wizard_tabs" data-count="6" href="#tokens" data-toggle="tab"><?=gT("Participant settings")?></a></li>
+            </ul>
         </div>
-
-        <!-- Create sample group/question checkbox -->
-        <div class="form-group">
-            <label class="col-sm-2 control-label" for='createsample'><?php  eT("Sample question:"); ?></label>
-            <div class="col-sm-2">
-                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                    'name' => 'createsample',
-                    'value'=> false,
-                    'onLabel'=>gT('On'),
-                    'offLabel'=>gT('Off')
-                    ));
-                ?>
-            </div>
-            <span class='help-block'><?php  eT("Adds a group and sample question to the new survey"); ?> </span>
+        <div class="grow-1 ls-flex-column fill align-items-center align-content-center">
+            <!-- Next pane button -->
+            <button class="btn" name="navigation_next" id="navigation_next" value="navigation_next"><i class="fa fa-chevron-right" style="font-size:82;"></i></button>
         </div>
-
-        <!-- Description -->
-        <div class="form-group">
-            <label for='description' class="col-sm-2 control-label"><?php  eT("Description:"); ?> </label>
-            <div class="col-sm-9">
-                <div class='htmleditor input-group' >
-                    <?php echo CHtml::textArea("description","",array('class'=>'form-control','cols'=>'80','rows'=>'10','id'=>"description")); ?>
-                    <?php echo getEditor("survey-desc", "description", "[" .  gT("Description:", "js") . "]", '', '', '', $action); ?>
+    </div>
+    <div class="ls-flex-row align-items-center align-content-center">
+        <div class="grow-10 ls-space padding left-10 right-10">
+            <div class="tab-content">
+                <div class="tab-pane active" id="general-settings" data-count="1">
+                    <?php echo $this->renderPartial('/admin/survey/subview/accordion/_generaloptions_panel', $generalsettingsdata); ?>
                 </div>
-            </div>
-        </div>
-
-        <!-- Welcome message -->
-        <div class="form-group">
-            <label for='welcome' class="col-sm-2 control-label">
-                <?php  eT("Welcome message:"); ?>
-            </label>
-            <div class="col-sm-9">
-                <div class='htmleditor input-group'>
-                    <?php echo CHtml::textArea("welcome","",array('class'=>'form-control','cols'=>'80','rows'=>'10','id'=>"welcome")); ?>
-                    <?php echo getEditor("survey-welc", "welcome", "[" .  gT("Welcome message:", "js") . "]", '', '', '', $action) ?>
+                <div class="tab-pane" id="texts" data-count="2">
+                    <?php echo $this->renderPartial('/admin/survey/subview/_create_survey_text', $edittextdata); ?>
                 </div>
-            </div>
-        </div>
-
-        <!-- End message -->
-        <div class="form-group">
-            <label for='endtext' class="col-sm-2 control-label">
-                <?php  eT("End message:") ;?>
-            </label>
-            <div class="col-sm-9">
-                <div class='htmleditor input-group'>
-                    <?php echo CHtml::textArea("endtext","",array('class'=>'form-control','cols'=>'80','rows'=>'10','id'=>"endtext")); ?>
-                    <?php echo getEditor("survey-endtext", "endtext", "[" .  gT("End message:", "js") . "]", '', '', '', $action) ?>
+                <div class="tab-pane" id="presentation" data-count="3">
+                    <?php echo $this->renderPartial('/admin/survey/subview/accordion/_presentation_panel', $presentationsettingsdata); ?>
+                </div>
+                <div class="tab-pane" id="publication" data-count="4">
+                    <?php echo $this->renderPartial('/admin/survey/subview/accordion/_publication_panel', $publicationsettingsdata); ?>
+                </div>
+                <div class="tab-pane" id="data-management" data-count="5">
+                    <?php echo $this->renderPartial('/admin/survey/subview/accordion/_notification_panel', $notificationsettingsdata); ?>
+                </div>
+                <div class="tab-pane" id="tokens" data-count="6">
+                    <?php echo $this->renderPartial('/admin/survey/subview/accordion/_tokens_panel', $tokensettingsdata); ?>
                 </div>
             </div>
         </div>
-
     </div>
-</div>
+    <div class="row">
+            <!-- Submit button -->
+            <button class="btn btn-primary btn-success hide" type="submit" name="save" id="create_survey_save_and_send"   value='insertsurvey'><?php eT("Finish & save"); ?></button>
+    </div>
+</form>
 
-<!-- Settings in accordion -->
-<div class='col-sm-12 col-md-6'>
-    <?php $this->renderPartial('/admin/survey/subview/accordion/_accordion_container', array('data'=>$data)); ?>
-</div>
+<script>
+    $(document).ready(function(){
+        sessionStorage.setItem('maxtabs', 1);
 
-<!-- Submit button -->
-<p>
-    <button type="submit" name="save"  class="hide" value='insertsurvey'><?php eT("Save"); ?></button>
-</p>
-</form>
+        $('#save-form-button').addClass('disabled');
+        $('#save-and-close-form-button').addClass('disabled');
+
+        $('#navigation_back').on('click', function(e){
+            e.preventDefault();
+            $('#create_survey_tablist').find('.active').prev('li').find('a').trigger('click');
+        })
+        $('#navigation_next').on('click', function(e){
+            e.preventDefault();
+            $('#create_survey_tablist').find('.active').next('li').find('a').trigger('click');
+        })
+        $('a.create_survey_wizard_tabs').on('shown.bs.tab', function (e) {
+            var count = $(e.target).data('count'); 
+            var sessionStorageValue = sessionStorage.getItem('maxtabs') || 1;
+            console.log(count, sessionStorageValue);
+            if(count>3 || sessionStorageValue>3){
+                $('#save-form-button').removeClass('disabled');
+                $('#save-and-close-form-button').removeClass('disabled');
+            }
+        });
+        $('#addnewsurvey').on('submit', function(ev){
+            ev.preventDefault();
+            ev.stopPropagation();
+            $.ajax({
+                url: $('#addnewsurvey').attr('action'),
+                data: $('#addnewsurvey').serializeArray(),
+                method: 'POST',
+                success: function(){console.log(arguments);},
+                error: function(){console.log(arguments)},
+            });
+        })
+    });
+</script>
diff --git a/application/views/admin/survey/subview/tab_edit_view.php b/application/views/admin/survey/subview/tab_edit_view.php
index f9dac0ef025..dce329f438e 100755
--- a/application/views/admin/survey/subview/tab_edit_view.php
+++ b/application/views/admin/survey/subview/tab_edit_view.php
@@ -6,7 +6,9 @@
  * @var $surveyid
  * @var $surveyls_language
  */
-
+if(isset($data)){
+    extract($data);
+}
  $count=0;
  if(isset($scripts))
     echo $scripts;
diff --git a/assets/packages/adminpanel/build/lsadminpanel.css b/assets/packages/adminpanel/build/lsadminpanel.css
index 6243dea5f46..d1bc4a4fdbb 100644
--- a/assets/packages/adminpanel/build/lsadminpanel.css
+++ b/assets/packages/adminpanel/build/lsadminpanel.css
@@ -2,27 +2,27 @@
   display: -moz-flex;
   display: -webkit-flex;
   display: flex; }
-  .ls-flex.align-item-center, .align-item-center.ls-flex-row, .align-item-center.ls-flex-column {
+  .ls-flex.align-items-center, .align-items-center.ls-flex-row, .align-items-center.ls-flex-column {
     -ms-align-items: center;
     -webkit-align-items: center;
     -moz-align-items: center;
     align-items: center; }
-  .ls-flex.align-item-flex-start, .align-item-flex-start.ls-flex-row, .align-item-flex-start.ls-flex-column {
+  .ls-flex.align-items-flex-start, .align-items-flex-start.ls-flex-row, .align-items-flex-start.ls-flex-column {
     -ms-align-items: flex-start;
     -webkit-align-items: flex-start;
     -moz-align-items: flex-start;
     align-items: flex-start; }
-  .ls-flex.align-item-flex-end, .align-item-flex-end.ls-flex-row, .align-item-flex-end.ls-flex-column {
+  .ls-flex.align-items-flex-end, .align-items-flex-end.ls-flex-row, .align-items-flex-end.ls-flex-column {
     -ms-align-items: flex-end;
     -webkit-align-items: flex-end;
     -moz-align-items: flex-end;
     align-items: flex-end; }
-  .ls-flex.align-item-baseline, .align-item-baseline.ls-flex-row, .align-item-baseline.ls-flex-column {
+  .ls-flex.align-items-baseline, .align-items-baseline.ls-flex-row, .align-items-baseline.ls-flex-column {
     -ms-align-items: baseline;
     -webkit-align-items: baseline;
     -moz-align-items: baseline;
     align-items: baseline; }
-  .ls-flex.align-item-stretch, .align-item-stretch.ls-flex-row, .align-item-stretch.ls-flex-column {
+  .ls-flex.align-items-stretch, .align-items-stretch.ls-flex-row, .align-items-stretch.ls-flex-column {
     -ms-align-items: stretch;
     -webkit-align-items: stretch;
     -moz-align-items: stretch;
@@ -57,6 +57,54 @@
     -webkit-flex-wrap: wrap;
     -moz-flex-wrap: wrap;
     flex-wrap: wrap; }
+  .ls-flex .grow-1, .ls-flex-row .grow-1, .ls-flex-column .grow-1 {
+    flex-grow: 1; }
+  .ls-flex .col-1, .ls-flex-row .col-1, .ls-flex-column .col-1 {
+    width: 8.33333%; }
+  .ls-flex .grow-2, .ls-flex-row .grow-2, .ls-flex-column .grow-2 {
+    flex-grow: 2; }
+  .ls-flex .col-2, .ls-flex-row .col-2, .ls-flex-column .col-2 {
+    width: 16.66667%; }
+  .ls-flex .grow-3, .ls-flex-row .grow-3, .ls-flex-column .grow-3 {
+    flex-grow: 3; }
+  .ls-flex .col-3, .ls-flex-row .col-3, .ls-flex-column .col-3 {
+    width: 25%; }
+  .ls-flex .grow-4, .ls-flex-row .grow-4, .ls-flex-column .grow-4 {
+    flex-grow: 4; }
+  .ls-flex .col-4, .ls-flex-row .col-4, .ls-flex-column .col-4 {
+    width: 33.33333%; }
+  .ls-flex .grow-5, .ls-flex-row .grow-5, .ls-flex-column .grow-5 {
+    flex-grow: 5; }
+  .ls-flex .col-5, .ls-flex-row .col-5, .ls-flex-column .col-5 {
+    width: 41.66667%; }
+  .ls-flex .grow-6, .ls-flex-row .grow-6, .ls-flex-column .grow-6 {
+    flex-grow: 6; }
+  .ls-flex .col-6, .ls-flex-row .col-6, .ls-flex-column .col-6 {
+    width: 50%; }
+  .ls-flex .grow-7, .ls-flex-row .grow-7, .ls-flex-column .grow-7 {
+    flex-grow: 7; }
+  .ls-flex .col-7, .ls-flex-row .col-7, .ls-flex-column .col-7 {
+    width: 58.33333%; }
+  .ls-flex .grow-8, .ls-flex-row .grow-8, .ls-flex-column .grow-8 {
+    flex-grow: 8; }
+  .ls-flex .col-8, .ls-flex-row .col-8, .ls-flex-column .col-8 {
+    width: 66.66667%; }
+  .ls-flex .grow-9, .ls-flex-row .grow-9, .ls-flex-column .grow-9 {
+    flex-grow: 9; }
+  .ls-flex .col-9, .ls-flex-row .col-9, .ls-flex-column .col-9 {
+    width: 75%; }
+  .ls-flex .grow-10, .ls-flex-row .grow-10, .ls-flex-column .grow-10 {
+    flex-grow: 10; }
+  .ls-flex .col-10, .ls-flex-row .col-10, .ls-flex-column .col-10 {
+    width: 83.33333%; }
+  .ls-flex .grow-11, .ls-flex-row .grow-11, .ls-flex-column .grow-11 {
+    flex-grow: 11; }
+  .ls-flex .col-11, .ls-flex-row .col-11, .ls-flex-column .col-11 {
+    width: 91.66667%; }
+  .ls-flex .grow-12, .ls-flex-row .grow-12, .ls-flex-column .grow-12 {
+    flex-grow: 12; }
+  .ls-flex .col-12, .ls-flex-row .col-12, .ls-flex-column .col-12 {
+    width: 100%; }
 
 .ls-flex-row {
   -ms-flex-direction: row;
@@ -70,6 +118,128 @@
   -webkit-flex-direction: column;
   -moz-flex-direction: column;
   flex-direction: column; }
+  .ls-flex-column.fill {
+    height: 100%; }
+
+.ls-space.margin.left-5 {
+  margin-left: 5px; }
+
+.ls-space.margin.right-5 {
+  margin-right: 5px; }
+
+.ls-space.margin.top-5 {
+  margin-top: 5px; }
+
+.ls-space.margin.bottom-5 {
+  margin-bottom: 5px; }
+
+.ls-space.margin.left-10 {
+  margin-left: 10px; }
+
+.ls-space.margin.right-10 {
+  margin-right: 10px; }
+
+.ls-space.margin.top-10 {
+  margin-top: 10px; }
+
+.ls-space.margin.bottom-10 {
+  margin-bottom: 10px; }
+
+.ls-space.margin.left-15 {
+  margin-left: 15px; }
+
+.ls-space.margin.right-15 {
+  margin-right: 15px; }
+
+.ls-space.margin.top-15 {
+  margin-top: 15px; }
+
+.ls-space.margin.bottom-15 {
+  margin-bottom: 15px; }
+
+.ls-space.margin.left-25 {
+  margin-left: 25px; }
+
+.ls-space.margin.right-25 {
+  margin-right: 25px; }
+
+.ls-space.margin.top-25 {
+  margin-top: 25px; }
+
+.ls-space.margin.bottom-25 {
+  margin-bottom: 25px; }
+
+.ls-space.margin.left-30 {
+  margin-left: 30px; }
+
+.ls-space.margin.right-30 {
+  margin-right: 30px; }
+
+.ls-space.margin.top-30 {
+  margin-top: 30px; }
+
+.ls-space.margin.bottom-30 {
+  margin-bottom: 30px; }
+
+.ls-space.padding.left-5 {
+  padding-left: 5px; }
+
+.ls-space.padding.right-5 {
+  padding-right: 5px; }
+
+.ls-space.padding.top-5 {
+  padding-top: 5px; }
+
+.ls-space.padding.bottom-5 {
+  padding-bottom: 5px; }
+
+.ls-space.padding.left-10 {
+  padding-left: 10px; }
+
+.ls-space.padding.right-10 {
+  padding-right: 10px; }
+
+.ls-space.padding.top-10 {
+  padding-top: 10px; }
+
+.ls-space.padding.bottom-10 {
+  padding-bottom: 10px; }
+
+.ls-space.padding.left-15 {
+  padding-left: 15px; }
+
+.ls-space.padding.right-15 {
+  padding-right: 15px; }
+
+.ls-space.padding.top-15 {
+  padding-top: 15px; }
+
+.ls-space.padding.bottom-15 {
+  padding-bottom: 15px; }
+
+.ls-space.padding.left-25 {
+  padding-left: 25px; }
+
+.ls-space.padding.right-25 {
+  padding-right: 25px; }
+
+.ls-space.padding.top-25 {
+  padding-top: 25px; }
+
+.ls-space.padding.bottom-25 {
+  padding-bottom: 25px; }
+
+.ls-space.padding.left-30 {
+  padding-left: 30px; }
+
+.ls-space.padding.right-30 {
+  padding-right: 30px; }
+
+.ls-space.padding.top-30 {
+  padding-top: 30px; }
+
+.ls-space.padding.bottom-30 {
+  padding-bottom: 30px; }
 
 .background-muted {
   background: #cdcdcd; }
@@ -90,3 +260,15 @@
         border-bottom: 0; }
     .ls-ba .list-group > .list-group-item .list-group:first-of-type {
       border-top: 1px solid #323232; }
+
+#sidebar {
+  padding-top: 15px; }
+
+.menubar.surveybar {
+  position: absolute;
+  top: 105px;
+  left: 305px;
+  width: 85%; }
+
+#in_survey_common {
+  padding-top: 65px; }
diff --git a/assets/packages/adminpanel/build/lsadminpanel.js b/assets/packages/adminpanel/build/lsadminpanel.js
index e6734f9e400..b4530cf184d 100644
--- a/assets/packages/adminpanel/build/lsadminpanel.js
+++ b/assets/packages/adminpanel/build/lsadminpanel.js
@@ -27369,8 +27369,7 @@ module.exports = function(obj) {
 /* 10 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(11);
-module.exports = __webpack_require__(56);
+module.exports = __webpack_require__(11);
 
 
 /***/ }),
@@ -30320,504 +30319,5 @@ module.exports = function() {
 }
 
 
-/***/ }),
-/* 56 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// style-loader: Adds some css to the DOM by adding a <style> tag
-
-// load the styles
-var content = __webpack_require__(57);
-if(typeof content === 'string') content = [[module.i, content, '']];
-// Prepare cssTransformation
-var transform;
-
-var options = {}
-options.transform = transform
-// add the styles to the DOM
-var update = __webpack_require__(58)(content, options);
-if(content.locals) module.exports = content.locals;
-// Hot Module Replacement
-if(false) {
-	// When the styles change, update the <style> tags
-	if(!content.locals) {
-		module.hot.accept("!!../node_modules/css-loader/index.js!../node_modules/sass-loader/lib/loader.js!./main.scss", function() {
-			var newContent = require("!!../node_modules/css-loader/index.js!../node_modules/sass-loader/lib/loader.js!./main.scss");
-			if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
-			update(newContent);
-		});
-	}
-	// When the module is disposed, remove the <style> tags
-	module.hot.dispose(function() { update(); });
-}
-
-/***/ }),
-/* 57 */
-/***/ (function(module, exports, __webpack_require__) {
-
-exports = module.exports = __webpack_require__(3)(undefined);
-// imports
-
-
-// module
-exports.push([module.i, ".ls-flex, .ls-flex-row, .ls-flex-column {\n  display: -moz-flex;\n  display: -webkit-flex;\n  display: flex; }\n  .ls-flex.align-item-center, .align-item-center.ls-flex-row, .align-item-center.ls-flex-column {\n    -ms-align-items: center;\n    -webkit-align-items: center;\n    -moz-align-items: center;\n    align-items: center; }\n  .ls-flex.align-item-flex-start, .align-item-flex-start.ls-flex-row, .align-item-flex-start.ls-flex-column {\n    -ms-align-items: flex-start;\n    -webkit-align-items: flex-start;\n    -moz-align-items: flex-start;\n    align-items: flex-start; }\n  .ls-flex.align-item-flex-end, .align-item-flex-end.ls-flex-row, .align-item-flex-end.ls-flex-column {\n    -ms-align-items: flex-end;\n    -webkit-align-items: flex-end;\n    -moz-align-items: flex-end;\n    align-items: flex-end; }\n  .ls-flex.align-item-baseline, .align-item-baseline.ls-flex-row, .align-item-baseline.ls-flex-column {\n    -ms-align-items: baseline;\n    -webkit-align-items: baseline;\n    -moz-align-items: baseline;\n    align-items: baseline; }\n  .ls-flex.align-item-stretch, .align-item-stretch.ls-flex-row, .align-item-stretch.ls-flex-column {\n    -ms-align-items: stretch;\n    -webkit-align-items: stretch;\n    -moz-align-items: stretch;\n    align-items: stretch; }\n  .ls-flex.align-content-center, .align-content-center.ls-flex-row, .align-content-center.ls-flex-column {\n    -ms-justify-content: center;\n    -webkit-justify-content: center;\n    -moz-justify-content: center;\n    justify-content: center; }\n  .ls-flex.align-content-flex-start, .align-content-flex-start.ls-flex-row, .align-content-flex-start.ls-flex-column {\n    -ms-justify-content: flex-start;\n    -webkit-justify-content: flex-start;\n    -moz-justify-content: flex-start;\n    justify-content: flex-start; }\n  .ls-flex.align-content-flex-end, .align-content-flex-end.ls-flex-row, .align-content-flex-end.ls-flex-column {\n    -ms-justify-content: flex-end;\n    -webkit-justify-content: flex-end;\n    -moz-justify-content: flex-end;\n    justify-content: flex-end; }\n  .ls-flex.align-content-space-between, .align-content-space-between.ls-flex-row, .align-content-space-between.ls-flex-column {\n    -ms-justify-content: space-between;\n    -webkit-justify-content: space-between;\n    -moz-justify-content: space-between;\n    justify-content: space-between; }\n  .ls-flex.align-content-space-around, .align-content-space-around.ls-flex-row, .align-content-space-around.ls-flex-column {\n    -ms-justify-content: space-around;\n    -webkit-justify-content: space-around;\n    -moz-justify-content: space-around;\n    justify-content: space-around; }\n  .ls-flex.wrap, .wrap.ls-flex-row, .wrap.ls-flex-column {\n    -ms-flex-wrap: wrap;\n    -webkit-flex-wrap: wrap;\n    -moz-flex-wrap: wrap;\n    flex-wrap: wrap; }\n  .ls-flex .col-1, .ls-flex-row .col-1, .ls-flex-column .col-1 {\n    width: 8.33333%; }\n  .ls-flex .col-2, .ls-flex-row .col-2, .ls-flex-column .col-2 {\n    width: 16.66667%; }\n  .ls-flex .col-3, .ls-flex-row .col-3, .ls-flex-column .col-3 {\n    width: 25%; }\n  .ls-flex .col-4, .ls-flex-row .col-4, .ls-flex-column .col-4 {\n    width: 33.33333%; }\n  .ls-flex .col-5, .ls-flex-row .col-5, .ls-flex-column .col-5 {\n    width: 41.66667%; }\n  .ls-flex .col-6, .ls-flex-row .col-6, .ls-flex-column .col-6 {\n    width: 50%; }\n  .ls-flex .col-7, .ls-flex-row .col-7, .ls-flex-column .col-7 {\n    width: 58.33333%; }\n  .ls-flex .col-8, .ls-flex-row .col-8, .ls-flex-column .col-8 {\n    width: 66.66667%; }\n  .ls-flex .col-9, .ls-flex-row .col-9, .ls-flex-column .col-9 {\n    width: 75%; }\n  .ls-flex .col-10, .ls-flex-row .col-10, .ls-flex-column .col-10 {\n    width: 83.33333%; }\n  .ls-flex .col-11, .ls-flex-row .col-11, .ls-flex-column .col-11 {\n    width: 91.66667%; }\n  .ls-flex .col-12, .ls-flex-row .col-12, .ls-flex-column .col-12 {\n    width: 100%; }\n\n.ls-flex-row {\n  -ms-flex-direction: row;\n  -webkit-flex-direction: row;\n  -moz-flex-direction: row;\n  flex-direction: row;\n  width: 100%; }\n\n.ls-flex-column {\n  -ms-flex-direction: column;\n  -webkit-flex-direction: column;\n  -moz-flex-direction: column;\n  flex-direction: column; }\n\n.background-muted {\n  background: #cdcdcd; }\n  .background-muted > li {\n    background: #cdcdcd; }\n\n.ls-ba .list-group > .list-group-item {\n  padding: 10px 0;\n  border: 0;\n  border-radius: 0;\n  border-bottom: 1px solid #323232;\n  margin-bottom: 1px; }\n  .ls-ba .list-group > .list-group-item .list-group {\n    margin-bottom: 0; }\n    .ls-ba .list-group > .list-group-item .list-group .list-group-item {\n      padding-left: 15px; }\n      .ls-ba .list-group > .list-group-item .list-group .list-group-item:last-of-type {\n        border-bottom: 0; }\n    .ls-ba .list-group > .list-group-item .list-group:first-of-type {\n      border-top: 1px solid #323232; }\n\n#sidebar {\n  padding-top: 15px; }\n\n.menubar.surveybar {\n  position: absolute;\n  top: 105px;\n  left: 305px;\n  width: 85%; }\n\n#in_survey_common {\n  padding-top: 65px; }\n", ""]);
-
-// exports
-
-
-/***/ }),
-/* 58 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-
-var stylesInDom = {};
-
-var	memoize = function (fn) {
-	var memo;
-
-	return function () {
-		if (typeof memo === "undefined") memo = fn.apply(this, arguments);
-		return memo;
-	};
-};
-
-var isOldIE = memoize(function () {
-	// Test for IE <= 9 as proposed by Browserhacks
-	// @see http://browserhacks.com/#hack-e71d8692f65334173fee715c222cb805
-	// Tests for existence of standard globals is to allow style-loader
-	// to operate correctly into non-standard environments
-	// @see https://github.com/webpack-contrib/style-loader/issues/177
-	return window && document && document.all && !window.atob;
-});
-
-var getElement = (function (fn) {
-	var memo = {};
-
-	return function(selector) {
-		if (typeof memo[selector] === "undefined") {
-			memo[selector] = fn.call(this, selector);
-		}
-
-		return memo[selector]
-	};
-})(function (target) {
-	return document.querySelector(target)
-});
-
-var singleton = null;
-var	singletonCounter = 0;
-var	stylesInsertedAtTop = [];
-
-var	fixUrls = __webpack_require__(59);
-
-module.exports = function(list, options) {
-	if (typeof DEBUG !== "undefined" && DEBUG) {
-		if (typeof document !== "object") throw new Error("The style-loader cannot be used in a non-browser environment");
-	}
-
-	options = options || {};
-
-	options.attrs = typeof options.attrs === "object" ? options.attrs : {};
-
-	// Force single-tag solution on IE6-9, which has a hard limit on the # of <style>
-	// tags it will allow on a page
-	if (!options.singleton) options.singleton = isOldIE();
-
-	// By default, add <style> tags to the <head> element
-	if (!options.insertInto) options.insertInto = "head";
-
-	// By default, add <style> tags to the bottom of the target
-	if (!options.insertAt) options.insertAt = "bottom";
-
-	var styles = listToStyles(list, options);
-
-	addStylesToDom(styles, options);
-
-	return function update (newList) {
-		var mayRemove = [];
-
-		for (var i = 0; i < styles.length; i++) {
-			var item = styles[i];
-			var domStyle = stylesInDom[item.id];
-
-			domStyle.refs--;
-			mayRemove.push(domStyle);
-		}
-
-		if(newList) {
-			var newStyles = listToStyles(newList, options);
-			addStylesToDom(newStyles, options);
-		}
-
-		for (var i = 0; i < mayRemove.length; i++) {
-			var domStyle = mayRemove[i];
-
-			if(domStyle.refs === 0) {
-				for (var j = 0; j < domStyle.parts.length; j++) domStyle.parts[j]();
-
-				delete stylesInDom[domStyle.id];
-			}
-		}
-	};
-};
-
-function addStylesToDom (styles, options) {
-	for (var i = 0; i < styles.length; i++) {
-		var item = styles[i];
-		var domStyle = stylesInDom[item.id];
-
-		if(domStyle) {
-			domStyle.refs++;
-
-			for(var j = 0; j < domStyle.parts.length; j++) {
-				domStyle.parts[j](item.parts[j]);
-			}
-
-			for(; j < item.parts.length; j++) {
-				domStyle.parts.push(addStyle(item.parts[j], options));
-			}
-		} else {
-			var parts = [];
-
-			for(var j = 0; j < item.parts.length; j++) {
-				parts.push(addStyle(item.parts[j], options));
-			}
-
-			stylesInDom[item.id] = {id: item.id, refs: 1, parts: parts};
-		}
-	}
-}
-
-function listToStyles (list, options) {
-	var styles = [];
-	var newStyles = {};
-
-	for (var i = 0; i < list.length; i++) {
-		var item = list[i];
-		var id = options.base ? item[0] + options.base : item[0];
-		var css = item[1];
-		var media = item[2];
-		var sourceMap = item[3];
-		var part = {css: css, media: media, sourceMap: sourceMap};
-
-		if(!newStyles[id]) styles.push(newStyles[id] = {id: id, parts: [part]});
-		else newStyles[id].parts.push(part);
-	}
-
-	return styles;
-}
-
-function insertStyleElement (options, style) {
-	var target = getElement(options.insertInto)
-
-	if (!target) {
-		throw new Error("Couldn't find a style target. This probably means that the value for the 'insertInto' parameter is invalid.");
-	}
-
-	var lastStyleElementInsertedAtTop = stylesInsertedAtTop[stylesInsertedAtTop.length - 1];
-
-	if (options.insertAt === "top") {
-		if (!lastStyleElementInsertedAtTop) {
-			target.insertBefore(style, target.firstChild);
-		} else if (lastStyleElementInsertedAtTop.nextSibling) {
-			target.insertBefore(style, lastStyleElementInsertedAtTop.nextSibling);
-		} else {
-			target.appendChild(style);
-		}
-		stylesInsertedAtTop.push(style);
-	} else if (options.insertAt === "bottom") {
-		target.appendChild(style);
-	} else {
-		throw new Error("Invalid value for parameter 'insertAt'. Must be 'top' or 'bottom'.");
-	}
-}
-
-function removeStyleElement (style) {
-	if (style.parentNode === null) return false;
-	style.parentNode.removeChild(style);
-
-	var idx = stylesInsertedAtTop.indexOf(style);
-	if(idx >= 0) {
-		stylesInsertedAtTop.splice(idx, 1);
-	}
-}
-
-function createStyleElement (options) {
-	var style = document.createElement("style");
-
-	options.attrs.type = "text/css";
-
-	addAttrs(style, options.attrs);
-	insertStyleElement(options, style);
-
-	return style;
-}
-
-function createLinkElement (options) {
-	var link = document.createElement("link");
-
-	options.attrs.type = "text/css";
-	options.attrs.rel = "stylesheet";
-
-	addAttrs(link, options.attrs);
-	insertStyleElement(options, link);
-
-	return link;
-}
-
-function addAttrs (el, attrs) {
-	Object.keys(attrs).forEach(function (key) {
-		el.setAttribute(key, attrs[key]);
-	});
-}
-
-function addStyle (obj, options) {
-	var style, update, remove, result;
-
-	// If a transform function was defined, run it on the css
-	if (options.transform && obj.css) {
-	    result = options.transform(obj.css);
-
-	    if (result) {
-	    	// If transform returns a value, use that instead of the original css.
-	    	// This allows running runtime transformations on the css.
-	    	obj.css = result;
-	    } else {
-	    	// If the transform function returns a falsy value, don't add this css.
-	    	// This allows conditional loading of css
-	    	return function() {
-	    		// noop
-	    	};
-	    }
-	}
-
-	if (options.singleton) {
-		var styleIndex = singletonCounter++;
-
-		style = singleton || (singleton = createStyleElement(options));
-
-		update = applyToSingletonTag.bind(null, style, styleIndex, false);
-		remove = applyToSingletonTag.bind(null, style, styleIndex, true);
-
-	} else if (
-		obj.sourceMap &&
-		typeof URL === "function" &&
-		typeof URL.createObjectURL === "function" &&
-		typeof URL.revokeObjectURL === "function" &&
-		typeof Blob === "function" &&
-		typeof btoa === "function"
-	) {
-		style = createLinkElement(options);
-		update = updateLink.bind(null, style, options);
-		remove = function () {
-			removeStyleElement(style);
-
-			if(style.href) URL.revokeObjectURL(style.href);
-		};
-	} else {
-		style = createStyleElement(options);
-		update = applyToTag.bind(null, style);
-		remove = function () {
-			removeStyleElement(style);
-		};
-	}
-
-	update(obj);
-
-	return function updateStyle (newObj) {
-		if (newObj) {
-			if (
-				newObj.css === obj.css &&
-				newObj.media === obj.media &&
-				newObj.sourceMap === obj.sourceMap
-			) {
-				return;
-			}
-
-			update(obj = newObj);
-		} else {
-			remove();
-		}
-	};
-}
-
-var replaceText = (function () {
-	var textStore = [];
-
-	return function (index, replacement) {
-		textStore[index] = replacement;
-
-		return textStore.filter(Boolean).join('\n');
-	};
-})();
-
-function applyToSingletonTag (style, index, remove, obj) {
-	var css = remove ? "" : obj.css;
-
-	if (style.styleSheet) {
-		style.styleSheet.cssText = replaceText(index, css);
-	} else {
-		var cssNode = document.createTextNode(css);
-		var childNodes = style.childNodes;
-
-		if (childNodes[index]) style.removeChild(childNodes[index]);
-
-		if (childNodes.length) {
-			style.insertBefore(cssNode, childNodes[index]);
-		} else {
-			style.appendChild(cssNode);
-		}
-	}
-}
-
-function applyToTag (style, obj) {
-	var css = obj.css;
-	var media = obj.media;
-
-	if(media) {
-		style.setAttribute("media", media)
-	}
-
-	if(style.styleSheet) {
-		style.styleSheet.cssText = css;
-	} else {
-		while(style.firstChild) {
-			style.removeChild(style.firstChild);
-		}
-
-		style.appendChild(document.createTextNode(css));
-	}
-}
-
-function updateLink (link, options, obj) {
-	var css = obj.css;
-	var sourceMap = obj.sourceMap;
-
-	/*
-		If convertToAbsoluteUrls isn't defined, but sourcemaps are enabled
-		and there is no publicPath defined then lets turn convertToAbsoluteUrls
-		on by default.  Otherwise default to the convertToAbsoluteUrls option
-		directly
-	*/
-	var autoFixUrls = options.convertToAbsoluteUrls === undefined && sourceMap;
-
-	if (options.convertToAbsoluteUrls || autoFixUrls) {
-		css = fixUrls(css);
-	}
-
-	if (sourceMap) {
-		// http://stackoverflow.com/a/26603875
-		css += "\n/*# sourceMappingURL=data:application/json;base64," + btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))) + " */";
-	}
-
-	var blob = new Blob([css], { type: "text/css" });
-
-	var oldSrc = link.href;
-
-	link.href = URL.createObjectURL(blob);
-
-	if(oldSrc) URL.revokeObjectURL(oldSrc);
-}
-
-
-/***/ }),
-/* 59 */
-/***/ (function(module, exports) {
-
-
-/**
- * When source maps are enabled, `style-loader` uses a link element with a data-uri to
- * embed the css on the page. This breaks all relative urls because now they are relative to a
- * bundle instead of the current page.
- *
- * One solution is to only use full urls, but that may be impossible.
- *
- * Instead, this function "fixes" the relative urls to be absolute according to the current page location.
- *
- * A rudimentary test suite is located at `test/fixUrls.js` and can be run via the `npm test` command.
- *
- */
-
-module.exports = function (css) {
-  // get current location
-  var location = typeof window !== "undefined" && window.location;
-
-  if (!location) {
-    throw new Error("fixUrls requires window.location");
-  }
-
-	// blank or null?
-	if (!css || typeof css !== "string") {
-	  return css;
-  }
-
-  var baseUrl = location.protocol + "//" + location.host;
-  var currentDir = baseUrl + location.pathname.replace(/\/[^\/]*$/, "/");
-
-	// convert each url(...)
-	/*
-	This regular expression is just a way to recursively match brackets within
-	a string.
-
-	 /url\s*\(  = Match on the word "url" with any whitespace after it and then a parens
-	   (  = Start a capturing group
-	     (?:  = Start a non-capturing group
-	         [^)(]  = Match anything that isn't a parentheses
-	         |  = OR
-	         \(  = Match a start parentheses
-	             (?:  = Start another non-capturing groups
-	                 [^)(]+  = Match anything that isn't a parentheses
-	                 |  = OR
-	                 \(  = Match a start parentheses
-	                     [^)(]*  = Match anything that isn't a parentheses
-	                 \)  = Match a end parentheses
-	             )  = End Group
-              *\) = Match anything and then a close parens
-          )  = Close non-capturing group
-          *  = Match anything
-       )  = Close capturing group
-	 \)  = Match a close parens
-
-	 /gi  = Get all matches, not the first.  Be case insensitive.
-	 */
-	var fixedCss = css.replace(/url\s*\(((?:[^)(]|\((?:[^)(]+|\([^)(]*\))*\))*)\)/gi, function(fullMatch, origUrl) {
-		// strip quotes (if they exist)
-		var unquotedOrigUrl = origUrl
-			.trim()
-			.replace(/^"(.*)"$/, function(o, $1){ return $1; })
-			.replace(/^'(.*)'$/, function(o, $1){ return $1; });
-
-		// already a full url? no change
-		if (/^(#|data:|http:\/\/|https:\/\/|file:\/\/\/)/i.test(unquotedOrigUrl)) {
-		  return fullMatch;
-		}
-
-		// convert the url to a full url
-		var newUrl;
-
-		if (unquotedOrigUrl.indexOf("//") === 0) {
-		  	//TODO: should we add protocol?
-			newUrl = unquotedOrigUrl;
-		} else if (unquotedOrigUrl.indexOf("/") === 0) {
-			// path should be relative to the base url
-			newUrl = baseUrl + unquotedOrigUrl; // already starts with '/'
-		} else {
-			// path should be relative to current directory
-			newUrl = currentDir + unquotedOrigUrl.replace(/^\.\//, ""); // Strip leading './'
-		}
-
-		// send back the fixed url(...)
-		return "url(" + JSON.stringify(newUrl) + ")";
-	});
-
-	// send back the fixed css
-	return fixedCss;
-};
-
-
 /***/ })
 /******/ ]);
\ No newline at end of file
diff --git a/assets/packages/adminpanel/gulpfile.js b/assets/packages/adminpanel/gulpfile.js
index 1939ba6ebdc..60ccbcaf117 100644
--- a/assets/packages/adminpanel/gulpfile.js
+++ b/assets/packages/adminpanel/gulpfile.js
@@ -11,5 +11,5 @@ gulp.task('sass', function () {
 });
  
 gulp.task('sass:watch', function () {
-  gulp.watch('./scss/main.scss', ['sass']);
+  gulp.watch('./scss/*.scss', ['sass']);
 });
diff --git a/assets/packages/adminpanel/scss/lsflex.scss b/assets/packages/adminpanel/scss/lsflex.scss
index d6595ef51d9..a6b1f99a58a 100644
--- a/assets/packages/adminpanel/scss/lsflex.scss
+++ b/assets/packages/adminpanel/scss/lsflex.scss
@@ -24,7 +24,7 @@ $x-directions: center flex-start flex-end space-between space-around;
     display: flex;
 
     @each $alignment in $y-directions{
-        &.align-item-#{$alignment} {
+        &.align-items-#{$alignment} {
             @include alignitems($alignment);
         }
     }
@@ -41,8 +41,11 @@ $x-directions: center flex-start flex-end space-between space-around;
         -moz-flex-wrap: wrap;
         flex-wrap: wrap;
     }
-
+    
     @for $i from 1 through 12 {
+        .grow-#{$i}{
+            flex-grow: $i;
+        }
         .col-#{$i} { width: 100*( $i/12)*1%; }
     }
 
@@ -64,4 +67,8 @@ $x-directions: center flex-start flex-end space-between space-around;
     -webkit-flex-direction: column;
     -moz-flex-direction: column;
     flex-direction: column;
+
+    &.fill{
+        height:100%;
+    }
 }
diff --git a/assets/packages/adminpanel/scss/lsspaces.scss b/assets/packages/adminpanel/scss/lsspaces.scss
new file mode 100644
index 00000000000..f40d205d323
--- /dev/null
+++ b/assets/packages/adminpanel/scss/lsspaces.scss
@@ -0,0 +1,44 @@
+
+$spaces: 5 10 15 25 30;
+
+@mixin margin($space){
+    &.margin{
+        &.left-#{$space}{
+            margin-left: $space*1px;
+        }
+        &.right-#{$space}{
+            margin-right: $space*1px;
+        }
+        &.top-#{$space}{
+            margin-top: $space*1px;
+        }
+        &.bottom-#{$space}{
+            margin-bottom: $space*1px;
+        }
+    }
+}
+@mixin padding($space){
+    &.padding{
+        &.left-#{$space}{
+            padding-left: $space*1px;
+        }
+        &.right-#{$space}{
+            padding-right: $space*1px;
+        }
+        &.top-#{$space}{
+            padding-top: $space*1px;
+        }
+        &.bottom-#{$space}{
+            padding-bottom: $space*1px;
+        }
+    }
+}
+
+.ls-space{
+    @each $space in $spaces{
+        @include margin($space);
+    }
+    @each $space in $spaces{
+        @include padding($space);
+    }
+}
\ No newline at end of file
diff --git a/assets/packages/adminpanel/scss/main.scss b/assets/packages/adminpanel/scss/main.scss
index ecf57d7dce7..0ea44595720 100644
--- a/assets/packages/adminpanel/scss/main.scss
+++ b/assets/packages/adminpanel/scss/main.scss
@@ -1,4 +1,5 @@
 @import 'lsflex';
+@import 'lsspaces';
 @import 'colors';
 @import 'bootstrapadditions';
 @import 'custom';
diff --git a/assets/packages/adminpanel/webpack.config.js b/assets/packages/adminpanel/webpack.config.js
index e0db223744e..d5e1f029124 100644
--- a/assets/packages/adminpanel/webpack.config.js
+++ b/assets/packages/adminpanel/webpack.config.js
@@ -4,7 +4,7 @@ var path = require('path');
 
 // Naming and path settings
 var appName = 'lsadminpanel';
-var entryPoint = ['./src/main.js', './scss/main.scss'];
+var entryPoint = ['./src/main.js'];
 var exportPath = path.resolve(__dirname, './build');
 
 // Enviroment flag