Procházet zdrojové kódy

[svn r18203] Button modification.
Now <button> </button> is use.
Here is what's done so far :
- CSS
- Portal Homepage
- My agenda
- Reporting
- My Profile
- Portal administration (not all)
- My course
- The production part
- The other parts are not complete

More to come this week.

Noël Dieschburg před 16 roky
rodič
revize
c3c3d4ab74
61 změnil soubory, kde provedl 1807 přidání a 221 odebrání
  1. 4 4
      index.php
  2. 6 6
      main/admin/configure_homepage.php
  3. 7 4
      main/admin/index.php
  4. 9 9
      main/admin/settings.php
  5. 2 2
      main/admin/user_add.php
  6. 7 3
      main/announcements/announcements.php
  7. 5 5
      main/auth/courses.php
  8. 8 8
      main/auth/profile.php
  9. 2 2
      main/calendar/agenda.inc.php
  10. 2 2
      main/calendar/agenda.php
  11. 3 3
      main/course_description/index.php
  12. 2 2
      main/create_course/add_course.php
  13. 125 1
      main/css/academica/default.css
  14. 124 0
      main/css/baby_orange/default.css
  15. 124 0
      main/css/corporate/default.css
  16. 125 0
      main/css/cosmic_campus/default.css
  17. 122 69
      main/css/dokeos_classic/default.css
  18. 124 0
      main/css/dokeos_classic_2D/default.css
  19. 122 0
      main/css/medical/default.css
  20. 126 2
      main/css/public_admin/default.css
  21. 124 0
      main/css/silver_line/default.css
  22. 124 0
      main/css/sober_brown/default.css
  23. 3 3
      main/document/create_document.php
  24. 2 2
      main/document/document.inc.php
  25. 3 3
      main/document/document.php
  26. 3 3
      main/document/edit_document.php
  27. 3 3
      main/document/upload.php
  28. 2 2
      main/dropbox/dropbox_functions.inc.php
  29. 2 2
      main/dropbox/index.php
  30. 2 2
      main/exercice/answer_admin.inc.php
  31. 2 2
      main/exercice/exercice.php
  32. 6 6
      main/exercice/exercice_submit.php
  33. 2 2
      main/exercice/exercise.class.php
  34. 3 3
      main/exercice/exercise_result.php
  35. 2 2
      main/exercice/hotpotatoes.php
  36. 4 4
      main/exercice/matching.class.php
  37. 2 2
      main/exercice/multiple_answer.class.php
  38. 2 2
      main/exercice/question_admin.inc.php
  39. 2 2
      main/exercice/unique_answer.class.php
  40. 2 2
      main/glossary/index.php
  41. 1 1
      main/gradebook/lib/fe/catform.class.php
  42. 1 1
      main/gradebook/lib/fe/scoredisplayform.class.php
  43. 2 2
      main/group/group_category.php
  44. 2 2
      main/group/group_creation.php
  45. 1 1
      main/group/group_edit.php
  46. binární
      main/img/accept.png
  47. binární
      main/img/addd.gif
  48. 2 2
      main/inc/introductionSection.inc.php
  49. 2 2
      main/inc/lib/fileUpload.lib.php
  50. 231 0
      main/inc/lib/formvalidator/Element/style_button.php
  51. 89 0
      main/inc/lib/formvalidator/Element/style_reset_button.php
  52. 89 0
      main/inc/lib/formvalidator/Element/style_submit_button.php
  53. 4 1
      main/inc/lib/formvalidator/FormValidator.class.php
  54. 2 2
      main/inc/lib/sortabletable.class.php
  55. 4 4
      main/lang/english/admin.inc.php
  56. 11 13
      main/link/link.php
  57. 15 15
      main/newscorm/learnpath.class.php
  58. 1 1
      main/newscorm/lp_add.php
  59. 2 1
      main/newscorm/lp_edit.php
  60. 2 2
      main/tracking/courseLog.php
  61. 2 2
      main/upload/upload.document.php

+ 4 - 4
index.php

@@ -1,4 +1,4 @@
-<?php // $Id: index.php 18164 2009-02-02 19:56:21Z herodoto $
+<?php // $Id: index.php 18203 2009-02-03 18:02:16Z ndieschburg $
  
 /*
 ==============================================================================
@@ -27,7 +27,7 @@
 /**
 *	@package dokeos.main
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Refactoring
-* 	@version $Id: index.php 18164 2009-02-02 19:56:21Z herodoto $
+* 	@version $Id: index.php 18203 2009-02-03 18:02:16Z ndieschburg $
 *   @todo check the different @todos in this page and really do them
 * 	@todo check if the news management works as expected
 */
@@ -485,7 +485,7 @@ function display_login_form()
 	$form = new FormValidator('formLogin');
 	$form->addElement('text','login',get_lang('UserName'),array('size'=>15));
 	$form->addElement('password','password',get_lang('Pass'),array('size'=>15));
-	$form->addElement('submit','submitAuth',get_lang('langEnter'));
+	$form->addElement('style_submit_button','submitAuth',get_lang('langEnter'));
 	$renderer =& $form->defaultRenderer();
 	$renderer->setElementTemplate('<div><label>{label}</label></div><div>{element}</div>');
 	$form->display();
@@ -751,4 +751,4 @@ function get_courses_of_user($user_id) {
 		$courses[$row['k']] = array("db"=> $row['db'], "code" => $row['k'], "visual_code" => $row['vc'], "title" => $row['i'], "directory" => $row['dir'], "status" => $row['status'], "tutor" => $row['t'], "subscribe" => $row['subscr'], "unsubscribe" => $row['unsubscr'], "sort" => $row['sort'], "user_course_category" => $row['user_course_cat']);
 	}
 	return $courses;
-}
+}

+ 6 - 6
main/admin/configure_homepage.php

@@ -1,4 +1,4 @@
-<?php // $Id: configure_homepage.php 18149 2009-02-02 16:04:18Z herodoto $
+<?php // $Id: configure_homepage.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ===== =========================================================================
 	Dokeos - elearning and course management software
@@ -717,7 +717,7 @@ switch($action){
 		if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://'))
 		{
 			$form->addElement('html', '</table><table border="0" cellpadding="5" cellspacing="0" width="100%"><tr><td>');
-			$form->addElement('submit', null, get_lang('Save'));
+			$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
 			$form->addElement('html', '</td></tr><tr><td>');
 			if (api_get_setting('wcag_anysurfer_public_pages')=='true')
 			{
@@ -729,13 +729,13 @@ switch($action){
 				$form->add_html_editor('link_html', '');
 			}
 			$form->addElement('html', '</td></tr><tr><td>');
-			$form->addElement('submit', null, get_lang('Save'));
+			$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
 			$form->addElement('html', '</td></tr>');
 		}
 		else
 		{
 			$form->addElement('html', '<tr><td>&nbsp;</td><td>');
-			$form->addElement('submit', null, get_lang('Save'));
+			$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
 			$form->addElement('html', '</td></tr>');
 		}
 
@@ -776,7 +776,7 @@ switch($action){
 		$renderer->setElementTemplate('<tr><td>{element}</td></tr>');
 		$renderer->setRequiredNoteTemplate('');
 		$form->addElement('hidden', 'formSent', '1');
-		$form->addElement('submit', null, get_lang('Save'));
+		$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
 		if($action == 'edit_news'){
 			$_languages=api_get_languages();
 			$html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
@@ -806,7 +806,7 @@ switch($action){
 			$default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
 			$form->add_html_editor($name, '');
 		}
-		$form->addElement('submit', null, get_lang('Save'));
+		$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
 		$form->setDefaults($default);
 		$form->display();
 

+ 7 - 4
main/admin/index.php

@@ -1,4 +1,4 @@
-<?php // $Id: index.php 18033 2009-01-27 21:08:58Z herodoto $
+<?php // $Id: index.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -87,7 +87,8 @@ if (api_is_platform_admin()) {
 	<ul>
 		<li style="list-style-type:none"><form method="get" action="user_list.php">	
 			<input type="text" name="keyword" value="<?php echo $keyword_url; ?>"/>
-			<input type="submit" value="<?php echo get_lang('Search'); ?>"/>
+			<button type="submit"> <?php echo get_lang('Search');?>
+			</button>
 			</form>
 		</li>
 		<li><a href="user_list.php?search=advanced"><?php echo ucfirst(get_lang('AdvancedSearch')); ?></a></li>
@@ -121,7 +122,8 @@ if(api_is_platform_admin()) {
 	<h4><?php Display::display_icon('course.gif', get_lang('Courses')); ?> <?php echo ucfirst(get_lang('Courses')); ?></h4>
 		<ul><li style="list-style-type:none"><form method="get" action="course_list.php">	
 		<input type="text" name="keyword" value="<?php echo $keyword_url; ?>"/>
-		<input type="submit" value="<?php echo get_lang('Search'); ?>"/>
+		<button type="submit"> <?php echo get_lang('Search');?>
+			</button>
 		</form></li>
 		<li>
 		<a href="course_list.php?search=advanced"><?php echo ucfirst(get_lang('AdvancedSearch')); ?></a>
@@ -178,7 +180,8 @@ if(api_get_setting('use_session_mode')=='true')
  <ul>
  <li style="list-style-type:none"><form method="POST" action="session_list.php">
 	<input type="text" name="keyword" value="<?php echo $keyword_url; ?>"/>
-	<input type="submit" value="<?php echo get_lang('Search'); ?>"/>
+	<button type="submit"> <?php echo get_lang('Search');?>
+			</button>
 	</form>
 </li>
   <li><a href="session_list.php"><?php echo get_lang('ListSession') ?></a></li>

+ 9 - 9
main/admin/settings.php

@@ -1,4 +1,4 @@
-<?php // $Id: settings.php 18160 2009-02-02 17:39:54Z herodoto $
+<?php // $Id: settings.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -58,7 +58,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script();
 
 // Submit Stylesheets
-if (!empty($_POST['submit_stylesheets']))
+if (isset($_POST['submit_stylesheets']))
 {
 	$message = store_stylesheets();
 	header("Location: ".api_get_self()."?category=stylesheets");
@@ -130,7 +130,7 @@ if (!empty($_GET['category']) and !in_array($_GET['category'], array('Plugins',
 		if ($i % 10 == 0 and $i<$b){
 			if ($_GET['category'] <> "Languages"){
 				$form->addElement('html','<div align="right">');
-				$form->addElement('submit', null,get_lang('SaveSettings'));
+				$form->addElement('style_submit_button', null,get_lang('SaveSettings'), 'class="save"');
 				$form->addElement('html','</div>');
 			}		
 		}
@@ -229,7 +229,7 @@ if (!empty($_GET['category']) and !in_array($_GET['category'], array('Plugins',
 	}
 	if ($_GET['category'] <> "Languages"){
 		$form->addElement('html','<div align="right">');
-		$form->addElement('submit', null,get_lang('SaveSettings'));
+		$form->addElement('style_submit_button', null,get_lang('SaveSettings'), 'class="save"');
 		$form->addElement('html','</div>');
 	}
 	$form->setDefaults($default_values);
@@ -373,7 +373,7 @@ function handle_plugins()
 	$userplugins = array();
 	$table_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
 
-	if (!empty($_POST['submit_plugins']))
+	if (isset($_POST['submit_plugins']))
 	{
 		store_plugins();
 		Display :: display_normal_message($SettingsStored);
@@ -491,7 +491,7 @@ function handle_plugins()
 				}
 	echo '</table>';
 
-	echo '<input type="submit" name="submit_plugins" value="'.get_lang('Ok').'" /></form>';
+	echo '<button class="save" type="submit" name="submit_plugins">'.get_lang('EnablePlugins').'</button></form>';
 			}
 
 
@@ -548,7 +548,7 @@ function handle_stylesheets()
 	$allowed_file_types = array ('css');
 	$form->addRule('new_stylesheet', get_lang('InvalidExtension').' ('.implode(',', $allowed_file_types).')', 'filetype', $allowed_file_types);
 	$form->addRule('new_stylesheet', get_lang('ThisFieldIsRequired'), 'required');
-	$form->addElement('submit', 'stylesheet_upload', get_lang('Ok'));
+	$form->addElement('style_submit_button', 'stylesheet_upload', get_lang('Ok'));
 	if( $form->validate() AND is_writable(api_get_path(SYS_CODE_PATH).'css/'))
 	{
 		$values = $form->exportValues();
@@ -636,7 +636,7 @@ function handle_stylesheets()
 	}
 	if ($is_style_changeable)
 	{	
-		echo '<input type="submit" name="submit_stylesheets" value="'.get_lang('Ok').'" /></form>';
+		echo '<button class="save" type="submit" name="submit_stylesheets"> '.get_lang('SaveSettings').' </button></form>';
 	}
 }
 
@@ -811,7 +811,7 @@ function handle_search() {
     $default_values['search_prefilter_prefix'] = api_get_setting('search_prefilter_prefix');
 
     //$form->addRule('search_show_unlinked_results', get_lang('ThisFieldIsRequired'), 'required');
-    $form->addElement('submit', 'search-options-save', get_lang('Ok'));
+    $form->addElement('style_submit_button', 'search-options-save', get_lang('Ok'));
     $form->setDefaults($default_values);
 
     if( $form->validate()) {

+ 2 - 2
main/admin/user_add.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_add.php 18078 2009-01-29 17:21:11Z cfasanando $
+<?php // $Id: user_add.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -310,7 +310,7 @@ $defaults['status'] = STUDENT;
 $defaults = array_merge($defaults,$extra_data);
 $form->setDefaults($defaults);
 // Submit button
-$form->addElement('submit', 'submit', get_lang('Add'));
+$form->addElement('button', 'submit', get_lang('Add'));
 $form->addElement('submit', 'submit_plus', get_lang('Add').'+');
 	
 // Validate form

+ 7 - 3
main/announcements/announcements.php

@@ -1,4 +1,4 @@
-<?php //$Id: announcements.php 18169 2009-02-02 22:07:38Z herodoto $
+<?php //$Id: announcements.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -1173,11 +1173,15 @@ if(!empty($error_message))
 		echo'<br />';
 		if(empty($_SESSION['toolgroup'])){
 			echo '<input type="hidden" name="submitAnnouncement" value="OK">';
-            echo '<br /><input type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[3],true)" /><br /><br />';
+            //echo '<br /><input type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[3],true)" /><br /><br />';
+            echo '<br /><button class="save"type="submit"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[3],true)" >'.get_lang('Send').'</button><br /><br />';
+            
 		}
 		else{
 			echo '<input type="hidden" name="submitAnnouncement" value="OK">';
-			echo '<br /><input type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" /><br /><br />';
+			//echo '<br /><input type="button"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" /><br /><br />';
+		    echo '<br /><button class="save"type="submit"  value="'.'  '.get_lang('Send').'  '.'" onclick="selectAll(this.form.elements[4],true)" >'.get_lang('Send').'</button><br /><br />';
+			
 		}
 		echo '</form><br />';
 

+ 5 - 5
main/auth/courses.php

@@ -1,4 +1,4 @@
-<?php // $Id: courses.php 17747 2009-01-15 21:03:02Z cfasanando $
+<?php // $Id: courses.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -455,7 +455,7 @@ function display_search_courses()
 					'<input type="hidden" name="sec_token" value="'.$stok.'">',
 					"<input type=\"hidden\" name=\"search_course\" value=\"1\" />",
 					"<input type=\"text\" name=\"search_term\" value=\"".(empty($_POST['search_term'])?'':$_POST['search_term'])."\" />",
-					"&nbsp;<input type=\"submit\" value=\"",get_lang("_search"),"\" />",
+					"&nbsp;<button type=\"submit\">",get_lang("_search")," </button>",
 					"</form>";
 	if (isset($_POST['search_course']))
 	{
@@ -618,7 +618,7 @@ function display_create_course_category_form()
 	echo "<form name=\"create_course_category\" method=\"post\" action=\"".api_get_self()."?action=sortmycourses\">\n";
 	echo '<input type="hidden" name="sec_token" value="'.$stok.'">';
 	echo "<input type=\"text\" name=\"title_course_category\" />\n";
-	echo "<input type=\"submit\" name=\"create_course_category\" value=\"".get_lang("Ok")."\" />\n";
+	echo "<button type=\"submit\" name=\"create_course_category\">".get_lang('Ok')." </button>\n";
 	echo "</form>\n";
 
 	echo get_lang("ExistingCourseCategories");
@@ -1076,7 +1076,7 @@ function display_change_course_category_form($edit_course)
 	while ($row=Database::fetch_array($result))
 		{$output.="\t\t<option value=\"".$row['id']."\">".$row['title']."</option>";}
 	$output.="\t</select>\n";
-	$output.="\t<input type=\"submit\" name=\"submit_change_course_category\" value=\"".get_lang("Ok")."\" />\n";
+	$output.="\t<button type=\"submit\" name=\"submit_change_course_category\">".get_lang("Ok")." </button>\n";
 	$output.="</form>";
 	return $output;
 }
@@ -1207,7 +1207,7 @@ function display_edit_course_category_form($edit_course_category)
 	echo '<input type="hidden" name="sec_token" value="'.$stok.'">';
 	$info_this_user_course_category=get_user_course_category($edit_course_category);
 	echo "\t<input type=\"text\" name=\"title_course_category\" value=\"".$info_this_user_course_category['title']."\" />";
-	echo "\t<input type=\"submit\" name=\"submit_edit_course_category\" value=\"".get_lang("Ok")."\" />\n";
+	echo "\t<button type=\"submit\" name=\"submit_edit_course_category\">".get_lang("Ok")." </button>\n";
 	echo "</form>";
 }
 

+ 8 - 8
main/auth/profile.php

@@ -1,4 +1,4 @@
-<?php // $Id: profile.php 18078 2009-01-29 17:21:11Z cfasanando $
+<?php // $Id: profile.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 ==============================================================================
@@ -121,18 +121,18 @@ $form = new FormValidator('profile', 'post', api_get_self()."?".str_replace('&fe
 /* Make sure this is the first submit on the form, even though it is hidden!
  * Otherwise, if a user has productions and presses ENTER to submit, he will
  * attempt to delete the first production in the list. */
-if (is_profile_editable())
-	$form->addElement('submit', null, get_lang('SaveSettings'), array('style' => 'visibility:hidden;'));
+//if (is_profile_editable())
+//	$form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"', array('style' => 'visibility:hidden;'));
 
 //	SUBMIT (visible)
-if (is_profile_editable())
+/*if (is_profile_editable())
 {
-	$form->addElement('submit', 'apply_change', get_lang('SaveSettings'));
+	$form->addElement('style_submit_button', 'apply_change', get_lang('SaveSettings'), 'class="save"');
 }
 else
 {
 	$form->freeze();
-}
+}*/
 
 //THEME
 if (is_profile_editable() && api_get_setting('user_selected_theme') == 'true')
@@ -387,7 +387,7 @@ foreach($extra as $id => $field_details)
 //	SUBMIT
 if (is_profile_editable())
 {
-	$form->addElement('submit', 'apply_change', get_lang('SaveSettings'));
+	$form->addElement('style_submit_button', 'apply_change', get_lang('SaveSettings'), 'class="save"');
 }
 else
 {
@@ -796,4 +796,4 @@ echo '</div>';
 
 $form->display();
 Display :: display_footer();
-?>
+?>

+ 2 - 2
main/calendar/agenda.inc.php

@@ -1,4 +1,4 @@
-<?php //$Id: agenda.inc.php 18169 2009-02-02 22:07:38Z herodoto $
+<?php //$Id: agenda.inc.php 18203 2009-02-03 18:02:16Z ndieschburg $
 
 /*
 ==============================================================================
@@ -2537,7 +2537,7 @@ function show_add_form($id = '')
 		</td>
         <td colspan="2" align="right">
         <label for="ical_import"><?php echo get_lang('ICalFileImport');?></label>
-        <input type="file" name="ical_import"/><input type="submit" name="ical_submit" value="<?php echo get_lang('Ok');?>"/>
+        <input type="file" name="ical_import"/><button class="save" type="submit" name="ical_submit"><?php echo get_lang('Import');?></button>
         </td>
 	</tr>
 

+ 2 - 2
main/calendar/agenda.php

@@ -1,4 +1,4 @@
-<?php //$Id: agenda.php 18113 2009-02-01 11:25:38Z ivantcholakov $
+<?php //$Id: agenda.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -324,7 +324,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 	switch ($_GET['action'])
 	{
 		case "add":			
-            if(!empty($_POST['ical_submit']))
+            if(isset($_POST['ical_submit']))
             {
                 $course_info = api_get_course_info();
                 agenda_import_ical($course_info,$_FILES['ical_import']);

+ 3 - 3
main/course_description/index.php

@@ -1,4 +1,4 @@
-<?php // $Id: index.php 18079 2009-01-29 17:56:50Z herodoto $
+<?php // $Id: index.php 18203 2009-02-03 18:02:16Z ndieschburg $
 
 /*
 ==============================================================================
@@ -204,7 +204,7 @@ if (api_is_allowed_to_edit() && !is_null($description_id) || $action =='add') {
 		} else {
 			$form->add_html_editor('contentDescription', get_lang('Content'));
 		}
-		$form->addElement('submit', null, get_lang('Save'));
+		$form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
 		// Set some default values
 		$default['title'] = $default_description_titles[$description_id];
 		$default['contentDescription'] = $description_content;
@@ -331,4 +331,4 @@ if ($show_description_list) {
 ==============================================================================
 */
 Display :: display_footer();
-?>
+?>

+ 2 - 2
main/create_course/add_course.php

@@ -1,5 +1,5 @@
 <?php
-// $Id: add_course.php 17497 2009-01-01 23:51:57Z yannoo $
+// $Id: add_course.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 ==============================================================================
@@ -70,7 +70,7 @@ $form->add_textfield('wanted_code', get_lang('Code'),false,array('size'=>'$maxle
 $form->addRule('wanted_code',get_lang('Max'),'maxlength',$maxlength);
 $titular= &$form->add_textfield('tutor_name', get_lang('Professors'),true,array('size'=>'60'));
 $form->addElement('select_language', 'course_language', get_lang('Ln'));
-$form->addElement('submit', null, get_lang('Ok'));
+$form->addElement('style_submit_button', null, get_lang('Create'));
 $form->add_progress_bar();
 
 // Set default values

+ 125 - 1
main/css/academica/default.css

@@ -1464,5 +1464,129 @@ span.radio {
 #exercise_close_link:hover{
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
-} 
+} 
+
+
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
    

+ 124 - 0
main/css/baby_orange/default.css

@@ -1466,4 +1466,128 @@ span.radio {
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
 } 
+   
+   
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
    

+ 124 - 0
main/css/corporate/default.css

@@ -1473,4 +1473,128 @@ span.radio {
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
 } 
+
+
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
    

+ 125 - 0
main/css/cosmic_campus/default.css

@@ -1499,4 +1499,129 @@ span.radio {
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
 } 
+
+
+
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
    

+ 122 - 69
main/css/dokeos_classic/default.css

@@ -1854,10 +1854,9 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 }
 .actions a {
 	margin-right: 10px;
-	vertical-align:middle;
+	vertical-align:middle;
 }
 
-
 /**********************************************
  *  MESSAGE TOOL                           *
  **********************************************/
@@ -1924,72 +1923,126 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
    }
    
    
-   
-/**********************************************
- *  EXERCISE TOOL                           *
- **********************************************/
-.exercice_form {
-	width: 300px;
-}
-#validationButton{
-	text-decoration: none;
-	margin: 5px;
-	/*border:1px solid #999999;*/
-	/*background:#F0F0F0;  */
-	padding: 3px; 
-	padding-left:10px;
-	padding-right:10px;
-	font-weight:bold;
-	color:#666;
-}
-.rounded{
-	background:#ccc;
-	padding: 3px;
-	width: 200px;
-	margin-left:10px;
-}
-.rounded_inner{
-	background:#FFF;
-	padding-top: 10px;
-	padding-bottom: 10px;		
-}
-.rounded_inner:hover{
-	color:#C802A5;
-	background:#F0F0F0;
-}
-.exercise_scenario_label{
-
-}
-.exercise_scenario_element{
-
-}
-span.checkbox {
-	width: 19px;
-	height: 25px;
-	padding: 0 5px 0 0;
-	background: url(images/checkbox.gif) no-repeat;
-	display: block;
-	clear: left;
-	float: left;
-}
-span.radio {
-	width: 19px;
-	height: 25px;
-	padding: 0 5px 0 0;
-	background: url(images/radio.gif) no-repeat;
-	display: block;
-	clear: left;
-	float: left;
-}
-#question_title{
-
-}
-#exercise_close_link{
-	background: url(images/close.gif) no-repeat;
-	padding-left: 20px; 
+ /*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
 }
-#exercise_close_link:hover{
-	background: url(images/close_highlight.gif) no-repeat;
-	padding-left: 20px; 
-} 
    

+ 124 - 0
main/css/dokeos_classic_2D/default.css

@@ -2577,4 +2577,128 @@ span.radio {
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
 } 
+
+
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
    

+ 122 - 0
main/css/medical/default.css

@@ -1976,4 +1976,126 @@ span.radio {
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
 } 
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
    

+ 126 - 2
main/css/public_admin/default.css

@@ -1877,7 +1877,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 .actions a {
 	margin-right: 10px;
 	vertical-align:middle;
-}
+}
 
 /**********************************************
  *  MESSAGE TOOL                           *
@@ -1941,7 +1941,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
     position:relative;
 	margin-top:115px;
 	margin-right:-100px;
-}
+   }
 
 /**********************************************
  *  EXERCISE TOOL                           *
@@ -2010,3 +2010,127 @@ span.radio {
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
 } 
+
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
+   

+ 124 - 0
main/css/silver_line/default.css

@@ -2079,4 +2079,128 @@ span.radio {
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
 } 
+
+
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
    

+ 124 - 0
main/css/sober_brown/default.css

@@ -2044,4 +2044,128 @@ span.radio {
 	background: url(images/close_highlight.gif) no-repeat;
 	padding-left: 20px; 
 } 
+
+
+/*****************************************************
+ *  BUTTONS	                                         *
+ *****************************************************/
+/* BUTTONS */
+button {
+/*display:block;
+    float:left;*/
+    margin:0 8px 0 0;
+    background-color:#f5f5f5;
+    border:2px solid #909090;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+    -moz-border-radius-topright : 10px;
+    -moz-border-radius-topleft : 10px;
+    -moz-border-radius-bottomright : 10px;
+    -moz-border-radius-bottomleft : 10px;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:100%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    outline:none;
+    cursor:pointer;
+    padding:3px 5px 3px 5px; /* Links */
+}
+button:hover{
+    background-color:#e0e0e0;
+    color:#545454; 
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button:active{
+	background-color:#909090;
+   border:2px solid #909090;
+   color:#fff;
+   outline:none;
+}
+button img{
+    margin:0 10px -3px -3px !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+/* NEGATIVE */
+
+button.negative, .cancel{
+    color:#680000;
+    border-bottom:2px inset #800000;
+    border-right:2px inset #800000;
+    outline:none;
+}
+button.negative, .cancel:hover{
+    background:#f5f5f5;
+    color:#d12f19;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.negative:active{
+    background-color:#380000;
+    border:2px solid #380000;
+    color:#fff;
+    outline:none;
+}
+/*including "cross" image*/
+button.cancel{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/delete.gif);
+    background-repeat:no-repeat;
+}
+/* POSITIVE */
+
+button.positive, .save, .add{
+    color:#529214;
+    border-bottom:2px inset #529220;
+    border-right:2px inset #52922;
+    outline:none;
+}
+button.positive, .save:hover,.add:hover{
+    background-color:#E6EFC2;
+    color:#529214;
+    border-top:2px solid #eee;
+    border-left:2px solid #eee;
+}
+button.positive:active{
+    background-color:#698B22;
+    border:2px solid #556b2f;
+    color:#fff;
+    outline:none;
+}
+/*including "save" image*/
+button.save{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/accept.png);
+    background-repeat:no-repeat;
+}
+/*including "add" image*/
+button.add{
+	 margin:0 10px -3px -3px !important;
+    padding:3px 1px 1px 23px;
+    /*text-decoration:none;
+    text-align:right;*/
+    width:auto;
+    height:100%;
+    background-position:3%;
+    background-image:url(/main/img/addd.gif);
+    background-repeat:no-repeat;
+}
    

+ 3 - 3
main/document/create_document.php

@@ -1,4 +1,4 @@
-<?php // $Id: create_document.php 18028 2009-01-27 15:13:17Z ivantcholakov $
+<?php // $Id: create_document.php 18203 2009-02-03 18:02:16Z ndieschburg $
 
 /*
 ==============================================================================
@@ -366,14 +366,14 @@ else
 	));		
 }
 
-$form->addElement('submit', 'submit', get_lang('SaveDocument'));
+//$form->addElement('style_submit_button', 'submit', get_lang('SaveDocument'), 'class="save"');
 
 // HTML-editor
 $form->add_html_editor('content','', false, false);
 // Comment-field
 
 //$form->addElement('textarea', 'comment', get_lang('Comment'), array ('rows' => 5, 'cols' => 50));
-$form->addElement('submit', 'submit', get_lang('CreateTheDocument'));
+$form->addElement('style_submit_button', 'submit', get_lang('langCreateDoc'), 'class="save"');
 $form->setDefaults($default);
 
 // HTML

+ 2 - 2
main/document/document.inc.php

@@ -1,4 +1,4 @@
-<?php // $Id: document.inc.php 17556 2009-01-07 10:46:20Z herodoto $
+<?php // $Id: document.inc.php 18203 2009-02-03 18:02:16Z ndieschburg $
 
 /*
 ==============================================================================
@@ -368,7 +368,7 @@ function build_move_to_selector($folders,$curdirpath,$move_file,$group_dir='')
 	}
 
 	$form .= '</select>'."\n";
-	$form .= '<input type="submit" name="move_file_submit" value="'.get_lang('Ok').'" />'."\n";
+	$form .= '<button type="submit" name="move_file_submit">'.get_lang('Ok').'</button>'."\n";
 	$form .= '</form>';
 
 	return $form;

+ 3 - 3
main/document/document.php

@@ -1,4 +1,4 @@
-<?php // $Id: document.php 18113 2009-02-01 11:25:38Z ivantcholakov $
+<?php // $Id: document.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -531,7 +531,7 @@ if($is_allowed_to_edit || $group_member_with_upload_rights) // TEACHER ONLY
 		$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$curdirpath.'" />';
 		$new_folder_text .= get_lang('NewDir') .' ';
 		$new_folder_text .= '<input type="text" name="dirname" />';
-		$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'" />';
+		$new_folder_text .= '<button type="submit" name="create_dir">'.get_lang('CreateFolder').'</button>';
 		$new_folder_text .= '</form>';
 		//show the form
 		Display::display_normal_message($new_folder_text,false);
@@ -593,7 +593,7 @@ if($is_allowed_to_edit || $group_member_with_upload_rights) // TEACHER ONLY
 		$new_folder_text .= '<td><input type="text" name="template_title" /></td></tr>';
 		$new_folder_text .= '<tr><td>'.get_lang('TemplateDescription').' : </td>';
 		$new_folder_text .= '<td><textarea name="template_description"></textarea></td></tr></table>';
-		$new_folder_text .= '<input type="submit" name="create_template" value="'.get_lang('Ok').'" />';
+		$new_folder_text .= '<button type="submit" name="create_template">'.get_lang('Ok').'</button>';
 		$new_folder_text .= '</form>';
 		//show the form
 		Display::display_normal_message($new_folder_text,false);		

+ 3 - 3
main/document/edit_document.php

@@ -1,4 +1,4 @@
-<?php // $Id: edit_document.php 18028 2009-01-27 15:13:17Z ivantcholakov $
+<?php // $Id: edit_document.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -616,7 +616,7 @@ if ($owner_id == $_user['user_id'] || api_is_platform_admin() || api_is_allowed_
 	{
 		if (empty($readonly) && $readonly==0)
 		{	
-			$form->addElement('submit','submit',get_lang('SaveDocument'));	
+			$form->addElement('style_submit_button','submit',get_lang('SaveDocument'), 'class="save"');	
 			$_SESSION['showedit']=1;
 			$form->add_html_editor('texte','',false,true);
 		}			
@@ -641,7 +641,7 @@ if ($owner_id == $_user['user_id'] || api_is_platform_admin() || api_is_allowed_
 			$checked->setChecked(true);
 		}
 	}		
-	$form->addElement('submit','submit',get_lang('SaveDocument'));
+	$form->addElement('style_submit_button','submit',get_lang('SaveDocument'), 'class="save"');
 			
 	$defaults['filename'] = $filename;
 	$defaults['extension'] = $extension;

+ 3 - 3
main/document/upload.php

@@ -1,4 +1,4 @@
-<?php // $Id: upload.php 17608 2009-01-08 23:26:20Z marvil07 $
+<?php // $Id: upload.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -516,7 +516,7 @@ if(isset($_GET['createdir']))
 	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
 	$new_folder_text .= get_lang('NewDir') .' ';
 	$new_folder_text .= '<input type="text" name="dirname"/>';
-	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
+	$new_folder_text .= '<button type="submit" class="save" name="create_dir">'.get_lang('CreateFolder').'</button>';
 	$new_folder_text .= '</form>';
 	//show the form
 	Display::display_normal_message($new_folder_text, false);
@@ -576,7 +576,7 @@ $form->addElement('radio', 'if_exists', get_lang('UplWhatIfFileExists'), get_lan
 $form->addElement('radio', 'if_exists', '', get_lang('UplOverwriteLong'), 'overwrite');
 $form->addElement('radio', 'if_exists', '', get_lang('UplRenameLong'), 'rename');
 
-$form->addElement('submit', 'submitDocument', get_lang('Ok'));
+$form->addElement('style_submit_button', 'submitDocument', get_lang('Ok'),'class="save"');
 
 $form->add_real_progress_bar('DocumentUpload','user_upload');
 

+ 2 - 2
main/dropbox/dropbox_functions.inc.php

@@ -473,7 +473,7 @@ function display_addcategory_form($category_name='', $id='')
 	echo "\t<td valign=\"top\">\n";
 	echo "\t</td>\n";
 	echo "\t<td>\n";
-	echo "<input type=\"submit\" name=\"StoreCategory\" value=\"".get_lang('Ok')."\">";
+	echo "<button class=\"save\"type=\"submit\" name=\"StoreCategory\"> ".get_lang('AddEdit')."</button>";
 	echo "\t</td>\n";
 	echo "\t</tr>\n";
 	echo "</table>\n";
@@ -641,7 +641,7 @@ function display_add_form()
 	echo "</select>",
 		"</td></tr>",
 		"<tr><td></td>",
-		"<td><input type=\"Submit\" name=\"submitWork\" value=\"".dropbox_lang("ok", "noDLTT")."\" />",
+		"<td><button type=\"Submit\" name=\"submitWork\">".dropbox_lang("upload", "noDLTT")." </button>",
 		"</td></tr>",
 		"</table>",
 		"</form>";

+ 2 - 2
main/dropbox/index.php

@@ -163,7 +163,7 @@ if ($_GET['action']=="add") {
 	display_add_form();
 }
 
-if ($_POST['submitWork']) {
+if (isset($_POST['submitWork'])) {
 	$check = Security::check_token();
 	if ($check) {
 		Display :: display_confirmation_message(store_add_dropbox());
@@ -185,7 +185,7 @@ if ($_GET['action']=='editcategory' and isset($_GET['id'])) {
 }
 
 // *** storing a new or edited category ***
-if ($_POST['StoreCategory']) {
+if (isset($_POST['StoreCategory'])) {
 	Display :: display_confirmation_message(store_addcategory());
 }
 

+ 2 - 2
main/exercice/answer_admin.inc.php

@@ -22,7 +22,7 @@
 *	This script allows to manage answers. It is included from the script admin.php
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: answer_admin.inc.php 15602 2008-06-18 08:52:24Z pcool $
+* 	@version $Id: answer_admin.inc.php 18203 2009-02-03 18:02:16Z ndieschburg $
 */
 
 
@@ -956,7 +956,7 @@ if($modifyAnswers)
   <td colspan="5"><?php echo get_lang('Answers'); ?> :</td>
 </tr>
 <tr bgcolor="#E6E6E6">
-  <td>N°</td>
+  <td>N�</td>
   <td><?php echo get_lang('True'); ?></td>
   <td><?php echo get_lang('Answer'); ?></td>
   <td><?php echo get_lang('Comment'); ?></td>

+ 2 - 2
main/exercice/exercice.php

@@ -1,4 +1,4 @@
-<?php // $Id: exercice.php 18113 2009-02-01 11:25:38Z ivantcholakov $
+<?php // $Id: exercice.php 18203 2009-02-03 18:02:16Z ndieschburg $
 
 /*
 ==============================================================================
@@ -680,7 +680,7 @@ echo '<div class="actions">';
 				}
 				$form_filter = '<form method="post" action="'.api_get_self().'?cidReq='.api_get_course_id().'&show=result">';
 				$form_filter .= make_select('filter',array(1=>get_lang('FilterByNotRevised'),2=>get_lang('FilterByRevised')),$filter);
-				$form_filter .= '<input type="submit" value="'.get_lang('FilterExercices').'"> </form>';
+				$form_filter .= '<button type="submit">'.get_lang('FilterExercices').'</button></form>';
 				echo $form_filter;
 			}
 		}

+ 6 - 6
main/exercice/exercice_submit.php

@@ -1,4 +1,4 @@
-<?php // $Id: exercice_submit.php 18002 2009-01-26 16:33:20Z juliomontoya $
+<?php // $Id: exercice_submit.php 18203 2009-02-03 18:02:16Z ndieschburg $
 
 /*
 ==============================================================================
@@ -42,7 +42,7 @@
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
 * 	@author Julio Montoya multiple fill in blank option added
-* 	@version $Id: exercice_submit.php 18002 2009-01-26 16:33:20Z juliomontoya $
+* 	@version $Id: exercice_submit.php 18203 2009-02-03 18:02:16Z ndieschburg $
 */
 
 
@@ -1297,9 +1297,9 @@ else
 	// end foreach()
 	
 	echo "	  	
-		 <!-- <input type='submit' name='buttonCancel' value=".get_lang('Cancel')." />
+		 <!-- <button type='submit' name='buttonCancel' class='cancel'>".get_lang('Cancel')."</button>
 	   &nbsp;&nbsp; //--><br />";
-		$submit_btn="<input type='submit' name='submit' value='";
+		$submit_btn="<button class=\"save\" type='submit' name='submit'>";
 		//	$submit_btn.=get_lang('ValidateAnswer'); 
 		if ($objExercise->selectFeedbackType()==1 && $_SESSION['objExercise']->selectType()==2) {						
 			$submit_btn='';
@@ -1322,7 +1322,7 @@ else
 			{
 				$submit_btn.=get_lang('Next').' &gt;';
 			}
-			$submit_btn.= '\' />'; 
+			$submit_btn.= "</button>"; 
 		}			
 	echo $submit_btn;	 
 	echo "</form>";	
@@ -1344,4 +1344,4 @@ else
 
 if ($origin != 'learnpath') { //so we are not in learnpath tool
     Display::display_footer();
-}
+}

+ 2 - 2
main/exercice/exercise.class.php

@@ -25,7 +25,7 @@
 *	Exercise class: This class allows to instantiate an object of type Exercise
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: exercise.class.php 18098 2009-01-30 23:12:27Z cvargas1 $
+* 	@version $Id: exercise.class.php 18203 2009-02-03 18:02:16Z ndieschburg $
 */
 
 
@@ -914,7 +914,7 @@ class Exercise
 		}
 		
 		// submit
-		$form -> addElement('submit', 'submitExercise', get_lang('Ok'));
+		$form -> addElement('style_submit_button', 'submitExercise', get_lang('CreateModif'), 'class="save"');
 		
 		$form -> addRule ('exerciseTitle', get_lang('GiveExerciseName'), 'required');			
 		if($type=='full') {

+ 3 - 3
main/exercice/exercise_result.php

@@ -29,7 +29,7 @@
 *	@author Olivier Brouckaert, main author
 *	@author Roan Embrechts, some refactoring
 * 	@author Julio Montoya Armas switchable fill in blank option added
-* 	@version $Id: exercise_result.php 17972 2009-01-23 20:11:22Z juliomontoya $
+* 	@version $Id: exercise_result.php 18203 2009-02-03 18:02:16Z ndieschburg $
 *
 *	@todo	split more code up in functions, move functions to library?
 */
@@ -1057,7 +1057,7 @@ $exerciseTitle=api_parse_tex($exerciseTitle);
 			<?php
 			if ($origin != 'learnpath') {
 			?>
-			<input type="submit" value="<?php echo get_lang('Finish'); ?>" />
+			<button type="submit" class="save"><?php echo get_lang('Finish');?></button>
 			<?php
 			} else {							
 			?>							
@@ -1183,4 +1183,4 @@ if(count($arrques)>0) {
 		}	
 	api_mail_html($student_name, $to, $subject, $mail_content, $from_name, $from, array('encoding'=>$mycharset,'charset'=>$mycharset));
 }
-?>
+?>

+ 2 - 2
main/exercice/hotpotatoes.php

@@ -22,7 +22,7 @@
 *	Code for Hotpotatoes integration.
 *	@package dokeos.exercise
 * 	@author Istvan Mandak
-* 	@version $Id: hotpotatoes.php 13477 2007-10-12 12:20:24Z elixir_inter $
+* 	@version $Id: hotpotatoes.php 18203 2009-02-03 18:02:16Z ndieschburg $
 */
 
 
@@ -279,7 +279,7 @@ if(($is_allowedToEdit) && (($finish == 0) || ($finish == 2)))
 			echo '<td width="250">';
 			echo '</td>';
 			echo '<td>';
-				echo '<input type="submit" name="submit" value="'.get_lang('Send').'">';
+				echo '<button type="submit" name="submit">'.get_lang('Send').'</button>';
 			echo '</td>';
 		echo '</tr>';
 	echo '</table>';

+ 4 - 4
main/exercice/matching.class.php

@@ -171,8 +171,8 @@ class Matching extends Question {
 
 		$form -> addElement ('html', '</table></div></div>');
 		$group = array();
-		$group[] = FormValidator :: createElement ('submit', 'lessMatches', get_lang('DelElem'));
-		$group[] = FormValidator :: createElement ('submit', 'moreMatches', get_lang('AddElem'));
+		$group[] = FormValidator :: createElement ('style_submit_button', 'lessMatches', get_lang('DelElem'));
+		$group[] = FormValidator :: createElement ('style_submit_button', 'moreMatches', get_lang('AddElem'));
 		$form -> addGroup($group);
 
 
@@ -216,8 +216,8 @@ class Matching extends Question {
 
 		$form -> addElement ('html', '</table></div></div>');
 		$group = array();
-		$group[] = FormValidator :: createElement ('submit', 'lessOptions', get_lang('DelElem'));
-		$group[] = FormValidator :: createElement ('submit', 'moreOptions',get_lang('AddElem'));
+		$group[] = FormValidator :: createElement ('style_submit_button', 'lessOptions', get_lang('DelElem'));
+		$group[] = FormValidator :: createElement ('style_submit_button', 'moreOptions',get_lang('AddElem'));
 		$form -> addGroup($group);
 
 		$form -> setDefaults($defaults);

+ 2 - 2
main/exercice/multiple_answer.class.php

@@ -152,8 +152,8 @@ class MultipleAnswer extends Question {
 		
 		$form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required');
 
-		$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'));
-		$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'));
+		$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'));
+		$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'));
 		$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
 		$renderer->setElementTemplate('{element}','moreAnswers');
 		$form -> addElement ('html', '</div></div>');

+ 2 - 2
main/exercice/question_admin.inc.php

@@ -27,7 +27,7 @@
 * 	It is included from the script admin.php
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: question_admin.inc.php 18002 2009-01-26 16:33:20Z juliomontoya $
+* 	@version $Id: question_admin.inc.php 18203 2009-02-03 18:02:16Z ndieschburg $
 */
 
 /*
@@ -94,7 +94,7 @@ if(is_object($objQuestion))
 
 	$objQuestion -> createAnswersForm ($form);
 
-	$form->addElement('submit','submitQuestion',get_lang('Ok'));
+	$form->addElement('style_submit_button','submitQuestion',get_lang('CreateModif'), 'class="save"');
 	$renderer = $form->defaultRenderer();
 	$renderer->setElementTemplate('<div class="row"><div class="label">{label}</div><div class="formw">{element}</div></div>','submitQuestion');
 

+ 2 - 2
main/exercice/unique_answer.class.php

@@ -256,8 +256,8 @@ class UniqueAnswer extends Question {
 		
 		$form -> addElement ('html', '</table>');
 
-		$form->addElement('submit', 'lessAnswers', get_lang('LessAnswer'));
-		$form->addElement('submit', 'moreAnswers', get_lang('PlusAnswer'));
+		$form->addElement('style_submit_button', 'lessAnswers', get_lang('LessAnswer'));
+		$form->addElement('style_submit_button', 'moreAnswers', get_lang('PlusAnswer'));
 		
 		$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
 		$renderer->setElementTemplate('{element}','moreAnswers');

+ 2 - 2
main/glossary/index.php

@@ -62,7 +62,7 @@ if (api_is_allowed_to_edit())
 		$form->addElement('header', '', get_lang('TermAddNew'));
 		$form->addElement('text', 'glossary_title', get_lang('TermName'));
 		$form->addElement('html_editor', 'glossary_comment', get_lang('TermDefinition'));
-		$form->addElement('submit', 'SubmitGlossary', get_lang('Ok'));	
+		$form->addElement('style_submit_button', 'SubmitGlossary', get_lang('TermAddButton'), 'class="add"');	
 		
 		// setting the rules
 		$form->addRule('glossary_title', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');	
@@ -97,7 +97,7 @@ if (api_is_allowed_to_edit())
 		$form->addElement('hidden', 'glossary_id');
 		$form->addElement('text', 'glossary_title', get_lang('TermName'));
 		$form->addElement('html_editor', 'glossary_comment', get_lang('TermDefinition'));
-		$form->addElement('submit', 'SubmitGlossary', get_lang('Ok'));	
+		$form->addElement('style_submit_button', 'SubmitGlossary', get_lang('TermUpdateButton'), 'class="save"');	
 		
 		// setting the defaults
 		$defaults = get_glossary_information(Security::remove_XSS($_GET['glossary_id']));

+ 1 - 1
main/gradebook/lib/fe/catform.class.php

@@ -149,7 +149,7 @@ class CatForm extends FormValidator {
    		$this->addElement('hidden','hid_parent_id');
 		$this->addElement('textarea', 'description', get_lang('Description'),array('rows'=>'3','cols' => '34'));
 		$this->addElement('checkbox', 'visible',get_lang('Visible'));
-		$this->addElement('submit', null, get_lang('Ok'));
+		$this->addElement('style_submit_button', null, get_lang('EditCategory'), 'class="save"');
 		$this->addRule('weight',get_lang('OnlyNumbers'),'numeric');
 		$this->addRule('weight',get_lang('NoDecimals'),'nopunctuation');
 		$this->addRule(array ('weight', 'zero'), get_lang('NegativeValue'), 'compare', '>=');

+ 1 - 1
main/gradebook/lib/fe/scoredisplayform.class.php

@@ -138,7 +138,7 @@ class ScoreDisplayForm extends FormValidator
 		}
 		$this->setDefaults(array (
 		'enablescore' => $displayscore->is_custom(), 'includeupperlimit' => $displayscore->is_upperlimit_included()));
-		$this->addElement('submit', 'submit', get_lang('Ok'));
+		$this->addElement('style_submit_button', 'submit', get_lang('Ok'));
 	}
 	function validate() {
 		return parent :: validate();

+ 2 - 2
main/group/group_category.php

@@ -1,5 +1,5 @@
 <?php
-// $Id: group_category.php 16962 2008-11-26 20:40:18Z yannoo $
+// $Id: group_category.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@@ -183,7 +183,7 @@ $form->addElement('radio', 'wiki_state', null, get_lang('Public'), TOOL_PUBLIC);
 $form->addElement('radio', 'wiki_state', null, get_lang('Private'), TOOL_PRIVATE);
 
 // Submit
-$form->addElement('submit', 'submit', get_lang('Ok'));
+$form->addElement('style_submit_button', 'submit', get_lang('PropModify'), 'class="save"');
 // If form validates -> save data
 if ($form->validate())
 {

+ 2 - 2
main/group/group_creation.php

@@ -260,7 +260,7 @@ EOT;
 	$defaults['action'] = 'create_groups';
 	$defaults['number_of_groups'] = $_POST['number_of_groups'];
 	$form->setDefaults($defaults);
-	$form->addElement('submit', 'submit', get_lang('Ok'));
+	$form->addElement('style_submit_button', 'submit', get_lang('Create'), 'class="save"');
 	$form->display();
 	}
 }
@@ -279,7 +279,7 @@ else
 		$group_el[] = & $create_groups_form->createElement('static', null, null, get_lang('Create'));
 		$group_el[] = & $create_groups_form->createElement('text', 'number_of_groups', null, array ('size' => 3));
 		$group_el[] = & $create_groups_form->createElement('static', null, null, get_lang('NewGroups'));
-		$group_el[] = & $create_groups_form->createElement('submit', 'submit', get_lang('Ok'));
+		$group_el[] = & $create_groups_form->createElement('style_submit_button', 'submit', get_lang('Create'), 'class="save"');
 		$create_groups_form->addGroup($group_el, 'create_groups', null, ' ', false);
 		$defaults = array ();
 		$defaults['number_of_groups'] = 1;

+ 1 - 1
main/group/group_edit.php

@@ -253,7 +253,7 @@ $group_members_element->setElementTemplate('
 $form->addFormRule('check_group_members');
 
 // submit button
-$form->addElement('submit', 'submit', get_lang('Ok'));
+$form->addElement('style_submit_button', 'submit', get_lang('PropModify'), 'class="save"');
 
 if ($form->validate()) {
 	$values = $form->exportValues();

binární
main/img/accept.png


binární
main/img/addd.gif


+ 2 - 2
main/inc/introductionSection.inc.php

@@ -73,9 +73,9 @@ else
 $renderer =& $form->defaultRenderer();
 $renderer->setElementTemplate('<div style="width: 80%; margin: 0px auto; padding-bottom: 10px; ">{element}</div>');
 
-$form->addElement('submit', 'intro_cmdUpdate', get_lang('Save'));
+$form->addElement('style_submit_button', 'intro_cmdUpdate', get_lang('Save'), 'class="save"');
 $form->add_html_editor('intro_content',null,null,false);
-$form->addElement('submit', 'intro_cmdUpdate', get_lang('Save'));
+$form->addElement('style_submit_button', 'intro_cmdUpdate', get_lang('Save'), 'class="save"');
 
 /*=========================================================
   INTRODUCTION MICRO MODULE - COMMANDS SECTION (IF ALLOWED)

+ 2 - 2
main/inc/lib/fileUpload.lib.php

@@ -1839,8 +1839,8 @@ function build_missing_files_form($missing_files,$upload_path,$file_name)
 					   ."</tr>\n";
 				}
 				$form .= "</table>\n"
-						."<input type=\"submit\" name=\"cancel_submit_image\" value=\"".get_lang('Cancel')."\"/>\n"
-						."<input type=\"submit\" name=\"submit_image\" value=\"".get_lang('Ok')."\"/><br/>"
+						."<button class=\"cancel\" type=\"submit\" name=\"cancel_submit_image\">".get_lang('Cancel')."<\button>\n"
+						."<button class=\"save\" type=\"submit\" name=\"submit_image\">".get_lang('Ok')."<\button><br/>"
 						."</form>\n";
 				return $form;
 }

+ 231 - 0
main/inc/lib/formvalidator/Element/style_button.php

@@ -0,0 +1,231 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Base class for <input /> form elements
+ * 
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.01 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_01.txt If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category    HTML
+ * @package     HTML_QuickForm
+ * @author      Adam Daniel <adaniel1@eesus.jnj.com>
+ * @author      Bertrand Mansion <bmansion@mamasam.com>
+ * @copyright   2001-2007 The PHP Group
+ * @license     http://www.php.net/license/3_01.txt PHP License 3.01
+ * @version     CVS: $Id: input.php 17344 2008-12-17 08:55:29Z Scara84 $
+ * @link        http://pear.php.net/package/HTML_QuickForm
+ */
+
+/**
+ * Base class for form elements
+ */ 
+require_once 'HTML/QuickForm/element.php';
+
+/**
+ * Base class for <button></button> form elements
+ * 
+ * @category    HTML
+ * @package     HTML_QuickForm
+ * @author      Hans De Bisschop <hans.de.bisschop@ehb.be>
+ * @abstract
+ */
+class HTML_QuickForm_stylebutton extends HTML_QuickForm_element
+{
+	// {{{ properties
+	/* Path to image */
+
+	
+    // {{{ constructor
+    /**
+     * Class constructor
+     * 
+     * @param    string     Input field name attribute
+     * @param    mixed      Label(s) for the input field
+     * @param    mixed      Either a typical HTML attribute string or an associative array
+     * @since     1.0
+     * @access    public
+     * @return    void
+     */
+    function HTML_QuickForm_stylebutton($elementName=null, $elementLabel=null, $attributes=null)
+    {
+        $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
+        
+    } //end constructor
+
+    // }}}
+    // {{{ setType()
+
+    /**
+     * Sets the element type
+     *
+     * @param     string    $type   Element type
+     * @since     1.0
+     * @access    public
+     * @return    void
+     */
+  
+  
+    /* Returns an HTML formatted attribute string
+     * @param    array   $attributes
+     * @return   string
+     * @access   private
+     */ 
+    function _getAttrString($attributes)
+    {
+        $strAttr = '';
+
+        if (is_array($attributes)) {
+            foreach ($attributes as $key => $value) {
+            	if ($key != 'value') $strAttr .= ' ' . $key . '="' . htmlspecialchars($value) . '"';
+            }
+        }
+        return $strAttr;
+    } // end func _getAttrString
+  
+    
+    function setType($type)
+    {
+        $this->_type = $type;
+        $this->updateAttributes(array('type'=>$type));
+    } // end func setType
+    
+    // }}}
+    // {{{ setName()
+
+    /**
+     * Sets the input field name
+     * 
+     * @param     string    $name   Input field name attribute
+     * @since     1.0
+     * @access    public
+     * @return    void
+     */
+    function setName($name)
+    {
+        $this->updateAttributes(array('name'=>$name));
+    } //end func setName
+    
+    // }}}
+    // {{{ getName()
+
+    /**
+     * Returns the element name
+     * 
+     * @since     1.0
+     * @access    public
+     * @return    string
+     */
+    function getName()
+    {
+        return $this->getAttribute('name');
+    } //end func getName
+    
+    // }}}
+    // {{{ setValue()
+
+    /**
+     * Sets the value of the form element
+     *
+     * @param     string    $value      Default value of the form element
+     * @since     1.0
+     * @access    public
+     * @return    void
+     */
+    function setValue($value)
+    {
+        $this->updateAttributes(array('value'=>$value));
+    } // end func setValue
+
+    // }}}
+    // {{{ getValue()
+
+    /**
+     * Returns the value of the form element
+     *
+     * @since     1.0
+     * @access    public
+     * @return    string
+     */
+    function getValue()
+    {
+        //return $this->getAttribute('value');
+	    return $this->_attributes['value'];
+    } // end func getValue
+    
+    // }}}
+    // {{{ toHtml()
+
+    /**
+     * Returns the input field in HTML
+     * 
+     * @since     1.0
+     * @access    public
+     * @return    string
+     */
+    function toHtml()
+    {
+        if ($this->_flagFrozen) {
+            return $this->getFrozenHtml();
+        } else {
+            return $this->_getTabs() . '<button' . $this->_getAttrString($this->_attributes) . ' />'.$this->getValue() .'</button>';
+        }
+    } //end func toHtml
+
+    // }}}
+    // {{{ onQuickFormEvent()
+
+    /**
+     * Called by HTML_QuickForm whenever form event is made on this element
+     *
+     * @param     string    $event  Name of event
+     * @param     mixed     $arg    event arguments
+     * @param     object    &$caller calling object
+     * @since     1.0
+     * @access    public
+     * @return    void
+     * @throws    
+     */
+    function onQuickFormEvent($event, $arg, &$caller)
+    {
+        // do not use submit values for button-type elements
+        $type = $this->getType();
+        if (('updateValue' != $event) ||
+            ('submit' != $type && 'reset' != $type && 'button' != $type)) {
+            parent::onQuickFormEvent($event, $arg, $caller);
+        } else {
+            $value = $this->_findValue($caller->_constantValues);
+            if (null === $value) {
+                $value = $this->_findValue($caller->_defaultValues);
+            }
+            if (null !== $value) {
+                $this->setValue($value);
+            }
+        }
+        return true;
+    } // end func onQuickFormEvent
+
+    // }}}
+    // {{{ exportValue()
+
+   /**
+    * We don't need values from button-type elements (except submit) and files
+    */
+    function exportValue(&$submitValues, $assoc = false)
+    {
+        $type = $this->getType();
+        if ('reset' == $type || 'button' == $type) {
+            return null;
+        } else {
+            return parent::exportValue($submitValues, $assoc);
+        }
+    }
+    
+    // }}}
+} // end class HTML_QuickForm_element
+?>

+ 89 - 0
main/inc/lib/formvalidator/Element/style_reset_button.php

@@ -0,0 +1,89 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * HTML class for a submit type element
+ * 
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.01 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_01.txt If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category    HTML
+ * @package     HTML_QuickForm
+ * @author      Adam Daniel <adaniel1@eesus.jnj.com>
+ * @author      Bertrand Mansion <bmansion@mamasam.com>
+ * @copyright   2001-2007 The PHP Group
+ * @license     http://www.php.net/license/3_01.txt PHP License 3.01
+ * @version     CVS: $Id: submit.php 17344 2008-12-17 08:55:29Z Scara84 $
+ * @link        http://pear.php.net/package/HTML_QuickForm
+ */
+
+/**
+ * Base class for <input /> form elements
+ */
+require_once 'style_button.php';
+
+/**
+ * HTML class for a submit type element
+ * 
+ * @category    HTML
+ * @package     HTML_QuickForm
+ * @author      Adam Daniel <adaniel1@eesus.jnj.com>
+ * @author      Bertrand Mansion <bmansion@mamasam.com>
+ * @version     Release: 3.2.10
+ * @since       1.0
+ */
+class HTML_QuickForm_styleresetbutton extends HTML_QuickForm_stylebutton
+{
+    // {{{ constructor
+
+    /**
+     * Class constructor
+     * 
+     * @param     string    Input field name attribute
+     * @param     string    Input field value
+     * @param     mixed     Either a typical HTML attribute string or an associative array
+     * @since     1.0
+     * @access    public
+     * @return    void
+     */
+    function HTML_QuickForm_styleresetbutton($elementName=null, $value=null, $attributes=null)
+    {
+        HTML_QuickForm_stylebutton::HTML_QuickForm_stylebutton($elementName, null, $attributes, $value);
+        $this->setValue($value);
+        $this->setType('reset');
+    } //end constructor
+    
+    // }}}
+    // {{{ freeze()
+
+    /**
+     * Freeze the element so that only its value is returned
+     * 
+     * @access    public
+     * @return    void
+     */
+    function freeze()
+    {
+        return false;
+    } //end func freeze
+
+    // }}}
+    // {{{ exportValue()
+
+   /**
+    * Only return the value if it is found within $submitValues (i.e. if
+    * this particular submit button was clicked)
+    */
+    function exportValue(&$submitValues, $assoc = false)
+    {
+        return $this->_prepareValue($this->_findValue($submitValues), $assoc);
+    }
+
+    // }}}
+} //end class HTML_QuickForm_submit
+?>

+ 89 - 0
main/inc/lib/formvalidator/Element/style_submit_button.php

@@ -0,0 +1,89 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * HTML class for a submit type element
+ * 
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.01 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_01.txt If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category    HTML
+ * @package     HTML_QuickForm
+ * @author      Adam Daniel <adaniel1@eesus.jnj.com>
+ * @author      Bertrand Mansion <bmansion@mamasam.com>
+ * @copyright   2001-2007 The PHP Group
+ * @license     http://www.php.net/license/3_01.txt PHP License 3.01
+ * @version     CVS: $Id: submit.php 17344 2008-12-17 08:55:29Z Scara84 $
+ * @link        http://pear.php.net/package/HTML_QuickForm
+ */
+
+/**
+ * Base class for <input /> form elements
+ */
+require_once 'style_button.php';
+
+/**
+ * HTML class for a submit type element
+ * 
+ * @category    HTML
+ * @package     HTML_QuickForm
+ * @author      Adam Daniel <adaniel1@eesus.jnj.com>
+ * @author      Bertrand Mansion <bmansion@mamasam.com>
+ * @version     Release: 3.2.10
+ * @since       1.0
+ */
+class HTML_QuickForm_stylesubmitbutton extends HTML_QuickForm_stylebutton
+{
+    // {{{ constructor
+
+    /**
+     * Class constructor
+     * 
+     * @param     string    Input field name attribute
+     * @param     string    Input field value
+     * @param     mixed     Either a typical HTML attribute string or an associative array
+     * @since     1.0
+     * @access    public
+     * @return    void
+     */
+    function HTML_QuickForm_stylesubmitbutton($elementName=null, $value=null, $attributes=null,$img=null)
+    {
+        HTML_QuickForm_stylebutton::HTML_QuickForm_stylebutton($elementName, null, $attributes, $value, $img);
+        $this->setValue($value);
+        $this->setType('submit');
+    } //end constructor
+    
+    // }}}
+    // {{{ freeze()
+
+    /**
+     * Freeze the element so that only its value is returned
+     * 
+     * @access    public
+     * @return    void
+     */
+    function freeze()
+    {
+        return false;
+    } //end func freeze
+
+    // }}}
+    // {{{ exportValue()
+
+   /**
+    * Only return the value if it is found within $submitValues (i.e. if
+    * this particular submit button was clicked)
+    */
+    function exportValue(&$submitValues, $assoc = false)
+    {
+        return $this->_prepareValue($this->_findValue($submitValues), $assoc);
+    }
+
+    // }}}
+} //end class HTML_QuickForm_submit
+?>

+ 4 - 1
main/inc/lib/formvalidator/FormValidator.class.php

@@ -53,13 +53,16 @@ class FormValidator extends HTML_QuickForm
 	{
 		$this->HTML_QuickForm($form_name, $method,$action, $target, $attributes, $trackSubmit);
 		// Load some custom elements and rules
-		$dir = dirname(__FILE__).'/';
+		$dir = dirname(__FILE__).'/';	
 		$this->registerElementType('html_editor', $dir.'Element/html_editor.php', 'HTML_QuickForm_html_editor');
 		$this->registerElementType('datepicker', $dir.'Element/datepicker.php', 'HTML_QuickForm_datepicker');
 		$this->registerElementType('datepickerdate', $dir.'Element/datepickerdate.php', 'HTML_QuickForm_datepickerdate');
 		$this->registerElementType('receivers', $dir.'Element/receivers.php', 'HTML_QuickForm_receivers');
 		$this->registerElementType('select_language', $dir.'Element/select_language.php', 'HTML_QuickForm_Select_Language');
 		$this->registerElementType('select_theme', $dir.'Element/select_theme.php', 'HTML_QuickForm_Select_Theme');
+		$this->registerElementType('style_button', $dir.'Element/style_button.php', 'HTML_QuickForm_stylebutton');
+		$this->registerElementType('style_submit_button', $dir.'Element/style_submit_button.php', 'HTML_QuickForm_stylesubmitbutton');
+		$this->registerElementType('style_reset_button', $dir.'Element/style_reset_button.php', 'HTML_QuickForm_styleresetbutton');
 		$this->registerRule('date', null, 'HTML_QuickForm_Rule_Date', $dir.'Rule/Date.php');
 		$this->registerRule('date_compare', null, 'HTML_QuickForm_Rule_DateCompare', $dir.'Rule/DateCompare.php');
 		$this->registerRule('html',null,'HTML_QuickForm_Rule_HTML',$dir.'Rule/HTML.php');

+ 2 - 2
main/inc/lib/sortabletable.class.php

@@ -258,7 +258,7 @@ class SortableTable extends HTML_Table
 					$html .= '<option value="'.$action.'">'.$label.'</option>';
 				}
 				$html .= '</select>';
-				$html .= '<input type="submit" value="'.get_lang('Ok').'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;"/>';
+				$html .= '<button type="submit" class="save" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.get_lang('Ok').'</button>';
 			}
 			else
 			{
@@ -351,7 +351,7 @@ class SortableTable extends HTML_Table
 		}
 		$result[] = '</select>';
 		$result[] = '<noscript>';
-		$result[] = '<input type="submit" value="'.get_lang('Ok').'"/>';
+		$result[] = '<button class="save" type="submit">'.get_lang('Save').'</button>';
 		$result[] = '</noscript>';
 		$result[] = '</form>';
 		$result = implode("\n", $result);

+ 4 - 4
main/lang/english/admin.inc.php

@@ -171,7 +171,7 @@ $langDiffTranslation = "Compare translations";
 $langStatOf = "Statistics of ";
 $langSpeeSubscribe = "Quick subscribe as Course Checker";
 $langLogIdentLogout = "Login list";
-$langServerStatus = "Status of MySQL server : ";
+$langServerStatus = "Status of MySQL server�: ";
 $langDataBase = "Database ";
 $langRun = "works";
 $langClient = "MySql Client ";
@@ -458,7 +458,7 @@ $langConfigureExtensions = "Configure the extensions";
 $langConfigureExtensions = "Configure the services";
 $langActiveExtensions = "Activate this service";
 $langVisioconf = "Visio-conference";
-$langVisioconfDescription = "Dokeos Live Conferencing® is a standard tool of visioconference which offers : displaying of diapos, whiteboard to draw and write, audio/video duplex, chat. It requires just the Flash® player and permits to use three modes : one2one, one2many et many2many. ";
+$langVisioconfDescription = "Dokeos Live Conferencing� is a standard tool of visioconference which offers : displaying of diapos, whiteboard to draw and write, audio/video duplex, chat. It requires just the Flash� player and permits to use three modes : one2one, one2many et many2many. ";
 $langPpt2lp = "Oogie-Woogie Rapid Learning";
 $langPpt2lpDescription = "Oogie-Woogie is a Rapid Learning tool. It allows you to convert Powerpoint presentations and Word documents and their Openoffice equivalents to SCORM-compliant e-courses. After the conversion, you are in the Dokeos Learning Path management tool and able to add audio on slides and pages, tests between the slides or pages and interaction activities like forum discussions or assigment upload. And the whole course generates accurate SCORM reporting for further coaching. The system combines the power of Openoffice as a MS-Office documents conversion tool + RED5 streaming server for audio recording + Dokeos learning path management tool.";
 $langBandWidthStatistics = "Bandwidth statistics";
@@ -637,7 +637,7 @@ $Remove = "Remove";
 $Rename = "Rename";
 $ShowNumberOfCoursesComment = "Show the number of courses in each category in the course categories on the homepage";
 $EphorusDescription = "Start using the Ephorus anti plagiarism service in Dokeos.<br /> 														<STRONG>With Ephorus, you will prevent internet plagiarism without any additional effort.</STRONG><br /> 														 You can use our unique open standard webservice to build your own integration or you can use one of our Dokeos-integration modules.";
-$EphorusLeadersInAntiPlagiarism = "<STRONG>Leaders in <BR>anti plagiarism </STRONG>				";
+$EphorusLeadersInAntiPlagiarism = "<STRONG>Leaders in�<BR>anti plagiarism </STRONG>				";
 $EphorusClickHereForInformationsAndPrices = "Click here for more information and prices			";
 $NameOfTheSession = "Name of the session";
 $NoSessionsForThisUser = "This user isn\\\'t subscribed in a session";
@@ -897,7 +897,7 @@ $EnablePlugins = "Enable the selected plugins";
 $AtLeastOneCourseAndOneURL = "At least one course and one URL";
 $ClickToRegisterAdmin = "Click here to register the admin into all sites";
 $AdminShouldBeRegisterInSite = "Admin user should be register here";
-$URLNotConfiguredPleaseChangedTo: = "URL not configured yet, please add this URL : ";
+$URLNotConfiguredPleaseChangedTo = "URL not configured yet, please add this URL : ";
 $AdminUserRegisteredToThisURL = "Admin user add to this URL";
 $CoursesWereEdited = "Coures were edited";
 $URLEdited = "The URL has been edited";

+ 11 - 13
main/link/link.php

@@ -1,4 +1,4 @@
-<?php // $Id: link.php 18126 2009-02-01 19:55:12Z herodoto $
+<?php // $Id: link.php 18203 2009-02-03 18:02:16Z ndieschburg $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -59,8 +59,8 @@ api_protect_course_script();
 
 // @todo change the $_REQUEST into $_POST or $_GET
 // @todo remove this code
-$link_submitted = (!empty($_POST['submitLink'])?$_POST['submitLink']:'');
-$category_submitted = (!empty($_POST['submitCategory'])?$_POST['submitCategory']:'');
+$link_submitted = (isset($_POST['submitLink'])?true:false);
+$category_submitted = (isset($_POST['submitCategory'])?true:false);
 $urlview = (!empty($_GET['urlview'])?$_GET['urlview']:'');
 $submitImport = (!empty($_POST['submitImport'])?$_POST['submitImport']:'');
 $down = (!empty($_GET['down'])?$_GET['down']:'');
@@ -72,13 +72,11 @@ $urllink = (!empty($_REQUEST['urllink'])?$_REQUEST['urllink']:'');
 $title = (!empty($_REQUEST['title'])?$_REQUEST['title']:'');
 $description = (!empty($_REQUEST['description'])?$_REQUEST['description']:'');
 $selectcategory = (!empty($_REQUEST['selectcategory'])?$_REQUEST['selectcategory']:'');
-$submitLink = (!empty($_REQUEST['submitLink'])?$_REQUEST['submitLink']:'');
+$submitLink = (isset($_REQUEST['submitLink'])?true : false);
 $action = (!empty($_REQUEST['action'])?$_REQUEST['action']:'');
 $category_title = (!empty($_REQUEST['category_title'])?$_REQUEST['category_title']:'');
-$submitCategory = (!empty($_REQUEST['submitCategory'])?$_REQUEST['submitCategory']:'');
-
+$submitCategory = isset($_POST['submitCategory'])?true:false;
 $nameTools = get_lang('Links');
-
 	if (isset($_GET['action']) && $_GET['action']=='addlink')
 	{
 		$nameTools = '';
@@ -100,8 +98,7 @@ $nameTools = get_lang('Links');
 		$interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('EditLink'));
 	}	 	
 	
-		
-		
+				
 // Database Table definitions
 $tbl_link = Database::get_course_table(TABLE_LINK);
 $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
@@ -271,8 +268,9 @@ if (is_allowed_to_edit() and isset($_GET['action']))
 				echo sprintf($sf_textbox, $specific_field['name'], $specific_field['code'], $default_values);
 			}
 		}
-
-		echo "<tr><td></td><td><input type=\"Submit\" name=\"submitLink\" value=\"".get_lang("Ok")."\" /></td></tr>",
+	// echo "<tr><td></td><td><input type=\"submit\" name=\"submitLink\"value=\"".get_lang('Ok')."\" /></td></tr>",
+	   echo "<tr><td></td><td><button class=\"save\" type=\"Submit\" name=\"submitLink\">".get_lang('SaveLink')." </button></td></tr>",
+	
 			"</table>",
 			"</form>";
 	}
@@ -295,7 +293,8 @@ if (is_allowed_to_edit() and isset($_GET['action']))
 			"</tr>",
 			"<tr><td align=\"right\" valign=\"top\">".get_lang("Description")." :</td>",
 			"<td><textarea rows=\"3\" cols=\"50\" name=\"description\">",htmlentities($description,ENT_QUOTES,$charset)."</textarea></td></tr>",
-			"<tr><td></td><td><input type=\"Submit\" name=\"submitCategory\" value=\"".get_lang("Ok")."\" /></td></tr>",
+			//"<tr><td></td><td><input type=\"Submit\" name=\"submitCategory\"value=\"".get_lang("Ok")."\"/></td></tr>",
+			"<tr><td></td><td><button class=\"save\" type=\"submit\" name=\"submitCategory\">".get_lang('Save')." </button></td></tr>",
 			"</table>",
 			"</form>";
 	}
@@ -445,7 +444,6 @@ if (empty($_GET['action']) || ($_GET['action']!='editlink' && $_GET['action']!='
 	////////////////////////////////////////////////////////////////////////////
 }		
 		
-		
 
 
 Display::display_footer();

+ 15 - 15
main/newscorm/learnpath.class.php

@@ -4476,7 +4476,7 @@ class learnpath {
 		// we need to close the form when we are updating the mp3 files
 		if ($_GET['updateaudio'] == 'true')
 		{
-			$return .= '<tr><th></th><th><input type="submit" name="save_audio" id="save_audio" value="'.get_lang('SaveAudio').'" /></th><th></th><th></th></tr>';	
+			$return .= '<tr><th></th> <th><button class="save" type="submit" name="save_audio" id="save_audio">'.get_lang('SaveAudio').'</button></th><th></th><th></th></tr>';	
 		}				
 		$return .= '</table>' . "\n";		
 		
@@ -5241,7 +5241,7 @@ class learnpath {
 					}
 					
 					$return .= "\t\t" . '<tr>' . "\n";						
-						$return .= "\t\t\t" . '<td>&nbsp;</td><td><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok').'" /></td>' . "\n";					
+						$return .= "\t\t\t" . '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('EditCurrentExecice').'</button></td>' . "\n";					
 					$return .= "\t\t" . '</tr>' . "\n";				
 				$return .= "\t" . '</table>' . "\n";	
 				
@@ -5503,7 +5503,7 @@ class learnpath {
 
 					$return .= "\t\t" . '<tr>' . "\n";
 
-						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok').'" /></td>' . "\n";
+						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok1').'" /></td>' . "\n";
 
 					$return .= "\t\t" . '</tr>' . "\n";
 
@@ -5752,7 +5752,7 @@ class learnpath {
 					}
 					
 					$return .= "\t\t" . '<tr>' . "\n";						
-						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok').'" /></td>' . "\n";					
+						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok2').'" /></td>' . "\n";					
 					$return .= "\t\t" . '</tr>' . "\n";
 				
 				$return .= "\t" . '</table>' . "\n";	
@@ -6017,7 +6017,7 @@ class learnpath {
 					
 					$return .= "\t\t" . '<tr>' . "\n";
 						
-						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok').'" /></td>' . "\n";
+						$return .= "\t\t\t" . '<td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang('Ok3').'" /></td>' . "\n";
 					
 					$return .= "\t\t" . '</tr>' . "\n";
 				
@@ -6213,7 +6213,7 @@ class learnpath {
 		
 		if(is_array($arrLP)) { reset($arrLP); }
 		
-		$form->addElement('submit', 'submit_button', get_lang('Ok'));
+		$form->addElement('style_submit_button', 'submit_button', get_lang('Save'),'class="save"');
 		
 		if($item_type == 'module' || $item_type == 'dokeos_module')
 		{
@@ -6558,7 +6558,7 @@ class learnpath {
 						
 						if(!$no_display_edit_textarea)
 						{
-							$form->addElement('submit', 'submit_button', get_lang('Ok'));
+							$form->addElement('style_submit_button', 'submit_button', get_lang('Ok'));
 							$renderer = $form->defaultRenderer();
 							$renderer->setElementTemplate('<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{label}<br />{element}','content_lp');
 
@@ -6573,7 +6573,7 @@ class learnpath {
 					elseif(is_numeric($extra_info))
 					{
 			
-						$form->addElement('submit', 'submit_button', get_lang('Ok'));
+						$form->addElement('style_submit_button', 'submit_button', get_lang('AddEdit'), 'class="save"');
 			
 						$return = $this->display_document($extra_info, true, true, true);
 						$form->addElement('html',$return);
@@ -6588,12 +6588,12 @@ class learnpath {
 			}
 			if(is_numeric($extra_info))
 			{
-				$form->addElement('submit', 'submit_button', get_lang('Ok'));
+				$form->addElement('style_submit_button', 'submit_button', get_lang('AddEdit'), 'class="save"');
 				$form->addElement('hidden', 'path', $extra_info);
 			}
 			elseif(is_array($extra_info))
 			{
-				$form->addElement('submit', 'submit_button', get_lang('Ok'));
+				$form->addElement('style_submit_button', 'submit_button', get_lang('TitleManipulateDocument'), 'class="save"');
 				$form->addElement('hidden', 'path', $extra_info['path']);
 			}
 			
@@ -6837,7 +6837,7 @@ class learnpath {
 					
 					$return .= "\t\t" . '<tr>' . "\n";
 						
-						$return .= "\t\t\t" . '<td>&nbsp;</td><td><input class="button" name="submit_button" type="submit" value="'.get_lang("Ok").'" /></td>' . "\n";
+						$return .= "\t\t\t" . '<td>&nbsp;</td><td><input class="button" name="submit_button" type="submit" value="'.get_lang("Ok4").'" /></td>' . "\n";
 					
 					$return .= "\t\t" . '</tr>' . "\n";
 				
@@ -7089,7 +7089,7 @@ class learnpath {
 					
 					$return .= "\t\t" . '<tr>' . "\n";
 						
-						$return .= "\t\t\t" . '<td>&nbsp</td><td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang("Ok").'" /></td>' . "\n";
+						$return .= "\t\t\t" . '<td>&nbsp</td><td colspan="2"><input class="button" name="submit_button" type="submit" value="'.get_lang("Ok5").'" /></td>' . "\n";
 					
 					$return .= "\t\t" . '</tr>' . "\n";
 				
@@ -7438,7 +7438,7 @@ class learnpath {
 					
 					$return .= "\t\t" . '<tr>' . "\n";
 					
-						$return .= "\t\t\t" . '<td colspan="2"><input class="button small_form" name="submit_button" type="submit" value="'.get_lang('Ok').'" /></td>' . "\n";
+						$return .= "\t\t\t" . '<td colspan="2"><button class="save" name="submit_button" type="submit">'.get_lang('Save').'</button></td>' . "\n";
 					
 					$return .= "\t\t" . '</tr>' . "\n";
 					
@@ -7565,7 +7565,7 @@ class learnpath {
 		}
 		$return .= '<tr>';
 		$return .= '<td colspan="3">';
-		$return .= '<input class="button" name="submit_button" type="submit" value="'.get_lang("Ok").'" /></td>' . "\n";
+		$return .= '<button class="save" name="submit_button" type="submit">'.get_lang("ModifyPrerequisities").' </button></td>' . "\n";
 		$return .= '</td>';
 		$return .= '</tr>';
 		$return .= '</table>';
@@ -8861,4 +8861,4 @@ if (!function_exists('trim_value')) {
     }
 }
 
-?>
+?>

+ 1 - 1
main/newscorm/lp_add.php

@@ -121,7 +121,7 @@ Display::display_normal_message(get_lang('AddLpIntro'),false);
 echo '<p>'.get_lang('AddLpToStart').' :</p>';
 echo '<form method="post">';
 	echo '<label for="idTitle">'.get_lang('Title').' : </label><input id="idTitle" name="learnpath_name" type="text" /> ';
-	echo '<input type="submit" value="'.get_lang('Ok').'" />';
+	echo '<button class="save"type="submit"/>'.get_lang('Create').'</button>';
 					echo '<input name="post_time" type="hidden" value="' . time() . '" />';
 echo '</form>';
 

+ 2 - 1
main/newscorm/lp_edit.php

@@ -139,7 +139,8 @@ $defaults['lp_name']=$_SESSION['oLP']->get_name();
 $defaults['lp_author']=$_SESSION['oLP']->get_author();
 
 //Submit button
-$form->addElement('submit', 'Submit', get_lang('SaveLPSettings'));
+$form->addElement('style_submit_button', 'Submit',get_lang('SaveLPSettings'),'class="save"');
+//'<img src="'.api_get_path(WEB_IMG_PATH).'accept.png'.'" alt=""/>'
 
 //Hidden fields
 $form->addElement('hidden', 'action', 'update_lp');

+ 2 - 2
main/tracking/courseLog.php

@@ -454,7 +454,7 @@ if($_GET['studentlist'] == 'false') {
 	$form = new FormValidator('reminder_form','get',api_get_path(REL_CODE_PATH).'announcements/announcements.php');
 	
 	$renderer = $form->defaultRenderer();
-	$renderer->setElementTemplate('<span>{label} {element}</span>&nbsp;<input type="submit" value="'.get_lang('Ok').'"','since');
+	$renderer->setElementTemplate('<span>{label} {element}</span>&nbsp;<button class="save" type="submit">'.get_lang('SendNotification').'</button>','since');
 	
 	$options = array(
 				2 => '2 '.get_lang('Days'),
@@ -582,4 +582,4 @@ if($_GET['studentlist'] == 'false') {
 ?>
 </table>
 <?php
-Display::display_footer();
+Display::display_footer();

+ 2 - 2
main/upload/upload.document.php

@@ -217,7 +217,7 @@ if(get_setting('use_document_title')=='true')
 </tr>
 </table>
 
-<input type="submit" value="<?php echo(get_lang('Ok'));?>">
+<input type="submit" value="<?php echo(get_lang('Oki'));?>">
 </form>
 <!-- end upload form -->
 
@@ -231,4 +231,4 @@ if(get_setting('use_document_title')=='true')
 ==============================================================================
 */
 Display::display_footer();
-?>
+?>