From 4d61c7856a049a48a2a34ae26c91b0a2fcbd33e5 Mon Sep 17 00:00:00 2001 From: aragonc Date: Fri, 28 Aug 2015 18:23:11 -0500 Subject: [PATCH] cambios boostrap 13 --- app/Resources/public/css/base.css | 81 +++++++++++++++++++++++------ main/course_description/listing.php | 1 + main/document/document.php | 80 ++++++++++++++++------------ main/inc/lib/agenda.lib.php | 47 ++++++++--------- 4 files changed, 138 insertions(+), 71 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 2c561e2070..7a72c5a91b 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -303,7 +303,7 @@ ul#navigation .report a { .actions { background:#ffffff; border:1px solid #dddddd; - padding: 15px; + padding: 10px; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -341,8 +341,37 @@ ul#navigation .report a { .muted { color: #999999 !important; } -.actions a img{ +.actions .btn-default{ + padding: 6px; + border: 1px solid #DDD +} +/* .actions a img{ margin-right: 5px; +}*/ +.actions a{ + border: 1px solid #ddd; + border-radius: 5px; + display: inline-block; + margin-left: 5px; + padding: 5px; + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* IE10+ */ + background: linear-gradient(to bottom, #ffffff 0%,#e5e5e5 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */ +} +.actions a:hover{ + background: #f4f4f4; /* Old browsers */ + background: -moz-linear-gradient(top, #f4f4f4 0%, #dddddd 71%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f4f4), color-stop(71%,#dddddd)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* IE10+ */ + background: linear-gradient(to bottom, #f4f4f4 0%,#dddddd 71%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#dddddd',GradientType=0 ); /* IE6-9 */ } .actions .btn-toolbar { margin : 0px; @@ -847,7 +876,7 @@ a.personal_agenda:hover, a.personal_agenda:hover { } .right { - float:right !important; + text-align: right; } /* Nice buttons v2 */ @@ -3990,20 +4019,34 @@ a.forum_group_link { text-align: center; } .new_actions { - background-color: #EEEEEE; - background-image: -moz-linear-gradient(center top , #F5F5F5 0%, #EEEEEE 100%); - background-repeat: repeat-x; + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* IE10+ */ + background: linear-gradient(to bottom, #ffffff 0%,#e5e5e5 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */ border: 1px solid #E5E5E5; border-radius: 4px 4px 4px 4px; - height: 53px; + min-height: 50px; } .new_actions .nav > li > a { - border-left: 1px solid #F5F5F5; + border-radius: 0 0 0 0; border-right: 1px solid #E5E5E5; margin: 0; - padding-bottom: 11px; - padding-top: 11px; + padding: 10px; +} +.new_actions .nav li a:hover{ + background: #f4f4f4; /* Old browsers */ + background: -moz-linear-gradient(top, #f4f4f4 0%, #dddddd 71%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f4f4), color-stop(71%,#dddddd)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* IE10+ */ + background: linear-gradient(to bottom, #f4f4f4 0%,#dddddd 71%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#dddddd',GradientType=0 ); /* IE6-9 */ } .new_actions-fixed { border-color: #D5D5D5; @@ -4015,17 +4058,25 @@ a.forum_group_link { top: 0px; z-index: 1030; } -.new_actions .nav > .active > a, .new_actions .nav > .active > a:hover { - background-color: #E9E9E9; +.new_actions .nav .active a:hover { + background: #E9E9E9; border-left: 0 none; border-right-color: #DDDDDD; box-shadow: 0 3px 5px rgba(0, 0, 0, 0.05) inset; color: #777777; - padding-left: 13px; } .new_actions .nav-tabs > li > a, .new_actions .nav-pills > li > a { - padding-left: 6px; - padding-right: 6px; + padding:8px; +} +.new_actions .nav-pills li.active a{ + background: #dddddd; /* Old browsers */ + background: -moz-linear-gradient(top, #dddddd 10%, #f4f4f4 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(10%,#dddddd), color-stop(100%,#f4f4f4)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* IE10+ */ + background: linear-gradient(to bottom, #dddddd 10%,#f4f4f4 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dddddd', endColorstr='#f4f4f4',GradientType=0 ); /* IE6-9 */ } .subnav .nav > li > .logout { padding-top:8px; diff --git a/main/course_description/listing.php b/main/course_description/listing.php index fca200c9e8..d99c643727 100755 --- a/main/course_description/listing.php +++ b/main/course_description/listing.php @@ -79,6 +79,7 @@ if (isset($descriptions) && count($descriptions) > 0) { echo '
'; echo $description['content']; echo '
'; + } } } else { diff --git a/main/document/document.php b/main/document/document.php index 8f7a4d0e46..c5fb58f57d 100755 --- a/main/document/document.php +++ b/main/document/document.php @@ -1499,32 +1499,19 @@ if ($groupId != 0) { if (!isset($folders) || $folders === false) { $folders = array(); } - +$btngroup= array('class' => 'btn btn-default'); $actions = '
'; -if (!$is_certificate_mode) { - /* BUILD SEARCH FORM */ - - $form = new FormValidator( - 'search_document', - 'get', - api_get_self().'?'.api_get_cidreq(), - '', - array(), - FormValidator::LAYOUT_INLINE - ); - $form->addText('keyword', '', false, array('class' => 'col-md-2')); - $form->addElement('hidden', 'cidReq', api_get_course_id()); - $form->addElement('hidden', 'id_session', api_get_session_id()); - $form->addElement('hidden', 'gidReq', $groupId); - $form->addButtonSearch(get_lang('Search')); - $actions .= $form->returnForm(); -} +$actions .= '
'; +$actions .= '
'; /* GO TO PARENT DIRECTORY */ + if ($curdirpath != '/' && $curdirpath != $group_properties['directory'] && !$is_certificate_mode) { + $actions .= ''; $actions .= Display::return_icon('folder_up.png', get_lang('Up'), '', ICON_SIZE_MEDIUM); $actions .= ''; + } if ($is_certificate_mode && $curdirpath != '/certificates') { @@ -1646,6 +1633,48 @@ if ($is_allowed_to_edit || ); } } +require 'document_slideshow.inc.php'; +if ($image_present && !isset($_GET['keyword'])) { + $actions .= Display::url( + Display::return_icon('slideshow.png', get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM), + api_get_path(WEB_CODE_PATH).'document/slideshow.php?'.api_get_cidreq().'&curdirpath='.$curdirpathurl + ); +} + +if (api_is_allowed_to_edit(null, true)) { + $actions .= Display::url( + Display::return_icon('percentage.png', get_lang('DocumentQuota'), '', ICON_SIZE_MEDIUM), + api_get_path(WEB_CODE_PATH).'document/document_quota.php?'.api_get_cidreq() + ); +} + +$actions .= '
'; +$actions .= '
'; +$actions .= '
'; +if (!$is_certificate_mode) { + /* BUILD SEARCH FORM */ + + $form = new FormValidator( + 'search_document', + 'get', + api_get_self().'?'.api_get_cidreq(), + '', + array(), + FormValidator::LAYOUT_INLINE + ); + $form->addText('keyword', '', false, array('class' => 'col-md-2')); + $form->addElement('hidden', 'cidReq', api_get_course_id()); + $form->addElement('hidden', 'id_session', api_get_session_id()); + $form->addElement('hidden', 'gidReq', $groupId); + $form->addButtonSearch(get_lang('Search')); + $actions .= $form->returnForm(); +} +$actions .= '
'; +$actions .= '
'; +$actions .= '
'; + + + $table_footer = ''; $total_size = 0; @@ -1822,20 +1851,7 @@ if (!is_null($documentAndFolders)) { } } -require 'document_slideshow.inc.php'; -if ($image_present && !isset($_GET['keyword'])) { - $actions .= Display::url( - Display::return_icon('slideshow.png', get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM), - api_get_path(WEB_CODE_PATH).'document/slideshow.php?'.api_get_cidreq().'&curdirpath='.$curdirpathurl - ); -} -if (api_is_allowed_to_edit(null, true)) { - $actions .= Display::url( - Display::return_icon('percentage.png', get_lang('DocumentQuota'), '', ICON_SIZE_MEDIUM), - api_get_path(WEB_CODE_PATH).'document/document_quota.php?'.api_get_cidreq() - ); -} $actions .= '
'; if (!empty($moveTo)) { diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php index 5317ef4e89..d8e53deb84 100644 --- a/main/inc/lib/agenda.lib.php +++ b/main/inc/lib/agenda.lib.php @@ -2459,26 +2459,31 @@ class Agenda */ public function displayActions($view, $filter = 0) { - $courseInfo = api_get_course_info(); + $courseInfo = api_get_course_info(); - $actions = '
'; - $actions .= '
'; - $actions .= "". + $toolbar = ''; + $toolbar .= "". Display::return_icon('calendar.png', get_lang('Calendar'), '', ICON_SIZE_MEDIUM).""; $courseCondition = ''; if (!empty($courseInfo)) { $courseCondition = api_get_cidreq(); } - $actions .= "". + + $toolbar .= "". Display::return_icon('week.png', get_lang('AgendaList'), '', ICON_SIZE_MEDIUM).""; - $actions .= '
'; + if (api_is_allowed_to_edit(false, true) || (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()) && api_is_allowed_to_session_edit(false, true) || GroupManager::user_has_access(api_get_user_id(), api_get_group_id(), GroupManager::GROUP_TOOL_CALENDAR) && GroupManager::is_tutor_of_group(api_get_user_id(), api_get_group_id()) ) { + $toolbar .= "". + Display::return_icon('new_event.png', get_lang('AgendaAdd'), '', ICON_SIZE_MEDIUM).""; + $toolbar .= "". + Display::return_icon('import_calendar.png', get_lang('ICalFileImport'), '', ICON_SIZE_MEDIUM).""; + if ($this->type == 'course') { $form = null; if (!isset($_GET['action'])) { @@ -2498,20 +2503,10 @@ class Agenda $selectedValues = $this->parseAgendaFilter($filter); $this->showToForm($form, $selectedValues, $attributes); $form = $form->returnForm(); - } - $actions .= "". - Display::return_icon('new_event.png', get_lang('AgendaAdd'), '', ICON_SIZE_MEDIUM).""; - $actions .= "". - Display::return_icon('import_calendar.png', get_lang('ICalFileImport'), '', ICON_SIZE_MEDIUM).""; - if ($view == 'calendar') { - $actions .= '
'; - $actions .= $form; - $actions .= '
'; - } + } } - } - + if (api_is_platform_admin() || api_is_teacher() || api_is_student_boss() || @@ -2547,14 +2542,18 @@ class Agenda $form->addButtonReset(get_lang('Reset')); $form = $form->returnForm(); } - - if ($view == 'calendar') { - $actions .= '
'; - $actions .= $form; - $actions .= '
'; - } } } + + $actions = '
'; + $actions .= '
'; + if ($view == 'calendar') { + $actions .= $form; + } + $actions .= '
'; + $actions .= '
'; + $actions .= $toolbar; + $actions .= '
'; $actions .= '
'; return $actions;