Add links for feed and wiki images, a=chris
Add links for feed and wiki images, a=chris
diff --git a/en-US/pages/documentation.thtml b/en-US/pages/documentation.thtml
index 4876f6f..7609026 100755
--- a/en-US/pages/documentation.thtml
+++ b/en-US/pages/documentation.thtml
@@ -33,8 +33,7 @@
<li><a href="#registration">Registration and Signin</a></li>
<li><a href="#passwords">Managing Accounts</a></li>
<li><a href="#userrolegroups">Managing Users, Roles, and Groups</a></li>
- <li><a href="#group-feeds">Group Feeds</a></li>
- <li><a href="#group-wikis">Group Wikis</a></li>
+ <li><a href="#feeds-wikis">Feeds and Wikis</a></li>
</ul>
</li>
<li><a href="#crawl-results"><b>Crawling and Customizing Results</b></a>
@@ -1480,8 +1479,8 @@ timestamp of the search index you want.
<p><a href="#toc">Return to table of contents</a>.</p>
<h3 id='mobile'>Mobile Interface</h3>
- <p>Yioop's user interface is designed to display reasonably well as is
- in table devices such as the iPad. For smart phones, such as
+ <p>Yioop's user interface is designed to display reasonably well on tablet
+ devices such as the iPad. For smart phones, such as
iPhone, Android, Blackberry, or Windows Phone, Yioop has a separate
user interface. For search, settings, and login, this looks fairly
similar to the non-mobile user interface:</p>
@@ -1670,17 +1669,60 @@ Yioop from a mobile device.
form and the Not Subscribed to Groups table:</p>
<img src='resources/BrowseGroups.png' alt='The Browse Groups form'/>
<p>If a group is subscribable then the Join link in the Actions column of
- Not Subscribed to Groups table should be clickable.</p>
+ Not Subscribed to Groups table should be clickable. Let's briefly
+ now consider the other columns of either the Groups List or not
+ Subscribed to Groups table. The Name column gives the name of the
+ group. Group name are unique identifiers for a group on a Yioop
+ system. In the Groups List table the name is clickable and takes you
+ to the <a href="#group-feeds">group feed</a> for that group. The
+ owner column gives that username of the owner of the group. If you
+ are the root account or if you are the owner of the group, then this
+ field should be a clickable link that take you to the following form:</p>
+ <img src='resources/TransferGroup.png' alt='The Transfer Group form'/>
+ <p>that can be used to transfer the ownership of a group. The next
+ two column give the register and access information for the group.
+ If you are the owner of the group these will be dropdowns allow you
+ to change these settings. We have already explained what the Join link
+ does in the actions column. Other links which can appear in the actions
+ column are Unsubscribe, which let's you leave a group which you have
+ joined but are not the owner of; Delete, which, if you are the owner
+ of a group, let's you delete the group, its feed, and all its wiki
+ pages; and Edit, which displays the following form:</p>
<img src='resources/EditGroup.png' alt='The Edit Group form'/>
- <p></p>
-<img src='resources/TransferGroup.png' alt='The Transfer Group form'/>
- <p></p>
+ <p>The Register and Access dropdown let's one modify the
+ registration and group access properties for the group which we have already
+ described before. Next to the Members table header is a link with
+ the number of current memebers of the group. Clicking this link expands
+ this area into a listing of users in the group as seen above. This allows
+ one to change access of different members to the group, for example,
+ approving a join request or banning a user. It also allows one to delete
+ a member from a group. Beneath the user listing is a link which can
+ take one to a form to invite more users.</p>
<p><a href="#toc">Return to table of contents</a>.</p>
- <h3 id='group-feeds'>Group Feeds</h3>
- <p><a href="#toc">Return to table of contents</a>.</p>
-
- <h3 id='group-wikis'>Group Wikis</h3>
+ <h3 id='feeds-wikis'>Feeds and Wikis</h3>
+<img src='resources/FeedsWikis.png' alt='The Main Feeds and Wiki Page'/>
+<img src='resources/SingleGroupFeed.png' alt='A Single Group Feed'/>
+<img src='resources/StartNewThread.png' alt='Starting a new thread from
+ a group feed'/>
+<img src='resources/AddComment.png' alt='Adding a comment to an existing
+ thread'/>
+<img src='resources/FeedThread.png' alt='A Group Feed Thread'/>
+<img src='resources/UserFeed.png' alt='User Feed'/>
+<img src='resources/UserRssFeed.png' alt='User Rss Feed'/>
+<img src='resources/NonexistantPage.png' alt='Screenshot of going to
+ location of a non-existant wiki page'/>
+<img src='resources/AdminHeading.png' alt='Read Edit Page Headings on Admin
+ view'/>
+<img src='resources/GroupHeading.png' alt='Read Edit Page Headings on Group
+ view'/>
+<img src='resources/WikiPageList.png' alt='List of Groups Wiki Pages'/>
+<img src='resources/WikiPage.png' alt='Example Viewing a Wiki Page'/>
+<img src='resources/EditWikiPage.png' alt='Editing a Wiki Page'/>
+<img src='resources/HistoryPage.png' alt='An example History Page of a Wiki
+ Page'/>
+<img src='resources/DiffPage.png' alt='An example diff page of two versions
+ of a Wiki Page'/>
<p><a href="#toc">Return to table of contents</a>.</p>
<h2 id='crawl-results'>Crawling and Customizing Results</h2>