Changeset 1382

Show
Ignore:
Timestamp:
03/04/07 16:06:19 (2 years ago)
Author:
jm3
Message:
  • cleaned up and CSS-ified the tag-list "batch operations" footer, then made it a header (partly because upon hearing a user request for help, i realized that if you have a tag with more than a screen-full of links, the batch operations buttons will be below the fold)
  • admin script to clean up any lingering import temp files (they're permission rw0000 so they're unreadable by anyone on the server, and they only get saved when the app is in debugging mode, but they shouldn't be cluttering up /tmp)
  • mootools collapse/expand tests -- need to integrate into the new taglist header
  • improved login copy message a tiny bit and added the silly progress bar... i need a new, cooler one'''
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • feedmelinks

    • Property svn:ignore changed from
      .htaccess
      cgi-bin
      cheat
      logs
      portal.php
      testing
      the-lost-urls
      utils.inc.php
      wall-of-ancients.php
      work
      *webalizer*
      _assets
      _profiling
      TODO
      info.php
      setup
      _comments
      local-remote-root
      .DS_Store
      flash
      _logs
      usage
      mint
      cgi-bin
      dev
      please
      usr
      blog
       to
      .htaccess
      cgi-bin
      cheat
      logs
      portal.php
      testing
      the-lost-urls
      utils.inc.php
      wall-of-ancients.php
      work
      *webalizer*
      _assets
      _profiling
      TODO
      info.php
      setup
      _comments
      local-remote-root
      .DS_Store
      flash
      _logs
      usage
      mint
      cgi-bin
      dev
      please
      usr
      blog
      xfer

  • feedmelinks/.cvsignore

    r1329 r1382  
    2727usr 
    2828blog 
     29xfer 

  • feedmelinks/admin/index.php

    r1360 r1382  
    3535                <li><a href="/admin/allow-unlimited-imports-from">allow unlimited imports from: FIXME: not yet implemented</a></li> 
    3636                <li><a href="/admin/disable-user">disable/enable/expire user</a></li> 
     37                <li><a href="/admin/delete-errant-cached-imports.php">delete errant cached imports</a></li> 
    3738                <li><a href="/admin/expire-old-users">expire old users</a></li> 
    3839                <li><a href="/admin/delete-all-comments-from-spammer">delete all comments from spammer</a></li> 

  • feedmelinks/bin/import-bookmarks.pl

    r1375 r1382  
    22use lib "/home/fml/public_html/lib"; 
    33use FeedMeLinks::Environment; 
    4 use File::Temp qw/ :mktemp  /; 
    54 
    65$glc = 0; 

  • feedmelinks/folder.php

    r1365 r1382  
    196196?> 
    197197<br /> 
    198 <br /> 
    199198<?php } ?> 
    200199 
    …… 
    225224<script language="javascript" type="text/javascript" src="/script/bulk-management.js"></script> 
    226225<form method="post" action="/action" name="folderForm"> 
    227         &nbsp; (<a href="/edit-folder?op=edit&id=<?= $id ?>&name=<?= urlencode( $fName ) ?>&options=">click to edit this <?= getCatName() ?>'s name or privacy</a>) 
     226        &nbsp; (<a href="/edit-folder?op=edit&id=<?= $id ?>&name=<?= urlencode( $fName ) ?>&options=">click to rename '<?= $fName ?>' or change its privacy settings</a>) 
    228227        <p /> 
    229228 
    …… 
    236235<div class="box"> 
    237236        <div class="subhead"> 
     237        <div style='float: left;'> 
    238238<?php if( $public && (!$owned)) { ?> 
    239         <a class="link" href="/u/<?= $owner ?>"><?= $owner ?>'s <?= getCatsName() ?></a> 
     239        <a class="hot" href="/u/<?= $owner ?>"><?= $owner ?>'s <?= getCatsName() ?></a> 
    240240<?php } else { ?> 
    241         <a class="link" href="/index">my <?= getCatsName() ?></a>  
     241        <a class="hot" href="/index">my <?= getCatsName() ?></a>  
    242242<?php } ?> / <b><?= makePrettyFolderName( getNameForFolder( $folder )) ?></b> 
    243243<?php  
    …… 
    277277<?php } ?> 
    278278</small> 
     279</div> 
    279280 
    280281<?php  
    281282        if( $owned ) { 
    282283                if( !$condensed ) { ?> 
     284                <div style='float: right'> 
    283285<small>&nbsp;select all:</small><input style="margin-bottom: -1px;" type="checkbox" name="selectAll" onChange="selectAllLinks(document.forms.folderForm);"/> 
     286</div> 
    284287<?php } ?> 
    285288<?php } else if( ! $condensed ) { ?> 
    …… 
    287290        snatch 
    288291<?php } ?> 
     292<br/> 
    289293        </div> 
     294 
     295 
    290296<!-- end row --> 
    291297 
    292298<?php 
     299        include( "$modules/tag-list-header.inc.php" ); 
    293300        $i = 0; 
    294301 
    …… 
    339346?> 
    340347<!-- start row --> 
    341 <div style="padding: 4px;" class="<?= $bg ?>"> 
     348<div class="<?= $bg ?> tl"> 
    342349<?php 
    343350        if( strlen( $name ) > $MAX_NAME_LENGTH ) { 
    …… 
    382389<?php 
    383390if( $owned && !$condensed) { ?> 
    384 <!-- start row --> 
    385 <div class="r1 last"> 
    386  
    387         <?= getCatVerb() ?> selected links as:  
    388         <select name="newFolderID"> 
    389         <?php include( "$modules/folder-menu.inc.php" ); ?> 
    390         </select> 
    391         <input type="hidden" name="op" value="tag" /> 
    392         <input type="hidden" name="debug" value="<?= $debug ?>" /> 
    393         <input type="hidden" name="folderID" value="<?= $folder ?>" /> 
    394         <input class="button" type="button" name="tagButton" value="tag" onClick="tagSelected()"/> 
    395 </div> 
    396  
    397 <div class="r1 last"> 
    398         make selected links: 
    399         <input class="button" type="button" name="makePrivateButton" value="private"  
    400                 onClick="privatizeSelected()"/> 
    401         /  
    402         <input class="button" type="button" name="makePublicButton" value="public"  
    403                 onClick="publicizeSelected()"/> 
    404          
    405         &nbsp;<input class="button" type="button" name="deleteButton" value="delete selected"  
    406                 onClick="deleteSelected()"/> 
    407  
    408         &nbsp;<input class="button" type="button" name="untagButton" value="untag selected"  
    409                 onClick="untagSelected()"/> 
    410 </div> 
    411  
    412 <br> 
    413391 
    414392<?php 
    …… 
    470448<?php } 
    471449        if( !$condensed && !$errors && !$numRows ) {  
    472                 echo  "$numRows $tag what"; 
    473450 
    474451?> 

  • feedmelinks/login.php

    r1360 r1382  
    5151        <small> 
    5252                <small> 
    53                         <small> 
    5453                                <br /> 
    55                                 logging you in... hol' up! 
    56                         </small> 
     54                                        Loading your links... 
    5755                </small> 
    5856        </small> 
     57        <br /> 
     58        <img src="/img/aqua-progressbar.gif" /> 
    5959</div> 
    6060<?php 

  • feedmelinks/modules/folder-menu.inc.php

    r1334 r1382  
    55        if( $tok && $tok == md5( getPasswdForUser( $u )) ) { 
    66 
    7         $qs = "SELECT * from tags where userid = '$sessionUserId' ORDER BY name"; 
     7        $qs_sub = "SELECT * from tags where userid = '$sessionUserId' ORDER BY name"; 
    88        $folderMenuCon = mysql_connect(); 
    9         mysql_selectdb( getDBName() ); 
    109 
    11         $q = mysql_query( $qs ); 
    12         $numRows = mysql_num_rows($q); 
    13         if( $numRows ) { 
     10        $q_sub = mysql_query( $qs_sub ); 
     11        $rows_sub = mysql_num_rows($q_sub); 
     12        if( $rows_sub ) { 
    1413%> 
    1514 
    16       <option value=""> - </option> 
    17       <option value="unfiled"> &lt;unfiled&gt; </option> 
     15      <option value=""> (Choose a tag) </option> 
     16      <!-- option value="unfiled"> &lt;unfiled&gt; </option --> 
    1817<% 
    1918                $i = 0; 
    20                 while ($i < $numRows) { 
    21                         $id = mysql_result($q,$i,"ID"); 
    22                         $isPrivate = mysql_result($q,$i,"isPrivate"); 
    23                         $folderName = makeSafeName( mysql_result($q,$i,"name")); 
     19                while ($i < $rows_sub) { 
     20                        $id = mysql_result($q_sub,$i,"ID"); 
     21                        $isPrivate = mysql_result($q_sub,$i,"isPrivate"); 
     22                        $folderName = makeSafeName( mysql_result($q_sub,$i,"name")); 
    2423 
    2524      # we use our own hashtables instead of the raw DB,  
    …… 
    2726      if( ! $isPrivate ) { 
    2827        $folderName = makePrettyFolderName( $folderName ); 
    29                                 $folderName = $folderName . " (pub)"; 
     28                        } else { 
     29                                $folderName .= " (private)"; 
    3030                        } 
    3131                        $groups[$id] =  $folderName; 

  • feedmelinks/style/main.css

    r1381 r1382  
    165165        margin: 0px; 
    166166        font-size: 9px; 
     167} 
     168 
     169medbutton, input.medbutton { 
     170        background-color: #FF6600; 
     171        color: white; 
     172        font-family: inherit; 
     173        padding: 3px; 
     174        margin: 1px; 
     175        font-size: 10px; 
    167176} 
    168177 
    …… 
    384393        padding-left: 0px; 
    385394} 
     395 
     396#re_tag_menu { 
     397        float: right; 
     398} 
     399 
     400#taglist_header { 
     401        height: 8.0em; 
     402        padding-right: 1.0em; 
     403        padding-left: 0.7em; 
     404        padding-top: 1.0em; 
     405} 
     406 
     407#taglist_header .button_group { 
     408        float: right; 
     409} 
     410 
     411#taglist_header .header { 
     412        float: left; 
     413} 
     414 
     415/* taglist r0 and r1 rows */ 
     416div.tl { 
     417        padding: 4px; 
     418} 

  • feedmelinks/user/re-enable.php

    r1360 r1382  
    2121        re_enable_user( $u ); 
    2222        $site = getSiteURL(); 
    23         fire(  "User $u returning!", "We automatically re-enabled them. $site/u/$u\n\n--\nFML Robot" ); 
     23        fire(  "User $u ($user) returning!", "We automatically re-enabled them. $site/u/$u\n\n--\nFML Robot" ); 
    2424?> 
    2525<h1>Welcome back <?= $u ?>, we're glad to have you!</h1>