Changeset 571 for trunk

Show
Ignore:
Timestamp:
08/01/08 13:53:15 (4 months ago)
Author:
kimparsell
Message:

+ Minor markup changes/cleanup in admin section

Location:
trunk/plog-admin
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • trunk/plog-admin/css/admin.css

    r570 r571  
    155155} 
    156156 
    157 #contentList #breadcrumb_links { 
     157#contentList #breadcrumb_links, #contentList #comment-count { 
    158158        font-size: 1.0em; 
    159159        padding: 3px; 
  • trunk/plog-admin/index.php

    r569 r571  
    1717        <title>' . plog_tr('Plogger Administrative Login') . '</title> 
    1818        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    19         <link href="'.$config['gallery_url'].'plog-admin/css/admin.css" type="text/css" rel="stylesheet" /> 
     19        <link rel="stylesheet" href="'.$config['gallery_url'].'plog-admin/css/admin.css" type="text/css" media="all" /> 
    2020        <script type="text/javascript" src="'.$config['gallery_url'].'plog-admin/js/plogger.js"></script> 
    2121</head> 
  • trunk/plog-admin/plog-admin-functions.php

    r570 r571  
    13821382                        $allow_comments = (1 == plogger_picture_allows_comments()) ? plog_tr("Yes") : plog_tr("No"); 
    13831383                        $output .= "\n\t\t\t\t<td>" . $allow_comments . "</td>"; 
    1384                         $output .= "\n\t\t\t\t" . '<td><a href="?action=edit-picture&amp;id=' . $id; 
     1384                        $output .= "\n\t\t\t\t" . '<td style="text-align: center;"><a href="?action=edit-picture&amp;id=' . $id; 
    13851385                        if (isset($_GET["entries_per_page"])) $output .= '&amp;entries_per_page=' . intval($_GET["entries_per_page"]); 
    13861386                        if (isset($_GET["plog_page"])) $output .= '&amp;plog_page=' . intval($_GET["plog_page"]); 
     
    13881388 
    13891389                        $parent_id = $_REQUEST["id"]; 
    1390                         $output .= '<a href="?action=move-delete&amp;selected%5B%5D=' . $id . '&amp;level=pictures&amp;delete_checked=1&amp;id='.$parent_id; 
     1390                        $output .= '&nbsp;&nbsp;&nbsp;<a href="?action=move-delete&amp;selected%5B%5D=' . $id . '&amp;level=pictures&amp;delete_checked=1&amp;id='.$parent_id; 
    13911391                        if (isset($_GET['plog_page'])) $output .= '&amp;plog_page=' . intval($_GET['plog_page']); 
    13921392                        $output .= '" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete this item?') . '\');"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/x.gif" alt="' . plog_tr('Delete') . '" title="' . plog_tr('Delete') . '" /></a></td>'; 
     
    14641464                        $output .= "\n\t\t\t\t".'<td><a class="folder" href="'.$_SERVER['PHP_SELF'].'?level=pictures&amp;id='.$id.'"><span id="album-name-'.plogger_get_album_id().'"><strong>'.plogger_get_album_name().'</strong></span></a> &#8212; ' . sprintf(plog_tr('contains %d picture(s)'), plogger_album_picture_count()) . '</td>'; 
    14651465                        $output .= "\n\t\t\t\t".'<td><p id="album-description-'.plogger_get_album_id().'">'.plogger_get_album_description().'&nbsp;</p></td>'; 
    1466                         $output .= "\n\t\t\t\t".'<td><a href="'.$_SERVER['PHP_SELF'].'?action=edit-album&amp;id='.$id.'"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/edit.gif" alt="' . plog_tr('Edit') . '" title="' . plog_tr('Edit') . '" /></a>'; 
    1467                         $output .= '<a href="'.$_SERVER['PHP_SELF'].'?action=move-delete&amp;selected%5B%5D='.$id.'&amp;level=albums&amp;delete_checked=1&amp;id='.$_REQUEST['id']; 
     1466                        $output .= "\n\t\t\t\t".'<td style="text-align: center;"><a href="'.$_SERVER['PHP_SELF'].'?action=edit-album&amp;id='.$id.'"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/edit.gif" alt="' . plog_tr('Edit') . '" title="' . plog_tr('Edit') . '" /></a>'; 
     1467                        $output .= '&nbsp;&nbsp;&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=move-delete&amp;selected%5B%5D='.$id.'&amp;level=albums&amp;delete_checked=1&amp;id='.$_REQUEST['id']; 
    14681468                        if (isset($_GET['plog_page'])) { $output .= '&amp;plog_page='.intval($_GET['plog_page']); } 
    14691469                        $output .= '" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete this item?') . '\');"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/x.gif" alt="' . plog_tr('Delete') . '" title="' . plog_tr('Delete') . '" /></a></td>'; 
     
    15371537                        $output .= "\n\t\t\t\t<td><a class='folder' href='?level=albums&amp;id=" .$id . "'><span id='collection-name-" . plogger_get_collection_id()."'><strong>".plogger_get_collection_name()."</strong></span></a> &#8212; " . sprintf(plog_tr('contains %d albums'), plogger_collection_album_count()) . "</td>"; 
    15381538                        $output .= "\n\t\t\t\t<td><p id='collection-description-" . plogger_get_collection_id() . "'>" . plogger_get_collection_description()."&nbsp;</p></td>"; 
    1539                         $output .= "\n\t\t\t\t" . '<td><a href="?action=edit-collection&amp;id=' . $id . '"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/edit.gif" alt="' . plog_tr('Edit') . '" title="' . plog_tr('Edit') . '" /></a>'; 
    1540                         $output .= '<a href="?action=move-delete&amp;selected%5B%5D=' . $id . '&amp;level=collections&amp;delete_checked=1&amp;'; 
     1539                        $output .= "\n\t\t\t\t" . '<td style="text-align: center;"><a href="?action=edit-collection&amp;id=' . $id . '"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/edit.gif" alt="' . plog_tr('Edit') . '" title="' . plog_tr('Edit') . '" /></a>'; 
     1540                        $output .= '&nbsp;&nbsp;&nbsp;<a href="?action=move-delete&amp;selected%5B%5D=' . $id . '&amp;level=collections&amp;delete_checked=1&amp;'; 
    15411541                        if (isset($_REQUEST['id'])) { $output .= 'id='.intval($_REQUEST['id']); } 
    15421542                        if (isset($_GET['plog_page'])) { $output .= '&amp;plog_page=' . intval($_GET['plog_page']); } 
     
    16121612                        $output .= "\n\t\t\t\t<td>" . plogger_get_comment_date("n.j.Y H:i:s") . "</td>"; 
    16131613                        $output .= "\n\t\t\t\t<td><p id=\"comment-comment-" . $id ."\">" . plogger_get_comment_text() . "&nbsp;</p></td>"; 
    1614                         $output .= "\n\t\t\t\t" . '<td><a href="?action=edit-comment&amp;id=' . $id . '"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/edit.gif" alt="' . plog_tr('Edit') . '" title="' . plog_tr('Edit') . '" /></a>'; 
    1615                 $output .= '<a href="?action=delete-comment&amp;id=' . $id . '" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete this item?') . '\');"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/x.gif" alt="' . plog_tr('Delete') . '" title="' . plog_tr('Delete') . '" /></a></td>'; 
     1614                        $output .= "\n\t\t\t\t" . '<td style="text-align: center;"><a href="?action=edit-comment&amp;id=' . $id . '"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/edit.gif" alt="' . plog_tr('Edit') . '" title="' . plog_tr('Edit') . '" /></a>'; 
     1615                $output .= '&nbsp;&nbsp;&nbsp;<a href="?action=delete-comment&amp;id=' . $id . '" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete this item?') . '\');"><img style="display: inline;" src="'.$config['gallery_url'].'plog-admin/images/x.gif" alt="' . plog_tr('Delete') . '" title="' . plog_tr('Delete') . '" /></a></td>'; 
    16161616                        $output .= "\n\t\t\t</tr>"; 
    16171617 
  • trunk/plog-admin/plog-feedback.php

    r570 r571  
    159159                $allowedCommentKeys = array("unix_date", "author", "email", "url", "comment"); 
    160160 
     161                                $output .= "\n\n\t\t" . '<div class="entries-page">'.generate_pagination_view_menu().' 
     162                </div>' . "\n"; 
     163 
     164                                if (!$empty) { $output .= $pagination_menu; } 
     165 
    161166                while($row = mysql_fetch_assoc($result)) { 
    162167                        // if we're on our first iteration, dump the header 
    163168                        if ($counter == 0) { 
    164169                                if ($approved) { 
    165                                         $output .= "\n\n\t\t" . '<table style="width: 100%;"> 
    166                                 <tr> 
    167                                         <td>' . sprintf(plog_tr('You have <strong>%d</strong> user comment(s).'),$num_comments) . '</td>'; 
     170 
     171                                        $output .= "\n\n\t\t" . '<div id="comment-count">' . sprintf(plog_tr('You have <strong>%d</strong> user comment(s).'),$num_comments) . '</div>'; 
     172 
    168173                                } else { 
    169                                         $output .= "\n\n\t\t" . '<table style="width: 100%;"> 
    170                                 <tr> 
    171                                         <td>' . sprintf(plog_tr('You have <strong>%d</strong> user comment(s) awaiting approval.'),$num_comments_im) . '</td>'; 
    172                                 } 
    173  
    174                                 // output view entries pagination control 
    175                                 $output .= "\n\t\t\t\t" . '<td align="right">'.generate_pagination_view_menu().' 
    176                                         </td> 
    177                                 </tr> 
    178                         </table>'; 
    179  
    180                                 if (!$empty) { $output .= $pagination_menu; } 
     174 
     175                                        $output .= "\n\n\t\t" . '<div id="comment-count">' . sprintf(plog_tr('You have <strong>%d</strong> user comment(s) awaiting approval.'),$num_comments_im) . '</div>'; 
     176 
     177                                } 
    181178 
    182179                                $output .= "\n\n\t\t" . '<table style="width: 100%;" cellpadding="4"> 
    183                                 <tr class="header"> 
    184                                         <th class="table-header-left"></th> 
    185                                         <th class="table-header-middle">' . plog_tr('Thumb') . '</th>'; 
     180                        <tr class="header"> 
     181                                <th class="table-header-left"></th> 
     182                                <th class="table-header-middle">' . plog_tr('Thumb') . '</th>'; 
    186183 
    187184                                foreach ($row as $name => $value) { 
     
    192189 
    193190                                $output .= "\n\t\t\t\t" . '<th class="table-header-right">' . plog_tr('Actions') . '</th> 
    194                                 </tr>'; 
     191                        </tr>'; 
    195192                        } 
    196193 
     
    240237                        $query = "?action=edit-comment&amp;pid=$row[id]"; 
    241238                        $output .= "\n\t\t\t\t" . '<td> 
    242                                         <div> 
     239                                        <div style="text-align: center;"> 
    243240                                                <a href="'.$_SERVER['PHP_SELF'].$query.'&amp;entries_per_page='.$_SESSION['entries_per_page'].'&amp;moderate='.$moderate.'"><img src="'.$config['gallery_url'].'plog-admin/images/edit.gif" alt="'.plog_tr('Edit').'" title="'.plog_tr('Edit').'" /></a> 
    244                                                 <a href="'.$_SERVER['PHP_SELF'].'?action=approve-delete&amp;delete_checked=1&amp;selected[]='.$row['id'].'&amp;moderate='.$moderate.'" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete this comment?') . '\');"><img src="'.$config['gallery_url'].'plog-admin/images/x.gif" alt="'.plog_tr('Delete').'" title="'.plog_tr('Delete').'" /></a>'; 
     241                                                &nbsp;&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=approve-delete&amp;delete_checked=1&amp;selected[]='.$row['id'].'&amp;moderate='.$moderate.'" onclick="return confirm(\'' . plog_tr('Are you sure you want to delete this comment?') . '\');"><img src="'.$config['gallery_url'].'plog-admin/images/x.gif" alt="'.plog_tr('Delete').'" title="'.plog_tr('Delete').'" /></a>'; 
    245242 
    246243                        if (!$approved){ 
    247                                 $output .= "\n\t\t\t\t\t\t".'<a href="'.$_SERVER['PHP_SELF'].'?action=approve-delete&amp;approve_checked=1&amp;selected[]='.$row['id'].'&amp;moderate=1" onclick="return confirm(\''.plog_tr('Are you sure you want to approve this comment?').'\');"><img src="'.$config['gallery_url'].'plog-admin/images/new_file.gif" alt="'.plog_tr('Approve').'" title="'.plog_tr('Approve').'" /></a>'; 
     244                                $output .= "\n\t\t\t\t\t\t".'&nbsp;&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=approve-delete&amp;approve_checked=1&amp;selected[]='.$row['id'].'&amp;moderate=1" onclick="return confirm(\''.plog_tr('Are you sure you want to approve this comment?').'\');"><img src="'.$config['gallery_url'].'plog-admin/images/new_file.gif" alt="'.plog_tr('Approve').'" title="'.plog_tr('Approve').'" /></a>'; 
    248245                        } 
    249246 
     
    254251                if ($counter > 0) { 
    255252                        $output .= "\n\t\t\t" . '<tr class="footer"> 
    256                                         <td colspan="9"></td> 
    257                                 </tr> 
    258                         </table>'; 
     253                                <td colspan="9"></td> 
     254                        </tr> 
     255                </table>'; 
    259256                } 
    260257        } 
     
    273270        } 
    274271 
    275         $output .= "\n\n\t\t" . '</div>' . "\n\t\t" . '</form>'. "\n"; 
     272        $output .= "\n\t\t" . '</div>' . "\n\t\t" . '</form>'. "\n"; 
    276273} 
    277274 
  • trunk/plog-admin/plog-manage.php

    r570 r571  
    311311        $totalRows = mysql_result($totalRowsResult,'num_items'); 
    312312 
    313         $pagination_menu = "\n\t\t" . '<div class="entries-page">'.generate_pagination_view_menu().'</div> 
    314                         <div class="pagination">'.generate_pagination("admin", "manage", $plog_page, $totalRows, $_SESSION['entries_per_page'], array("level" => $level, "id" => $id)).' 
    315                 </div>'; 
     313        $pagination_menu = "\n\t\t" . '<div class="entries-page">'.generate_pagination_view_menu().' 
     314                </div> 
     315                <div class="pagination">'.generate_pagination("admin", "manage", $plog_page, $totalRows, $_SESSION['entries_per_page'], array("level" => $level, "id" => $id)).'</div>'; 
    316316 
    317317        $output .= "\n\t\t" . '<form id="contentList" action="'.$_SERVER['PHP_SELF'].'" method="post">';