diff --git a/fileresponsefilemanager.php b/fileresponsefilemanager.php
index ee935fe..ca08039 100755
--- a/fileresponsefilemanager.php
+++ b/fileresponsefilemanager.php
@@ -589,41 +589,56 @@ protected function fm_print_generallayout($fm) {
 <div id="fileresponsefilemanager-' . $client_id . '" class="filemanager fm-loading">
 <div class="fp-restrictions">
     ' . $restrictions . '
-    <span class="dnduploadnotsupported-message"> - ' . $strdndnotsupported . ' </span>
+    <span class="dnduploadnotsupported-message"> - ' .
+                 $strdndnotsupported . ' </span>
 </div>
 <div class="fp-navbar">
     <div class="filemanager-toolbar">
         <div class="fp-toolbar">
             <div class="fp-btn-add">
-                <a role="button" title="' . $straddfile . '" href="#">
-                    <img src="' . $this->pix_url('a/add_file') . '" alt="' . $straddfiletext . '" />
+                <a role="button" title="' . $straddfile .
+                 '" href="#">
+                    <img src="' .
+                 $this->image_url('a/add_file') . '" alt="' . $straddfiletext . '" />
                 </a>
             </div>
             <div class="fp-btn-mkdir">
-                <a role="button" title="' . $strmakedir . '" href="#">
-                    <img src="' . $this->pix_url('a/create_folder') . '" alt="' . $strcreatefolder . '" />
+                <a role="button" title="' . $strmakedir .
+                 '" href="#">
+                    <img src="' .
+                 $this->image_url('a/create_folder') . '" alt="' . $strcreatefolder . '" />
                 </a>
             </div>
             <div class="fp-btn-download">
                 <a role="button" title="' . $strdownload . '" href="#">
-                    <img src="' . $this->pix_url('a/download_all') . '" alt="' .
-                 $strdownloadallfiles . '" />
+                    <img src="' .
+                 $this->image_url('a/download_all') . '" alt="' . $strdownloadallfiles .
+                 '" />
                 </a>
             </div>
-            <img class="fp-img-downloading" src="' . $this->pix_url('i/loading_small') . '" alt="" />
+            <img class="fp-img-downloading" src="' .
+                 $this->image_url('i/loading_small') .
+                 '" alt="" />
         </div>
         <div class="fp-viewbar">
-            <a title="' . get_string('displayicons', 'repository') . '" class="fp-vb-icons" href="#">
-                <img alt="' . get_string('displayasicons', 'repository') . '" src="' .
-                 $this->pix_url('fp/view_icon_active', 'theme') . '" />
+            <a title="' .
+                 get_string('displayicons', 'repository') . '" class="fp-vb-icons" href="#">
+                <img alt="' .
+                 get_string('displayasicons', 'repository') . '" src="' .
+                 $this->image_url('fp/view_icon_active', 'theme') .
+                 '" />
             </a>
-            <a title="' . get_string('displaydetails', 'repository') . '" class="fp-vb-details" href="#">
-                <img alt="' . get_string('displayasdetails', 'repository') . '" src="' .
-                 $this->pix_url('fp/view_list_active', 'theme') . '" />
+            <a title="' .
+                 get_string('displaydetails', 'repository') . '" class="fp-vb-details" href="#">
+                <img alt="' .
+                 get_string('displayasdetails', 'repository') . '" src="' .
+                 $this->image_url('fp/view_list_active', 'theme') . '" />
             </a>
-            <a title="' . get_string('displaytree', 'repository') . '" class="fp-vb-tree" href="#">
-                <img alt="' . get_string('displayastree', 'repository') . '" src="' .
-                 $this->pix_url('fp/view_tree_active', 'theme') . '" />
+            <a title="' .
+                 get_string('displaytree', 'repository') . '" class="fp-vb-tree" href="#">
+                <img alt="' .
+                 get_string('displayastree', 'repository') . '" src="' .
+                 $this->image_url('fp/view_tree_active', 'theme') . '" />
             </a>
         </div>
     </div>
@@ -631,14 +646,18 @@ protected function fm_print_generallayout($fm) {
         <span class="fp-path-folder"><a class="fp-path-folder-name" href="#"></a></span>
     </div>
 </div>
-<div class="filemanager-loading mdl-align">' . $icon_progress . '</div>
+<div class="filemanager-loading mdl-align">' . $icon_progress .
+                 '</div>
 <div class="filemanager-container" >
     <div class="fm-content-wrapper">
         <div class="fp-content"></div>
         <div class="fm-empty-container">
-            <div class="dndupload-message">' . $strdndenabledinbox . '<br/><div class="dndupload-arrow"></div></div>
+            <div class="dndupload-message">' .
+                 $strdndenabledinbox .
+                 '<br/><div class="dndupload-arrow"></div></div>
         </div>
-        <div class="dndupload-target">' . $strdroptoupload . '<br/><div class="dndupload-arrow"></div></div>
+        <div class="dndupload-target">' .
+                 $strdroptoupload . '<br/><div class="dndupload-arrow"></div></div>
         <div class="dndupload-progressbars"></div>
         <div class="dndupload-uploadinprogress">' . $icon_progress . '</div>
     </div>
@@ -673,7 +692,8 @@ protected function fm_js_template_iconfilename() {
     <div class="fp-filename"></div>
 </div>
 </a>
-<a class="fp-contextmenu" href="#">' . $this->pix_icon('i/menu', '▶') . '</a>
+<a class="fp-contextmenu" href="#">' .
+                 $this->pix_icon('i/menu', '▶') . '</a>
 </div>';
         return $rv;
     }
@@ -701,7 +721,8 @@ protected function fm_js_template_listfilename() {
 <span class="fp-reficons2"></span>
 <span class="fp-filename"></span>
 </a>
-<a class="fp-contextmenu" href="#" onclick="return false;">' . $this->pix_icon('i/menu', '▶') . '</a>
+<a class="fp-contextmenu" href="#" onclick="return false;">' .
+                 $this->pix_icon('i/menu', '▶') . '</a>
 </span>';
         return $rv;
     }
@@ -724,11 +745,14 @@ protected function fm_js_template_mkdir() {
         $rv = '
 <div class="filemanager fp-mkdir-dlg" role="dialog" aria-live="assertive" aria-labelledby="fp-mkdir-dlg-title">
 <div class="fp-mkdir-dlg-text">
-    <label id="fp-mkdir-dlg-title">' . get_string('newfoldername', 'repository') . '</label><br/>
+    <label id="fp-mkdir-dlg-title">' .
+                 get_string('newfoldername', 'repository') . '</label><br/>
     <input type="text" />
 </div>
-<button class="fp-dlg-butcreate btn-primary btn">' . get_string('makeafolder') . '</button>
-<button class="fp-dlg-butcancel btn-cancel btn">' . get_string('cancel') . '</button>
+<button class="fp-dlg-butcreate btn-primary btn">' .
+                 get_string('makeafolder') . '</button>
+<button class="fp-dlg-butcancel btn-cancel btn">' .
+                 get_string('cancel') . '</button>
 </div>';
         return $rv;
     }
@@ -793,71 +817,97 @@ protected function fm_js_template_fileselectlayout() {
         $rv = '
 <div class="filemanager fp-select">
 <div class="fp-select-loading">
-    <img src="' . $this->pix_url('i/loading_small') . '" />
+    <img src="' . $this->image_url('i/loading_small') . '" />
 </div>
 <form class="form-horizontal">
-    <button class="fp-file-download">' .
-                 get_string('download') . '</button>
+    <button class="fp-file-download">' . get_string('download') . '</button>
     <button class="fp-file-delete">' . get_string('delete') . '</button>
-    <button class="fp-file-setmain">' . get_string('setmainfile', 'repository') . '</button>
-    <span class="fp-file-setmain-help">' . $OUTPUT->help_icon('setmainfile', 'repository') . '</span>
-    <button class="fp-file-zip">' . get_string('zip', 'editor') . '</button>
+    <button class="fp-file-setmain">' .
+                 get_string('setmainfile', 'repository') .
+                 '</button>
+    <span class="fp-file-setmain-help">' .
+                 $OUTPUT->help_icon('setmainfile', 'repository') . '</span>
+    <button class="fp-file-zip">' .
+                 get_string('zip', 'editor') . '</button>
     <button class="fp-file-unzip">' . get_string('unzip') . '</button>
     <div class="fp-hr"></div>
 
     <div class="fp-forminset">
             <div class="fp-saveas control-group clearfix">
-                <label class="control-label">' . get_string('name', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('name', 'repository') . '</label>
                 <div class="controls">
                     <input type="text"/>
                 </div>
             </div>
             <div class="fp-author control-group clearfix">
-                <label class="control-label">' . get_string('author', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('author', 'repository') .
+                 '</label>
                 <div class="controls">
                     <input type="text"/>
                 </div>
             </div>
             <div class="fp-license control-group clearfix">
-                <label class="control-label">' . get_string('chooselicense', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('chooselicense', 'repository') . '</label>
                 <div class="controls">
                     <select></select>
                 </div>
             </div>
             <div class="fp-path control-group clearfix">
-                <label class="control-label">' . get_string('path', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('path', 'repository') . '</label>
                 <div class="controls">
                     <select></select>
                 </div>
             </div>
             <div class="fp-original control-group clearfix">
-                <label class="control-label">' . get_string('original', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('original', 'repository') .
+                 '</label>
                 <div class="controls">
-                    <span class="fp-originloading">' . $iconprogress . ' ' . $strloading . '</span><span class="fp-value"></span>
+                    <span class="fp-originloading">' .
+                 $iconprogress . ' ' . $strloading .
+                 '</span><span class="fp-value"></span>
                 </div>
             </div>
             <div class="fp-reflist control-group clearfix">
-                <label class="control-label">' . get_string('referenceslist', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('referenceslist', 'repository') .
+                 '</label>
                 <div class="controls">
                     <p class="fp-refcount"></p>
-                    <span class="fp-reflistloading">' . $iconprogress . ' ' . $strloading . '</span>
+                    <span class="fp-reflistloading">' .
+                 $iconprogress . ' ' . $strloading .
+                 '</span>
                     <ul class="fp-value"></ul>
                 </div>
             </div>
     </div>
     <div class="fp-select-buttons">
-        <button class="fp-file-update btn-primary btn">' . get_string('update', 'moodle') . '</button>
-        <button class="fp-file-cancel btn-cancel btn">' . get_string('cancel') . '</button>
+        <button class="fp-file-update btn-primary btn">' .
+                 get_string('update', 'moodle') . '</button>
+        <button class="fp-file-cancel btn-cancel btn">' .
+                 get_string('cancel') .
+                 '</button>
     </div>
 </form>
 <div class="fp-info clearfix">
     <div class="fp-hr"></div>
     <p class="fp-thumbnail"></p>
     <div class="fp-fileinfo">
-        <div class="fp-datemodified">' . get_string('lastmodified', 'repository') . ' <span class="fp-value"></span></div>
-        <div class="fp-datecreated">' . get_string('datecreated', 'repository') . ' <span class="fp-value"></span></div>
-        <div class="fp-size">' . get_string('size', 'repository') . ' <span class="fp-value"></span></div>
-        <div class="fp-dimensions">' . get_string('dimensions', 'repository') . ' <span class="fp-value"></span></div>
+        <div class="fp-datemodified">' .
+                 get_string('lastmodified', 'repository') .
+                 ' <span class="fp-value"></span></div>
+        <div class="fp-datecreated">' .
+                 get_string('datecreated', 'repository') .
+                 ' <span class="fp-value"></span></div>
+        <div class="fp-size">' .
+                 get_string('size', 'repository') .
+                 ' <span class="fp-value"></span></div>
+        <div class="fp-dimensions">' .
+                 get_string('dimensions', 'repository') . ' <span class="fp-value"></span></div>
     </div>
 </div>
 </div>';
@@ -879,9 +929,9 @@ protected function fm_js_template_confirmdialog() {
         $rv = '
 <div class="filemanager fp-dlg">
 <div class="fp-dlg-text"></div>
-<button class="fp-dlg-butconfirm btn-primary btn">' .
-                 get_string('ok') . '</button>
-<button class="fp-dlg-butcancel btn-cancel btn">' . get_string('cancel') . '</button>
+<button class="fp-dlg-butconfirm btn-primary btn">' . get_string('ok') . '</button>
+<button class="fp-dlg-butcancel btn-cancel btn">' .
+                 get_string('cancel') . '</button>
 </div>';
         return $rv;
     }
@@ -987,42 +1037,60 @@ protected function fp_js_template_generallayout() {
         <div>
             <div class="fp-toolbar">
                 <div class="fp-tb-back">
-                    <a href="#">' . get_string('back', 'repository') . '</a>
+                    <a href="#">' .
+                 get_string('back', 'repository') . '</a>
                 </div>
                 <div class="fp-tb-search">
                     <form></form>
                 </div>
                 <div class="fp-tb-refresh">
-                    <a title="' . get_string('refresh', 'repository') . '" href="#">
-                        <img alt=""  src="' . $this->pix_url('a/refresh') . '" />
+                    <a title="' .
+                 get_string('refresh', 'repository') . '" href="#">
+                        <img alt=""  src="' .
+                 $this->image_url('a/refresh') . '" />
                     </a>
                 </div>
                 <div class="fp-tb-logout">
-                    <a title="' . get_string('logout', 'repository') . '" href="#">
-                        <img alt="" src="' . $this->pix_url('a/logout') . '" />
+                    <a title="' .
+                 get_string('logout', 'repository') . '" href="#">
+                        <img alt="" src="' .
+                 $this->image_url('a/logout') . '" />
                     </a>
                 </div>
                 <div class="fp-tb-manage">
-                    <a title="' . get_string('settings', 'repository') . '" href="#">
-                        <img alt="" src="' . $this->pix_url('a/setting') . '" />
+                    <a title="' .
+                 get_string('settings', 'repository') . '" href="#">
+                        <img alt="" src="' .
+                 $this->image_url('a/setting') . '" />
                     </a>
                 </div>
                 <div class="fp-tb-help">
-                    <a title="' . get_string('help', 'repository') . '" href="#">
-                        <img alt="" src="' . $this->pix_url('a/help') . '" />
+                    <a title="' .
+                 get_string('help', 'repository') . '" href="#">
+                        <img alt="" src="' .
+                 $this->image_url('a/help') .
+                 '" />
                     </a>
                 </div>
                 <div class="fp-tb-message"></div>
             </div>
             <div class="fp-viewbar">
-                <a role="button" title="' . get_string('displayicons', 'repository') . '" class="fp-vb-icons" href="#">
-                    <img alt="" src="' . $this->pix_url('fp/view_icon_active', 'theme') . '" />
+                <a role="button" title="' .
+                 get_string('displayicons', 'repository') . '" class="fp-vb-icons" href="#">
+                    <img alt="" src="' .
+                 $this->image_url('fp/view_icon_active', 'theme') .
+                 '" />
                 </a>
-                <a role="button" title="' . get_string('displaydetails', 'repository') . '" class="fp-vb-details" href="#">
-                    <img alt="" src="' . $this->pix_url('fp/view_list_active', 'theme') . '" />
+                <a role="button" title="' .
+                 get_string('displaydetails', 'repository') . '" class="fp-vb-details" href="#">
+                    <img alt="" src="' .
+                 $this->image_url('fp/view_list_active', 'theme') .
+                 '" />
                 </a>
-                <a role="button" title="' . get_string('displaytree', 'repository') . '" class="fp-vb-tree" href="#">
-                    <img alt="" src="' . $this->pix_url('fp/view_tree_active', 'theme') . '" />
+                <a role="button" title="' .
+                 get_string('displaytree', 'repository') . '" class="fp-vb-tree" href="#">
+                    <img alt="" src="' .
+                 $this->image_url('fp/view_tree_active', 'theme') . '" />
                 </a>
             </div>
             <div class="fp-clear-left"></div>
@@ -1114,7 +1182,7 @@ protected function fp_js_template_nextpage() {
 <div class="fp-nextpage">
 <div class="fp-nextpage-link"><a href="#">' . get_string('more') . '</a></div>
 <div class="fp-nextpage-loading">
-    <img src="' . $this->pix_url('i/loading_small') . '" />
+    <img src="' . $this->image_url('i/loading_small') . '" />
 </div>
 </div>';
         return $rv;
@@ -1152,7 +1220,7 @@ protected function fp_js_template_selectlayout() {
         $rv = '
 <div class="file-picker fp-select">
 <div class="fp-select-loading">
-    <img src="' . $this->pix_url('i/loading_small') . '" />
+    <img src="' . $this->image_url('i/loading_small') . '" />
 </div>
 <form class="form-horizontal">
     <div class="fp-forminset">
@@ -1178,39 +1246,58 @@ protected function fp_js_template_selectlayout() {
                 </div>
             </div>
             <div class="fp-saveas control-group clearfix">
-                <label class="control-label">' . get_string('saveas', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('saveas', 'repository') . '</label>
                 <div class="controls">
                     <input type="text"/>
                 </div>
             </div>
             <div class="fp-setauthor control-group clearfix">
-                <label class="control-label">' . get_string('author', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('author', 'repository') .
+                 '</label>
                 <div class="controls">
                     <input type="text"/>
                 </div>
             </div>
             <div class="fp-setlicense control-group clearfix">
-                <label class="control-label">' . get_string('chooselicense', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('chooselicense', 'repository') .
+                 '</label>
                 <div class="controls">
                     <select></select>
                 </div>
             </div>
     </div>
    <div class="fp-select-buttons">
-        <button class="fp-select-confirm btn-primary btn">' . get_string('getfile', 'repository') . '</button>
-        <button class="fp-select-cancel btn-cancel btn">' . get_string('cancel') . '</button>
+        <button class="fp-select-confirm btn-primary btn">' .
+                 get_string('getfile', 'repository') . '</button>
+        <button class="fp-select-cancel btn-cancel btn">' .
+                 get_string('cancel') .
+                 '</button>
     </div>
 </form>
 <div class="fp-info clearfix">
     <div class="fp-hr"></div>
     <p class="fp-thumbnail"></p>
     <div class="fp-fileinfo">
-        <div class="fp-datemodified">' . get_string('lastmodified', 'repository') . '<span class="fp-value"></span></div>
-        <div class="fp-datecreated">' . get_string('datecreated', 'repository') . '<span class="fp-value"></span></div>
-        <div class="fp-size">' . get_string('size', 'repository') . '<span class="fp-value"></span></div>
-        <div class="fp-license">' . get_string('license', 'repository') . '<span class="fp-value"></span></div>
-        <div class="fp-author">' . get_string('author', 'repository') . '<span class="fp-value"></span></div>
-        <div class="fp-dimensions">' . get_string('dimensions', 'repository') . '<span class="fp-value"></span></div>
+        <div class="fp-datemodified">' .
+                 get_string('lastmodified', 'repository') .
+                 '<span class="fp-value"></span></div>
+        <div class="fp-datecreated">' .
+                 get_string('datecreated', 'repository') .
+                 '<span class="fp-value"></span></div>
+        <div class="fp-size">' .
+                 get_string('size', 'repository') .
+                 '<span class="fp-value"></span></div>
+        <div class="fp-license">' .
+                 get_string('license', 'repository') .
+                 '<span class="fp-value"></span></div>
+        <div class="fp-author">' .
+                 get_string('author', 'repository') .
+                 '<span class="fp-value"></span></div>
+        <div class="fp-dimensions">' .
+                 get_string('dimensions', 'repository') . '<span class="fp-value"></span></div>
     </div>
 </div>
 </div>';
@@ -1242,25 +1329,31 @@ protected function fp_js_template_uploadform() {
     <form enctype="multipart/form-data" method="POST" class="form-horizontal">
         <div class="fp-formset">
             <div class="fp-file control-group clearfix">
-                <label class="control-label">' . get_string('attachment', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('attachment', 'repository') . '</label>
                 <div class="controls">
                     <input type="file"/>
                 </div>
             </div>
             <div class="fp-saveas control-group clearfix">
-                <label class="control-label">' . get_string('saveas', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('saveas', 'repository') . '</label>
                 <div class="controls">
                     <input type="text"/>
                 </div>
             </div>
             <div class="fp-setauthor control-group clearfix">
-                <label class="control-label">' . get_string('author', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('author', 'repository') .
+                 '</label>
                 <div class="controls">
                     <input type="text"/>
                 </div>
             </div>
             <div class="fp-setlicense control-group clearfix">
-                <label class="control-label">' . get_string('chooselicense', 'repository') . '</label>
+                <label class="control-label">' .
+                 get_string('chooselicense', 'repository') .
+                 '</label>
                 <div class="controls">
                     <select ></select>
                 </div>
@@ -1268,7 +1361,8 @@ protected function fp_js_template_uploadform() {
         </div>
     </form>
     <div class="mdl-align">
-        <button class="fp-upload-btn btn-primary btn">' . get_string('upload', 'repository') . '</button>
+        <button class="fp-upload-btn btn-primary btn">' .
+                 get_string('upload', 'repository') . '</button>
     </div>
 </div>
 </div> ';
@@ -1285,7 +1379,7 @@ protected function fp_js_template_loading() {
         return '
 <div class="fp-content-loading">
 <div class="fp-content-center">
-    <img src="' . $this->pix_url('i/loading_small') . '" />
+    <img src="' . $this->image_url('i/loading_small') . '" />
 </div>
 </div>';
     }
@@ -1348,9 +1442,11 @@ protected function fp_js_template_processexistingfile() {
 <div class="file-picker fp-dlg">
 <p class="fp-dlg-text"></p>
 <div class="fp-dlg-buttons">
-    <button class="fp-dlg-butoverwrite btn">' . get_string('overwrite', 'repository') . '</button>
+    <button class="fp-dlg-butoverwrite btn">' .
+                 get_string('overwrite', 'repository') . '</button>
     <button class="fp-dlg-butrename btn"></button>
-    <button class="fp-dlg-butcancel btn btn-cancel">' . get_string('cancel') . '</button>
+    <button class="fp-dlg-butcancel btn btn-cancel">' .
+                 get_string('cancel') . '</button>
 </div>
 </div>';
         return $rv;
@@ -1375,13 +1471,17 @@ protected function fp_js_template_processexistingfilemultiple() {
         $rv = '
 <div class="file-picker fp-dlg">
 <p class="fp-dlg-text"></p>
-<a class="fp-dlg-butoverwrite fp-panel-button" href="#">' . get_string('overwrite', 'repository') . '</a>
-<a class="fp-dlg-butcancel fp-panel-button" href="#">' . get_string('cancel') . '</a>
+<a class="fp-dlg-butoverwrite fp-panel-button" href="#">' .
+                 get_string('overwrite', 'repository') . '</a>
+<a class="fp-dlg-butcancel fp-panel-button" href="#">' .
+                 get_string('cancel') . '</a>
 <a class="fp-dlg-butrename fp-panel-button" href="#"></a>
 <br/>
 <a class="fp-dlg-butoverwriteall fp-panel-button" href="#">' .
-                 get_string('overwriteall', 'repository') . '</a>
-<a class="fp-dlg-butrenameall fp-panel-button" href="#">' . get_string('renameall', 'repository') . '</a>
+                 get_string('overwriteall', 'repository') .
+                 '</a>
+<a class="fp-dlg-butrenameall fp-panel-button" href="#">' .
+                 get_string('renameall', 'repository') . '</a>
 </div>';
         return $rv;
     }
@@ -1438,7 +1538,8 @@ protected function fp_js_template_loginform() {
                 <div class="controls fp-login-radio"><input /> <label></label></div>
             </div>
         </div>
-        <p><button class="fp-login-submit btn-primary btn">' . get_string('submit', 'repository') . '</button></p>
+        <p><button class="fp-login-submit btn-primary btn">' .
+                 get_string('submit', 'repository') . '</button></p>
     </form>
 </div>
 </div>';
diff --git a/fileresponsesimplifiedfilemanager.php b/fileresponsesimplifiedfilemanager.php
index 890b3a9..6ee9b8e 100755
--- a/fileresponsesimplifiedfilemanager.php
+++ b/fileresponsesimplifiedfilemanager.php
@@ -412,7 +412,8 @@ public function get_nonjsurl() {
                     'itemid' => $this->options->itemid, 'subdirs' => $this->options->subdirs,
                     'maxbytes' => $this->options->maxbytes,
                     'areamaxbytes' => $this->options->areamaxbytes,
-                    'maxfiles' => $this->options->maxfiles, 'ctx_id' => $PAGE->context->id,  // TODO ?
+                    'maxfiles' => $this->options->maxfiles, 'ctx_id' => $PAGE->context->id,  // TODO
+                                                                                            // ?
                     'course' => $PAGE->course->id, // TODO ?
 'sesskey' => sesskey()
                 ));
@@ -523,8 +524,9 @@ function initialise_fileresponsesimplifiedfilepicker($args) {
             $templatesinitialized['core'] = true;
         }
         if (sizeof($templates)) {
-            $PAGE->requires->js_init_call('M.core_filepicker.set_templates', array($templates
-            ), true);
+            $PAGE->requires->js_init_call('M.core_filepicker.set_templates',
+                    array($templates
+                    ), true);
         }
         return $return;
     }
@@ -659,54 +661,38 @@ private function fm_print_generallayout($fm) {
         $loading = get_string('loading', 'repository');
 
         $html = '
-<div id="fileresponsesimplifiedfilemanager-' .
-                 $client_id . '" class="filemanager fm-loading">
+<div id="fileresponsesimplifiedfilemanager-' . $client_id . '" class="filemanager fm-loading">
     <div class="fp-restrictions">
         ' . $restrictions . '
-        <span class="dnduploadnotsupported-message"> - ' .
-                 $strdndnotsupported .
-                 ' </span>
+        <span class="dnduploadnotsupported-message"> - ' . $strdndnotsupported . ' </span>
     </div>
     <div class="fp-navbar">
         <div class="filemanager-toolbar">
             <div class="fp-toolbar">
                 <div class="fp-btn-add">
-                    <a role="button" title="' .
-                 $straddfile . '" href="#"><img src="' . $this->pix_url('a/add_file') .
-                 '" alt="" /></a>
+                    <a role="button" title="' . $straddfile . '" href="#"><img src="' .
+                 $this->image_url('a/add_file') . '" alt="" /></a>
                 </div>
                 <div class="fp-btn-mkdir">
-                    <a role="button" title="' .
-                 $strmakedir . '" href="#"><img src="' . $this->pix_url('a/create_folder') .
-                 '" alt="" /></a>
+                    <a role="button" title="' . $strmakedir . '" href="#"><img src="' .
+                 $this->image_url('a/create_folder') . '" alt="" /></a>
                 </div>
                 <!-- <div class="fp-btn-download"> -->
-                    <!--<a role="button" title="' .
-                 $strdownload . '" href="#"><img src="' . $this->pix_url('a/download_all') .
-                 '" alt="" /></a>-->
+                    <!--<a role="button" title="' . $strdownload . '" href="#"><img src="' .
+                 $this->image_url('a/download_all') . '" alt="" /></a>-->
                     <!-- don\'t download fix -->
                 <!-- </div> -->
-                <img class="fp-img-downloading" src="' .
-                 $this->pix_url('i/loading_small') .
-                 '" alt="" />
+                <img class="fp-img-downloading" src="' . $this->image_url('i/loading_small') . '" alt="" />
             </div>
             <div class="fp-viewbar">
-                <a title="' .
-                 get_string('displayicons', 'repository') . '" class="fp-vb-icons" href="#">
-                    <img alt="" src="' .
-                 $this->pix_url('fp/view_icon_active', 'theme') .
-                 '" />
+                <a title="' . get_string('displayicons', 'repository') . '" class="fp-vb-icons" href="#">
+                    <img alt="" src="' . $this->image_url('fp/view_icon_active', 'theme') . '" />
                 </a>
-                <a title="' .
-                 get_string('displaydetails', 'repository') . '" class="fp-vb-details" href="#">
-                    <img alt="" src="' .
-                 $this->pix_url('fp/view_list_active', 'theme') .
-                 '" />
+                <a title="' . get_string('displaydetails', 'repository') . '" class="fp-vb-details" href="#">
+                    <img alt="" src="' . $this->image_url('fp/view_list_active', 'theme') . '" />
                 </a>
-                <a title="' .
-                 get_string('displaytree', 'repository') . '" class="fp-vb-tree" href="#">
-                    <img alt="" src="' .
-                 $this->pix_url('fp/view_tree_active', 'theme') . '" />
+                <a title="' . get_string('displaytree', 'repository') . '" class="fp-vb-tree" href="#">
+                    <img alt="" src="' . $this->image_url('fp/view_tree_active', 'theme') . '" />
                 </a>
             </div>
         </div>
@@ -714,18 +700,14 @@ private function fm_print_generallayout($fm) {
             <span class="fp-path-folder"><a class="fp-path-folder-name" href="#"></a></span>
         </div>
     </div>
-    <div class="filemanager-loading mdl-align">' . $icon_progress .
-                 '</div>
+    <div class="filemanager-loading mdl-align">' . $icon_progress . '</div>
     <div class="filemanager-container" >
         <div class="fm-content-wrapper">
             <div class="fp-content"></div>
             <div class="fm-empty-container">
-                <div class="dndupload-message">' .
-                 $strdndenabledinbox .
-                 '<br/><div class="dndupload-arrow"></div></div>
+                <div class="dndupload-message">' . $strdndenabledinbox . '<br/><div class="dndupload-arrow"></div></div>
             </div>
-            <div class="dndupload-target">' .
-                 $strdroptoupload . '<br/><div class="dndupload-arrow"></div></div>
+            <div class="dndupload-target">' . $strdroptoupload . '<br/><div class="dndupload-arrow"></div></div>
             <div class="dndupload-progressbars"></div>
             <div class="dndupload-uploadinprogress">' . $icon_progress . '</div>
         </div>
@@ -760,8 +742,7 @@ private function fm_js_template_iconfilename() {
         <div class="fp-filename"></div>
     </div>
     </a>
-    <a class="fp-contextmenu" href="#">' .
-                 $this->pix_icon('i/menu', '▶') . '</a>
+    <a class="fp-contextmenu" href="#">' . $this->pix_icon('i/menu', '▶') . '</a>
 </div>';
         return $rv;
     }
@@ -788,8 +769,7 @@ private function fm_js_template_listfilename() {
     <span class="fp-reficons2"></span>
     <span class="fp-filename"></span>
     </a>
-    <a class="fp-contextmenu" href="#" onclick="return false;">' .
-                 $this->pix_icon('i/menu', '▶') . '</a>
+    <a class="fp-contextmenu" href="#" onclick="return false;">' . $this->pix_icon('i/menu', '▶') . '</a>
 </span>';
         return $rv;
     }
@@ -812,14 +792,11 @@ private function fm_js_template_mkdir() {
         $rv = '
 <div class="filemanager fp-mkdir-dlg" role="dialog" aria-live="assertive" aria-labelledby="fp-mkdir-dlg-title">
     <div class="fp-mkdir-dlg-text">
-        <label id="fp-mkdir-dlg-title">' .
-                 get_string('newfoldername', 'repository') . '</label><br/>
+        <label id="fp-mkdir-dlg-title">' . get_string('newfoldername', 'repository') . '</label><br/>
         <input type="text" />
     </div>
-    <button class="fp-dlg-butcreate btn-primary btn">' .
-                 get_string('makeafolder') . '</button>
-    <button class="fp-dlg-butcancel btn-cancel btn">' .
-                 get_string('cancel') . '</button>
+    <button class="fp-dlg-butcreate btn-primary btn">' . get_string('makeafolder') . '</button>
+    <button class="fp-dlg-butcancel btn-cancel btn">' . get_string('cancel') . '</button>
 </div>';
         return $rv;
     }
@@ -883,100 +860,74 @@ private function fm_js_template_fileselectlayout() {
         $rv = '
 <div class="filemanager fp-select">
     <div class="fp-select-loading">
-        <img src="' . $this->pix_url('i/loading_small') . '" />
+        <img src="' .
+                 $this->image_url('i/loading_small') . '" />
     </div>
     <form class="form-horizontal">
-        <!-- <button class="fp-file-download">' .
-                 get_string('download') . '</button> -->
+        <!-- <button class="fp-file-download">' . get_string('download') . '</button> -->
         <button class="fp-file-delete">' . get_string('delete') . '</button>
-        <button class="fp-file-setmain">' .
-                 get_string('setmainfile', 'repository') .
-                 '</button>
-        <span class="fp-file-setmain-help">' .
-                 $OUTPUT->help_icon('setmainfile', 'repository') . '</span>
-        <button class="fp-file-zip">' .
-                 get_string('zip', 'editor') . '</button>
+        <button class="fp-file-setmain">' . get_string('setmainfile', 'repository') . '</button>
+        <span class="fp-file-setmain-help">' . $OUTPUT->help_icon('setmainfile', 'repository') . '</span>
+        <button class="fp-file-zip">' . get_string('zip', 'editor') . '</button>
         <button class="fp-file-unzip">' . get_string('unzip') . '</button>
         <div class="fp-hr"></div>
 
         <div class="fp-forminset">
                 <div class="fp-saveas control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('name', 'repository') . '</label>
+                    <label class="control-label">' . get_string('name', 'repository') . '</label>
                     <div class="controls">
                         <input type="text"/>
                     </div>
                 </div>
                 <!-- don\'t download fix: eliminate author field -->
                 <!--<div class="fp-author control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('author', 'repository') .
-                 '</label>
+                    <label class="control-label">' . get_string('author', 'repository') . '</label>
                     <div class="controls">
                         <input type="text"/>
                     </div>
                 </div>-->
                 <!-- don\'t download fix: eliminate license field -->
                 <!--<div class="fp-license control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('chooselicense', 'repository') . '</label>
+                    <label class="control-label">' . get_string('chooselicense', 'repository') . '</label>
                     <div class="controls">
                         <select></select>
                     </div>
                 </div>-->
                 <!-- don\'t download fix: eliminate path field -->
                 <!--<div class="fp-path control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('path', 'repository') . '</label>
+                    <label class="control-label">' . get_string('path', 'repository') . '</label>
                     <div class="controls">
                         <select></select>
                     </div>
                 </div>-->
                 <div class="fp-original control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('original', 'repository') .
-                 '</label>
+                    <label class="control-label">' . get_string('original', 'repository') . '</label>
                     <div class="controls">
-                        <span class="fp-originloading">' .
-                 $iconprogress . ' ' . $strloading .
-                 '</span><span class="fp-value"></span>
+                        <span class="fp-originloading">' . $iconprogress . ' ' . $strloading . '</span><span class="fp-value"></span>
                     </div>
                 </div>
                 <div class="fp-reflist control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('referenceslist', 'repository') . '</label>
+                    <label class="control-label">' . get_string('referenceslist', 'repository') . '</label>
                     <div class="controls">
                         <p class="fp-refcount"></p>
-                        <span class="fp-reflistloading">' .
-                 $iconprogress . ' ' . $strloading .
-                 '</span>
+                        <span class="fp-reflistloading">' . $iconprogress . ' ' . $strloading . '</span>
                         <ul class="fp-value"></ul>
                     </div>
                 </div>
         </div>
         <div class="fp-select-buttons">
-            <button class="fp-file-update btn-primary btn">' .
-                 get_string('update', 'moodle') . '</button>
-            <button class="fp-file-cancel btn-cancel btn">' .
-                 get_string('cancel') .
-                 '</button>
+            <button class="fp-file-update btn-primary btn">' . get_string('update', 'moodle') . '</button>
+            <button class="fp-file-cancel btn-cancel btn">' . get_string('cancel') . '</button>
         </div>
     </form>
     <div class="fp-info clearfix">
         <div class="fp-hr"></div>
         <p class="fp-thumbnail"></p>
         <div class="fp-fileinfo">
-            <div class="fp-datemodified">' .
-                 get_string('lastmodified', 'repository') .
-                 ' <span class="fp-value"></span></div>
-            <div class="fp-datecreated">' .
-                 get_string('datecreated', 'repository') .
-                 ' <span class="fp-value"></span></div>
-            <div class="fp-size">' .
-                 get_string('size', 'repository') .
-                 ' <span class="fp-value"></span></div>
-            <div class="fp-dimensions">' .
-                 get_string('dimensions', 'repository') . ' <span class="fp-value"></span></div>
+            <div class="fp-datemodified">' . get_string('lastmodified', 'repository') . ' <span class="fp-value"></span></div>
+            <div class="fp-datecreated">' . get_string('datecreated', 'repository') . ' <span class="fp-value"></span></div>
+            <div class="fp-size">' . get_string('size', 'repository') . ' <span class="fp-value"></span></div>
+            <div class="fp-dimensions">' . get_string('dimensions', 'repository') . ' <span class="fp-value"></span></div>
         </div>
     </div>
 </div>';
@@ -998,10 +949,8 @@ private function fm_js_template_confirmdialog() {
         $rv = '
 <div class="filemanager fp-dlg">
     <div class="fp-dlg-text"></div>
-    <button class="fp-dlg-butconfirm btn-primary btn">' .
-                 get_string('ok') . '</button>
-    <button class="fp-dlg-butcancel btn-cancel btn">' .
-                 get_string('cancel') . '</button>
+    <button class="fp-dlg-butconfirm btn-primary btn">' . get_string('ok') . '</button>
+    <button class="fp-dlg-butcancel btn-cancel btn">' . get_string('cancel') . '</button>
 </div>';
         return $rv;
     }
@@ -1107,60 +1056,42 @@ private function fp_js_template_generallayout() {
             <div>
                 <div class="fp-toolbar">
                     <div class="fp-tb-back">
-                        <a href="#">' .
-                 get_string('back', 'repository') . '</a>
+                        <a href="#">' . get_string('back', 'repository') . '</a>
                     </div>
                     <div class="fp-tb-search">
                         <form></form>
                     </div>
                     <div class="fp-tb-refresh">
-                        <a title="' .
-                 get_string('refresh', 'repository') . '" href="#">
-                            <img alt="" src="' .
-                 $this->pix_url('a/refresh') . '" />
+                        <a title="' . get_string('refresh', 'repository') . '" href="#">
+                            <img alt="" src="' . $this->image_url('a/refresh') . '" />
                         </a>
                     </div>
                     <div class="fp-tb-logout">
-                        <a title="' .
-                 get_string('logout', 'repository') . '" href="#">
-                            <img alt="" src="' .
-                 $this->pix_url('a/logout') . '" />
+                        <a title="' . get_string('logout', 'repository') . '" href="#">
+                            <img alt="" src="' . $this->image_url('a/logout') . '" />
                         </a>
                     </div>
                     <div class="fp-tb-manage">
-                        <a title="' .
-                 get_string('settings', 'repository') . '" href="#">
-                            <img alt="" src="' .
-                 $this->pix_url('a/setting') . '" />
+                        <a title="' . get_string('settings', 'repository') . '" href="#">
+                            <img alt="" src="' . $this->image_url('a/setting') . '" />
                         </a>
                     </div>
                     <div class="fp-tb-help">
-                        <a title="' .
-                 get_string('help', 'repository') . '" href="#">
-                            <img alt="" src="' .
-                 $this->pix_url('a/help') .
-                 '" />
+                        <a title="' . get_string('help', 'repository') . '" href="#">
+                            <img alt="" src="' . $this->image_url('a/help') . '" />
                         </a>
                     </div>
                     <div class="fp-tb-message"></div>
                 </div>
                 <div class="fp-viewbar">
-                    <a role="button" title="' .
-                 get_string('displayicons', 'repository') . '" class="fp-vb-icons" href="#">
-                        <img alt="" src="' .
-                 $this->pix_url('fp/view_icon_active', 'theme') .
-                 '" />
+                    <a role="button" title="' . get_string('displayicons', 'repository') . '" class="fp-vb-icons" href="#">
+                        <img alt="" src="' . $this->image_url('fp/view_icon_active', 'theme') . '" />
                     </a>
-                    <a role="button" title="' .
-                 get_string('displaydetails', 'repository') . '" class="fp-vb-details" href="#">
-                        <img alt="" src="' .
-                 $this->pix_url('fp/view_list_active', 'theme') .
-                 '" />
+                    <a role="button" title="' . get_string('displaydetails', 'repository') . '" class="fp-vb-details" href="#">
+                        <img alt="" src="' . $this->image_url('fp/view_list_active', 'theme') . '" />
                     </a>
-                    <a role="button" title="' .
-                 get_string('displaytree', 'repository') . '" class="fp-vb-tree" href="#">
-                        <img alt="" src="' .
-                 $this->pix_url('fp/view_tree_active', 'theme') . '" />
+                    <a role="button" title="' . get_string('displaytree', 'repository') . '" class="fp-vb-tree" href="#">
+                        <img alt="" src="' . $this->image_url('fp/view_tree_active', 'theme') . '" />
                     </a>
                 </div>
                 <div class="fp-clear-left"></div>
@@ -1250,9 +1181,11 @@ private function fp_js_template_listfilename() {
     private function fp_js_template_nextpage() {
         $rv = '
 <div class="fp-nextpage">
-    <div class="fp-nextpage-link"><a href="#">' . get_string('more') . '</a></div>
+    <div class="fp-nextpage-link"><a href="#">' .
+                 get_string('more') . '</a></div>
     <div class="fp-nextpage-loading">
-        <img src="' . $this->pix_url('i/loading_small') . '" />
+        <img src="' .
+                 $this->image_url('i/loading_small') . '" />
     </div>
 </div>';
         return $rv;
@@ -1290,23 +1223,20 @@ private function fp_js_template_selectlayout() {
         $rv = '
 <div class="file-picker fp-select">
     <div class="fp-select-loading">
-        <img src="' . $this->pix_url('i/loading_small') .
-                 '" />
+        <img src="' . $this->image_url('i/loading_small') . '" />
     </div>
     <form class="form-horizontal">
         <div class="fp-forminset">
                 <div class="fp-linktype-2 control-group control-radio clearfix">
                     <label class="control-label control-radio">' .
-                 get_string('makefileinternal', 'repository') .
-                 '</label>
+                 get_string('makefileinternal', 'repository') . '</label>
                     <div class="controls control-radio">
                         <input type="radio"/>
                     </div>
                 </div>
                 <div class="fp-linktype-1 control-group control-radio clearfix">
                     <label class="control-label control-radio">' .
-                 get_string('makefilelink', 'repository') .
-                 '</label>
+                 get_string('makefilelink', 'repository') . '</label>
                     <div class="controls control-radio">
                         <input type="radio"/>
                     </div>
@@ -1319,26 +1249,21 @@ private function fp_js_template_selectlayout() {
                     </div>
                 </div>
                 <div class="fp-saveas control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('saveas', 'repository') . '</label>
+                    <label class="control-label">' . get_string('saveas', 'repository') . '</label>
                     <div class="controls">
                         <input type="text"/>
                     </div>
                 </div>
                 <!-- don\'t download fix: eliminate author field -->
                 <!--<div class="fp-setauthor control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('author', 'repository') .
-                 '</label>
+                    <label class="control-label">' . get_string('author', 'repository') . '</label>
                     <div class="controls">
                         <input type="text"/>
                     </div>
                 </div>-->
                 <!-- don\'t download fix: eliminate license field -->
                 <!--<div class="fp-setlicense control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('chooselicense', 'repository') .
-                 '</label>
+                    <label class="control-label">' . get_string('chooselicense', 'repository') . '</label>
                     <div class="controls">
                         <select></select>
                     </div>
@@ -1347,34 +1272,21 @@ private function fp_js_template_selectlayout() {
        <div class="fp-select-buttons">
             <button class="fp-select-confirm btn-primary btn">' .
                  get_string('getfile', 'repository') . '</button>
-            <button class="fp-select-cancel btn-cancel btn">' .
-                 get_string('cancel') .
-                 '</button>
+            <button class="fp-select-cancel btn-cancel btn">' . get_string('cancel') . '</button>
         </div>
     </form>
     <div class="fp-info clearfix">
         <div class="fp-hr"></div>
         <p class="fp-thumbnail"></p>
         <div class="fp-fileinfo">
-            <div class="fp-datemodified">' .
-                 get_string('lastmodified', 'repository') .
-                 '<span class="fp-value"></span></div>
-            <div class="fp-datecreated">' .
-                 get_string('datecreated', 'repository') .
-                 '<span class="fp-value"></span></div>
-            <div class="fp-size">' .
-                 get_string('size', 'repository') .
-                 '<span class="fp-value"></span></div>
+            <div class="fp-datemodified">' . get_string('lastmodified', 'repository') . '<span class="fp-value"></span></div>
+            <div class="fp-datecreated">' . get_string('datecreated', 'repository') . '<span class="fp-value"></span></div>
+            <div class="fp-size">' . get_string('size', 'repository') . '<span class="fp-value"></span></div>
             <!-- don\'t download fix: eliminate license field -->
-            <!--<div class="fp-license">' .
-                 get_string('license', 'repository') .
-                 '<span class="fp-value"></span></div>-->
+            <!--<div class="fp-license">' . get_string('license', 'repository') . '<span class="fp-value"></span></div>-->
             <!-- don\'t download fix: eliminate author field -->
-            <!--<div class="fp-author">' .
-                 get_string('author', 'repository') .
-                 '<span class="fp-value"></span></div>-->
-            <div class="fp-dimensions">' .
-                 get_string('dimensions', 'repository') . '<span class="fp-value"></span></div>
+            <!--<div class="fp-author">' . get_string('author', 'repository') . '<span class="fp-value"></span></div>-->
+            <div class="fp-dimensions">' . get_string('dimensions', 'repository') . '<span class="fp-value"></span></div>
         </div>
     </div>
 </div>';
@@ -1406,33 +1318,27 @@ private function fp_js_template_uploadform() {
         <form enctype="multipart/form-data" method="POST" class="form-horizontal">
             <div class="fp-formset">
                 <div class="fp-file control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('attachment', 'repository') . '</label>
+                    <label class="control-label">' . get_string('attachment', 'repository') . '</label>
                     <div class="controls">
                         <input type="file"/>
                     </div>
                 </div>
                 <div class="fp-saveas control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('saveas', 'repository') . '</label>
+                    <label class="control-label">' . get_string('saveas', 'repository') . '</label>
                     <div class="controls">
                         <input type="text"/>
                     </div>
                 </div>
                 <!-- don\'t download fix: eliminate author field -->
                 <!--<div class="fp-setauthor control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('author', 'repository') .
-                 '</label>
+                    <label class="control-label">' . get_string('author', 'repository') . '</label>
                     <div class="controls">
                         <input type="text"/>
                     </div>
                 </div>-->
                 <!-- don\'t download fix: eliminate license field -->
                 <!--<div class="fp-setlicense control-group clearfix">
-                    <label class="control-label">' .
-                 get_string('chooselicense', 'repository') .
-                 '</label>
+                    <label class="control-label">' . get_string('chooselicense', 'repository') . '</label>
                     <div class="controls">
                         <select ></select>
                     </div>
@@ -1440,8 +1346,7 @@ private function fp_js_template_uploadform() {
             </div>
         </form>
         <div class="mdl-align">
-            <button class="fp-upload-btn btn-primary btn">' .
-                 get_string('upload', 'repository') . '</button>
+            <button class="fp-upload-btn btn-primary btn">' . get_string('upload', 'repository') . '</button>
         </div>
     </div>
 </div> ';
@@ -1459,7 +1364,8 @@ private function fp_js_template_loading() {
         return '
 <div class="fp-content-loading">
     <div class="fp-content-center">
-        <img src="' . $this->pix_url('i/loading_small') . '" />
+        <img src="' .
+                 $this->image_url('i/loading_small') . '" />
     </div>
 </div>';
     }
@@ -1496,7 +1402,8 @@ private function fp_js_template_message() {
         $rv = '
 <div class="file-picker fp-msg" role="alertdialog" aria-live="assertive" aria-labelledby="fp-msg-labelledby">
     <p class="fp-msg-text" id="fp-msg-labelledby"></p>
-    <button class="fp-msg-butok btn-primary btn">' . get_string('ok') . '</button>
+    <button class="fp-msg-butok btn-primary btn">' .
+                 get_string('ok') . '</button>
 </div>';
         return $rv;
     }
@@ -1522,11 +1429,9 @@ private function fp_js_template_processexistingfile() {
 <div class="file-picker fp-dlg">
     <p class="fp-dlg-text"></p>
     <div class="fp-dlg-buttons">
-        <button class="fp-dlg-butoverwrite btn">' .
-                 get_string('overwrite', 'repository') . '</button>
+        <button class="fp-dlg-butoverwrite btn">' . get_string('overwrite', 'repository') . '</button>
         <button class="fp-dlg-butrename btn"></button>
-        <button class="fp-dlg-butcancel btn btn-cancel">' .
-                 get_string('cancel') . '</button>
+        <button class="fp-dlg-butcancel btn btn-cancel">' . get_string('cancel') . '</button>
     </div>
 </div>';
         return $rv;
@@ -1553,14 +1458,11 @@ private function fp_js_template_processexistingfilemultiple() {
     <p class="fp-dlg-text"></p>
     <a class="fp-dlg-butoverwrite fp-panel-button" href="#">' .
                  get_string('overwrite', 'repository') . '</a>
-    <a class="fp-dlg-butcancel fp-panel-button" href="#">' .
-                 get_string('cancel') .
-                 '</a>
+    <a class="fp-dlg-butcancel fp-panel-button" href="#">' . get_string('cancel') . '</a>
     <a class="fp-dlg-butrename fp-panel-button" href="#"></a>
     <br/>
     <a class="fp-dlg-butoverwriteall fp-panel-button" href="#">' .
-                 get_string('overwriteall', 'repository') .
-                 '</a>
+                 get_string('overwriteall', 'repository') . '</a>
     <a class="fp-dlg-butrenameall fp-panel-button" href="#">' .
                  get_string('renameall', 'repository') . '</a>
 </div>';
@@ -1598,8 +1500,7 @@ private function fp_js_template_loginform() {
                 <div class="fp-login-popup control-group clearfix">
                     <div class="controls fp-popup">
                         <button class="fp-login-popup-but btn-primary btn">' .
-                 get_string('login', 'repository') .
-                 '</button>
+                 get_string('login', 'repository') . '</button>
                     </div>
                 </div>
                 <div class="fp-login-textarea control-group clearfix">