Changeset 1299

Show
Ignore:
Timestamp:
01/28/07 17:13:20 (2 years ago)
Author:
jm3
Message:

made initial interaction better with some hints on the homepage to start linking / tagging.
removed the "delete tags" link when you have no tags.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • feedmelinks/index.php

    r1288 r1299  
    11<% 
    22        ob_start(); 
    3         include_once( "modules/class.gzip_encode.inc.php" ); 
     3        include( "modules/class.gzip_encode.inc.php" ); 
    44 
    55        # $Id$ 
    …… 
    7070 
    7171        if( $l ) { 
    72                 include_once( "$modules/view-link.inc.php" ); 
     72                include( "$modules/view-link.inc.php" ); 
    7373        } else if( $mesg ) { 
    7474%> 
    …… 
    311311        <div id="leftColumn"> 
    312312 
     313<?php 
     314  $num_links = get_simple_rs( getQuery( "links_per_user", $u )); 
     315        if( $num_links < 1 ) { 
     316                include( "modules/new-user-no-links.inc.php" ); 
     317        } 
     318?> 
     319 
    313320                <div class="box"> 
    314321                        <div class="subhead">  
    315                                 <%= get_ownoun() %> <%= getCatsName() %>  
    316                                 (Sort by: 
    317  
    318                                 <% if( $taglist_sort_order == "alphabetic" ) { %> 
    319                                 <a href="<%= $page %>?taglist_sort_order=popularity">Popularity</a> 
    320                                 <% } else { %> 
    321                                 Popularity 
    322                                 <% } %> 
    323                                 | 
    324                                 <% if( $taglist_sort_order == "alphabetic" ) { %> 
    325                                 A-Z<%  
    326                                         } else { %> 
    327                                 <a href="<%= $page %>?taglist_sort_order=alphabetic">A-Z</a><%  
    328                                         } %>) 
    329                         </div> 
    330  
    331 <%       
     322<?php 
    332323        $qs = getQuery( "sorted_tags_per_user", $u ); 
    333324        $q = mysql_query( $qs ); 
    334325        if( $q ) 
    335                 $numRows = mysql_num_rows($q); 
     326                $num_tags = $numRows = mysql_num_rows($q); 
    336327        else { 
    337 %> 
    338 <!-- ERROR: running <%= $qs %> --> 
    339 <% 
    340         } 
    341         if( $numRows ) { 
     328                ?> <!-- ERROR: running <%= $qs %> --> <?php 
     329        } 
     330 
     331        $tagbox_title = ($num_tags < 4)  
     332                ? "Tags are like labels for your links." :  
     333                (  
     334                        get_ownoun()  
     335                        . " "  
     336                        . getCatsName()  
     337                        . " (Sort by: " 
     338                        . (( $taglist_sort_order == "alphabetic" ) ?  "<a href='" .  $page . "?taglist_sort_order=popularity'>Popularity</a>" : "Popularity" ) 
     339                        . " |"  
     340                        . (( $taglist_sort_order == "alphabetic" ) ?  "A-Z" : "<a href='" . $page . "?taglist_sort_order=alphabetic'>A-Z</a>") 
     341                                ); 
     342 
     343                                echo $tagbox_title; 
     344?> 
     345 
     346                        </div> 
     347 
     348<?php    
     349 
     350 
     351        if( $num_tags > 4 ) { 
    342352                $qs2 = getQuery( "links_per_user", $u ); 
    343353                $q2 = mysql_query( $qs2 ); 
    344354                if( $q2 ) { 
    345355                        $numLinks = mysql_result($q2,0); 
    346 %> 
     356?> 
    347357        <div class=""> 
    348358                <%= printLinkCount( $numLinks ) %> total links, 
    …… 
    366376 
    367377<% 
    368 } 
     378               } 
    369379        } else { 
    370 %> 
    371         <div> 
    372                 (You do not have any <%= getCatsName() %> yet.<br /> 
    373                 Try adding some, it's much nicer that way!) 
    374         </div> 
    375  
    376 <% 
     380                include( "modules/new-user-no-tags.inc.php" ); 
    377381        } 
    378382%> 
    …… 
    389393                 /> 
    390394                        <input type="hidden" name="op" value="createGroup" /> 
    391                         <input type="submit" class="button" value="create" /> 
     395                        <input type="submit" class="button" value="Add tag" style="padding: 3px;" /> 
    392396                </form> 
    393397        </p> 
     398 
     399        <?php 
     400        if( $num_tags > 3 ) { 
     401 
     402        ?> 
    394403        <p> 
    395         You can also <big><a href="/delete-unused-tags">Delete any unused tags</a></big>. 
     404               You can also <big><a href="/delete-unused-tags">Delete any unused tags</a></big>. 
    396405        </p> 
     406        <?php 
     407        } 
     408        ?> 
    397409        </div> 
    398410</div> 
    …… 
    400412<div id="rightColumn"> 
    401413        <div id="news" class="box"> 
    402                 <% include_once( "$modules/news-divs.inc.php" ); %> 
     414                <% include( "$modules/news-divs.inc.php" ); %> 
    403415        </div> 
    404416 
    …… 
    407419        <% include( "$modules/my-recent.inc.php" ); %> 
    408420 
    409         <% include_once( "$modules/random-links.inc.php" ); %> 
     421        <% include( "$modules/random-links.inc.php" ); %> 
    410422</div> 
    411423 

  • feedmelinks/install/index.php

    r1074 r1299  
    3030 
    3131<% 
    32         if( preg_match( "/MSIE/", $HTTP_USER_AGENT ) && preg_match( "/Windows/", $HTTP_USER_AGENT )) { 
     32        if( $windows || (preg_match( "/MSIE/", $HTTP_USER_AGENT ) && preg_match( "/Windows/", $HTTP_USER_AGENT ))) { 
    3333%> 
    3434        <h2>You appear to be using Microsoft Internet Explorer on Windows</h2> 
    3535        You have the following install options: 
    3636 
     37        <!-- 
    3738        <div class="bullet_box"> 
    3839                <div class="bullet_img"> 
    …… 
    4243        </div> 
    4344        <br clear="all"> 
     45        --> 
    4446 
    4547        <div class="bullet_box"> 
    …… 
    8991                        <a href="/add"><img src="/img/install-options/nomad.jpg" align="right" border="0" /></a> 
    9092                </div> 
    91                 <h2>Install nothin, AKA, "Nomad Mode"</h2> 
    92                 To use Feed Me Links in Nomad Mode, click: 
     93                <h2>Install nothing, AKA, "Nomad Mode"</h2> 
     94                <p> 
     95                <small> 
     96                        (Nomad mode is for users on public computers or anywhere that<br /> 
     97                        you'd prefer not to change the browser by installing Feed Me Links)</small> 
     98                </p> 
     99                To use Feed Me Links in Nomad Mode, click or bookmark: 
    93100                <big>&nbsp;<a href="/add">http://feedmelinks.com/add</a></big> 
    94101                <p /> 
    95                 <small>(Nomad mode is for users on public computers or anywhere that<br /> 
    96                 you'd prefer not to change the browser by installing Feed Me Links)</small> 
    97102        </div> 
    98103        <br clear="all"> 
    …… 
    106111        </ul> 
    107112         
    108        Holy God, YES. </h3> 
     113</h3> 
    109114 
    110115 
    111116<a name="autoinstall"><br></a> 
    112 <h2>Installing Feed Me Links on Windows, using Internet Explorer</h2> 
    113117 
    114118<div style="width: 440px;"> 
    …… 
    116120 
    117121<p> 
    118         <h3>A. Set up your browser</h3> 
    119         <ul> 
    120                 <li>Make sure your Links Toolbar is showing. If you cannot see it, 
    121                 go to the <b>View > Toolbars > Links</b> menu to make it appear. </li> 
    122                 <li>If the "Links" toolbar isn't fully showing, click and hold on 
    123                 "Links" while moving it to create more space. </li> 
    124                 <li>To remove any unwanted buttons, right click on the name and 
    125                 select "Delete". </li> 
    126         </ul> 
    127  
    128         <h3>B. Run the installer</h3> 
    129         <ul> 
    130                 <li>when the window asks whether you want to "Open" or "Save", choose "Open"</li> 
    131                 <li><a style="font-size: 24pt; color: red; font-weight: bold; text-decoration: underline;" href="/install/InstallBookmarklet.exe">Install Away!</a></li> 
    132         </ul> 
    133  
    134         <h3>C. You're done! Bright moments!</h3> 
    135  
    136122         
    137         <h3>Alternative Browsers: Firefox, Mozilla, Safari, Opera, Netscape, etc!</h3> 
     123        <h3>Firefox, Mozilla, Safari, Opera, Netscape, etc!</h3> 
    138124 
    139125<ul> 

  • feedmelinks/install/traditional-install.php

    r381 r1299  
    44%> 
    55<title> feedmelinks.com : the ADD LINK button </title> 
    6 <% include( "$modules/header.inc.php" ); %> 
     6<%  
     7        $noBody = true; 
     8        include( "$modules/header.inc.php" );  
     9%> 
     10 
     11<script language="javascript"> 
     12 
     13var d=document; var _a=(d.all)?1:0; var l=(!d.getElementById && b.nn)?1:0; 
     14function getE(e,f){if(l){f=(f)?f:self;V=f.document.layers;if(V[e])return V[e];for(W=0;W<V.length;)t=getE(e,V[W++]);return t;}if(_a)return d.all[e];return d.getElementById(e);} 
     15function writeH(e,h){e=getE(e);if(l){Y=e.document;Y.write(h);Y.close();}else e.innerHTML=h;} 
     16 
     17        function remove_onclick_for_all_bookmarklets_on_page( optional_id ) { 
     18 
     19                var e = document.getElementById( "killme" ); 
     20                // isn't working; the href attribute is too long and weird with all the JS, maybe? 
     21                //alert( e.getAttribute( "href" )); 
     22                //e.setAttribute( "href", "#" ); 
     23                //alert( e.getAttribute( "href" )); 
     24                //alert( "remove_onclick_for_all_bookmarklets_on_page called" ); 
     25                // no-up until RP is back up 
     26        } 
     27</script> 
     28 
     29<body onLoad="remove_onclick_for_all_bookmarklets_on_page();"> 
    730 
    831<!-- override the bgcolor cause the screenshots are on white --> 
    …… 
    1437<div style="width: 720px;"> 
    1538 
    16 <h1>Feed Me Links : ADD LINK button.</h1> 
     39<h1>Using Firefox, Mozilla, Safari*, Opera, and Netscape?</h1> 
    1740 
    1841<div style="width: 55em;"> 
    1942 
    20 <div> 
    21 <p> 
    22 <img src="img/the-button.gif" align="right" style="margin-left: 10px;" /> 
    23 <b>Feed Me Links</b> keeps all your links so you can use them from any 
    24 computer or browser. You can share your links with anyone on the 
    25 web and check out what sites other people are linking to.  All of 
    26 this works by adding a new button to your browser called "Add Link". 
    27  
    28  
    29 When you visit on a site you want to remember, just click 'Add 
    30 Link'.  The Feed Me Links gnomes will prompt you to name the link and 
    31 will you save it to a folder of your choosing.  Never easier, you 
    32 salty gumshoe. 
     43<big> 
     44        <ol> 
     45                <li>Drag the "<a title="Add Link" class="bookmarklet" id="killme" href="<%= getBookmarklet() %>">Add Link</a>" button to your browser's links bar: (DRAG, don't click!) 
     46                <li>If you're confused, please see the <a href="/install/traditional-install">detailed instructions</a>.</li> 
     47                <li>Enjoy!</li> 
     48        </ol> 
     49</big> 
    3350 
    3451</p> 
     52 
     53<div style="border: 2px solid red; padding: 1em; margin-top: 2em; margin-bottom: 2em; text-align: center;"> 
     54        <a style="color: white;" href="<%= getBookmarklet() %>"><img src="/img/icon.gif" alt="Add Link" align="middle" border="0" /> Add Link</a><br /> 
     55        <!-- &nbsp; Drag the "Add Link" button to your browser's Links toolbar: --> 
    3556</div> 
    36 <br clear="all" /> 
    37 <br /> 
    3857 
    39 <div style="border: 2px solid red; padding: 1em; margin-top: 2em; margin-bottom: 2em;"> 
    40 <span class="head">To Get It:</span> 
    41 drag the skull to your browser's Links toolbar:  &nbsp; 
     58( * if you see the warning "This link may not be safe", please ignore it. Internet Explorer is not too smart about javascript. ) 
    4259 
    43 <a style="color: white;" href="<%= getBookmarklet() %>"><img src="/img/icon.gif" alt="Add Link" align="middle" border="0" /> Add Link</a><br /> 
     60<!-- <img src="img/the-button.gif" align="right" style="margin-left: 10px;" /> --> 
     61<h3>So what does all this do, now?</h3> 
     62<p> 
     63        Good question.<p/> 
     64        <b>Feed Me Links</b> keeps all your links so you can use them from any 
     65        computer or browser. You can share your links with anyone on the 
     66        web and check out what sites other people are linking to.  All of 
     67        this works by adding a new button to your browser called "Add Link". 
     68</p> 
     69<p> 
     70        When you visit on a site you want to remember, just click 'Add 
     71        Link'.  The Feed Me Links gnomes will prompt you to name the link and 
     72        will you save it to a folder of your choosing.  Never easier, you 
     73        salty gumshoe. 
     74</p> 
    4475 
    45 </div> 
    46 ( * if you see "this link may not be safe", ignore it. Internet Explorer is not too smart about javascript. ) 
     76<p><small> 
     77* Safari users please note -- we have found many issues with Safari on Feed Me Links javascript and with browsing in general. We make an effort to make our code compatible with all browsers, but we've seen several issues in the past that can be traced back to how Safari renders web pages. Caveat Browser.</small></p> 
     78 
     79<h2>Using Internet Explorer on Windows?</h2> 
     80 
     81  <h3>A. Set up your browser</h3> 
     82  <ul> 
     83    <li>Make sure your Links Toolbar is showing. If you cannot see it, 
     84    go to the <b>View > Toolbars > Links</b> menu to make it appear. </li> 
     85    <li>If the "Links" toolbar isn't fully showing, click and hold on 
     86    "Links" while moving it to create more space. </li> 
     87    <li>To remove any unwanted buttons, right click on the name and 
     88    select "Delete". </li> 
     89  </ul> 
     90 
     91  <h3>B. Drag the "Add Link" button to your Links toolbar</h3> 
     92  <ul> 
     93    <li>If the window asks whether you want to "Open" or "Save", choose "Open"</li> 
     94    ("Add Link" button above) 
     95  </ul> 
     96   
     97        <h3>C. All done!</h3> 
     98 
    4799 
    48100<p> 
    49101no software will be installed on your computer, and you will NOT 
    50102need to restart your computer or your browser. No animals were 
    51 harmed in the making of this shhht. </p> </div> 
     103harmed in the making of this. </p> </div> 
    52104 
    53105<h2> 

  • feedmelinks/modules/my-recent.inc.php

    r1177 r1299  
    8080                                <table cellpadding="4" cellspacing="0" width="390"> 
    8181                                        <tr> 
    82                                                 <td class="rowNormal"><br /><center>(<%= $user == $u ? "you have" : "$user has" %> not added any links yet)</center><br /></td> 
     82                                                <td class="rowNormal"><br /><center>(<%= $user == $u ? "You haven't" : "$user hasn't" %> added any links yet)</center><br /></td> 
    8383                                        </tr> 
    8484                        </table> 

  • feedmelinks/modules/recent-with-times.inc.php

    r1290 r1299  
    8383                $tag = mysql_result($q,$i,"tag"); 
    8484                $tagID = mysql_result($q,$i,"tagID"); 
    85                 if( isPublicLine( $id )) { 
     85                if( isPublicLink( $id )) { 
    8686 
    8787                if( $format == "1-per-line" ) { 

  • feedmelinks/modules/utils.inc.php

    r1290 r1299  
    594594    $pi["r34l"] = true; 
    595595    $pi["chrishaney"] = true; 
    596     $pi["fairybel"] = true; 
     596    $pi["rugcarpet"] = true; 
    597597 
    598598    #$pi["rrhobbs"] = true; 
    …… 
    35323532    $class = $class ? "class=\"$class\"" : ""; 
    35333533    $target = $target ? "target=\"$target\"" : ""; 
    3534 %><a <%= $title ? $title : "" %> href="<%= $url %>" <%= $class %> <%= $target %>><%= $text %></a><%= isPrivate( $id ) ? "&#160;" . getLinkLock( $id ) : "" %><% 
     3534%><a <%= $title ? $title : "" %> href="<%= $url %>" <%= $class %> <%= $target %>><%= $text %></a><%= isPrivate( $id ) ? "&#160;"  
     3535        . getLinkLock( $id ) : ""  
     3536        . " " . get_report_link( getOwnerForLink( $id )) %><% 
    35353537  } else if( $id ) { 
    35363538                %><a href="/<%= $id %>"><%= getTitleForLink( $id ) %></a><%  
    …… 
    35383540        $out = ob_get_clean(); 
    35393541        return $out; 
     3542} 
     3543 
     3544function get_report_link( $usr ) { 
     3545        if( ! $usr )  
     3546                return ""; 
     3547        return "[<a href='/diespammersdie/report?user=$usr'>is this spam?</a>]"; 
    35403548} 
    35413549 

  • feedmelinks/right-click.php

    r567 r1299  
    11<% 
    2         echo "FOR OUR RIGHT-CLICKIN' BITCHES"; 
     2        echo "A service for our right-clickin' Windows users!"; 
    33        if( $op != "add" ) { 
    44%> 
    …… 
    3131</script> 
    3232</html> 
    33 <h1>do magical js shit...</h1> 
     33<h1>Do magical Javascript stuff here...</h1> 
    3434 
    3535<!--