From cc540ec185b20ae7f729050d4a0b5deb0a0acb72 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Thu, 2 Apr 2015 19:08:03 -0500 Subject: [PATCH] Minor - Fix button style - refs #7539 --- custompages/registration-dist.php | 2 +- main/auth/lostPassword.php | 2 +- main/coursecopy/import_backup.php | 4 ++-- main/document/showinframes.php | 4 ++-- main/forum/forumqualify.php | 2 +- main/group/group_space.php | 4 ++-- main/help/help.php | 4 ++-- main/inc/ajax/social.ajax.php | 2 +- main/inc/lib/nanogong.lib.php | 4 ++-- main/inc/lib/social.lib.php | 2 +- main/social/friends.php | 2 +- main/social/groups.php | 20 +++++++++---------- main/social/profile.php | 2 +- main/template/default/agenda/event_list.tpl | 4 ++-- main/template/default/auth/courses_list.php | 4 ++-- .../default/auth/sessions_catalog.tpl | 2 +- .../default/course_description/edit.tpl | 2 +- .../default/layout/course_navigation.tpl | 2 +- .../default/learnpath/record_voice.tpl | 2 +- main/template/default/skill/drh_report.tpl | 4 ++-- main/template/default/skill/profile.tpl | 2 +- main/template/default/skill/skill_tree.tpl | 4 ++-- main/template/default/skill/skill_wheel.tpl | 2 +- .../default/skill/skill_wheel_student.tpl | 2 +- main/user/user.php | 4 ++-- plugin/add_cas_login_button/template.tpl | 2 +- plugin/add_cas_logout_button/template.tpl | 2 +- .../add_shibboleth_login_button/template.tpl | 2 +- plugin/bbb/listing.tpl | 2 +- plugin/buycourses/view/index.tpl | 8 ++++---- plugin/openmeetings/listing.tpl | 2 +- .../lib/search_course_widget.class.php | 2 +- 32 files changed, 54 insertions(+), 54 deletions(-) diff --git a/custompages/registration-dist.php b/custompages/registration-dist.php index aeb4fc0f83..c0206a1149 100644 --- a/custompages/registration-dist.php +++ b/custompages/registration-dist.php @@ -41,7 +41,7 @@ $form_template = <<   -

S'inscrire

+

S'inscrire

EOT; diff --git a/main/auth/lostPassword.php b/main/auth/lostPassword.php index f9131cbb80..7b0f627e93 100755 --- a/main/auth/lostPassword.php +++ b/main/auth/lostPassword.php @@ -75,7 +75,7 @@ if (api_get_setting('allow_lostpassword') == 'false') { if (isset($_GET['reset']) && isset($_GET['id'])) { $message = Display::return_message(Login::reset_password($_GET["reset"], $_GET["id"], true), 'normal', false); - $message .= ''.get_lang('Back').''; + $message .= ''.get_lang('Back').''; echo $message; } else { $form = new FormValidator('lost_password'); diff --git a/main/coursecopy/import_backup.php b/main/coursecopy/import_backup.php index cee700ca0c..48cf94412f 100755 --- a/main/coursecopy/import_backup.php +++ b/main/coursecopy/import_backup.php @@ -137,10 +137,10 @@ if (Security::check_token('post') && ( CourseSelectForm::display_form($course, $hiddenFields); } elseif ($filename === false) { Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin')); - echo '' . get_lang('TryAgain') . ''; + echo '' . get_lang('TryAgain') . ''; } else { Display::display_warning_message(get_lang('NoResourcesInBackupFile')); - echo '' . get_lang('TryAgain') . ''; + echo '' . get_lang('TryAgain') . ''; } } else { $user = api_get_user_info(); diff --git a/main/document/showinframes.php b/main/document/showinframes.php index 15111f775a..a198c41bbd 100755 --- a/main/document/showinframes.php +++ b/main/document/showinframes.php @@ -329,7 +329,7 @@ $file_url_web = $file_url.'?'.api_get_cidreq(); if (!$is_nanogong_available) { if (in_array(strtolower($pathinfo['extension']) , array('html', "htm"))) { - echo ''.get_lang('CutPasteLink').''; + echo ''.get_lang('CutPasteLink').''; } } @@ -426,7 +426,7 @@ if ($is_freemind_available) { if ($is_nanogong_available) { $file_url_web = DocumentManager::generateAudioTempFolder($file_url_sys); echo '
'; - echo ''.get_lang('Download').''; + echo ' '.get_lang('Download').''; echo '
'; echo '
'; echo DocumentManager::readNanogongFile($to_url); diff --git a/main/forum/forumqualify.php b/main/forum/forumqualify.php index 6508591d24..2f40651cc2 100755 --- a/main/forum/forumqualify.php +++ b/main/forum/forumqualify.php @@ -228,7 +228,7 @@ if ($allowed_to_edit) { } echo '

'.get_lang('QualificationChangesHistory').'

'; if ($_GET['type'] == 'false') { - $buttons = ''. + $buttons = ''. get_lang('MoreRecent').' '.get_lang('Older').''; } else { $buttons = ''.get_lang('MoreRecent').' diff --git a/main/group/group_space.php b/main/group/group_space.php index 7524a62259..9a3a51e3e4 100755 --- a/main/group/group_space.php +++ b/main/group/group_space.php @@ -103,7 +103,7 @@ echo ''. */ $subscribe_group = ''; if (GroupManager :: is_self_registration_allowed($user_id, $current_group['id'])) { - $subscribe_group = ''. + $subscribe_group = ''. get_lang("RegIntoGroup").''; } @@ -112,7 +112,7 @@ if (GroupManager :: is_self_registration_allowed($user_id, $current_group['id']) */ $unsubscribe_group = ''; if (GroupManager :: is_self_unregistration_allowed($user_id, $current_group['id'])) { - $unsubscribe_group = ''. + $unsubscribe_group = ''. get_lang("StudentUnsubscribe").''; } echo ' 
'; diff --git a/main/help/help.php b/main/help/help.php index b1eed1b258..b9af28169a 100755 --- a/main/help/help.php +++ b/main/help/help.php @@ -16,7 +16,7 @@ if (empty($help_name)) { } ?> - +
@@ -24,6 +24,6 @@ if (empty($help_name)) {
- + diff --git a/main/inc/ajax/social.ajax.php b/main/inc/ajax/social.ajax.php index c30303595f..b7ba47a40b 100755 --- a/main/inc/ajax/social.ajax.php +++ b/main/inc/ajax/social.ajax.php @@ -93,7 +93,7 @@ switch ($action) { $friend_html.=''; $friend_html.='
'; $friend_html.='
'.$user_name.'
'; - $friend_html.='

'; + $friend_html.='

'; $friend_html.='
'; $friend_html.=''; diff --git a/main/inc/lib/nanogong.lib.php b/main/inc/lib/nanogong.lib.php index 6cd7524f28..b42f68e233 100755 --- a/main/inc/lib/nanogong.lib.php +++ b/main/inc/lib/nanogong.lib.php @@ -604,7 +604,7 @@ class Nanogong $html .= '
'; $html .= ''; - $html .= ''.get_lang('SendRecord').''; + $html .= ''.get_lang('SendRecord').''; $html .= '
'; @@ -614,7 +614,7 @@ class Nanogong //$html .= Display::return_message(get_lang('BrowserNotSupportNanogongSend'), 'warning'); $html .= ''; $html .= ''; $html .= ''; diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 5ea4b03618..f9b0b8460f 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -1647,7 +1647,7 @@ class SocialManager extends UserManager $friendHtml.=''; } else { $friendHtml.= '
'.get_lang('NoFriendsInYourContactList').'
' - .''. get_lang('TryAndFindSomeFriends').'
'; + .' '. get_lang('TryAndFindSomeFriends').''; } return $friendHtml; diff --git a/main/social/friends.php b/main/social/friends.php index 701da12666..6345e70c10 100755 --- a/main/social/friends.php +++ b/main/social/friends.php @@ -99,7 +99,7 @@ $social_right_content = '
'; if (count($friends) == 0) { $social_right_content .= get_lang('NoFriendsInYourContactList').'

'; - $social_right_content .= ''.get_lang('TryAndFindSomeFriends').''; + $social_right_content .= ''.get_lang('TryAndFindSomeFriends').''; } else { $social_right_content .= get_lang('Search').'   :   '; $social_right_content .= ''; diff --git a/main/social/groups.php b/main/social/groups.php index 0b3c7363cb..f22df53ec7 100755 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -331,10 +331,10 @@ if ($group_id != 0) { ) ) ) { - $social_right_content .= '' . get_lang('JoinGroup') . ''; } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) { - $social_right_content .= '' . get_lang('YouHaveBeenInvitedJoinNow') . ''; } $social_right_content .= '

'; @@ -447,10 +447,10 @@ if ($group_id != 0) { ) ) ) { - $social_right_content .= '' . get_lang('JoinGroup') . ''; } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) { - $social_right_content .= '' . get_lang('YouHaveBeenInvitedJoinNow') . ''; } } @@ -618,7 +618,7 @@ if ($group_id != 0) { //Avoiding my groups $join_url = ''; if (!in_array($id, $my_group_list)) { - $join_url = '' . get_lang('JoinGroup') . ' '; } @@ -705,7 +705,7 @@ if ($group_id != 0) { $join_url = ''; if (!in_array($id, $my_group_list)) { - $join_url = '' . get_lang('JoinGroup') . ' '; } $item_4 = '
' . $join_url . '
'; @@ -740,7 +740,7 @@ if ($group_id != 0) { 'allow_students_to_create_groups_in_social' ) == 'true' ) { - $create_group_item = '' . get_lang( 'CreateASocialGroup' @@ -748,7 +748,7 @@ if ($group_id != 0) { //$my_group_content = $create_group_item. $my_group_content; } else { if (api_is_allowed_to_edit(null, true)) { - $create_group_item = '' . get_lang( 'CreateASocialGroup' @@ -816,7 +816,7 @@ if ($group_id != 0) { 'allow_students_to_create_groups_in_social' ) == 'true' ) { - $create_group_item = '' . get_lang( 'CreateASocialGroup' @@ -824,7 +824,7 @@ if ($group_id != 0) { //$my_group_content = $create_group_item. $my_group_content; } else { if (api_is_allowed_to_edit(null, true)) { - $create_group_item = '' . get_lang( 'CreateASocialGroup' diff --git a/main/social/profile.php b/main/social/profile.php index 9088d58063..9810ac292d 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -662,7 +662,7 @@ if ($show_full_profile) { ); $invitations .= '
'; $invitations .= '' + .' class="btn btn-default" onclick="register_friend(this)" href="javascript:void(0)">' .get_lang('SocialAddToFriends') .''; $invitations .= '
'; diff --git a/main/template/default/agenda/event_list.tpl b/main/template/default/agenda/event_list.tpl index 4af213398e..682dc92408 100755 --- a/main/template/default/agenda/event_list.tpl +++ b/main/template/default/agenda/event_list.tpl @@ -44,12 +44,12 @@ {% if is_allowed_to_edit %} {% if event.visibility == 1 %} - + {% else %} {% if event.type == 'course' or event.type == 'session' %} - + {% endif %} diff --git a/main/template/default/auth/courses_list.php b/main/template/default/auth/courses_list.php index 7671c6f44a..4255f807ba 100755 --- a/main/template/default/auth/courses_list.php +++ b/main/template/default/auth/courses_list.php @@ -162,7 +162,7 @@ if (!empty($user_course_categories)) {
')) return false"> -
@@ -262,7 +262,7 @@ if (!empty($courses_without_category)) {
')) return false;"> -
diff --git a/main/template/default/auth/sessions_catalog.tpl b/main/template/default/auth/sessions_catalog.tpl index c4e1428b79..4f680328d2 100644 --- a/main/template/default/auth/sessions_catalog.tpl +++ b/main/template/default/auth/sessions_catalog.tpl @@ -73,7 +73,7 @@ {% endif %} {% if coursesCategoriesList is not empty %} - {{ 'RandomPick' | get_lang }} + {{ 'RandomPick' | get_lang }} {% endif %}
diff --git a/main/template/default/course_description/edit.tpl b/main/template/default/course_description/edit.tpl index 72339f9be5..6c2b68841f 100755 --- a/main/template/default/course_description/edit.tpl +++ b/main/template/default/course_description/edit.tpl @@ -7,7 +7,7 @@ {% if is_allowed_to_edit %}
- +
diff --git a/main/template/default/layout/course_navigation.tpl b/main/template/default/layout/course_navigation.tpl index de993570c2..e49d1cbb11 100755 --- a/main/template/default/layout/course_navigation.tpl +++ b/main/template/default/layout/course_navigation.tpl @@ -55,7 +55,7 @@ createCookie('menu_state',0,10); } } - document.write('
{{'Hide'|get_lang}}<\/a>
'); + document.write('
{{'Hide'|get_lang}}<\/a>
'); {{ show_course_navigation_menu }} {% endif %} diff --git a/main/template/default/learnpath/record_voice.tpl b/main/template/default/learnpath/record_voice.tpl index e393642631..53245680db 100755 --- a/main/template/default/learnpath/record_voice.tpl +++ b/main/template/default/learnpath/record_voice.tpl @@ -8,7 +8,7 @@
{{ 'RecordAudio' | get_lang }} - +
diff --git a/main/template/default/skill/drh_report.tpl b/main/template/default/skill/drh_report.tpl index a2bee272ca..deaea710a8 100644 --- a/main/template/default/skill/drh_report.tpl +++ b/main/template/default/skill/drh_report.tpl @@ -19,7 +19,7 @@ {% endfor %} - +
@@ -31,7 +31,7 @@ {% endfor %} - +
diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl index 94db31c15a..c6f429266c 100755 --- a/main/template/default/skill/profile.tpl +++ b/main/template/default/skill/profile.tpl @@ -9,7 +9,7 @@ {% endfor %} - {{"SaveThisSearch"|get_lang}} + {{"SaveThisSearch"|get_lang}} {% endif %} diff --git a/main/template/default/skill/skill_tree.tpl b/main/template/default/skill/skill_tree.tpl index 95432e7601..46e26d8154 100755 --- a/main/template/default/skill/skill_tree.tpl +++ b/main/template/default/skill/skill_tree.tpl @@ -415,8 +415,8 @@ $(document).ready(function() {

{{'Skills'|get_lang}}

{{'AddSkill'|get_lang}} - {{'Root'|get_lang}} - {{'BackToAdmin'|get_lang}} + {{'Root'|get_lang}} + {{'BackToAdmin'|get_lang}}
diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl index 37eca5ea7f..7587337290 100644 --- a/main/template/default/skill/skill_wheel.tpl +++ b/main/template/default/skill/skill_wheel.tpl @@ -502,7 +502,7 @@ $(document).ready(function() {
{{ "ViewSkillsWheel"|get_lang }} - +
diff --git a/main/template/default/skill/skill_wheel_student.tpl b/main/template/default/skill/skill_wheel_student.tpl index cd10d4a0e7..54d9e65bcd 100755 --- a/main/template/default/skill/skill_wheel_student.tpl +++ b/main/template/default/skill/skill_wheel_student.tpl @@ -334,7 +334,7 @@ $(document).ready(function() {
{{ "ViewSkillsWheel"|get_lang }} - +
diff --git a/main/user/user.php b/main/user/user.php index 1ed8d97e00..a78410cc67 100755 --- a/main/user/user.php +++ b/main/user/user.php @@ -484,13 +484,13 @@ if (api_is_allowed_to_edit(null, true)) { if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' or api_is_platform_admin() ) { - $actions .= ' '.get_lang('Classes').''; + $actions .= ' '.get_lang('Classes').''; } if (api_is_allowed_to_edit() && isset($_configuration['allow_tutors_to_assign_students_to_session']) && $_configuration['allow_tutors_to_assign_students_to_session'] == 'true') { - $actions .= ' '.get_lang('Sessions').''; + $actions .= ' '.get_lang('Sessions').''; } // Build search-form diff --git a/plugin/add_cas_login_button/template.tpl b/plugin/add_cas_login_button/template.tpl index 1f1e25a212..9e8bd5142d 100755 --- a/plugin/add_cas_login_button/template.tpl +++ b/plugin/add_cas_login_button/template.tpl @@ -11,7 +11,7 @@
{{ add_cas_login_button.comm_label }}
{% if add_cas_login_button.cas_activated %} {% if add_cas_login_button.cas_configured %} - + {% else %} CAS isn't configured. Go to Admin > Configuration > CAS.
{% endif %} diff --git a/plugin/add_cas_logout_button/template.tpl b/plugin/add_cas_logout_button/template.tpl index c9a958cf80..d7e8f2825c 100755 --- a/plugin/add_cas_logout_button/template.tpl +++ b/plugin/add_cas_logout_button/template.tpl @@ -9,7 +9,7 @@
 
{% endif %}
{{add_cas_logout_button.logout_comment}}
- + {% endif %} diff --git a/plugin/add_shibboleth_login_button/template.tpl b/plugin/add_shibboleth_login_button/template.tpl index ebfd597a40..e42d26d6a2 100755 --- a/plugin/add_shibboleth_login_button/template.tpl +++ b/plugin/add_shibboleth_login_button/template.tpl @@ -10,6 +10,6 @@
 
{% endif %}
{{ add_shibboleth_login_button.comm_label }}
- + {% endif %} diff --git a/plugin/bbb/listing.tpl b/plugin/bbb/listing.tpl index 24c0f54b9b..21eb9090a8 100755 --- a/plugin/bbb/listing.tpl +++ b/plugin/bbb/listing.tpl @@ -52,7 +52,7 @@ {% if allow_to_edit %} {% if meeting.status == 1 %} - {{ 'CloseMeeting'|get_lang }} + {{ 'CloseMeeting'|get_lang }} {% else %} {{ meeting.action_links }} {% endif %} diff --git a/plugin/buycourses/view/index.tpl b/plugin/buycourses/view/index.tpl index 80aed3709c..92e1bb82c2 100644 --- a/plugin/buycourses/view/index.tpl +++ b/plugin/buycourses/view/index.tpl @@ -30,7 +30,7 @@
- {{ BuyCourses }} + {{ BuyCourses }}
@@ -41,7 +41,7 @@
- {{ ConfigurationOfCoursesAndPrices }} + {{ ConfigurationOfCoursesAndPrices }}
@@ -51,7 +51,7 @@
- {{ ConfigurationOfPayments }} + {{ ConfigurationOfPayments }}
@@ -61,7 +61,7 @@
- {{ OrdersPendingOfPayment }} + {{ OrdersPendingOfPayment }}
diff --git a/plugin/openmeetings/listing.tpl b/plugin/openmeetings/listing.tpl index 4ffbafe0bd..c703f5e7fa 100755 --- a/plugin/openmeetings/listing.tpl +++ b/plugin/openmeetings/listing.tpl @@ -48,7 +48,7 @@ {% if allow_to_edit %} {% if meeting.status == 1 %} - {{ 'CloseMeeting' | get_lang }} + {{ 'CloseMeeting' | get_lang }} {% endif %} {{ 'DeleteMeeting' | get_lang }} diff --git a/plugin/search_course/lib/search_course_widget.class.php b/plugin/search_course/lib/search_course_widget.class.php index 8c16580a3b..30fd407320 100755 --- a/plugin/search_course/lib/search_course_widget.class.php +++ b/plugin/search_course/lib/search_course_widget.class.php @@ -207,7 +207,7 @@ EOT; -   +   EOT; echo $form;