aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2005-12-30 21:54:46 +0000
committerchrisaga <chrisaga@piwigo.org>2005-12-30 21:54:46 +0000
commit29a32a3d9422416423f612acb90bceeac4b52608 (patch)
tree7b98651a43e3ce656410de50135f49b56c79b760
parente2982cdb2c97c436515862cbc2917dce32d9be7d (diff)
deletion: of unused code in picture.php
merge -r993:994 from branches/branch-1_5 into trunk (bug 254 fixed). git-svn-id: http://piwigo.org/svn/trunk@995 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--picture.php6
-rw-r--r--template/yoga/menubar.css20
2 files changed, 18 insertions, 8 deletions
diff --git a/picture.php b/picture.php
index 81e781ff0..69c8e9b8e 100644
--- a/picture.php
+++ b/picture.php
@@ -544,12 +544,6 @@ if (!$picture['current']['is_picture'])
'download',
array('U_DOWNLOAD' => $picture['current']['download']));
}
-else
-{
- $template->assign_block_vars(
- 'ecard',
- array('U_ECARD' => $picture['current']['url']));
-}
// display a high quality link if present
if (isset($picture['current']['high']))
{
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index e5baa9dc5..c89c6c304 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -63,19 +63,35 @@
/* quickconnect form */
FORM#quickconnect {
margin: 0;
+ padding: 5px;
}
FORM#quickconnect FIELDSET {
- margin: 5px;
+ margin: 0;
+ padding: 0 0 0.5em 0;
+ overflow: hidden; /* Correct float issue with Opera 7.5 */
+ width: 100%; /* // */
}
FORM#quickconnect P {
float: left;
+}
+
+FORM#quickconnect P INPUT {
margin: 0;
}
FORM#quickconnect UL.actions {
display: inline;
- margin: 0,5em 0 0 0;
float: right;
+ padding: 0;
+ text-align: right; /* Opera 7.5 */
+ width: 40%; /* Opera 7.5 cannot find why width:auto fails :-( */
}
+
+FORM#quickconnect UL.actions,
+FORM#quickconnect P,
+FORM#quickconnect LABEL {
+ margin: 0 0.5em 0 0.5em;
+}
+