Permalink
Browse files

[Contest1] No hard-coded icons in css

Modified "list-style-type" to "none" for the list items that has an image as the bullet point and aligned them
  • Loading branch information...
1 parent dd76637 commit c88420a247a1d63e56f8434ba497cb87f4aedc39 @hisamith hisamith committed Mar 2, 2013
Showing with 31 additions and 21 deletions.
  1. +16 −12 index.php
  2. +1 −1 libraries/display_create_database.lib.php
  3. +1 −1 server_databases.php
  4. +13 −7 themes/pmahomme/css/common.css.php
View
@@ -120,9 +120,9 @@
if (! $cfg['NavigationDisplayServers']
&& (count($cfg['Servers']) > 1 || $server == 0 && count($cfg['Servers']) == 1)
) {
- echo '<li id="li_select_server">';
+ echo '<li id="li_select_server" class="no_bullets" >';
include_once 'libraries/select_server.lib.php';
- echo PMA_selectServer(true, true);
+ echo PMA_Util::getImage('s_host.png')." ".PMA_selectServer(true, true);
echo '</li>';
}
@@ -137,22 +137,22 @@
if ($cfg['ShowChgPassword']) {
$conditional_class = 'ajax';
PMA_printListItem(
- __('Change password'),
+ PMA_Util::getImage('s_passwd.png')." ".__('Change password'),
'li_change_password',
'user_password.php?' . $common_url_query,
null,
null,
'change_password_anchor',
- null,
+ "no_bullets",
$conditional_class
);
}
} // end if
- echo ' <li id="li_select_mysql_collation">';
+ echo ' <li id="li_select_mysql_collation" class="no_bullets" >';
echo ' <form method="post" action="index.php">' . "\n"
. PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
. ' <label for="select_collation_connection">' . "\n"
- . ' ' . __('Server connection collation') . "\n"
+ . ' '.PMA_Util::getImage('s_asci.png')." " . __('Server connection collation') . "\n"
// put the doc link in the form so that it appears on the same line
. PMA_Util::showMySQLDocu(
'MySQL_Database_Administration',
@@ -183,17 +183,17 @@
// Displays language selection combo
if (empty($cfg['Lang']) && count($GLOBALS['available_languages']) > 1) {
- echo '<li id="li_select_lang">';
+ echo '<li id="li_select_lang" class="no_bullets">';
include_once 'libraries/display_select_lang.lib.php';
- echo PMA_getLanguageSelectorHtml();
+ echo PMA_Util::getImage('s_lang.png')." ".PMA_getLanguageSelectorHtml();
echo '</li>';
}
// ThemeManager if available
if ($GLOBALS['cfg']['ThemeManager']) {
- echo '<li id="li_select_theme">';
- echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox();
+ echo '<li id="li_select_theme" class="no_bullets">';
+ echo PMA_Util::getImage('s_theme.png')." ".$_SESSION['PMA_Theme_Manager']->getHtmlSelectBox();
echo '</li>';
}
echo '<li id="li_select_fontsize">';
@@ -207,9 +207,13 @@
if ($server > 0) {
echo '<ul>';
echo PMA_printListItem(
- __('More settings'),
+ PMA_Util::getImage('b_tblops.png')." " .__('More settings'),
'li_user_preferences',
- 'prefs_manage.php?' . $common_url_query
+ 'prefs_manage.php?' . $common_url_query,
+ null,
+ null,
+ null,
+ "no_bullets"
);
echo '</ul>';
}
@@ -18,7 +18,7 @@
// The user is allowed to create a db
?>
<form method="post" action="db_create.php" id="create_database_form" class="ajax"><strong>
- <?php echo '<label for="text_create_db">' . __('Create database') . '</label>&nbsp;' . PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
+ <?php echo '<label for="text_create_db">'. PMA_Util::getImage('b_newdb.png')." " . __('Create database') . '</label>&nbsp;' . PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
<?php echo PMA_generate_common_hidden_inputs('', '', 5); ?>
<input type="hidden" name="reload" value="1" />
<input type="text" name="new_db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="text_create_db"/>
View
@@ -142,7 +142,7 @@
* Create database.
*/
if ($cfg['ShowCreateDb']) {
- echo '<ul><li id="li_create_database">' . "\n";
+ echo '<ul><li id="li_create_database" class="no_bullets">' . "\n";
include 'libraries/display_create_database.lib.php';
echo ' </li>' . "\n";
echo '</ul>' . "\n";
@@ -1651,20 +1651,26 @@
/* iconic view for ul items */
+
+li.no_bullets {
+ list-style-type:none !important;
+ margin-left: -25px !important; //align with other list items which have bullets
+}
+
li#li_create_database {
- list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_newdb.png');?>);
+ //list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_newdb.png');?>);
}
li#li_select_lang {
- list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_lang.png');?>);
+ //list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_lang.png');?>);
}
li#li_select_mysql_collation {
- list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asci.png');?>);
+ //list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asci.png');?>);
}
li#li_select_theme {
- list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_theme.png');?>);
+ //list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_theme.png');?>);
}
li#li_user_info {
@@ -1708,7 +1714,7 @@
}
li#li_change_password {
- list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_passwd.png');?>);
+ //list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_passwd.png');?>);
}
li#li_log_out {
@@ -1728,7 +1734,7 @@
}
li#li_user_preferences {
- list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_tblops.png');?>);
+ //list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_tblops.png');?>);
}
/* END iconic view for ul items */
@@ -1875,7 +1881,7 @@
}
#li_select_server {
- list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_host.png');?>);
+ //list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_host.png');?>);
}
#list_server {

0 comments on commit c88420a

Please sign in to comment.