Changeset 1839

Show
Ignore:
Timestamp:
05/25/08 17:02:26 (8 months ago)
Author:
freakerz
Message:

Merging r1837 to this branch.

Location:
branches/acl
Files:
46 modified

Legend:

Unmodified
Added
Removed

  • branches/acl/3rdparty/humanmsg/humanmsg.css

    r1742 r1839  
    11/* 
    2     HUMANIZED MESSAGES 1.0 
     2    HUMANIZED MESSAGES 1.0 - Habari Edition 
    33    idea - http://www.humanized.com/weblog/2006/09/11/monolog_boxes_and_transparent_messages 
    44    home - http://humanmsg.googlecode.com 
    … …  
    1010 
    1111.humanMsg { 
    12     font: normal 20px/50px Helvetica, Arial, Sans-Serif; 
    13     letter-spacing: -1px; 
     12    font: normal 12px Helvetica, Arial, Sans-Serif; 
    1413    position: fixed; 
    15     top: 130px; 
    16     left: 25%; 
    17     width: 50%; 
     14    top: 40px; 
     15    left: 10px; 
     16    width: 30%; 
    1817    color: white; 
    19     text-align: center; 
    20     z-index: 100000; 
     18    text-align: left; 
     19    z-index: 900; 
    2120    display: none; 
     21    padding: 0px; 
    2222} 
    2323 
    24 .humanMsg .round { 
    25     border-left: solid 2px white; 
    26     border-right: solid 2px white; 
    27     font-size: 1px; height: 2px; 
     24.humanMsg .imsgs .msg { 
     25    padding: 10px; 
     26    background-color: black; 
     27    -webkit-border-radius: 5px; 
     28    -moz-border-radius: 5px; 
     29    -webkit-box-shadow: 0px 1px 5px #333; 
     30    margin-bottom: 5px; 
    2831    } 
    2932 
    3033.humanMsg p { 
    31     padding: .3em; 
    3234    display: inline; 
    3335    } 
    3436 
     37.humanMsg p a { 
     38    color: #19a5d1; 
     39    } 
     40 
    3541.humanMsg .imsgs .msg { 
    36     margin-bottom: 5px; 
    37     background-color: black; 
    3842    display: none; 
    3943    opacity: 0; 
    4044    } 
    41  
    4245 
    4346#humanMsgLog { 

  • branches/acl/3rdparty/humanmsg/humanmsg.js

    r1742 r1839  
    4242        // Inject message 
    4343        $('#'+humanMsg.msgID).show(); 
    44         $('<div class="msg"><div class="round" id="msgid_"' + humanMsg.msgcount + '></div><p>' + msg + '</p><div class="round"></div></div>') 
     44        $('<div class="msg" id="msgid_' + humanMsg.msgcount + '"><p>' + msg + '</p></div>') 
    4545        .appendTo('#'+humanMsg.msgID+' .imsgs') 
    4646        .show().animate({ opacity: humanMsg.msgOpacity}, 200, function() { 

  • branches/acl/index.php

    r1742 r1839  
    129129    if ( !defined( 'DEBUG' ) ) define( 'DEBUG', false ); 
    130130 
    131     // Set the locale. 
    132     if ( isset($locale) ) { 
    133         Locale::set( $locale ); 
    134     } 
    135  
    136131    // Make sure we have a DSN string and database credentials. 
    137132    // $db_connection is an array with necessary informations to connect to the database. 
    … …  
    167162/* Habari is installed and we established a connection with the database */ 
    168163 
     164// Set the locale from database 
     165if ( @ Options::get('locale') ) { 
     166    Locale::set( Options::get('locale') ); 
     167} 
     168 
    169169// Verify if the database has to be upgraded. 
    170170if ( Version::requires_upgrade() ) { 

  • branches/acl/system/admin/comments.php

    r1792 r1839  
    22 
    33<div class="container navigator"> 
    4     <span class="older pct10"><a href="#" onclick="timeline.skipLoupeLeft();return false">&laquo; Older</a></span> 
    5     <span class="currentposition pct15 minor">0 of 0</span> 
    6     <span class="search pct50"><input type="search" placeholder="Type and wait to search for any comment component" autosave="habaricontent" results="10" value="<?php echo $search_args ?>"></span> 
     4    <span class="older pct10"><a href="#" onclick="timeline.skipLoupeLeft();return false">&laquo; <?php _e('Older'); ?></a></span> 
     5    <span class="currentposition pct15 minor"><?php _e('0 of 0'); ?></span> 
     6    <span class="search pct50"><input type="search" placeholder="<?php _e('Type and wait to search for any comment component'); ?>" autosave="habaricontent" results="10" value="<?php echo $search_args ?>"></span> 
    77    <span class="nothing pct15">&nbsp;</span> 
    8     <span class="newer pct10"><a href="#" onclick="timeline.skipLoupeRight();return false">Newer &raquo;</a></span> 
     8    <span class="newer pct10"><a href="#" onclick="timeline.skipLoupeRight();return false"><?php _e('Newer'); ?> &raquo;</a></span> 
    99 
    1010    <div class="timeline"> 
    … …  
    3838        <div class="item controls"> 
    3939            <span class="checkboxandselected pct25"> 
    40                 <input type="checkbox"></input> 
    41                 <span class="selectedtext minor none">None selected</span> 
     40                <input type="checkbox"> 
     41                <span class="selectedtext minor none"><?php _e('None selected'); ?></span> 
    4242            </span> 
    4343            <span class="buttons"> 
    44                 <input type="submit" name="do_delete" value="Delete" class="deletebutton"></input> 
    45                 <input type="submit" name="do_spam" value="Spam" class="spambutton"></input> 
    46                 <input type="submit" name="do_unapprove" value="Unapprove" class="spambutton"></input> 
    47                 <input type="submit" name="do_approve" value="Approve" class="approvebutton"></input> 
     44                <input type="submit" name="do_delete" value="<?php _e('Delete'); ?>" class="deletebutton"> 
     45                <input type="submit" name="do_spam" value="<?php _e('Spam'); ?>" class="spambutton"> 
     46                <input type="submit" name="do_unapprove" value="<?php _e('Unapprove'); ?>" class="spambutton"> 
     47                <input type="submit" name="do_approve" value="<?php _e('Approve'); ?>" class="approvebutton"> 
    4848            </span> 
    4949        </div> 
    … …  
    6161    <div class="item controls"> 
    6262        <span class="checkboxandselected pct25"> 
    63             <input type="checkbox"></input> 
    64             <span class="selectedtext minor none">None selected</span> 
     63            <input type="checkbox"> 
     64            <span class="selectedtext minor none"><?php _e('None selected'); ?></span> 
    6565        </span> 
    6666        <span class="buttons"> 
    67             <input type="submit" name="do_delete" value="Delete" class="deletebutton"></input> 
    68             <input type="submit" name="do_spam" value="Spam" class="spambutton"></input> 
    69             <input type="submit" name="do_unapprove" value="Unapprove" class="spambutton"></input> 
    70             <input type="submit" name="do_approve" value="Approve" class="approvebutton"></input> 
     67            <input type="submit" name="do_delete" value="<?php _e('Delete'); ?>" class="deletebutton"> 
     68            <input type="submit" name="do_spam" value="<?php _e('Spam'); ?>" class="spambutton"> 
     69            <input type="submit" name="do_unapprove" value="<?php _e('Unapprove'); ?>" class="spambutton"> 
     70            <input type="submit" name="do_approve" value="<?php _e('Approve'); ?>" class="approvebutton"> 
    7171        </span> 
    7272    </div> 

  • branches/acl/system/admin/comments_items.php

    r1792 r1839  
    44    <div class="head clear"> 
    55        <span class="checkboxandtitle pct25"> 
    6             <input type="checkbox" class="checkbox" name="comment_ids[<?php echo $comment->id; ?>]" id="comments_ids[<?php echo $comment->id; ?>]" value="1"></input> 
     6            <input type="checkbox" class="checkbox" name="comment_ids[<?php echo $comment->id; ?>]" id="comments_ids[<?php echo $comment->id; ?>]" value="1"> 
    77            <?php if($comment->url != ''): ?> 
    88            <a href="#" class="author"><?php echo $comment->name; ?></a> 
    … …  
    1111            <?php endif; ?> 
    1212        </span> 
    13         <span class="entry pct30"><span class="dim">in '</span><a href="<?php echo $comment->post->permalink ?>#comment-<?php echo $comment->id; ?>"><?php echo $comment->post->title; ?></a><span class="dim">'</span></span> 
    14     <span class="time pct10"><a href="#"><span class="dim">at</span> <?php echo date('H:i', strtotime($comment->date));?></a></span> 
    15     <span class="date pct15"><a href="#"><span class="dim">on</span> <?php echo date('M d, Y', strtotime($comment->date));?></a></span> 
     13        <span class="entry pct30"><span class="dim"><?php _e('in'); ?> '</span><a href="<?php echo $comment->post->permalink ?>#comment-<?php echo $comment->id; ?>"><?php echo $comment->post->title; ?></a><span class="dim">'</span></span> 
     14    <span class="time pct10"><a href="#"><span class="dim"><?php _e('at'); ?></span> <?php echo date('H:i', strtotime($comment->date));?></a></span> 
     15    <span class="date pct15"><a href="#"><span class="dim"><?php _e('on'); ?></span> <?php echo date('M d, Y', strtotime($comment->date));?></a></span> 
    1616        <ul class="dropbutton"> 
    17             <li><a href="#" onclick="itemManage.update(<?php echo $comment->id; ?>, 'delete');return false;">Delete</a></li> 
    18             <li><a href="#" onclick="itemManage.update(<?php echo $comment->id; ?>, 'spam');return false;">Spam</a></li> 
    19             <li><a href="#" onclick="itemManage.update(<?php echo $comment->id; ?>, 'approve');return false;">Approve</a></li> 
    20             <li><a href="#" onclick="itemManage.update(<?php echo $comment->id; ?>, 'unapprove');return false;">Unapprove</a></li> 
    21             <li><a href="#">Edit</a></li> 
     17            <li><a href="#" onclick="itemManage.update(<?php echo $comment->id; ?>, 'delete');return false;"><?php _e('Delete'); ?></a></li> 
     18            <li><a href="#" onclick="itemManage.update(<?php echo $comment->id; ?>, 'spam');return false;"><?php _e('Spam'); ?></a></li> 
     19            <li><a href="#" onclick="itemManage.update(<?php echo $comment->id; ?>, 'approve');return false;"><?php _e('Approve'); ?></a></li> 
     20            <li><a href="#" onclick="itemManage.update(<?php echo $comment->id; ?>, 'unapprove');return false;"><?php _e('Unapprove'); ?></a></li> 
     21            <li><a href="#"><?php _e('Edit'); ?></a></li> 
    2222        </ul> 
    2323    </div> 

  • branches/acl/system/admin/css/admin.css

    r1792 r1839  
    318318    } 
    319319 
     320.wideitems .item { 
     321    margin-left: -40px; 
     322    padding-left: 5px; 
     323    margin-right: -40px; 
     324    padding-right: 5px; 
     325    } 
     326 
    320327span.dim { 
    321328    font-weight: normal; 
    … …  
    517524 
    518525.viewpost { 
    519     display: none; /* Temp */ 
     526    float: right; 
    520527    } 
    521528 
    … …  
    751758    } 
    752759     
    753 .dashboard .logsmodule { 
    754     position: relative; 
    755     float: left; 
    756     width: 100%; 
    757     height: 260px; 
    758 } 
    759  
    760760.dashboard .module .modulecore, 
    761761.dashboard .module .optionswindow { 
    … …  
    961961 
    962962 
     963/* LOGS */ 
     964 
     965body.page-logs .time, body.page-logs .user, body.page-logs .ip, body.page-logs .module, body.page-logs .severity { 
     966admin   white-space: nowrap; 
     967    overflow: hidden; 
     968    text-overflow: ellipsis; 
     969    } 
     970 
     971body.page-logs .item select { 
     972    margin-right: 10px; 
     973    } 
     974 
     975body.page-logs .item { 
     976    padding: 3px 0 3px 2px; 
     977    } 
     978 
     979body.page-logs .item input[type=checkbox] { 
     980    margin-left: 10px; 
     981    } 
     982 
     983 
     984/* OPTIONS */ 
     985 
     986body.page-options .item { 
     987    padding: 1px; 
     988    border: none; 
     989    } 
     990 
     991 
    963992/* NAVIGATION */ 
    964993 
    … …  
    9751004/* PLUGINS */ 
    9761005 
     1006.plugins .item { 
     1007    padding-left: 40px; 
     1008    padding-right: 40px; 
     1009    } 
     1010 
     1011.plugins .item .dropbutton { 
     1012    right: 40px !important; 
     1013    } 
     1014 
    9771015.plugins .item:hover { 
    978     background: #eee; 
     1016    background: #dfdfdf; 
    9791017    } 
    9801018 
    … …  
    9871025    margin: 0; 
    9881026    width: 70%; 
     1027    } 
     1028 
     1029.plugins #pluginconfigure { 
     1030    clear: both; 
    9891031    } 
    9901032 
    … …  
    14851527    } 
    14861528 
     1529 
     1530/* FOOTER */ 
     1531 
     1532#footer { 
     1533    margin: 35px 0; 
     1534    text-align: center; 
     1535    } 
     1536 
     1537#footer p { 
     1538    white-space: nowrap; 
     1539    padding: 7px 15px; 
     1540    background: #e3e3e3; 
     1541    -webkit-border-radius: 5px; 
     1542    -moz-border-radius: 5px; 
     1543    display: inline; 
     1544    } 
     1545 
     1546#footer a, #footer span { 
     1547    font-size: 11px; 
     1548    color: #888; 
     1549    } 
     1550 
     1551#footer a { 
     1552    font-weight: bold; 
     1553    color: #777; 
     1554    } 
     1555 
     1556#footer .middot { 
     1557    padding: 0 5px; 
     1558    color: #aaa; 
     1559    } 
     1560 
     1561     
    14871562/* OPACITY PERCENTAGES */ 
    14881563.opa0 { opacity: 0; } 

  • branches/acl/system/admin/dash_latestcomments.php

    r1742 r1839  
    22 
    33<div class="modulecore"> 
    4     <h2>Latest Comments</h2> 
     4    <h2><a href="<?php Site::out_url('admin'); ?>/comments"><?php _e('Latest Comments'); ?></a></h2> 
    55 
    66    <div class="handle">&nbsp;</div> 
    … …  
    3636 
    3737<div class="optionswindow"> 
    38     <h2>Latest Comments</h2> 
     38    <h2><?php _e('Latest Comments'); ?></h2> 
    3939 
    4040    <div class="handle">&nbsp;</div> 
    … …  
    4242    <div class="optionscontent"> 
    4343        <p> 
    44             <label for="dummy" class="pct30"># of Entries</label> 
     44            <label for="dummy" class="pct30"><?php _e('# of Entries'); ?></label> 
    4545            <select class="pct55"> 
    4646                <option>10</option> 
    … …  
    4949 
    5050        <p class="buttons"> 
    51             <input type="submit" value="Submit"> 
     51            <input type="submit" value="<?php _e('Submit'); ?>"> 
    5252        </p> 
    5353    </div> 

  • branches/acl/system/admin/dash_latestentries.php

    r1792 r1839  
    22 
    33<div class="modulecore"> 
    4     <h2>Latest Entries</h2> 
     4    <h2><a href="<?php Site::out_url('admin'); ?>/entries?type=1"><?php _e('Latest Entries'); ?></a></h2> 
    55 
    66    <div class="handle">&nbsp;</div> 
    … …  
    1111        <li class="item clear"> 
    1212            <span class="date pct15 minor"><a href="<?php echo URL::get('display_entries_by_date', array('year' => date('Y', strtotime($post->pubdate)), 'month' => date('m', strtotime($post->pubdate)), 'day' => date('d', strtotime($post->pubdate)))); ?>" title="<?php printf(_t('Posted at %1$s'), date('g:m a \o\n F jS, Y', strtotime($post->pubdate))); ?>"><?php echo date('M j', strtotime($post->pubdate)); ?></a></span> 
    13             <span class="title pct75"><a href="<?php echo $post->permalink; ?>"><?php echo $post->title; ?></a> <a class="minor" href="<?php Site::out_url('habari'); ?>/admin/user/<?php echo $post->author->username; ?>">by <?php echo $post->author->displayname ? $post->author->displayname : $post->author->username; ?></a></span> 
     13            <span class="title pct75"><a href="<?php echo $post->permalink; ?>"><?php echo $post->title; ?></a> <a class="minor" href="<?php Site::out_url('habari'); ?>/admin/user/<?php echo $post->author->username; ?>"> <?php _e('by'); ?> <?php echo $post->author->displayname; ?></a></span> 
    1414            <span class="comments pct10"><a href="<?php echo $post->permalink; ?>#comments"><?php echo $post->comments->approved->count; ?></a></span> 
    1515        </li> 
    … …  
    2020 
    2121<div class="optionswindow"> 
    22     <h2>Latest Entries</h2> 
     22    <h2><?php _e('Latest Entries'); ?></h2> 
    2323 
    2424    <div class="handle">&nbsp;</div> 
    … …  
    2626    <div class="optionscontent"> 
    2727        <p> 
    28             <label for="dummy" class="pct30"># of Entries</label> 
     28            <label for="dummy" class="pct30"><?php _e('# of Entries'); ?></label> 
    2929            <select class="pct55"> 
    3030                <option>10</option> 
    … …  
    3333 
    3434        <p class="buttons"> 
    35             <input type="submit" value="Submit"> 
     35            <input type="submit" value="<?php _e('Submit'); ?>"> 
    3636        </p> 
    3737    </div> 

  • branches/acl/system/admin/dash_logs.php

    r1742 r1839  
    11<div class="options">&nbsp;</div> 
    22<div class="modulecore"> 
    3     <h2>Activity Logs</h2> 
     3    <h2><a href="<?php Site::out_url('admin'); ?>/logs"><?php _e('Activity Logs'); ?></a></h2> 
    44    <div class="handle">&nbsp;</div> 
    55    <ul class="items"> 
    6         <?php foreach( eventlog::get( array( 'limit' => 10 ) ) as $log ) { ?> 
     6        <?php foreach( eventlog::get( array( 'limit' => 8 ) ) as $log ) { ?> 
    77            <li class="item clear"> 
    8                 <span class="date pct15 minor"><?php echo Format::nice_date( $log->timestamp, 'F j, Y' ); ?></span> 
    9                 <span class="title pct15"><?php echo $log->type; ?></span> 
    10                 <span class="pct70"><?php echo $log->message; ?></span> 
     8                <span class="date pct15 minor"><?php echo Format::nice_date( $log->timestamp, 'F j' ); ?></span> 
     9                <span class="message pct85 minor"><?php echo $log->message; ?></span> 
    1110            </li> 
    1211        <?php } ?> 
    … …  
    1413</div> 
    1514<div class="optionswindow"> 
    16     <h2>Activity Logs</h2> 
     15    <h2><?php _e('Activity Logs'); ?></h2> 
    1716 
    1817    <div class="handle">&nbsp;</div> 
    … …  
    2019    <div class="optionscontent"> 
    2120        <p> 
    22             <label for="dummy" class="pct30"># of Log Entries</label> 
     21            <label for="dummy" class="pct30"><?php _e('# of Log Entries'); ?></label> 
    2322            <select class="pct55"> 
    2423                <option>10</option> 
    … …  
    2726 
    2827        <p class="buttons"> 
    29             <input type="submit" value="Submit"> 
     28            <input type="submit" value="<?php _e('Submit'); ?>"> 
    3029        </p> 
    3130    </div> 

  • branches/acl/system/admin/db_profiling.php

    r865 r1839  
    3737</style> 
    3838<div class="prof_container"> 
    39 <h1 class="prof_header">DB Profiling</h1> 
     39<h1 class="prof_header"><?php _e('DB Profiling'); ?></h1> 
    4040<?php 
    4141$profiles= DB::get_profiles(); 
    … …  
    4545<div> 
    4646<code class="prof_sql"><?php echo $profile->query_text;?></code> 
    47 <div class="prof_time">Time to Execute: <strong><?php echo $profile->total_time;?></strong></div> 
     47<div class="prof_time"><?php _e('Time to Execute:'); ?> <strong><?php echo $profile->total_time;?></strong></div> 
    4848<?php if (! empty($profile->backtrace)) {?> 
    49 <pre style="text-align: left;"><strong>BACKTRACE:</strong><br><?php print_r($profile->backtrace);?></pre> 
     49<pre style="text-align: left;"><strong><?php _e('BACKTRACE:'); ?></strong><br><?php print_r($profile->backtrace);?></pre> 
    5050<?php }?> 
    5151</div> 
    … …  
    5454} 
    5555?> 
    56 <div class="prof_time_total">Total Time Executing Queries: <?php echo $total_time_querying;?></div> 
     56<div class="prof_time_total"><?php _e('Total Time Executing Queries:'); ?> <?php echo $total_time_querying;?></div> 
    5757</div> 
    5858<?php 

  • branches/acl/system/admin/entries.php

    r1792 r1839  
    33 
    44<div class="container navigator"> 
    5     <span class="older pct10"><a href="#" onclick="timeline.skipLoupeLeft();return false">&laquo; Older</a></span> 
    6     <span class="currentposition pct15 minor">0-0 of 0</span> 
    7     <span class="search pct50"><input type="search" placeholder="Type and wait to search for any entry component" autosave="habaricontent" results="10" value="<?php echo $search_args ?>"></span> 
     5    <span class="older pct10"><a href="#" onclick="timeline.skipLoupeLeft();return false">&laquo; <?php _e('Older'); ?></a></span> 
     6    <span class="currentposition pct15 minor"><?php _e('0-0 of 0'); ?></span> 
     7    <span class="search pct50"><input type="search" placeholder="<?php _e('Type and wait to search for any entry component'); ?>" autosave="habaricontent" results="10" value="<?php echo $search_args ?>"></span> 
    88    <span class="nothing pct15">&nbsp;</span> 
    9     <span class="newer pct10"><a href="#" onclick="timeline.skipLoupeRight();return false">Newer &raquo;</a></span> 
     9    <span class="newer pct10"><a href="#" onclick="timeline.skipLoupeRight();return false"><?php _e('Newer'); ?> &raquo;</a></span> 
    1010 
    1111    <div class="timeline"> 
    … …  
    3838 
    3939    <div class="item controls"> 
    40         <input type="hidden" name="nonce" id="nonce" value="<?php echo $wsse['nonce']; ?>"></input> 
    41         <input type="hidden" name="timestamp" id="timestamp" value="<?php echo $wsse['timestamp']; ?>"></input> 
    42         <input type="hidden" name="PasswordDigest" id="PasswordDigest" value="<?php echo $wsse['digest']; ?>"></input> 
     40        <input type="hidden" name="nonce" id="nonce" value="<?php echo $wsse['nonce']; ?>"> 
     41        <input type="hidden" name="timestamp" id="timestamp" value="<?php echo $wsse['timestamp']; ?>"> 
     42        <input type="hidden" name="PasswordDigest" id="PasswordDigest" value="<?php echo $wsse['digest']; ?>"> 
    4343        <span class="pct25"> 
    44             <input type="checkbox"></input> 
    45             <span class="selectedtext minor none">None selected</span> 
     44            <input type="checkbox"> 
     45            <span class="selectedtext minor none"><?php _e('None selected'); ?></span> 
    4646        </span> 
    4747        <select class="actiondropdown"> 
    48             <option value="1">Delete</option> 
     48            <option value="1"><?php _e('Delete'); ?></option> 
    4949        </select> 
    50         <input type="button" value="Submit" class="submitbutton"> 
     50        <input type="button" value="<?php _e('Submit'); ?>" class="submitbutton"> 
    5151    </div> 
    5252 

  • branches/acl/system/admin/entries_items.php