]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #1791 from annando/1507-new-poco
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 2 Aug 2015 08:31:34 +0000 (10:31 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 2 Aug 2015 08:31:34 +0000 (10:31 +0200)
Improved Local Directory

24 files changed:
doc/FAQ.md
doc/Vagrant.md
js/filebrowser.js [new file with mode: 0644]
js/main.js
mod/fbrowser.php
util/htconfig.vagrant.php [new file with mode: 0644]
util/vagrant_provision.sh
view/global.css
view/templates/filebrowser.tpl
view/templates/filebrowser_plain.tpl [new file with mode: 0644]
view/templates/jot-header.tpl
view/theme/dispy/templates/comment_item.tpl
view/theme/duepuntozero/style.css
view/theme/duepuntozero/templates/comment_item.tpl
view/theme/frost-mobile/templates/comment_item.tpl
view/theme/frost/templates/comment_item.tpl
view/theme/quattro/dark/style.css
view/theme/quattro/green/style.css
view/theme/quattro/icons.less
view/theme/quattro/lilac/style.css
view/theme/quattro/quattro.less
view/theme/quattro/templates/comment_item.tpl
view/theme/vier/style.css
view/theme/vier/templates/comment_item.tpl

index fd2012c7eea9878cc1482b4ace9a9af87ae39db1..f9e5cacd367fa34536a0b87004d2027d66907ca0 100644 (file)
@@ -19,6 +19,8 @@ Admins
 
 * **[Can I configure multiple domains with the same code instance?](help/FAQ#multiple)**
 * **[Where can I find the source code of friendica, addons and themes?](help/FAQ#sources)**
+* **[I've changed the my email address now the admin panel is gone?](help/FAQ#adminaccount1)**
+* **[Can there be more then just one admin for a node?](help/FAQ#adminaccount2)**
 
 User
 --------
@@ -198,3 +200,14 @@ There you will always find the current stable version of friendica.
 Addons are listed at [this page](https://github.com/friendica/friendica-addons).
 
 If you are searching for new themes, you can find them at [Friendica-Themes.com](http://friendica-themes.com/) 
+
+<a name="adminaccount1"></a>
+###I've changed the my email address now the admin panel is gone?
+
+Have a look into your <tt>.htconfig.php</tt> and fix your email address there.
+
+<a name="adminaccount2"></a>
+###Can there be more then just one admin for a node?
+
+Yes. You just have to list more then one email address in the
+<tt>.htconfig.php</tt> file. The listed emails need to be separated by a comma.
index 979c5c49b6ae50b081cf32ccff48dc44abb13900..1d23ace13458470cc9c849ee8bd3ddcbcefeea4d 100644 (file)
@@ -17,7 +17,7 @@ Inside, you'll find a "Vagrantfile" and some scripts in the utils folder.
 3. Run "vagrant up" from inside the friendica clone.
 Be patient: When it runs for the first time, it downloads an Ubuntu Server image.
 4. Run "vagrant ssh" to log into the virtual machine to log in to the VM.
-5. Open 192.168.22.10 in a browser to finish the Friendica installation.
+5. Open 192.168.22.10 in a browser.
 The mysql database is called "friendica", the mysql user and password both are "root".
 6. Work on Friendica's code in your git clone on your machine (not in the VM).
 7. Check the changes in your browser in the VM.
@@ -30,13 +30,7 @@ If you want to stop vagrant after finishing your work, run the following command
 
 in the development directory.
 
-Import test data
-----------------
-
-If you want some test data in your vagrant Friendica instance import the database dump friendica_test_data.sql like so (inside the VM):
-
-               $> mysql -u root -p friendica < /vagrant/friendica_test_data.sql
-
+The vagrant Friendica instance contains a test database.
 You will then have the following accounts to login:
 
   * admin, password admin
diff --git a/js/filebrowser.js b/js/filebrowser.js
new file mode 100644 (file)
index 0000000..c203151
--- /dev/null
@@ -0,0 +1,123 @@
+/**\r
+ * Filebrowser - Friendica Communications Server\r
+ * \r
+ * Copyright (c) 2010-2013 the Friendica Project\r
+ *\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU Affero General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This code handle user interaction for image/file upload/browser dialog.\r
+ * Is loaded from filebrowser_plain.tpl\r
+ *\r
+ * To load filebrowser in colorbox, call\r
+ *\r
+ *     $.colorbox({href: ulr, iframe:true,innerWidth:'500px',innerHeight:'400px'})\r
+ *\r
+ * where url is:\r
+ *\r
+ *             <baseurl>/fbrowser/<type>/?mode=minimal[#<eventname>-<id>]\r
+ *\r
+ *             baseurl: baseurl from friendica\r
+ *             type: one of "image", "file"\r
+ *             eventname: event name to catch return value\r
+ *             id: id returned to event handler\r
+ *\r
+ *     When user select an item, an event in fired in parent page, on body element\r
+ *     The event is named\r
+ *\r
+ *             fbrowser.<type>.[<eventname>]\r
+ *             \r
+ *     with params:\r
+ *\r
+ *             filemane: filename of item choosed by user\r
+ *             embed: bbcode to embed element into posts\r
+ *             id: id from url\r
+ *\r
+ *  example:\r
+ *\r
+ *     // open dialog for select an image for a textarea with id "myeditor"\r
+ *             var id="myeditor";\r
+ *             $.colorbox({href: baseurl + "/fbrowser/image/?mode=minimal#example-"+id, iframe:true,innerWidth:'500px',innerHeight:'400px'})\r
+ *\r
+ *             // setup event handler to get user selection\r
+ *             $("body").on("fbrowser.image.example", function(event, filename, bbcode, id) {\r
+ *                     // close colorbox\r
+ *                     $.colorbox.close();\r
+ *                     // replace textxarea text with bbcode\r
+ *                     $(id).value = bbcode;\r
+ *             });\r
+ **/\r
\r
+var FileBrowser = {\r
+       nickname : "",\r
+       type : "",\r
+       event: "",\r
+       id : null,\r
+       \r
+       init: function(nickname, type) {\r
+               FileBrowser.nickname = nickname;\r
+               FileBrowser.type = type;\r
+               FileBrowser.event = "fbrowser."+type;\r
+               if (location['hash']!=="") {\r
+                       var h = location['hash'].replace("#","");\r
+                       FileBrowser.event = FileBrowser.event + "." + h.split("-")[0];\r
+                       FileBrowser.id = h.split("-")[1];\r
+               }\r
+               \r
+               console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );\r
+               \r
+               $(".folders a, .path a").on("click", function(e){\r
+                       e.preventDefault();\r
+                       var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=minimal" + location['hash'];\r
+                       location.href = url;\r
+               });\r
+               \r
+               $(".photo-album-photo-link").on('click', function(e){\r
+                       e.preventDefault();\r
+                       \r
+                       var embed = "";\r
+                       if (FileBrowser.type == "image") {\r
+                               embed = "[url="+this.dataset.link+"][img]"+this.dataset.img+"[/img][/url]";\r
+                       }\r
+                       if (FileBrowser.type=="file") {\r
+                               // attachment links are "baseurl/attach/id"; we need id\r
+                               embed = "[attachment]"+this.dataset.link.split("/").pop()+"[/attachment]";\r
+                       }\r
+                       console.log(FileBrowser.event, this.dataset.filename, embed, FileBrowser.id);\r
+                       parent.$("body").trigger(FileBrowser.event, [\r
+                               this.dataset.filename,\r
+                               embed,\r
+                               FileBrowser.id\r
+                       ]);\r
+                       \r
+               });\r
+               \r
+               if ($("#upload-image").length)\r
+                       var image_uploader = new window.AjaxUpload(\r
+                               'upload-image',\r
+                               { action: 'wall_upload/'+FileBrowser.nickname,\r
+                                       name: 'userfile',\r
+                                       onSubmit: function(file,ext) { $('#profile-rotator').show(); },\r
+                                       onComplete: function(file,response) {\r
+                                               location = baseurl + "/fbrowser/image/?mode=minimal"+location['hash'];\r
+                                               location.reload(true);\r
+                                       }                                \r
+                               }\r
+                       );\r
+\r
+               if ($("#upload-file").length)\r
+                       var file_uploader = new window.AjaxUpload(\r
+                               'upload-file',\r
+                               { action: 'wall_attach/'+FileBrowser.nickname,\r
+                                       name: 'userfile',\r
+                                       onSubmit: function(file,ext) { $('#profile-rotator').show(); },\r
+                                       onComplete: function(file,response) {\r
+                                               location = baseurl + "/fbrowser/file/?mode=minimal"+location['hash'];\r
+                                               location.reload(true);                          }                                \r
+                               }\r
+               );\r
+       }\r
+};\r
+\r
index 239a875cb418896f00cbd86458cf322b3f9a84e3..e1e852cbaf655935fce69142f87ca02c642e5c86 100644 (file)
                        e.tipTip({defaultPosition: pos, edgeOffset: 8});
                });*/
                
+               /* setup comment textarea buttons */
+               /* comment textarea buttons needs some "data-*" attributes to work:
+                *              data-role="insert-formatting" : to mark the element as a formatting button
+                *              data-comment="<string>" : string for "Comment", used by insertFormatting() function
+                *              data-bbcode="<string>" : name of the bbcode element to insert. insertFormatting() will insert it as "[name][/name]"
+                *              data-id="<string>" : id of the comment, used to find other comment-related element, like the textarea
+                * */           
+               $('body').on('click','[data-role="insert-formatting"]', function(e) {
+                       e.preventDefault();
+                       var o = $(this);
+                       var comment = o.data('comment');
+                       var bbcode  = o.data('bbcode');
+                       var id = o.data('id');
+                       if (bbcode=="img") {
+                               $.colorbox({href: baseurl + "/fbrowser/image/?mode=minimal#comment-"+id, iframe:true,innerWidth:'500px',innerHeight:'400px'})
+                               return; 
+                       }
+                       
+                       insertFormatting(comment, bbcode, id);
+               });
+
+               /* event from comment textarea button popups */
+               /* insert returned bbcode at cursor position or replace selected text */
+               $("body").on("fbrowser.image.comment", function(e, filename, bbcode, id) {
+                       console.log("on", id);
+                       $.colorbox.close();
+                       var textarea = document.getElementById("comment-edit-text-" +id);
+                       var start = textarea.selectionStart;
+                       var end = textarea.selectionEnd;
+                       textarea.value = textarea.value.substring(0, start) + bbcode + textarea.value.substring(end, textarea.value.length);
+               });
+       
                
                
                /* setup onoff widgets */
index 075846e50631e5cf577bca02bb70d38edb707f49..b2bda828792828b2dc21207fcf74949d80b32db6 100644 (file)
@@ -18,11 +18,18 @@ function fbrowser_content($a){
        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]){
                case "image":
-                       $path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")));
+                       $path = array( array("", t("Photos")));
                        $albums = false;
                        $sql_extra = "";
                        $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
@@ -32,8 +39,8 @@ function fbrowser_content($a){
                                        intval(local_user())
                                );
                                // anon functions only from 5.3.0... meglio tardi che mai..
-                               function folder1($el){return array(bin2hex($el['album']),$el['album']);}        
-                               $albums = array_map( "folder1" , $albums);
+                               $folder1 = function($el) use ($mode) {return array(bin2hex($el['album']),$el['album']);};
+                               $albums = array_map( $folder1 , $albums);
                                
                        }
                        
@@ -42,7 +49,7 @@ function fbrowser_content($a){
                                $album = hex2bin($a->argv[2]);
                                $sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
                                $sql_extra2 = "";
-                               $path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album);
+                               $path[]=array($a->argv[2], $album);
                        }
                                
                        $r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  
@@ -71,14 +78,16 @@ function fbrowser_content($a){
                        }
                        $files = array_map("files1", $r);
                        
-                       $tpl = get_markup_template("filebrowser.tpl");
-                       echo replace_macros($tpl, array(
+                       $tpl = get_markup_template($template_file);
+                       
+                       $o =  replace_macros($tpl, array(
                                '$type' => 'image',
                                '$baseurl' => $a->get_baseurl(),
                                '$path' => $path,
                                '$folders' => $albums,
                                '$files' =>$files,
                                '$cancel' => t('Cancel'),
+                               '$nickname' => $a->user['nickname'],
                        ));
                                
                                
@@ -106,14 +115,15 @@ function fbrowser_content($a){
                                //echo "<pre>"; var_dump($files); killme();
                        
                                                        
-                               $tpl = get_markup_template("filebrowser.tpl");
-                               echo replace_macros($tpl, array(
+                               $tpl = get_markup_template($template_file);
+                               $o = replace_macros($tpl, array(
                                        '$type' => 'file',
                                        '$baseurl' => $a->get_baseurl(),
-                                       '$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
+                                       '$path' => array( array( "", t("Files")) ),
                                        '$folders' => false,
                                        '$files' =>$files,
                                        '$cancel' => t('Cancel'),
+                                       '$nickname' => $a->user['nickname'],
                                ));
                                
                        }
@@ -121,7 +131,12 @@ function fbrowser_content($a){
                        break;
        }
        
-
-       killme();
+       if (x($_GET,'mode')) {
+               return $o;
+       } else {
+               echo $o;
+               killme();
+       }
+       
        
 }
diff --git a/util/htconfig.vagrant.php b/util/htconfig.vagrant.php
new file mode 100644 (file)
index 0000000..36fd4b9
--- /dev/null
@@ -0,0 +1,71 @@
+<?php
+
+// Set the following for your MySQL installation
+// Copy or rename this file to .htconfig.php
+
+$db_host = 'localhost';
+$db_user = 'root';
+$db_pass = 'root';
+$db_data = 'friendica';
+
+// If you are using a subdirectory of your domain you will need to put the
+// relative path (from the root of your domain) here.
+// For instance if your URL is 'http://example.com/directory/subdirectory',
+// set path to 'directory/subdirectory'. 
+
+$a->path = '';
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = 'Europe/Berlin';
+
+// What is your site name?
+
+$a->config['sitename'] = "My Friend Network";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = 'vagrant@friendica.dev';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '/usr/bin/php';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = '[internal]';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+// By default allow pseudonyms
+
+$a->config['system']['no_regfullname'] = true;
index b964d224318d8029a8dda11980be870d1785e797..ac24659662496b1fffbda3c6360bce52fe04e2cd 100644 (file)
@@ -63,6 +63,7 @@ SQL="${Q1}${Q2}"
 $MYSQL -uroot -proot -e "$SQL"
 service mysql restart
 
+
 #configure rudimentary mail server (local delivery only)
 #add Friendica accounts for local user accounts, use email address like vagrant@friendica.dev, read the email with 'mail'.
 debconf-set-selections <<< "postfix postfix/mailname string friendica.dev"
@@ -74,15 +75,13 @@ sudo echo -e "friendica1:   vagrant\nfriendica2:    vagrant\nfriendica3:    vagrant\nfri
 sudo rm -rf /var/www/
 sudo ln -fs /vagrant /var/www
 
-#delete .htconfig.php file if it exists to have a fresh friendica 
-#installation
-if [ -f /vagrant/.htconfig.php ]
-  then
-    sudo rm /vagrant/.htconfig.php
-fi
+# initial config file for friendica in vagrant
+cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php
 
-#create the friendica database
+# create the friendica database
 echo "create database friendica" | mysql -u root -proot
+# import test database
+$MYSQL -uroot -proot friendica < /vagrant/friendica_test_data.sql
 
 #create cronjob
 echo "*/10 * * * * cd /vagrant; /usr/bin/php include/poller.php" >> friendicacron
index 9bcd30229633fdaad828451efcee5293c13189c2..0033418b8695121df2e064d2b7cd487479c3b7c1 100644 (file)
@@ -176,4 +176,19 @@ span.oembed, h4 {
 }
 
 /* notifications unseen */
-.notify-unseen { background-color: #cceeFF; }
\ No newline at end of file
+.notify-unseen { background-color: #cceeFF; }
+
+
+/* plain text editor upload/select popup */
+\r
+.fbrowser .path a { padding: 5px; }\r
+.fbrowser .path a:before { content: "/"; padding-right: 5px;}
+.fbrowser .folders ul { list-style-type: none; padding-left: 10px;}
+.fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; }\r
+.fbrowser.image .photo-album-image-wrapper { float: left; }\r
+.fbrowser.image a img { height: 48px; }
+.fbrowser.image a p { display: none;}\r
+.fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; }\r
+.fbrowser.file img { display: inline; }\r
+.fbrowser.file p  { display: inline; white-space: nowrap; }
+.fbrowser .upload { clear: both; padding-top: 1em;}\r
index b207277a7b6cf9d788e9bdbc246e04dc483c2cc8..c40b85474382f23d63d8676c02fc93e8b5fcfcc4 100644 (file)
@@ -1,10 +1,13 @@
-
 <!DOCTYPE html>
 <html>
+       <!--
+               This is the template used by mod/fbrowser.php when is called from TinyMCE rich editor.
+               See also 'filebrowser_plain.tpl'
+       -->
        <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; }
+               .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; }
@@ -65,7 +68,7 @@
                        </div>
                        <div class="filebrowser folders">
                                <ul>
-                                       {{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
+                                       {{foreach $folders as $f}}<li><a href="{{$baseurl}}/fbrowser/{{$type}}/{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
                                </ul>
                        </div>
                        <div class="filebrowser files {{$type}}">
diff --git a/view/templates/filebrowser_plain.tpl b/view/templates/filebrowser_plain.tpl
new file mode 100644 (file)
index 0000000..4a50d4a
--- /dev/null
@@ -0,0 +1,48 @@
+       <!--
+               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="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>
index 3a67e8bcc40a0a5336b690fff4d4c90d1e72d582..8d009fd40cdd1f81bdabb65fb63a6379fbbaa1e8 100644 (file)
@@ -127,38 +127,67 @@ function enableOnUser(){
 <script>
        var ispublic = '{{$ispublic}}';
 
+       
        $(document).ready(function() {
                
                /* enable tinymce on focus and click */
                $("#profile-jot-text").focus(enableOnUser);
                $("#profile-jot-text").click(enableOnUser);
 
-               var uploader = new window.AjaxUpload(
-                       'wall-image-upload',
-                       { action: 'wall_upload/{{$nickname}}',
-                               name: 'userfile',
-                               onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-                               onComplete: function(file,response) {
-                                       addeditortext(response);
-                                       $('#profile-rotator').hide();
-                               }                                
-                       }
-               );
-               var file_uploader = new window.AjaxUpload(
-                       'wall-file-upload',
-                       { action: 'wall_attach/{{$nickname}}',
-                               name: 'userfile',
-                               onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-                               onComplete: function(file,response) {
-                                       addeditortext(response);
-                                       $('#profile-rotator').hide();
-                               }                                
-                       }
-               );
-
-
+               
+               
+               
+               /* show images / file browser window
+                * 
+                **/
+       
+               /* callback */
+               $('body').on('fbrowser.image.main', function(e, filename, embedcode, id) {
+                       $.colorbox.close();
+                       addeditortext(embedcode);
+               });
+               $('body').on('fbrowser.file.main', function(e, filename, embedcode, id) {
+                       $.colorbox.close();
+                       addeditortext(embedcode);
+               });
+       
+               $('#wall-image-upload').on('click', function(){
+                       $.colorbox({href: baseurl + "/fbrowser/image/?mode=minimal#main", iframe:true,innerWidth:'500px',innerHeight:'400px'})
+               });
+               
+               $('#wall-file-upload').on('click', function(){
+                       $.colorbox({href: baseurl + "/fbrowser/file/?mode=minimal#main", iframe:true,innerWidth:'500px',innerHeight:'400px'})
+               });
+               
+               /**     
+                       var uploader = new window.AjaxUpload(
+                               'wall-image-upload',
+                               { action: 'wall_upload/{{$nickname}}',
+                                       name: 'userfile',
+                                       onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+                                       onComplete: function(file,response) {
+                                               addeditortext(response);
+                                               $('#profile-rotator').hide();
+                                       }                                
+                               }
+                       );
+                       var file_uploader = new window.AjaxUpload(
+                               'wall-file-upload',
+                               { action: 'wall_attach/{{$nickname}}',
+                                       name: 'userfile',
+                                       onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+                                       onComplete: function(file,response) {
+                                               addeditortext(response);
+                                               $('#profile-rotator').hide();
+                                       }                                
+                               }
+                       );
+               
+               }
+               **/
        });
 
+
        function deleteCheckedItems() {
                if(confirm('{{$delitems}}')) {
                        var checkedstr = '';
index b9462e0a7a23294254c431f6dbb061290338494d..9af025454661b08cfeee1492f590e2c6aba8585a 100644 (file)
                                <ul class="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;"
-                                               onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;"
-                                               onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;"
-                                               onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;"
-                                               onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;"
-                                               onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;"
-                                               onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                style="cursor: pointer;"
-                                               onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
                                </ul>
                                <div class="comment-edit-bb-end"></div>
                                <textarea id="comment-edit-text-{{$id}}"
index 5b1e8392db953f1f5534296aae57ae7c1fe4ad7b..ff108a86319645a67f8e7b91953d770d0ecb7b07 100644 (file)
@@ -1469,6 +1469,7 @@ blockquote.shared_content {
   padding: 10px;
   text-align: center;
   font-size: 1.0em;
+  clear:left;
 }
 
 
@@ -3468,3 +3469,5 @@ ul.menu-popup {
 .videos .video-top-wrapper:hover .video-delete {
   opacity: 1;
 }
+
+
index afbac7c643192b8248a4002758730419646d90f4..1bb9dc6663d8f0759c9fb458c907b8b5d2a0bc43 100644 (file)
                                <ul class="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
-                                               onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;" title="{{$edimg}}"
-                                               onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                style="cursor: pointer;" title="{{$edurl}}"
-                                               onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
                                </ul>   
                                <div class="comment-edit-bb-end"></div>
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>                       
index bd3e57716df8e9762847198102f62be23d632843..11aa31116aba2a5e53cb92b8e19df827d16d3c67 100644 (file)
                                <ul class="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
-                                               onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
 {{*<!--                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;" title="{{$edimg}}"
-                                               onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                style="cursor: pointer;" title="{{$edurl}}"
-                                               onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>-->*}}
                                </ul>   
                                {{*<!--<div class="comment-edit-bb-end"></div>-->*}}
 {{*<!--                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
index 34eade358578b583e7acfa2aa3570f6782aa1665..56adbb1af3d9730c43ddeeaa475ea04883fd5cb4 100644 (file)
                                <ul class="comment-edit-bb" id="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
-                                               onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;" title="{{$edimg}}"
-                                               onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                style="cursor: pointer;" title="{{$edurl}}"
-                                               onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
                                </ul>   
 {{*<!--                                <div class="comment-edit-bb-end"></div>-->*}}
 {{*<!--                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
index 7a335ff4bc5300043f1992237088e9576e60f98d..89f3649abf04126acba27e95e244f3fa01b1abc2 100644 (file)
@@ -43,6 +43,9 @@
 .icon.edit {
   background-image: url("../../../images/icons/22/edit.png");
 }
+.icon.pencil {
+  background-image: url("../../../images/icons/22/edit.png");
+}
 .icon.star {
   background-image: url("../../../images/icons/22/star.png");
 }
@@ -52,6 +55,9 @@
 .icon.link {
   background-image: url("../../../images/icons/22/link.png");
 }
+.icon.remote-link {
+  background-image: url("../../../images/icons/22/link.png");
+}
 .icon.lock {
   background-image: url("../../../images/icons/22/lock.png");
 }
 .icon.s10.edit {
   background-image: url("../../../images/icons/10/edit.png");
 }
+.icon.s10.pencil {
+  background-image: url("../../../images/icons/10/edit.png");
+}
 .icon.s10.star {
   background-image: url("../../../images/icons/10/star.png");
 }
 .icon.s10.link {
   background-image: url("../../../images/icons/10/link.png");
 }
+.icon.s10.remote-link {
+  background-image: url("../../../images/icons/10/link.png");
+}
 .icon.s10.lock {
   background-image: url("../../../images/icons/10/lock.png");
 }
 .icon.s16.edit {
   background-image: url("../../../images/icons/16/edit.png");
 }
+.icon.s16.pencil {
+  background-image: url("../../../images/icons/16/edit.png");
+}
 .icon.s16.star {
   background-image: url("../../../images/icons/16/star.png");
 }
 .icon.s16.link {
   background-image: url("../../../images/icons/16/link.png");
 }
+.icon.s16.remote-link {
+  background-image: url("../../../images/icons/16/link.png");
+}
 .icon.s16.lock {
   background-image: url("../../../images/icons/16/lock.png");
 }
 .icon.s22.edit {
   background-image: url("../../../images/icons/22/edit.png");
 }
+.icon.s22.pencil {
+  background-image: url("../../../images/icons/22/edit.png");
+}
 .icon.s22.star {
   background-image: url("../../../images/icons/22/star.png");
 }
 .icon.s22.link {
   background-image: url("../../../images/icons/22/link.png");
 }
+.icon.s22.remote-link {
+  background-image: url("../../../images/icons/22/link.png");
+}
 .icon.s22.lock {
   background-image: url("../../../images/icons/22/lock.png");
 }
 .icon.s48.edit {
   background-image: url("../../../images/icons/48/edit.png");
 }
+.icon.s48.pencil {
+  background-image: url("../../../images/icons/48/edit.png");
+}
 .icon.s48.star {
   background-image: url("../../../images/icons/48/star.png");
 }
 .icon.s48.link {
   background-image: url("../../../images/icons/48/link.png");
 }
+.icon.s48.remote-link {
+  background-image: url("../../../images/icons/48/link.png");
+}
 .icon.s48.lock {
   background-image: url("../../../images/icons/48/lock.png");
 }
@@ -2450,3 +2480,70 @@ footer {
   border: 0px;
   color: #999999;
 }
+/* buttons for the event view */
+.plink-event-link {
+  float: left;
+  margin-left: 2px;
+}
+/* upload/select popup */
+.fbrowser {
+  overflow: auto;
+  position: absolute;
+  top: 0px;
+  width: 100%;
+  height: 100%;
+}
+.fbrowser .path {
+  background-color: #0e232e;
+}
+.fbrowser .path a {
+  padding: 5px;
+  margin: 0px 2px;
+  display: inline-block;
+}
+.fbrowser .path a,
+.fbrowser .path a:active,
+.fbrowser .path a:visited,
+.fbrowser .path a:link,
+.fbrowser .path a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+.fbrowser .folders ul {
+  list-style: url("icons/folder.png");
+  padding-left: 22px;
+}
+.fbrowser .list {
+  padding: 10px;
+}
+.fbrowser.image .photo-album-image-wrapper {
+  width: 48px;
+  height: 48px;
+}
+.fbrowser.image a img {
+  width: auto;
+  height: 48px;
+}
+.fbrowser.image a p {
+  display: none;
+}
+.fbrowser.file .photo-album-image-wrapper {
+  float: none;
+  white-space: nowrap;
+  width: 100%;
+  height: auto;
+}
+.fbrowser.file img {
+  display: inline;
+  width: 16px;
+  height: 16px;
+}
+.fbrowser.file p {
+  display: inline;
+  white-space: nowrap;
+}
+.fbrowser .upload {
+  clear: both;
+  padding-top: 1em;
+}
index 0fdbbbbbd080c834c360f5045b543602a62423e9..e49a0b16cbd1fbc9022b400d5be139a74fa7af84 100644 (file)
@@ -43,6 +43,9 @@
 .icon.edit {
   background-image: url("../../../images/icons/22/edit.png");
 }
+.icon.pencil {
+  background-image: url("../../../images/icons/22/edit.png");
+}
 .icon.star {
   background-image: url("../../../images/icons/22/star.png");
 }
@@ -52,6 +55,9 @@
 .icon.link {
   background-image: url("../../../images/icons/22/link.png");
 }
+.icon.remote-link {
+  background-image: url("../../../images/icons/22/link.png");
+}
 .icon.lock {
   background-image: url("../../../images/icons/22/lock.png");
 }
 .icon.s10.edit {
   background-image: url("../../../images/icons/10/edit.png");
 }
+.icon.s10.pencil {
+  background-image: url("../../../images/icons/10/edit.png");
+}
 .icon.s10.star {
   background-image: url("../../../images/icons/10/star.png");
 }
 .icon.s10.link {
   background-image: url("../../../images/icons/10/link.png");
 }
+.icon.s10.remote-link {
+  background-image: url("../../../images/icons/10/link.png");
+}
 .icon.s10.lock {
   background-image: url("../../../images/icons/10/lock.png");
 }
 .icon.s16.edit {
   background-image: url("../../../images/icons/16/edit.png");
 }
+.icon.s16.pencil {
+  background-image: url("../../../images/icons/16/edit.png");
+}
 .icon.s16.star {
   background-image: url("../../../images/icons/16/star.png");
 }
 .icon.s16.link {
   background-image: url("../../../images/icons/16/link.png");
 }
+.icon.s16.remote-link {
+  background-image: url("../../../images/icons/16/link.png");
+}
 .icon.s16.lock {
   background-image: url("../../../images/icons/16/lock.png");
 }
 .icon.s22.edit {
   background-image: url("../../../images/icons/22/edit.png");
 }
+.icon.s22.pencil {
+  background-image: url("../../../images/icons/22/edit.png");
+}
 .icon.s22.star {
   background-image: url("../../../images/icons/22/star.png");
 }
 .icon.s22.link {
   background-image: url("../../../images/icons/22/link.png");
 }
+.icon.s22.remote-link {
+  background-image: url("../../../images/icons/22/link.png");
+}
 .icon.s22.lock {
   background-image: url("../../../images/icons/22/lock.png");
 }
 .icon.s48.edit {
   background-image: url("../../../images/icons/48/edit.png");
 }
+.icon.s48.pencil {
+  background-image: url("../../../images/icons/48/edit.png");
+}
 .icon.s48.star {
   background-image: url("../../../images/icons/48/star.png");
 }
 .icon.s48.link {
   background-image: url("../../../images/icons/48/link.png");
 }
+.icon.s48.remote-link {
+  background-image: url("../../../images/icons/48/link.png");
+}
 .icon.s48.lock {
   background-image: url("../../../images/icons/48/lock.png");
 }
@@ -2450,3 +2480,70 @@ footer {
   border: 0px;
   color: #999999;
 }
+/* buttons for the event view */
+.plink-event-link {
+  float: left;
+  margin-left: 2px;
+}
+/* upload/select popup */
+.fbrowser {
+  overflow: auto;
+  position: absolute;
+  top: 0px;
+  width: 100%;
+  height: 100%;
+}
+.fbrowser .path {
+  background-color: #009100;
+}
+.fbrowser .path a {
+  padding: 5px;
+  margin: 0px 2px;
+  display: inline-block;
+}
+.fbrowser .path a,
+.fbrowser .path a:active,
+.fbrowser .path a:visited,
+.fbrowser .path a:link,
+.fbrowser .path a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+.fbrowser .folders ul {
+  list-style: url("icons/folder.png");
+  padding-left: 22px;
+}
+.fbrowser .list {
+  padding: 10px;
+}
+.fbrowser.image .photo-album-image-wrapper {
+  width: 48px;
+  height: 48px;
+}
+.fbrowser.image a img {
+  width: auto;
+  height: 48px;
+}
+.fbrowser.image a p {
+  display: none;
+}
+.fbrowser.file .photo-album-image-wrapper {
+  float: none;
+  white-space: nowrap;
+  width: 100%;
+  height: auto;
+}
+.fbrowser.file img {
+  display: inline;
+  width: 16px;
+  height: 16px;
+}
+.fbrowser.file p {
+  display: inline;
+  white-space: nowrap;
+}
+.fbrowser .upload {
+  clear: both;
+  padding-top: 1em;
+}
index 830e647823aa95dba1b572cf2ecff23ef0461835..af8f4ef9fb75f64b9cf2b4a8d5cf66527a1ef488 100644 (file)
@@ -7,15 +7,17 @@
        &.mail   { background-image: url("icons/messages_off.png"); }
        &.gear   { background-image: url("../../../images/icons/@{size}/gear.png"); }
        
-    &.like      { background-image: url("icons/like.png"); }
+       &.like   { background-image: url("icons/like.png"); }
        &.dislike        { background-image: url("icons/dislike.png"); }
        
        &.add           { background-image: url("../../../images/icons/@{size}/add.png"); }
        &.delete        { background-image: url("../../../images/icons/@{size}/delete.png"); }
        &.edit          { background-image: url("../../../images/icons/@{size}/edit.png"); }
+       &.pencil        { background-image: url("../../../images/icons/@{size}/edit.png"); }
        &.star          { background-image: url("../../../images/icons/@{size}/star.png"); }
        &.menu          { background-image: url("../../../images/icons/@{size}/menu.png"); }
        &.link          { background-image: url("../../../images/icons/@{size}/link.png"); }
+       &.remote-link   { background-image: url("../../../images/icons/@{size}/link.png"); }
        &.lock          { background-image: url("../../../images/icons/@{size}/lock.png"); }
        &.unlock        { background-image: url("../../../images/icons/@{size}/unlock.png"); }
        &.plugin        { background-image: url("../../../images/icons/@{size}/plugin.png"); }
index 7a0f7e537e0e1b1618000dfde544c068366a225f..5ea6b40c3bd5b8369a9ef16fdfd12f2e549b777e 100644 (file)
@@ -43,6 +43,9 @@
 .icon.edit {
   background-image: url("../../../images/icons/22/edit.png");
 }
+.icon.pencil {
+  background-image: url("../../../images/icons/22/edit.png");
+}
 .icon.star {
   background-image: url("../../../images/icons/22/star.png");
 }
@@ -52,6 +55,9 @@
 .icon.link {
   background-image: url("../../../images/icons/22/link.png");
 }
+.icon.remote-link {
+  background-image: url("../../../images/icons/22/link.png");
+}
 .icon.lock {
   background-image: url("../../../images/icons/22/lock.png");
 }
 .icon.s10.edit {
   background-image: url("../../../images/icons/10/edit.png");
 }
+.icon.s10.pencil {
+  background-image: url("../../../images/icons/10/edit.png");
+}
 .icon.s10.star {
   background-image: url("../../../images/icons/10/star.png");
 }
 .icon.s10.link {
   background-image: url("../../../images/icons/10/link.png");
 }
+.icon.s10.remote-link {
+  background-image: url("../../../images/icons/10/link.png");
+}
 .icon.s10.lock {
   background-image: url("../../../images/icons/10/lock.png");
 }
 .icon.s16.edit {
   background-image: url("../../../images/icons/16/edit.png");
 }
+.icon.s16.pencil {
+  background-image: url("../../../images/icons/16/edit.png");
+}
 .icon.s16.star {
   background-image: url("../../../images/icons/16/star.png");
 }
 .icon.s16.link {
   background-image: url("../../../images/icons/16/link.png");
 }
+.icon.s16.remote-link {
+  background-image: url("../../../images/icons/16/link.png");
+}
 .icon.s16.lock {
   background-image: url("../../../images/icons/16/lock.png");
 }
 .icon.s22.edit {
   background-image: url("../../../images/icons/22/edit.png");
 }
+.icon.s22.pencil {
+  background-image: url("../../../images/icons/22/edit.png");
+}
 .icon.s22.star {
   background-image: url("../../../images/icons/22/star.png");
 }
 .icon.s22.link {
   background-image: url("../../../images/icons/22/link.png");
 }
+.icon.s22.remote-link {
+  background-image: url("../../../images/icons/22/link.png");
+}
 .icon.s22.lock {
   background-image: url("../../../images/icons/22/lock.png");
 }
 .icon.s48.edit {
   background-image: url("../../../images/icons/48/edit.png");
 }
+.icon.s48.pencil {
+  background-image: url("../../../images/icons/48/edit.png");
+}
 .icon.s48.star {
   background-image: url("../../../images/icons/48/star.png");
 }
 .icon.s48.link {
   background-image: url("../../../images/icons/48/link.png");
 }
+.icon.s48.remote-link {
+  background-image: url("../../../images/icons/48/link.png");
+}
 .icon.s48.lock {
   background-image: url("../../../images/icons/48/lock.png");
 }
@@ -2450,3 +2480,70 @@ footer {
   border: 0px;
   color: #999999;
 }
+/* buttons for the event view */
+.plink-event-link {
+  float: left;
+  margin-left: 2px;
+}
+/* upload/select popup */
+.fbrowser {
+  overflow: auto;
+  position: absolute;
+  top: 0px;
+  width: 100%;
+  height: 100%;
+}
+.fbrowser .path {
+  background-color: #521f5c;
+}
+.fbrowser .path a {
+  padding: 5px;
+  margin: 0px 2px;
+  display: inline-block;
+}
+.fbrowser .path a,
+.fbrowser .path a:active,
+.fbrowser .path a:visited,
+.fbrowser .path a:link,
+.fbrowser .path a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+.fbrowser .folders ul {
+  list-style: url("icons/folder.png");
+  padding-left: 22px;
+}
+.fbrowser .list {
+  padding: 10px;
+}
+.fbrowser.image .photo-album-image-wrapper {
+  width: 48px;
+  height: 48px;
+}
+.fbrowser.image a img {
+  width: auto;
+  height: 48px;
+}
+.fbrowser.image a p {
+  display: none;
+}
+.fbrowser.file .photo-album-image-wrapper {
+  float: none;
+  white-space: nowrap;
+  width: 100%;
+  height: auto;
+}
+.fbrowser.file img {
+  display: inline;
+  width: 16px;
+  height: 16px;
+}
+.fbrowser.file p {
+  display: inline;
+  white-space: nowrap;
+}
+.fbrowser .upload {
+  clear: both;
+  padding-top: 1em;
+}
index 142bdc190a77d32fbb739cc0dba418841a4b796a..368e26c3a2858672e981e0eb61ec5cf9666dc0dd 100644 (file)
@@ -1700,3 +1700,33 @@ footer { height: 100px; display: table-row; }
        color: @FieldHelpColor;
 }
 
+/* buttons for the event view */
+.plink-event-link {
+       float: left;
+       margin-left: 2px;
+}
+
+/* upload/select popup */
+.fbrowser {
+       overflow: auto;
+       position: absolute;
+       top: 0px;
+       width: 100%;
+       height: 100%;
+}
+.fbrowser .path {
+       background-color: @NavbarBackground;
+       a {     padding: 5px; margin: 0px 2px; display: inline-block; }
+       a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none;  }
+}
+.fbrowser .folders ul { list-style: url("icons/folder.png"); padding-left: 22px;}
+.fbrowser .list { padding: 10px; }
+.fbrowser.image .photo-album-image-wrapper { width: 48px; height: 48px; }
+.fbrowser.image a img { width: auto; height: 48px; }
+.fbrowser.image a p { display: none;}
+.fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; width: 100%; height: auto; }
+.fbrowser.file img { display: inline; width: 16px; height: 16px}
+.fbrowser.file p  { display: inline; white-space: nowrap; }
+
+.fbrowser .upload { clear: both; padding-top: 1em;}
+
index d3d5c46320e961581fd644d0d099b4dcda8ea0be..20417c1e186f96bd1b1fbc2e70bbb471796d8d0f 100644 (file)
                                        class="comment-edit-bb">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
-                                               onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon italicbb shadow"
                                                style="cursor: pointer;" title="{{$editalic}}"
-                                               onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon underlinebb shadow"
                                                style="cursor: pointer;" title="{{$eduline}}"
-                                               onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon quotebb shadow"
                                                style="cursor: pointer;" title="{{$edquote}}"
-                                               onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
-                                               onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="code" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;" title="{{$edimg}}"
-                                               onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                style="cursor: pointer;" title="{{$edurl}}"
-                                               onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+                                               data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"></a></li>
                                </ul>   
                                <textarea id="comment-edit-text-{{$id}}" 
                                        class="comment-edit-text-empty" 
                                        name="body" 
-                                       onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" 
-                                       onBlur="commentClose(this,{{$id}}) && cmtBbClose({{$id}});" >{{$comment}}</textarea>
+                                       onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" >{{$comment}}</textarea>
                                {{if $qcomment}}
                                        <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
                                        <option value=""></option>
index 79309e338e8090e9d020d0cfc5de0e9dccb1930a..848a2a419007e9b6f9e389608c332a6e44d53151 100644 (file)
@@ -1109,6 +1109,9 @@ section {
 section.minimal {
   top: 0px;
   left: 0px;
+  position: absolute;
+  width: 100%;
+  height: 100%;
 }
 
 /* wall item */
@@ -2929,3 +2932,6 @@ a.mail-list-link {
 .videos .video-top-wrapper:hover .video-delete {
   opacity: 1;
 }
+
+/* upload/select popup */
+.fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
index 62a42c6e865e2083366982bdc3466631c28b20b9..7a9627b7795771e5c929ffcc0512f31b196555a5 100644 (file)
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
 
                                <div class="comment-edit-bb">
-                                       <a title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});"><i class="icon-picture"></i></a>      
-                                       <a title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});"><i class="icon-link"></i></a>
-                                       <a title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});"><i class="icon-film"></i></a>
+                                       <a title="{{$edimg}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>      
+                                       <a title="{{$edurl}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
+                                       <a title="{{$edvideo}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
                                                                                 
-                                       <a title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});"><i class="icon-underline"></i></a>
-                                       <a title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});"><i class="icon-italic"></i></a>
-                                       <a title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});"><i class="icon-bold"></i></a>
-                                       <a title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});"><i class="icon-quote-left"></i></a>
+                                       <a title="{{$eduline}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
+                                       <a title="{{$editalic}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
+                                       <a title="{{$edbold}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
+                                       <a title="{{$edquote}}" data-role="insert-formatting" data-comment="{{$comment}}" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
 
                                 </div>
                                        <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />