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

improve the wiki's usability

Browse Source
skala
Juan Carlos Raña 15 years ago
parent 70dbbf2681
commit 348b27cedf
6 changed files with 229 additions and 206 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. BIN
      main/img/icons/32/menu.png
  2. 3
      main/img/icons/48/_sum.txt
  3. BIN
      main/img/icons/48/menu.png
  4. 5
      main/inc/lib/fckeditor/toolbars/extended/wiki.php
  5. 373
      main/wiki/css/default.css
  6. 54
      main/wiki/index.php

BIN
main/img/icons/32/menu.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

3
main/img/icons/48/_sum.txt
Unescape View File

@ -281,4 +281,5 @@ wiki_task modif nuvola
wiki_work modif nuvola
wiki_assignment modif nuvola
star crystal
star_green modif crystal
star_green modif crystal
menu nuvola

BIN
main/img/icons/48/menu.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

5
main/inc/lib/fckeditor/toolbars/extended/wiki.php
Unescape View File

@ -25,11 +25,12 @@ $config['ToolbarSets']['Normal'] = array(
array('Undo','Redo'),
array('Wikilink','Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'),
array('UnorderedList','OrderedList','Rule'),
array('JustifyLeft','JustifyCenter','JustifyFull'),
array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor','Source'),
array('FitWindow')
);
// This is the visible toolbar set when the editor is maximized.
// If it has not been defined, then the toolbar set for the "normal" size is used.

373
main/wiki/css/default.css
Unescape View File

@ -1,209 +1,208 @@
/*
==============================================================================
WIKI STYLES
==============================================================================
*/
.wikiTitle h1{
color: Black;
background: none;
font-size: 200%;
font-weight: bold;
/*font-weight: normal;*/
border-bottom: 2px solid #aaaaaa;
}
.wiki2xhtml a.wikiEdit{
color: #0000FF;
}
.diff{
font-family: monospace;
padding: 5px;
margin: 5px;
border:solid 2px #aaaaaa;
}
.diffEqual{
background-color: #FFFFFF;
}
.diffMoved{
background-color: #FFFFAA;
}
.diffAdded{
background-color: #CCFFCC;
}
.diffDeleted{
background-color: #FFAAAA;
}
.diffAddedTex{
background-color: #CCFFCC;
text-decoration:underline;
}
.diffDeletedTex{
background-color: #FFAAAA;
/*
==============================================================================
WIKI STYLES
==============================================================================
*/
.wikiTitle h1{
color: Black;
background: none;
font-size: 200%;
font-weight: bold;
/*font-weight: normal;*/
border-bottom: 2px solid #aaaaaa;
}
.wiki2xhtml a.wikiEdit{
color: #0000FF;
}
.diff{
font-family: monospace;
padding: 5px;
margin: 5px;
border:solid 2px #aaaaaa;
}
.diffEqual{
background-color: #FFFFFF;
}
.diffMoved{
background-color: #FFFFAA;
}
.diffAdded{
background-color: #CCFFCC;
}
.diffDeleted{
background-color: #FFAAAA;
}
.diffAddedTex{
background-color: #CCFFCC;
text-decoration:underline;
}
.diffDeletedTex{
background-color: #FFAAAA;
text-decoration:line-through;
}
#wikititle {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 100%;
font-weight: bold;
background-color: #EFEFEF;
border-bottom: 1px solid #cccccc;
padding: 3px;
padding-top:5px;
border-top: 1px solid #ccc;
height: auto!important;
min-height:20px;
}
#wikititle input {
border: 1px solid #333;
padding-left: 3px;
}
#wikicontent {
padding-top:5px;
min-height:300px;
}
#wikititle {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 100%;
font-weight: bold;
background-color: #EFEFEF;
border-bottom: 1px solid #cccccc;
padding: 3px;
padding-top:5px;
border-top: 1px solid #ccc;
height: auto!important;
min-height:20px;
}
#wikititle input {
border: 1px solid #333;
padding-left: 3px;
}
#wikicontent {
padding-top:5px;
min-height:300px;
}
#menuwiki {
float:left;
border-top: 1px solid #cccccc;
border-right: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
border-left: 1px solid #cccccc;
margin-bottom: 10px;
padding: 10px;
background-color: #efefef;
}
border: 2px solid #cccccc;
margin-right: 10px;
padding: 2px;
background-color: #efefef;
width:74px;
height:30px;
overflow:hidden;
}
#menuwiki li{
list-style-type: square;
}
}
#mainwiki {
border-left: 1px solid #cccccc;
margin-left:240px;
#mainwiki {
border-left: 1px solid #cccccc;
padding-left:10px;
}
}
#wikifooter {
#wikifooter {
background-color: #EFEFEF;
border-top: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
border-left: 1px solid #cccccc;
border-top: 1px solid #cccccc;
border-bottom: 1px solid #cccccc;
border-left: 1px solid #cccccc;
border-right: 1px solid #cccccc;
}
.fwiki1{
font-size:larger;
font-style:italic;
font-weight:bold;
background-color:#DAFFD9;
}
.fwiki2{
font-size:smaller;
background-color:#ffffff;
}
.message {
color: #cccccc;
}
.wiki_warning{
color: #FF0000;
font-weight:bold;
}
a.new_wiki_link{
color: #FF0000;
}
.fwiki1{
font-size:larger;
font-style:italic;
font-weight:bold;
background-color:#DAFFD9;
}
.fwiki2{
font-size:smaller;
background-color:#ffffff;
}
.message {
color: #cccccc;
}
.wiki_warning{
color: #FF0000;
font-weight:bold;
}
a.new_wiki_link{
color: #FF0000;
border-bottom: 1px dotted #cccccc;
}
a.wiki_link{
}
a.wiki_link{
border-bottom: 1px dotted #cccccc;
}
}
a.wiki_link_ext{
background: url(ext.png) center right no-repeat; padding-right: 14px; }
a.wiki_link_ext{
background: url(ext.png) center right no-repeat; padding-right: 14px; }
a.wiki_mail_link{
background: url(email.gif) center right no-repeat; padding-right: 18px; }
a.wiki_mail_link{
background: url(email.gif) center right no-repeat; padding-right: 18px; }
a.wiki_news_link{
background: url(news.png) center right no-repeat; padding-right: 18px; }
a.wiki_news_link{
background: url(news.png) center right no-repeat; padding-right: 18px; }
a.wiki_ftp_link{
a.wiki_ftp_link{
background: url(ftp.gif) center right no-repeat; padding-right: 18px; }
a.wiki_irc_link{
background: url(irc.gif) center right no-repeat; padding-right: 18px; }
#main_navigation{
height: 20px;
margin: 0;
padding-left: 10px;
background-color:#cccccc;
}
#tabnav{
height: 20px;
margin: 0;
padding-left: 10px;
}
#tabnav_content {
margin: 0;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 10px;
padding-top: 4px;
border: 1px solid #ccc;
}
#tabnav li {
margin: 0;
padding: 0;
display: inline;
list-style-type: none;
}
#tabnav a:link, #tabnav a:visited {
float: left;
background: #fff;
font-size: 10px;
line-height: 14px;
font-weight: bold;
padding: 2px 10px 2px 10px;
margin-right: 4px;
border: 1px solid #ccc;
border-bottom: 1px solid #f3f3f3;
text-decoration: none;
color: #666;
}
#tabnav a:link.active, #tabnav a:visited.active
{
border-bottom: 2px solid #f3f3f3;
background: #f3f3f3;
color: #000;
}
#tabnav a:link.right, #tabnav a:visited.right
{
border-bottom: 1px solid #f3f3f3;
background: #f3f3f3;
color: #666;
margin-left: 100px;
}
#tabnav a:link.rightactive, #tabnav a:visited.rightactive
{
border-bottom: 1px solid #fff;
background: #fff;
color: #000;
margin-left: 170px;
}
#tabnav a:hover
{
background: #fff;
a.wiki_irc_link{
background: url(irc.gif) center right no-repeat; padding-right: 18px; }
#main_navigation{
height: 20px;
margin: 0;
padding-left: 10px;
background-color:#cccccc;
}
#tabnav{
height: 20px;
margin: 0;
padding-left: 10px;
}
#tabnav_content {
margin: 0;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 10px;
padding-top: 4px;
border: 1px solid #ccc;
}
#tabnav li {
margin: 0;
padding: 0;
display: inline;
list-style-type: none;
}
#tabnav a:link, #tabnav a:visited {
float: left;
background: #fff;
font-size: 10px;
line-height: 14px;
font-weight: bold;
padding: 2px 10px 2px 10px;
margin-right: 4px;
border: 1px solid #ccc;
border-bottom: 1px solid #f3f3f3;
text-decoration: none;
color: #666;
}
#tabnav a:link.active, #tabnav a:visited.active
{
border-bottom: 2px solid #f3f3f3;
background: #f3f3f3;
color: #000;
}
#tabnav a:link.right, #tabnav a:visited.right
{
border-bottom: 1px solid #f3f3f3;
background: #f3f3f3;
color: #666;
margin-left: 100px;
}
#tabnav a:link.rightactive, #tabnav a:visited.rightactive
{
border-bottom: 1px solid #fff;
background: #fff;
color: #000;
margin-left: 170px;
}
#tabnav a:hover
{
background: #fff;
}

54
main/wiki/index.php
Unescape View File

@ -358,18 +358,38 @@ if ($_GET['action']=='discuss' && $_POST['Submit']) {
echo "<div id='wikiwrapper'>";
/** Actions bar (= action of the wiki tool, not of the page)**/
//dynamic wiki menu
?>
<script>
function menu_wiki(){
if(document.getElementById("menuwiki").style.width=="160px"){
var w=74;
var b=2;
var h=30;
}
else{
var w=160;
var b=1;
var h=160;
}
document.getElementById("menuwiki").style.width=w+"px";
document.getElementById("menuwiki").style.height=h+"px";
document.getElementById("menuwiki").style.border=b+"px solid #cccccc";
}
</script>
<?php
echo '<div id="menuwiki">';
echo '<table width="210">';
echo '<tr>';
echo '<td>';
echo get_lang('Menu');
echo '</td>';
echo '</tr>';
echo '<tr>';
echo '<td>';
echo '&nbsp;<a href="javascript:void(0)" onClick="menu_wiki()">'.Display::return_icon('menu.png',get_lang('Menu'),'','32').'</a>&nbsp;';
echo '<a href="index.php?cidReq='.$_course[id].'&action=show&amp;title=index&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('show').'>'.Display::return_icon('wiki.png',get_lang('HomeWiki'),'','32').'</a>';//
///menu home
echo '<ul><li style="list-style-image: url(../img/home.png)"
><a href="index.php?cidReq='.$_course[id].'&action=show&amp;title=index&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('show').'>'.get_lang('HomeWiki').'</a></li>';
echo '<ul>';
if ( api_is_allowed_to_session_edit(false,true) ) {
//menu add page
echo '<li><a href="index.php?cidReq='.$_course[id].'&action=addnew&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('addnew').'>'.get_lang('AddNew').'</a> ';
@ -408,9 +428,7 @@ echo '<td>';
echo '<li><a href="index.php?action=more&amp;title='.api_htmlentities(urlencode($page)).'"'.is_active_navigation_tab('more').'>'.get_lang('More').'</a></li>';
echo '</ul>';
echo '</td>';
echo '</tr>';
echo '</table>';
echo '</div>';
@ -420,6 +438,8 @@ MAIN WIKI AREA
-----------------------------------------------------------
*/
echo "<div id='mainwiki'>";
/** menuwiki (= actions of the page, not of the wiki tool) **/
if (!in_array($_GET['action'], array('addnew', 'searchpages', 'allpages', 'recentchanges', 'deletewiki', 'more', 'mactiveusers', 'mvisited', 'mostchanged', 'orphaned', 'wanted')))
@ -427,7 +447,7 @@ if (!in_array($_GET['action'], array('addnew', 'searchpages', 'allpages', 'recen
echo "<div class='actions'>";
//menu show page
echo '<a href="index.php?cidReq='.$_course[id].'&action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('showpage').'>'.Display::return_icon('page.png',get_lang('ShowThisPage'),'','32').'</a>';
echo '&nbsp;&nbsp;<a href="index.php?cidReq='.$_course[id].'&action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('showpage').'>'.Display::return_icon('page.png',get_lang('ShowThisPage'),'','32').'</a>';
if (api_is_allowed_to_session_edit(false,true) ) {
//menu edit page
@ -1156,7 +1176,7 @@ if ($_GET['action']=='addnew')
}
echo '<div class="actions">'.get_lang('AddNew').'</div>';
echo '<br/>';
//first, check if page index was created. chektitle=false
if (checktitle('index'))
{
@ -1436,7 +1456,9 @@ if ($_GET['action']=='edit')
//previous checking for concurrent editions
if($row['is_editing']==0)
{
echo '<div style="z-index:0">';
Display::display_normal_message(get_lang('WarningMaxEditingTime'));
echo '</div>';
$time_edit = date("Y-m-d H:i:s");
$sql='UPDATE '.$tbl_wiki.' SET is_editing="'.$_user['user_id'].'", time_edit="'.$time_edit.'" WHERE id="'.$row['id'].'"';
@ -1926,7 +1948,7 @@ if ($_GET['action']=='recentchanges') {
$row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
$row[] = $ShowAssignment.$icon_task;
$row[] = '<a href="'.api_get_self().'?cidReq='.$_course[id].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&amp;view='.$obj->id.'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.api_htmlentities($obj->title).'</a>';
$row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy');
$row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy');
$row[] = $obj->user_id <> 0 ? '<a href="../user/userInfo.php?uInfo='.$userinfo['user_id'].'">'.api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])).'</a>' : get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')';
$rows[] = $row;
}

Write Preview
Loading…
Cancel
Save