feature 2477: merge -r12528 from trunk remove unnecesary admin css rules / html elements
git-svn-id: http://piwigo.org/svn/branches/2.3@12529 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
parent
01847bcd75
commit
b1f148bfc5
5 changed files with 53 additions and 36 deletions
|
|
@ -131,7 +131,7 @@ $template->assign(
|
|||
|
||||
$available_order_by= array(
|
||||
array(l10n('Rate date'), 'recently_rated DESC'),
|
||||
array(l10n('Rating score'), 'score DESC'),
|
||||
array(l10n('Rating score'), 'score DESC'),
|
||||
array(l10n('Average rate'), 'avg_rates DESC'),
|
||||
array(l10n('Number of rates'), 'nb_rates DESC'),
|
||||
array(l10n('Sum of rates'), 'sum_rates DESC'),
|
||||
|
|
@ -162,14 +162,14 @@ $template->assign('user_options_selected', array(@$_GET['users']) );
|
|||
|
||||
$query = '
|
||||
SELECT i.id,
|
||||
i.path,
|
||||
i.file,
|
||||
i.tn_ext,
|
||||
i.rating_score AS score,
|
||||
MAX(r.date) AS recently_rated,
|
||||
ROUND(AVG(r.rate),2) AS avg_rates,
|
||||
COUNT(r.rate) AS nb_rates,
|
||||
SUM(r.rate) AS sum_rates
|
||||
i.path,
|
||||
i.file,
|
||||
i.tn_ext,
|
||||
i.rating_score AS score,
|
||||
MAX(r.date) AS recently_rated,
|
||||
ROUND(AVG(r.rate),2) AS avg_rates,
|
||||
COUNT(r.rate) AS nb_rates,
|
||||
SUM(r.rate) AS sum_rates
|
||||
FROM '.RATE_TABLE.' AS r
|
||||
LEFT JOIN '.IMAGES_TABLE.' AS i ON r.element_id = i.id
|
||||
WHERE 1 = 1 ' . $page['user_filter'] . '
|
||||
|
|
@ -245,7 +245,7 @@ ORDER BY date DESC;';
|
|||
|
||||
$tpl_image['rates'][] =
|
||||
array(
|
||||
'DATE' => format_date($row['date']),
|
||||
'DATE' => /*format_date*/($row['date']),
|
||||
'RATE' => $row['rate'],
|
||||
'USER' => $user_rate,
|
||||
'U_DELETE' => $url_del
|
||||
|
|
|
|||
|
|
@ -78,7 +78,11 @@ h3, #imageToolBar a:hover, .content, .throw, .row1 { background-color: #ddd; }
|
|||
.row2 { background-color:#eeeeee; }
|
||||
.throw em { font-style: normal; color: #0cc9c; }
|
||||
#content { background: #f1f1f1; min-height: 467px;}
|
||||
.content { padding:0 5px 0 0; margin: 0 10px 0 252px; z-index:99; border: 1px solid #aaa;}
|
||||
|
||||
.content {
|
||||
border: 1px solid #aaa;
|
||||
}
|
||||
|
||||
.content h3 { font-size:20px; letter-spacing:-0.4px; margin:0 20px 12px 0;
|
||||
text-align:center; background:none; border: 0; }
|
||||
.content h3 ~ h3{ margin-top: 40px; }
|
||||
|
|
@ -153,11 +157,11 @@ margin-top:4px; padding-bottom:3px; padding-top:3px; top:1px;
|
|||
.tabsheet a span { display:block; font-size:10px; margin-right:2px; padding:0 3px 0 1px; }
|
||||
|
||||
.sort { clear: none; }
|
||||
#debug { margin-left:248px; font-size:12px; }
|
||||
/* menubar is on all admin pages => No specific css file */
|
||||
#menubar {
|
||||
display:inline; float:left; left:0; margin: 10px 0 0 10px;
|
||||
padding:0; width:207px; z-index:99; text-align: left; }
|
||||
padding:0; width:207px; z-index:99; text-align: left;
|
||||
}
|
||||
|
||||
#menubar ul.scroll { overflow-y:auto;
|
||||
/* Only IE family supports colored scrollbar */
|
||||
scrollbar-face-color: #ddd; scrollbar-shadow-color: #bbb; scrollbar-highlight-color: #fff;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<h2>{$NB_ELEMENTS} {'Photos'|@translate}</h2>
|
||||
|
||||
<form action="{$F_ACTION}" method="GET" id="update" class="filter">
|
||||
<form action="{$F_ACTION}" method="GET" class="filter">
|
||||
<fieldset>
|
||||
<legend>{'Filter'|@translate}</legend>
|
||||
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
<label>
|
||||
|
||||
<input class="submit" type="submit" name="submit_filter" value="{'Submit'|@translate}">
|
||||
<input class="submit" type="submit" value="{'Submit'|@translate}">
|
||||
</label>
|
||||
<input type="hidden" name="page" value="rating">
|
||||
</fieldset>
|
||||
|
|
@ -47,18 +47,18 @@
|
|||
</tr>
|
||||
{foreach from=$images item=image name=image}
|
||||
<tr valign="top" class="{if $smarty.foreach.image.index is odd}row1{else}row2{/if}">
|
||||
<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>
|
||||
<td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td>
|
||||
<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>
|
||||
<td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td>
|
||||
<td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.SCORE_RATE}</strong></td>
|
||||
<td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td>
|
||||
<td rowspan="{$image.NB_RATES_TOTAL+1}" style="border-right: 1px solid;" ><strong>{$image.SUM_RATE}</strong></td>
|
||||
<td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td>
|
||||
<td rowspan="{$image.NB_RATES_TOTAL+1}" style="border-right: 1px solid;" ><strong>{$image.SUM_RATE}</strong></td>
|
||||
</tr>
|
||||
{foreach from=$image.rates item=rate name=rate}
|
||||
<tr class="{if ($smarty.foreach.image.index+$smarty.foreach.rate.index) is odd}row1{else}row2{/if}">
|
||||
<td>{$rate.RATE}</td>
|
||||
<td><b>{$rate.USER}</b></td>
|
||||
<td><span class="date">{$rate.DATE}</span></td>
|
||||
<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>
|
||||
<td>{$rate.RATE}</td>
|
||||
<td><b>{$rate.USER}</b></td>
|
||||
<td>{$rate.DATE}</td>
|
||||
<td><a href="{$rate.U_DELETE}"><img src="{$themeconf.admin_icon_dir}/delete.png" alt="[{'Delete'|@translate}]"></a></td>
|
||||
</tr>
|
||||
{/foreach} {*rates*}
|
||||
{/foreach} {*images*}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/* content.css */
|
||||
|
||||
/* .Content is on every pages so it is common and it will no longer be a specific css */
|
||||
.content { margin-right: 1em; margin-bottom: 1em; }
|
||||
.content h2 {margin: 0; padding: 5px 0.5em 5px 0.5em; text-align: right; font-size: 120%;}
|
||||
.content .navigationBar { margin: 10px 0; text-align: center; }
|
||||
.content form { text-align: left; }
|
||||
|
|
@ -498,9 +497,9 @@ FORM.filter FIELDSET P
|
|||
display: block;
|
||||
}
|
||||
|
||||
FORM.filter INPUT[type="submit"] {
|
||||
/*FORM.filter INPUT[type="submit"] {
|
||||
margin-top: 1.8em;
|
||||
}
|
||||
}*/
|
||||
|
||||
FORM.properties UL, FORM#update UL {
|
||||
list-style-type: none;
|
||||
|
|
@ -633,7 +632,10 @@ img.ui-datepicker-trigger {
|
|||
|
||||
html, body {height:100%; margin:0; padding:0;}
|
||||
#the_page {min-height:100%; position:absolute; width:100%; padding:0;margin:0;}
|
||||
#pwgMain {padding:10px;padding-bottom:60px;}
|
||||
|
||||
#pwgMain {
|
||||
padding: 10px 5px 60px;
|
||||
}
|
||||
|
||||
#footer {
|
||||
position:absolute;
|
||||
|
|
@ -781,10 +783,16 @@ html, body {height:100%; margin:0; padding:0;}
|
|||
/* Set the width of the menubar for the galery */
|
||||
#menubar {
|
||||
width: 18em;
|
||||
margin: 10px 0 50px 10px !important;
|
||||
margin: 10px 0 50px 5px;
|
||||
display: inline;
|
||||
float: left;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.content {
|
||||
margin-left: 20em; /* = #menubar width + 2em */
|
||||
padding:0 5px 0 0;
|
||||
margin: 0 5px 0 227px;
|
||||
z-index:99;
|
||||
}
|
||||
/* Set minimum width of the page before getting a scrollbar */
|
||||
/* IE5 and IE6 don't get that */
|
||||
|
|
@ -1074,4 +1082,6 @@ p#uploadModeInfos {text-align:left;margin-top:1em;font-size:90%;color:#999;}
|
|||
.ui-progressbar-value { background-image: url(images/pbar-ani.gif); height:10px;margin:-1px;border:1px solid #E78F08;}
|
||||
|
||||
/* Tag Manager */
|
||||
.warningDeletion {display:none;font-style:italic;}
|
||||
.warningDeletion {display:none;font-style:italic;}
|
||||
|
||||
#debug { margin-left: 227px; font-size:12px; }
|
||||
|
|
|
|||
|
|
@ -47,14 +47,16 @@ h3, #imageToolBar a:hover, .row2, .content { background-color: #222; }
|
|||
.throw em { font-style: normal; color: #ff3363; }
|
||||
|
||||
#content { min-height: 466px; margin-top: 15px; }
|
||||
.content { padding:0 5px 0 0; margin: 0 10px 0 248px; z-index:99; border: 1px solid #222; }
|
||||
|
||||
.content {
|
||||
border: 1px solid #222;
|
||||
}
|
||||
|
||||
.content h3 { font-size:20px; letter-spacing:-0.4px; margin:0 20px 12px 0; text-align:center; background:none; border: 0; }
|
||||
.content h3 ~ h3{ margin-top: 40px; }
|
||||
.content h4 { font-size:14px; text-align:left; padding:3px; margin: 2px;}
|
||||
|
||||
.content dl, dd { margin:5px; }
|
||||
.content div.titrePage {}
|
||||
|
||||
|
||||
UL.thumbnails span.wrap2:hover { background-color:#111; border:1px solid #FF3363; color:#666; }
|
||||
|
|
@ -124,12 +126,13 @@ margin-top:4px; padding-bottom:3px; padding-top:3px; top:1px;
|
|||
}
|
||||
.tabsheet a:hover, .tabsheet li.selected_tab a { color: #F36; }
|
||||
.tabsheet a span { background-color:#222; display:block; font-size:10px; margin-right:2px; padding:0 3px 0 1px; }
|
||||
#debug { margin-left:248px; font-size:12px; }
|
||||
/* menubar is on all admin pages => No specific css file */
|
||||
#menubar {
|
||||
background:transparent url(images/menuBoxBottom_new.png) no-repeat scroll left bottom;
|
||||
border:0; display:inline; float:left; left:0; margin: 10px 0 0 10px;
|
||||
padding:0; width:230px; z-index:99; text-align: left; }
|
||||
border:0;
|
||||
padding:0; width:230px; z-index:99; text-align: left;
|
||||
}
|
||||
|
||||
#menubar dd {
|
||||
background: transparent url(images/menubar-detail.png) repeat-y top left;
|
||||
margin: 0; padding: 0 0 10px 0; }
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue