chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update btns CT#7339

Browse Source
1.10.x
aragonc 11 years ago
parent 4384378f02
commit 99ab28b315
13 changed files with 57 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/announcements/announcements.php
  2. 10
      main/inc/introductionSection.inc.php
  3. 4
      main/inc/lib/AnnouncementManager.php
  4. 8
      main/inc/lib/api.lib.php
  5. 4
      main/inc/lib/blog.lib.php
  6. 4
      main/inc/lib/groupmanager.lib.php
  7. 2
      main/inc/lib/message.lib.php
  8. 2
      main/inc/lib/nanogong.lib.php
  9. 2
      main/inc/lib/sortable_table.class.php
  10. 2
      main/inc/lib/usermanager.lib.php
  11. 62
      main/link/link.php
  12. 8
      main/newscorm/learnpath.class.php
  13. 4
      main/newscorm/lp_list.php

2
main/announcements/announcements.php
Unescape View File

@ -330,7 +330,7 @@ switch ($action) {
$form->addCheckBox('send_to_users_in_session', null, get_lang('SendToUsersInSessions'));
}
$form->addButton('save', get_lang('ButtonPublishAnnouncement'));
$form->addButtonSave(get_lang('ButtonPublishAnnouncement'));
$form->setDefaults($defaults);
$content = $form->return_form();

10
main/inc/introductionSection.inc.php
Unescape View File

@ -277,10 +277,10 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
</div>
</div>';
$thematic_description_html .=
'<div class="span8">
<div class="row-fluid">';
'<div class="col-md-8">
<div class="row">';
$thematic_description_html .=
'<div class="span6 items-progress'.$class1.'">
'<div class="col-md-6 items-progress'.$class1.'">
<div class="topics">' . $subTitle1 . '</div>
<p class="title_topics">' . $thematic_info['title'] . '</p>
<p class="date">' . $thematic_advance_info['start_date'] . '</p>
@ -294,7 +294,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic_advance_info2['start_date'] = api_format_date($thematic_advance_info2['start_date'], DATE_TIME_FORMAT_LONG);
$thematic_description_html .=
'<div class="span6 items-progress">
'<div class="col-md-6 items-progress">
<div class="topics">'.$subTitle2.'</div>
<p class="title_topics">'.$thematic_info['title'].'</p>
<p class="date">'.$thematic_advance_info2['start_date'].'</p>
@ -320,7 +320,7 @@ $introduction_section .= '<div class="row"><div class="col-md-12">';
$introduction_section .= $thematic_description_html;
$introduction_section .= '</div>';
$introduction_section .= '<div class="home-course-intro span12"><div class="page-course">';
$introduction_section .= '<div class="home-course-intro col-md-12"><div class="page-course">';
if ($intro_dispDefault) {
if (!empty($intro_content)) {

4
main/inc/lib/AnnouncementManager.php
Unescape View File

@ -1495,13 +1495,13 @@ class AnnouncementManager
(empty($_GET['origin']) or $_GET['origin'] !== 'learnpath')
) {
$html .= '<div id="no-data-view">';
$html .= '<h2>' . get_lang('Announcements') . '</h2>';
$html .= '<h3>' . get_lang('Announcements') . '</h3>';
$html .= Display::return_icon('valves.png', '', array(), 64);
$html .= '<div class="controls">';
$html .= Display::url(
get_lang('AddAnnouncement'),
api_get_self() . "?" . api_get_cidreq() . "&action=add",
array('class' => 'btn')
array('class' => 'btn btn-primary')
);
$html .= '</div>';
$html .= '</div>';

8
main/inc/lib/api.lib.php
Unescape View File

@ -3369,9 +3369,9 @@ function api_not_allowed($print_headers = false, $message = null)
$action = api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
$action = str_replace('&amp;', '&', $action);
$form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked'));
$form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'span3 autocapitalize_off')); //new
$form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'), 'class' => 'span3')); //new
$form->addElement('style_submit_button', 'submitAuth', get_lang('LoginEnter'), array('class' => 'btn span3'));
$form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'col-md-3 autocapitalize_off')); //new
$form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'), 'class' => 'col-md-3')); //new
$form->addElement('style_submit_button', 'submitAuth', get_lang('LoginEnter'), array('class' => 'btn col-md-3'));
// see same text in auth/gotocourse.php and main_api.lib.php function api_not_allowed (bellow)
$msg = Display::return_message(get_lang('NotAllowed'), 'error', false);
@ -3383,7 +3383,7 @@ function api_not_allowed($print_headers = false, $message = null)
$msg .= "<p style='text-align:center'><a href='#' onclick='$(this).parent().next().toggle()'>".get_lang('LoginWithExternalAccount')."</a></p>";
$msg .= "<div style='display:none;'>";
}
$msg .= '<div class="well_login">';
$msg .= '<div class="well">';
$msg .= $form->return_form();
$msg .='</div>';
if (api_is_cas_activated()) {

4
main/inc/lib/blog.lib.php
Unescape View File

@ -2038,7 +2038,7 @@ class Blog
//Link to register users
if($a_infosUser["user_id"] != $_SESSION['_user']['user_id'])
{
$row[] = "<a class=\"btn \" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;register=yes&amp;user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
$row[] = "<a class=\"btn btn-primary \" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;register=yes&amp;user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
}
else
{
@ -2151,7 +2151,7 @@ class Blog
//Link to register users
if($myrow["user_id"] != $_user['user_id']) {
$row[] = "<a class=\"btn\" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;unregister=yes&amp;user_id=" . $myrow[user_id]."\">" . get_lang('UnRegister')."</a>";
$row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;unregister=yes&amp;user_id=" . $myrow[user_id]."\">" . get_lang('UnRegister')."</a>";
} else {
$row[] = '';
}

4
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -2237,9 +2237,9 @@ class GroupManager
// Self-registration / unregistration
if (!api_is_allowed_to_edit(false, true)) {
if (self :: is_self_registration_allowed($user_id, $this_group['id'])) {
$row[] = '<a class = "btn" href="group.php?'.api_get_cidreq().'&category='.$category_id.'&amp;action=self_reg&amp;group_id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."'".')) return false;">'.get_lang('GroupSelfRegInf').'</a>';
$row[] = '<a class = "btn btn-default" href="group.php?'.api_get_cidreq().'&category='.$category_id.'&amp;action=self_reg&amp;group_id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."'".')) return false;">'.get_lang('GroupSelfRegInf').'</a>';
} elseif (self :: is_self_unregistration_allowed($user_id, $this_group['id'])) {
$row[] = '<a class = "btn" href="group.php?'.api_get_cidreq().'&category='.$category_id.'&amp;action=self_unreg&amp;group_id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."'".')) return false;">'.get_lang('GroupSelfUnRegInf').'</a>';
$row[] = '<a class = "btn btn-default" href="group.php?'.api_get_cidreq().'&category='.$category_id.'&amp;action=self_unreg&amp;group_id='.$this_group['id'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."'".')) return false;">'.get_lang('GroupSelfUnRegInf').'</a>';
} else {
$row[] = '-';
}

2
main/inc/lib/message.lib.php
Unescape View File

@ -1083,7 +1083,7 @@ class MessageManager
$html .= Display::tag('h4', Display::url(Security::remove_XSS($topic['title'], STUDENT, true), 'group_topics.php?id='.$group_id.'&topic_id='.$topic['id']));
if ($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) {
$actions = '<br />'.Display::url(get_lang('Delete'), api_get_path(WEB_CODE_PATH).'social/group_topics.php?action=delete&id='.$group_id.'&topic_id='.$topic['id'], array('class' => 'btn'));
$actions = '<br />'.Display::url(get_lang('Delete'), api_get_path(WEB_CODE_PATH).'social/group_topics.php?action=delete&id='.$group_id.'&topic_id='.$topic['id'], array('class' => 'btn btn-default'));
}
$date = '';

2
main/inc/lib/nanogong.lib.php
Unescape View File

@ -338,7 +338,7 @@ class Nanogong
if (!empty($file_path)) {
$url = $this->get_public_url(true);
$actions = Display::url(Display::return_icon('save.png', get_lang('Download'), array(), ICON_SIZE_SMALL), $url, array('target'=>'_blank'));
$download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn'));
$download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn btn-default'));
if ($show_delete_button) {
$actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();'));

2
main/inc/lib/sortable_table.class.php
Unescape View File

@ -665,7 +665,7 @@ class SortableTable extends HTML_Table
//}
$result[] = '</select>';
$result[] = '<noscript>';
$result[] = '<button class="btn save" type="submit">'.get_lang('Save').'</button>';
$result[] = '<button class="btn btn-success" type="submit">'.get_lang('Save').'</button>';
$result[] = '</noscript>';
$result[] = '</form>';
$result = implode("\n", $result);

2
main/inc/lib/usermanager.lib.php
Unescape View File

@ -3937,7 +3937,7 @@ class UserManager
<option value="2"' . (($searchType=='2')?'selected="selected"':"") . '>--' . get_lang('Group') . '--</option>
</select>
'.$extraFields.'
<button class="btn" type="submit" value="search">'.get_lang('Search').'</button>
<button class="btn btn-primary" type="submit" value="search">'.get_lang('Search').'</button>
</form>
';

62
main/link/link.php
Unescape View File

@ -223,47 +223,47 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
$target_link = "_blank";
}
echo ' <div class="control-group url">
<label class="control-label">
echo ' <div class="form-group url">
<label class="col-sm-2 control-label">
<span class="form_required">*</span> URL
</label>
<div class="controls">
<input type="text" name="urllink" class="span6" value="' . (empty($urllink) ? 'http://' : Security::remove_XSS($urllink)) . '" />
<div class="col-sm-10">
<input type="text" name="urllink" class="form-control" value="' . (empty($urllink) ? 'http://' : Security::remove_XSS($urllink)) . '" />
</div>
</div>';
echo ' <div class="control-group title">
<label class="control-label">
echo ' <div class="form-group title">
<label class="col-sm-2 control-label">
'.get_lang('LinkName').'
</label>
<div class="controls">
<input type="text" name="title" class="span6" value="' . Security::remove_XSS($title) . '" />
<div class="col-sm-10">
<input type="text" name="title" class="form-control" value="' . Security::remove_XSS($title) . '" />
</div>
</div>';
echo ' <div class="control-group metadata">
<label class="control-label">
echo ' <div class="form-group metadata">
<label class="col-sm-2 control-label">
'.get_lang('Metadata').'
</label>
<div class="controls">
<div class="col-sm-10">
<a href="../metadata/index.php?eid='.urlencode('Link.'.$clean_link_id).'">'.get_lang('AddMetadata').'</a>
</div>
</div>';
echo ' <div class="control-group description">
<label class="control-label">
echo ' <div class="form-group description">
<label class="col-sm-2 control-label">
'.get_lang('Description').'
</label>
<div class="controls">
<textarea class="span3" cols="50" name="description">' . Security::remove_XSS($description) . '</textarea>
<div class="col-sm-10">
<textarea class="form-control" cols="50" name="description">' . Security::remove_XSS($description) . '</textarea>
</div>
</div>';
$resultcategories = Link::getLinkCategories($course_id, $session_id);
if (!empty($resultcategories)) {
echo ' <div class="control-group category">
<label class="control-label">
echo ' <div class="form-group category">
<label class="col-sm-2 control-label">
'.get_lang('Category').'
</label>
<div class="controls">';
<div class="col-sm-10">';
echo ' <select name="selectcategory">';
echo ' <option value="0">--</option>';
foreach ($resultcategories as $myrow) {
@ -277,18 +277,18 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
echo ' </div>
</div>';
}
echo ' <div class="control-group onhomepage">
<label class="control-label">
echo ' <div class="form-group onhomepage">
<label class="col-sm-2 control-label">
</label>
<div class="controls">
<div class="col-sm-10">
<input class="checkbox" type="checkbox" name="onhomepage" id="onhomepage" value="1"'.$onhomepage.'><label for="onhomepage"> '.get_lang('OnHomepage').'?</label>
</div>
</div>';
echo ' <div class="control-group target" id="div_target">
<label class="control-label">
echo ' <div class="form-group target" id="div_target">
<label class="col-sm-2 control-label">
'.get_lang('LinkTarget').'
</label>
<div class="controls">
<div class="col-sm-10 controls">
<select name="target_link" id="target_link">';
$targets = array('_self'=>get_lang('LinkOpenSelf'),'_blank'=>get_lang('LinkOpenBlank'),'_parent'=>get_lang('LinkOpenParent'),'_top'=>get_lang('LinkOpenTop'));
foreach ($targets as $target_id => $target) {
@ -309,11 +309,11 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
$specific_fields = get_specific_field_list();
echo ' <div class="control-group index">
<label class="control-label">
echo ' <div class="form-group index">
<label class="col-sm-2 control-label">
'.get_lang('SearchFeatureDoIndexLink').'
</label>
<div class="controls">
<div class="col-sm-10">
<label for="index_document">
<input class="checkbox" type="checkbox" name="index_document" id="index_document" checked="checked">
'.get_lang('Yes').'
@ -347,11 +347,11 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) {
}
}
echo '<input type="hidden" name="lp_id" value="' . $lpId. '" />';
echo '<div class="control-group">
<label class="control-label">
echo '<div class="form-group">
<label class="col-sm-2 control-label">
</label>
<div class="controls">
<button class="btn save" type="submit" name="submitLink" value="OK">'.get_lang('SaveLink').'</button>
<div class="col-sm-10">
<button class="btn btn-success" type="submit" name="submitLink" value="OK">'.get_lang('SaveLink').'</button>
</div>
</div>';
echo '</form>';

8
main/newscorm/learnpath.class.php
Unescape View File

@ -3146,9 +3146,9 @@ class learnpath
if ($this->get_lp_session_id() == api_get_session_id()) {
$html .= '<div id="actions_lp" class="actions_lp">';
$html .= '<div class="btn-group">';
$html .= "<a class='btn' href='lp_controller.php?" . api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=build&amp;lp_id=" . $this->lp_id . "' target='_parent'>" . get_lang('Overview') . "</a>";
$html .= "<a class='btn' href='lp_controller.php?" . api_get_cidreq()."&amp;action=add_item&amp;type=step&amp;lp_id=" . $this->lp_id . "' target='_parent'>" . get_lang('Edit') . "</a>";
$html .= '<a class="btn" href="lp_controller.php?'.api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=edit&amp;lp_id=" . $this->lp_id.'">'.get_lang('Settings').'</a>';
$html .= "<a class='btn btn-default' href='lp_controller.php?" . api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=build&amp;lp_id=" . $this->lp_id . "' target='_parent'>" . get_lang('Overview') . "</a>";
$html .= "<a class='btn btn-default' href='lp_controller.php?" . api_get_cidreq()."&amp;action=add_item&amp;type=step&amp;lp_id=" . $this->lp_id . "' target='_parent'>" . get_lang('Edit') . "</a>";
$html .= '<a class="btn btn-default" href="lp_controller.php?'.api_get_cidreq()."&amp;gradebook=$gradebook&amp;action=edit&amp;lp_id=" . $this->lp_id.'">'.get_lang('Settings').'</a>';
$html .= '</div>';
$html .= '</div>';
}
@ -5401,7 +5401,7 @@ class learnpath
$return .= '<div class="col-md-12">';
$return .= self::return_new_tree($update_audio);
$return .='</div>';
$return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn')), array('style'=>'float:left; margin-top:15px;width:100%'));
$return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn btn-primary')), array('style'=>'float:left; margin-top:15px;width:100%'));
} else {
$return_audio .= self::return_new_tree($update_audio);
$return .= $return_audio.'</table>';

4
main/newscorm/lp_list.php
Unescape View File

@ -475,10 +475,10 @@ if (!empty($flat_list)) {
} else {
if ($is_allowed_to_edit) {
echo '<div id="no-data-view">';
echo '<h2>'.get_lang('LearningPaths').'</h2>';
echo '<h3>'.get_lang('LearningPaths').'</h3>';
echo Display::return_icon('scorms.png', '', array(), 64);
echo '<div class="controls">';
echo Display::url(get_lang('LearnpathAddLearnpath'), api_get_self().'?'.api_get_cidreq().'&action=add_lp', array('class' => 'btn'));
echo Display::url(get_lang('LearnpathAddLearnpath'), api_get_self().'?'.api_get_cidreq().'&action=add_lp', array('class' => 'btn btn-primary'));
echo '</div>';
echo '</div>';
}

Write Preview
Loading…
Cancel
Save