<
From version < 78.1 >
edited by Manuel Smeria
on 2012/11/29 16:43
To version < 79.1 >
edited by Manuel Smeria
on 2012/11/29 16:45
>
Change comment: Updated some mini-tutorials and some images

Summary

Details

Page properties
Content
... ... @@ -71,8 +71,10 @@
71 71  Insert image menu is active when there's no image selected.
72 72  
73 73  |(% rowspan="2" %)[[image:imageinsertmenu.png||style="border: 1px solid black;"]]|1. The user can insert one of the attached images or upload a new image.
74 +|2. The user can insert an image by typing or pasting its address.
74 74  
75 75  Edit image menu is active when there's an image selected.
77 +
76 76  |(% rowspan="2" %)[[image:imageeditmenu.png||style="border: 1px solid black;"]]|1. The user can edit the selected image (i.e. change its source, width, height etc.).
77 77  |2. The user can remove the selected image.
78 78  
... ... @@ -101,7 +101,7 @@
101 101  Insert macro menu is active when there's no macro selected.
102 102  
103 103  |(% rowspan="4" %)[[image:macroinsertmenu.png||style="border: 1px solid black;"]]|1. The user can insert a predefined macro.
104 -|2. The user can force a refresh of all the macros' output. This is useful when macro output depends on the page content like in the case of the Table of Contents macro.
106 +|2. The user can force a refresh of all the macros' output. This is useful when macro output depends on the page content like in the case of the "Table of Contents" macro.
105 105  |3. The user can collapse all the macros in the edited page.
106 106  |4. The user can expand all the macros in the edited page.
107 107  
... ... @@ -113,13 +113,16 @@
113 113  
114 114  See also [[Inserting and Editing Macros>>#HInsertingandEditingMacros]] for a detailed description of how macros can be inserted and edited.
115 115  
116 -====Import ====
118 +==== Import ====
119 +
117 117  Import office files.
121 +
118 118  |(% rowspan="3" %)[[image:ImportOfficeDocument.png||style="border: 1px solid black;"]]|1. The user can import an entire Microsoft Office Word document.
119 -|2. The user can copy or paste the content of an office document from or in the clipboard.
123 +|2. The user can copy and paste content from an office document in the clipboard.
120 120  See [[Importing Office Content>>#HImportingOfficeContent]].
121 121  
122 122  === Tabs ===
127 +
123 123  [[image:tabs.png||style="border: 1px solid black;"]]
124 124  
125 125  The user can view or edit the document source code by clicking on the Source tab (for advanced users). **The source code is not necessarily HTML**. It depends on the editor configuration. Usually the source code is in wiki syntax but the editor supports any syntax that can be converted to and from HTML.
... ... @@ -177,7 +177,7 @@
177 177  The symbol picker is a special dialog that allows us to insert a special symbol (such as accented characters, trademark, currency symbol etc.) in place of the current text selection or at the caret position. Just click on the desired symbol to insert it. See [[Inserting Symbols>>#HInsertingSymbols]].
178 178  
179 179  [[image:link2wikistep2.png||style="border: 1px solid black;"]]
180 -Complex dialogs are used in wizards. Their body is made of three parts: the header, the content and the footer. The header usually contains the title of the wizard step and the next/previous buttons. The content of the dialog includes the input controls used to collect data from the user. The footer usually contains the buttons for canceling the wizard or finishing it at the current step.
185 +Complex dialogs are used in wizards. Their body is made of three parts: the header, the content and the footer. The header usually contains the title of the wizard step. The content of the dialog includes the input controls used to collect data from the user. The footer usually contains the next/previous buttons and the button for canceling the wizard or finishing it at the current step.
181 181  
182 182  == Standard Features ==
183 183  
... ... @@ -300,6 +300,7 @@
300 300  Headings can be used to organize your text. You can split the content in **sections** and **subsections** and then specify a title for each of them. You can choose the heading level to apply from the format list box which is found on the toolbar. If you want to remove the heading style just choose "Plain text" from the format list box.
301 301  
302 302  [[image:formatexample.png||style="border: 1px solid black;"]]
308 +
303 303  ==== Fonts ====
304 304  
305 305  [[image:fontname.png||style="border: 1px solid black;"]]
... ... @@ -383,14 +383,14 @@
383 383  [[image:listcreatestep6.png||style="border: 1px solid black;"]]
384 384  You can create **sublists** by **indenting** list items. To do this click the [[image:indent.gif||style="vertical-align: middle;"]] button from the toolbar. Note that you can indent just one level because a sublist must always have a parent list. You can indent multiple list items at once though, by selecting them first. The **outdent** feature, [[image:outdent.gif||style="vertical-align: middle;"]], is the opposite of indent. Unlike indent, you can outdent a list item multiple levels. Outdenting a top level list item transforms it in plain text.
385 385  
386 -[[image:listcreatestep7.png||style="border: 1px solid black;"]]
392 +[[image:listcreatestep7.png||width="478" height="89" style="border: 1px solid black;"]]
387 387  
388 -[[image:listcreatestep8.png||style="border: 1px solid black;"]]
394 +[[image:listcreatestep8.png||width="478" height="89" style="border: 1px solid black;"]]
389 389  You can **mix** bulleted lists with numbered lists.
390 390  
391 391  [[image:listcreatestep9.png||style="border: 1px solid black;"]]
392 392  
393 -[[image:listcreatestep10.png||style="border: 1px solid black;"]]
399 +[[image:listcreatestep10.png||width="478" height="89" style="border: 1px solid black;"]]
394 394  After you created the list, press the toolbar button for the associated list type to go back to plain text.
395 395  
396 396  === Creating and Editing Links ===
... ... @@ -424,9 +424,10 @@
424 424  Click "Create link" when you're done. You will comeback to this dialog when editing a link.
425 425  
426 426  [[image:link2wikistep3.png||style="border: 1px solid black;"]]
427 -Your link should be visible inside the editing area at this point. Try to hover the mouse cursor over the link or to edit the link label in place.
433 +Your link should be visible inside the editing area at this point. Hover the mouse cursor over the link to see the link label in place.
428 428  
429 429  [[image:link2wikistep4.png||style="border: 1px solid black;"]]
436 +
430 430  ==== Link to attachment ====
431 431  
432 432  To create a link to an attachment choose "Attached file" from the "Link" menu.
... ... @@ -437,7 +437,7 @@
437 437  [[image:link2attachmentstep2.png||style="border: 1px solid black;"]]
438 438  Use the tree to browse the wiki pages in search for the right attachment to link to. As you can see, each page has an "Attachments" child node that holds the attached files. Notice the "Upload file..." entry which you can use to attach a new file to the corresponding page.
439 439  
440 -Advanced users can use the text box below the tree to quickly search for attached files. You have use this syntax: **WikiName:[email protected]**. The wiki name, the space name and the page name can be omitted. The text box will offer you suggestions based on the attachment file names that match your input.
447 +Advanced users can use the text box below the tree to quickly search for attached files. You have to use this syntax: **WikiName:[email protected]**. The wiki name, the space name and the page name can be omitted. The text box will offer you suggestions based on the attachment file names that match your input.
441 441  
442 442  After you select the attachment (either by using the tree or the text box) click the "Select" button to proceed to the next step.
443 443  
... ... @@ -448,12 +448,13 @@
448 448  * the tool tip: the text to display when the mouse cursor hovers over the link
449 449  * if the link should be opened in a new window or not
450 450  
451 -This are the same parameters as for a link to a wiki page. Click "Create link" when you're done. You will comeback to this dialog when editing a link.
458 +These are the same parameters as for a link to a wiki page. Click "Create link" when you're done. You will come back to this dialog when editing a link.
452 452  
453 453  [[image:link2attachmentstep4.png||style="border: 1px solid black;"]]
454 454  Your link should be visible inside the editing area at this point. You can view or download the attachment by following this link in view mode.
455 455  
456 456  [[image:link2attachmentstep5.png||style="border: 1px solid black;"]]
464 +
457 457  ==== Link to web page ====
458 458  
459 459  To create a link to a web page is very easy. You have to choose "Web page" from the "Link" menu and then fill in the link parameters:
... ... @@ -460,17 +460,19 @@
460 460  
461 461  * the address of the web page you wish to link to (you can paste here an address copied from the web browser's address bar). If you don't specify a protocol (like we did in out example) then the default HTTP protocol is considered. So you can simply type __www.xwiki.org__ and the final address will be __http:~/~/www.xwiki.org__. Of course you can use other protocols if you want to.
462 462  * the link label
463 -* the tool tip: the text to display when the mouse cursor hovers over the link
471 +* the tooltip: the text to display when the mouse cursor hovers over the link
464 464  * if the link should be opened in a new window or not
465 465  
466 466  Click "Create link" when you're done.
467 467  
468 468  [[image:link2webpage.png||style="border: 1px solid black;"]]
477 +
469 469  ==== Link to email ====
470 470  
471 -Creating a link to an email address is much line creating a link to a web page. The only difference is that you have to specify an email address instead of a web page address.
480 +Creating a link to an email address is much like creating a link to a web page. The only difference is that you have to specify an email address instead of a web page address.
472 472  
473 473  [[image:link2email.png||style="border: 1px solid black;"]]
483 +
474 474  ==== Image link ====
475 475  
476 476  You can use an image as the label of a link. To do this you have to select the image and then follow the steps for the type of link you wish to create. Note that you won't be able to edit the link label during the link creation process. If you want to change the label of an image link after it was created then edit the image.
... ... @@ -497,26 +497,25 @@
497 497  
498 498  === Inserting and Editing Images ===
499 499  
500 -To insert an image place the caret where you want the image to be inserted and choose "Insert image" from the "Image" menu. Make sure you don't have an image selected before opening the "Image" menu because otherwise you'll see the edit image menu entries and no "Insert image" entry.
510 +To insert an image place the caret where you want the image to be inserted and choose "Attached Image" from the "Image" menu. Make sure you don't have an image selected before opening the "Image" menu because otherwise you'll see the edit image menu entries and no "Attached Image" entry.
501 501  
502 502  [[image:imagestep1.png||style="border: 1px solid black;"]]
503 -You have three ways to specify which image to insert:
513 +You have three ways of choosing which image to insert:
504 504  
505 -* Choose from the images already attached to the edited page. In our example there are two images already attached to the edited page: the Ubuntu logo and the Firefox logo.
515 +* Upload a new image to the page.
516 +* Choose from the images already attached to the edited page. In our example there are three images already attached to the page: the XWiki logo, the Ubuntu logo and the Firefox logo.
506 506  * Choose from the images attached to the other pages. For this you have to click on the "All pages" tab and specify the page where the image you want is attached.
507 -* Upload a new image to the edited page.
508 -* Insert an image from an external source (without uploading it to your XWiki)
509 509  
510 510  Whatever option you choose you have to click on the "Select" button to move to the next step.
511 511  
512 512  [[image:imagestep2.png||style="border: 1px solid black;"]]
513 -In our example we choose to upload a new image. Browse through your local files and pick the image you want then click on the "Upload" button to attach the image to the edited page.
522 +In our example we choose to upload a new image. Browse through your local files and pick the image you want then click on the "Insert Image" button to attach the image to the edited page.
514 514  
515 515  [[image:imagestep3.png||style="border: 1px solid black;"]]
516 516  In the final step, before the image is inserted, you can edit the image properties. Here's what you can specify:
517 517  
518 518  * the image **width** and **height** on the page (i.e. how much space does the image take on the page)
519 -* an **alternative text** that is printed instead on the image when the image can't be displayed
528 +* an **alternative text** that is printed instead of displaying the image when the image can't be displayed
520 520  * if the text should flow around the image (**horizontal alignment**) or not; if you want the image to be on the left and the text to flow on its right side then choose //Left//; if you want the image to be on the right and the text to flow on its left side then choose //Right//; if you want the image to be centered horizontally on the page then choose //Center// but note that in this case the text can't flow on the left nor on the right side of the image.
521 521  * how is the image aligned relative to the height of the line where it is inserted (**vertical alignment**); if you want the image to be aligned to the top of the line then choose //Top//; if you want the image to be centered vertically on the line where it is inserted then choose //Middle//; if you want the image to be aligned to the bottom of the line then choose //Bottom//.
522 522  
... ... @@ -532,8 +532,8 @@
532 532  [[image:imagestep6.png||style="border: 1px solid black;"]]
533 533  To delete an image you can select it and press the **Delete** key or choose "Remove image" from the "Image" menu.
534 534  
535 -To insert an external image, go to the third tab of the Insert menu, and give the path to the file.
536 -The image will be linked to the source you mention instead of being uploaded to your XWiki.
544 +To insert an external image place the caret where you want the image to be inserted and choose "External Image" from the "Image" menu. Then type or paste the address of the image.
545 +The image will be linked to the source you mention instead of being attached to your document.
537 537  
538 538  [[image:InsertExternalImage.png||style="border: 1px solid black;"]]
539 539  
... ... @@ -545,7 +545,7 @@
545 545  In the opened dialog you can specify the number of rows and columns the new table should have and if you want a table header or not. You can leave the default number of rows and columns if you don't know how many you'll need because you can add rows and columns later. You can't add a table header later though so you must decide now if you need one or not. When you're done, click the "Insert" button.
546 546  
547 547  [[image:tablestep2.png||style="border: 1px solid black;"]]
548 -You should see now the table in your editing area. Fill in the table cells. You can navigate from cell to cell using the **arrow keys**. See [[Writing>>#HWriting]] to find out how you can use the **Tab** key to navigate through table cells. See also [[Keyboard Shortcuts>>#HKeyboardShortcuts]] if you can't move the caret before or after the table.
557 +You should now see the table in your editing area. Fill in the table cells. You can navigate from cell to cell using the **arrow keys**. See [[Writing>>#HWriting]] to find out how you can use the **Tab** key to navigate through table cells. See also [[Keyboard Shortcuts>>#HKeyboardShortcuts]] if you can't move the caret before or after the table.
549 549  
550 550  [[image:tablestep3.png||style="border: 1px solid black;"]]
551 551  If you need a new column you can insert one before or after an existing column. Just place the caret in one of the cells from the reference column and choose the appropriate option from the "Table" menu. In our example we choose to insert a new column after the "Index" column (i.e. the "Index" column was the reference column in our case). You can also delete columns in the same manner: place the caret in one of the cells from the column to be deleted and choose "Delete column" from the "Table" menu.
... ... @@ -568,15 +568,15 @@
568 568  Start by writing a few sections in the editing area then create an empty line where you want the table of contents to be inserted. In our example, we pressed Enter after "Space" in order to create the empty line. You can insert the table of contents in other places if you want. Leave the caret on the empty line and choose "Insert Macro..." from the "Macro" menu.
569 569  
570 570  [[image:macroinsertstep1.png||style="border: 1px solid black;"]]
571 -You should see a dialog with all the available macros. Each macro has a short description that will give you a hint about what the macro does. Look for the ToC macro. You can browse the list of macros using the keyboard: Up/Down selects the previous/next item in the list, Home/End selects the first/last item in the list. Click "Select" once you have the ToC macro highlighted.
580 +You should see a dialog with all the available macros. Each macro has a short description that will give you a hint about what the macro does. Look for the "Table Of Contents" macro. You can browse the list of macros using the keyboard: Up/Down selects the previous/next item in the list, Home/End selects the first/last item in the list. Click "Select" once you have the "Table Of Contents" macro highlighted.
572 572  
573 573  [[image:macroinsertstep2.png||style="border: 1px solid black;"]]
574 -Parameters control the behavior and the output of a macro. Some parameters are mandatory. You can distinguish them from the rest by their color: green. The ToC macro has only optional parameters. One special macro parameter is the macro content. The ToC macro doesn't require any content but other macros like Info use the content as the main source for their output. You can say that the ToC macro uses the entire page as its content, so you don't have to specify the content.
583 +Parameters control the behavior and the output of a macro. Some parameters are mandatory. They are different from the rest because they have the "(Required)" text written after the name of the parameter. The "Table Of Contents" macro has only optional parameters. One special macro parameter is the macro content. The "Table Of Contents" macro doesn't require any content but other macros like Info use the content as the main source for their output. You can say that the "Table Of Contents" macro uses the entire page as its content, so you don't have to specify the content.
575 575  
576 -Change the ToC parameters if you wish but note that you can come back to this step later by editing the inserted ToC macro. We kept the default values in our example. Click "Apply" when you're done.
585 +Change the "Table Of Contents" parameters if you wish but note that you can come back to this step later by editing the inserted "Table Of Contents" macro. We kept the default values in our example. Click "Apply" when you're done.
577 577  
578 578  [[image:macroinsertstep3.png||style="border: 1px solid black;"]]
579 -At this point you should see the ToC macro inserted in your document.
588 +At this point you should see the "Table Of Contents" macro inserted in your document.
580 580  
581 581  [[image:macroinsertstep4.png||style="border: 1px solid black;"]]
582 582  Next, we add more sections to the document and choose "Refresh" from the "Macro" menu in order to update the table of contents.
... ... @@ -591,7 +591,7 @@
591 591  
592 592  === Importing Office Content ===
593 593  
594 -The editor allows you to import content from office applications like **OpenOffice Writer** or **Microsoft Word**. If you want to insert just a fragment from an office document you can copy it from the office application you use and then click the Insert button from the Menu toolbar.
603 +The editor allows you to import content from office applications like **OpenOffice Writer** or **Microsoft Word**. If you want to insert just a fragment from an office document you can copy it from the office application you use and then click the "Paste" button from the Menu toolbar.
595 595  
596 596  [[image:officeimporterstep1.png||style="border: 1px solid black;"]]
597 597  **Paste** what you've copied from the office application in the text area that you can see on the opened dialog. Notice the "//Filter styles//" check box in bottom left corner of the dialog. If you want the pasted text to look as much as possible as in your office application then leave the check box unchecked. Otherwise, if you care only about the content and not the text styles then check "Filter styles". This will result in a much cleaner document but the result may look different than in your office application. Click the "Import" button in the end.
... ... @@ -600,7 +600,7 @@
600 600  You should see the office content in the editing area. It was inserted at the caret position or in place of the selected text. You can edit the imported content if you want.
601 601  
602 602  [[image:officeimporterstep3.png||style="border: 1px solid black;"]]
603 -In case you need to **import** an office document and not just a fragment you can use the "//File//" tab on the Office Importer dialog. **NOTE**: this feature requires special setup in order to work. Ask your system administrator to enable it.
612 +In case you need to **import** an office document and not just a fragment you can click on the "Import" link in the menu and then click on "Office Document". **NOTE**: this feature requires special setup in order to work. Ask your system administrator to enable it.
604 604  
605 605  [[image:officeimporterstep4.png||style="border: 1px solid black;"]]
606 606  See also the [[Office Importer Application>>extensions:Extension.Office Importer Application]].

Get Connected