diff --git a/index.php b/index.php index 691502eb98..61ee894fe4 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,4 @@ -, 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('
{element}
'); $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; -} \ No newline at end of file +} diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index c17fb91625..bf54d8b9a8 100644 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -1,4 +1,4 @@ -addElement('html', ''); } else { $form->addElement('html', ''); } @@ -776,7 +776,7 @@ switch($action){ $renderer->setElementTemplate(''); $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 = '
'); - $form->addElement('submit', null, get_lang('Save')); + $form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"'); $form->addElement('html', '
'); if (api_get_setting('wcag_anysurfer_public_pages')=='true') { @@ -729,13 +729,13 @@ switch($action){ $form->add_html_editor('link_html', ''); } $form->addElement('html', '
'); - $form->addElement('submit', null, get_lang('Save')); + $form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"'); $form->addElement('html', '
 '); - $form->addElement('submit', null, get_lang('Save')); + $form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"'); $form->addElement('html', '
{element}
'.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(); diff --git a/main/admin/index.php b/main/admin/index.php index 053077fe6c..11c590e933 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -1,4 +1,4 @@ -
  • - +
    • @@ -121,7 +122,8 @@ if(api_is_platform_admin()) {

    • - +
    • @@ -178,7 +180,8 @@ if(api_get_setting('use_session_mode')=='true')
      • - +
        • diff --git a/main/admin/settings.php b/main/admin/settings.php index de67d95e5d..715a48a31b 100644 --- a/main/admin/settings.php +++ b/main/admin/settings.php @@ -1,4 +1,4 @@ - "Languages"){ $form->addElement('html','
        '); - $form->addElement('submit', null,get_lang('SaveSettings')); + $form->addElement('style_submit_button', null,get_lang('SaveSettings'), 'class="save"'); $form->addElement('html','
        '); } } @@ -229,7 +229,7 @@ if (!empty($_GET['category']) and !in_array($_GET['category'], array('Plugins', } if ($_GET['category'] <> "Languages"){ $form->addElement('html','
        '); - $form->addElement('submit', null,get_lang('SaveSettings')); + $form->addElement('style_submit_button', null,get_lang('SaveSettings'), 'class="save"'); $form->addElement('html','
        '); } $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 '
    '; - echo ''; + echo ''; } @@ -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 ''; + echo ''; } } @@ -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()) { diff --git a/main/admin/user_add.php b/main/admin/user_add.php index 816a3d77a6..c437f13ec7 100644 --- a/main/admin/user_add.php +++ b/main/admin/user_add.php @@ -1,4 +1,4 @@ -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 diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php index 4b98e5530a..0f83615f82 100644 --- a/main/announcements/announcements.php +++ b/main/announcements/announcements.php @@ -1,4 +1,4 @@ -'; if(empty($_SESSION['toolgroup'])){ echo ''; - echo '


    '; + //echo '


    '; + echo '


    '; + } else{ echo ''; - echo '


    '; + //echo '


    '; + echo '


    '; + } echo '
    '; diff --git a/main/auth/courses.php b/main/auth/courses.php index 3fda80a5ce..9cfae14eda 100644 --- a/main/auth/courses.php +++ b/main/auth/courses.php @@ -1,4 +1,4 @@ -', "", "", - " ", + " ", ""; if (isset($_POST['search_course'])) { @@ -618,7 +618,7 @@ function display_create_course_category_form() echo "
    \n"; echo ''; echo "\n"; - echo "\n"; + echo "\n"; echo "
    \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";} $output.="\t\n"; - $output.="\t\n"; + $output.="\t\n"; $output.=""; return $output; } @@ -1207,7 +1207,7 @@ function display_edit_course_category_form($edit_course_category) echo ''; $info_this_user_course_category=get_user_course_category($edit_course_category); echo "\t"; - echo "\t\n"; + echo "\t\n"; echo ""; } diff --git a/main/auth/profile.php b/main/auth/profile.php index 6d6007d2b2..e16859306b 100644 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -1,4 +1,4 @@ -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 ''; $form->display(); Display :: display_footer(); -?> \ No newline at end of file +?> diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php index 5aa9031b3f..41876991d6 100644 --- a/main/calendar/agenda.inc.php +++ b/main/calendar/agenda.inc.php @@ -1,4 +1,4 @@ - - + diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php index c5087ee7ac..3bd13dfbbb 100644 --- a/main/calendar/agenda.php +++ b/main/calendar/agenda.php @@ -1,4 +1,4 @@ -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(); -?> \ No newline at end of file +?> diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php index 7a671a6bc7..7c6e1895bb 100644 --- a/main/create_course/add_course.php +++ b/main/create_course/add_course.php @@ -1,5 +1,5 @@ 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 diff --git a/main/css/academica/default.css b/main/css/academica/default.css index a4ba50b642..122f970048 100644 --- a/main/css/academica/default.css +++ b/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; +} \ No newline at end of file diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css index eb76124c75..0455ac3b99 100644 --- a/main/css/baby_orange/default.css +++ b/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; +} \ No newline at end of file diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css index b97421cfab..0164974a0a 100644 --- a/main/css/corporate/default.css +++ b/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; +} \ No newline at end of file diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css index 26f48ff21f..89ace2c908 100644 --- a/main/css/cosmic_campus/default.css +++ b/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; +} \ No newline at end of file diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css index c055b91889..37a26b5be7 100644 --- a/main/css/dokeos_classic/default.css +++ b/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; -} \ No newline at end of file diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css index 195627d09f..96d55eaac0 100644 --- a/main/css/dokeos_classic_2D/default.css +++ b/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; +} \ No newline at end of file diff --git a/main/css/medical/default.css b/main/css/medical/default.css index 6270d4cc0f..965a76caa8 100644 --- a/main/css/medical/default.css +++ b/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; +} \ No newline at end of file diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css index 0763064e6c..897d66f8c8 100644 --- a/main/css/public_admin/default.css +++ b/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; +} + \ No newline at end of file diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css index 8d2ee13d25..f5aff2be18 100644 --- a/main/css/silver_line/default.css +++ b/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; +} \ No newline at end of file diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css index 48b1e0928a..5f1cf3f6b5 100644 --- a/main/css/sober_brown/default.css +++ b/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; +} \ No newline at end of file diff --git a/main/document/create_document.php b/main/document/create_document.php index cae56abb07..254720ea71 100644 --- a/main/document/create_document.php +++ b/main/document/create_document.php @@ -1,4 +1,4 @@ -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 diff --git a/main/document/document.inc.php b/main/document/document.inc.php index 286bb90fd8..44c2cc03e4 100644 --- a/main/document/document.inc.php +++ b/main/document/document.inc.php @@ -1,4 +1,4 @@ -'."\n"; - $form .= ''."\n"; + $form .= ''."\n"; $form .= ''; return $form; diff --git a/main/document/document.php b/main/document/document.php index 86ee82ebe8..54d197abc4 100644 --- a/main/document/document.php +++ b/main/document/document.php @@ -1,4 +1,4 @@ -'; $new_folder_text .= get_lang('NewDir') .' '; $new_folder_text .= ''; - $new_folder_text .= ''; + $new_folder_text .= ''; $new_folder_text .= ''; //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 .= ''; $new_folder_text .= ''.get_lang('TemplateDescription').' : '; $new_folder_text .= ''; - $new_folder_text .= ''; + $new_folder_text .= ''; $new_folder_text .= ''; //show the form Display::display_normal_message($new_folder_text,false); diff --git a/main/document/edit_document.php b/main/document/edit_document.php index 256a68612f..3274d96cbe 100644 --- a/main/document/edit_document.php +++ b/main/document/edit_document.php @@ -1,4 +1,4 @@ -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; diff --git a/main/document/upload.php b/main/document/upload.php index 3f64dee1db..ceb6ae4eba 100644 --- a/main/document/upload.php +++ b/main/document/upload.php @@ -1,4 +1,4 @@ -'; $new_folder_text .= get_lang('NewDir') .' '; $new_folder_text .= ''; - $new_folder_text .= ''; + $new_folder_text .= ''; $new_folder_text .= ''; //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'); diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php index 17989d7c29..b4e2e7013a 100644 --- a/main/dropbox/dropbox_functions.inc.php +++ b/main/dropbox/dropbox_functions.inc.php @@ -473,7 +473,7 @@ function display_addcategory_form($category_name='', $id='') echo "\t\n"; echo "\t\n"; echo "\t\n"; - echo ""; + echo ""; echo "\t\n"; echo "\t\n"; echo "\n"; @@ -641,7 +641,7 @@ function display_add_form() echo "", "", "", - "", + "", "", "", ""; diff --git a/main/dropbox/index.php b/main/dropbox/index.php index 50e820cc93..8c2beff97b 100644 --- a/main/dropbox/index.php +++ b/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()); } diff --git a/main/exercice/answer_admin.inc.php b/main/exercice/answer_admin.inc.php index 427b187e50..0d973b58c0 100644 --- a/main/exercice/answer_admin.inc.php +++ b/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) : - N° + N� diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php index e6fb39d3e8..9c6c7f2dfc 100644 --- a/main/exercice/exercice.php +++ b/main/exercice/exercice.php @@ -1,4 +1,4 @@ -'; } $form_filter = '
    '; $form_filter .= make_select('filter',array(1=>get_lang('FilterByNotRevised'),2=>get_lang('FilterByRevised')),$filter); - $form_filter .= '
    '; + $form_filter .= ''; echo $form_filter; } } diff --git a/main/exercice/exercice_submit.php b/main/exercice/exercice_submit.php index b897256ef8..db9bb8c94f 100644 --- a/main/exercice/exercice_submit.php +++ b/main/exercice/exercice_submit.php @@ -1,4 +1,4 @@ - +
    "; - $submit_btn=""; // $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').' >'; } - $submit_btn.= '\' />'; + $submit_btn.= ""; } echo $submit_btn; echo ""; @@ -1344,4 +1344,4 @@ else if ($origin != 'learnpath') { //so we are not in learnpath tool Display::display_footer(); -} \ No newline at end of file +} diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index 65a2711620..9d7634b45f 100644 --- a/main/exercice/exercise.class.php +++ b/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') { diff --git a/main/exercice/exercise_result.php b/main/exercice/exercise_result.php index 373ed35ba3..9d5184808d 100644 --- a/main/exercice/exercise_result.php +++ b/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); - + @@ -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)); } -?> \ No newline at end of file +?> diff --git a/main/exercice/hotpotatoes.php b/main/exercice/hotpotatoes.php index d3aa2eae1c..554d6abd7e 100644 --- a/main/exercice/hotpotatoes.php +++ b/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 ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; diff --git a/main/exercice/matching.class.php b/main/exercice/matching.class.php index 4c47c148dd..7418ee91a0 100644 --- a/main/exercice/matching.class.php +++ b/main/exercice/matching.class.php @@ -171,8 +171,8 @@ class Matching extends Question { $form -> addElement ('html', ''); $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', ''); $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); diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php index a51475bd80..caa5318087 100644 --- a/main/exercice/multiple_answer.class.php +++ b/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} ','lessAnswers'); $renderer->setElementTemplate('{element}','moreAnswers'); $form -> addElement ('html', ''); diff --git a/main/exercice/question_admin.inc.php b/main/exercice/question_admin.inc.php index 12f3d37088..abbf0926c7 100644 --- a/main/exercice/question_admin.inc.php +++ b/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('
    {label}
    {element}
    ','submitQuestion'); diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php index 621a107b3a..284933ca7c 100644 --- a/main/exercice/unique_answer.class.php +++ b/main/exercice/unique_answer.class.php @@ -256,8 +256,8 @@ class UniqueAnswer extends Question { $form -> addElement ('html', ''); - $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} ','lessAnswers'); $renderer->setElementTemplate('{element}','moreAnswers'); diff --git a/main/glossary/index.php b/main/glossary/index.php index 276ad78b68..3286ff7e95 100755 --- a/main/glossary/index.php +++ b/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', '
    '.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'])); diff --git a/main/gradebook/lib/fe/catform.class.php b/main/gradebook/lib/fe/catform.class.php index 328f4381e2..e019b1ea78 100644 --- a/main/gradebook/lib/fe/catform.class.php +++ b/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', '>='); diff --git a/main/gradebook/lib/fe/scoredisplayform.class.php b/main/gradebook/lib/fe/scoredisplayform.class.php index 1ef327f2ca..2f144e465c 100644 --- a/main/gradebook/lib/fe/scoredisplayform.class.php +++ b/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(); diff --git a/main/group/group_category.php b/main/group/group_category.php index 95d69d931d..f61cf278bf 100644 --- a/main/group/group_category.php +++ b/main/group/group_category.php @@ -1,5 +1,5 @@ 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()) { diff --git a/main/group/group_creation.php b/main/group/group_creation.php index 31cbc6a874..bfef53a57f 100644 --- a/main/group/group_creation.php +++ b/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; diff --git a/main/group/group_edit.php b/main/group/group_edit.php index d60b1e8719..82989df083 100644 --- a/main/group/group_edit.php +++ b/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(); diff --git a/main/img/accept.png b/main/img/accept.png new file mode 100644 index 0000000000..89c8129a49 Binary files /dev/null and b/main/img/accept.png differ diff --git a/main/img/addd.gif b/main/img/addd.gif new file mode 100644 index 0000000000..6332fefea4 Binary files /dev/null and b/main/img/addd.gif differ diff --git a/main/inc/introductionSection.inc.php b/main/inc/introductionSection.inc.php index e1b01ced87..3c47ca9df3 100644 --- a/main/inc/introductionSection.inc.php +++ b/main/inc/introductionSection.inc.php @@ -73,9 +73,9 @@ else $renderer =& $form->defaultRenderer(); $renderer->setElementTemplate('
    {element}
    '); -$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) diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php index c8d5de75dc..efe10c407f 100644 --- a/main/inc/lib/fileUpload.lib.php +++ b/main/inc/lib/fileUpload.lib.php @@ -1839,8 +1839,8 @@ function build_missing_files_form($missing_files,$upload_path,$file_name) ."\n"; } $form .= "\n" - ."\n" - ."
    " + ." form elements + * + * @category HTML + * @package HTML_QuickForm + * @author Hans De Bisschop + * @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() . '_getAttrString($this->_attributes) . ' />'.$this->getValue() .''; + } + } //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 +?> diff --git a/main/inc/lib/formvalidator/Element/style_reset_button.php b/main/inc/lib/formvalidator/Element/style_reset_button.php new file mode 100644 index 0000000000..26023e151e --- /dev/null +++ b/main/inc/lib/formvalidator/Element/style_reset_button.php @@ -0,0 +1,89 @@ + + * @author Bertrand Mansion + * @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 form elements + */ +require_once 'style_button.php'; + +/** + * HTML class for a submit type element + * + * @category HTML + * @package HTML_QuickForm + * @author Adam Daniel + * @author Bertrand Mansion + * @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 +?> diff --git a/main/inc/lib/formvalidator/Element/style_submit_button.php b/main/inc/lib/formvalidator/Element/style_submit_button.php new file mode 100644 index 0000000000..beee7398d7 --- /dev/null +++ b/main/inc/lib/formvalidator/Element/style_submit_button.php @@ -0,0 +1,89 @@ + + * @author Bertrand Mansion + * @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 form elements + */ +require_once 'style_button.php'; + +/** + * HTML class for a submit type element + * + * @category HTML + * @package HTML_QuickForm + * @author Adam Daniel + * @author Bertrand Mansion + * @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 +?> diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php index 1c6bbfd4d6..c10db52815 100644 --- a/main/inc/lib/formvalidator/FormValidator.class.php +++ b/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'); diff --git a/main/inc/lib/sortabletable.class.php b/main/inc/lib/sortabletable.class.php index 2a3ad06c0e..cc4062a27b 100644 --- a/main/inc/lib/sortabletable.class.php +++ b/main/inc/lib/sortabletable.class.php @@ -258,7 +258,7 @@ class SortableTable extends HTML_Table $html .= ''; } $html .= ''; - $html .= ''; + $html .= ''; } else { @@ -351,7 +351,7 @@ class SortableTable extends HTML_Table } $result[] = ''; $result[] = ''; $result[] = ''; $result = implode("\n", $result); diff --git a/main/lang/english/admin.inc.php b/main/lang/english/admin.inc.php index 3e7e5a9f24..39f1fbfacd 100644 --- a/main/lang/english/admin.inc.php +++ b/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.
    With Ephorus, you will prevent internet plagiarism without any additional effort.
    You can use our unique open standard webservice to build your own integration or you can use one of our Dokeos-integration modules."; -$EphorusLeadersInAntiPlagiarism = "Leaders in 
    anti plagiarism     "; +$EphorusLeadersInAntiPlagiarism = "Leaders in�
    anti plagiarism     "; $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"; diff --git a/main/link/link.php b/main/link/link.php index b396bb0c45..6994af2c55 100644 --- a/main/link/link.php +++ b/main/link/link.php @@ -1,4 +1,4 @@ - '#', '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 "", + // echo "", + echo "", + "", ""; } @@ -295,7 +293,8 @@ if (is_allowed_to_edit() and isset($_GET['action'])) "", "".get_lang("Description")." :", "", - "", + //"", + "", "", ""; } @@ -445,7 +444,6 @@ if (empty($_GET['action']) || ($_GET['action']!='editlink' && $_GET['action']!=' //////////////////////////////////////////////////////////////////////////// } - Display::display_footer(); diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index 32c4e4e396..3a526c08b4 100644 --- a/main/newscorm/learnpath.class.php +++ b/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 .= ''; + $return .= ' '; } $return .= '' . "\n"; @@ -5241,7 +5241,7 @@ class learnpath { } $return .= "\t\t" . '' . "\n"; - $return .= "\t\t\t" . ' ' . "\n"; + $return .= "\t\t\t" . ' ' . "\n"; $return .= "\t\t" . '' . "\n"; $return .= "\t" . '' . "\n"; @@ -5503,7 +5503,7 @@ class learnpath { $return .= "\t\t" . '' . "\n"; - $return .= "\t\t\t" . '' . "\n"; + $return .= "\t\t\t" . '' . "\n"; $return .= "\t\t" . '' . "\n"; @@ -5752,7 +5752,7 @@ class learnpath { } $return .= "\t\t" . '' . "\n"; - $return .= "\t\t\t" . '' . "\n"; + $return .= "\t\t\t" . '' . "\n"; $return .= "\t\t" . '' . "\n"; $return .= "\t" . '' . "\n"; @@ -6017,7 +6017,7 @@ class learnpath { $return .= "\t\t" . '' . "\n"; - $return .= "\t\t\t" . '' . "\n"; + $return .= "\t\t\t" . '' . "\n"; $return .= "\t\t" . '' . "\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('
          {label}
    {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" . '' . "\n"; - $return .= "\t\t\t" . ' ' . "\n"; + $return .= "\t\t\t" . ' ' . "\n"; $return .= "\t\t" . '' . "\n"; @@ -7089,7 +7089,7 @@ class learnpath { $return .= "\t\t" . '' . "\n"; - $return .= "\t\t\t" . ' ' . "\n"; + $return .= "\t\t\t" . ' ' . "\n"; $return .= "\t\t" . '' . "\n"; @@ -7438,7 +7438,7 @@ class learnpath { $return .= "\t\t" . '' . "\n"; - $return .= "\t\t\t" . '' . "\n"; + $return .= "\t\t\t" . '' . "\n"; $return .= "\t\t" . '' . "\n"; @@ -7565,7 +7565,7 @@ class learnpath { } $return .= ''; $return .= ''; - $return .= '' . "\n"; + $return .= '' . "\n"; $return .= ''; $return .= ''; $return .= ''; @@ -8861,4 +8861,4 @@ if (!function_exists('trim_value')) { } } -?> \ No newline at end of file +?> diff --git a/main/newscorm/lp_add.php b/main/newscorm/lp_add.php index c225dde57d..a299ba86c3 100644 --- a/main/newscorm/lp_add.php +++ b/main/newscorm/lp_add.php @@ -121,7 +121,7 @@ Display::display_normal_message(get_lang('AddLpIntro'),false); echo '

    '.get_lang('AddLpToStart').' :

    '; echo '
    '; echo ' '; - echo ''; + echo ''; echo ''; echo '
    '; diff --git a/main/newscorm/lp_edit.php b/main/newscorm/lp_edit.php index d637aa2dbc..3ba5d9866b 100644 --- a/main/newscorm/lp_edit.php +++ b/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"'); +//'' //Hidden fields $form->addElement('hidden', 'action', 'update_lp'); diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php index 3b3a2be19a..32447db166 100644 --- a/main/tracking/courseLog.php +++ b/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('{label} {element} setElementTemplate('{label} {element} ','since'); $options = array( 2 => '2 '.get_lang('Days'), @@ -582,4 +582,4 @@ if($_GET['studentlist'] == 'false') { ?> - + @@ -231,4 +231,4 @@ if(get_setting('use_document_title')=='true') ============================================================================== */ Display::display_footer(); -?> \ No newline at end of file +?>