[svn r16719] first part of css cleanup (currently only the css/corporate style)

main/admin/configure_homepage.php

@@ -1,4 +1,4 @@
-<?php // $Id: configure_homepage.php 15986 2008-08-13 18:12:25Z juliomontoya $
+<?php // $Id: configure_homepage.php 16719 2008-11-12 15:36:21Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -885,10 +885,14 @@ switch($action){
 		<table border="0" cellpadding="5" cellspacing="0" width="100%">
 		<tr>
 		  <td width="80%" colspan="2">
+		  	<div class="actions">
 			<a href="<?php echo api_get_self(); ?>?action=edit_top"><img src="../img/edit.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>"/></a> <a href="<?php echo api_get_self(); ?>?action=edit_top"><?php echo get_lang('EditHomePage'); ?></a>
+		  	</div>
 		  </td>
 		  <td width="20%">
+		  	<div class="actions">
 			<a href="<?php echo api_get_self(); ?>?action=insert_link"><img src="../img/insert_row.png" border="0" alt="" /></a> <a href="<?php echo api_get_self(); ?>?action=insert_link"/><?php echo get_lang('InsertLink'); ?></a>
+			</div>
 		  </td>
 		</tr>
 		<tr>
@@ -913,8 +917,9 @@ switch($action){
 			</tr>
 			<tr>
 			  <td width="50%">
-				<br />
+				<div class="actions">
 				<a href="course_category.php"><img src="../img/edit.gif" border="0" alt="" title="<?php echo htmlentities(get_lang('Modify'),ENT_QUOTES,$charset); ?>"/></a> <a href="course_category.php"><?php echo get_lang('EditCategories'); ?></a>
+				</div>
 			  </td>
 			  <td width="50%">
 				<br />

main/admin/course_category.php

@@ -1,4 +1,4 @@
-<?php // $Id: course_category.php 14214 2008-01-31 03:31:49Z yannoo $
+<?php // $Id: course_category.php 16719 2008-11-12 15:36:21Z pcool $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -128,26 +128,15 @@ if(empty($action))
 	$Categories=api_store_result($result);
 }
 
-if(!empty($category) && empty($action))
-{
-	$myquery = "SELECT parent_id FROM $tbl_category WHERE code='$category'";
-	$result=api_sql_query($myquery,__FILE__,__LINE__);
-	$parent_id = 0;
-	if(Database::num_rows($result)>0){
-		$parent_id=Database::fetch_row($result);
-	}
-	?>
 	
-	<a href="<?php echo api_get_self(); ?>?category=<?php echo Security::remove_XSS($parent_id); ?>">&lt;&lt; <?php echo get_lang("Back"); if(!empty($parent_id)) echo ' ('.$parent_id.')'; ?></a>
 	
-	<?php
-}
 
 if($action == 'add' || $action == 'edit')
 {
 	?>
-	
+	<div class="actions">
-	<a href="<?php echo api_get_self(); ?>?category=<?php echo Security::remove_XSS($category); ?>">&lt;&lt; <?php echo get_lang("Back"); if(!empty($category)) echo ' ('.Security::remove_XSS($category).')'; ?></a>
+	<a href="<?php echo api_get_self(); ?>?category=<?php echo Security::remove_XSS($category); ?>"><?php echo Display::return_icon('folder_up.gif').get_lang("Back"); if(!empty($category)) echo ' ('.Security::remove_XSS($category).')'; ?></a>
+	</div>	
 	
 	<h3><?php echo ($action == 'add')?get_lang('AddACategory'):get_lang('EditNode'); if(!empty($category)) echo ' '.get_lang('Into').' '.Security::remove_XSS($category); ?></h3>
 	
@@ -201,7 +190,25 @@ if($action == 'add' || $action == 'edit')
 else
 {
 ?>
+<div class="actions">
+<?php 
+if(!empty($category) && empty($action))
+{
+	$myquery = "SELECT parent_id FROM $tbl_category WHERE code='$category'";
+	$result=api_sql_query($myquery,__FILE__,__LINE__);
+	$parent_id = 0;
+	if(Database::num_rows($result)>0){
+		$parent_id=Database::fetch_row($result);
+	}
+	?>
+
+	<a href="<?php echo api_get_self(); ?>?category=<?php echo Security::remove_XSS($parent_id); ?>"><?php echo Display::return_icon('folder_up.gif').get_lang("Back"); if(!empty($parent_id)) echo ' ('.$parent_id.')'; ?></a>
 
+	<?php
+}
+?>
+<a href="<?php echo api_get_self(); ?>?category=<?php echo Security::remove_XSS($category); ?>&amp;action=add"><?php echo Display::return_icon('folder_new.gif').get_lang("AddACategory"); if(!empty($category)) echo ' '.get_lang('Into').' '.Security::remove_XSS($category); ?></a>
+</div>
 <ul>
 
 <?php
@@ -229,7 +236,7 @@ else
 ?>
 </ul>
 
-<a href="<?php echo api_get_self(); ?>?category=<?php echo Security::remove_XSS($category); ?>&amp;action=add"><?php echo get_lang("AddACategory"); if(!empty($category)) echo ' '.get_lang('Into').' '.Security::remove_XSS($category); ?></a>
+
 
 <?php
 }

main/admin/course_list.php

@@ -1,5 +1,4 @@
-<?php
+<?php // $Id: course_list.php 16719 2008-11-12 15:36:21Z pcool $
-// $Id: course_list.php 16709 2008-11-10 22:22:28Z yannoo $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -223,7 +222,9 @@ else
 	$form->addElement('text','keyword',get_lang('keyword'));
 	$form->addElement('submit','submit',get_lang('Search'));
 	$form->addElement('static','search_advanced_link',null,'<a href="course_list.php?search=advanced">'.get_lang('AdvancedSearch').'</a>');
+	echo '<div class="actions">';
 	$form->display();
+	echo '</div>';
 	// Create a sortable table with the course data
 	$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data',2);
 	$parameters=array();

main/admin/settings.php

@@ -1,5 +1,4 @@
-<?php
+<?php // $Id: settings.php 16719 2008-11-12 15:36:21Z pcool $
-// $Id: settings.php 16418 2008-09-26 18:27:24Z juliomontoya $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -80,8 +79,8 @@ if (!empty($_GET['category']) and $_GET['category'] <> "Plugins" and $_GET['cate
 {
 	$form = new FormValidator('settings', 'post', 'settings.php?category='.$_GET['category']);
 	$renderer = & $form->defaultRenderer();
-	$renderer->setHeaderTemplate('<div class="settingtitle">{header}</div>'."\n");
+	$renderer->setHeaderTemplate('<div class="sectiontitle">{header}</div>'."\n");
-	$renderer->setElementTemplate('<div class="settingcomment">{label}</div>'."\n".'<div class="settingvalue">{element}</div>'."\n");
+	$renderer->setElementTemplate('<div class="sectioncomment">{label}</div>'."\n".'<div class="sectionvalue">{element}</div>'."\n");
 	$my_category = mysql_real_escape_string($_GET['category']);
 	
 	if ($_configuration['access_url']==1)
@@ -247,19 +246,33 @@ if (!empty($_GET['action']) && $_GET['action'] == "stored")
 	Display :: display_normal_message($SettingsStored);
 }
 
+// the action images
+$action_images['platform'] 		= 'dokeos.gif';
+$action_images['course'] 		= 'lp_dokeos_module.gif';
+$action_images['tools'] 		= 'reference.gif';
+$action_images['user'] 			= 'students.gif';
+$action_images['gradebook']		= 'gradebook_eval_not_empty.gif';
+$action_images['ldap'] 			= 'loginmanager.gif';
+$action_images['security'] 		= 'passwordprotected.gif';
+$action_images['languages']		= 'forum.gif';
+$action_images['tuning'] 		= 'tuning.gif';
+$action_images['plugins'] 		= 'plugin.gif';
+$action_images['stylesheets'] 	= 'theme.gif';
+
+
 // grabbing the categories
 //$selectcategories = "SELECT DISTINCT category FROM ".$table_settings_current." WHERE category NOT IN ('stylesheets','Plugins')";
 //$resultcategories = api_sql_query($selectcategories, __FILE__, __LINE__);
 $resultcategories = api_get_settings_categories(array('stylesheets','Plugins'));
-echo "\n<div><ul>";
+echo "\n<div class=\"actions\">";
 //while ($row = mysql_fetch_array($resultcategories))
 foreach($resultcategories as $row)
 {
-	echo "\n\t<li><a href=\"".api_get_self()."?category=".$row['category']."\">".ucfirst(get_lang($row['category']))."</a></li>";
+	echo "\n\t<a href=\"".api_get_self()."?category=".$row['category']."\">".Display::return_icon($action_images[strtolower($row['category'])]).ucfirst(get_lang($row['category']))."</a>";
 }
-echo "\n\t<li><a href=\"".api_get_self()."?category=Plugins\">".ucfirst(get_lang('Plugins'))."</a></li>";
+echo "\n\t<a href=\"".api_get_self()."?category=Plugins\">".Display::return_icon($action_images['plugins']).ucfirst(get_lang('Plugins'))."</a>";
-echo "\n\t<li><a href=\"".api_get_self()."?category=stylesheets\">".ucfirst(get_lang('Stylesheets'))."</a></li>";
+echo "\n\t<a href=\"".api_get_self()."?category=stylesheets\">".Display::return_icon($action_images['stylesheets']).ucfirst(get_lang('Stylesheets'))."</a>";
-echo "\n</ul></div>";
+echo "\n</div>";
 
 if (isset ($_GET['category']))
 {

main/admin/user_fields.php

@@ -170,8 +170,10 @@ if(1)
 	//$form->addElement('text','title',get_lang('FieldTitle'));
 	//$form->addElement('text','default',get_lang('FieldDefaultValue'));
 	//$form->addElement('submit','submit',get_lang('Search'));
-	$form->addElement('static','search_advanced_link',null,'<a href="user_fields_add.php?action=fill">'.get_lang('AddUserField').'</a>');
+	$form->addElement('static','search_advanced_link',null,'<a href="user_fields_add.php?action=fill">'.Display::return_icon('fieldadd.gif').get_lang('AddUserField').'</a>');
+	echo '<div class="actions">';
 	$form->display();
+	echo '</div>';
 
 	// Create a sortable table with user-data
 	$parameters['sec_token'] = Security::get_token();