Dev: upload images in all theme option views

LimeSurvey · Nov 23, 2017 · 8a6f345 · 8a6f345
1 parent f8408bf
commit 8a6f345
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -240,7 +240,7 @@
                 'imageSrc'                   => 'LS_Twig_Extension::imageSrc',
                 'sprintf'                 => 'sprintf',
                 'gT'                      => 'gT',
-                'getMaximumFileUploadSize'=> 'getMaximumFileUploadSize'
+                'createUrl'               => 'LS_Twig_Extension::createUrl',
             ),
             'filters' => array(
                 'jencode' => 'CJSON::encode',
@@ -264,7 +264,7 @@
                     'Question' => array('qid', 'parent_qid', 'sid', 'gid', 'type', 'title', 'question', 'help', 'other', 'mandatory', 'language', 'scale_qid'),
                     'QuestionGroups' => array('gid', 'sid', 'group_name', 'group_order', 'description', 'language', 'randomization_group', 'grelevance')
                 ),
-                'functions' => array('include', 'dump', 'flatEllipsizeText', 'getLanguageData', 'array_flip', 'array_intersect_key', 'registerPublicCssFile', 'registerTemplateCssFile', 'registerGeneralScript', 'registerTemplateScript', 'registerScript', 'unregisterPackage', 'unregisterScriptFile', 'unregisterScriptForAjax', 'listCoreScripts', 'listScriptFiles', 'getAllQuestionClasses', 'intval', 'count', 'empty', 'reset', 'renderCaptcha', 'getPost', 'getParam', 'getQuery', 'isset', 'str_replace', 'assetPublish', 'image', 'imageSrc', 'sprintf', 'gT'),
+                'functions' => array('include', 'dump', 'flatEllipsizeText', 'getLanguageData', 'array_flip', 'array_intersect_key', 'registerPublicCssFile', 'registerTemplateCssFile', 'registerGeneralScript', 'registerTemplateScript', 'registerScript', 'unregisterPackage', 'unregisterScriptFile', 'unregisterScriptForAjax', 'listCoreScripts', 'listScriptFiles', 'getAllQuestionClasses', 'intval', 'count', 'empty', 'reset', 'renderCaptcha', 'getPost', 'getParam', 'getQuery', 'isset', 'str_replace', 'assetPublish', 'image', 'imageSrc', 'sprintf', 'gT', 'createUrl'),
             ),
 
         ),

diff --git a/application/core/LSETwigViewRenderer.php b/application/core/LSETwigViewRenderer.php
@@ -142,7 +142,7 @@ public function renderOptionPage($oTemplate, $renderArray = array())
         }
 
         if (file_exists($oRTemplate->path.$sOptionJS)) {
-            Yii::app()->getClientScript()->registerScriptFile($oRTemplate->sTemplateurl.$sOptionJS, CClientScript::POS_BEGIN);
+            Yii::app()->getClientScript()->registerScriptFile($oRTemplate->sTemplateurl.$sOptionJS, LSYii_ClientScript::POS_BEGIN);
         }
 
         $this->_twig = $twig = parent::getTwig();

diff --git a/application/core/LS_Twig_Extension.php b/application/core/LS_Twig_Extension.php
@@ -211,6 +211,12 @@ public static function renderCaptcha()
             'buttonLabel' => gt('Reload image', 'unescaped')
         ));
     }
+
+
+    public static function createUrl($url, $params = array())
+    {
+        return App()->getController()->createUrl($url, $params);
+    }
 
     /**
      * @param string $sRessource
@@ -234,6 +240,7 @@ public static function image($sImagePath, $alt = '', $htmlOptions = array( ))
         if ($oTemplate) {
             $sUrlImgAsset = self::assetPublish($oTemplate->path.$sImagePath);
         } else {
+            $sUrlImgAsset = '';            
             // TODO: publish a default image "not found"
         }
 
@@ -250,6 +257,7 @@ public static function imageSrc($sImagePath, $default = './files/pattern.png')
     {
         // Reccurence on templates to find the file
         $oTemplate = self::getTemplateForRessource($sImagePath);
+        $sUrlImgAsset = '';
 
         if ($oTemplate) {
             $sUrlImgAsset = self::assetPublish($oTemplate->path.$sImagePath);

diff --git a/application/views/admin/themeoptions/update.php b/application/views/admin/themeoptions/update.php
@@ -212,6 +212,8 @@
         var $activeInput = $(options.input);
         var $progressBar = $(options.progress);
 
+        var onSuccess = options.onSuccess || function(){};
+
         var progressHandling = function(event){
             var percent = 0;
             var position = event.loaded || event.position;
@@ -247,6 +249,7 @@
                         $('#notif-container').append('<div class="alert alert-success" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+data.message+'</div>');
                         $progressBar.css("width", "0%");
                         $progressBar.find('span.sr-only').text('0%');
+                        onSuccess();
                     } else {
                         $('#notif-container').append('<div class="alert alert-danger" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+data.message+'</div>');
                         $progressBar.css("width", "0%");

diff --git a/themes/survey/default/options/options.js b/themes/survey/default/options/options.js
@@ -144,5 +144,15 @@ $(document).on('ready pjax:scriptcomplete',function(){
     $('.simple-template-edit-loading').css('display','block');
     prepare().then(function(){
         $('.simple-template-edit-loading').remove();
-    })
+    });
+    var uploadImageBind = new bindUpload({
+        form: '#upload_frontend',
+        input: '#upload_image_frontend',
+        progress: '#upload_progress_frontend',
+        onSuccess : function(){ 
+            var triggerEvent = new Event('pjax:load');
+            triggerEvent.url =  window.location.href;
+            window.dispatchEvent( triggerEvent );
+        }
+    });
 });
diff --git a/themes/survey/default/options/options.twig b/themes/survey/default/options/options.twig
@@ -575,15 +575,16 @@
                     {{ sprintf( gT("Upload an image (maximum size: %d MB):"), (templateConfiguration.maxFileSize/1024/1024) ) }}
                 </div>
                 <div class="col-sm-6">
-                {{ C.Html.form('admin/themes/sa/upload', 'post', { 'id' : 'upload_frontend', 'name' : 'upload_frontend', 'enctype' :'multipart/form-data' }) }}
+                {{ C.Html.form(createUrl('/admin/themes/sa/upload'), 'post', { 'id' : 'upload_frontend', 'name' : 'upload_frontend', 'enctype' :'multipart/form-data' }) }}
                     <span id="fileselector">
                         <label class="btn btn-default col-xs-8" for="upload_image_frontend">
-                            <input class="hidden" id="upload_logo" name="upload_image_frontend" type="file">
-                            <i class="fa fa-upload ls-space margin right-10"></i><{{ gT("Upload") }}
+                            <input class="hidden" id="upload_image_frontend" name="upload_image_frontend" type="file">
+                            <i class="fa fa-upload ls-space margin right-10"></i>
+                            {{ gT("Upload") }}
                         </label>
                     </span>
 
-                        <input type='hidden' name='templatename' value='{{ templateConfiguration.name }}' />
+                        <input type='hidden' name='templatename' value='{{ templateConfiguration.template_name }}' />
                         <input type='hidden' name='templateconfig' value='{{ templateConfiguration.id }}' />
                         <input type='hidden' name='action' value='templateuploadimagefile' />
                     </form>