From 39efc11c562d7b0011714a3e353d0de99bf67bc7 Mon Sep 17 00:00:00 2001
From: aragonc
Date: Mon, 31 Aug 2015 14:43:37 -0500
Subject: [PATCH] fix works list CT#7769
---
app/Resources/public/css/base.css | 20 +++++++++++---------
main/session/session_list.php | 3 +++
main/work/work.lib.php | 2 ++
main/work/work.php | 8 ++++----
4 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index c30d2219ce..926365436e 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -5946,7 +5946,10 @@ div#chat-remote-video video {
font-size:22px;
margin-top:5px;
}
-#work-list{
+#student-list-work{
+ padding: 10px;
+}
+#work-list, #session-list{
padding: 10px;
border:1px solid #dddddd;
border-radius: 5px;
@@ -6070,7 +6073,8 @@ div#chat-remote-video video {
.ui-dialog .ui-dialog-buttonpane{
border-top: 1px solid #DDD;
}
-/*.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+
+.ui-button.ui-widget.ui-state-default {
background-color:#f5f5f5;
background-image:-moz-linear-gradient(top,#fff,#e6e6e6);
background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
@@ -6085,12 +6089,7 @@ div#chat-remote-video video {
box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)
}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus{
+.ui-button.ui-widget.ui-state-hover{
border-width: 1px;
border-style:solid;
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
@@ -6099,7 +6098,10 @@ div#chat-remote-video video {
background-color: #E6E6E6;
font-weight:normal;
color:#333333;
-}*/
+}
+
+
+
.select2-container .select2-selection--single{
height: 32px !important;
border-color: #CCCCCC !important;
diff --git a/main/session/session_list.php b/main/session/session_list.php
index 19ba7edc77..4389c4e6ed 100644
--- a/main/session/session_list.php
+++ b/main/session/session_list.php
@@ -323,7 +323,10 @@ if (api_is_platform_admin()) {
echo '';
}
echo '';
+echo '';
echo Display::grid_html('sessions');
+echo '
';
+
Display::display_footer();
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index b31e84dc56..4c58c9cf49 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -49,6 +49,8 @@ function display_action_links($id, $cur_dir_path, $action)
$display_output .= '';
$display_output .= Display::return_icon('settings.png', get_lang('EditToolOptions'),'',ICON_SIZE_MEDIUM).'';
}
+ $display_output .= '' . Display::return_icon('listwork.png', get_lang('viewStudents'),'',ICON_SIZE_MEDIUM) . '';
+
}
if (api_is_allowed_to_edit(null, true) && $origin != 'learnpath' && api_is_allowed_to_session_edit(false, true)) {
diff --git a/main/work/work.php b/main/work/work.php
index 5fb9f686fa..d6b22eb5c2 100755
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -316,13 +316,13 @@ switch ($action) {
case 'list':
/* Display list of student publications */
if (!empty($my_folder_data['description'])) {
- $content = ''.
- get_lang('Description').':'.Security::remove_XSS($my_folder_data['description'], STUDENT).
- '
';
+ $content = ''.
+ get_lang('Description').':'.Security::remove_XSS($my_folder_data['description'], STUDENT).
+ '
';
}
if (api_is_allowed_to_edit() || api_is_coach()) {
// Work list
- $content .= '';
+
$content .= '