diff --git a/main/img/icons/32/menu.png b/main/img/icons/32/menu.png new file mode 100644 index 0000000000..ac2dea85c4 Binary files /dev/null and b/main/img/icons/32/menu.png differ diff --git a/main/img/icons/48/_sum.txt b/main/img/icons/48/_sum.txt index 65d7449f00..2fce75005a 100644 --- a/main/img/icons/48/_sum.txt +++ b/main/img/icons/48/_sum.txt @@ -281,4 +281,5 @@ wiki_task modif nuvola wiki_work modif nuvola wiki_assignment modif nuvola star crystal -star_green modif crystal \ No newline at end of file +star_green modif crystal +menu nuvola \ No newline at end of file diff --git a/main/img/icons/48/menu.png b/main/img/icons/48/menu.png new file mode 100644 index 0000000000..a2a5dfe255 Binary files /dev/null and b/main/img/icons/48/menu.png differ diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki.php b/main/inc/lib/fckeditor/toolbars/extended/wiki.php index 65f916ff17..66668ee297 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki.php @@ -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. diff --git a/main/wiki/css/default.css b/main/wiki/css/default.css index 6342eb28a1..86de6e9b17 100755 --- a/main/wiki/css/default.css +++ b/main/wiki/css/default.css @@ -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; } \ No newline at end of file diff --git a/main/wiki/index.php b/main/wiki/index.php index 115edb87d0..7560cef927 100755 --- a/main/wiki/index.php +++ b/main/wiki/index.php @@ -358,18 +358,38 @@ if ($_GET['action']=='discuss' && $_POST['Submit']) { echo "
"; /** Actions bar (= action of the wiki tool, not of the page)**/ + +//dynamic wiki menu +?> + + +'; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo '
'; - echo get_lang('Menu'); -echo '
'; + +echo ' '.Display::return_icon('menu.png',get_lang('Menu'),'','32').' '; +echo ''.Display::return_icon('wiki.png',get_lang('HomeWiki'),'','32').'';// + ///menu home - echo ''; echo '
  • '.get_lang('More').'
    • '; echo ''; -echo '
    '; + echo '
    '; @@ -420,6 +438,8 @@ MAIN WIKI AREA ----------------------------------------------------------- */ + + echo "
    "; /** 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 "
    "; //menu show page - echo ''.Display::return_icon('page.png',get_lang('ShowThisPage'),'','32').''; + echo '  '.Display::return_icon('page.png',get_lang('ShowThisPage'),'','32').''; if (api_is_allowed_to_session_edit(false,true) ) { //menu edit page @@ -1156,7 +1176,7 @@ if ($_GET['action']=='addnew') } echo '
    '.get_lang('AddNew').'
    '; - + echo '
    '; //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 '
    '; Display::display_normal_message(get_lang('WarningMaxEditingTime')); + echo '
    '; $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[] = ''.api_htmlentities($obj->title).''; - $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 ? ''.api_htmlentities(api_get_person_name($userinfo['firstname'], $userinfo['lastname'])).'' : get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')'; $rows[] = $row; }