Changeset 12529


Ignore:
Timestamp:
10/28/11 21:38:27 (7 years ago)
Author:
rvelices
Message:

feature 2477: merge -r12528 from trunk remove unnecesary admin css rules / html elements

Location:
branches/2.3/admin
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/admin/rating.php

    r12255 r12529  
    132132$available_order_by= array( 
    133133    array(l10n('Rate date'), 'recently_rated DESC'), 
    134                 array(l10n('Rating score'), 'score DESC'), 
     134    array(l10n('Rating score'), 'score DESC'), 
    135135    array(l10n('Average rate'), 'avg_rates DESC'), 
    136136    array(l10n('Number of rates'), 'nb_rates DESC'), 
     
    163163$query = ' 
    164164SELECT i.id, 
    165        i.path, 
    166        i.file, 
    167        i.tn_ext, 
    168        i.rating_score                           AS score, 
    169        MAX(r.date)          AS recently_rated, 
    170                         ROUND(AVG(r.rate),2) AS avg_rates, 
    171        COUNT(r.rate)        AS nb_rates, 
    172        SUM(r.rate)          AS sum_rates 
     165    i.path, 
     166    i.file, 
     167    i.tn_ext, 
     168    i.rating_score       AS score, 
     169    MAX(r.date)          AS recently_rated, 
     170    ROUND(AVG(r.rate),2) AS avg_rates, 
     171    COUNT(r.rate)        AS nb_rates, 
     172    SUM(r.rate)          AS sum_rates 
    173173  FROM '.RATE_TABLE.' AS r 
    174174    LEFT JOIN '.IMAGES_TABLE.' AS i ON r.element_id = i.id 
     
    246246    $tpl_image['rates'][] = 
    247247       array( 
    248          'DATE' => format_date($row['date']), 
     248         'DATE' => /*format_date*/($row['date']), 
    249249         'RATE' => $row['rate'], 
    250250         'USER' => $user_rate, 
  • branches/2.3/admin/themes/clear/theme.css

    r11962 r12529  
    7979.throw em { font-style: normal; color: #0cc9c; } 
    8080#content { background: #f1f1f1; min-height: 467px;} 
    81 .content { padding:0 5px 0 0; margin: 0 10px 0 252px; z-index:99; border: 1px solid #aaa;} 
     81 
     82.content {  
     83  border: 1px solid #aaa; 
     84} 
     85 
    8286.content h3 { font-size:20px; letter-spacing:-0.4px; margin:0 20px 12px 0; 
    8387 text-align:center; background:none; border: 0; } 
     
    154158 
    155159.sort { clear: none; } 
    156 #debug { margin-left:248px; font-size:12px; } 
    157160/* menubar is on all admin pages => No specific css file */ 
    158161#menubar { 
    159 display:inline; float:left; left:0; margin: 10px 0 0 10px; 
    160 padding:0; width:207px; z-index:99; text-align: left; } 
     162  padding:0; width:207px; z-index:99; text-align: left;  
     163} 
     164 
    161165#menubar ul.scroll { overflow-y:auto; 
    162166 /* Only IE family supports colored scrollbar */ 
  • branches/2.3/admin/themes/default/template/rating.tpl

    r11827 r12529  
    11<h2>{$NB_ELEMENTS} {'Photos'|@translate}</h2> 
    22 
    3 <form action="{$F_ACTION}" method="GET" id="update" class="filter"> 
     3<form action="{$F_ACTION}" method="GET" class="filter"> 
    44  <fieldset> 
    55    <legend>{'Filter'|@translate}</legend> 
     
    2626    <label> 
    2727      &nbsp; 
    28     <input class="submit" type="submit" name="submit_filter" value="{'Submit'|@translate}"> 
     28    <input class="submit" type="submit" value="{'Submit'|@translate}"> 
    2929    </label> 
    3030    <input type="hidden" name="page" value="rating"> 
     
    4848{foreach from=$images item=image name=image} 
    4949<tr valign="top" class="{if $smarty.foreach.image.index is odd}row1{else}row2{/if}"> 
    50   <td rowspan="{$image.NB_RATES_TOTAL+1}"><a href="{$image.U_URL}"><img src="{$image.U_THUMB}" alt="{$image.FILE}" title="{$image.FILE}"></a></td> 
    51   <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td> 
     50        <td rowspan="{$image.NB_RATES_TOTAL+1}"><a href="{$image.U_URL}"><img src="{$image.U_THUMB}" alt="{$image.FILE}" title="{$image.FILE}"></a></td> 
     51        <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td> 
    5252        <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.SCORE_RATE}</strong></td> 
    53   <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td> 
    54   <td rowspan="{$image.NB_RATES_TOTAL+1}" style="border-right: 1px solid;" ><strong>{$image.SUM_RATE}</strong></td> 
     53        <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td> 
     54        <td rowspan="{$image.NB_RATES_TOTAL+1}" style="border-right: 1px solid;" ><strong>{$image.SUM_RATE}</strong></td> 
    5555</tr> 
    5656{foreach from=$image.rates item=rate name=rate} 
    5757<tr class="{if ($smarty.foreach.image.index+$smarty.foreach.rate.index) is odd}row1{else}row2{/if}"> 
    58     <td>{$rate.RATE}</td> 
    59     <td><b>{$rate.USER}</b></td> 
    60     <td><span class="date">{$rate.DATE}</span></td> 
    61     <td><a href="{$rate.U_DELETE}"><img src="{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'Delete'|@translate}]"></a></td> 
     58        <td>{$rate.RATE}</td> 
     59        <td><b>{$rate.USER}</b></td> 
     60        <td>{$rate.DATE}</td> 
     61        <td><a href="{$rate.U_DELETE}"><img src="{$themeconf.admin_icon_dir}/delete.png" alt="[{'Delete'|@translate}]"></a></td> 
    6262</tr> 
    6363{/foreach} {*rates*} 
  • branches/2.3/admin/themes/default/theme.css

    r12480 r12529  
    22 
    33/* .Content  is on every pages so it is common and it will no longer be a specific css */ 
    4 .content { margin-right: 1em; margin-bottom: 1em; } 
    54.content h2 {margin: 0; padding: 5px 0.5em 5px 0.5em; text-align: right; font-size: 120%;} 
    65.content .navigationBar { margin: 10px 0; text-align: center; } 
     
    499498} 
    500499 
    501 FORM.filter INPUT[type="submit"] { 
     500/*FORM.filter INPUT[type="submit"] { 
    502501        margin-top: 1.8em; 
    503 } 
     502}*/ 
    504503 
    505504FORM.properties UL, FORM#update UL { 
     
    634633html, body {height:100%; margin:0; padding:0;} 
    635634#the_page {min-height:100%; position:absolute; width:100%; padding:0;margin:0;} 
    636 #pwgMain {padding:10px;padding-bottom:60px;} 
     635 
     636#pwgMain { 
     637  padding: 10px 5px 60px; 
     638} 
    637639 
    638640#footer { 
     
    782784#menubar { 
    783785  width: 18em; 
    784   margin: 10px 0 50px 10px !important; 
    785 } 
     786  margin: 10px 0 50px 5px; 
     787  display: inline;  
     788  float: left;  
     789  left: 0;  
     790} 
     791 
    786792.content { 
    787   margin-left: 20em;  /* = #menubar width + 2em */ 
     793  padding:0 5px 0 0;  
     794  margin: 0 5px 0 227px; 
     795  z-index:99; 
    788796} 
    789797/* Set minimum width of the page before getting a scrollbar */ 
     
    10761084/* Tag Manager */ 
    10771085.warningDeletion {display:none;font-style:italic;} 
     1086 
     1087#debug { margin-left: 227px; font-size:12px; } 
  • branches/2.3/admin/themes/roma/theme.css

    r12005 r12529  
    4848 
    4949#content { min-height: 466px; margin-top: 15px; } 
    50 .content { padding:0 5px 0 0; margin: 0 10px 0 248px; z-index:99; border: 1px solid #222; } 
     50 
     51.content { 
     52  border: 1px solid #222;  
     53} 
    5154 
    5255.content h3 { font-size:20px; letter-spacing:-0.4px; margin:0 20px 12px 0; text-align:center; background:none; border: 0; } 
     
    5558 
    5659.content dl, dd { margin:5px; } 
    57 .content div.titrePage {} 
    5860 
    5961 
     
    125127.tabsheet a:hover, .tabsheet li.selected_tab  a { color: #F36; } 
    126128.tabsheet a span { background-color:#222; display:block; font-size:10px; margin-right:2px; padding:0 3px 0 1px; } 
    127 #debug { margin-left:248px; font-size:12px; } 
    128129/* menubar is on all admin pages => No specific css file */ 
    129130#menubar { 
    130131background:transparent url(images/menuBoxBottom_new.png) no-repeat scroll left bottom; 
    131 border:0; display:inline; float:left; left:0; margin: 10px 0 0 10px;  
    132 padding:0; width:230px; z-index:99; text-align: left; } 
     132border:0;  
     133padding:0; width:230px; z-index:99; text-align: left;  
     134} 
     135 
    133136#menubar dd { 
    134137background: transparent url(images/menubar-detail.png) repeat-y top left; 
Note: See TracChangeset for help on using the changeset viewer.