]> git.mxchange.org Git - friendica.git/commitdiff
- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
authorHypolite Petovan <ben.lort@gmail.com>
Fri, 27 Jan 2017 04:04:38 +0000 (23:04 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Fri, 27 Jan 2017 04:04:38 +0000 (23:04 -0500)
mod/fbrowser.php
view/templates/filebrowser.tpl
view/templates/filebrowser_plain.tpl [deleted file]
view/theme/frio/templates/filebrowser.tpl [new file with mode: 0644]
view/theme/frio/templates/filebrowser_plain.tpl [deleted file]
view/theme/frost/templates/filebrowser.tpl [deleted file]

index 09ecf032e7a990d4ca054ca6fd44feb5a3bd9164..9a0e9244c1cbb617511187d7273f58f853e077db 100644 (file)
@@ -12,24 +12,23 @@ require_once('include/Photo.php');
  */
 function fbrowser_content(App $a) {
 
-       if (!local_user())
+       if (!local_user()) {
                killme();
+       }
 
-       if ($a->argc==1)
+       if ($a->argc == 1) {
                killme();
+       }
 
        $template_file = "filebrowser.tpl";
        $mode = "";
        if (x($_GET,'mode')) {
-               $template_file = "filebrowser_plain.tpl";
                $mode  = "?mode=".$_GET['mode'];
        }
 
-       //echo "<pre>"; var_dump($a->argv); killme();
-
-       switch($a->argv[1]){
+       switch ($a->argv[1]) {
                case "image":
-                       $path = array( array("", t("Photos")));
+                       $path = array(array("", t("Photos")));
                        $albums = false;
                        $sql_extra = "";
                        $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
index c40b85474382f23d63d8676c02fc93e8b5fcfcc4..2c683f784a65d60c2433518a2c625d108ac7b497 100644 (file)
@@ -1,88 +1,50 @@
-<!DOCTYPE html>
-<html>
        <!--
-               This is the template used by mod/fbrowser.php when is called from TinyMCE rich editor.
-               See also 'filebrowser_plain.tpl'
+               This is the template used by mod/fbrowser.php
        -->
-       <head>
-       <script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-       <style>
-               .panel_wrapper div.current{ overflow: auto; height: auto!important; }
-               .filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-               .filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-               .filebrowser ul{ list-style-type: none; padding:0px; }
-               .filebrowser.folders a { display: block; padding: 0.3em }
-               .filebrowser.folders a:hover { background-color: #f0f0ee; }
-               .filebrowser.files.image { overflow: auto; height: auto; }
-               .filebrowser.files.image img { height:50px;}
-               .filebrowser.files.image li { display: block; padding: 5px; float: left; }
-               .filebrowser.files.image span { display: none;}
-               .filebrowser.files.file img { height:16px; vertical-align: bottom;}
-               .filebrowser.files a { display: block;  padding: 0.3em}
-               .filebrowser.files a:hover { background-color: #f0f0ee; }
-               .filebrowser a { text-decoration: none; }
-       </style>
-       <script>
-               var FileBrowserDialogue = {
-                       init : function () {
-                               // Here goes your code for setting your custom things onLoad.
-                       },
-                       mySubmit : function (URL) {
-                               //var URL = document.my_form.my_field.value;
-                               var win = tinyMCEPopup.getWindowArg("window");
-
-                               // insert information now
-                               win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-                               // are we an image browser
-                               if (typeof(win.ImageDialog) != "undefined") {
-                                       // we are, so update image dimensions...
-                                       if (win.ImageDialog.getImageData)
-                                               win.ImageDialog.getImageData();
-
-                                       // ... and preview if necessary
-                                       if (win.ImageDialog.showPreviewImage)
-                                               win.ImageDialog.showPreviewImage(URL);
-                               }
+<style>
+       #buglink_wrapper{display:none;} /* hide buglink. only in this page */
+</style>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/filebrowser.js"></script>
+<script>
+       $(function() {
+               FileBrowser.init("{{$nickname}}", "{{$type}}");
+       });
+</script>
+<div class="fbrowser {{$type}}">
+       <div class="error hidden">
+               <span></span> <a href="#" class='close'>X</a>
+       </div>
 
-                               // close popup window
-                               tinyMCEPopup.close();
-                       }
-               }
+       <div class="path">
+               {{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
+       </div>
 
-               tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-       </script>
-       </head>
-       <body>
-       
-       <div class="tabs">
-               <ul >
-                       <li class="current"><span>FileBrowser</span></li>
+       {{if $folders }}
+       <div class="folders">
+               <ul>
+                       {{foreach $folders as $f}}<li><a href="#" data-folder="{{$f.0}}">{{$f.1}}</a></li>{{/foreach}}
                </ul>
        </div>
-       <div class="panel_wrapper">
+       {{/if}}
 
-               <div id="general_panel" class="panel current">
-                       <div class="filebrowser path">
-                               {{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-                       </div>
-                       <div class="filebrowser folders">
-                               <ul>
-                                       {{foreach $folders as $f}}<li><a href="{{$baseurl}}/fbrowser/{{$type}}/{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
-                               </ul>
-                       </div>
-                       <div class="filebrowser files {{$type}}">
-                               <ul>
-                               {{foreach $files as $f}}
-                                       <li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
-                               {{/foreach}}
-                               </ul>
-                       </div>
+       <div class="list">
+               {{foreach $files as $f}}
+               <div class="photo-album-image-wrapper">
+                       <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+                               <img src="{{$f.2}}">
+                               <p>{{$f.1}}</p>
+                       </a>
                </div>
+               {{/foreach}}
        </div>
-       <div class="mceActionPanel">
-               <input type="button" id="cancel" name="cancel" value="{{$cancel|escape:'html'}}" onclick="tinyMCEPopup.close();" />
-       </div>  
+
+       <div class="upload">
+               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
+       </div>
+</div>
+
+
        </body>
-       
+
 </html>
diff --git a/view/templates/filebrowser_plain.tpl b/view/templates/filebrowser_plain.tpl
deleted file mode 100644 (file)
index 1ebf8a2..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-       <!--
-               This is the template used by mod/fbrowser.php when is called from plain text editor.
-               See also 'filebrowser.tpl'
-       -->
-<style>
-       #buglink_wrapper{display:none;} /* hide buglink. only in this page */
-</style>
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/filebrowser.js"></script>
-<script>
-       $(function() {
-               FileBrowser.init("{{$nickname}}", "{{$type}}");
-       });
-</script>
-<div class="fbrowser {{$type}}">
-       <div class="error hidden">
-               <span></span> <a href="#" class='close'>X</a>
-       </div>
-
-       <div class="path">
-               {{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-       </div>
-
-       {{if $folders }}
-       <div class="folders">
-               <ul>
-                       {{foreach $folders as $f}}<li><a href="#" data-folder="{{$f.0}}">{{$f.1}}</a></li>{{/foreach}}
-               </ul>
-       </div>
-       {{/if}}
-
-       <div class="list">
-               {{foreach $files as $f}}
-               <div class="photo-album-image-wrapper">
-                       <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
-                               <img src="{{$f.2}}">
-                               <p>{{$f.1}}</p>
-                       </a>
-               </div>
-               {{/foreach}}
-       </div>
-
-       <div class="upload">
-               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
-       </div>
-</div>
-
-
-       </body>
-
-</html>
diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl
new file mode 100644 (file)
index 0000000..55cecab
--- /dev/null
@@ -0,0 +1,50 @@
+       <!--
+               This is the template used by mod/fbrowser.php
+       -->
+<style>
+       #buglink_wrapper{display:none;} /* hide buglink. only in this page */
+</style>
+{{*<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>*}}
+{{*<script type="text/javascript" src="view/theme/frio/js/filebrowser.js"></script>*}}
+
+<div class="fbrowser {{$type}}">
+       <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
+       <input id="fb-type" type="hidden" name="type" value="{{$type}}" />
+
+       <div class="error hidden">
+               <span></span> <a href="#" class='close'>X</a>
+       </div>
+
+       <div class="path">
+               {{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
+       </div>
+
+       {{if $folders }}
+       <div class="folders">
+               <ul>
+                       {{foreach $folders as $f}}<li><a href="#" data-folder="{{$f.0}}">{{$f.1}}</a></li>{{/foreach}}
+               </ul>
+       </div>
+       {{/if}}
+
+       <div class="list">
+               {{foreach $files as $f}}
+               <div class="photo-album-image-wrapper">
+                       <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+                               <img src="{{$f.2}}">
+                               <p>{{$f.1}}</p>
+                       </a>
+               </div>
+               {{/foreach}}
+       </div>
+
+       <div class="upload">
+               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
+       </div>
+</div>
+
+<script>
+    $(document).ready(function(){
+
+       });
+</script>
\ No newline at end of file
diff --git a/view/theme/frio/templates/filebrowser_plain.tpl b/view/theme/frio/templates/filebrowser_plain.tpl
deleted file mode 100644 (file)
index b1127c8..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-       <!--
-               This is the template used by mod/fbrowser.php when is called from plain text editor.
-               See also 'filebrowser.tpl'
-       -->
-<style>
-       #buglink_wrapper{display:none;} /* hide buglink. only in this page */
-</style>
-{{*<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>*}}
-{{*<script type="text/javascript" src="view/theme/frio/js/filebrowser.js"></script>*}}
-
-<div class="fbrowser {{$type}}">
-       <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
-       <input id="fb-type" type="hidden" name="type" value="{{$type}}" />
-
-       <div class="error hidden">
-               <span></span> <a href="#" class='close'>X</a>
-       </div>
-
-       <div class="path">
-               {{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-       </div>
-
-       {{if $folders }}
-       <div class="folders">
-               <ul>
-                       {{foreach $folders as $f}}<li><a href="#" data-folder="{{$f.0}}">{{$f.1}}</a></li>{{/foreach}}
-               </ul>
-       </div>
-       {{/if}}
-
-       <div class="list">
-               {{foreach $files as $f}}
-               <div class="photo-album-image-wrapper">
-                       <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
-                               <img src="{{$f.2}}">
-                               <p>{{$f.1}}</p>
-                       </a>
-               </div>
-               {{/foreach}}
-       </div>
-
-       <div class="upload">
-               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
-       </div>
-</div>
-
-<script>
-    $(document).ready(function(){
-
-       });
-</script>
\ No newline at end of file
diff --git a/view/theme/frost/templates/filebrowser.tpl b/view/theme/frost/templates/filebrowser.tpl
deleted file mode 100644 (file)
index 26316a9..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<!DOCTYPE html>
-<html>
-       <head>
-       <script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-       <style>
-               .panel_wrapper div.current{.overflow: auto; height: auto!important; }
-               .filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-               .filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-               .filebrowser ul{ list-style-type: none; padding:0px; }
-               .filebrowser.folders a { display: block; padding: 0.3em }
-               .filebrowser.folders a:hover { background-color: #f0f0ee; }
-               .filebrowser.files.image { overflow: auto; height: auto; }
-               .filebrowser.files.image img { height:100px;}
-               .filebrowser.files.image li { display: block; padding: 5px; float: left; }
-               .filebrowser.files.image span { display: none;}
-               .filebrowser.files.file img { height:16px; vertical-align: bottom;}
-               .filebrowser.files a { display: block;  padding: 0.3em}
-               .filebrowser.files a:hover { background-color: #f0f0ee; }
-               .filebrowser a { text-decoration: none; }
-       </style>
-       <script>
-               var FileBrowserDialogue = {
-                       init : function () {
-                               // Here goes your code for setting your custom things onLoad.
-                       },
-                       mySubmit : function (URL) {
-                               //var URL = document.my_form.my_field.value;
-                               var win = tinyMCEPopup.getWindowArg("window");
-
-                               // insert information now
-                               win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-                               // are we an image browser
-                               if (typeof(win.ImageDialog) != "undefined") {
-                                       // we are, so update image dimensions...
-                                       if (win.ImageDialog.getImageData)
-                                               win.ImageDialog.getImageData();
-
-                                       // ... and preview if necessary
-                                       if (win.ImageDialog.showPreviewImage)
-                                               win.ImageDialog.showPreviewImage(URL);
-                               }
-
-                               // close popup window
-                               tinyMCEPopup.close();
-                       }
-               }
-
-               tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-       </script>
-       </head>
-       <body>
-       
-       <div class="tabs">
-               <ul >
-                       <li class="current"><span>FileBrowser</span></li>
-               </ul>
-       </div>
-       <div class="panel_wrapper">
-
-               <div id="general_panel" class="panel current">
-                       <div class="filebrowser path">
-                               {{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-                       </div>
-                       <div class="filebrowser folders">
-                               <ul>
-                                       {{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
-                               </ul>
-                       </div>
-                       <div class="filebrowser files {{$type}}">
-                               <ul>
-                               {{foreach $files as $f}}
-                                       <li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
-                               {{/foreach}}
-                               </ul>
-                       </div>
-               </div>
-       </div>
-       <div class="mceActionPanel">
-               <input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
-       </div>  
-       </body>
-       
-</html>