Changeset 2841

Show
Ignore:
Timestamp:
11/07/08 19:51:36 (5 years ago)
Author:
vdigital
Message:

merge -c2840 from branch 2.0 to trunk
New: Extend of available fields within a category page for a template-extension simple usage.
Refer to topic: "Smoothgallery plugin" where no plugin is requested to do it.
Minor: Some format in Sylvia theme

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/include/category_default.inc.php

    r2515 r2841  
    113113      'ICON_TS'      => get_icon($row['date_available']), 
    114114      'URL'    => $url, 
     115 
     116   /* Fields for template-extension usage */ 
     117      'FILE_PATH' => $row['path'], 
     118      'FILE_POSTED' => format_date($row['date_available'], 'mysql_datetime'), 
     119      'FILE_CREATED' => (empty($row['date_creation'])) ?  
     120        '-': format_date($row['date_creation'], 'mysql_datetime'), 
     121      'FILE_DESC' => (empty($row['comment'])) ? '-' : $row['comment'], 
     122      'FILE_AUTHOR' => (empty($row['author'])) ? '-' : $row['author'], 
     123      'FILE_HIT' => $row['hit'], 
     124      'FILE_SIZE' => (empty($row['filesize'])) ? '-' : $row['filesize'], 
     125      'FILE_WIDTH' => (empty($row['width'])) ? '-' : $row['width'], 
     126      'FILE_HEIGHT' => (empty($row['height'])) ? '-' : $row['height'], 
     127      'FILE_METADATE' => (empty($row['date_metadata_update'])) ?  
     128        '-': format_date($row['date_metadata_update'], 'mysql_datetime'), 
     129      'FILE_RATE' => (empty($row['rate'])) ? '-' : $row['rate'],  
     130      'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ?  
     131                true:false, /* lack of include/functions_picture.inc.php */ 
    115132    ); 
    116133 
  • trunk/template/yoga/theme/Sylvia/theme.css

    r2795 r2841  
    3939} 
    4040#mbIdentification p, .totalImages {  
    41         color: #333;  
     41        color:#333;  
    4242} 
    4343.header_msgs {  
     
    103103} 
    104104#menubar UL {  
    105         color: #333;  
     105        color:#333;  
    106106        font-size: 16px;  
    107107        line-height: 15px;  
     
    228228}  
    229229.infos {  
    230         color: #f70;  
     230        color:#f70;  
    231231        border:0;  
    232232        background-color: transparent;  
     
    240240} 
    241241.errors {  
    242         color: #f30;  
     242        color:#f30;  
    243243        border:0;  
    244244        background-color: transparent;  
     
    258258} 
    259259#qsearchInput {  
    260         border-color: #222;  
    261         color: #222; 
     260        border-color:#222;  
     261        color:#222; 
    262262} 
    263263FIELDSET, INPUT, SELECT, TEXTAREA {  
     
    270270INPUT, select, textarea {  
    271271        color:#999;  
    272         background-color: #444;  
     272        background-color:#444;  
    273273} 
    274274input[type="radio"], input[type="checkbox"], input[type="button"].rateButtonStarEmpty, input[type="button"].rateButtonStarFull {  
     
    277277#qsearchInput:focus, input:focus, select:focus, textarea:focus, input.focus, form .focus {  
    278278        background-color:#444; 
    279         color: #999;  
     279        color:#999;  
    280280} 
    281281.content UL.thumbnails SPAN.wrap2 { 
     
    284284} 
    285285.content UL.thumbnails SPAN.wrap2:hover {  
    286         color: #666; 
    287         background-color: #111;  
     286        color:#666; 
     287        background-color:#111;  
    288288        border:1px solid #ff3363;       /* thumbnails border color when mouse cursor is over it */  
    289289} 
     
    299299} 
    300300A:hover, A:active {  
    301         color: #f33;  
     301        color:#f33;  
    302302        border-bottom: 1px solid #f33;  
    303303        cursor: pointer;  
     
    334334        color:#ff3363;  
    335335        background-color:#222;  
    336         border-color: #ff3363;  
     336        border-color:#ff3363;  
    337337} 
    338338input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover { 
    339339        color:#999;  
    340         border-color: #666;  
    341 } 
     340        border-color:#666;  
     341}