improved style for navigation menu - partial CT#493

main/admin/configure_homepage.php

@@ -387,11 +387,11 @@ if(!empty($action)) {
 							}
 						}
 
-						$home_menu[$insert_where+1]='<li><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'.$link_name.'</a></li>';
+						$home_menu[$insert_where+1]='<li><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'"><span>'.$link_name.'</span></a></li>';
 					}
 					else // If the request is about a link edition, change the link
 					{
-						$home_menu[$link_index]='<li><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'.$link_name.'</a></li>';
+						$home_menu[$link_index]='<li><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'"><span>'.$link_name.'</span></a></li>';
 					}
 					// Re-build the file from the home_menu array
 					$home_menu=implode("\n",$home_menu);

main/css/academica/default.css

@@ -1485,6 +1485,7 @@ div.system_announcement {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/baby_orange/default.css

@@ -1475,6 +1475,7 @@ div.system_announcement {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/blue_lagoon/default.css

@@ -519,6 +519,7 @@ select, input[type=checkbox], input[type=radio], input[type=button], input[type=
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/cool_blue/default.css

@@ -497,6 +497,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/corporate/default.css

@@ -1393,6 +1393,7 @@ span.radio {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/cosmic_campus/default.css

@@ -1513,6 +1513,7 @@ div.system_announcement_content {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/delicious_bordeaux/default.css

@@ -517,6 +517,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/dokeos_blue/default.css

@@ -501,6 +501,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/dokeos_classic/default.css

@@ -540,6 +540,7 @@ input[text] {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/dokeos_classic_2D/default.css

@@ -535,6 +535,7 @@ this lets the navigation menu appear to the left:
 	margin: 0;
 	padding: 5px 5px 5px 10px;
 	text-decoration: none;
+	line-height:24px;
 }
 #toolnavlist a:hover, #toolnavlist a#here {
 	background: #fff;

main/css/empire_green/default.css

@@ -513,6 +513,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/fruity_orange/default.css

@@ -512,6 +512,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/medical/default.css

@@ -567,6 +567,7 @@ input[text] {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/public_admin/default.css

@@ -589,6 +589,7 @@ this lets the navigation menu appear to the left:
 	margin: 0;
 	padding: 5px 5px 5px 10px;
 	text-decoration: none;
+	line-height:24px;
 }
 #toolnavlist a:hover, #toolnavlist a#here {
 	background: #fff;

main/css/royal_purple/default.css

@@ -510,6 +510,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/silver_line/default.css

@@ -494,65 +494,6 @@ td .menu {
 	   be fed in using IE only CSS below becasue IE/Win also works with the 100% method.
 	*/
 }
-/* --- course navigation menu as a definition list  --- */
-#swap_menu_link {
-	float: left;
-}
-#toolnavbox {
-	margin: 0 0 0 10px;
-	padding: 0;
-	float: left;
-	border: 1px solid #f0f0f0;
-}
-#toolnavbox dl {
-	width: 160px;
-	margin: 0 auto;
-	padding: 0;
-	background: transparent;
-	font-size: 12px;
-	text-align: center;
-}
-#toolnavbox dt {
-	margin: 0;
-	padding: 0;
-	font-weight: bold;
-	font-size: 12px;
-	text-align: center;
-	color: #000;
-	border-bottom: 1px solid #fff;
-	background: transparent;
-}
-#toolnavbox dd {
-	margin: 0;
-	padding: 0;
-	color: #009;
-	text-align: left;
-	border-bottom:1px solid #fff;
-	background: #E5EDF9;
-}
-#toolnav img {
-	float: left;
-	width: 25px;
-	height: 25px;
-	margin: 0 4px 0 0;
-}
-#toolnavlist a, #toolnavlist a:link {
-	background: #E5EDF9;
-	color: #dcdcdc;
-	padding: 5px 5px 5px 10px;
-	margin: 0;
-	text-decoration: none;
-	display: block;
-}
-#toolnavlist a:hover {
-	background: #fff;
-	color:#dcdcdc;
-}
-#toolnavlist a#here {
-	background: #fff;
-	color:#dcdcdc;
-}
-/* --- end of course navigation menu section  --- */
 /*
 this lets the navigation menu appear to the left:
 #center { margin: 0 0 0 180px; padding: 10px 0 40px 0;
@@ -1676,6 +1617,7 @@ div.system_announcement {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/sober_brown/default.css

@@ -559,6 +559,7 @@ input[text] {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/steel_grey/default.css

@@ -515,6 +515,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/css/tasty_olive/default.css

@@ -513,6 +513,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 	margin: 0;
 	text-decoration: none;
 	display: block;
+	line-height:24px;
 }
 #toolnavlist a:hover {
 	background: #fff;

main/inc/banner.inc.php

@@ -320,7 +320,7 @@ if(api_get_self() != '/main/admin/configure_homepage.php') {
 	echo $open;
 } else {
 	$home_menu = '';
-	if(file_exists($homep.$menutabs.'_'.$lang.$ext)) {
+	if(file_exists($homep.$menutabs.'_'.$lang.$ext)) {		
 		$home_menu = file($homep.$menutabs.'_'.$lang.$ext);
 	} else {
 		$home_menu = file ($homep.$menutabs.$ext);
@@ -328,12 +328,13 @@ if(api_get_self() != '/main/admin/configure_homepage.php') {
 	foreach($home_menu as $key=>$enreg) {
 		$enreg=trim($enreg);
 		if(!empty($enreg)) {
-			$edit_link='<a href="'.api_get_self().'?action=edit_tabs&amp;link_index='.$key.'" style="padding-right:0px; padding-left:0px;">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
-			$delete_link='<a href="'.api_get_self().'?action=delete_tabs&amp;link_index='.$key.'" style="padding-right:0px;" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
-			echo str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=','</li>'),array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=',' '.$edit_link.' '.$delete_link.'</li>'),$enreg);
+			$edit_link='<a href="'.api_get_self().'?action=edit_tabs&amp;link_index='.$key.'" ><span>'.Display::return_icon('edit.gif', get_lang('Edit')).'</span></a>';
+			$delete_link='<a href="'.api_get_self().'?action=delete_tabs&amp;link_index='.$key.'"  onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;"><span>'.Display::return_icon('delete.gif', get_lang('Delete')).'</span></a>';
+			$tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=','</li>'),array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=',''.$edit_link.$delete_link.'</li>'),$enreg);			
+			echo $tab_string;
 		}
 	}
-	echo '<li id="insert-link"> <a href="'.api_get_self().'?action=insert_tabs" style="padding-right:0px;">'. Display::return_icon('insert_row.png', get_lang('InsertLink')).'</a> <a href="'.api_get_self().'?action=insert_tabs">'.get_lang('InsertLink').'</a></li>';
+	echo '<li id="insert-link"> <a href="'.api_get_self().'?action=insert_tabs" style="padding-right:0px;"><span>'. Display::return_icon('insert_row.png', get_lang('InsertLink'),array('style'=>'vertical-align:middle')).' '.get_lang('InsertLink').'</span></a></li>';
 }
 /*********************/
 //Header about the tabs