From 348b27cedfe1f199d11262b210f27f4a79a8acb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Tue, 19 Apr 2011 22:45:27 +0200 Subject: [PATCH] improve the wiki's usability --- main/img/icons/32/menu.png | Bin 0 -> 1515 bytes main/img/icons/48/_sum.txt | 3 +- main/img/icons/48/menu.png | Bin 0 -> 2046 bytes .../lib/fckeditor/toolbars/extended/wiki.php | 5 +- main/wiki/css/default.css | 373 +++++++++--------- main/wiki/index.php | 54 ++- 6 files changed, 229 insertions(+), 206 deletions(-) create mode 100644 main/img/icons/32/menu.png create mode 100644 main/img/icons/48/menu.png diff --git a/main/img/icons/32/menu.png b/main/img/icons/32/menu.png new file mode 100644 index 0000000000000000000000000000000000000000..ac2dea85c45a75b2cc920e348a3e50c1e6c46c0c GIT binary patch literal 1515 zcmW+$Yfuws6#cSG9%8@^iX@067$4N41fq!Y$l?P;1JXb>S{;`VusS|a#1=JV!y^Pm zhz~|+QBct`?F;Fw zl)Dt!g5({UTe4-@naYCQUD>e!&{fIH6EePitniSe#Ee2XP$;+1XYU=#;si~FK zv9V7cpyd)oh5fu8&9|Up0(MDiYuDHM2KB~gb)U{x0h-r75E?=d<7NIsti)ko?Di|5 z?|oyfSCbxB`n|`G+aH+CTKk=+^cD_s9Xh21RN(F7~<#T?H_PUh8Cj0Pz4ngf|&z-4XHB_{j-UVbL zl%zYdva+%{S#h^aW8;w7O6o6_k4WHa)oEfRRnsMcQ#`Jd#hT*v<@OiMcYIdM4wru(@na=)XM zGBRh^Tr_P3a{YK#wsWNHd(Cn9YiMAOb~CBQE@T_{cyQ^npxi*f5*Xm<=z^NTBiDKI z^?i6B@>vm=7qJHx9-1P&lAFoMF>hvvEsBctxZM+nLa@b-apwEGOzs9Xflpj)$iV@{ zLtc3K5UT|m7z{TXN%a?#eIgbHhI-c)iVc@U5jPHesI_+-nPb~t9(sjqU*J_d49$s3 zq|UE~+4b=%uWMs5ry=IAKcTHqb%WKYCR(=lXx%mvx17_pmH6Xr5->8I z^1SB6V3>5Zvkf^6KN$xFEhf*1-FyH$^8S>jE^+Qm z9}%91gyxe;%~2Dmgn?pg?hp0GT~7}J%PL9F>fpxV4xQh^rmgsdpn0ai5&lR469SNq zJ~hM7&yPJk+^_(@@29-SYss0H_V84^3LZM3RX0X|dbZ7OSES31F~<7CqhpQ+(8+}I z8qUUtM*)CXPlKHfJM8}eG;yG?nxhlN5Va!5M*EJ>xkx$AtzGMjb;RX7#-nYdI&BH2 zqz|r=d8i=7nA@$bXH<`x@1HT*1~B~3{EDVo+_O>3_DxypBQ|6@``gd0Gu1ijPL!|^ zv_d~yENlwQpeqVx=@A=x@RznE)N@Rp0%&c~J*U#COm#H#P~dYF1`rz*CD;Ru*xwyg PT7%>jsmq&}VnzQ062Xym literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a2a5dfe2550df89d004d39c73472b36b68b4a92c GIT binary patch literal 2046 zcmZuyX;_n27QSB+5|&^BVM#zkAQBN!2rv~ZGzqeWGAyYDv^s<>L94?wbw;pA5=amw zNFvw@!X)5^s3Rzk`V2_o1WG_Gb(x}qEEWVE12Sbb%Qv6%Ykti0+T>^Jv^dS;9PCURG|=H~o1L0N|9|XwI&}7ujYQX6aL~0O|>U8VQK(onvSK zg-!iGw+FRiN2k9Gd}wINGp)=Q!1Lp9gJiEj`A?#WLZKaGU>OVsRo1C{l__~edk$+$ zj_unaOo|Iic|~V~c6@Y;#cKKdhsw%;06&9DT2q5ot=DB43=&F9a5Z#nVS0yt*?3$e zDUFk?hOt3YAuS@J(KIvUHK-NCvbVXYucKrrI(jfs7EVeqct2<=_m^2 z8j4+iDz~S}t@m46(>SZdTxgpMn^qS>L(%$7Z1!*72DF+bMz`YPNI}F~5QaF4hOL$d zj*d$;j~}H9S4}HHKjq6~Hb<@df*Q&4&aSGP?5#}4UrjSALGS4NxRzoyuSt80_fq+} z;1cm{5kC`+A@UdkeyvKySDtYdu39ZP?tTw3@Y%RKBZFLGUbU~ zC(>Cd6QmAdhLO(+G@JslTl6D$=Hr*aqZq0~sJ^dSt>aD(sag2G* zs5mQ-ZF-ZbEeSP$u$Tyg&jBQJK_}{R7uAy^cM90%M(Li5{-Sr12w=B99zSc(5>5!L zJ-UkeV3m)|iBq~BGZ>rM%?ugMgF5HD422Sq%}K~qXgc6GPlRoo_`dc>xqvyx;&s4r zBz@yw&(_uH1Z7X#+eE?S1!LC4YFp#8K#;a#tOoj{uZtNic?twVt<0*8ES#;y;M@tp zBp5As+8Epx9UyAAb>;9J@B?aayaUN@MlFF)p7PxTH9_|>aiojE00 z?&J7#llZf@PR~O8YfK+G4XNG>^sqJ&CYRiTt{&}ZZggtwt)Q1I^xB7?rckU_Y3+=- z1kQdYN>WQJce~WTQ=aw{-7aTvG6G9X{rw=3_MT@;lMtDp^qK;nsQXZ*a!n=EZu-)# zU5UB{A^|LT#rOBvCno>>7dd`3qHCi5tWyDC{v+Tf!Rs?-Lsxr)U79_@M2DNrT7`~0 zVIF#a&MB8x-{i-|a1~B3Hz~sDC!F#})CEcgHWVQ;VK|fDT3Eg7%gOkvHkU>938{R+ zvxO>^Z$U)qojn21AL*>Nsv;hEqV}I-pLhI2Lr7G!TdFg&xk4YhZLb&oG?)c`u^IyDjXknPdoMd&S4pCp1p z{#kcxCWu1aI)X`aIN)G0uT`x^;1`z&e5L{qK8EH9rl+%n{G7Gk_wz%^U9Qef52^3g z0Rieqc%01NJTWt*#v?TLy~12EdbYS^m#0S|JQ}5&2nW=~R{P-e)CJSs6;K=mUb5>F{+a;y#<#4y8>^om7u%LI(o$pNedPh=Z0>A-O*+1sdXJwa5Uk-G`-i8_kcmjU zFi`oJFSm|&AG5jiM2+7SRI0H+$~B!c;hooN1+bwaa;Qzj`^&qF*P<@rDuU!G^{p-_ z35c3gN#owIr$aW9o?LQ4xwx4wY3+Hkv|sa8OFvG zoUgvJX>iYnbcdRR1?0KWB79&_2KmY)gaBCvcNyhjzWLj(p+dZPqgG*aECXw+fdb_G z>wipmh(U5>xhjj=ZWDcsyeDYI#BJh*x~RrxL}D4rD)DcxHw2%gq$GIn%{i}#UaCy( zOZV3Q%94K49-MmhBjCF@1fFZ~ZG Ctbe)y literal 0 HcmV?d00001 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; }