The branch, master has been updated
via abc229d0b055d7328bedfc1d2eed916335b2310a (commit)
from 96bcf83996b1d796fc4486633a6813dfed488a51 (commit)
- Log -----------------------------------------------------------------
commit abc229d0b055d7328bedfc1d2eed916335b2310a
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun May 23 08:27:27 2010 -0400
bug #3004216 Field attributes use inline CSS
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
tbl_structure.php | 11 +++++------
themes/darkblue_orange/css/theme_right.css.php | 9 ++++++++-
themes/original/css/theme_right.css.php | 9 ++++++++-
4 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9351e07..160d5f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,7 @@ $Id$
to Muhammad Adnan.
+ [doc] Incorporate synchronisation docs into main document.
+ [core] Include Content Security Policy HTTP headers.
+- bug #3004216 [CSS] Field attributes use inline CSS
3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value
diff --git a/tbl_structure.php b/tbl_structure.php
index ae90d6b..c255cde 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -327,9 +327,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
// underline commented fields and display a hover-title (CSS only)
- $comment_style = '';
if (isset($comments_map[$row['Field']])) {
- $displayed_field_name = '<span style="border-bottom: 1px dashed
black;" title="' . htmlspecialchars($comments_map[$row['Field']]) .
'">' . $field_name . '</span>';
+ $displayed_field_name = '<span class="commented_column"
title="' . htmlspecialchars($comments_map[$row['Field']]) .
'">' . $field_name . '</span>';
}
if ($primary && $primary->hasColumn($field_name)) {
@@ -347,7 +346,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
<th nowrap="nowrap"><label for="checkbox_row_<?php echo
$rownum; ?>"><?php echo $displayed_field_name;
?></label></th>
<td<?php echo $type_nowrap; ?>><bdo dir="ltr"
xml:lang="en"><?php echo $type; echo $type_mime;
?></bdo></td>
<td><?php echo (empty($field_charset) ? '' : '<dfn
title="' . PMA_getCollationDescr($field_charset) . '">' .
$field_charset . '</dfn>'); ?></td>
- <td nowrap="nowrap" style="font-size: 70%"><?php echo
$attribute; ?></td>
+ <td nowrap="nowrap" class="column_attribute"><?php echo
$attribute; ?></td>
<td><?php echo (($row['Null'] == 'YES') ? __('Yes')
: __('No')); ?></td>
<td nowrap="nowrap"><?php
if (isset($row['Default'])) {
@@ -540,11 +539,11 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
if ($cfg['PropertiesIconic']) {
echo '<img class="icon" src="' . $pmaThemeImage .
'b_insrow.png" width="16" height="16" alt="' .
__('Add new field') . '"/>';
}
- echo sprintf(__('Add %s field(s)'), '<input type="text"
name="num_fields" size="2" maxlength="2" value="1"
style="vertical-align: middle" onfocus="this.select()" />');
+ echo sprintf(__('Add %s field(s)'), '<input type="text"
name="num_fields" size="2" maxlength="2" value="1"
onfocus="this.select()" />');
// I tried displaying the drop-down inside the label but with Firefox
// the drop-down was blinking
- $fieldOptions = '<select name="after_field"
style="vertical-align: middle"
onclick="this.form.field_where[2].checked=true"
onchange="this.form.field_where[2].checked=true">';
+ $fieldOptions = '<select name="after_field"
onclick="this.form.field_where[2].checked=true"
onchange="this.form.field_where[2].checked=true">';
foreach ($aryFields as $fieldname) {
$fieldOptions .= '<option value="' . htmlspecialchars($fieldname)
. '">' . htmlspecialchars($fieldname) . '</option>' .
"\n";
}
@@ -560,7 +559,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
echo $fieldOptions;
unset($fieldOptions, $choices);
?>
-<input type="submit" value="<?php echo __('Go'); ?>"
style="vertical-align: middle" />
+<input type="submit" value="<?php echo __('Go'); ?>"
/>
</form>
<hr />
<?php
diff --git a/themes/darkblue_orange/css/theme_right.css.php
b/themes/darkblue_orange/css/theme_right.css.php
index 38743e3..c4b8cda 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -595,6 +595,13 @@ form.login label {
font-weight: bolder;
}
+.commented_column {
+ border-bottom: 1px dashed black;
+}
+
+.column_attribute {
+ font-size: 70%;
+}
/******************************************************************************/
/* specific elements */
@@ -1288,4 +1295,4 @@ table#serverconnection_trg_local {
* Validation error message styles
*/
.invalid_value
-{background:#F00;}
\ No newline at end of file
+{background:#F00;}
diff --git a/themes/original/css/theme_right.css.php
b/themes/original/css/theme_right.css.php
index 34c5052..b3c5101 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -570,6 +570,13 @@ form.login label {
font-weight: bolder;
}
+.commented_column {
+ border-bottom: 1px dashed black;
+}
+
+.column_attribute {
+ font-size: 70%;
+}
/******************************************************************************/
/* specific elements */
@@ -1220,4 +1227,4 @@ table#serverconnection_trg_local {
* Validation error message styles
*/
.invalid_value
-{background:#F00;}
\ No newline at end of file
+{background:#F00;}
hooks/post-receive
--
phpMyAdmin