aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes/default
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-10-28 19:38:27 +0000
committerrvelices <rv-github@modusoptimus.com>2011-10-28 19:38:27 +0000
commitb1f148bfc5f9b5a2e62eb04970ef99eb53987cc4 (patch)
treeb7d8239b72d34ee3276d290461e940a5d0b18fce /admin/themes/default
parent01847bcd75bbc46efbd1d17354a1b6c2dad261e1 (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/themes/default/template/rating.tpl20
-rw-r--r--admin/themes/default/theme.css24
2 files changed, 27 insertions, 17 deletions
diff --git a/admin/themes/default/template/rating.tpl b/admin/themes/default/template/rating.tpl
index a6d107a69..fbfd9d8d9 100644
--- a/admin/themes/default/template/rating.tpl
+++ b/admin/themes/default/template/rating.tpl
@@ -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>
&nbsp;
- <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*}
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 1b30ff591..69d19d798 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -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;} \ No newline at end of file
+.warningDeletion {display:none;font-style:italic;}
+
+#debug { margin-left: 227px; font-size:12px; }