[svn r15673] Owner name added in documents - groups (see FS#2633)

skala
Julio Montoya 18 years ago
parent dd69acac07
commit 5c8ae425b2
  1. 2
      main/css/academica/default.css
  2. 2
      main/css/baby_orange/default.css
  3. 2
      main/css/corporate/default.css
  4. 2
      main/css/cosmic_campus/default.css
  5. 2
      main/css/dokeos_classic/default.css
  6. 1
      main/css/dokeos_classic_2D/default.css
  7. 2
      main/css/medical/default.css
  8. 1
      main/css/public_admin/default.css
  9. 1
      main/css/silver_line/default.css
  10. 2
      main/css/sober_brown/default.css
  11. 26
      main/document/document.inc.php
  12. 23
      main/document/document.php

@ -623,7 +623,7 @@ td .menu {
#folderselector select {
margin: 0 .2em;
}
.document_owner {text-align: right;}
/*
==============================================================================
FORM STYLES

@ -589,7 +589,7 @@ td .menu {
font-style: italic ;
font-weight: normal;
}
.document_owner {text-align: right;}
/*
==============================================================================
FORM STYLES

@ -734,7 +734,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {color: #666666; }
dl.upload_option {margin: 1em 0; padding: 0;}
.upload_option dt {font-weight:bold; margin:0;}
.upload_option dd {margin:0;}
.document_owner {text-align: right;}
/**********************************************
* DROPBOX MODULE *
**********************************************/

@ -794,7 +794,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {color: #666666; }
dl.upload_option {margin: 1em 0; padding: 0;}
.upload_option dt {font-weight:bold; margin:0;}
.upload_option dd {margin:0;}
.document_owner {text-align: right;}
/**********************************************
* DROPBOX MODULE *
**********************************************/

@ -757,7 +757,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {color: #666666; }
dl.upload_option {margin: 1em 0; padding: 0;}
.upload_option dt {font-weight:bold; margin:0;}
.upload_option dd {margin:0;}
.document_owner {text-align: right;}
/**********************************************
* DROPBOX MODULE *
**********************************************/

@ -1048,6 +1048,7 @@ dl.upload_option {
margin:0;
}
.document_owner {text-align: right;}
/*
==============================================================================
DROPBOX MODULE

@ -795,7 +795,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {color: #666666; }
dl.upload_option {margin: 1em 0; padding: 0;}
.upload_option dt {font-weight:bold; margin:0;}
.upload_option dd {margin:0;}
.document_owner {text-align: right;}
/**********************************************
* DROPBOX MODULE *
**********************************************/

@ -790,6 +790,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {color: #666666; }
dl.upload_option {margin: 1em 0; padding: 0;}
.upload_option dt {font-weight:bold; margin:0;}
.upload_option dd {margin:0;}
.document_owner {text-align: right;}
/**********************************************
* DROPBOX MODULE *

@ -563,6 +563,7 @@ td .menu {
margin: 0 .2em;
}
.document_owner {text-align: right;}
/*
==============================================================================
FORM STYLES

@ -791,7 +791,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {color: #666666; }
dl.upload_option {margin: 1em 0; padding: 0;}
.upload_option dt {font-weight:bold; margin:0;}
.upload_option dd {margin:0;}
.document_owner {text-align: right;}
/**********************************************
* DROPBOX MODULE *
**********************************************/

@ -1,4 +1,4 @@
<?php // $Id: document.inc.php 15525 2008-06-09 06:24:20Z yannoo $
<?php // $Id: document.inc.php 15673 2008-07-01 15:16:49Z juliomontoya $
/*
==============================================================================
Dokeos - elearning and course management software
@ -384,4 +384,28 @@ function get_titles_of_path($path)
}
return $path_displayed;
}
/**
* This function displays the name of the user and makes the link tothe user tool.
*
* @param $user_id
* @param $name
* @return a link to the userInfo.php
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @version february 2006, dokeos 1.8
*/
function display_user_link($user_id, $name)
{
if ($user_id<>0)
{
return '<a href="../user/userInfo.php?uInfo='.$user_id.'">'.$name.'</a>';
}
else
{
return get_lang('Anonymous');
}
}
?>

@ -1,4 +1,4 @@
<?php // $Id: document.php 15525 2008-06-09 06:24:20Z yannoo $
<?php // $Id: document.php 15673 2008-07-01 15:16:49Z juliomontoya $
/*
==============================================================================
@ -71,6 +71,8 @@ require("../inc/global.inc.php");
$this_section=SECTION_COURSES;
require('document.inc.php');
require('../inc/lib/usermanager.lib.php');
api_protect_course_script(true);
//session
@ -623,6 +625,7 @@ if(isset($docs_and_folders) && is_array($docs_and_folders))
//create a sortable table with our data
$sortable_data = array();
while (list ($key, $id) = each($docs_and_folders))
{
$row = array ();
@ -647,9 +650,23 @@ if(isset($docs_and_folders) && is_array($docs_and_folders))
$row[] = $id['path'];
}
//icons
$row[]= build_document_icon_tag($id['filetype'],$id['path']);
$row[]= build_document_icon_tag($id['filetype'],$id['path']);
// Show the Owner of the file only in groups
$user_link='';
if(isset($_SESSION['_gid']) && $_SESSION['_gid']!='')
{
if (!empty($id['insert_user_id']))
{
$user_info=UserManager::get_user_info_by_id($id['insert_user_id']);
$user_name=$user_info['firstname'].' '.$user_info['lastname'];
$user_link='<div class="document_owner">'.get_lang('Owner').': '.display_user_link($id['insert_user_id'],$user_name).'</div>';
}
}
//document title with hyperlink
$row[] = create_document_link($http_www,$document_name,$id['path'],$id['filetype'],$size,$id['visibility']).'<br />'.$invisibility_span_open.nl2br(htmlspecialchars($id['comment'],ENT_QUOTES,$charset)).$invisibility_span_close;
$row[] = create_document_link($http_www,$document_name,$id['path'],$id['filetype'],$size,$id['visibility']).'<br />'.$invisibility_span_open.nl2br(htmlspecialchars($id['comment'],ENT_QUOTES,$charset)).$invisibility_span_close.$user_link;
//comments => display comment under the document name
//$row[] = $invisibility_span_open.nl2br(htmlspecialchars($id['comment'])).$invisibility_span_close;
$display_size = format_file_size($size);

Loading…
Cancel
Save