[Mapbender-commits] r2934 - in branches: . beck_dev/http/css
beck_dev/http/print
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Sep 15 06:52:12 EDT 2008
Author: beck
Date: 2008-09-15 06:52:12 -0400 (Mon, 15 Sep 2008)
New Revision: 2934
Added:
branches/beck_dev/
branches/beck_dev/http/css/print.css
Removed:
branches/beck_dev/http/css/print.css
Modified:
branches/beck_dev/http/print/mod_printPDF.php
Log:
Copied: branches/beck_dev (from rev 2743, branches/2.5)
Deleted: branches/beck_dev/http/css/print.css
===================================================================
--- branches/2.5/http/css/print.css 2008-08-06 07:43:23 UTC (rev 2743)
+++ branches/beck_dev/http/css/print.css 2008-09-15 10:52:12 UTC (rev 2934)
@@ -1,43 +0,0 @@
-* {
- font: 12px normal Verdana,Arial,Helvetica,sans-serif;
-}
-
-body {
- margin: 0;
- padding: 10px;
- color: #000;
- background-color: #FFF;
-}
-
-form fieldset {
- margin: 0;
- padding: 0;
- border: 0;
-}
-
-form p {
- line-height: 1.25em;
- white-space: nowrap;
-}
-
-form p label {
- display: block;
- float: left;
- width: 7em;
- padding-right: 1em;
- line-height: 1.25em;
-}
-
-form p label em {
- display: block;
- color: #666;
-}
-
-form p input#mylegendcheckbox {
- margin: 0;
- padding: 0;
-}
-
-form p input#print {
- margin-left: 8em;
-}
\ No newline at end of file
Copied: branches/beck_dev/http/css/print.css (from rev 2744, branches/2.5/http/css/print.css)
===================================================================
--- branches/beck_dev/http/css/print.css (rev 0)
+++ branches/beck_dev/http/css/print.css 2008-09-15 10:52:12 UTC (rev 2934)
@@ -0,0 +1,45 @@
+* {
+ font: 12px normal Verdana,Arial,Helvetica,sans-serif;
+}
+
+body {
+ margin: 0;
+ padding: 10px;
+ color: #000;
+ background-color: #FFF;
+}
+
+form fieldset {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+
+form p {
+ line-height: 1.25em;
+ white-space: nowrap;
+}
+
+form p label {
+ /*
+ display: block;
+ float: left;
+ width: 7em;
+ padding-right: 1em;
+ line-height: 1.25em;
+ */
+}
+
+form p label em {
+ display: block;
+ color: #666;
+}
+
+form p input#mylegendcheckbox {
+ margin: 0;
+ padding: 0;
+}
+
+form p input#print {
+ margin-left: 8em;
+}
\ No newline at end of file
Modified: branches/beck_dev/http/print/mod_printPDF.php
===================================================================
--- branches/2.5/http/print/mod_printPDF.php 2008-08-06 07:43:23 UTC (rev 2743)
+++ branches/beck_dev/http/print/mod_printPDF.php 2008-09-15 10:52:12 UTC (rev 2934)
@@ -34,7 +34,7 @@
//FIXME:
//setlocale(LC_ALL, "de_DE.utf8");
- require_once(dirname(__FILE__)."/../print/".$_REQUEST["conf"]);
+ require_once(dirname(__FILE__)."/../print_ingrid/".$_REQUEST["conf"]);
printf("
<script type=\"text/javascript\">
@@ -287,35 +287,41 @@
</head>
<body>
-<form name="form1" method="post" action="../print/mod_printPDF_pdf.php?<?php echo SID; ?>" target="_blank">
-<p id="container_size">
- <label for="size"><?php echo $label_format ?></label>
- <select id="size" name="size" onchange="validate();">
- <option value="false">-</option>
- <?php
- for($i = 4; $i >= 0; $i--) {
- if(${"a".$i}) {
- printf("<option value=\"A%s\">%s</option>",$i,${"label_format_a".$i});
+<form name="form1" method="POST" action="../print/mod_printPDF_pdf.php?<?php echo SID; ?>" target="_blank">
+<fieldset id="container_size">
+ <p>
+ <label for="size"><?php echo $label_format ?></label>
+ <select id="size" name="size" onchange="validate();">
+ <option value="false">-</option>
+ <?php
+ for($i = 4; $i >= 0; $i--) {
+ if(${"a".$i}) {
+ printf("<option value=\"A%s\">%s</option>",$i,${"label_format_a".$i});
+ }
}
- }
- ?>
- </select>
-</p>
+ ?>
+ </select>
+ </p>
+</fieldset>
-<p id="container_orientation">
- <label for="format"><?php echo $label_orientation; ?></label>
- <select id="format" name="format" onchange="validate();">
- <option value="portrait"><?php echo $label_portrait; ?></option>
- <option value="landscape"><?php echo $label_landscape; ?></option>
- </select>
-</p>
+<fieldset id="container_orientation">
+ <p>
+ <label for="format"><?php echo $label_orientation; ?></label>
+ <select id="format" name="format" onchange="validate();">
+ <option value="portrait"><?php echo $label_portrait; ?></option>
+ <option value="landscape"><?php echo $label_landscape; ?></option>
+ </select>
+ </p>
+</fieldset>
<?php if($highquality === TRUE): ?>
- <p id="container_quality">
- <label for="quality"><?php echo $label_quality; ?></label>
- <input type="radio" id="quality" name="quality" value="1" checked="checked" /> <?php echo $label_72dpi; ?>
- <input type="radio" id="quality" name="quality" value="2" /> <?php echo $label_288dpi; ?>
- </p>
+ <fieldset id="container_quality">
+ <p>
+ <label for="quality"><?php echo $label_quality; ?></label>
+ <input type="radio" id="quality" name="quality" value="1" checked="checked" /> <?php echo $label_72dpi; ?>
+ <input type="radio" id="quality" name="quality" value="2" /> <?php echo $label_288dpi; ?>
+ </p>
+ </fieldset>
<?php endif; ?>
<?php
@@ -326,20 +332,24 @@
$label_hint = ($max_comment_length > -1) ? sprintf(" <em>(max. %s)</em>",$max_comment_length) : NULL;
$javascript = ($max_comment_length > -1) ? sprintf(" onblur=\"checkCommentLength(this,%s)\"",$max_comment_length) : NULL;
- $html = sprintf("<p id=\"container_comment%s\">",$i);
+ $html = sprintf("<fieldset id=\"container_comment%s\">",$i);
+ $html .= "<p>";
$html .= sprintf("<label for=\"c%s\">%s%s</label> ",$i,${"label_comment".$i},$label_hint);
$html .= sprintf("<textarea id=\"c%s\" name=\"c%s\" cols=\"20\" rows=\"2\"%s></textarea> ",$i,$i,$javascript);
$html .= "</p>";
+ $html .= "</fieldset>";
echo $html;
}
?>
<?php if($legend === TRUE): ?>
- <p id="container_legend">
- <label for="mylegendcheckbox"><?php echo $label_legend; ?></label>
- <input type="checkbox" id="mylegendcheckbox" name="mylegendcheckbox" value="false" />
- </p>
+ <fieldset id="container_legend">
+ <p>
+ <label for="mylegendcheckbox"><?php echo $label_legend; ?></label>
+ <input type="checkbox" id="mylegendcheckbox" name="mylegendcheckbox" value="false" />
+ </p>
+ </fieldset>
<?php else: ?>
<input type="hidden" name="mylegendcheckbox" value="false" />
<?php endif; ?>
@@ -359,9 +369,11 @@
<input type="hidden" name="measured_x_values" />
<input type="hidden" name="measured_y_values" />
-<p>
- <input type="button" id="print" name="print" value="<?php echo $label_button; ?>" onclick="printMap();" />
-</p>
+<fieldset>
+ <p>
+ <input type="button" id="print" name="print" value="<?php echo $label_button; ?>" onclick="printMap();" />
+ </p>
+</fieldset>
</form>
</body>
More information about the Mapbender_commits
mailing list