dynamic title input box - via fabrixxm

diff --git a/include/conversation.php b/include/conversation.php
index a30a782718dd0ad405cbd3af6639e10577a61b01..ec1fd4152cd1c5818c84339fd17a561c58e590fe 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -812,7 +812,8 @@ function status_editor($a,$x, $notes_cid = 0) {
                        '$audurl' => t("Please enter an audio link/URL:"),
                        '$term' => t('Tag term:'),
                        '$whereareu' => t('Where are you right now?'),
-                       '$title' => t('Enter a title for this item') 
+                       '$title' => t('Enter a title for this item'),
+                       '$addtitle' => t('click here to add a title') 
                ));
 
 
@@ -880,6 +881,8 @@ function status_editor($a,$x, $notes_cid = 0) {
                        '$acl' => $x['acl'],
                        '$bang' => $x['bang'],
                        '$profile_uid' => $x['profile_uid'],
+                       '$addtitle' => t('click here to add a title') 
+
                ));
 
        return $o;

diff --git a/mod/ping.php b/mod/ping.php
index 5b9159fa4619b328d1754b94f1e4d265da52dea5..df07cb768e672dcdea8cf40e56a489c8cfb8a7af 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -7,7 +7,6 @@ function ping_init(&$a) {
        header("Content-type: text/xml");
        echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
                <result>";
-       
 
        $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
        if(local_user()){
@@ -18,11 +17,10 @@ function ping_init(&$a) {
                $dislikes = array();
                $friends = array();
                $posts = array();
-               $cit = array();
                
 
                $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, 
-                               `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, `item`.`body`, 
+                               `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, 
                                `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
                                FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
                                WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
@@ -31,8 +29,6 @@ function ping_init(&$a) {
                        intval(local_user())
                );
                
-               
-               
                $network = count($r);
                foreach ($r as $it) {
                        switch($it['verb']){
@@ -53,11 +49,8 @@ function ping_init(&$a) {
                                        $friends[] = $it;
                                        break;
                                default:
-                                       $reg = "|@\[url=".$a->get_baseurl()."/profile/".$a->user['nickname']."|";
                                        if ($it['parent']!=$it['id']) { 
                                                $comments[] = $it;
-                                       } else if(preg_match( $reg, $it['body'])){
-                                               $cit[] = $it;
                                        } else {
                                                $posts[] = $it;
                                        }
@@ -93,9 +86,6 @@ function ping_init(&$a) {
                                        break;
                                default:
                                        if ($it['parent']!=$it['id']) $comments[] = $it;
-                                       if(preg_match("/@\[[^]]*\]".$a->user['username']."/", $it['body'])){
-                                               $cit[] = $it;
-                                       }                                       
                        }
                }
 
@@ -128,9 +118,9 @@ function ping_init(&$a) {
                );
                $mail = $mails[0]['total'];
                
-               if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
-                       $regs = q("select register.created, contact.name, contact.url, contact.micro from register left join contact on register.uid = contact.uid where contact.self = 1");
-                       $register = count($regs);
+               if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
+                       $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
+                       $register = $regs[0]['total'];
                } else {
                        $register = "0";
                }
@@ -150,12 +140,12 @@ function ping_init(&$a) {
                                <home>$home</home>";
                if ($register!=0) echo "<register>$register</register>";
                
-               $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags)+count($cit);
+               $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
                
                echo '  <notif count="'.$tot.'">';
                if ($intro>0){
                        foreach ($intros as $i) { 
-                               echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
+                               echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
                        };
                }
                if ($mail>0){
@@ -191,7 +181,7 @@ function ping_init(&$a) {
                }
                if (count($posts)){
                        foreach ($posts as $i) {
-                               echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']),  t("{0} posted")  );
+                               echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} posted") ) );
                        };
                }
                if (count($tags)){
@@ -199,11 +189,6 @@ function ping_init(&$a) {
                                echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} tagged %s's post with #%s"), $i['pname'], $i['tname'] ) );
                        };
                }
-               if (count($cit)){
-                       foreach ($cit as $i) {
-                               echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), t("{0} mentioned you in a post") );
-                       };
-               }
 
                echo "  </notif>";
        }

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 941a8f3e2757876e15373e79ca28c5558e9c3e42..f35cbee17579fdfd67eeaaba34bf0de99336c742 100644 (file)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -7,7 +7,7 @@ var textlen = 0;
 function initEditor(cb){
        if (editor==false){
                $("#profile-jot-text-loading").show();  
-//             $("#jot-title").show();
+               $("#jot-title-desc").show();
                tinyMCE.init({
                        theme : "advanced",
                        mode : "specific_textareas",
@@ -111,7 +111,11 @@ function initEditor(cb){
                        $(this).val("");
                        initEditor();
                });
-               
+
+               $("#jot-title-desc").click(function() {
+                       $("#jot-title-desc").hide();
+                       $("#jot-title").show();
+               });             
        
                var uploader = new window.AjaxUpload(
                        'wall-image-upload',

diff --git a/view/jot.tpl b/view/jot.tpl
index 83af1ae37162a15590bfd412641af4ac46ee2a8f..cb4eb64d43e6a76bf5edabcfd42727be0dd6f827 100644 (file)
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -14,6 +14,7 @@
                <input type="hidden" name="coord" id="jot-coord" value="" />
                <input type="hidden" name="post_id" value="$post_id" />
                <div id="jot-title-wrapper">
+               <span id="jot-title-desc" style="display: none;">$addtitle</span>
                <input type="text" name="title" id="jot-title" value="" style="display: none;" />
                </div>
 
@@ -46,9 +47,6 @@
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
        </div> 
-       <div id="profile-title-wrapper" style="display: $visitor;" >
-               <a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
-       </div> 
 
        <div id="profile-jot-plugin-wrapper">
        $jotplugins

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 7a1012230f27174e74a350d954ce6ee10fc882df..a3464f3f7a45294133755ce2f554755dcab7411e 100644 (file)
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -8,6 +8,7 @@ var textlen = 0;
 function initEditor(cb) {
     if (editor==false) {
         $("#profile-jot-text-loading").show();
+               $("#jot-title-desc").show();
         tinyMCE.init({
                 theme : "advanced",
                 mode : "specific_textareas",
@@ -100,6 +101,12 @@ function initEditor(cb) {
                     $(this).val("");
                     initEditor();
                 }); 
+
+               $("#jot-title-desc").click(function() {
+                       $("#jot-title-desc").hide();
+                       $("#jot-title").show();
+               });             
+
                var uploader = new window.AjaxUpload(
                        'wall-image-upload',
                        { action: 'wall_upload/$nickname',

diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index a2c883e4beba74dd6b6f118f44960803fc5902de..b340b532b3bd003ecb74c9c07f5efdbc4787c5cb 100644 (file)
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -14,8 +14,11 @@
                <input type="hidden" name="return" value="$return_path" />
                <input type="hidden" name="location" id="jot-location" value="$defloc" />
                <input type="hidden" name="coord" id="jot-coord" value="" />
-               <input type="hidden" name="title" id="jot-title" value="" />
                <input type="hidden" name="post_id" value="$post_id" />
+               <div id="jot-title-wrapper">
+               <span id="jot-title-desc" style="display: none;">$addtitle</span>
+               <input type="text" name="title" id="jot-title" value="" style="display: none;" />
+               </div>
 
                 <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
@@ -49,9 +52,6 @@
        <div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
                <a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
        </div> 
-       <div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-               <a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-       </div> 
 
        <div id="profile-jot-plugin-wrapper" style="display: none;">
        $jotplugins

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 0d8b546980512030b34d252fa1494098e8d4b905..59425a05a2dca7c219eb28938548d40fd7abb5e3 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -342,6 +342,19 @@ aside #viewcontacts { text-align: right;}
 #acl-deny-text-end { clear: both; }
 
 
+#jot-title-desc {
+       color: #cccccc;
+}
+
+#jot-title-wrapper {
+       margin-bottom: 5px;
+}
+
+#jot-title {
+       border: 1px solid #cccccc;
+       width: 530px;
+}
+
 
 /**
  * section

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c6582d06855c652ba8dc05e85679462a9380b52d..f3c0e7a90b7f83a022a732da00789ec2495b0c06 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -269,6 +269,19 @@ div.wall-item-content-wrapper.shiny {
        float: left;
 }
 
+#jot-title-desc {
+       color: #cccccc;
+}
+
+#jot-title-wrapper {
+       margin-bottom: 5px;
+}
+
+#jot-title {
+       border: 1px solid #cccccc;
+       width: 530px;
+}
+
 .fakelink, .fakelink:visited, .fakelink:link {
        color: #3465a4;
        text-decoration: none;

diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 222edc1660afee5aa0006661e4b5d035cc722df1..daacba7fc5778a2d89e68420a63bb5e4698610b7 100644 (file)
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -131,6 +131,20 @@ blockquote:before {
        float: left;
 }
 
+#jot-title-desc {
+       color: #cccccc;
+}
+
+#jot-title-wrapper {
+       margin-bottom: 5px;
+}
+
+#jot-title {
+       border: 1px solid #cccccc;
+       width: 530px;
+}
+
+
 .fakelink, .fakelink:visited {
        color: #15607B;
        text-decoration: none;

diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
index d65ac8b17d5430ba6f2dcd06cba019a08c0285e8..9aeea2df941a7585353c76aa2e766128da79f7ce 100644 (file)
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
@@ -12,8 +12,11 @@
                <input type="hidden" name="return" value="$return_path" />
                <input type="hidden" name="location" id="jot-location" value="$defloc" />
                <input type="hidden" name="coord" id="jot-coord" value="" />
-               <input type="hidden" name="title" id="jot-title" value="" />
                <input type="hidden" name="post_id" value="$post_id" />
+               <div id="jot-title-wrapper">
+               <span id="jot-title-desc" style="display: none;">$addtitle</span>
+               <input type="text" name="title" id="jot-title" value="" style="display: none;" />
+               </div>
 
                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
@@ -43,9 +46,6 @@
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;">no location</a>
        </div> 
-       <div id="profile-title-wrapper" style="display: $visitor;" >
-               <a id="profile-title" class="article" title="$title" onclick="jotTitle();return false;">title</a>
-       </div> 
        <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
                <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="$lockstate"  title="$permset" >permissions</a>$bang
        </div>

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 2e61b91829fd8a0f0038f3f3c696e182f5c73e2d..a2955985948e2f97f4b47963c97ca68dbe1b88cd 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -528,6 +528,8 @@ section {
 #about-jot-submit-wrapper {
        margin-top: 15px;
 }
+
+
 /** buttons **/
 /*input[type="submit"] {
        border: 0px;

diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index 62351e17321e17026c610b74e0cfaeaaa60f63ff..dba6cfd2b897237ca3ee86479135fdd491274207 100644 (file)
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -8,6 +8,7 @@ var textlen = 0;
 function initEditor(cb) {
     if (editor==false) {
         $("#profile-jot-text-loading").show();
+               $("#jot-title-desc").show();
         tinyMCE.init({
                 theme : "advanced",
                 mode : "specific_textareas",
@@ -122,6 +123,13 @@ function initEditor(cb) {
                     $(this).val("");
                     initEditor();
                 }); 
+
+               $("#jot-title-desc").click(function() {
+            $("#jot-title-desc").hide();
+            $("#jot-title").show();
+        });
+
+
                var uploader = new window.AjaxUpload(
                        'wall-image-upload',
                        { action: 'wall_upload/$nickname',

diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index 7ccaf2aa2b2e59a81a0ab3d8a6ff2bae13b7ee80..dce5fb616cecd72e963e569a061b87c546595173 100644 (file)
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -14,9 +14,13 @@
                <input type="hidden" name="return" value="$return_path" />
                <input type="hidden" name="location" id="jot-location" value="$defloc" />
                <input type="hidden" name="coord" id="jot-coord" value="" />
-               <input type="hidden" name="title" id="jot-title" value="" />
                <input type="hidden" name="post_id" value="$post_id" />
 
+               <div id="jot-title-wrapper">
+        <span id="jot-title-desc" style="display: none;">$addtitle</span>
+        <input type="text" name="title" id="jot-title" value="" style="display: none;" />
+        </div>
+
                 <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
                 {{ if $content }}<script>initEditor();</script>{{ endif }}
@@ -42,9 +46,6 @@
        <div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
                <a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
        </div> 
-       <div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-               <a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-       </div> 
 
        <div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
                <input type="submit" id="profile-jot-submit" name="submit" value="$share" />

diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index d1d344ef970cc71b1b00eb75b8b90c07046089a8..5c31f2f41161cce5a5b28a384fe57b5c41ee71b5 100644 (file)
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -744,6 +744,20 @@ ul .sidebar-group-li .icon{
 #profile-jot-submit-wrapper { 
 }
 
+#jot-title-desc {
+       color: #cccccc;
+}
+
+#jot-title-wrapper {
+       margin-bottom: 5px;
+}
+
+#jot-title {
+       border: 1px solid #cccccc;
+       width: 460px;
+}
+
+
 #profile-jot-perms, #profile-jot-submit {
        width: 60px;
        font-size: 12px;