]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #551 from fermionic/20121222-use-smarty-template-engine
authorfermionic <fermion@gmx.com>
Sun, 23 Dec 2012 13:31:11 +0000 (05:31 -0800)
committerfermionic <fermion@gmx.com>
Sun, 23 Dec 2012 13:31:11 +0000 (05:31 -0800)
20121222 use smarty template engine

17 files changed:
boot.php
htconfig.php
include/bbcode.php
include/diaspora.php
include/items.php
include/onepoll.php
mod/admin.php
mod/dfrn_request.php
mod/share.php
util/messages.po
view/admin_site.tpl
view/theme/vier/comment_item.tpl
view/theme/vier/nav.tpl
view/theme/vier/search_item.tpl
view/theme/vier/style.css
view/theme/vier/theme.php
view/theme/vier/wall_thread.tpl

index 08caf1a4509b1eca3bdc7f63b368944d04242920..d8bc174b4a25c8bb64ff85713d02e3f8367eda63 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1561' );
+define ( 'FRIENDICA_VERSION',      '3.1.1565' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1157      );
 
index bb0f47727ab289aab61e6ddaeda97eb8e20f0482..e8aec1090900d6a8baa0946013541e37a7ac212f 100644 (file)
@@ -92,5 +92,5 @@ $a->config['system']['lockpath'] = "";
 // If enabled, the MyBB fulltext engine is used
 // $a->config['system']['use_fulltext_engine'] = true;
 
-// Let reshared messages look like wall-to-wall posts
-// $a->config['system']['diaspora_newreshare'] = true;
+// Use the new "share" element
+// $a->config['system']['new_share'] = true;
index e09b1ed34259ffb02471dda4a9990899c46886ec..384fd5ebd90a8aa1b156908143cc5e720705858a 100644 (file)
@@ -3,6 +3,14 @@
 require_once("include/oembed.php");
 require_once('include/event.php');
 
+function bb_cleanstyle($st) {
+  return "<span style=\"".cleancss($st[1]).";\">".$st[2]."</span>";
+}
+
+function bb_cleanclass($st) {
+  return "<span class=\"".cleancss($st[1])."\">".$st[2]."</span>";
+}
+
 function cleancss($input) {
 
        $cleaned = "";
@@ -213,7 +221,7 @@ function bb_ShareAttributes($match) {
         $author = "";
         preg_match("/author='(.*?)'/ism", $attributes, $matches);
         if ($matches[1] != "")
-                $author = $matches[1];
+                $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
 
         preg_match('/author="(.*?)"/ism', $attributes, $matches);
         if ($matches[1] != "")
@@ -385,10 +393,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
        $Text = str_replace("[*]", "<li>", $Text);
 
        // Check for style sheet commands
-       $Text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism","<span style=\"$1;\">$2</span>",$Text);
+       $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism","bb_cleanstyle",$Text);
 
        // Check for CSS classes
-       $Text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism","<span class=\"$1\">$2</span>",$Text);
+       $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_cleanclass",$Text);
 
        // handle nested lists
        $endlessloop = 0;
index b14402b5a24cffade05e6fd14886ca1bdd88d053..dcbe0fadaa9d141fe58349cb572d50e08df69320 100755 (executable)
@@ -960,12 +960,12 @@ function diaspora_reshare($importer,$xml,$msg) {
 
        $person = find_diaspora_person_by_handle($orig_author);
 
-       if(is_array($person) && x($person,'name') && x($person,'url'))
+       /*if(is_array($person) && x($person,'name') && x($person,'url'))
                $details = '[url=' . $person['url'] . ']' . $person['name'] . '[/url]';
        else
                $details = $orig_author;
 
-       $prefix = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . $details . "\n";
+       $prefix = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . $details . "\n";*/
 
 
        // allocate a guid on our system - we aren't fixing any collisions.
@@ -1012,7 +1012,7 @@ function diaspora_reshare($importer,$xml,$msg) {
                        }
                }
        }
-       
+
        $datarray['uid'] = $importer['uid'];
        $datarray['contact-id'] = $contact['id'];
        $datarray['wall'] = 0;
@@ -1024,16 +1024,8 @@ function diaspora_reshare($importer,$xml,$msg) {
        $datarray['owner-name'] = $contact['name'];
        $datarray['owner-link'] = $contact['url'];
        $datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']);
-       if (intval(get_config('system','diaspora_newreshare'))) {
-               // Let reshared messages look like wall-to-wall posts
-               // we have to set an additional value in the item in the future
-               // to distinct the wall-to-wall-posts from reshared/repeated messages
-               $datarray['author-name'] = $person['name'];
-               $datarray['author-link'] = $person['url'];
-               $datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
-               $datarray['body'] = $body;
-       } else {
-               $prefix = "[share author='".$person['name'].
+       if (intval(get_config('system','new_share'))) {
+               $prefix = "[share author='".str_replace("'", "&#039;",$person['name']).
                                "' profile='".$person['url'].
                                "' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']).
                                "' link='".$orig_url."']";
@@ -1041,6 +1033,12 @@ function diaspora_reshare($importer,$xml,$msg) {
                $datarray['author-link'] = $contact['url'];
                $datarray['author-avatar'] = $contact['thumb'];
                $datarray['body'] = $prefix.$body."[/share]";
+       } else {
+               // Let reshared messages look like wall-to-wall posts
+               $datarray['author-name'] = $person['name'];
+               $datarray['author-link'] = $person['url'];
+               $datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
+               $datarray['body'] = $body;
        }
 
        $datarray['tag'] = $str_tags;
index b5e6062b23f7c55eebf6ffdc1aab09a84b348eff..fa46fe108433b0985082602fe13b3acd4607ff80 100755 (executable)
@@ -808,20 +808,24 @@ function get_atom_elements($feed,$item) {
                if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
                        logger('get_atom_elements: fixing sender of repeated message.');
 
-                       /*$res["owner-name"] = $res["author-name"];
-                       $res["owner-link"] = $res["author-link"];
-                       $res["owner-avatar"] = $res["author-avatar"];
-
-                       $res["author-name"] = $name;
-                       $res["author-link"] = $uri;
-                       $res["author-avatar"] = $avatar;*/
-
-                       $prefix = "[share author='".$name.
-                                       "' profile='".$uri.
-                                       "' avatar='".$avatar.
-                                       "' link='".$orig_uri."']";
-
-                       $res["body"] = $prefix.html2bbcode($message)."[/share]";
+                       if (intval(get_config('system','new_share'))) {
+                               $prefix = "[share author='".str_replace("'", "&#039;",$name).
+                                               "' profile='".$uri.
+                                               "' avatar='".$avatar.
+                                               "' link='".$orig_uri."']";
+
+                               $res["body"] = $prefix.html2bbcode($message)."[/share]";
+                       } else {
+                               $res["owner-name"] = $res["author-name"];
+                               $res["owner-link"] = $res["author-link"];
+                               $res["owner-avatar"] = $res["author-avatar"];
+
+                               $res["author-name"] = $name;
+                               $res["author-link"] = $uri;
+                               $res["author-avatar"] = $avatar;
+
+                               $res["body"] = html2bbcode($message);
+                       }
                }
        }
 
index c493aff76270e12a96e9ce1569e4a9a54c979aa9..d819b7f421d9b9d1e7c620a669c2317d606952f6 100644 (file)
@@ -398,14 +398,15 @@ function onepoll_run(&$argv, &$argc){
                                                // Is it a reply?
                                                $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
                                                        (substr(strtolower($datarray['title']), 0, 3) == "re-") or
-                                                       (raw_refs != ""));
+                                                       ($raw_refs != ""));
 
                                                // Remove Reply-signs in the subject
                                                $datarray['title'] = RemoveReply($datarray['title']);
 
                                                // If it seems to be a reply but a header couldn't be found take the last message with matching subject
                                                if(!x($datarray,'parent-uri') and $reply) {
-                                                       $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
+                                                       //$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
+                                                       $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
                                                                dbesc(protect_sprintf($datarray['title'])),
                                                                intval($importer_uid));
                                                        if(count($r))
index 69b2896772cf8189286424aa5ed25db3fbb28fb2..c951dd8b9cd7d4d1b3bb0f58fa9adc900f8e7ceb 100644 (file)
@@ -241,14 +241,14 @@ function admin_page_site_post(&$a){
        $maximagesize           =       ((x($_POST,'maximagesize'))             ? intval(trim($_POST['maximagesize']))          :  0);
        $maximagelength         =       ((x($_POST,'maximagelength'))           ? intval(trim($_POST['maximagelength']))        :  MAX_IMAGE_LENGTH);
        $jpegimagequality       =       ((x($_POST,'jpegimagequality'))         ? intval(trim($_POST['jpegimagequality']))      :  JPEG_QUALITY);
-       
-       
+
+
        $register_policy        =       ((x($_POST,'register_policy'))          ? intval(trim($_POST['register_policy']))       :  0);
-       $daily_registrations    =       ((x($_POST,'max_daily_registrations'))  ? intval(trim($_POST['max_daily_registrations']))       :0);    
+       $daily_registrations    =       ((x($_POST,'max_daily_registrations'))  ? intval(trim($_POST['max_daily_registrations']))       :0);
        $abandon_days           =       ((x($_POST,'abandon_days'))             ? intval(trim($_POST['abandon_days']))          :  0);
 
-       $register_text          =       ((x($_POST,'register_text'))            ? notags(trim($_POST['register_text']))         : '');  
-       
+       $register_text          =       ((x($_POST,'register_text'))            ? notags(trim($_POST['register_text']))         : '');
+
        $allowed_sites          =       ((x($_POST,'allowed_sites'))            ? notags(trim($_POST['allowed_sites']))         : '');
        $allowed_email          =       ((x($_POST,'allowed_email'))            ? notags(trim($_POST['allowed_email']))         : '');
        $block_public           =       ((x($_POST,'block_public'))             ? True                                          : False);
@@ -273,6 +273,13 @@ function admin_page_site_post(&$a){
        $ostatus_disabled       =       !((x($_POST,'ostatus_disabled'))        ? True                                          : False);
        $diaspora_enabled       =       ((x($_POST,'diaspora_enabled'))         ? True                                          : False);
        $ssl_policy             =       ((x($_POST,'ssl_policy'))               ? intval($_POST['ssl_policy'])                  : 0);
+       $new_share              =       ((x($_POST,'new_share'))                ? True                                          : False);
+       $use_fulltext_engine    =       ((x($_POST,'use_fulltext_engine'))      ? True                                          : False);
+       $itemcache              =       ((x($_POST,'itemcache'))                ? notags(trim($_POST['itemcache']))             : '');
+       $itemcache_duration     =       ((x($_POST,'itemcache_duration'))       ? intval($_POST['itemcache_duration'])          : 0);
+       $lockpath               =       ((x($_POST,'lockpath'))                 ? notags(trim($_POST['lockpath']))              : '');
+       $temppath               =       ((x($_POST,'temppath'))                 ? notags(trim($_POST['temppath']))              : '');
+       $basepath               =       ((x($_POST,'basepath'))                 ? notags(trim($_POST['basepath']))              : '');
 
        if($ssl_policy != intval(get_config('system','ssl_policy'))) {
                if($ssl_policy == SSL_POLICY_FULL) {
@@ -372,10 +379,19 @@ function admin_page_site_post(&$a){
        set_config('system','ostatus_disabled', $ostatus_disabled);
        set_config('system','diaspora_enabled', $diaspora_enabled);
 
+       set_config('system','new_share', $new_share);
+       set_config('system','use_fulltext_engine', $use_fulltext_engine);
+       set_config('system','itemcache', $itemcache);
+       set_config('system','itemcache_duration', $itemcache_duration);
+       set_config('system','lockpath', $lockpath);
+       set_config('system','temppath', $temppath);
+       set_config('system','basepath', $basepath);
+
+
        info( t('Site settings updated.') . EOL);
        goaway($a->get_baseurl(true) . '/admin/site' );
-       return; // NOTREACHED   
-       
+       return; // NOTREACHED
+
 }
 
 /**
@@ -456,6 +472,7 @@ function admin_page_site(&$a) {
                '$upload' => t('File upload'),
                '$corporate' => t('Policies'),
                '$advanced' => t('Advanced'),
+               '$performance' => t('Performance'),
                
                '$baseurl' => $a->get_baseurl(true),
                // name, label, value, help string, extra data...
@@ -465,6 +482,7 @@ function admin_page_site(&$a) {
                '$theme'                => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
                '$theme_mobile'         => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
                '$ssl_policy'           => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
+               '$new_share'            => array('new_share', t("'Share' element"), get_config('system','new_share'), t("Activates the bbcode element 'share' for repeating items.")),
                '$maximagesize'         => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
                '$maximagelength'               => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
                '$jpegimagequality'             => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
@@ -480,7 +498,7 @@ function admin_page_site(&$a) {
                '$global_directory'     => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
                '$thread_allow'         => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
                '$newuser_private'      => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
-                       
+
                '$no_multi_reg'         => array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
                '$no_openid'            => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
                '$no_regfullname'       => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
@@ -496,6 +514,14 @@ function admin_page_site(&$a) {
                '$delivery_interval'    => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")),
                '$poll_interval'        => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
                '$maxloadavg'           => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
+
+               '$use_fulltext_engine'  => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")),
+               '$itemcache'            => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), "The item caches buffers generated bbcode and external images."),
+               '$itemcache_duration'   => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day).")),
+               '$lockpath'             => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."),
+               '$temppath'             => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."),
+               '$basepath'             => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
+
         '$form_security_token' => get_form_security_token("admin_site"),
 
        ));
index b3033c0aa22d0fe8586dd61f9f6496d824a4b9c6..0c03607fc9eee65134d0cc2b36998e54f64ce125 100644 (file)
@@ -358,6 +358,7 @@ function dfrn_request_post(&$a) {
                                        intval($uid)
                                );
                                if(! count($r)) {
+
                                        notice( t('This account has not been configured for email. Request failed.') . EOL);
                                        return;
                                }
@@ -616,7 +617,7 @@ function dfrn_request_post(&$a) {
                         *
                         */
 
-                       $url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url);
+                       $url = str_replace('{uri}', $a->get_baseurl() . '/profile/' . $nickname, $url);
                        goaway($url);
                        // NOTREACHED
                        // END $network === NETWORK_OSTATUS
index 761220ad7fca94509f6a4d7cf3619d8eaacff821..e307294a6db8aa5fe5e8ff8dd23da4a862c7ae91 100644 (file)
@@ -18,15 +18,30 @@ function share_init(&$a) {
        if(! count($r) || ($r[0]['private'] == 1))
                killme();
 
-       $o = '';
-
-       $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
-       if($r[0]['title'])
-               $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
-       $o .= $r[0]['body'] . "\n" ;
-
-       $o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
-
+       if (intval(get_config('system','new_share'))) {
+               if (strpos($r[0]['body'], "[/share]") !== false) {
+                       $pos = strpos($r[0]['body'], "[share");
+                       $o = substr($r[0]['body'], $pos);
+               } else {
+                       $o = "[share author='".str_replace("'", "&#039;",$r[0]['author-name']).
+                               "' profile='".$r[0]['author-link'].
+                               "' avatar='".$r[0]['author-avatar'].
+                               "' link='".$r[0]['plink']."']\n";
+                       if($r[0]['title'])
+                               $o .= '[b]'.$r[0]['title'].'[/b]'."\n";
+                       $o .= $r[0]['body'];
+                       $o.= "[/share]";
+               }
+       } else {
+               $o = '';
+
+               $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
+               if($r[0]['title'])
+                       $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
+               $o .= $r[0]['body'] . "\n" ;
+
+               $o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
+       }
        echo $o;
-       killme();  
+       killme();
 }
index 0d244a01eb0a939b0a531d5980c500c1ffc21331..2e186ea651005b3b7cc46ce711e9cb2e77bcda40 100644 (file)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1561\n"
+"Project-Id-Version: 3.1.1565\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-18 10:00-0800\n"
+"POT-Creation-Date: 2012-12-22 10:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,8 +40,8 @@ msgstr ""
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:541
-#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -93,8 +93,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:695 ../../mod/admin.php:705
 msgid "Name"
 msgstr ""
 
@@ -137,9 +137,9 @@ msgstr ""
 #: ../../mod/photos.php:1519 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
 #: ../../mod/content.php:693 ../../mod/contacts.php:352
-#: ../../mod/settings.php:559 ../../mod/settings.php:669
-#: ../../mod/settings.php:738 ../../mod/settings.php:810
-#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../mod/settings.php:1018 ../../mod/group.php:85 ../../mod/mood.php:137
 #: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
 #: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
 #: ../../mod/admin.php:1115 ../../mod/profiles.php:604
@@ -289,7 +289,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1748
+#: ../../include/nav.php:52 ../../boot.php:1761
 msgid "Events"
 msgstr ""
 
@@ -347,8 +347,8 @@ msgstr ""
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1278
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1291
 msgid "Location:"
 msgstr ""
 
@@ -361,8 +361,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560
-#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../addon/js_upload/js_upload.php:45
 #: ../../include/conversation.php:1009
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
@@ -410,30 +410,30 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:237
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:237
 #: ../../mod/profiles.php:584
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:238
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:238
 #: ../../mod/profiles.php:585
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../boot.php:1741
+#: ../../mod/photos.php:51 ../../boot.php:1754
 msgid "Photo Albums"
 msgstr ""
 
@@ -656,7 +656,7 @@ msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1402 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
+#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:621
 #: ../../object/Item.php:267 ../../object/Item.php:576
 msgid "Comment"
 msgstr ""
@@ -669,7 +669,7 @@ msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1488 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:622
+#: ../../mod/content.php:724 ../../mod/settings.php:623
 #: ../../mod/group.php:168 ../../mod/admin.php:699
 #: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
@@ -742,7 +742,7 @@ msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:106 ../../mod/content.php:711
-#: ../../mod/settings.php:621 ../../object/Item.php:109
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr ""
 
@@ -999,7 +999,7 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
+#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:682
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr ""
 
@@ -1051,7 +1051,7 @@ msgstr ""
 #: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1332,7 +1332,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1398,7 +1398,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1216
+#: ../../include/contact_widgets.php:9 ../../boot.php:1229
 msgid "Connect"
 msgstr ""
 
@@ -1465,7 +1465,7 @@ msgstr[1] ""
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:609
+#: ../../include/contact_widgets.php:204 ../../boot.php:622
 #: ../../object/Item.php:292 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -2034,7 +2034,7 @@ msgid "Edit contact"
 msgstr ""
 
 #: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr ""
 
@@ -2073,7 +2073,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702
+#: ../../boot.php:837 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2087,7 +2087,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:963
+#: ../../mod/lostpass.php:83 ../../boot.php:976
 msgid "Password Reset"
 msgstr ""
 
@@ -2139,63 +2139,63 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:585
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:227
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:246
+#: ../../mod/settings.php:247
 msgid "Features updated"
 msgstr ""
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:322
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:324
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:389
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:391
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:399
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:453
+#: ../../mod/settings.php:454
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:457
+#: ../../mod/settings.php:458
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
 #: ../../addon/fbpost/fbpost.php:151
 #: ../../addon/remote_permissions/remote_permissions.php:204
 #: ../../addon/impressum/impressum.php:78
@@ -2211,455 +2211,455 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
 #: ../../addon/statusnet/statusnet.php:694
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
 #: ../../addon/statusnet/statusnet.php:693
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:637
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:123
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:668
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:683
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:715
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:720
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:727
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:731 ../../mod/settings.php:736
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:768 ../../mod/admin.php:404
+#: ../../mod/settings.php:769 ../../mod/admin.php:404
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:814 ../../mod/settings.php:825
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:900
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:904
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:908
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:934
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:940
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:948
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:957
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:969
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:975
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:983
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1066
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -2762,7 +2762,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1755
+#: ../../mod/notes.php:44 ../../boot.php:1768
 msgid "Personal Notes"
 msgstr ""
 
@@ -2929,7 +2929,7 @@ msgstr ""
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1731
+#: ../../boot.php:1744
 msgid "Profile"
 msgstr ""
 
@@ -3234,7 +3234,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:936
 msgid "Register"
 msgstr ""
 
@@ -3291,7 +3291,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1738
+#: ../../include/nav.php:51 ../../boot.php:1751
 msgid "Photos"
 msgstr ""
 
@@ -3551,7 +3551,7 @@ msgstr ""
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:120 ../../include/nav.php:149
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr ""
 
@@ -4180,7 +4180,7 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1126
+#: ../../mod/profile.php:21 ../../boot.php:1139
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -4586,23 +4586,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:700 ../../boot.php:1244
+#: ../../mod/profiles.php:700 ../../boot.php:1257
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:701 ../../boot.php:1245
+#: ../../mod/profiles.php:701 ../../boot.php:1258
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:712 ../../boot.php:1255
+#: ../../mod/profiles.php:712 ../../boot.php:1268
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:714 ../../boot.php:1258
+#: ../../mod/profiles.php:714 ../../boot.php:1271
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:715 ../../boot.php:1259
+#: ../../mod/profiles.php:715 ../../boot.php:1272
 msgid "Edit visibility"
 msgstr ""
 
@@ -4624,7 +4624,7 @@ msgstr ""
 msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
 msgstr ""
 
@@ -4734,19 +4734,19 @@ msgstr ""
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1280
+#: ../../include/profile_advanced.php:17 ../../boot.php:1293
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1283
+#: ../../include/profile_advanced.php:37 ../../boot.php:1296
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1285
+#: ../../include/profile_advanced.php:48 ../../boot.php:1298
 msgid "Homepage:"
 msgstr ""
 
@@ -5632,7 +5632,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:949
+#: ../../include/nav.php:64 ../../boot.php:962
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -6240,8 +6240,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:778
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -8256,11 +8256,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr ""
 
@@ -8602,7 +8602,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:948
+#: ../../include/nav.php:46 ../../boot.php:961
 msgid "Logout"
 msgstr ""
 
@@ -8610,7 +8610,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1724
+#: ../../include/nav.php:49 ../../boot.php:1737
 msgid "Status"
 msgstr ""
 
@@ -8698,23 +8698,27 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:140 ../../boot.php:1238
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr ""
+
+#: ../../include/nav.php:142 ../../boot.php:1251
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:140
+#: ../../include/nav.php:142
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr ""
 
@@ -8858,19 +8862,26 @@ msgstr ""
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/onepoll.php:421
+#: ../../include/onepoll.php:439
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:202 ../../include/bbcode.php:482
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:254
+#, php-format
+msgid ""
+"<span><a href=\"%s\">%s</a> wrote the following <a href=\"%s\">post</a>:</"
+"span>"
+msgstr ""
+
+#: ../../include/bbcode.php:447 ../../include/bbcode.php:467
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:487 ../../include/bbcode.php:488
 msgid "Encrypted content"
 msgstr ""
 
@@ -9521,109 +9532,109 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:607
+#: ../../boot.php:620
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:610
+#: ../../boot.php:623
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:819
+#: ../../boot.php:832
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:821
+#: ../../boot.php:834
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:922
+#: ../../boot.php:935
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:951
+#: ../../boot.php:964
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:952
+#: ../../boot.php:965
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:953
+#: ../../boot.php:966
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:956
+#: ../../boot.php:969
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:962
+#: ../../boot.php:975
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1087
+#: ../../boot.php:1100
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1164
+#: ../../boot.php:1177
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1230
+#: ../../boot.php:1243
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1238
+#: ../../boot.php:1251
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1352 ../../boot.php:1438
+#: ../../boot.php:1365 ../../boot.php:1451
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1353 ../../boot.php:1439
+#: ../../boot.php:1366 ../../boot.php:1452
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1398 ../../boot.php:1479
+#: ../../boot.php:1411 ../../boot.php:1492
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1410
+#: ../../boot.php:1423
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1411
+#: ../../boot.php:1424
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1472
+#: ../../boot.php:1485
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1490
+#: ../../boot.php:1503
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1491
+#: ../../boot.php:1504
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1727
+#: ../../boot.php:1740
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1734
+#: ../../boot.php:1747
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1751
+#: ../../boot.php:1764
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1758
+#: ../../boot.php:1771
 msgid "Only You Can See This"
 msgstr ""
 
index 16f5b580de5aaa311e8b6010094c0ebde57a0951..4892dc31455d6ef8379d63823512910bc51af812 100644 (file)
        <form action="$baseurl/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-       {{ inc $field_input with $field=$sitename }}{{ endinc }}
-       {{ inc $field_textarea with $field=$banner }}{{ endinc }}
-       {{ inc $field_select with $field=$language }}{{ endinc }}
-       {{ inc $field_select with $field=$theme }}{{ endinc }}
-       {{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
-       {{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+       {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$language }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
+
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>
-       {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
-       {{ inc $field_input with $field=$proxy }}{{ endinc }}
-       {{ inc $field_input with $field=$proxyuser }}{{ endinc }}
-       {{ inc $field_input with $field=$timeout }}{{ endinc }}
-       {{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$poll_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
-       {{ inc $field_input with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
+
+       <h3>$performance</h3>
+       {{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
+
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
index ac7073d7106fe2340ebbc2ae077b36b9fc181800..fd27e494b92f859bf0f63eb227a0d618ec1fe160 100644 (file)
                                <div class="comment-edit-text-end"></div>
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
 
-                               <div class="comment-edit-bb-$id">
-                                       <a class="icon bb-image" style="cursor: pointer;" title="$edimg" onclick="insertFormatting('$comment','img',$id);">img</a>      
-                                       <a class="icon bb-url" style="cursor: pointer;" title="$edurl" onclick="insertFormatting('$comment','url',$id);">url</a>
-                                       <a class="icon bb-video" style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video',$id);">video</a>                                
+                               <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-bookmark"></i></a>
+                                       <a title="$edvideo" onclick="insertFormatting('$comment','video',$id);"><i class="icon-film"></i></a>
                                                                                 
-                                       <a class="icon underline" style="cursor: pointer;" title="$eduline" onclick="insertFormatting('$comment','u',$id);">u</a>
-                                       <a class="icon italic" style="cursor: pointer;" title="$editalic" onclick="insertFormatting('$comment','i',$id);">i</a>
-                                       <a class="icon bold" style="cursor: pointer;"  title="$edbold" onclick="insertFormatting('$comment','b',$id);">b</a>
-                                       <a class="icon quote" style="cursor: pointer;" title="$edquote" onclick="insertFormatting('$comment','quote',$id);">quote</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-comments"></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" />
                                        <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
index f615be85f0a34e3b7f474367ec50d539c63ed8cc..d0d69948ef5e39789473343a6f8e875a6724774c 100644 (file)
@@ -35,7 +35,7 @@
                         </li>           
                 {{ endif }}
 
-               <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+               <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear" style="color: lightgray;"></span></a>
                        <ul id="nav-site-menu" class="menu-popup">
                                {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}                           
                                {{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
@@ -50,7 +50,7 @@
                        </ul>           
                </li>
                {{ if $nav.notifications }}
-                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
+                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify"></span></a>
                                <span id="notify-update" class="nav-notify"></span>
                                <ul id="nav-notifications-menu" class="menu-popup">
                                        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
index 0e01532f8b7959dc0e9054b13783a5989603285d..846f5ccff7c3240bead711f9e42b4e261ca0228b 100644 (file)
@@ -45,7 +45,8 @@
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }}
+                       <!-- {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }} -->
+                       {{ if $item.conv }}<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'><i class="icon-link icon-large"></i></a>{{ endif }}
                </div>
                <div class="wall-item-actions">
 
index f7e10c94de1aae0a82caf004b0dabb669ec2160e..640062bcf84cfa72ff55854d293e1454a470e326 100644 (file)
@@ -5,6 +5,7 @@
 
 /* @import "css/font-awesome.css"; */
 @import url("css/font-awesome.css") all;
+@import url("css/font2.css") all;
 
 /* ========= */
 /* = Admin = */
 }
 
 .admin.linklist {
-        border: 0px; padding: 0px;
+        border: 0px; 
+       padding: 0px;
+       list-style: none;
+       margin-top: 0px;
 }
 
 .admin.link {
         list-style-position: inside;
         font-size: 1em;
-        padding: 5px;
-        width: 100px;
+        padding-left: 5px;
         margin: 5px;
 }
 
 #adminpage .selectall { text-align: right; }
 /* icons */
 
-.icon.bb-url{
-  background-image: url("../../../view/theme/diabook/icons/bb-url.png");
-  float: right;
-  margin-top: 2px;}
-.icon.quote{
-  background-image: url("../../../view/theme/diabook/icons/quote.png");
-  float: right;
-  margin-top: 2px;}
-.icon.bold{
-  background-image: url("../../../view/theme/diabook/icons/bold.png");
-  float: right;
-  margin-top: 2px;}
-.icon.underline{
-  background-image: url("../../../view/theme/diabook/icons/underline.png");
-  float: right;
-  margin-top: 2px;}
-.icon.italic{
-  background-image: url("../../../view/theme/diabook/icons/italic.png");
-  float: right;
-  margin-top: 2px;}
-.icon.bb-image{
-  background-image: url("../../../view/theme/diabook/icons/bb-image.png");
-  float: right;
-  margin-top: 2px;}
-.icon.bb-video{
-  background-image: url("../../../view/theme/diabook/icons/bb-video.png");
-  float: right;
-  margin-top: 2px;}
-
+/*
 .article       { background-position: -50px  0px;}
-.audio                 { background-position: -70px  0px;}
 .block                 { background-position: -90px  0px;}
-.drop          { background-position: -110px 0px;}
 .drophide      { background-position: -130px 0px;}
-.edit          { background-position: -150px 0px;}
-.camera        { background-position: -170px 0px;}
-.dislike       { background-position: -190px 0px;}
-.like          { background-position: -210px 0px;}
-.link          { background-position: -230px 0px;}
 
-.globe                 { background-position: -50px  -20px;}
 .noglobe       { background-position: -70px  -20px;}
 .no            { background-position: -90px  -20px;}
-.pause                 { background-position: -110px -20px;}
-.play          { background-position: -130px -20px;}
-.pencil        { background-position: -150px -20px;}
-.small-pencil  { background-position: -170px -20px;}
 .recycle       { background-position: -190px -20px;}
 .remote-link   { background-position: -210px -20px;}
 .share                 { background-position: -230px -20px;}
 
 .tools                 { background-position: -50px  -40px;}
-.lock          { background-position: -70px  -40px;}
-.unlock        { background-position: -90px  -40px;}
 
-.video          { background-position: -110px -40px;}
 .youtube        { background-position: -130px -40px;}
 
-.attach         { background-position: -190px -40px;}
 .language       { background-position: -210px -40px;}
 
-
-.on             { background-position: -50px  -60px;}
-.off            { background-position: -70px  -60px;}
 .prev           { background-position: -90px  -60px;}
 .next           { background-position: -110px -60px;}
 .tagged     { background-position: -130px -60px;}
-
-.attachtype {
-        display: block; width: 20px; height: 23px;
-        background-image: url('../../../images/content-types.png');
-}
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
+*/
 
 .icon.drop, .icon.drophide {
  float: left;
 }
 
-.icon {
-  display: block;
-  width: 18px;
-  height: 18px;
-  background-image: url('icons.png');
-}
 
 .icon {
   background-color: transparent ;
   background-repeat: no-repeat;
-  /* background-position: left center; */
+  width: 18px;
+  height: 18px;
   display: block;
   overflow: hidden;
-  text-indent: -9999px;
   padding: 1px;
+  color: #999;
+} 
+
+.icon:hover {
+  text-decoration: none;
+  color: #000;
+}
+
+.icon a:hover {
 }
 
 .icon.text {
   min-width: 10px;
   height: 10px;
 }
-.icon.s10.notify {
-  background-image: url("../../../images/icons/10/notify_off.png");
-}
-.icon.s10.gear {
-  background-image: url("../../../images/icons/10/gear.png");
-}
-.icon.s10.add {
-  background-image: url("../../../images/icons/10/add.png");
-}
-.icon.s10.delete {
-  background-image: url("../../../images/icons/10/delete.png");
-}
-.icon.s10.edit {
-  background-image: url("../../../images/icons/10/edit.png");
-}
-.icon.s10.star {
-  background-image: url("../../../images/icons/10/star.png");
-}
-.icon.s10.menu {
-  background-image: url("../../../images/icons/10/menu.png");
-}
-.icon.s10.link {
-  background-image: url("../../../images/icons/10/link.png");
-}
-.icon.s10.lock {
-  background-image: url("../../../images/icons/10/lock.png");
-}
-.icon.s10.unlock {
-  background-image: url("../../../images/icons/10/unlock.png");
-}
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
   font-size: 10px;
   min-width: 16px;
   height: 16px;
 }
-.icon.s16.notify {
-  background-image: url("../../../images/icons/16/notify_off.png");
-}
-.icon.s16.gear {
-  background-image: url("../../../images/icons/16/gear.png");
-}
-.icon.s16.add {
-  background-image: url("../../../images/icons/16/add.png");
-}
-.icon.s16.delete {
-  background-image: url("../../../images/icons/16/delete.png");
-}
-/*.icon.s16.edit {
-  background-image: url("../../../images/icons/16/edit.png");
-}*/
-.icon.s16.star {
-  background-image: url("../../../images/icons/16/star.png");
-}
-.icon.s16.menu {
-  background-image: url("../../../images/icons/16/menu.png");
-}
-/*.icon.s16.link {
-  background-image: url("../../../images/icons/16/link.png");
-}*/
-.icon.s16.lock {
-  background-image: url("../../../images/icons/16/lock.png");
-}
-.icon.s16.unlock {
-  background-image: url("../../../images/icons/16/unlock.png");
-}
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
   font-size: 10px;
 }
+.wall-item-decor .icon.s22.lock {
+  color: #888;
+}
+.wall-item-decor .icon.s22.lock:hover {
+  color: #000;
+  text-decoration: none;
+}
 .icon.s22 {
   min-width: 22px;
   height: 22px;
 }
 .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_off.png");
-}
-.icon.s22.gear {
-  background-image: url("../../../images/icons/22/gear.png");
-}
-.icon.s22.add {
-  background-image: url("../../../images/icons/22/add.png");
-}
-.icon.s22.delete {
-  background-image: url("../../../images/icons/22/delete.png");
-}
-.icon.s22.edit {
-  background-image: url("../../../images/icons/22/edit.png");
-}
-.icon.s22.star {
-  background-image: url("../../../images/icons/22/star.png");
-}
-.icon.s22.menu {
-  background-image: url("../../../images/icons/22/menu.png");
-}
-.icon.s22.link {
-  background-image: url("../../../images/icons/22/link.png");
-}
-.icon.s22.lock {
-  background-image: url("../../../images/icons/22/lock.png");
-}
-.icon.s22.unlock {
-  background-image: url("../../../images/icons/22/unlock.png");
+  color: gray;
 }
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
-  width: 200px;
+  width: 230px;
+  font-size: 1em;
 }
 .icon.s48 {
   width: 48px;
   height: 48px;
 }
-.icon.s48.notify {
-  background-image: url("../../../images/icons/48/notify_off.png");
-}
-.icon.s48.gear {
-  background-image: url("../../../images/icons/48/gear.png");
-}
-.icon.s48.add {
-  background-image: url("../../../images/icons/48/add.png");
-}
-.icon.s48.delete {
-  background-image: url("../../../images/icons/48/delete.png");
-}
-.icon.s48.edit {
-  background-image: url("../../../images/icons/48/edit.png");
-}
-.icon.s48.star {
-  background-image: url("../../../images/icons/48/star.png");
-}
-.icon.s48.menu {
-  background-image: url("../../../images/icons/48/menu.png");
-}
-.icon.s48.link {
-  background-image: url("../../../images/icons/48/link.png");
-}
-.icon.s48.lock {
-  background-image: url("../../../images/icons/48/lock.png");
-}
-.icon.s48.unlock {
-  background-image: url("../../../images/icons/48/unlock.png");
-}
 .sparkle {
        cursor: url('lock.cur'), pointer;
 }
@@ -355,10 +195,10 @@ div.pager, .birthday-notice {
   border-radius: 6px;
   background-color: #f2f2f2;
   clear: left;
-  margin-top: 15px;
+  margin-top: 5px;
   padding: 1%;
   height: 1em;
-  margin-bottom: 15px;
+  margin-bottom: 5px;
 }
 
 .birthday-notice {
@@ -512,7 +352,7 @@ code {
 .tool {
   height: auto;
   overflow: auto;
-  padding: 3px;
+  padding: 0px;
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
@@ -531,10 +371,32 @@ code {
 .tool a:hover {
   text-decoration: underline;
 }
+.groupsideedit, .savedsearchdrop {
+  float: right;
+  opacity: 0.3;
+}
+.groupsideedit:hover, .savedsearchdrop:hover {
+  opacity: 1;
+}
+
 .sidebar-group-element {
 /*  color: #000; */
 }
 
+#sidebar-new-group, #posted-date-selector, #hide-forum-list, #forum-list, #sidebar-ungrouped,
+.side-link, #peoplefind-desc, #connect-desc, #follow-sidebar form, #peoplefind-sidebar form,
+#netsearch-box form {
+  margin-left: 10px;
+}
+
+#sidebar-ungrouped, .side-link {
+  padding-top: 5px;
+}
+
+#forum-list {
+  margin-top: 2px;
+}
+
 /* popup notifications */
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -587,6 +449,7 @@ header #banner #logo-text {
 }
 /* nav */
 nav {
+  min-width: 1000px;
   width: 100%;
   height: 32px;
   position: fixed;
@@ -633,7 +496,7 @@ nav ul li .menu-popup {
   right: auto;
 }
 nav #search-box #search-text {
-  background-image:  url('icons/lupe.png');
+  /* background-image:  url('icons/lupe.png'); */
   background-repeat:no-repeat;
   padding-left:0px;
   border-top-left-radius: 15px;
@@ -739,7 +602,7 @@ nav #nav-notifications-linkmenu {
   margin-right: 5px;
 }
 nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_on.png");
+  color: white;
 }
 nav #nav-messages-linkmenu.selected,
 nav #nav-user-linklabel.selected,
@@ -747,8 +610,9 @@ nav #nav-apps-link.selected {
   background-color: #364e59;
 }
 
-nav #nav-community-link {
-  margin-left: 215px;
+/* nav #nav-community-link { */
+nav ul {
+  margin-left: 210px;
 }
 
 nav #nav-user-linkmenu {
@@ -882,16 +746,17 @@ aside {
   display: table-cell;
   vertical-align: top;
   width: 185px;
-  padding: 0px 10px 0px 20px;
+  padding: 10px 10px 10px 20px;
   border-right: 1px solid #D2D2D2;
   background-color: #ECECF2;
   font-size: 14px;
   /* background: #F1F1F1; */
 }
 aside .vcard .fn {
-  font-size: 16px;
+  font-size: 18px;
   font-weight: bold;
   margin-bottom: 5px;
+  float: left;
 }
 aside .vcard .title {
   margin-bottom: 5px;
@@ -903,14 +768,14 @@ aside .vcard dl {
 aside .vcard dt {
   float: left;
   margin-left: 0px;
-  width: 35%;
+  /* width: 35%; */
   text-align: right;
   color: #999999;
 }
 aside .vcard dd {
   float: left;
   margin-left: 4px;
-  width: 60%;
+  /* width: 60%; */
 }
 aside #profile-extra-links ul {
   padding: 0px;
@@ -941,7 +806,7 @@ aside #profiles-menu {
   width: 20em;
 }
 
-aside #search-text {
+aside #search-text, aside #side-follow-url, aside #side-peoplefind-url {
   width: 150px;
   height: 17px;
   padding-left: 10px;
@@ -955,6 +820,12 @@ aside #search-text {
   -moz-border-right-colors: #dbdbdb;
 }
 
+aside h4 {
+  margin-bottom: 0px;
+  margin-top: 0px;
+  font-size: 1.17em;
+}
+
 .nets-ul {
   margin-top: 0px;
 }
@@ -1001,7 +872,7 @@ aside #search-text {
 }
 /* widget */
 .widget {
-  margin-bottom: 2em;
+  margin-bottom: 1em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
        .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
 /*  font-size: 12px; */
@@ -1052,15 +923,16 @@ aside #search-text {
 }
 .widget ul {
   padding: 0px;
-  -webkit-margin-before: 0em;
-  -webkit-margin-after: 0em;
+  margin-top: 0px;
+  margin-bottom: 0px;
 }
 .widget ul li {
-  padding-left: 10px;
+  padding-left: 5px;
   /* min-height: 20px; */
   list-style: none;
-  padding-top: 1px;
-  padding-bottom: 1px;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  margin: 5px;
 }
 .widget .tool.selected {
   background: url('../../../images/selected.png') no-repeat left center;
@@ -1075,7 +947,7 @@ section {
   display: table-cell;
   vertical-align: top;
   width: 760px;
-  padding: 0px 0px 0px 10px;
+  padding: 10px 0px 10px 10px;
 }
 /* wall item */
 .tread-wrapper {
@@ -1765,7 +1637,6 @@ ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink {
 }
 
 ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
-
     color: #fff;
     text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     border: 1px solid #ececf2;
@@ -1780,6 +1651,19 @@ ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-subm
     text-decoration: none;
 }
 
+.comment-edit-bb {
+  float:right;
+}
+.comment-edit-bb a {
+  color: #888;
+  padding: 0px 5px 1px 5px;
+}
+
+.comment-edit-bb a:hover {
+  color: #000;
+  text-decoration: none;
+}
+
 /**
  * Form fields
  */
@@ -1855,6 +1739,7 @@ ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-subm
 
 .profile-edit-side-div {
   display: none;
+/*  float: right; */
 }
 
 #register-form label,
index f071c1bd067c5f55ffcc1e158b6c34cce2da9817..7c0f3d3f8d1b6fa3f3136230564047319179b2c4 100644 (file)
@@ -1,10 +1,11 @@
 <?php
 /**
  * Name: Vier
- * Version: 0.1
+ * Version: 0.9
  * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
  * Author: Ike <http://pirati.ca/profile/heluecht>
  * Maintainer: Ike <http://pirati.ca/profile/heluecht>
+ * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
  */
 
 set_template_engine($a, 'smarty3');
index b104fe1dcd5291629d39503e844fab1f1e77d1ca..1a45df57b6fa21e2c73a3c1e5ed47b04e874d356 100644 (file)
@@ -54,7 +54,7 @@
                        <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
                         {{ if $item.owner_url }}$item.via <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> <!-- $item.vwall -->{{ endif }}
                        <span class="wall-item-ago">-
-                               {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+                               {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
                                {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
                        </span>
                </div>
@@ -98,7 +98,7 @@
                                {{ endif }}
                        {{ endif }}
                        {{ if $item.vote.share }}
-                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-share icon-large"></i></a>
+                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-retweet icon-large"></i></a>
                        {{ endif }}
                        {{ if $item.star }}
                                <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do"><i class="icon-star icon-large"></i></a>